You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dj...@apache.org on 2006/03/13 11:07:58 UTC
svn commit: r385487 [1/3] - in /geronimo/branches/1.1:
applications/console-core/src/java/org/apache/geronimo/console/util/
modules/axis-builder/src/test/org/apache/geronimo/axis/builder/
modules/client-builder/src/java/org/apache/geronimo/client/build...
Author: djencks
Date: Mon Mar 13 02:07:53 2006
New Revision: 385487
URL: http://svn.apache.org/viewcvs?rev=385487&view=rev
Log:
some refactoring, builders all build, tests don't
Modified:
geronimo/branches/1.1/applications/console-core/src/java/org/apache/geronimo/console/util/KernelManagementHelper.java
geronimo/branches/1.1/modules/axis-builder/src/test/org/apache/geronimo/axis/builder/ServiceReferenceTest.java
geronimo/branches/1.1/modules/client-builder/src/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.java
geronimo/branches/1.1/modules/connector-builder/src/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java
geronimo/branches/1.1/modules/connector-builder/src/test/org/apache/geronimo/connector/deployment/ConnectorModuleBuilderTest.java
geronimo/branches/1.1/modules/deployment/src/java/org/apache/geronimo/deployment/DeploymentContext.java
geronimo/branches/1.1/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/ApplicationInfo.java
geronimo/branches/1.1/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/AppClientModule.java
geronimo/branches/1.1/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/ConnectorModule.java
geronimo/branches/1.1/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java
geronimo/branches/1.1/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/EARContext.java
geronimo/branches/1.1/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/EJBModule.java
geronimo/branches/1.1/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/Module.java
geronimo/branches/1.1/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/ModuleBuilder.java
geronimo/branches/1.1/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/SwitchingModuleBuilder.java
geronimo/branches/1.1/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/WebModule.java
geronimo/branches/1.1/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/EARConfigBuilderTest.java
geronimo/branches/1.1/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/MockConnectorConfigBuilder.java
geronimo/branches/1.1/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/MockEJBConfigBuilder.java
geronimo/branches/1.1/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/MockWARConfigBuilder.java
geronimo/branches/1.1/modules/j2ee/src/java/org/apache/geronimo/j2ee/j2eeobjectnames/NameFactory.java
geronimo/branches/1.1/modules/jetty-builder/src/java/org/apache/geronimo/jetty/deployment/JettyModuleBuilder.java
geronimo/branches/1.1/modules/jetty/src/java/org/apache/geronimo/jetty/JettyFilterMapping.java
geronimo/branches/1.1/modules/jetty/src/java/org/apache/geronimo/jetty/JettyManagerImpl.java
geronimo/branches/1.1/modules/kernel/src/java/org/apache/geronimo/gbean/AbstractName.java
geronimo/branches/1.1/modules/kernel/src/java/org/apache/geronimo/kernel/Kernel.java
geronimo/branches/1.1/modules/kernel/src/java/org/apache/geronimo/kernel/KernelGBean.java
geronimo/branches/1.1/modules/kernel/src/java/org/apache/geronimo/kernel/basic/BasicKernel.java
geronimo/branches/1.1/modules/kernel/src/java/org/apache/geronimo/kernel/basic/BasicProxyManager.java
geronimo/branches/1.1/modules/kernel/src/java/org/apache/geronimo/kernel/basic/ProxyMethodInterceptor.java
geronimo/branches/1.1/modules/kernel/src/java/org/apache/geronimo/kernel/jmx/JMXProxyMethodInterceptor.java
geronimo/branches/1.1/modules/kernel/src/java/org/apache/geronimo/kernel/jmx/KernelDelegate.java
geronimo/branches/1.1/modules/kernel/src/java/org/apache/geronimo/kernel/proxy/ProxyManager.java
geronimo/branches/1.1/modules/management/src/java/org/apache/geronimo/management/geronimo/NetworkManager.java
geronimo/branches/1.1/modules/management/src/java/org/apache/geronimo/management/geronimo/WebManager.java
geronimo/branches/1.1/modules/naming-builder/src/java/org/apache/geronimo/naming/deployment/ENCConfigBuilder.java
geronimo/branches/1.1/modules/security/src/java/org/apache/geronimo/security/jaas/JaasLoginModuleUse.java
geronimo/branches/1.1/modules/security/src/java/org/apache/geronimo/security/realm/GenericSecurityRealm.java
geronimo/branches/1.1/modules/tomcat-builder/src/java/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilder.java
geronimo/branches/1.1/modules/tomcat/src/java/org/apache/geronimo/tomcat/TomcatManagerImpl.java
geronimo/branches/1.1/modules/web-builder/src/java/org/apache/geronimo/web/deployment/AbstractWebModuleBuilder.java
geronimo/branches/1.1/plugins/geronimo-packaging-plugin/project.xml
geronimo/branches/1.1/plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/MavenAttributeStore.java
geronimo/branches/1.1/plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/PackageBuilder.java
Modified: geronimo/branches/1.1/applications/console-core/src/java/org/apache/geronimo/console/util/KernelManagementHelper.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/applications/console-core/src/java/org/apache/geronimo/console/util/KernelManagementHelper.java?rev=385487&r1=385486&r2=385487&view=diff
==============================================================================
--- geronimo/branches/1.1/applications/console-core/src/java/org/apache/geronimo/console/util/KernelManagementHelper.java (original)
+++ geronimo/branches/1.1/applications/console-core/src/java/org/apache/geronimo/console/util/KernelManagementHelper.java Mon Mar 13 02:07:53 2006
@@ -550,7 +550,7 @@
}
public WebAccessLog getWebAccessLog(WebManager manager, WebContainer container) {
- return getWebAccessLog(manager, kernel.getObjectNameFor(container).getCanonicalName());
+ return getWebAccessLog(manager, kernel.getAbstractNameFor(container).getCanonicalName());
}
public WebAccessLog getWebAccessLog(WebManager manager, String container) {
@@ -579,11 +579,11 @@
}
public WebConnector[] getWebConnectorsForContainer(WebManager manager, WebContainer container, String protocol) {
- return getWebConnectorsForContainer(manager, kernel.getObjectNameFor(container).getCanonicalName(), protocol);
+ return getWebConnectorsForContainer(manager, kernel.getAbstractNameFor(container).getCanonicalName(), protocol);
}
public WebConnector[] getWebConnectorsForContainer(WebManager manager, WebContainer container) {
- return getWebConnectorsForContainer(manager, kernel.getObjectNameFor(container).getCanonicalName());
+ return getWebConnectorsForContainer(manager, kernel.getAbstractNameFor(container).getCanonicalName());
}
public WebConnector[] getWebConnectorsForContainer(WebManager manager, String containerObjectName, String protocol) {
@@ -730,11 +730,11 @@
}
public JMSConnector[] getJMSConnectorsForContainer(JMSManager manager, JMSBroker broker, String protocol) {
- return getJMSConnectorsForContainer(manager, kernel.getObjectNameFor(broker).getCanonicalName(), protocol);
+ return getJMSConnectorsForContainer(manager, kernel.getAbstractNameFor(broker).getCanonicalName(), protocol);
}
public JMSConnector[] getJMSConnectorsForContainer(JMSManager manager, JMSBroker broker) {
- return getJMSConnectorsForContainer(manager, kernel.getObjectNameFor(broker).getCanonicalName());
+ return getJMSConnectorsForContainer(manager, kernel.getAbstractNameFor(broker).getCanonicalName());
}
public JMSConnector[] getJMSConnectorsForContainer(JMSManager manager, String brokerObjectName, String protocol) {
Modified: geronimo/branches/1.1/modules/axis-builder/src/test/org/apache/geronimo/axis/builder/ServiceReferenceTest.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/axis-builder/src/test/org/apache/geronimo/axis/builder/ServiceReferenceTest.java?rev=385487&r1=385486&r2=385487&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/axis-builder/src/test/org/apache/geronimo/axis/builder/ServiceReferenceTest.java (original)
+++ geronimo/branches/1.1/modules/axis-builder/src/test/org/apache/geronimo/axis/builder/ServiceReferenceTest.java Mon Mar 13 02:07:53 2006
@@ -78,7 +78,7 @@
import org.apache.geronimo.xbeans.geronimo.naming.GerServiceRefType;
/**
- * @version $Rev: 384686 $ $Date$
+ * @version $Rev:385232 $ $Date$
*/
public class ServiceReferenceTest extends TestCase {
private static final File basedir = new File(System.getProperty("basedir", System.getProperty("user.dir")));
@@ -111,7 +111,7 @@
File moduleLocation = new File(tmpbasedir, "ejb");
moduleLocation.mkdirs();
- module = new EJBModule(true, environment, new UnpackedJarFile(moduleLocation), "ejb", null, null, null);
+ module = new EJBModule(true, moduleName, environment, new UnpackedJarFile(moduleLocation), "ejb", null, null, null);
runExternalWSTest = System.getProperty("geronimo.run.external.webservicetest", "false").equals("true");
}
Modified: geronimo/branches/1.1/modules/client-builder/src/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/client-builder/src/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.java?rev=385487&r1=385486&r2=385487&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/client-builder/src/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.java (original)
+++ geronimo/branches/1.1/modules/client-builder/src/java/org/apache/geronimo/client/builder/AppClientModuleBuilder.java Mon Mar 13 02:07:53 2006
@@ -68,6 +68,7 @@
import org.apache.xmlbeans.XmlObject;
import javax.management.ObjectName;
+import javax.management.MalformedObjectNameException;
import java.io.File;
import java.io.IOException;
import java.net.URI;
@@ -95,7 +96,6 @@
private final AbstractNameQuery corbaGBeanObjectName;
private final Kernel kernel;
- private final String clientApplicationName = "client-application";
private final AbstractNameQuery transactionContextManagerObjectName;
private final AbstractNameQuery connectionTrackerObjectName;
private final EJBReferenceBuilder ejbReferenceBuilder;
@@ -127,14 +127,14 @@
}
public Module createModule(File plan, JarFile moduleFile) throws DeploymentException {
- return createModule(plan, moduleFile, "app-client", null, null, true);
+ return createModule(plan, moduleFile, "app-client", null, null, true, null);
}
- public Module createModule(Object plan, JarFile moduleFile, String targetPath, URL specDDUrl, Environment environment, Object moduleContextInfo) throws DeploymentException {
- return createModule(plan, moduleFile, targetPath, specDDUrl, environment, false);
+ public Module createModule(Object plan, JarFile moduleFile, String targetPath, URL specDDUrl, Environment environment, Object moduleContextInfo, AbstractName earName) throws DeploymentException {
+ return createModule(plan, moduleFile, targetPath, specDDUrl, environment, false, earName);
}
- private Module createModule(Object plan, JarFile moduleFile, String targetPath, URL specDDUrl, Environment environment, boolean standAlone) throws DeploymentException {
+ private Module createModule(Object plan, JarFile moduleFile, String targetPath, URL specDDUrl, Environment environment, boolean standAlone, AbstractName earName) throws DeploymentException {
assert moduleFile != null: "moduleFile is null";
assert targetPath != null: "targetPath is null";
assert !targetPath.endsWith("/"): "targetPath must not end with a '/'";
@@ -172,8 +172,18 @@
EnvironmentType serverEnvironmentType = gerAppClient.getServerEnvironment();
Environment serverEnvironment = EnvironmentBuilder.buildEnvironment(serverEnvironmentType, defaultServerEnvironment);
+ AbstractName moduleName;
+ if (earName == null) {
+ try {
+ moduleName = NameFactory.buildModuleName(environment.getProperties(), environment.getConfigId(), ConfigurationModuleType.CAR, null);
+ } catch (MalformedObjectNameException e) {
+ throw new DeploymentException("Could not construct standalone app client module name", e);
+ }
+ } else {
+ moduleName = NameFactory.getChildName(earName, NameFactory.APP_CLIENT_MODULE, targetPath, null);
+ }
- return new AppClientModule(standAlone, serverEnvironment, clientEnvironment, moduleFile, targetPath, appClient, gerAppClient, specDD);
+ return new AppClientModule(standAlone, moduleName, serverEnvironment, clientEnvironment, moduleFile, targetPath, appClient, gerAppClient, specDD);
}
GerApplicationClientType getGeronimoAppClient(Object plan, JarFile moduleFile, boolean standAlone, String targetPath, ApplicationClientType appClient, Environment environment) throws DeploymentException {
@@ -261,6 +271,13 @@
Artifact configId = new Artifact(earConfigId.getGroupId(), earConfigId.getArtifactId() + "_" + module.getTargetPath(), earConfigId.getVersion(), "car");
clientEnvironment.setConfigId(configId);
}
+
+ AbstractName clientBaseName;
+ try {
+ clientBaseName = NameFactory.buildModuleName(clientEnvironment.getProperties(), clientEnvironment.getConfigId(), ConfigurationModuleType.CAR, moduleFile.getName());
+ } catch (MalformedObjectNameException e) {
+ throw new DeploymentException("Could not construct abstract name for app client", e);
+ }
File appClientDir;
try {
appClientDir = configurationStore.createNewConfigurationDir(clientEnvironment.getConfigId());
@@ -275,7 +292,7 @@
clientEnvironment,
ConfigurationModuleType.CAR,
kernel,
- clientApplicationName,
+ clientBaseName,
transactionContextManagerObjectName,
connectionTrackerObjectName,
null,
@@ -294,7 +311,6 @@
}
public void addGBeans(EARContext earContext, Module module, ClassLoader earClassLoader, Repository repository) throws DeploymentException {
- AbstractName earName = earContext.getModuleName();
AppClientModule appClientModule = (AppClientModule) module;
@@ -323,7 +339,7 @@
}
// generate the object name for the app client
- AbstractName appClientModuleName = NameFactory.getChildName(earName, NameFactory.APP_CLIENT_MODULE, appClientModule.getName(), null);
+ AbstractName appClientModuleName = appClientModule.getModuleName();
// create a gbean for the app client module and add it to the ear
Map componentContext;
@@ -401,7 +417,7 @@
}
}
XmlObject connectorPlan = resource.getConnector();
- Module connectorModule = connectorModuleBuilder.createModule(connectorPlan, connectorFile, path, null, null, null);
+ Module connectorModule = connectorModuleBuilder.createModule(connectorPlan, connectorFile, path, null, null, null, appClientDeploymentContext.getModuleName());
resourceModules.add(connectorModule);
//TODO configStore == null is fishy, consider moving these stages for connectors into the corresponding stages for this module.
connectorModuleBuilder.installModule(connectorFile, appClientDeploymentContext, connectorModule, null, repository);
Modified: geronimo/branches/1.1/modules/connector-builder/src/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/connector-builder/src/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java?rev=385487&r1=385486&r2=385487&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/connector-builder/src/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java (original)
+++ geronimo/branches/1.1/modules/connector-builder/src/java/org/apache/geronimo/connector/deployment/ConnectorModuleBuilder.java Mon Mar 13 02:07:53 2006
@@ -58,10 +58,10 @@
import org.apache.geronimo.j2ee.deployment.ResourceReferenceBuilder;
import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
import org.apache.geronimo.kernel.GBeanNotFoundException;
-import org.apache.geronimo.kernel.Kernel;
import org.apache.geronimo.kernel.GBeanAlreadyExistsException;
import org.apache.geronimo.kernel.config.ConfigurationStore;
import org.apache.geronimo.kernel.config.Configuration;
+import org.apache.geronimo.kernel.config.ConfigurationModuleType;
import org.apache.geronimo.kernel.repository.Environment;
import org.apache.geronimo.kernel.repository.Repository;
import org.apache.geronimo.naming.deployment.ENCConfigBuilder;
@@ -92,6 +92,7 @@
import javax.naming.Reference;
import javax.xml.namespace.QName;
+import javax.management.MalformedObjectNameException;
import java.beans.Introspector;
import java.beans.PropertyEditor;
import java.io.File;
@@ -143,14 +144,14 @@
}
public Module createModule(File plan, JarFile moduleFile) throws DeploymentException {
- return createModule(plan, moduleFile, "rar", null, true);
+ return createModule(plan, moduleFile, "rar", null, true, null);
}
- public Module createModule(Object plan, JarFile moduleFile, String targetPath, URL specDDUrl, Environment environment, Object moduleContextInfo) throws DeploymentException {
- return createModule(plan, moduleFile, targetPath, specDDUrl, false);
+ public Module createModule(Object plan, JarFile moduleFile, String targetPath, URL specDDUrl, Environment environment, Object moduleContextInfo, AbstractName earName) throws DeploymentException {
+ return createModule(plan, moduleFile, targetPath, specDDUrl, false, earName);
}
- private Module createModule(Object plan, JarFile moduleFile, String targetPath, URL specDDUrl, boolean standAlone) throws DeploymentException {
+ private Module createModule(Object plan, JarFile moduleFile, String targetPath, URL specDDUrl, boolean standAlone, AbstractName earName) throws DeploymentException {
assert moduleFile != null: "moduleFile is null";
assert targetPath != null: "targetPath is null";
assert !targetPath.endsWith("/"): "targetPath must not end with a '/'";
@@ -226,7 +227,19 @@
EnvironmentType environmentType = gerConnector.getEnvironment();
Environment environment = EnvironmentBuilder.buildEnvironment(environmentType, defaultEnvironment);
- return new ConnectorModule(standAlone, environment, moduleFile, targetPath, connector, gerConnector, specDD);
+
+ AbstractName moduleName;
+ if (earName == null) {
+ try {
+ moduleName = NameFactory.buildModuleName(environment.getProperties(), environment.getConfigId(), ConfigurationModuleType.RAR, null);
+ } catch (MalformedObjectNameException e) {
+ throw new DeploymentException("Could not construct standalone connector module name", e);
+ }
+ } else {
+ moduleName = NameFactory.getChildName(earName, NameFactory.RESOURCE_ADAPTER_MODULE, targetPath, null);
+ }
+
+ return new ConnectorModule(standAlone, moduleName, environment, moduleFile, targetPath, connector, gerConnector, specDD);
}
public void installModule(JarFile earFile, EARContext earContext, Module module, ConfigurationStore configurationStore, Repository repository) throws DeploymentException {
@@ -257,13 +270,8 @@
public void initContext(EARContext earContext, Module module, ClassLoader cl) throws DeploymentException {
ConnectorModule resourceModule = (ConnectorModule) module;
- AbstractName resourceAdapterModuleName;
- if (resourceModule.isStandAlone()) {
- resourceAdapterModuleName = earContext.getModuleName();
- } else {
- AbstractName applicationName = earContext.getApplicationName();
- resourceAdapterModuleName = NameFactory.getChildName(applicationName, NameFactory.RESOURCE_ADAPTER_MODULE, module.getName(), null);
- }
+ AbstractName resourceAdapterModuleName = resourceModule.getModuleName();
+
AbstractName resourceName = NameFactory.getChildName(resourceAdapterModuleName, NameFactory.JCA_RESOURCE, module.getName(), null);
final ConnectorType connector = (ConnectorType) module.getSpecDD();
@@ -273,8 +281,8 @@
// initalize the GBean
resourceAdapterModuleData.setReferencePattern(NameFactory.J2EE_SERVER, earContext.getServerObjectName());
- if (!earContext.getJ2EEApplicationName().equals(NameFactory.NULL)) {
- resourceAdapterModuleData.setReferencePattern(NameFactory.J2EE_APPLICATION, earContext.getApplicationName());
+ if (!earContext.getModuleName().equals(resourceAdapterModuleName)) {
+ resourceAdapterModuleData.setReferencePattern(NameFactory.J2EE_APPLICATION, earContext.getModuleName());
}
resourceAdapterModuleData.setAttribute("deploymentDescriptor", module.getOriginalSpecDD());
Modified: geronimo/branches/1.1/modules/connector-builder/src/test/org/apache/geronimo/connector/deployment/ConnectorModuleBuilderTest.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/connector-builder/src/test/org/apache/geronimo/connector/deployment/ConnectorModuleBuilderTest.java?rev=385487&r1=385486&r2=385487&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/connector-builder/src/test/org/apache/geronimo/connector/deployment/ConnectorModuleBuilderTest.java (original)
+++ geronimo/branches/1.1/modules/connector-builder/src/test/org/apache/geronimo/connector/deployment/ConnectorModuleBuilderTest.java Mon Mar 13 02:07:53 2006
@@ -345,7 +345,7 @@
Thread.currentThread().setContextClassLoader(cl);
JarFile rarJarFile = DeploymentUtil.createJarFile(rarFile);
- Module module = moduleBuilder.createModule(action.getVendorDD(), rarJarFile, j2eeContext.getJ2eeModuleName(), action.getSpecDD(), null, null);
+ Module module = moduleBuilder.createModule(action.getVendorDD(), rarJarFile, j2eeContext.getJ2eeModuleName(), action.getSpecDD(), null, null, earName);
if (module == null) {
throw new DeploymentException("Was not a connector module");
}
Modified: geronimo/branches/1.1/modules/deployment/src/java/org/apache/geronimo/deployment/DeploymentContext.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/deployment/src/java/org/apache/geronimo/deployment/DeploymentContext.java?rev=385487&r1=385486&r2=385487&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/deployment/src/java/org/apache/geronimo/deployment/DeploymentContext.java (original)
+++ geronimo/branches/1.1/modules/deployment/src/java/org/apache/geronimo/deployment/DeploymentContext.java Mon Mar 13 02:07:53 2006
@@ -60,7 +60,7 @@
import org.apache.geronimo.kernel.repository.Environment;
/**
- * @version $Rev: 384933 $ $Date$
+ * @version $Rev:385232 $ $Date$
*/
public class DeploymentContext {
private static int deploymentCount = 42;
@@ -404,7 +404,7 @@
return configuration.getConfigurationClassLoader();
}
- public Configuration getConfiguration(Configuration knownParent) {
+ public Configuration getConfiguration() {
return configuration;
}
Modified: geronimo/branches/1.1/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/ApplicationInfo.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/ApplicationInfo.java?rev=385487&r1=385486&r2=385487&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/ApplicationInfo.java (original)
+++ geronimo/branches/1.1/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/ApplicationInfo.java Mon Mar 13 02:07:53 2006
@@ -20,6 +20,7 @@
import org.apache.geronimo.kernel.config.ConfigurationModuleType;
import org.apache.geronimo.kernel.repository.Environment;
+import org.apache.geronimo.gbean.AbstractName;
import org.apache.xmlbeans.XmlObject;
/**
@@ -28,7 +29,7 @@
public class ApplicationInfo {
private ConfigurationModuleType type;
private Environment environment;
- private String applicationName;
+ private AbstractName baseName;
private XmlObject specDD;
private XmlObject vendorDD;
private Set modules;
@@ -38,7 +39,7 @@
public ApplicationInfo() {
}
- public ApplicationInfo(ConfigurationModuleType type, Environment environment, String applicationName, XmlObject specDD, XmlObject vendorDD, Set modules, Set moduleLocations, String originalSpecDD) {
+ public ApplicationInfo(ConfigurationModuleType type, Environment environment, AbstractName baseName, XmlObject specDD, XmlObject vendorDD, Set modules, Set moduleLocations, String originalSpecDD) {
assert type != null;
assert environment != null;
assert modules != null;
@@ -46,7 +47,7 @@
this.type = type;
this.environment = environment;
- this.applicationName = applicationName;
+ this.baseName = baseName;
this.specDD = specDD;
this.vendorDD = vendorDD;
this.modules = modules;
@@ -70,12 +71,12 @@
this.environment = environment;
}
- public String getApplicationName() {
- return applicationName;
+ public AbstractName getBaseName() {
+ return baseName;
}
- public void setApplicationName(String applicationName) {
- this.applicationName = applicationName;
+ public void setBaseName(AbstractName baseName) {
+ this.baseName = baseName;
}
public XmlObject getVendorDD() {
Modified: geronimo/branches/1.1/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/AppClientModule.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/AppClientModule.java?rev=385487&r1=385486&r2=385487&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/AppClientModule.java (original)
+++ geronimo/branches/1.1/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/AppClientModule.java Mon Mar 13 02:07:53 2006
@@ -20,6 +20,7 @@
import org.apache.geronimo.deployment.DeploymentContext;
import org.apache.geronimo.kernel.config.ConfigurationModuleType;
import org.apache.geronimo.kernel.repository.Environment;
+import org.apache.geronimo.gbean.AbstractName;
import org.apache.xmlbeans.XmlObject;
import java.io.IOException;
@@ -37,8 +38,8 @@
private Collection resourceModules;
- public AppClientModule(boolean standAlone, Environment serverEnvironment, Environment clientEnvironment, JarFile moduleFile, String targetPath, XmlObject specDD, XmlObject vendorDD, String originalSpecDD) throws DeploymentException {
- super(standAlone, serverEnvironment, moduleFile, targetPath, specDD, vendorDD, originalSpecDD, null);
+ public AppClientModule(boolean standAlone, AbstractName moduleName, Environment serverEnvironment, Environment clientEnvironment, JarFile moduleFile, String targetPath, XmlObject specDD, XmlObject vendorDD, String originalSpecDD) throws DeploymentException {
+ super(standAlone, moduleName, serverEnvironment, moduleFile, targetPath, specDD, vendorDD, originalSpecDD, null);
this.clientEnvironment = clientEnvironment;
}
Modified: geronimo/branches/1.1/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/ConnectorModule.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/ConnectorModule.java?rev=385487&r1=385486&r2=385487&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/ConnectorModule.java (original)
+++ geronimo/branches/1.1/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/ConnectorModule.java Mon Mar 13 02:07:53 2006
@@ -20,6 +20,7 @@
import org.apache.geronimo.deployment.DeploymentContext;
import org.apache.geronimo.kernel.config.ConfigurationModuleType;
import org.apache.geronimo.kernel.repository.Environment;
+import org.apache.geronimo.gbean.AbstractName;
import org.apache.xmlbeans.XmlObject;
import java.io.IOException;
@@ -31,8 +32,8 @@
* @version $Rev$ $Date$
*/
public class ConnectorModule extends Module {
- public ConnectorModule(boolean standAlone, Environment environment, JarFile moduleFile, String targetPath, XmlObject specDD, XmlObject vendorDD, String originalSpecDD) throws DeploymentException {
- super(standAlone, environment, moduleFile, targetPath, specDD, vendorDD, originalSpecDD, null);
+ public ConnectorModule(boolean standAlone, AbstractName moduleName, Environment environment, JarFile moduleFile, String targetPath, XmlObject specDD, XmlObject vendorDD, String originalSpecDD) throws DeploymentException {
+ super(standAlone, moduleName, environment, moduleFile, targetPath, specDD, vendorDD, originalSpecDD, null);
}
public ConfigurationModuleType getType() {
Modified: geronimo/branches/1.1/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java?rev=385487&r1=385486&r2=385487&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java (original)
+++ geronimo/branches/1.1/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java Mon Mar 13 02:07:53 2006
@@ -61,7 +61,6 @@
import java.io.IOException;
import java.net.MalformedURLException;
import java.net.URI;
-import java.net.URISyntaxException;
import java.net.URL;
import java.util.Collections;
import java.util.Enumeration;
@@ -152,7 +151,7 @@
return new ApplicationInfo(module.getType(),
module.getEnvironment(),
- NameFactory.NULL,
+ module.getModuleName(),
null,
null,
Collections.singleton(module),
@@ -211,13 +210,21 @@
EnvironmentType environmentType = gerApplication.getEnvironment();
Environment environment = EnvironmentBuilder.buildEnvironment(environmentType, defaultEnvironment);
+
+ AbstractName earName = null;
+ try {
+ earName = NameFactory.buildApplicationName(environment.getProperties(), environment.getConfigId());
+ } catch (MalformedObjectNameException e) {
+ throw new DeploymentException("Could not build ear name", e);
+ }
+
// get the modules either the application plan or for a stand alone module from the specific deployer
// todo change module so you can extract the real module path back out.. then we can eliminate
// the moduleLocations and have addModules return the modules
Set moduleLocations = new HashSet();
Set modules = new LinkedHashSet();
try {
- addModules(earFile, application, gerApplication, moduleLocations, modules, environment);
+ addModules(earFile, application, gerApplication, moduleLocations, modules, environment, earName);
} catch (Throwable e) {
// close all the modules
for (Iterator iterator = modules.iterator(); iterator.hasNext();) {
@@ -235,17 +242,9 @@
throw new DeploymentException(e);
}
- //TODO extract override from environment name-key map.
- String applicationName = null;
- try {
- applicationName = gerApplication.isSetApplicationName() ? gerApplication.getApplicationName() : environment.getConfigId().toURI().toString();
- } catch (URISyntaxException e) {
- throw new DeploymentException("Could not construct application name from configId", e);
- }
-
return new ApplicationInfo(ConfigurationModuleType.EAR,
environment,
- applicationName,
+ earName,
application,
gerApplication,
modules,
@@ -306,7 +305,7 @@
applicationInfo.getEnvironment(),
applicationType,
kernel,
- applicationInfo.getApplicationName(),
+ applicationInfo.getBaseName(),
transactionContextManagerObjectName,
connectionTrackerObjectName,
transactionalTimerObjectName,
@@ -403,7 +402,7 @@
}
}
- private void addModules(JarFile earFile, ApplicationType application, GerApplicationType gerApplication, Set moduleLocations, Set modules, Environment environment) throws DeploymentException {
+ private void addModules(JarFile earFile, ApplicationType application, GerApplicationType gerApplication, Set moduleLocations, Set modules, Environment environment, AbstractName earName) throws DeploymentException {
Map altVendorDDs = new HashMap();
try {
if (earFile != null) {
@@ -510,7 +509,7 @@
}
}
- NestedJarFile moduleFile = null;
+ NestedJarFile moduleFile;
try {
moduleFile = new NestedJarFile(earFile, modulePath);
} catch (IOException e) {
@@ -522,7 +521,8 @@
modulePath,
altSpecDD,
environment,
- moduleContextInfo);
+ moduleContextInfo,
+ earName);
if (module == null) {
throw new DeploymentException("Module was not " + moduleTypeName + ": " + modulePath);
@@ -622,7 +622,7 @@
moduleName,
altSpecDD,
environment,
- moduleContextInfo);
+ moduleContextInfo, earName);
if (module == null) {
throw new DeploymentException("Module was not " + moduleTypeName + ": " + moduleName);
Modified: geronimo/branches/1.1/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/EARContext.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/EARContext.java?rev=385487&r1=385486&r2=385487&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/EARContext.java (original)
+++ geronimo/branches/1.1/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/EARContext.java Mon Mar 13 02:07:53 2006
@@ -55,15 +55,10 @@
private AbstractName jaccManagerName;
private SecurityConfiguration securityConfiguration;
- public EARContext(File baseDir, Environment environment, ConfigurationModuleType moduleType, Kernel kernel, String j2eeApplicationName, AbstractNameQuery transactionContextManagerObjectName, AbstractNameQuery connectionTrackerObjectName, AbstractNameQuery transactedTimerName, AbstractNameQuery nonTransactedTimerName, AbstractNameQuery corbaGBeanObjectName, RefContext refContext) throws MalformedObjectNameException, DeploymentException {
+ public EARContext(File baseDir, Environment environment, ConfigurationModuleType moduleType, Kernel kernel, AbstractName baseName, AbstractNameQuery transactionContextManagerObjectName, AbstractNameQuery connectionTrackerObjectName, AbstractNameQuery transactedTimerName, AbstractNameQuery nonTransactedTimerName, AbstractNameQuery corbaGBeanObjectName, RefContext refContext) throws MalformedObjectNameException, DeploymentException {
super(baseDir, environment, moduleType, kernel);
- if (moduleType.equals(ConfigurationModuleType.EAR)) {
- moduleName = NameFactory.buildApplicationName(environment.getProperties(), environment.getConfigId());
+ moduleName = baseName;
applicationName = moduleName;
- } else {
- moduleName = NameFactory.buildModuleName(environment.getProperties(), environment.getConfigId(), moduleType, j2eeApplicationName);
- applicationName = null;
- }
//TODO configId FIXME
domainObjectName = null;//NameFactory.getDomainName(null, moduleName);
serverObjectName = null;//NameFactory.getServerName(null, null, moduleName);
Modified: geronimo/branches/1.1/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/EJBModule.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/EJBModule.java?rev=385487&r1=385486&r2=385487&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/EJBModule.java (original)
+++ geronimo/branches/1.1/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/EJBModule.java Mon Mar 13 02:07:53 2006
@@ -20,6 +20,7 @@
import org.apache.geronimo.deployment.DeploymentContext;
import org.apache.geronimo.kernel.config.ConfigurationModuleType;
import org.apache.geronimo.kernel.repository.Environment;
+import org.apache.geronimo.gbean.AbstractName;
import org.apache.xmlbeans.XmlObject;
import java.io.IOException;
@@ -31,8 +32,8 @@
* @version $Rev$ $Date$
*/
public class EJBModule extends Module {
- public EJBModule(boolean standAlone, Environment environment, JarFile moduleFile, String targetPath, XmlObject specDD, XmlObject vendorDD, String originalSpecDD) throws DeploymentException {
- super(standAlone, environment, moduleFile, targetPath, specDD, vendorDD, originalSpecDD, null);
+ public EJBModule(boolean standAlone, AbstractName moduleName, Environment environment, JarFile moduleFile, String targetPath, XmlObject specDD, XmlObject vendorDD, String originalSpecDD) throws DeploymentException {
+ super(standAlone, moduleName, environment, moduleFile, targetPath, specDD, vendorDD, originalSpecDD, null);
}
public ConfigurationModuleType getType() {
Modified: geronimo/branches/1.1/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/Module.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/Module.java?rev=385487&r1=385486&r2=385487&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/Module.java (original)
+++ geronimo/branches/1.1/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/Module.java Mon Mar 13 02:07:53 2006
@@ -28,12 +28,15 @@
import org.apache.geronimo.deployment.util.DeploymentUtil;
import org.apache.geronimo.deployment.DeploymentContext;
import org.apache.geronimo.common.DeploymentException;
+import org.apache.geronimo.gbean.AbstractName;
/**
* @version $Rev$ $Date$
*/
public abstract class Module {
private final boolean standAlone;
+
+ private final AbstractName moduleName;
private final String name;
private final Environment environment;
private final URI moduleURI;
@@ -49,10 +52,12 @@
private URI uniqueModuleLocation;
- protected Module(boolean standAlone, Environment environment, JarFile moduleFile, String targetPath, XmlObject specDD, XmlObject vendorDD, String originalSpecDD, String namespace) throws DeploymentException {
+ protected Module(boolean standAlone, AbstractName moduleName, Environment environment, JarFile moduleFile, String targetPath, XmlObject specDD, XmlObject vendorDD, String originalSpecDD, String namespace) throws DeploymentException {
assert targetPath != null: "targetPath is null";
+ assert moduleName != null: "moduleName is null";
this.standAlone = standAlone;
+ this.moduleName = moduleName;
this.environment = environment;
this.moduleFile = moduleFile;
this.targetPath = targetPath;
@@ -80,6 +85,10 @@
public boolean isStandAlone() {
return standAlone;
+ }
+
+ public AbstractName getModuleName() {
+ return moduleName;
}
public Environment getEnvironment() {
Modified: geronimo/branches/1.1/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/ModuleBuilder.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/ModuleBuilder.java?rev=385487&r1=385486&r2=385487&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/ModuleBuilder.java (original)
+++ geronimo/branches/1.1/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/ModuleBuilder.java Mon Mar 13 02:07:53 2006
@@ -20,6 +20,7 @@
import org.apache.geronimo.kernel.config.ConfigurationStore;
import org.apache.geronimo.kernel.repository.Environment;
import org.apache.geronimo.kernel.repository.Repository;
+import org.apache.geronimo.gbean.AbstractName;
import java.io.File;
import java.net.URL;
@@ -31,7 +32,7 @@
public interface ModuleBuilder {
Module createModule(File plan, JarFile moduleFile) throws DeploymentException;
- Module createModule(Object plan, JarFile moduleFile, String targetPath, URL specDDUrl, Environment environment, Object moduleContextInfo) throws DeploymentException;
+ Module createModule(Object plan, JarFile moduleFile, String targetPath, URL specDDUrl, Environment environment, Object moduleContextInfo, AbstractName earName) throws DeploymentException;
void installModule(JarFile earFile, EARContext earContext, Module module, ConfigurationStore configurationStore, Repository repository) throws DeploymentException;
Modified: geronimo/branches/1.1/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/SwitchingModuleBuilder.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/SwitchingModuleBuilder.java?rev=385487&r1=385486&r2=385487&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/SwitchingModuleBuilder.java (original)
+++ geronimo/branches/1.1/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/SwitchingModuleBuilder.java Mon Mar 13 02:07:53 2006
@@ -23,6 +23,7 @@
import org.apache.geronimo.gbean.ReferenceCollection;
import org.apache.geronimo.gbean.ReferenceCollectionEvent;
import org.apache.geronimo.gbean.ReferenceCollectionListener;
+import org.apache.geronimo.gbean.AbstractName;
import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
import org.apache.geronimo.kernel.config.ConfigurationStore;
import org.apache.geronimo.kernel.repository.Environment;
@@ -134,11 +135,11 @@
return builder;
}
- public Module createModule(Object plan, JarFile moduleFile, String targetPath, URL specDDUrl, Environment environment, Object moduleContextInfo) throws DeploymentException {
+ public Module createModule(Object plan, JarFile moduleFile, String targetPath, URL specDDUrl, Environment environment, Object moduleContextInfo, AbstractName earName) throws DeploymentException {
String namespace = getNamespaceFromPlan(plan);
ModuleBuilder builder = getBuilderFromNamespace(namespace);
if (builder != null) {
- return builder.createModule(plan, moduleFile, targetPath, specDDUrl, environment, moduleContextInfo);
+ return builder.createModule(plan, moduleFile, targetPath, specDDUrl, environment, moduleContextInfo, earName);
} else {
return null;
}
Modified: geronimo/branches/1.1/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/WebModule.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/WebModule.java?rev=385487&r1=385486&r2=385487&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/WebModule.java (original)
+++ geronimo/branches/1.1/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/WebModule.java Mon Mar 13 02:07:53 2006
@@ -20,6 +20,7 @@
import org.apache.geronimo.deployment.DeploymentContext;
import org.apache.geronimo.kernel.config.ConfigurationModuleType;
import org.apache.geronimo.kernel.repository.Environment;
+import org.apache.geronimo.gbean.AbstractName;
import org.apache.xmlbeans.XmlObject;
import java.io.IOException;
@@ -38,8 +39,8 @@
private final String contextRoot;
private final Map portMap;
- public WebModule(boolean standAlone, Environment environment, JarFile moduleFile, String targetPath, XmlObject specDD, XmlObject vendorDD, String originalSpecDD, String contextRoot, Map portMap, String namespace) throws DeploymentException {
- super(standAlone, environment, moduleFile, targetPath, specDD, vendorDD, originalSpecDD, namespace);
+ public WebModule(boolean standAlone, AbstractName moduleName, Environment environment, JarFile moduleFile, String targetPath, XmlObject specDD, XmlObject vendorDD, String originalSpecDD, String contextRoot, Map portMap, String namespace) throws DeploymentException {
+ super(standAlone, moduleName, environment, moduleFile, targetPath, specDD, vendorDD, originalSpecDD, namespace);
this.contextRoot = contextRoot;
this.portMap = portMap;
}
Modified: geronimo/branches/1.1/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/EARConfigBuilderTest.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/EARConfigBuilderTest.java?rev=385487&r1=385486&r2=385487&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/EARConfigBuilderTest.java (original)
+++ geronimo/branches/1.1/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/EARConfigBuilderTest.java Mon Mar 13 02:07:53 2006
@@ -94,10 +94,10 @@
TestSetup setup14 = new TestSetup(inner) {
protected void setUp() throws Exception {
earFile = DeploymentUtil.createJarFile(new File(basedir, "target/test-ear14/test-ear.ear"));
- ejbConfigBuilder.ejbModule = new EJBModule(false, null, null, "test-ejb-jar.jar", null, null, null);
+ ejbConfigBuilder.ejbModule = new EJBModule(false, moduleName, null, null, "test-ejb-jar.jar", null, null, null);
webConfigBuilder.contextRoot = contextRoot;
- webConfigBuilder.webModule = new WebModule(false, null, null, "test-war.war", null, null, null, contextRoot, portMap, WEB_NAMESPACE);
- connectorConfigBuilder.connectorModule = new ConnectorModule(false, null, null, "test-rar.rar", null, null, null);
+ webConfigBuilder.webModule = new WebModule(false, moduleName, null, null, "test-war.war", null, null, null, contextRoot, portMap, WEB_NAMESPACE);
+ connectorConfigBuilder.connectorModule = new ConnectorModule(false, moduleName, null, null, "test-rar.rar", null, null, null);
}
protected void tearDown() {
@@ -110,10 +110,10 @@
TestSetup setupNaked14 = new TestSetup(inner) {
protected void setUp() throws Exception {
earFile = DeploymentUtil.createJarFile(new File(basedir, "target/test-ear14/test-naked-ear.ear"));
- ejbConfigBuilder.ejbModule = new EJBModule(false, null, null, "test-ejb-jar.jar", null, null, null);
+ ejbConfigBuilder.ejbModule = new EJBModule(false, moduleName, null, null, "test-ejb-jar.jar", null, null, null);
webConfigBuilder.contextRoot = contextRoot;
- webConfigBuilder.webModule = new WebModule(false, null, null, "test-war.war", null, null, null, contextRoot, portMap, WEB_NAMESPACE);
- connectorConfigBuilder.connectorModule = new ConnectorModule(false, null, null, "test-rar.rar", null, null, null);
+ webConfigBuilder.webModule = new WebModule(false, moduleName, null, null, "test-war.war", null, null, null, contextRoot, portMap, WEB_NAMESPACE);
+ connectorConfigBuilder.connectorModule = new ConnectorModule(false, moduleName, null, null, "test-rar.rar", null, null, null);
}
protected void tearDown() {
@@ -126,10 +126,10 @@
TestSetup setup13 = new TestSetup(inner) {
protected void setUp() throws Exception {
earFile = DeploymentUtil.createJarFile(new File(basedir, "target/test-ear13/test-ear.ear"));
- ejbConfigBuilder.ejbModule = new EJBModule(false, null, null, "test-ejb-jar.jar", null, null, null);
+ ejbConfigBuilder.ejbModule = new EJBModule(false, moduleName, null, null, "test-ejb-jar.jar", null, null, null);
webConfigBuilder.contextRoot = contextRoot;
- webConfigBuilder.webModule = new WebModule(false, null, null, "test-war.war", null, null, null, contextRoot, portMap, WEB_NAMESPACE);
- connectorConfigBuilder.connectorModule = new ConnectorModule(false, null, null, "test-rar.rar", null, null, null);
+ webConfigBuilder.webModule = new WebModule(false, moduleName, null, null, "test-war.war", null, null, null, contextRoot, portMap, WEB_NAMESPACE);
+ connectorConfigBuilder.connectorModule = new ConnectorModule(false, moduleName, null, null, "test-rar.rar", null, null, null);
}
protected void tearDown() {
@@ -142,10 +142,10 @@
TestSetup setupNaked13 = new TestSetup(inner) {
protected void setUp() throws Exception {
earFile = DeploymentUtil.createJarFile(new File(basedir, "target/test-ear13/test-naked-ear.ear"));
- ejbConfigBuilder.ejbModule = new EJBModule(false, null, null, "test-ejb-jar.jar", null, null, null);
+ ejbConfigBuilder.ejbModule = new EJBModule(false, moduleName, null, null, "test-ejb-jar.jar", null, null, null);
webConfigBuilder.contextRoot = contextRoot;
- webConfigBuilder.webModule = new WebModule(false, null, null, "test-war.war", null, null, null, contextRoot, portMap, WEB_NAMESPACE);
- connectorConfigBuilder.connectorModule = new ConnectorModule(false, null, null, "test-rar.rar", null, null, null);
+ webConfigBuilder.webModule = new WebModule(false, moduleName, null, null, "test-war.war", null, null, null, contextRoot, portMap, WEB_NAMESPACE);
+ connectorConfigBuilder.connectorModule = new ConnectorModule(false, moduleName, null, null, "test-rar.rar", null, null, null);
}
protected void tearDown() {
@@ -158,10 +158,10 @@
TestSetup setupUnpacked = new TestSetup(inner) {
protected void setUp() throws Exception {
earFile = DeploymentUtil.createJarFile(new File(basedir, "target/test-unpacked-ear/full/"));
- ejbConfigBuilder.ejbModule = new EJBModule(false, null, null, "test-ejb-jar.jar/", null, null, null);
+ ejbConfigBuilder.ejbModule = new EJBModule(false, moduleName, null, null, "test-ejb-jar.jar/", null, null, null);
webConfigBuilder.contextRoot = contextRoot;
- webConfigBuilder.webModule = new WebModule(false, null, null, "test-war.war/", null, null, null, contextRoot, portMap, WEB_NAMESPACE);
- connectorConfigBuilder.connectorModule = new ConnectorModule(false, null, null, "test-rar.rar", null, null, null);
+ webConfigBuilder.webModule = new WebModule(false, moduleName, null, null, "test-war.war/", null, null, null, contextRoot, portMap, WEB_NAMESPACE);
+ connectorConfigBuilder.connectorModule = new ConnectorModule(false, moduleName, null, null, "test-rar.rar", null, null, null);
}
protected void tearDown() {
@@ -174,10 +174,10 @@
TestSetup setupUnpackedNaked = new TestSetup(inner) {
protected void setUp() throws Exception {
earFile = DeploymentUtil.createJarFile(new File(basedir, "target/test-unpacked-ear/naked/"));
- ejbConfigBuilder.ejbModule = new EJBModule(false, null, null, "test-ejb-jar.jar/", null, null, null);
+ ejbConfigBuilder.ejbModule = new EJBModule(false, moduleName, null, null, "test-ejb-jar.jar/", null, null, null);
webConfigBuilder.contextRoot = contextRoot;
- webConfigBuilder.webModule = new WebModule(false, null, null, "test-war.war", null, null, null, contextRoot, portMap, WEB_NAMESPACE);
- connectorConfigBuilder.connectorModule = new ConnectorModule(false, null, null, "test-rar.rar", null, null, null);
+ webConfigBuilder.webModule = new WebModule(false, moduleName, null, null, "test-war.war", null, null, null, contextRoot, portMap, WEB_NAMESPACE);
+ connectorConfigBuilder.connectorModule = new ConnectorModule(false, moduleName, null, null, "test-rar.rar", null, null, null);
}
protected void tearDown() {
@@ -190,10 +190,10 @@
TestSetup setupUnpackedAltDD = new TestSetup(inner) {
protected void setUp() throws Exception {
earFile = DeploymentUtil.createJarFile(new File(basedir, "target/test-unpacked-ear/alt-dd/"));
- ejbConfigBuilder.ejbModule = new EJBModule(false, null, null, "test-ejb-jar.jar/", null, null, null);
+ ejbConfigBuilder.ejbModule = new EJBModule(false, moduleName, null, null, "test-ejb-jar.jar/", null, null, null);
webConfigBuilder.contextRoot = contextRoot;
- webConfigBuilder.webModule = new WebModule(false, null, null, "test-war.war/", null, null, null, contextRoot, portMap, WEB_NAMESPACE);
- connectorConfigBuilder.connectorModule = new ConnectorModule(false, null, null, "test-rar.rar", null, null, null);
+ webConfigBuilder.webModule = new WebModule(false, moduleName, null, null, "test-war.war/", null, null, null, contextRoot, portMap, WEB_NAMESPACE);
+ connectorConfigBuilder.connectorModule = new ConnectorModule(false, moduleName, null, null, "test-rar.rar", null, null, null);
}
protected void tearDown() {
@@ -206,10 +206,10 @@
TestSetup setupPackedAltDD = new TestSetup(inner) {
protected void setUp() throws Exception {
earFile = DeploymentUtil.createJarFile(new File(basedir, "target/test-unpacked-ear/alt-dd.ear"));
- ejbConfigBuilder.ejbModule = new EJBModule(false, null, null, "test-ejb-jar.jar/", null, null, null);
+ ejbConfigBuilder.ejbModule = new EJBModule(false, moduleName, null, null, "test-ejb-jar.jar/", null, null, null);
webConfigBuilder.contextRoot = contextRoot;
- webConfigBuilder.webModule = new WebModule(false, null, null, "test-war.war/", null, null, null, contextRoot, portMap, WEB_NAMESPACE);
- connectorConfigBuilder.connectorModule = new ConnectorModule(false, null, null, "test-rar.rar", null, null, null);
+ webConfigBuilder.webModule = new WebModule(false, moduleName, null, null, "test-war.war/", null, null, null, contextRoot, portMap, WEB_NAMESPACE);
+ connectorConfigBuilder.connectorModule = new ConnectorModule(false, moduleName, null, null, "test-rar.rar", null, null, null);
}
protected void tearDown() {
Modified: geronimo/branches/1.1/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/MockConnectorConfigBuilder.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/MockConnectorConfigBuilder.java?rev=385487&r1=385486&r2=385487&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/MockConnectorConfigBuilder.java (original)
+++ geronimo/branches/1.1/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/MockConnectorConfigBuilder.java Mon Mar 13 02:07:53 2006
@@ -20,6 +20,7 @@
import org.apache.geronimo.common.DeploymentException;
import org.apache.geronimo.gbean.GBeanData;
import org.apache.geronimo.gbean.AbstractNameQuery;
+import org.apache.geronimo.gbean.AbstractName;
import org.apache.geronimo.kernel.config.ConfigurationStore;
import org.apache.geronimo.kernel.config.Configuration;
import org.apache.geronimo.kernel.repository.Environment;
@@ -40,11 +41,11 @@
public ClassLoader cl;
public Module createModule(File plan, JarFile moduleFile) throws DeploymentException {
- return new ConnectorModule(true, null, moduleFile, "connector", null, null, null);
+ 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) throws DeploymentException {
- return new ConnectorModule(false, null, moduleFile, targetPath, null, null, null);
+ public Module createModule(Object plan, JarFile moduleFile, String targetPath, URL specDDUrl, Environment environment, Object moduleContextInfo, AbstractName earName) throws DeploymentException {
+ return new ConnectorModule(false, moduleName, null, moduleFile, targetPath, null, null, null);
}
public void installModule(JarFile earFile, EARContext earContext, Module connectorModule, ConfigurationStore configurationStore, Repository repository) {
Modified: geronimo/branches/1.1/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/MockEJBConfigBuilder.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/MockEJBConfigBuilder.java?rev=385487&r1=385486&r2=385487&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/MockEJBConfigBuilder.java (original)
+++ geronimo/branches/1.1/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/MockEJBConfigBuilder.java Mon Mar 13 02:07:53 2006
@@ -40,11 +40,11 @@
public ClassLoader cl;
public Module createModule(File plan, JarFile moduleFile) throws DeploymentException {
- return new EJBModule(true, null, moduleFile, "ejb.jar", null, null, null);
+ 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) throws DeploymentException {
- return new EJBModule(false, null, moduleFile, targetPath, null, null, null);
+ public Module createModule(Object plan, JarFile moduleFile, String targetPath, URL specDDUrl, Environment environment, Object moduleContextInfo, AbstractName earName) throws DeploymentException {
+ return new EJBModule(false, moduleName, null, moduleFile, targetPath, null, null, null);
}
public void installModule(JarFile earFile, EARContext earContext, Module ejbModule, ConfigurationStore configurationStore, Repository repository) {
Modified: geronimo/branches/1.1/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/MockWARConfigBuilder.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/MockWARConfigBuilder.java?rev=385487&r1=385486&r2=385487&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/MockWARConfigBuilder.java (original)
+++ geronimo/branches/1.1/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/MockWARConfigBuilder.java Mon Mar 13 02:07:53 2006
@@ -21,6 +21,7 @@
import org.apache.geronimo.kernel.config.ConfigurationStore;
import org.apache.geronimo.kernel.repository.Environment;
import org.apache.geronimo.kernel.repository.Repository;
+import org.apache.geronimo.gbean.AbstractName;
import java.io.File;
import java.net.URL;
@@ -39,11 +40,11 @@
private String namespace = "foo";
public Module createModule(File plan, JarFile moduleFile) throws DeploymentException {
- return new WebModule(true, null, moduleFile, "war", null, null, null, contextRoot, portMap, namespace);
+ 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) throws DeploymentException {
- return new WebModule(false, null, moduleFile, targetPath, null, null, null, contextRoot, portMap, namespace);
+ public Module createModule(Object plan, JarFile moduleFile, String targetPath, URL specDDUrl, Environment environment, Object moduleContextInfo, AbstractName earName) throws DeploymentException {
+ return new WebModule(false, moduleName, null, moduleFile, targetPath, null, null, null, contextRoot, portMap, namespace);
}
public void installModule(JarFile earFile, EARContext earContext, Module webModule, ConfigurationStore configurationStore, Repository repository) throws DeploymentException {
Modified: geronimo/branches/1.1/modules/j2ee/src/java/org/apache/geronimo/j2ee/j2eeobjectnames/NameFactory.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/j2ee/src/java/org/apache/geronimo/j2ee/j2eeobjectnames/NameFactory.java?rev=385487&r1=385486&r2=385487&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/j2ee/src/java/org/apache/geronimo/j2ee/j2eeobjectnames/NameFactory.java (original)
+++ geronimo/branches/1.1/modules/j2ee/src/java/org/apache/geronimo/j2ee/j2eeobjectnames/NameFactory.java Mon Mar 13 02:07:53 2006
@@ -95,7 +95,8 @@
public static final String JCA_WORK_MANAGER = "JCAWorkManager";
public static final String JCA_CONNECTION_MANAGER = "JCAConnectionManager";
public static final String WEB_FILTER = "WebFilter";
- public static final String WEB_FILTER_MAPPING = "WebFilterMapping";
+ public static final String URL_WEB_FILTER_MAPPING = "URLWebFilterMapping";
+ public static final String SERVLET_WEB_FILTER_MAPPING = "ServletWebFilterMapping";
public static final String URL_PATTERN = "URLPattern";
public static final String GERONIMO_SERVICE = "GBean"; //copied in GBeanInfoBuilder to avoid dependencies in the wrong direction.
public static final String CORBA_SERVICE = "CORBABean";
@@ -326,7 +327,7 @@
//TODO THIS IS KIND OF WEIRD. Is there a better way???
public static ObjectName getWebFilterMappingName(String j2eeDomainName, String j2eeServerName, String j2eeApplicationName, String j2eeModuleName, String filterName, String servletName, String urlPattern, J2eeContext context) throws MalformedObjectNameException {
Properties props = new Properties();
- props.put(J2EE_TYPE, WEB_FILTER_MAPPING);
+ props.put(J2EE_TYPE, URL_WEB_FILTER_MAPPING);
props.put(J2EE_SERVER, context.getJ2eeServerName(j2eeServerName));
props.put(J2EE_APPLICATION, context.getJ2eeApplicationName(j2eeApplicationName));
props.put(WEB_MODULE, context.getJ2eeModuleName(j2eeModuleName));