Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 30001 invoked from network); 19 Jul 2006 01:49:19 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 19 Jul 2006 01:49:19 -0000 Received: (qmail 25320 invoked by uid 500); 19 Jul 2006 01:49:18 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 25312 invoked by uid 500); 19 Jul 2006 01:49:18 -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 25301 invoked by uid 99); 19 Jul 2006 01:49:18 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 18 Jul 2006 18:49:18 -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-SPF: pass (asf.osuosl.org: local policy) Received: from [140.211.166.113] (HELO eris.apache.org) (140.211.166.113) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 18 Jul 2006 18:49:17 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id E38A81A981A; Tue, 18 Jul 2006 18:48:57 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r423337 - in /geronimo/sandbox/svkmerge/m2migration/modules/connector-builder: ./ src/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java Date: Wed, 19 Jul 2006 01:48:57 -0000 To: scm@geronimo.apache.org From: jdillon@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20060719014857.E38A81A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: jdillon Date: Tue Jul 18 18:48:57 2006 New Revision: 423337 URL: http://svn.apache.org/viewvc?rev=423337&view=rev Log: Update from trunk Modified: geronimo/sandbox/svkmerge/m2migration/modules/connector-builder/ (props changed) geronimo/sandbox/svkmerge/m2migration/modules/connector-builder/src/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java Propchange: geronimo/sandbox/svkmerge/m2migration/modules/connector-builder/ ------------------------------------------------------------------------------ --- svk:merge (added) +++ svk:merge Tue Jul 18 18:48:57 2006 @@ -0,0 +1 @@ +13f79535-47bb-0310-9956-ffa450edef68:/geronimo/sandbox/svkmerge/trunk/modules/connector-builder:421368 Modified: geronimo/sandbox/svkmerge/m2migration/modules/connector-builder/src/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/modules/connector-builder/src/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java?rev=423337&r1=423336&r2=423337&view=diff ============================================================================== --- geronimo/sandbox/svkmerge/m2migration/modules/connector-builder/src/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java (original) +++ geronimo/sandbox/svkmerge/m2migration/modules/connector-builder/src/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java Tue Jul 18 18:48:57 2006 @@ -261,6 +261,9 @@ // add the manifest classpath entries declared in the connector to the class loader // we have to explicitly add these since we are unpacking the connector module // and the url class loader will not pick up a manifiest from an unpacked dir + // N.B. If we ever introduce a separate configuration/module for a rar inside an ear + // this will need to be modified to use "../" instead of module.getTargetPath(). + // See AbstractWebModuleBuilder. earContext.addManifestClassPath(moduleFile, URI.create(module.getTargetPath())); URI targetURI = URI.create(module.getTargetPath() + "/");