Re: svn commit: r425429 - /geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/configuration/GBeanOverride.java

[Jason Dillon]

Merge to trunk?

--jason


On Jul 25, 2006, at 8:55 AM, [EMAIL PROTECTED] wrote:

Author: ammulder
Date: Tue Jul 25 08:55:34 2006
New Revision: 425429

URL: http://svn.apache.org/viewvc?rev=425429&view=rev
Log:
Module and name are independent of artifact

Modified:

geronimo/branches/1.1/modules/system/src/java/org/apache/ geronimo/system/configuration/GBeanOverride.java

Modified: geronimo/branches/1.1/modules/system/src/java/org/apache/ geronimo/system/configuration/GBeanOverride.java URL: http://svn.apache.org/viewvc/geronimo/branches/1.1/modules/ system/src/java/org/apache/geronimo/system/configuration/ GBeanOverride.java?rev=425429&r1=425428&r2=425429&view=diff ====================================================================== ======== --- geronimo/branches/1.1/modules/system/src/java/org/apache/ geronimo/system/configuration/GBeanOverride.java (original) +++ geronimo/branches/1.1/modules/system/src/java/org/apache/ geronimo/system/configuration/GBeanOverride.java Tue Jul 25 08:55:34 2006

@@ -459,17 +459,17 @@

type.appendChild(doc.createTextNode (artifact.getType()));

                         pat.appendChild(type);
                     }
-                    Map nameMap = pattern.getName();
-                    if (nameMap.get("module") != null) {
-                        Element module = doc.createElement("module");

- module.appendChild(doc.createTextNode (nameMap.get("module").toString()));

-                        pat.appendChild(module);
-                    }
-                    if (nameMap.get("name") != null) {
-                        Element patName = doc.createElement("name");

- patName.appendChild(doc.createTextNode (nameMap.get("name").toString()));

-                        pat.appendChild(patName);
-                    }
+                }
+                Map nameMap = pattern.getName();
+                if (nameMap.get("module") != null) {
+                    Element module = doc.createElement("module");

+ module.appendChild(doc.createTextNode (nameMap.get("module").toString()));

+                    pat.appendChild(module);
+                }
+                if (nameMap.get("name") != null) {
+                    Element patName = doc.createElement("name");

+ patName.appendChild(doc.createTextNode (nameMap.get("name").toString()));

+                    pat.appendChild(patName);
                 }
 //                out.print(pattern.toString());
             }