You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by dj...@apache.org on 2006/10/24 10:55:24 UTC
svn commit: r467281 - in
/incubator/openejb/trunk/openejb2/modules/openejb-builder/src:
main/java/org/apache/openejb/deployment/
test/java/org/apache/openejb/deployment/
Author: djencks
Date: Tue Oct 24 01:55:23 2006
New Revision: 467281
URL: http://svn.apache.org/viewvc?view=rev&rev=467281
Log:
OPENEJB-294 use the correct OpenEjbModuleBuilder constructor
Modified:
incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/apache/openejb/deployment/OpenEjbModuleBuilder.java
incubator/openejb/trunk/openejb2/modules/openejb-builder/src/test/java/org/apache/openejb/deployment/DeploymentTestSuite.java
incubator/openejb/trunk/openejb2/modules/openejb-builder/src/test/java/org/apache/openejb/deployment/PlanParsingTest.java
Modified: incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/apache/openejb/deployment/OpenEjbModuleBuilder.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/apache/openejb/deployment/OpenEjbModuleBuilder.java?view=diff&rev=467281&r1=467280&r2=467281
==============================================================================
--- incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/apache/openejb/deployment/OpenEjbModuleBuilder.java (original)
+++ incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/apache/openejb/deployment/OpenEjbModuleBuilder.java Tue Oct 24 01:55:23 2006
@@ -134,8 +134,8 @@
AbstractNameQuery listener,
Object webServiceLinkTemplate,
Collection webServiceBuilder,
- NamespaceDrivenBuilder securityBuilder,
- NamespaceDrivenBuilder serviceBuilder,
+ Collection securityBuilders,
+ Collection serviceBuilders,
NamingBuilder namingBuilders,
ResourceEnvironmentSetter resourceEnvironmentSetter,
ActivationSpecInfoLocator activationSpecInfoLocator,
@@ -150,20 +150,21 @@
listener,
getLinkData(kernel, webServiceLinkTemplate),
new SingleElementCollection(webServiceBuilder),
- securityBuilder == null ? Collections.EMPTY_SET : Collections.singleton(securityBuilder),
- serviceBuilder == null ? Collections.EMPTY_SET : Collections.singleton(serviceBuilder),
+ securityBuilders == null ? Collections.EMPTY_SET : securityBuilders,
+ serviceBuilders == null ? Collections.EMPTY_SET : serviceBuilders,
namingBuilders,
resourceEnvironmentSetter,
activationSpecInfoLocator,
kernel);
}
- public OpenEjbModuleBuilder(Environment defaultEnvironment,
- String defaultStatelessEjbContainer,
+ //note different constructor argument order to avoid confusing GBeanInfo
+ public OpenEjbModuleBuilder(String defaultStatelessEjbContainer,
String defaultStatefulEjbContainer,
String defaultBmpEjbContainer,
String defaultCmpEjbContainer,
String defaultMdbEjbContainer,
+ Environment defaultEnvironment,
AbstractNameQuery listener,
GBeanData linkTemplate,
WebServiceBuilder webServiceBuilder,
@@ -191,7 +192,7 @@
kernel);
}
- public OpenEjbModuleBuilder(Environment defaultEnvironment,
+ OpenEjbModuleBuilder(Environment defaultEnvironment,
String defaultStatelessEjbContainer,
String defaultStatefulEjbContainer,
String defaultBmpEjbContainer,
@@ -203,7 +204,8 @@
Collection securityBuilders,
Collection serviceBuilders,
NamingBuilder namingBuilders,
- ResourceEnvironmentSetter resourceEnvironmentSetter, ActivationSpecInfoLocator activationSpecInfoLocator,
+ ResourceEnvironmentSetter resourceEnvironmentSetter,
+ ActivationSpecInfoLocator activationSpecInfoLocator,
Kernel kernel) {
this.defaultEnvironment = defaultEnvironment;
Modified: incubator/openejb/trunk/openejb2/modules/openejb-builder/src/test/java/org/apache/openejb/deployment/DeploymentTestSuite.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb2/modules/openejb-builder/src/test/java/org/apache/openejb/deployment/DeploymentTestSuite.java?view=diff&rev=467281&r1=467280&r2=467281
==============================================================================
--- incubator/openejb/trunk/openejb2/modules/openejb-builder/src/test/java/org/apache/openejb/deployment/DeploymentTestSuite.java (original)
+++ incubator/openejb/trunk/openejb2/modules/openejb-builder/src/test/java/org/apache/openejb/deployment/DeploymentTestSuite.java Tue Oct 24 01:55:23 2006
@@ -127,12 +127,7 @@
WebServiceBuilder webServiceBuilder = new AxisBuilder();
GBeanData linkData = new GBeanData(WSContainerGBean.GBEAN_INFO);
- OpenEjbModuleBuilder moduleBuilder = new OpenEjbModuleBuilder(defaultEnvironment,
- deploymentHelper.statelessEjbContainerName,
- deploymentHelper.statefulEjbContainerName,
- deploymentHelper.bmpEjbContainerName,
- deploymentHelper.cmpEjbContainerName,
- deploymentHelper.mdbEjbContainerName,
+ OpenEjbModuleBuilder moduleBuilder = new OpenEjbModuleBuilder(deploymentHelper.statelessEjbContainerName, deploymentHelper.statefulEjbContainerName, deploymentHelper.bmpEjbContainerName, deploymentHelper.cmpEjbContainerName, deploymentHelper.mdbEjbContainerName, defaultEnvironment,
null,
linkData,
webServiceBuilder,
Modified: incubator/openejb/trunk/openejb2/modules/openejb-builder/src/test/java/org/apache/openejb/deployment/PlanParsingTest.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb2/modules/openejb-builder/src/test/java/org/apache/openejb/deployment/PlanParsingTest.java?view=diff&rev=467281&r1=467280&r2=467281
==============================================================================
--- incubator/openejb/trunk/openejb2/modules/openejb-builder/src/test/java/org/apache/openejb/deployment/PlanParsingTest.java (original)
+++ incubator/openejb/trunk/openejb2/modules/openejb-builder/src/test/java/org/apache/openejb/deployment/PlanParsingTest.java Tue Oct 24 01:55:23 2006
@@ -18,9 +18,12 @@
import java.io.File;
import java.util.Collections;
+import java.util.Collection;
import junit.framework.TestCase;
import org.apache.geronimo.j2ee.deployment.NamingBuilderCollection;
+import org.apache.geronimo.j2ee.deployment.WebServiceBuilder;
+import org.apache.geronimo.kernel.repository.Environment;
import org.apache.openejb.xbeans.ejbjar.OpenejbOpenejbJarType;
/**
@@ -31,7 +34,7 @@
protected void setUp() throws Exception {
super.setUp();
- builder = new OpenEjbModuleBuilder(null,
+ builder = new OpenEjbModuleBuilder(null,
null,
null,
null,
@@ -39,9 +42,9 @@
null,
null,
null,
+ (WebServiceBuilder)null,
+ null,
null,
- Collections.EMPTY_LIST,
- Collections.EMPTY_LIST,
new NamingBuilderCollection(null, null),
new MockResourceEnvironmentSetter(),
null,