svn commit: r703060 - /openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/cmd/Info2Properties.java

[db...@apache.org]

Author: dblevins
Date: Wed Oct  8 22:23:19 2008
New Revision: 703060

URL: http://svn.apache.org/viewvc?rev=703060&view=rev
Log:
Fixed up the Info2Properties command a bit.

Modified:
    openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/cmd/Info2Properties.java

Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/cmd/Info2Properties.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/cmd/Info2Properties.java?rev=703060&r1=703059&r2=703060&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/cmd/Info2Properties.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/cmd/Info2Properties.java Wed Oct  8 22:23:19 2008
@@ -42,7 +42,6 @@
 import java.util.Map;
 import java.util.Properties;
 import java.util.HashMap;
-import java.net.URISyntaxException;
 
 /**
  * @version $Rev$ $Date$
@@ -121,6 +120,17 @@
             System.exit(10);
         }
 
+        printConfig(configuration);
+    }
+
+    public static void printLocalConfig() {
+        OpenEjbConfiguration configuration = SystemInstance.get().getComponent(OpenEjbConfiguration.class);
+        if (configuration != null){
+            printConfig(configuration);
+        }
+    }
+
+    public static void printConfig(OpenEjbConfiguration configuration) {
         comment(i18n("cmd.properties.header"));
         comment("");
         comment("");
@@ -170,22 +180,23 @@
         comment("-------------------------------------------------");
         println("");
         printSystemProperties();
-
     }
 
     private static void printSystemProperties() {
 
         try {
-            Properties p = new Properties();
+            SuperProperties p = new SuperProperties();
+            p.setSpaceBetweenProperties(false);
+            p.setKeyValueSeparator(" = ");
             copyOpenEjbProperties(System.getProperties(), p);
             copyOpenEjbProperties(SystemInstance.get().getProperties(), p);
-            p.store(new Filter(System.out), null);
+            p.store(System.out, null);
 
 
-            p = System.getProperties();
+            Properties p2 = System.getProperties();
             String[] misc = {"os.version", "os.name", "os.arch", "java.version", "java.vendor"};
             for (String prop : misc) {
-                comment(prop + "=" + p.get(prop));
+                comment(prop + "=" + p2.get(prop));
             }
         } catch (IOException e) {
             e.printStackTrace(new PrintWriter(new CommentsFilter(System.out)));
@@ -228,7 +239,9 @@
             // TODO: the codebase value usually isn't filled in, we should do that.
             // comment("codebase: " + info.codebase);
             comment("");
-            Properties p = new SuperProperties();
+            SuperProperties p = new SuperProperties();
+            p.setSpaceBetweenProperties(false);
+            p.setKeyValueSeparator(" = ");
 
 
             String uri = "new://" + info.service;
@@ -254,7 +267,7 @@
                     p.put(info.id + "." + entry.getKey(), entry.getValue());
                 }
             }
-            p.store(new Filter(System.out), null);
+            p.store(System.out, null);
 
         } catch (IOException e) {
             System.out.println("# Printing service(id=" + info.id + ") failed.");