You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dj...@apache.org on 2006/04/23 01:13:44 UTC
svn commit: r396178 - in /geronimo/branches/1.1/modules/upgrade/src:
java/org/apache/geronimo/upgrade/Upgrade1_0To1_1.java
test-data/appclient_dep_1.xml test-data/appclient_dep_1_result.xml
Author: djencks
Date: Sat Apr 22 16:13:41 2006
New Revision: 396178
URL: http://svn.apache.org/viewcvs?rev=396178&view=rev
Log:
handle 'import' elements in upgrade
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-data/appclient_dep_1.xml
geronimo/branches/1.1/modules/upgrade/src/test-data/appclient_dep_1_result.xml
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=396178&r1=396177&r2=396178&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 Sat Apr 22 16:13:41 2006
@@ -138,7 +138,8 @@
}
cursor.push();
do {
- if (cursor.getName().getLocalPart().equals("dependency")) {
+ String localPart = cursor.getName().getLocalPart();
+ if (localPart.equals("dependency") || localPart.equals("import")) {
extractDependency(cursor, environment);
} else {
break;
@@ -207,7 +208,7 @@
QName attrQName = new QName(null, "suppressDefaultParentId");
if ((attrValue = cursor.getAttributeText(attrQName)) != null) {
cursor.removeAttribute(attrQName);
- return true;
+ return Boolean.valueOf(attrValue).booleanValue();
}
return false;
}
Modified: geronimo/branches/1.1/modules/upgrade/src/test-data/appclient_dep_1.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/upgrade/src/test-data/appclient_dep_1.xml?rev=396178&r1=396177&r2=396178&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/upgrade/src/test-data/appclient_dep_1.xml (original)
+++ geronimo/branches/1.1/modules/upgrade/src/test-data/appclient_dep_1.xml Sat Apr 22 16:13:41 2006
@@ -2,6 +2,15 @@
<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application" xmlns:j2ee="http://java.sun.com/xml/ns/j2ee"
configId="appclient_dep"
parentId="${pom.groupId}/server-security/${pom.currentVersion}/car">
+ <import>
+ <uri>geronimo/j2ee-server/${geronimo_version}/car</uri>
+ </import>
+ <import>
+ <groupId>geronimo</groupId>
+ <type>car</type>
+ <artifactId>openejb</artifactId>
+ <version>${geronimo_version}</version>
+ </import>
<module>
<java>appclient_dep_resref_single_client.jar</java>
Modified: geronimo/branches/1.1/modules/upgrade/src/test-data/appclient_dep_1_result.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/upgrade/src/test-data/appclient_dep_1_result.xml?rev=396178&r1=396177&r2=396178&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/upgrade/src/test-data/appclient_dep_1_result.xml (original)
+++ geronimo/branches/1.1/modules/upgrade/src/test-data/appclient_dep_1_result.xml Sat Apr 22 16:13:41 2006
@@ -13,6 +13,18 @@
<dep:version>${pom.currentVersion}</dep:version>
<dep:type>car</dep:type>
</dep:dependency>
+ <dep:dependency>
+ <dep:groupId>geronimo</dep:groupId>
+ <dep:artifactId>j2ee-server</dep:artifactId>
+ <dep:version>${geronimo_version}</dep:version>
+ <dep:type>car</dep:type>
+ </dep:dependency>
+ <dep:dependency>
+ <dep:groupId>geronimo</dep:groupId>
+ <dep:artifactId>j2ee-security</dep:artifactId>
+ <dep:version>${geronimo_version}</dep:version>
+ <dep:type>car</dep:type>
+ </dep:dependency>
</dep:dependencies>
<dep:hidden-classes/>
<dep:non-overridable-classes/>