geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ke...@apache.org
Subject svn commit: r405784 - in /geronimo/branches/1.1/modules: deploy-jsr88/src/java/org/apache/geronimo/deployment/plugin/ConfigIDExtractor.java service-builder/src/java/org/apache/geronimo/deployment/service/jsr88/EnvironmentData.java
Date Wed, 10 May 2006 15:47:47 GMT
Author: kevan
Date: Wed May 10 08:47:40 2006
New Revision: 405784

URL: http://svn.apache.org/viewcvs?rev=405784&view=rev
Log:
Fix a redeploy problem. ConfigIdExtractor was still looking for 'configId' when scanning a
plan. I also updated a usage of 'configId' in EnvironmentData

Modified:
    geronimo/branches/1.1/modules/deploy-jsr88/src/java/org/apache/geronimo/deployment/plugin/ConfigIDExtractor.java
    geronimo/branches/1.1/modules/service-builder/src/java/org/apache/geronimo/deployment/service/jsr88/EnvironmentData.java

Modified: geronimo/branches/1.1/modules/deploy-jsr88/src/java/org/apache/geronimo/deployment/plugin/ConfigIDExtractor.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/deploy-jsr88/src/java/org/apache/geronimo/deployment/plugin/ConfigIDExtractor.java?rev=405784&r1=405783&r2=405784&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/deploy-jsr88/src/java/org/apache/geronimo/deployment/plugin/ConfigIDExtractor.java
(original)
+++ geronimo/branches/1.1/modules/deploy-jsr88/src/java/org/apache/geronimo/deployment/plugin/ConfigIDExtractor.java
Wed May 10 08:47:40 2006
@@ -193,7 +193,7 @@
         }
         return list;
     }
-    
+
     private static String extractModuleIdFromPlan(Reader plan) throws IOException {
         SAXParserFactory factory = SAXParserFactory.newInstance();
         factory.setNamespaceAware(true);
@@ -252,11 +252,11 @@
                     inElement = localName;
                 }
             } else {
-                if(parent.size() == 2 && localName.equals("configId")) {
+                if(parent.size() == 2 && localName.equals("moduleId")) {
                     inConfigId = true; // only document/environment/configId, not e.g. configId
in nested plan in EAR
                 } else {
-                    if(parent.size() == 0 && attributes.getIndex("configId") >
-1) {
-                        configId = attributes.getValue("configId");
+                    if(parent.size() == 0 && attributes.getIndex("moduleId") >
-1) {
+                        configId = attributes.getValue("moduleId");
                         formatIs10 = true;
                     }
                 }
@@ -276,7 +276,7 @@
 
         public void endElement(String uri, String localName, String qName) throws SAXException
{
             inElement = null;
-            if(inConfigId && localName.equals("configId")) {
+            if(inConfigId && localName.equals("moduleId")) {
                 inConfigId = false;
             }
             if(parent.peek().equals(localName)) {

Modified: geronimo/branches/1.1/modules/service-builder/src/java/org/apache/geronimo/deployment/service/jsr88/EnvironmentData.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/service-builder/src/java/org/apache/geronimo/deployment/service/jsr88/EnvironmentData.java?rev=405784&r1=405783&r2=405784&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/service-builder/src/java/org/apache/geronimo/deployment/service/jsr88/EnvironmentData.java
(original)
+++ geronimo/branches/1.1/modules/service-builder/src/java/org/apache/geronimo/deployment/service/jsr88/EnvironmentData.java
Wed May 10 08:47:40 2006
@@ -82,7 +82,7 @@
         if(configId != null) {
             configId.configure(getEnvironmentType().addNewModuleId());
         }
-        pcs.firePropertyChange("configId", old, configId);
+        pcs.firePropertyChange("moduleId", old, configId);
     }
 
     public Artifact[] getDependencies() {



Mime
View raw message