geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r396373 - in /geronimo/branches/1.1/modules/upgrade/src: java/org/apache/geronimo/upgrade/ test-data/ test/org/apache/geronimo/upgrade/
Date Mon, 24 Apr 2006 01:49:30 GMT
Author: djencks
Date: Sun Apr 23 18:49:30 2006
New Revision: 396373

URL: http://svn.apache.org/viewcvs?rev=396373&view=rev
Log:
Fix another upgrader problem

Added:
    geronimo/branches/1.1/modules/upgrade/src/test-data/transport_1.xml
    geronimo/branches/1.1/modules/upgrade/src/test-data/transport_1_result.xml
    geronimo/branches/1.1/modules/upgrade/src/test-data/transport_2.xml
    geronimo/branches/1.1/modules/upgrade/src/test-data/transport_2_result.xml
Modified:
    geronimo/branches/1.1/modules/upgrade/src/java/org/apache/geronimo/upgrade/Upgrade1_0To1_1.java
    geronimo/branches/1.1/modules/upgrade/src/test/org/apache/geronimo/upgrade/Upgrade1_0To1_1Test.java

Modified: geronimo/branches/1.1/modules/upgrade/src/java/org/apache/geronimo/upgrade/Upgrade1_0To1_1.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/upgrade/src/java/org/apache/geronimo/upgrade/Upgrade1_0To1_1.java?rev=396373&r1=396372&r2=396373&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/upgrade/src/java/org/apache/geronimo/upgrade/Upgrade1_0To1_1.java
(original)
+++ geronimo/branches/1.1/modules/upgrade/src/java/org/apache/geronimo/upgrade/Upgrade1_0To1_1.java
Sun Apr 23 18:49:30 2006
@@ -136,7 +136,6 @@
             //no dependencies, do nothing
             return;
         }
-        cursor.push();
         do {
             String localPart = cursor.getName().getLocalPart();
             if (localPart.equals("dependency") || localPart.equals("import")) {
@@ -145,7 +144,6 @@
                 break;
             }
         } while (cursor.toNextSibling());
