geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sppa...@apache.org
Subject svn commit: r436814 - in /geronimo/server/branches/sachin/modules/jetty-builder/src/test/java/org/apache/geronimo/jetty/deployment: JettyModuleBuilderTest.java PlanParsingTest.java
Date Fri, 25 Aug 2006 14:30:54 GMT
Author: sppatel
Date: Fri Aug 25 07:30:53 2006
New Revision: 436814

URL: http://svn.apache.org/viewvc?rev=436814&view=rev
Log:
fix tests to use DeployableModule

Modified:
    geronimo/server/branches/sachin/modules/jetty-builder/src/test/java/org/apache/geronimo/jetty/deployment/JettyModuleBuilderTest.java
    geronimo/server/branches/sachin/modules/jetty-builder/src/test/java/org/apache/geronimo/jetty/deployment/PlanParsingTest.java

Modified: geronimo/server/branches/sachin/modules/jetty-builder/src/test/java/org/apache/geronimo/jetty/deployment/JettyModuleBuilderTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/modules/jetty-builder/src/test/java/org/apache/geronimo/jetty/deployment/JettyModuleBuilderTest.java?rev=436814&r1=436813&r2=436814&view=diff
==============================================================================
--- geronimo/server/branches/sachin/modules/jetty-builder/src/test/java/org/apache/geronimo/jetty/deployment/JettyModuleBuilderTest.java
(original)
+++ geronimo/server/branches/sachin/modules/jetty-builder/src/test/java/org/apache/geronimo/jetty/deployment/JettyModuleBuilderTest.java
Fri Aug 25 07:30:53 2006
@@ -40,6 +40,8 @@
 import org.apache.geronimo.connector.outbound.connectiontracking.ConnectionTrackingCoordinatorGBean;
 import org.apache.geronimo.deployment.DeploymentContext;
 import org.apache.geronimo.deployment.ModuleIDBuilder;
+import org.apache.geronimo.deployment.DeployableModule;
+import org.apache.geronimo.deployment.DeployableModuleFactory;
 import org.apache.geronimo.deployment.service.GBeanBuilder;
 import org.apache.geronimo.deployment.util.DeploymentUtil;
 import org.apache.geronimo.deployment.util.UnpackedJarFile;
@@ -115,7 +117,8 @@
         new File(outputPath, "war").mkdir();
         File path = new File(BASEDIR, "src/test/resources/deployables/war4");
         UnpackedJarFile jarFile = new UnpackedJarFile(path);
-        Module module = builder.createModule(null, jarFile, kernel.getNaming(), new ModuleIDBuilder());
+        DeployableModule dm = DeployableModuleFactory.createDeployableModule(jarFile);
+        Module module = builder.createModule(null, dm, kernel.getNaming(), new ModuleIDBuilder());
         Repository repository = null;
 
         AbstractName moduleName = module.getModuleName();
@@ -152,7 +155,8 @@
         new File(outputPath, "war").mkdir();
         File path = new File(BASEDIR, "src/test/resources/deployables/war-spaces-in-context");
         UnpackedJarFile jarFile = new UnpackedJarFile(path);
-        Module module = builder.createModule(null, jarFile, kernel.getNaming(), new ModuleIDBuilder());
+        DeployableModule dm = DeployableModuleFactory.createDeployableModule(jarFile);
+        Module module = builder.createModule(null, dm, kernel.getNaming(), new ModuleIDBuilder());
         Repository repository = null;
 
         AbstractName moduleName = module.getModuleName();

Modified: geronimo/server/branches/sachin/modules/jetty-builder/src/test/java/org/apache/geronimo/jetty/deployment/PlanParsingTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/modules/jetty-builder/src/test/java/org/apache/geronimo/jetty/deployment/PlanParsingTest.java?rev=436814&r1=436813&r2=436814&view=diff
==============================================================================
--- geronimo/server/branches/sachin/modules/jetty-builder/src/test/java/org/apache/geronimo/jetty/deployment/PlanParsingTest.java
(original)
+++ geronimo/server/branches/sachin/modules/jetty-builder/src/test/java/org/apache/geronimo/jetty/deployment/PlanParsingTest.java
Fri Aug 25 07:30:53 2006
@@ -8,6 +8,8 @@
 import org.apache.geronimo.deployment.xmlbeans.XmlBeansUtil;
 import org.apache.geronimo.deployment.service.ServiceConfigBuilder;
 import org.apache.geronimo.deployment.service.GBeanBuilder;
