diff --git a/utils/src/com/cloud/utils/script/Executor.java b/utils/src/com/cloud/utils/script/Executor.java deleted file mode 100644 index 4e70a773931..00000000000 --- a/utils/src/com/cloud/utils/script/Executor.java +++ /dev/null @@ -1,27 +0,0 @@ -// Licensed to the Apache Software Foundation (ASF) under one -// or more contributor license agreements. See the NOTICE file -// distributed with this work for additional information -// regarding copyright ownership. The ASF licenses this file -// to you under the Apache License, Version 2.0 (the -// "License"); you may not use this file except in compliance -// the License. You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, -// software distributed under the License is distributed on an -// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the License for the -// specific language governing permissions and limitations -// under the License. -package com.cloud.utils.script; - -import org.apache.log4j.Logger; - -/** - * Executor figures out how to execute a certain script. - * - */ -public interface Executor { - String execute(Script script, long timeout, Logger logger); -} diff --git a/utils/src/com/cloud/utils/script/Script.java b/utils/src/com/cloud/utils/script/Script.java index d3a35916eaf..04ad7c46ba0 100755 --- a/utils/src/com/cloud/utils/script/Script.java +++ b/utils/src/com/cloud/utils/script/Script.java @@ -61,8 +61,6 @@ public class Script implements Callable { Process _process; Thread _thread; - ScriptBuilder _builder; - public Script(String command, long timeout, Logger logger) { _command = new ArrayList(); _command.add(command); @@ -75,10 +73,6 @@ public class Script implements Callable { _logger = logger != null ? logger : s_logger; } - protected Script(ScriptBuilder builder) { - this(builder._command, builder._timeout, builder._logger); - } - public Script(boolean runWithSudo, String command, long timeout, Logger logger) { this(command, timeout, logger); if (runWithSudo) { diff --git a/utils/src/com/cloud/utils/script/ScriptBuilder.java b/utils/src/com/cloud/utils/script/ScriptBuilder.java deleted file mode 100644 index 96cadfbaba9..00000000000 --- a/utils/src/com/cloud/utils/script/ScriptBuilder.java +++ /dev/null @@ -1,73 +0,0 @@ -// Licensed to the Apache Software Foundation (ASF) under one -// or more contributor license agreements. See the NOTICE file -// distributed with this work for additional information -// regarding copyright ownership. The ASF licenses this file -// to you under the Apache License, Version 2.0 (the -// "License"); you may not use this file except in compliance -// the License. You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, -// software distributed under the License is distributed on an -// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the License for the -// specific language governing permissions and limitations -// under the License. -package com.cloud.utils.script; - -import java.util.ArrayList; -import java.util.List; - -import org.apache.log4j.Logger; - -/** - * - */ -public class ScriptBuilder { - Logger _logger; - long _timeout; - String _command; - ArrayList _params; - Executor _executor; - - public ScriptBuilder(String command, Executor executor, long timeout, Logger logger) { - _command = command; - _timeout = timeout; - _logger = logger; - _executor = executor; - - } - - public ScriptBuilder add(String... params) { - for (String param : params) { - _params.add(param); - } - - return this; - } - - public Script script() { - return new Script(this); - } - - public List getParameterNames() { - return _params; - } - - public String getCommand() { - return _command; - } - - public long getTimeout() { - return _timeout; - } - - public Logger getLogger() { - return _logger; - } - - public Executor getExecutor() { - return _executor; - } -}