You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2013/11/14 07:25:19 UTC
svn commit: r1541834 - in /karaf/branches/karaf-2.x/admin/command/src:
main/java/org/apache/karaf/admin/main/Execute.java
test/java/org/apache/karaf/admin/main/ExecuteTest.java
Author: jbonofre
Date: Thu Nov 14 06:25:18 2013
New Revision: 1541834
URL: http://svn.apache.org/r1541834
Log:
[KARAF-2575] Add missing commands in bin/admin
Modified:
karaf/branches/karaf-2.x/admin/command/src/main/java/org/apache/karaf/admin/main/Execute.java
karaf/branches/karaf-2.x/admin/command/src/test/java/org/apache/karaf/admin/main/ExecuteTest.java
Modified: karaf/branches/karaf-2.x/admin/command/src/main/java/org/apache/karaf/admin/main/Execute.java
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.x/admin/command/src/main/java/org/apache/karaf/admin/main/Execute.java?rev=1541834&r1=1541833&r2=1541834&view=diff
==============================================================================
--- karaf/branches/karaf-2.x/admin/command/src/main/java/org/apache/karaf/admin/main/Execute.java (original)
+++ karaf/branches/karaf-2.x/admin/command/src/main/java/org/apache/karaf/admin/main/Execute.java Thu Nov 14 06:25:18 2013
@@ -33,16 +33,20 @@ import org.fusesource.jansi.AnsiConsole;
public class Execute {
static Class<? extends Action> x = CreateCommand.class;
- private static final Class<?> [] COMMAND_CLASSES = new Class[] {
- CreateCommand.class,
- StartCommand.class,
- StopCommand.class,
- DestroyCommand.class,
- ListCommand.class,
- ChangeSshPortCommand.class,
- ChangeRmiRegistryPortCommand.class,
- ChangeRmiServerPortCommand.class};
+ private static final Class<?>[] COMMAND_CLASSES = new Class[]{
+ ChangeOptsCommand.class,
+ ChangeRmiRegistryPortCommand.class,
+ ChangeRmiServerPortCommand.class,
+ ChangeSshPortCommand.class,
+ CloneCommand.class,
+ CreateCommand.class,
+ DestroyCommand.class,
+ ListCommand.class,
+ RenameCommand.class,
+ StartCommand.class,
+ StopCommand.class};
private static final Map<String, Class<?>> COMMANDS = new TreeMap<String, Class<?>>();
+
static {
for (Class<?> c : COMMAND_CLASSES) {
Command ann = c.getAnnotation(Command.class);
@@ -51,22 +55,22 @@ public class Execute {
}
COMMANDS.put(ann.name(), c);
}
- }
-
+ }
+
// For testing
static boolean exitAllowed = true;
-
+
/**
- * Environment variable for specifying extra options to the Karaf admin
+ * Environment variable for specifying extra options to the Karaf admin
* process kicked off from this Java process.
*/
private static final String ENV_KARAF_OPTS = "KARAF_OPTS";
-
+
/**
- * System property for specifying extra options to the Karaf admin
+ * System property for specifying extra options to the Karaf admin
* process kicked off from this Java process.
*/
- private static final String PROP_KARAF_OPTS = "karaf.opts";
+ private static final String PROP_KARAF_OPTS = "karaf.opts";
public static void main(String[] args) throws Exception {
AnsiConsole.systemInstall();
@@ -85,24 +89,24 @@ public class Execute {
String storage = System.getProperty("karaf.instances");
if (storage == null) {
System.err.println("System property 'karaf.instances' is not set. \n" +
- "This property needs to be set to the full path of the instance.properties file.");
- exit(-1);
+ "This property needs to be set to the full path of the instance.properties file.");
+ exit(-2);
}
File storageFile = new File(storage);
System.setProperty("user.dir", storageFile.getParentFile().getParentFile().getCanonicalPath());
-
+
try {
String karafOpts = System.getenv(ENV_KARAF_OPTS);
if (karafOpts != null) {
System.setProperty(PROP_KARAF_OPTS, karafOpts);
}
- } catch(Exception e) {
+ } catch (Exception e) {
System.err.println("Could not read KARAF_OPTS environment variable: " + e.getMessage());
if (System.getProperty("karaf.showStackTrace") != null) {
throw e;
}
- }
-
+ }
+
Object command = cls.newInstance();
if (command instanceof AdminCommandSupport) {
try {
@@ -115,10 +119,10 @@ public class Execute {
}
} else {
System.err.println("Not an admin command: " + commandName);
- exit(-1);
+ exit(-3);
}
}
-
+
static void execute(AdminCommandSupport command, File storageFile, String[] args) throws Exception {
DefaultActionPreparator dap = new DefaultActionPreparator();
List<Object> params = new ArrayList<Object>(Arrays.asList(args));
@@ -127,7 +131,7 @@ public class Execute {
if (!dap.prepare(command, null, params)) {
return;
}
-
+
AdminServiceImpl admin = new AdminServiceImpl();
admin.setStorageLocation(storageFile);
command.setAdminService(admin);
@@ -140,7 +144,7 @@ public class Execute {
Command ann = entry.getValue().getAnnotation(Command.class);
System.out.printf(" %s - %s\n", entry.getKey(), ann.description());
}
-
+
System.out.println("Type 'command --help' for more help on the specified command.");
}
Modified: karaf/branches/karaf-2.x/admin/command/src/test/java/org/apache/karaf/admin/main/ExecuteTest.java
URL: http://svn.apache.org/viewvc/karaf/branches/karaf-2.x/admin/command/src/test/java/org/apache/karaf/admin/main/ExecuteTest.java?rev=1541834&r1=1541833&r2=1541834&view=diff
==============================================================================
--- karaf/branches/karaf-2.x/admin/command/src/test/java/org/apache/karaf/admin/main/ExecuteTest.java (original)
+++ karaf/branches/karaf-2.x/admin/command/src/test/java/org/apache/karaf/admin/main/ExecuteTest.java Thu Nov 14 06:25:18 2013
@@ -90,7 +90,7 @@ public class ExecuteTest extends TestCas
try {
Execute.main(new String [] {"create"});
} catch (RuntimeException re) {
- assertEquals("-1", re.getMessage());
+ assertEquals("-2", re.getMessage());
String s = new String(baos.toByteArray());
assertTrue(s.contains("karaf.instances"));