geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ke...@apache.org
Subject svn commit: r558931 - in /geronimo/server/branches/2.0: configs/jsr88-deploymentfactory/src/plan/plan.xml modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/LocalAttributeManager.java
Date Tue, 24 Jul 2007 05:05:11 GMT
Author: kevan
Date: Mon Jul 23 22:05:10 2007
New Revision: 558931

URL: http://svn.apache.org/viewvc?view=rev&rev=558931
Log:
GERONIMO-2735 Fix broken JSR88-Depoloyment. Make LocalAttributeManager a bit more lenient
if a substitutionPrefix attribute is not specified

Modified:
    geronimo/server/branches/2.0/configs/jsr88-deploymentfactory/src/plan/plan.xml
    geronimo/server/branches/2.0/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/LocalAttributeManager.java

Modified: geronimo/server/branches/2.0/configs/jsr88-deploymentfactory/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0/configs/jsr88-deploymentfactory/src/plan/plan.xml?view=diff&rev=558931&r1=558930&r2=558931
==============================================================================
--- geronimo/server/branches/2.0/configs/jsr88-deploymentfactory/src/plan/plan.xml (original)
+++ geronimo/server/branches/2.0/configs/jsr88-deploymentfactory/src/plan/plan.xml Mon Jul
23 22:05:10 2007
@@ -46,6 +46,7 @@
         <attribute name="readOnly">true</attribute>
         <attribute name="configFile">var/config/jsr88-configurer-config.xml</attribute>
         <attribute name="substitutionsFile">var/config/config-substitutions.properties</attribute>
+        <attribute name="substitutionPrefix">org.apache.geronimo.config.substitution.</attribute>
     </gbean>
 
     <!-- ArtifactManager -->

Modified: geronimo/server/branches/2.0/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/LocalAttributeManager.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/LocalAttributeManager.java?view=diff&rev=558931&r1=558930&r2=558931
==============================================================================
--- geronimo/server/branches/2.0/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/LocalAttributeManager.java
(original)
+++ geronimo/server/branches/2.0/modules/geronimo-system/src/main/java/org/apache/geronimo/system/configuration/LocalAttributeManager.java
Mon Jul 23 22:05:10 2007
@@ -632,11 +632,13 @@
     }
 
     private static void addGeronimoSubstitutions(Map<String, String> vars, Map props,
String prefix) {
-        int start = prefix.length();
-        for (Object o: props.entrySet()) {
-            Map.Entry entry = (Map.Entry) o;
-            if (((String)entry.getKey()).startsWith(prefix)) {
-                vars.put(((String)entry.getKey()).substring(start), (String)entry.getValue());
+        if (prefix != null) {
+            int start = prefix.length();
+            for (Object o: props.entrySet()) {
+                Map.Entry entry = (Map.Entry) o;
+                if (((String)entry.getKey()).startsWith(prefix)) {
+                    vars.put(((String)entry.getKey()).substring(start), (String)entry.getValue());
+                }
             }
         }
     }



Mime
View raw message