You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by jg...@apache.org on 2005/07/24 17:07:39 UTC
svn commit: r224625 -
/geronimo/trunk/modules/tomcat-builder/src/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java
Author: jgenender
Date: Sun Jul 24 08:07:38 2005
New Revision: 224625
URL: http://svn.apache.org/viewcvs?rev=224625&view=rev
Log:
Use raw webmodile class urls
Modified:
geronimo/trunk/modules/tomcat-builder/src/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java
Modified: geronimo/trunk/modules/tomcat-builder/src/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/tomcat-builder/src/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java?rev=224625&r1=224624&r2=224625&view=diff
==============================================================================
--- geronimo/trunk/modules/tomcat-builder/src/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java (original)
+++ geronimo/trunk/modules/tomcat-builder/src/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java Sun Jul 24 08:07:38 2005
@@ -36,6 +36,7 @@
import java.util.Set;
import java.util.jar.JarFile;
import java.util.zip.ZipEntry;
+
import javax.management.MalformedObjectNameException;
import javax.management.ObjectName;
import javax.security.jacc.WebResourcePermission;
@@ -59,7 +60,6 @@
import org.apache.geronimo.j2ee.j2eeobjectnames.J2eeContext;
import org.apache.geronimo.j2ee.j2eeobjectnames.J2eeContextImpl;
import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
-import org.apache.geronimo.kernel.Kernel;
import org.apache.geronimo.kernel.StoredObject;
import org.apache.geronimo.kernel.repository.Repository;
import org.apache.geronimo.naming.deployment.ENCConfigBuilder;
@@ -377,7 +377,7 @@
webModuleData.setAttribute("componentContext", compContext);
webModuleData.setAttribute("userTransaction", userTransaction);
//classpath may have been augmented with enhanced classes
- webModuleData.setAttribute("webClassPath", getFinalWebClasspath(webModule));
+ webModuleData.setAttribute("webClassPath", webModule.getWebClasspath());
// unsharableResources, applicationManagedSecurityResources
GBeanResourceEnvironmentBuilder rebuilder = new GBeanResourceEnvironmentBuilder(webModuleData);
ENCConfigBuilder.setResourceEnvironment(earContext, webModule.getModuleURI(), rebuilder, webApp.getResourceRefArray(), tomcatWebApp.getResourceRefArray());
@@ -855,23 +855,6 @@
}
}
}
- }
-
- private static URI[] getFinalWebClasspath(WebModule webModule) throws Exception {
-
- URI oldClassPath[] = webModule.getWebClasspath();
- String target = webModule.getTargetPath();
- URI cleanClassPath[] = new URI[oldClassPath.length];
-
- for (int i = 0; i < oldClassPath.length; i++) {
- String uri = oldClassPath[i].toString();
- if (uri.startsWith(target)) {
- cleanClassPath[i] = new URI(uri.substring(target.length() + 1));
- } else {
- cleanClassPath[i] = oldClassPath[i];
- }
- }
- return cleanClassPath;
}
private static void checkString(String pattern) throws DeploymentException {