+import org.apache.geronimo.deployment.DeployableModule;
+import org.apache.geronimo.deployment.DeployableModuleFactory;
 import org.apache.geronimo.gbean.AbstractName;
 import org.apache.geronimo.gbean.AbstractNameQuery;
 import org.apache.geronimo.j2ee.deployment.WebServiceBuilder;
@@ -100,7 +102,8 @@
         URL war = classLoader.getResource("deployables/war5");
         assertTrue(war != null);
         UnpackedJarFile moduleFile = new UnpackedJarFile(new File(war.getFile()));
-        JettyWebAppType jettyWebApp = builder.getJettyWebApp(null, moduleFile, true, null,
null);
+        DeployableModule dm = DeployableModuleFactory.createDeployableModule(moduleFile);
+        JettyWebAppType jettyWebApp = builder.getJettyWebApp(null, dm, true, null, null);
         moduleFile.close();
         assertEquals(1, jettyWebApp.getResourceRefArray().length);
     }
@@ -109,7 +112,8 @@
         URL war = classLoader.getResource("deployables/war6.war");
         assertTrue(war != null);
         JarFile moduleFile = new JarFile(new File(war.getFile()));
-        JettyWebAppType jettyWebApp = builder.getJettyWebApp(null, moduleFile, true, null,
null);
+        DeployableModule dm = DeployableModuleFactory.createDeployableModule(moduleFile);
+        JettyWebAppType jettyWebApp = builder.getJettyWebApp(null, dm, true, null, null);
         moduleFile.close();
         assertEquals(1, jettyWebApp.getResourceRefArray().length);
     }
@@ -151,8 +155,8 @@
         URL war = classLoader.getResource("deployables/war2.war");
         assertTrue(war != null);
         JarFile dummyFile = new JarFile(new File(war.getFile()));
-
-        webApp = builder.getJettyWebApp(webApp, dummyFile, true, null, null);
+        DeployableModule dm = DeployableModuleFactory.createDeployableModule(dummyFile);
+        webApp = builder.getJettyWebApp(webApp, dm, true, null, null);
 
         assertEquals("myContextRoot", webApp.getContextRoot());
 
@@ -163,7 +167,8 @@
         URL war = classLoader.getResource("deployables/war2.war");
         assertTrue(war != null);
         JarFile dummyFile = new JarFile(new File(war.getFile()));
-        JettyWebAppType GerWebAppType = builder.getJettyWebApp(null, dummyFile, true, null,
null);
+        DeployableModule dm = DeployableModuleFactory.createDeployableModule(dummyFile);
+        JettyWebAppType GerWebAppType = builder.getJettyWebApp(null, dm, true, null, null);
 
         assertEquals("war2", GerWebAppType.getContextRoot());
 
@@ -174,7 +179,8 @@
         URL war = classLoader.getResource("deployables/war2.war");
         assertTrue(war != null);
         JarFile dummyFile = new JarFile(new File(war.getFile()));
-        JettyWebAppType GerWebAppType = builder.getJettyWebApp(null, dummyFile, false, "myTargetPath",
null);
+        DeployableModule dm = DeployableModuleFactory.createDeployableModule(dummyFile);
+        JettyWebAppType GerWebAppType = builder.getJettyWebApp(null, dm, false, "myTargetPath",
null);
 
         assertEquals("myTargetPath", GerWebAppType.getContextRoot());
 
@@ -189,7 +195,8 @@
         URL war = classLoader.getResource("deployables/war2.war");
         assertTrue(war != null);
         JarFile dummyFile = new JarFile(new File(war.getFile()));
-        JettyWebAppType GerWebAppType = builder.getJettyWebApp(null, dummyFile, false, "myTargetPath",
webAppType);
+        DeployableModule dm = DeployableModuleFactory.createDeployableModule(dummyFile);
+        JettyWebAppType GerWebAppType = builder.getJettyWebApp(null, dm, false, "myTargetPath",
webAppType);
 
         assertEquals("myId", GerWebAppType.getContextRoot());
 



Mime
View raw message