You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by sp...@apache.org on 2006/08/25 15:58:39 UTC
svn commit: r436795 - in
/geronimo/server/branches/sachin/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment:
EARConfigBuilderTest.java MockConnectorConfigBuilder.java
MockEJBConfigBuilder.java MockWARConfigBuilder.java
Author: sppatel
Date: Fri Aug 25 06:58:38 2006
New Revision: 436795
URL: http://svn.apache.org/viewvc?rev=436795&view=rev
Log:
fix tests to use DeployableModule
Modified:
geronimo/server/branches/sachin/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/EARConfigBuilderTest.java
geronimo/server/branches/sachin/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/MockConnectorConfigBuilder.java
geronimo/server/branches/sachin/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/MockEJBConfigBuilder.java
geronimo/server/branches/sachin/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/MockWARConfigBuilder.java
Modified: geronimo/server/branches/sachin/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/EARConfigBuilderTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/EARConfigBuilderTest.java?rev=436795&r1=436794&r2=436795&view=diff
==============================================================================
--- geronimo/server/branches/sachin/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/EARConfigBuilderTest.java (original)
+++ geronimo/server/branches/sachin/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/EARConfigBuilderTest.java Fri Aug 25 06:58:38 2006
@@ -36,9 +36,7 @@
import junit.framework.TestSuite;
import org.apache.geronimo.common.DeploymentException;
-import org.apache.geronimo.deployment.DeploymentContext;
-import org.apache.geronimo.deployment.ModuleIDBuilder;
-import org.apache.geronimo.deployment.NamespaceDrivenBuilder;
+import org.apache.geronimo.deployment.*;
import org.apache.geronimo.deployment.util.DeploymentUtil;
import org.apache.geronimo.gbean.AbstractName;
import org.apache.geronimo.gbean.AbstractNameQuery;
@@ -66,7 +64,7 @@
private static final File basedir = new File(System.getProperty("basedir", System.getProperty("user.dir")));
private static String WEB_NAMESPACE = "foo";
- private static JarFile earFile;
+ private static DeployableModule earModule;
private static MockConfigStore configStore = new MockConfigStore();
private static ArtifactManager artifactManager = new DefaultArtifactManager();
private static ArtifactResolver artifactResolver = new DefaultArtifactResolver(artifactManager, Collections.EMPTY_SET, null);
@@ -121,7 +119,8 @@
TestSuite inner = new TestSuite(EARConfigBuilderTest.class);
TestSetup setup14 = new TestSetup(inner) {
protected void setUp() throws Exception {
- earFile = DeploymentUtil.createJarFile(new File(basedir, "target/test-ear14/test-ear.ear"));
+ JarFile ear = DeploymentUtil.createJarFile(new File(basedir, "target/test-ear14/test-ear.ear"));
+ earModule = DeployableModuleFactory.createDeployableModule(ear);
ejbConfigBuilder.ejbModule = new EJBModule(false, ejbModuleName, null, null, "test-ejb-jar.jar", null, null, null);
webConfigBuilder.contextRoot = contextRoot;
webConfigBuilder.webModule = new WebModule(false, webModuleName, null, null, "test-war.war", null, null, null, contextRoot, portMap, WEB_NAMESPACE);
@@ -129,7 +128,7 @@
}
protected void tearDown() {
- DeploymentUtil.close(earFile);
+ earModule.cleanup();
close(ejbConfigBuilder.ejbModule);
close(webConfigBuilder.webModule);
close(connectorConfigBuilder.connectorModule);
@@ -137,7 +136,8 @@
};
TestSetup setupNaked14 = new TestSetup(inner) {
protected void setUp() throws Exception {
- earFile = DeploymentUtil.createJarFile(new File(basedir, "target/test-ear14/test-naked-ear.ear"));
+ JarFile ear = DeploymentUtil.createJarFile(new File(basedir, "target/test-ear14/test-naked-ear.ear"));
+ earModule = DeployableModuleFactory.createDeployableModule(ear);
ejbConfigBuilder.ejbModule = new EJBModule(false, ejbModuleName, null, null, "test-ejb-jar.jar", null, null, null);
webConfigBuilder.contextRoot = contextRoot;
webConfigBuilder.webModule = new WebModule(false, webModuleName, null, null, "test-war.war", null, null, null, contextRoot, portMap, WEB_NAMESPACE);
@@ -145,7 +145,7 @@
}
protected void tearDown() {
- DeploymentUtil.close(earFile);
+ earModule.cleanup();
close(ejbConfigBuilder.ejbModule);
close(webConfigBuilder.webModule);
close(connectorConfigBuilder.connectorModule);
@@ -153,7 +153,8 @@
};
TestSetup setup13 = new TestSetup(inner) {
protected void setUp() throws Exception {
- earFile = DeploymentUtil.createJarFile(new File(basedir, "target/test-ear13/test-ear.ear"));
+ JarFile ear = DeploymentUtil.createJarFile(new File(basedir, "target/test-ear13/test-ear.ear"));
+ earModule = DeployableModuleFactory.createDeployableModule(ear);
ejbConfigBuilder.ejbModule = new EJBModule(false, ejbModuleName, null, null, "test-ejb-jar.jar", null, null, null);
webConfigBuilder.contextRoot = contextRoot;
webConfigBuilder.webModule = new WebModule(false, webModuleName, null, null, "test-war.war", null, null, null, contextRoot, portMap, WEB_NAMESPACE);
@@ -161,7 +162,7 @@
}
protected void tearDown() {
- DeploymentUtil.close(earFile);
+ earModule.cleanup();
close(ejbConfigBuilder.ejbModule);
close(webConfigBuilder.webModule);
close(connectorConfigBuilder.connectorModule);
@@ -169,7 +170,8 @@
};
TestSetup setupNaked13 = new TestSetup(inner) {
protected void setUp() throws Exception {
- earFile = DeploymentUtil.createJarFile(new File(basedir, "target/test-ear13/test-naked-ear.ear"));
+ JarFile ear = DeploymentUtil.createJarFile(new File(basedir, "target/test-ear13/test-naked-ear.ear"));
+ earModule = DeployableModuleFactory.createDeployableModule(ear);
ejbConfigBuilder.ejbModule = new EJBModule(false, ejbModuleName, null, null, "test-ejb-jar.jar", null, null, null);
webConfigBuilder.contextRoot = contextRoot;
webConfigBuilder.webModule = new WebModule(false, webModuleName, null, null, "test-war.war", null, null, null, contextRoot, portMap, WEB_NAMESPACE);
@@ -177,7 +179,7 @@
}
protected void tearDown() {
- DeploymentUtil.close(earFile);
+ earModule.cleanup();
close(ejbConfigBuilder.ejbModule);
close(webConfigBuilder.webModule);
close(connectorConfigBuilder.connectorModule);
@@ -185,7 +187,8 @@
};
TestSetup setupUnpacked = new TestSetup(inner) {
protected void setUp() throws Exception {
- earFile = DeploymentUtil.createJarFile(new File(basedir, "target/test-unpacked-ear/full/"));
+ JarFile ear = DeploymentUtil.createJarFile(new File(basedir, "target/test-unpacked-ear/full/"));
+ earModule = DeployableModuleFactory.createDeployableModule(ear);
ejbConfigBuilder.ejbModule = new EJBModule(false, ejbModuleName, null, null, "test-ejb-jar.jar/", null, null, null);
webConfigBuilder.contextRoot = contextRoot;
webConfigBuilder.webModule = new WebModule(false, webModuleName, null, null, "test-war.war/", null, null, null, contextRoot, portMap, WEB_NAMESPACE);
@@ -193,7 +196,7 @@
}
protected void tearDown() {
- DeploymentUtil.close(earFile);
+ earModule.cleanup();
close(ejbConfigBuilder.ejbModule);
close(webConfigBuilder.webModule);
close(connectorConfigBuilder.connectorModule);
@@ -201,7 +204,8 @@
};
TestSetup setupUnpackedNaked = new TestSetup(inner) {
protected void setUp() throws Exception {
- earFile = DeploymentUtil.createJarFile(new File(basedir, "target/test-unpacked-ear/naked/"));
+ JarFile ear = DeploymentUtil.createJarFile(new File(basedir, "target/test-unpacked-ear/naked/"));
+ earModule = DeployableModuleFactory.createDeployableModule(ear);
ejbConfigBuilder.ejbModule = new EJBModule(false, ejbModuleName, null, null, "test-ejb-jar.jar/", null, null, null);
webConfigBuilder.contextRoot = contextRoot;
webConfigBuilder.webModule = new WebModule(false, webModuleName, null, null, "test-war.war", null, null, null, contextRoot, portMap, WEB_NAMESPACE);
@@ -209,7 +213,7 @@
}
protected void tearDown() {
- DeploymentUtil.close(earFile);
+ earModule.cleanup();
close(ejbConfigBuilder.ejbModule);
close(webConfigBuilder.webModule);
close(connectorConfigBuilder.connectorModule);
@@ -217,7 +221,8 @@
};
TestSetup setupUnpackedAltDD = new TestSetup(inner) {
protected void setUp() throws Exception {
- earFile = DeploymentUtil.createJarFile(new File(basedir, "target/test-unpacked-ear/alt-dd/"));
+ JarFile ear = DeploymentUtil.createJarFile(new File(basedir, "target/test-unpacked-ear/alt-dd/"));
+ earModule = DeployableModuleFactory.createDeployableModule(ear);
ejbConfigBuilder.ejbModule = new EJBModule(false, ejbModuleName, null, null, "test-ejb-jar.jar/", null, null, null);
webConfigBuilder.contextRoot = contextRoot;
webConfigBuilder.webModule = new WebModule(false, webModuleName, null, null, "test-war.war/", null, null, null, contextRoot, portMap, WEB_NAMESPACE);
@@ -225,7 +230,7 @@
}
protected void tearDown() {
- DeploymentUtil.close(earFile);
+ earModule.cleanup();
close(ejbConfigBuilder.ejbModule);
close(webConfigBuilder.webModule);
close(connectorConfigBuilder.connectorModule);
@@ -233,7 +238,8 @@
};
TestSetup setupPackedAltDD = new TestSetup(inner) {
protected void setUp() throws Exception {
- earFile = DeploymentUtil.createJarFile(new File(basedir, "target/test-unpacked-ear/alt-dd.ear"));
+ JarFile ear = DeploymentUtil.createJarFile(new File(basedir, "target/test-unpacked-ear/alt-dd.ear"));
+ earModule = DeployableModuleFactory.createDeployableModule(ear);
ejbConfigBuilder.ejbModule = new EJBModule(false, ejbModuleName, null, null, "test-ejb-jar.jar/", null, null, null);
webConfigBuilder.contextRoot = contextRoot;
webConfigBuilder.webModule = new WebModule(false, webModuleName, null, null, "test-war.war/", null, null, null, contextRoot, portMap, WEB_NAMESPACE);
@@ -241,7 +247,7 @@
}
protected void tearDown() {
- DeploymentUtil.close(earFile);
+ earModule.cleanup();
close(ejbConfigBuilder.ejbModule);
close(webConfigBuilder.webModule);
close(connectorConfigBuilder.connectorModule);
@@ -283,8 +289,8 @@
serviceBuilder,
naming);
- Object plan = configBuilder.getDeploymentPlan(null, earFile, idBuilder);
- context = configBuilder.buildConfiguration(false, configBuilder.getConfigurationID(plan, earFile, idBuilder), plan, earFile, Collections.singleton(configStore), artifactResolver, configStore);
+ Object plan = configBuilder.getDeploymentPlan(null, earModule, idBuilder);
+ context = configBuilder.buildConfiguration(false, configBuilder.getConfigurationID(plan, earModule, idBuilder), plan, earModule, Collections.singleton(configStore), artifactResolver, configStore);
configurationData = getConfigurationData(context);
} finally {
if (context != null) {
@@ -319,8 +325,8 @@
ConfigurationData configurationData = null;
DeploymentContext context = null;
try {
- Object plan = configBuilder.getDeploymentPlan(new File(basedir, "target/plans/test-bad-ejb-jar.xml"), earFile, idBuilder);
- context = configBuilder.buildConfiguration(false, configBuilder.getConfigurationID(plan, earFile, idBuilder), plan, earFile, Collections.singleton(configStore), artifactResolver, configStore);
+ Object plan = configBuilder.getDeploymentPlan(new File(basedir, "target/plans/test-bad-ejb-jar.xml"), earModule, idBuilder);
+ context = configBuilder.buildConfiguration(false, configBuilder.getConfigurationID(plan, earModule, idBuilder), plan, earModule, Collections.singleton(configStore), artifactResolver, configStore);
configurationData = getConfigurationData(context);
fail("Should have thrown a DeploymentException");
} catch (DeploymentException e) {
@@ -360,8 +366,8 @@
ConfigurationData configurationData = null;
DeploymentContext context = null;
try {
- Object plan = configBuilder.getDeploymentPlan(new File(basedir, "target/plans/test-bad-war.xml"), earFile, idBuilder);
- context = configBuilder.buildConfiguration(false, configBuilder.getConfigurationID(plan, earFile, idBuilder), plan, earFile, Collections.singleton(configStore), artifactResolver, configStore);
+ Object plan = configBuilder.getDeploymentPlan(new File(basedir, "target/plans/test-bad-war.xml"), earModule, idBuilder);
+ context = configBuilder.buildConfiguration(false, configBuilder.getConfigurationID(plan, earModule, idBuilder), plan, earModule, Collections.singleton(configStore), artifactResolver, configStore);
configurationData = getConfigurationData(context);
fail("Should have thrown a DeploymentException");
} catch (DeploymentException e) {
@@ -401,8 +407,8 @@
ConfigurationData configurationData = null;
DeploymentContext context = null;
try {
- Object plan = configBuilder.getDeploymentPlan(new File(basedir, "target/plans/test-bad-rar.xml"), earFile, idBuilder);
- context = configBuilder.buildConfiguration(false, configBuilder.getConfigurationID(plan, earFile, idBuilder), plan, earFile, Collections.singleton(configStore), artifactResolver, configStore);
+ Object plan = configBuilder.getDeploymentPlan(new File(basedir, "target/plans/test-bad-rar.xml"), earModule, idBuilder);
+ context = configBuilder.buildConfiguration(false, configBuilder.getConfigurationID(plan, earModule, idBuilder), plan, earModule, Collections.singleton(configStore), artifactResolver, configStore);
configurationData = getConfigurationData(context);
fail("Should have thrown a DeploymentException");
} catch (DeploymentException e) {
@@ -442,8 +448,8 @@
ConfigurationData configurationData = null;
DeploymentContext context = null;
try {
- Object plan = configBuilder.getDeploymentPlan(new File(basedir, "target/plans/test-bad-car.xml"), earFile, idBuilder);
- context = configBuilder.buildConfiguration(false, configBuilder.getConfigurationID(plan, earFile, idBuilder), plan, earFile, Collections.singleton(configStore), artifactResolver, configStore);
+ Object plan = configBuilder.getDeploymentPlan(new File(basedir, "target/plans/test-bad-car.xml"), earModule, idBuilder);
+ context = configBuilder.buildConfiguration(false, configBuilder.getConfigurationID(plan, earModule, idBuilder), plan, earModule, Collections.singleton(configStore), artifactResolver, configStore);
configurationData = getConfigurationData(context);
fail("Should have thrown a DeploymentException");
} catch (DeploymentException e) {
@@ -484,8 +490,8 @@
ConfigurationData configurationData = null;
DeploymentContext context = null;
try {
- Object plan = configBuilder.getDeploymentPlan(null, earFile, idBuilder);
- context = configBuilder.buildConfiguration(false, configBuilder.getConfigurationID(plan, earFile, idBuilder), plan, earFile, Collections.singleton(configStore), artifactResolver, configStore);
+ Object plan = configBuilder.getDeploymentPlan(null, earModule, idBuilder);
+ context = configBuilder.buildConfiguration(false, configBuilder.getConfigurationID(plan, earModule, idBuilder), plan, earModule, Collections.singleton(configStore), artifactResolver, configStore);
configurationData = getConfigurationData(context);
fail("Should have thrown a DeploymentException");
} catch (DeploymentException e) {
@@ -523,8 +529,8 @@
ConfigurationData configurationData = null;
DeploymentContext context = null;
try {
- Object plan = configBuilder.getDeploymentPlan(null, earFile, idBuilder);
- context = configBuilder.buildConfiguration(false, configBuilder.getConfigurationID(plan, earFile, idBuilder), plan, earFile, Collections.singleton(configStore), artifactResolver, configStore);
+ Object plan = configBuilder.getDeploymentPlan(null, earModule, idBuilder);
+ context = configBuilder.buildConfiguration(false, configBuilder.getConfigurationID(plan, earModule, idBuilder), plan, earModule, Collections.singleton(configStore), artifactResolver, configStore);
configurationData = getConfigurationData(context);
fail("Should have thrown a DeploymentException");
} catch (DeploymentException e) {
@@ -562,8 +568,8 @@
ConfigurationData configurationData = null;
DeploymentContext context = null;
try {
- Object plan = configBuilder.getDeploymentPlan(null, earFile, idBuilder);
- context = configBuilder.buildConfiguration(false, configBuilder.getConfigurationID(plan, earFile, idBuilder), plan, earFile, Collections.singleton(configStore), artifactResolver, configStore);
+ Object plan = configBuilder.getDeploymentPlan(null, earModule, idBuilder);
+ context = configBuilder.buildConfiguration(false, configBuilder.getConfigurationID(plan, earModule, idBuilder), plan, earModule, Collections.singleton(configStore), artifactResolver, configStore);
configurationData = getConfigurationData(context);
fail("Should have thrown a DeploymentException");
} catch (DeploymentException e) {
Modified: geronimo/server/branches/sachin/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/MockConnectorConfigBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/MockConnectorConfigBuilder.java?rev=436795&r1=436794&r2=436795&view=diff
==============================================================================
--- geronimo/server/branches/sachin/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/MockConnectorConfigBuilder.java (original)
+++ geronimo/server/branches/sachin/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/MockConnectorConfigBuilder.java Fri Aug 25 06:58:38 2006
@@ -28,6 +28,7 @@
import org.apache.geronimo.kernel.Naming;
import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
import org.apache.geronimo.deployment.ModuleIDBuilder;
+import org.apache.geronimo.deployment.DeployableModule;
import javax.management.ObjectName;
import javax.naming.Reference;
@@ -44,18 +45,18 @@
private ClassLoader cl;
public Module connectorModule;
- public Module createModule(File plan, JarFile moduleFile, Naming naming, ModuleIDBuilder idBuilder) throws DeploymentException {
+ public Module createModule(File plan, DeployableModule moduleFile, Naming naming, ModuleIDBuilder idBuilder) throws DeploymentException {
AbstractName earName = naming.createRootName(new Artifact("test", "test-war", "", "rar"), NameFactory.NULL, NameFactory.J2EE_APPLICATION) ;
AbstractName moduleName = naming.createChildName(earName, "rar", NameFactory.RESOURCE_ADAPTER_MODULE);
return new ConnectorModule(true, moduleName, null, moduleFile, "connector", null, null, null);
}
- public Module createModule(Object plan, JarFile moduleFile, String targetPath, URL specDDUrl, Environment environment, Object moduleContextInfo, AbstractName earName, Naming naming, ModuleIDBuilder idBuilder) throws DeploymentException {
+ public Module createModule(Object plan, DeployableModule moduleFile, String targetPath, URL specDDUrl, Environment environment, Object moduleContextInfo, AbstractName earName, Naming naming, ModuleIDBuilder idBuilder) throws DeploymentException {
AbstractName moduleName = naming.createChildName(earName, "rar", NameFactory.RESOURCE_ADAPTER_MODULE);
return new ConnectorModule(false, moduleName, null, moduleFile, targetPath, null, null, null);
}
- public void installModule(JarFile earFile, EARContext earContext, Module connectorModule, Collection configurationStores, ConfigurationStore targetConfigurationStore, Collection repository) {
+ public void installModule(DeployableModule earFile, EARContext earContext, Module connectorModule, Collection configurationStores, ConfigurationStore targetConfigurationStore, Collection repository) {
assertNotNull(earFile);
assertNotNull(earContext);
this.earContext = earContext;
Modified: geronimo/server/branches/sachin/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/MockEJBConfigBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/MockEJBConfigBuilder.java?rev=436795&r1=436794&r2=436795&view=diff
==============================================================================
--- geronimo/server/branches/sachin/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/MockEJBConfigBuilder.java (original)
+++ geronimo/server/branches/sachin/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/MockEJBConfigBuilder.java Fri Aug 25 06:58:38 2006
@@ -27,6 +27,7 @@
import org.apache.geronimo.kernel.repository.Environment;
import org.apache.geronimo.kernel.Naming;
import org.apache.geronimo.deployment.ModuleIDBuilder;
+import org.apache.geronimo.deployment.DeployableModule;
import javax.naming.Reference;
import java.io.File;
@@ -44,18 +45,18 @@
private ClassLoader cl;
public EJBModule ejbModule;
- public Module createModule(File plan, JarFile moduleFile, Naming naming, ModuleIDBuilder idBuilder) throws DeploymentException {
+ public Module createModule(File plan, DeployableModule moduleFile, Naming naming, ModuleIDBuilder idBuilder) throws DeploymentException {
AbstractName earName = naming.createRootName(new Artifact("test", "test-ejb-jar", "", "jar"), NameFactory.NULL, NameFactory.J2EE_APPLICATION) ;
AbstractName moduleName = naming.createChildName(earName, "ejb-jar", NameFactory.EJB_MODULE);
return new EJBModule(true, moduleName, null, moduleFile, "ejb.jar", null, null, null);
}
- public Module createModule(Object plan, JarFile moduleFile, String targetPath, URL specDDUrl, Environment environment, Object moduleContextInfo, AbstractName earName, Naming naming, ModuleIDBuilder idBuilder) throws DeploymentException {
+ public Module createModule(Object plan, DeployableModule moduleFile, String targetPath, URL specDDUrl, Environment environment, Object moduleContextInfo, AbstractName earName, Naming naming, ModuleIDBuilder idBuilder) throws DeploymentException {
AbstractName moduleName = naming.createChildName(earName, "ejb-jar", NameFactory.EJB_MODULE);
return new EJBModule(false, moduleName, null, moduleFile, targetPath, null, null, null);
}
- public void installModule(JarFile earFile, EARContext earContext, Module ejbModule, Collection configurationStores, ConfigurationStore targetConfigurationStore, Collection repository) {
+ public void installModule(DeployableModule earFile, EARContext earContext, Module ejbModule, Collection configurationStores, ConfigurationStore targetConfigurationStore, Collection repository) {
assertNotNull(earFile);
assertNotNull(earContext);
this.earContext = earContext;
Modified: geronimo/server/branches/sachin/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/MockWARConfigBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/sachin/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/MockWARConfigBuilder.java?rev=436795&r1=436794&r2=436795&view=diff
==============================================================================
--- geronimo/server/branches/sachin/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/MockWARConfigBuilder.java (original)
+++ geronimo/server/branches/sachin/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/MockWARConfigBuilder.java Fri Aug 25 06:58:38 2006
@@ -25,6 +25,7 @@
import org.apache.geronimo.gbean.AbstractName;
import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
import org.apache.geronimo.deployment.ModuleIDBuilder;
+import org.apache.geronimo.deployment.DeployableModule;
import java.io.File;
import java.net.URL;
@@ -43,18 +44,18 @@
public WebModule webModule;
public String contextRoot;
- public Module createModule(File plan, JarFile moduleFile, Naming naming, ModuleIDBuilder idBuilder) throws DeploymentException {
+ public Module createModule(File plan, DeployableModule moduleFile, Naming naming, ModuleIDBuilder idBuilder) throws DeploymentException {
AbstractName earName = naming.createRootName(new Artifact("test", "test-war", "", "war"), NameFactory.NULL, NameFactory.J2EE_APPLICATION) ;
AbstractName moduleName = naming.createChildName(earName, "war", NameFactory.WEB_MODULE);
return new WebModule(true, moduleName, null, moduleFile, "war", null, null, null, contextRoot, portMap, namespace);
}
- public Module createModule(Object plan, JarFile moduleFile, String targetPath, URL specDDUrl, Environment environment, Object moduleContextInfo, AbstractName earName, Naming naming, ModuleIDBuilder idBuilder) throws DeploymentException {
+ public Module createModule(Object plan, DeployableModule moduleFile, String targetPath, URL specDDUrl, Environment environment, Object moduleContextInfo, AbstractName earName, Naming naming, ModuleIDBuilder idBuilder) throws DeploymentException {
AbstractName moduleName = naming.createChildName(earName, "war", NameFactory.WEB_MODULE);
return new WebModule(false, moduleName, null, moduleFile, targetPath, null, null, null, contextRoot, portMap, namespace);
}
- public void installModule(JarFile earFile, EARContext earContext, Module webModule, Collection configurationStores, ConfigurationStore targetConfigurationStore, Collection repository) throws DeploymentException {
+ public void installModule(DeployableModule earFile, EARContext earContext, Module webModule, Collection configurationStores, ConfigurationStore targetConfigurationStore, Collection repository) throws DeploymentException {
assertNotNull(earFile);
assertNotNull(earContext);
this.earContext = earContext;