Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 31507 invoked from network); 22 Apr 2006 23:14:07 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 22 Apr 2006 23:14:07 -0000 Received: (qmail 21309 invoked by uid 500); 22 Apr 2006 23:14:06 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 21286 invoked by uid 500); 22 Apr 2006 23:14:06 -0000 Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: dev@geronimo.apache.org List-Id: Delivered-To: mailing list scm@geronimo.apache.org Received: (qmail 21267 invoked by uid 99); 22 Apr 2006 23:14:06 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 22 Apr 2006 16:14:06 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.29) with SMTP; Sat, 22 Apr 2006 16:14:05 -0700 Received: (qmail 31454 invoked by uid 65534); 22 Apr 2006 23:13:45 -0000 Message-ID: <20060422231345.31447.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: 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 Date: Sat, 22 Apr 2006 23:13:44 -0000 To: scm@geronimo.apache.org From: djencks@apache.org X-Mailer: svnmailer-1.0.8 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N 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 @@ + + geronimo/j2ee-server/${geronimo_version}/car + + + geronimo + car + openejb + ${geronimo_version} + appclient_dep_resref_single_client.jar 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 @@ ${pom.currentVersion} car + + geronimo + j2ee-server + ${geronimo_version} + car + + + geronimo + j2ee-security + ${geronimo_version} + car +