geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdil...@apache.org
Subject svn commit: r423338 - in /geronimo/sandbox/svkmerge/m2migration/modules/web-builder: ./ src/java/org/apache/geronimo/web/deployment/AbstractWebModuleBuilder.java
Date Wed, 19 Jul 2006 01:49:44 GMT
Author: jdillon
Date: Tue Jul 18 18:49:44 2006
New Revision: 423338

URL: http://svn.apache.org/viewvc?rev=423338&view=rev
Log:
Update from trunk

Modified:
    geronimo/sandbox/svkmerge/m2migration/modules/web-builder/   (props changed)
    geronimo/sandbox/svkmerge/m2migration/modules/web-builder/src/java/org/apache/geronimo/web/deployment/AbstractWebModuleBuilder.java

Propchange: geronimo/sandbox/svkmerge/m2migration/modules/web-builder/
------------------------------------------------------------------------------
--- svk:merge (added)
+++ svk:merge Tue Jul 18 18:49:44 2006
@@ -0,0 +1 @@
+13f79535-47bb-0310-9956-ffa450edef68:/geronimo/sandbox/svkmerge/trunk/modules/web-builder:421368

Modified: geronimo/sandbox/svkmerge/m2migration/modules/web-builder/src/java/org/apache/geronimo/web/deployment/AbstractWebModuleBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/modules/web-builder/src/java/org/apache/geronimo/web/deployment/AbstractWebModuleBuilder.java?rev=423338&r1=423337&r2=423338&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/modules/web-builder/src/java/org/apache/geronimo/web/deployment/AbstractWebModuleBuilder.java
(original)
+++ geronimo/sandbox/svkmerge/m2migration/modules/web-builder/src/java/org/apache/geronimo/web/deployment/AbstractWebModuleBuilder.java
Tue Jul 18 18:49:44 2006
@@ -86,6 +86,13 @@
     protected static final AbstractNameQuery ENTITY_BEAN_PATTERN;
     protected final Kernel kernel;
 
+    /**
+     * Manifest classpath entries in a war configuration must be resolved relative to the
war configuration, not the
+     * enclosing ear configuration.  Resolving relative to he war configuration using this
offset produces the same
+     * effect as URI.create(module.targetPath()).resolve(mcpEntry) executed in the ear configuration.
+     */
+    private static final URI RELATIVE_MODULE_BASE_URI = URI.create("../");
+
     protected AbstractWebModuleBuilder(Kernel kernel) {
         this.kernel = kernel;
     }
@@ -226,7 +233,7 @@
             // add the manifest classpath entries declared in the war to the class loader
             // we have to explicitly add these since we are unpacking the web module
             // and the url class loader will not pick up a manifest from an unpacked dir
-            moduleContext.addManifestClassPath(warFile, URI.create(module.getTargetPath()));
+            moduleContext.addManifestClassPath(warFile, RELATIVE_MODULE_BASE_URI);
 
         } catch (IOException e) {
             throw new DeploymentException("Problem deploying war", e);



Mime
View raw message