-        cursor.pop();
     }
 
     private static void extractDependency(XmlCursor cursor, Environment environment) {

Added: geronimo/branches/1.1/modules/upgrade/src/test-data/transport_1.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/upgrade/src/test-data/transport_1.xml?rev=396373&view=auto
==============================================================================
--- geronimo/branches/1.1/modules/upgrade/src/test-data/transport_1.xml (added)
+++ geronimo/branches/1.1/modules/upgrade/src/test-data/transport_1.xml Sun Apr 23 18:49:30
2006
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<application
+    xmlns="http://geronimo.apache.org/xml/ns/j2ee/application"
+    configId="transport_1"
+    >
+
+    <import>
+        <uri>${pom.groupId}/server-resources/${pom.currentVersion}/car</uri>
+    </import>
+
+    <module>
+        <java>transport_1_client.jar</java>
+        <application-client xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-client"
+            configId="bar"
+            clientParentId="${pom.groupId}/client-security/${pom.currentVersion}/car" clientConfigId="transport_ejb_vehicle/transport_ejb_vehicle_client">
+            <ejb-ref>
+                <ref-name>ejb/EJBVehicle</ref-name>
+                <ejb-link>common_ejb_EJBVehicle</ejb-link>
+            </ejb-ref>
+        </application-client>
+    </module>
+</application>

Added: geronimo/branches/1.1/modules/upgrade/src/test-data/transport_1_result.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/upgrade/src/test-data/transport_1_result.xml?rev=396373&view=auto
==============================================================================
--- geronimo/branches/1.1/modules/upgrade/src/test-data/transport_1_result.xml (added)
+++ geronimo/branches/1.1/modules/upgrade/src/test-data/transport_1_result.xml Sun Apr 23
18:49:30 2006
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.1">
+  <dep:environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.1">
+    <dep:configId>
+      <dep:groupId>default</dep:groupId>
+      <dep:artifactId>transport_1</dep:artifactId>
+      <dep:version>1-default</dep:version>
+      <dep:type>car</dep:type>
+    </dep:configId>
+    <dep:dependencies>
+      <dep:dependency>
+        <dep:groupId>${pom.groupId}</dep:groupId>
+        <dep:artifactId>server-resources</dep:artifactId>
+        <dep:version>${pom.currentVersion}</dep:version>
+        <dep:type>car</dep:type>
+      </dep:dependency>
+    </dep:dependencies>
+    <dep:hidden-classes/>
+    <dep:non-overridable-classes/>
+  </dep:environment>
+  <module>
+    <java>transport_1_client.jar</java>
+    <application-client xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-client-1.1">
+      <dep:client-environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.1">
+        <dep:configId>
+          <dep:groupId>default</dep:groupId>
+          <dep:artifactId>transport_ejb_vehicle_transport_ejb_vehicle_client</dep:artifactId>
+          <dep:version>1-default</dep:version>
+          <dep:type>car</dep:type>
+        </dep:configId>
+        <dep:dependencies>
+          <dep:dependency>
+            <dep:groupId>${pom.groupId}</dep:groupId>
+            <dep:artifactId>client-security</dep:artifactId>
+            <dep:version>${pom.currentVersion}</dep:version>
+            <dep:type>car</dep:type>
+          </dep:dependency>
+        </dep:dependencies>
+        <dep:hidden-classes/>
+        <dep:non-overridable-classes/>
+      </dep:client-environment>
+      <dep:server-environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.1">
+        <dep:configId>
+          <dep:groupId>default</dep:groupId>
+          <dep:artifactId>bar</dep:artifactId>
+          <dep:version>1-default</dep:version>
+          <dep:type>car</dep:type>
+        </dep:configId>
+        <dep:dependencies/>
+        <dep:hidden-classes/>
+        <dep:non-overridable-classes/>
+      </dep:server-environment>
+      <ejb-ref>
+        <ref-name>ejb/EJBVehicle</ref-name>
+        <ejb-link>common_ejb_EJBVehicle</ejb-link>
+      </ejb-ref>
+    </application-client>
+  </module>
+</application>
+

Added: geronimo/branches/1.1/modules/upgrade/src/test-data/transport_2.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/upgrade/src/test-data/transport_2.xml?rev=396373&view=auto
==============================================================================
--- geronimo/branches/1.1/modules/upgrade/src/test-data/transport_2.xml (added)
+++ geronimo/branches/1.1/modules/upgrade/src/test-data/transport_2.xml Sun Apr 23 18:49:30
2006
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<application
+    xmlns="http://geronimo.apache.org/xml/ns/j2ee/application"
+    configId="transport_jsp_vehicle"
+    >
+
+    <import>
+        <uri>${pom.groupId}/server-resources/${pom.currentVersion}/car</uri>
+    </import>
+</application>
+        
\ No newline at end of file

Added: geronimo/branches/1.1/modules/upgrade/src/test-data/transport_2_result.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/upgrade/src/test-data/transport_2_result.xml?rev=396373&view=auto
==============================================================================
--- geronimo/branches/1.1/modules/upgrade/src/test-data/transport_2_result.xml (added)
+++ geronimo/branches/1.1/modules/upgrade/src/test-data/transport_2_result.xml Sun Apr 23
18:49:30 2006
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.1">
+  <dep:environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.1">
+    <dep:configId>
+      <dep:groupId>default</dep:groupId>
+      <dep:artifactId>transport_jsp_vehicle</dep:artifactId>
+      <dep:version>1-default</dep:version>
+      <dep:type>car</dep:type>
+    </dep:configId>
+    <dep:dependencies>
+      <dep:dependency>
+        <dep:groupId>${pom.groupId}</dep:groupId>
+        <dep:artifactId>server-resources</dep:artifactId>
+        <dep:version>${pom.currentVersion}</dep:version>
+        <dep:type>car</dep:type>
+      </dep:dependency>
+    </dep:dependencies>
+    <dep:hidden-classes/>
+    <dep:non-overridable-classes/>
+  </dep:environment>
+</application>
+        
\ No newline at end of file

Modified: geronimo/branches/1.1/modules/upgrade/src/test/org/apache/geronimo/upgrade/Upgrade1_0To1_1Test.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/upgrade/src/test/org/apache/geronimo/upgrade/Upgrade1_0To1_1Test.java?rev=396373&r1=396372&r2=396373&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/upgrade/src/test/org/apache/geronimo/upgrade/Upgrade1_0To1_1Test.java
(original)
+++ geronimo/branches/1.1/modules/upgrade/src/test/org/apache/geronimo/upgrade/Upgrade1_0To1_1Test.java
Sun Apr 23 18:49:30 2006
@@ -48,6 +48,14 @@
         test("appclient_dep_1");
     }
 
+    public void test3() throws Exception {
+        test("transport_1");
+    }
+
+    public void test4() throws Exception {
+        test("transport_2");
+    }
+
     private void test(String testName) throws Exception {
         InputStream srcXml = classLoader.getResourceAsStream(testName + ".xml");
         Writer targetXml = new StringWriter();



Mime
View raw message