Changeset 1878

Timestamp:

2011-03-31 21:00:45 (14 months ago)

Author:

mpo

Message:

fixes #447
switching to --version without arguments (and optional -Dkauri.info.module) to dump the version-info string
and hiding the path info from the output unless -Dkauri.info.verbose=true
as suggested in the comments

Location:

trunk/core

Files:

• kauri-runtime-cli/src/main/java/org/kauriproject/runtime/cli/KauriRuntimeCli.java (modified) (2 diffs)
• kauri-runtime/src/main/java/org/kauriproject/runtime/model/KauriRuntimeModel.java (modified) (1 diff)
• kauri-runtime/src/main/java/org/kauriproject/runtime/model/ModuleDefinition.java (modified) (1 diff)

trunk/core/kauri-runtime-cli/src/main/java/org/kauriproject/runtime/cli/KauriRuntimeCli.java

@@ -163 +163 @@
         cliOptions.addOption(modeOption);
         
-        Option infoOption = OptionBuilder
-            .withArgName("module-id")
-            .hasArg()
-            .withDescription("Don't start the service, only dump the info string for the module.")
-            .withLongOpt("info")
-            .create("I");
-        cliOptions.addOption(infoOption);      
+        Option versionOption = OptionBuilder
+            .withDescription("Don't start the service, only dump the version info string for the module defined with -Dkauri.info.module")
+            .withLongOpt("version")
+            .create("V");
+        cliOptions.addOption(versionOption);      
         
         Option helpOption = new Option("h", "help", false, "Shows help");
@@ -277 +275 @@
         }
         
-        if (cmd.hasOption(infoOption.getOpt())) {
-            System.out.println(runtime.buildModel().moduleInfo(cmd.getOptionValue(infoOption.getOpt())));
+        if (cmd.hasOption(versionOption.getOpt())) {
+            System.out.println(runtime.buildModel().moduleInfo(System.getProperty("kauri.info.module")));
             System.exit(0);
         }

trunk/core/kauri-runtime/src/main/java/org/kauriproject/runtime/model/KauriRuntimeModel.java

@@ -70 +70 @@
    
     public String moduleInfo(String id){
-        if (id == null || id.length() == 0 || id.equals("+")){
+        if (id == null || id.length() == 0 ){
             String result = "";
             int i = 1;

trunk/core/kauri-runtime/src/main/java/org/kauriproject/runtime/model/ModuleDefinition.java

@@ -68 +68 @@
     
     public String moduleInfo() {
-        return String.format("%s (version: %s) - running from [%s] (in mode: %s)", id, version, file.getAbsolutePath(), sourceType.name());
+        if (Boolean.getBoolean("kauri.info.verbose"))
+            return String.format("%s (version: %s) - running from [%s] (in mode: %s)", id, version, file.getAbsolutePath(), sourceType.name());
+        //else
+        return String.format("%s (version: %s)", id, version);
     }