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 2006/01/11 23:46:30 UTC

svn commit: r368154 - /geronimo/branches/1.0/modules/tomcat-builder/src/test/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilderTest.java

Author: jgenender
Date: Wed Jan 11 14:46:25 2006
New Revision: 368154

URL: http://svn.apache.org/viewcvs?rev=368154&view=rev
Log:
Fix TomcatModuleBuilder webservices unit test

Modified:
    geronimo/branches/1.0/modules/tomcat-builder/src/test/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilderTest.java

Modified: geronimo/branches/1.0/modules/tomcat-builder/src/test/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilderTest.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/modules/tomcat-builder/src/test/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilderTest.java?rev=368154&r1=368153&r2=368154&view=diff
==============================================================================
--- geronimo/branches/1.0/modules/tomcat-builder/src/test/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilderTest.java (original)
+++ geronimo/branches/1.0/modules/tomcat-builder/src/test/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilderTest.java Wed Jan 11 14:46:25 2006
@@ -160,7 +160,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(path);
+        UnpackedJarFile jarFile = new UnpackedJarFile(dest);
         Module module = builder.createModule(null, jarFile);
         URI id = new URI(warName);
 
@@ -186,7 +186,7 @@
         earContext.close();
         module.close();
         GBeanData configData = earContext.getConfigurationGBeanData();
-        configData.setAttribute("baseURL", path.toURL());
+        configData.setAttribute("baseURL", outputPath.toURL());
         kernel.loadGBean(configData, cl);
         ObjectName configName = configData.getName();
         kernel.startGBean(configName);
@@ -391,7 +391,7 @@
 
         WebServiceBuilder webServiceBuilder = new AxisBuilder();
 
-        builder = new TomcatModuleBuilder(new URI[] {new URI("null")}, false, containerName, webServiceBuilder, null);
+        builder = new TomcatModuleBuilder(new URI[] {new URI("null")}, true, containerName, webServiceBuilder, null);
 
         // Default Realm
         Map initParams = new HashMap();