geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lin...@apache.org
Subject svn commit: r669891 - /geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/LocalAttributeManager.java
Date Fri, 20 Jun 2008 13:38:47 GMT
Author: linsun
Date: Fri Jun 20 06:38:47 2008
New Revision: 669891

URL: http://svn.apache.org/viewvc?rev=669891&view=rev
Log:
GERONIMO-4139 Add a comment to config-substitutions.properties to indicate its usage

Modified:
    geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/LocalAttributeManager.java

Modified: geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/LocalAttributeManager.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/LocalAttributeManager.java?rev=669891&r1=669890&r2=669891&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/LocalAttributeManager.java
(original)
+++ geronimo/server/trunk/framework/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/LocalAttributeManager.java
Fri Jun 20 06:38:47 2008
@@ -641,12 +641,22 @@
             try {
                 FileOutputStream out = new FileOutputStream(configSubstitutionsFile);
                 try {
+                    String instruction = "#Put variables and their substitution values in
this file: \n"
+                            + "#they will be used when processing config.xml. \n"
+                            + "#Values in this file will be overridden by environment variables
and system properties: \n"
+                            + "#    hostName=localhost \n"
+                            + "#    httpPort=8080 \n"
+                            + "#    httpsPort=8443 \n"
+                            + "#To run multiple instances of geronimo choose a portOffset
such that none of the ports conflict \n"
+                            + "#Try PortOffset=10 \n";
+                    out.write(instruction.getBytes());                    
                     properties.store(out, null);
                 } finally {
                     out.close();
                 }
             } catch (Exception e) {
-                log.error("Caught exception {} trying to open properties file {}", e, configSubstitutionsFile.getAbsolutePath());
+                log.error("Caught exception " + e
+                        + " trying to open properties file " + configSubstitutionsFile.getAbsolutePath());
             }
         }
     }



Mime
View raw message