svn commit: r382110 - in /geronimo/branches/1.1/modules: deployment/src/java/org/apache/geronimo/deployment/util/ tomcat-builder/src/java/org/apache/geronimo/tomcat/deployment/ tomcat-builder/src/test/org/apache/geronimo/tomcat/deployment/

[dj...@apache.org]

Author: djencks
Date: Wed Mar  1 10:11:56 2006
New Revision: 382110

URL: http://svn.apache.org/viewcvs?rev=382110&view=rev
Log:
fix a problem with classloaders for deploying exploded wars, and fix web services deployment on tomcat.

Modified:
    geronimo/branches/1.1/modules/deployment/src/java/org/apache/geronimo/deployment/util/DeploymentUtil.java
    geronimo/branches/1.1/modules/tomcat-builder/src/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java
    geronimo/branches/1.1/modules/tomcat-builder/src/test/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilderTest.java

Modified: geronimo/branches/1.1/modules/deployment/src/java/org/apache/geronimo/deployment/util/DeploymentUtil.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/deployment/src/java/org/apache/geronimo/deployment/util/DeploymentUtil.java?rev=382110&r1=382109&r2=382110&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/deployment/src/java/org/apache/geronimo/deployment/util/DeploymentUtil.java (original)
+++ geronimo/branches/1.1/modules/deployment/src/java/org/apache/geronimo/deployment/util/DeploymentUtil.java Wed Mar  1 10:11:56 2006
@@ -253,10 +253,9 @@
             return;
         }
         for (int i = 0; i < files.length; i++) {
+            collection.add(files[i]);
             if (files[i].isDirectory()) {
                 listRecursiveFiles(files[i], collection);
-            } else {
-                collection.add(files[i]);
             }
         }
     }

Modified: geronimo/branches/1.1/modules/tomcat-builder/src/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/tomcat-builder/src/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java?rev=382110&r1=382109&r2=382110&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/tomcat-builder/src/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java (original)
+++ geronimo/branches/1.1/modules/tomcat-builder/src/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java Wed Mar  1 10:11:56 2006
@@ -380,7 +380,7 @@
                             throw new DeploymentException("No web service deployment info for servlet name " + servletName);
                         }
 
-                        StoredObject wsContainer = configurePOJO(webModule.getModuleFile(), portInfo, servletClassName, cl);
+                        StoredObject wsContainer = configurePOJO(webModule.getModuleFile(), portInfo, servletClassName, moduleClassLoader);
                         webServices.put(servletName, wsContainer);
                     }
                 }

Modified: geronimo/branches/1.1/modules/tomcat-builder/src/test/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilderTest.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/tomcat-builder/src/test/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilderTest.java?rev=382110&r1=382109&r2=382110&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/tomcat-builder/src/test/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilderTest.java (original)
+++ geronimo/branches/1.1/modules/tomcat-builder/src/test/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilderTest.java Wed Mar  1 10:11:56 2006
@@ -157,7 +157,7 @@
         deployWar("war4", "foo/bar/1/car");
     }
 
-    public void XtestDeployWar5() throws Exception {
+    public void testDeployWar5() throws Exception {
         deployWar("war5", "test/foo/1/car");
     }
 
@@ -170,7 +170,7 @@
         File path = new File(basedir, "src/test-resources/deployables/" + warName);
         File dest = new File(basedir, "target/test-resources/deployables/" + warName + "/war");
         recursiveCopy(path, dest);
-        UnpackedJarFile jarFile = new UnpackedJarFile(dest);
+        UnpackedJarFile jarFile = new UnpackedJarFile(path);
         Module module = builder.createModule(null, jarFile);
 
         ObjectName jaccBeanName = NameFactory.getComponentName(null, null, null, null, "foo", NameFactory.JACC_MANAGER, moduleContext);
@@ -191,6 +191,7 @@
         ObjectName serverName = earContext.getServerObjectName();
         GBeanData server = new GBeanData(serverName, J2EEServerImpl.GBEAN_INFO);
         start(server);
+        builder.installModule(jarFile, earContext, module, new MockConfigStore());
         builder.initContext(earContext, module, cl);
         builder.addGBeans(earContext, module, cl, null);
         earContext.close();