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/09/23 03:00:37 UTC
svn commit: r449136 - in
/incubator/openejb/trunk/openejb2/modules/openejb-builder/src:
main/java/org/openejb/deployment/ test/java/org/openejb/deployment/
Author: djencks
Date: Fri Sep 22 18:00:36 2006
New Revision: 449136
URL: http://svn.apache.org/viewvc?view=rev&rev=449136
Log:
GERONIMO-2427. Make ref builders accept either j2ee 1.4 or jee5 deployment descriptor xml
Added:
incubator/openejb/trunk/openejb2/modules/openejb-builder/src/test/java/org/openejb/deployment/MockResourceEnvironmentSetter.java (with props)
Modified:
incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/openejb/deployment/OpenEjbAbstractRefBuilder.java
incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/openejb/deployment/OpenEjbClientRemoteRefBuilder.java
incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/openejb/deployment/OpenEjbLocalRefBuilder.java
incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/openejb/deployment/OpenEjbModuleBuilder.java
incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/openejb/deployment/OpenEjbRemoteRefBuilder.java
incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/openejb/deployment/XmlBeanBuilder.java
incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/openejb/deployment/XmlBeansEntityBuilder.java
incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/openejb/deployment/XmlBeansMdbBuilder.java
incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/openejb/deployment/XmlBeansSessionBuilder.java
incubator/openejb/trunk/openejb2/modules/openejb-builder/src/test/java/org/openejb/deployment/DeploymentTestSuite.java
incubator/openejb/trunk/openejb2/modules/openejb-builder/src/test/java/org/openejb/deployment/PlanParsingTest.java
Modified: incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/openejb/deployment/OpenEjbAbstractRefBuilder.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/openejb/deployment/OpenEjbAbstractRefBuilder.java?view=diff&rev=449136&r1=449135&r2=449136
==============================================================================
--- incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/openejb/deployment/OpenEjbAbstractRefBuilder.java (original)
+++ incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/openejb/deployment/OpenEjbAbstractRefBuilder.java Fri Sep 22 18:00:36 2006
@@ -40,10 +40,9 @@
import org.openejb.RpcEjbDeployment;
/**
- * @version $Rev:$ $Date:$
+ * @version $Rev$ $Date$
*/
public abstract class OpenEjbAbstractRefBuilder extends AbstractNamingBuilder {
- protected static final String J2EE_NAMESPACE = "http://java.sun.com/xml/ns/j2ee";
private final static Map STATELESS = Collections.singletonMap(NameFactory.J2EE_TYPE, NameFactory.STATELESS_SESSION_BEAN);
private final static Map STATEFUL = Collections.singletonMap(NameFactory.J2EE_TYPE, NameFactory.STATEFUL_SESSION_BEAN);
private final static Map ENTITY = Collections.singletonMap(NameFactory.J2EE_TYPE, NameFactory.ENTITY_BEAN);
Modified: incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/openejb/deployment/OpenEjbClientRemoteRefBuilder.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/openejb/deployment/OpenEjbClientRemoteRefBuilder.java?view=diff&rev=449136&r1=449135&r2=449136
==============================================================================
--- incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/openejb/deployment/OpenEjbClientRemoteRefBuilder.java (original)
+++ incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/openejb/deployment/OpenEjbClientRemoteRefBuilder.java Fri Sep 22 18:00:36 2006
@@ -32,20 +32,19 @@
import org.openejb.client.naming.RemoteEJBReference;
/**
- * @version $Rev:$ $Date:$
+ * @version $Rev$ $Date$
*/
public class OpenEjbClientRemoteRefBuilder extends OpenEjbRemoteRefBuilder {
private final ServerMetaData server;
- public OpenEjbClientRemoteRefBuilder(Environment defaultEnvironment, String host, int port) throws UnknownHostException{
- super(defaultEnvironment);
+ public OpenEjbClientRemoteRefBuilder(Environment defaultEnvironment, String[] eeNamespaces, String host, int port) throws UnknownHostException{
+ super(defaultEnvironment, eeNamespaces);
server = new ServerMetaData("BOOT", host, port);
}
protected Reference buildRemoteReference(Artifact configurationId, AbstractNameQuery abstractNameQuery, boolean session, String home, String remote) {
- Reference reference = new RemoteEJBReference(abstractNameQuery.toString(), Collections.singletonList(server));
- return reference;
+ return new RemoteEJBReference(abstractNameQuery.toString(), Collections.singletonList(server));
}
public static final GBeanInfo GBEAN_INFO;
@@ -56,7 +55,7 @@
infoBuilder.addAttribute("host", String.class, true);
infoBuilder.addAttribute("port", int.class, true);
- infoBuilder.setConstructor(new String[]{"defaultEnvironment", "host", "port"});
+ infoBuilder.setConstructor(new String[]{"defaultEnvironment", "eeNamespaces", "host", "port"});
GBEAN_INFO = infoBuilder.getBeanInfo();
}
Modified: incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/openejb/deployment/OpenEjbLocalRefBuilder.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/openejb/deployment/OpenEjbLocalRefBuilder.java?view=diff&rev=449136&r1=449135&r2=449136
==============================================================================
--- incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/openejb/deployment/OpenEjbLocalRefBuilder.java (original)
+++ incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/openejb/deployment/OpenEjbLocalRefBuilder.java Fri Sep 22 18:00:36 2006
@@ -34,6 +34,7 @@
import org.apache.geronimo.kernel.GBeanNotFoundException;
import org.apache.geronimo.kernel.config.Configuration;
import org.apache.geronimo.kernel.repository.Artifact;
+import org.apache.geronimo.kernel.repository.Environment;
import org.apache.geronimo.xbeans.geronimo.naming.GerEjbLocalRefDocument;
import org.apache.geronimo.xbeans.geronimo.naming.GerEjbLocalRefType;
import org.apache.geronimo.xbeans.geronimo.naming.GerPatternType;
@@ -48,13 +49,18 @@
*/
public class OpenEjbLocalRefBuilder extends OpenEjbAbstractRefBuilder {
- private static final QName EJB_LOCAL_REF_QNAME = new QName(J2EE_NAMESPACE, "ejb-local-ref");
- private static final QNameSet EJB_LOCAL_REF_QNAME_SET = QNameSet.singleton(EJB_LOCAL_REF_QNAME);
private static final QName GER_EJB_LOCAL_REF_QNAME = GerEjbLocalRefDocument.type.getDocumentElementName();
private static final QNameSet GER_EJB_LOCAL_REF_QNAME_SET = QNameSet.singleton(GER_EJB_LOCAL_REF_QNAME);
+ private final QNameSet ejbLocalRefQNameSet;
+
+ public OpenEjbLocalRefBuilder(Environment defaultEnvironment, String[] eeNamespaces) {
+ super(defaultEnvironment);
+ ejbLocalRefQNameSet = buildQNameSet(eeNamespaces, "ejb-local-ref");
+ }
+
public void buildNaming(XmlObject specDD, XmlObject plan, Configuration localConfiguration, Configuration remoteConfiguration, Module module, Map componentContext) throws DeploymentException {
- XmlObject[] ejbLocalRefsUntyped = specDD.selectChildren(EJB_LOCAL_REF_QNAME_SET);
+ XmlObject[] ejbLocalRefsUntyped = convert(specDD.selectChildren(ejbLocalRefQNameSet), J2EE_CONVERTER, EjbLocalRefType.type);
XmlObject[] gerEjbLocalRefsUntyped = plan == null? NO_REFS: plan.selectChildren(GER_EJB_LOCAL_REF_QNAME_SET);
Map ejbLocalRefMap = mapEjbLocalRefs(gerEjbLocalRefsUntyped);
ClassLoader cl = localConfiguration.getConfigurationClassLoader();
@@ -120,7 +126,7 @@
}
public QNameSet getSpecQNameSet() {
- return EJB_LOCAL_REF_QNAME_SET;
+ return ejbLocalRefQNameSet;
}
public QNameSet getPlanQNameSet() {
@@ -185,6 +191,10 @@
static {
GBeanInfoBuilder infoBuilder = GBeanInfoBuilder.createStatic(OpenEjbLocalRefBuilder.class, NameFactory.MODULE_BUILDER); //TODO decide what type this should be
+ infoBuilder.addAttribute("eeNamespaces", String[].class, true, true);
+ infoBuilder.addAttribute("defaultEnvironment", Environment.class, true, true);
+
+ infoBuilder.setConstructor(new String[] {"defaultEnvironment", "eeNamespaces"});
GBEAN_INFO = infoBuilder.getBeanInfo();
}
Modified: incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/openejb/deployment/OpenEjbModuleBuilder.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/openejb/deployment/OpenEjbModuleBuilder.java?view=diff&rev=449136&r1=449135&r2=449136
==============================================================================
--- incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/openejb/deployment/OpenEjbModuleBuilder.java (original)
+++ incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/openejb/deployment/OpenEjbModuleBuilder.java Fri Sep 22 18:00:36 2006
@@ -50,7 +50,6 @@
import java.io.File;
import java.io.IOException;
-import java.net.MalformedURLException;
import java.net.URI;
import java.net.URL;
import java.security.Permissions;
@@ -96,6 +95,7 @@
import org.apache.geronimo.kernel.config.ConfigurationStore;
import org.apache.geronimo.kernel.repository.Environment;
import org.apache.geronimo.naming.deployment.ENCConfigBuilder;
+import org.apache.geronimo.naming.deployment.ResourceEnvironmentSetter;
import org.apache.geronimo.schema.NamespaceElementConverter;
import org.apache.geronimo.schema.SchemaConversionUtils;
import org.apache.geronimo.security.jacc.ComponentPermissions;
@@ -143,6 +143,7 @@
private final NamespaceDrivenBuilderCollection serviceBuilders;
private final NamingBuilder namingBuilders;
private final ActivationSpecInfoLocator activationSpecInfoLocator;
+ private final ResourceEnvironmentSetter resourceEnvironmentSetter;
static {
@@ -164,6 +165,7 @@
NamespaceDrivenBuilder securityBuilder,
NamespaceDrivenBuilder serviceBuilder,
NamingBuilder namingBuilders,
+ ResourceEnvironmentSetter resourceEnvironmentSetter,
ActivationSpecInfoLocator activationSpecInfoLocator,
Kernel kernel) throws GBeanNotFoundException {
@@ -179,7 +181,9 @@
securityBuilder == null ? Collections.EMPTY_SET : Collections.singleton(securityBuilder),
serviceBuilder == null ? Collections.EMPTY_SET : Collections.singleton(serviceBuilder),
namingBuilders,
- activationSpecInfoLocator, kernel);
+ resourceEnvironmentSetter,
+ activationSpecInfoLocator,
+ kernel);
}
public OpenEjbModuleBuilder(Environment defaultEnvironment,
@@ -194,6 +198,7 @@
NamespaceDrivenBuilder securityBuilder,
NamespaceDrivenBuilder serviceBuilder,
NamingBuilder namingBuilders,
+ ResourceEnvironmentSetter resourceEnvironmentSetter,
ActivationSpecInfoLocator activationSpecInfoLocator,
Kernel kernel) {
@@ -209,6 +214,7 @@
securityBuilder == null ? Collections.EMPTY_SET : Collections.singleton(securityBuilder),
serviceBuilder == null ? Collections.EMPTY_SET : Collections.singleton(serviceBuilder),
namingBuilders,
+ resourceEnvironmentSetter,
activationSpecInfoLocator,
kernel);
}
@@ -225,7 +231,8 @@
Collection securityBuilders,
Collection serviceBuilders,
NamingBuilder namingBuilders,
- ActivationSpecInfoLocator activationSpecInfoLocator, Kernel kernel) {
+ ResourceEnvironmentSetter resourceEnvironmentSetter, ActivationSpecInfoLocator activationSpecInfoLocator,
+ Kernel kernel) {
this.defaultEnvironment = defaultEnvironment;
this.listener = listener;
@@ -237,6 +244,7 @@
this.securityBuilders = new NamespaceDrivenBuilderCollection(securityBuilders);
this.serviceBuilders = new NamespaceDrivenBuilderCollection(serviceBuilders);
this.namingBuilders = namingBuilders;
+ this.resourceEnvironmentSetter = resourceEnvironmentSetter;
this.activationSpecInfoLocator = activationSpecInfoLocator;
}
@@ -618,6 +626,7 @@
infoBuilder.addReference("SecurityBuilders", NamespaceDrivenBuilder.class, NameFactory.MODULE_BUILDER);
infoBuilder.addReference("ServiceBuilders", NamespaceDrivenBuilder.class, NameFactory.MODULE_BUILDER);
infoBuilder.addReference("NamingBuilders", NamingBuilder.class, NameFactory.MODULE_BUILDER);
+ infoBuilder.addReference("ResourceEnvironmentSetter", ResourceEnvironmentSetter.class, NameFactory.MODULE_BUILDER);
infoBuilder.addReference("ActivationSpecInfoLocator", ActivationSpecInfoLocator.class, NameFactory.MODULE_BUILDER);
infoBuilder.setConstructor(new String[]{
@@ -633,6 +642,7 @@
"SecurityBuilders",
"ServiceBuilders",
"NamingBuilders",
+ "ResourceEnvironmentSetter",
"ActivationSpecInfoLocator",
"kernel"});
GBEAN_INFO = infoBuilder.getBeanInfo();
@@ -644,5 +654,9 @@
public ActivationSpecInfoLocator getActivationSpecInfoLocator() {
return activationSpecInfoLocator;
+ }
+
+ public ResourceEnvironmentSetter getResourceEnvironmentSetter() {
+ return resourceEnvironmentSetter;
}
}
Modified: incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/openejb/deployment/OpenEjbRemoteRefBuilder.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/openejb/deployment/OpenEjbRemoteRefBuilder.java?view=diff&rev=449136&r1=449135&r2=449136
==============================================================================
--- incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/openejb/deployment/OpenEjbRemoteRefBuilder.java (original)
+++ incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/openejb/deployment/OpenEjbRemoteRefBuilder.java Fri Sep 22 18:00:36 2006
@@ -52,13 +52,14 @@
*/
public class OpenEjbRemoteRefBuilder extends OpenEjbAbstractRefBuilder {
- private static final QName EJB_REF_QNAME = new QName(J2EE_NAMESPACE, "ejb-ref");
- private static final QNameSet EJB_REF_QNAME_SET = QNameSet.singleton(EJB_REF_QNAME);
private static final QName GER_EJB_REF_QNAME = GerEjbRefDocument.type.getDocumentElementName();
private static final QNameSet GER_EJB_REF_QNAME_SET = QNameSet.singleton(GER_EJB_REF_QNAME);
- public OpenEjbRemoteRefBuilder(Environment defaultEnvironment) {
+ private final QNameSet ejbRefQNameSet;
+
+ public OpenEjbRemoteRefBuilder(Environment defaultEnvironment, String[] eeNamespaces) {
super(defaultEnvironment);
+ ejbRefQNameSet = buildQNameSet(eeNamespaces, "ejb-ref");
}
protected boolean willMergeEnvironment(XmlObject specDD, XmlObject plan) {
@@ -83,7 +84,7 @@
}
private XmlObject[] getEjbRefs(XmlObject specDD) {
- return specDD.selectChildren(EJB_REF_QNAME_SET);
+ return convert(specDD.selectChildren(ejbRefQNameSet), J2EE_CONVERTER, EjbRefType.type);
}
private Reference addEJBRef(Configuration earContext, Configuration ejbContext, URI moduleURI, EjbRefType ejbRef, GerEjbRefType remoteRef, ClassLoader cl) throws DeploymentException {
@@ -161,7 +162,7 @@
}
public QNameSet getSpecQNameSet() {
- return EJB_REF_QNAME_SET;
+ return ejbRefQNameSet;
}
public QNameSet getPlanQNameSet() {
@@ -240,9 +241,10 @@
static {
GBeanInfoBuilder infoBuilder = GBeanInfoBuilder.createStatic(OpenEjbRemoteRefBuilder.class, NameFactory.MODULE_BUILDER); //TODO decide what type this should be
+ infoBuilder.addAttribute("eeNamespaces", String[].class, true, true);
infoBuilder.addAttribute("defaultEnvironment", Environment.class, true, true);
- infoBuilder.setConstructor(new String[] {"defaultEnvironment"});
+ infoBuilder.setConstructor(new String[] {"defaultEnvironment", "eeNamespaces"});
GBEAN_INFO = infoBuilder.getBeanInfo();
}
Modified: incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/openejb/deployment/XmlBeanBuilder.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/openejb/deployment/XmlBeanBuilder.java?view=diff&rev=449136&r1=449135&r2=449136
==============================================================================
--- incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/openejb/deployment/XmlBeanBuilder.java (original)
+++ incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/openejb/deployment/XmlBeanBuilder.java Fri Sep 22 18:00:36 2006
@@ -49,6 +49,7 @@
import org.apache.geronimo.j2ee.deployment.NamingBuilder;
import org.apache.geronimo.j2ee.deployment.ActivationSpecInfoLocator;
+import org.apache.geronimo.naming.deployment.ResourceEnvironmentSetter;
public abstract class XmlBeanBuilder {
protected final OpenEjbModuleBuilder moduleBuilder;
@@ -63,6 +64,10 @@
public NamingBuilder getNamingBuilders() {
return moduleBuilder.getNamingBuilders();
+ }
+
+ public ResourceEnvironmentSetter getResourceEnvironmentSetter() {
+ return moduleBuilder.getResourceEnvironmentSetter();
}
public ActivationSpecInfoLocator getActivationSpecInfoLocator() {
Modified: incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/openejb/deployment/XmlBeansEntityBuilder.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/openejb/deployment/XmlBeansEntityBuilder.java?view=diff&rev=449136&r1=449135&r2=449136
==============================================================================
--- incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/openejb/deployment/XmlBeansEntityBuilder.java (original)
+++ incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/openejb/deployment/XmlBeansEntityBuilder.java Fri Sep 22 18:00:36 2006
@@ -219,7 +219,7 @@
Configuration earConfiguration = earContext.getConfiguration();
getNamingBuilders().buildNaming(entityBean, openejbEntityBean, earConfiguration, earConfiguration, ejbModule, componentContext);
builder.setComponentContext(componentContext);
- ENCConfigBuilder.setResourceEnvironment(builder, resourceRefs, openejbResourceRefs);
+ getResourceEnvironmentSetter().setResourceEnvironment(builder, resourceRefs, openejbResourceRefs);
}
public void initContext(EARContext earContext, AbstractName moduleBaseName, URI moduleUri, ClassLoader cl, EnterpriseBeansType enterpriseBeans) throws DeploymentException {
Modified: incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/openejb/deployment/XmlBeansMdbBuilder.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/openejb/deployment/XmlBeansMdbBuilder.java?view=diff&rev=449136&r1=449135&r2=449136
==============================================================================
--- incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/openejb/deployment/XmlBeansMdbBuilder.java (original)
+++ incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/openejb/deployment/XmlBeansMdbBuilder.java Fri Sep 22 18:00:36 2006
@@ -437,6 +437,6 @@
Configuration earConfiguration = earContext.getConfiguration();
getNamingBuilders().buildNaming(messageDrivenBean, openejbMessageDrivenBean, earConfiguration, earConfiguration, ejbModule, componentContext);
builder.setComponentContext(componentContext);
- ENCConfigBuilder.setResourceEnvironment(builder, resourceRefs, openejbResourceRefs);
+ getResourceEnvironmentSetter().setResourceEnvironment(builder, resourceRefs, openejbResourceRefs);
}
}
Modified: incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/openejb/deployment/XmlBeansSessionBuilder.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/openejb/deployment/XmlBeansSessionBuilder.java?view=diff&rev=449136&r1=449135&r2=449136
==============================================================================
--- incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/openejb/deployment/XmlBeansSessionBuilder.java (original)
+++ incubator/openejb/trunk/openejb2/modules/openejb-builder/src/main/java/org/openejb/deployment/XmlBeansSessionBuilder.java Fri Sep 22 18:00:36 2006
@@ -286,7 +286,7 @@
Configuration earConfiguration = earContext.getConfiguration();
getNamingBuilders().buildNaming(sessionBean, openejbSessionBean, earConfiguration, earConfiguration, ejbModule, componentContext);
sessionBuilder.setComponentContext(componentContext);
- ENCConfigBuilder.setResourceEnvironment(sessionBuilder, resourceRefs, openejbResourceRefs);
+ getResourceEnvironmentSetter().setResourceEnvironment(sessionBuilder, resourceRefs, openejbResourceRefs);
}
private List createHandlerInfos(JarFile moduleFile, String ejbName, ClassLoader cl) throws DeploymentException {
Modified: incubator/openejb/trunk/openejb2/modules/openejb-builder/src/test/java/org/openejb/deployment/DeploymentTestSuite.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb2/modules/openejb-builder/src/test/java/org/openejb/deployment/DeploymentTestSuite.java?view=diff&rev=449136&r1=449135&r2=449136
==============================================================================
--- incubator/openejb/trunk/openejb2/modules/openejb-builder/src/test/java/org/openejb/deployment/DeploymentTestSuite.java (original)
+++ incubator/openejb/trunk/openejb2/modules/openejb-builder/src/test/java/org/openejb/deployment/DeploymentTestSuite.java Fri Sep 22 18:00:36 2006
@@ -160,6 +160,7 @@
null,
new GBeanBuilder(null, null),
new NamingBuilderCollection(null, null),
+ new MockResourceEnvironmentSetter(),
ACTIVATION_SPEC_INFO_LOCATOR,
null);
Added: incubator/openejb/trunk/openejb2/modules/openejb-builder/src/test/java/org/openejb/deployment/MockResourceEnvironmentSetter.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb2/modules/openejb-builder/src/test/java/org/openejb/deployment/MockResourceEnvironmentSetter.java?view=auto&rev=449136
==============================================================================
--- incubator/openejb/trunk/openejb2/modules/openejb-builder/src/test/java/org/openejb/deployment/MockResourceEnvironmentSetter.java (added)
+++ incubator/openejb/trunk/openejb2/modules/openejb-builder/src/test/java/org/openejb/deployment/MockResourceEnvironmentSetter.java Fri Sep 22 18:00:36 2006
@@ -0,0 +1,34 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+
+package org.openejb.deployment;
+
+import org.apache.geronimo.naming.deployment.ResourceEnvironmentSetter;
+import org.apache.geronimo.naming.deployment.ResourceEnvironmentBuilder;
+import org.apache.geronimo.xbeans.geronimo.naming.GerResourceRefType;
+import org.apache.xmlbeans.XmlObject;
+
+/**
+ * @version $Rev:$ $Date:$
+ */
+public class MockResourceEnvironmentSetter implements ResourceEnvironmentSetter {
+ public void setResourceEnvironment(ResourceEnvironmentBuilder builder, XmlObject[] resourceRefs, GerResourceRefType[] gerResourceRefs) {
+ }
+}
Propchange: incubator/openejb/trunk/openejb2/modules/openejb-builder/src/test/java/org/openejb/deployment/MockResourceEnvironmentSetter.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/openejb/trunk/openejb2/modules/openejb-builder/src/test/java/org/openejb/deployment/MockResourceEnvironmentSetter.java
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: incubator/openejb/trunk/openejb2/modules/openejb-builder/src/test/java/org/openejb/deployment/MockResourceEnvironmentSetter.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: incubator/openejb/trunk/openejb2/modules/openejb-builder/src/test/java/org/openejb/deployment/PlanParsingTest.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb2/modules/openejb-builder/src/test/java/org/openejb/deployment/PlanParsingTest.java?view=diff&rev=449136&r1=449135&r2=449136
==============================================================================
--- incubator/openejb/trunk/openejb2/modules/openejb-builder/src/test/java/org/openejb/deployment/PlanParsingTest.java (original)
+++ incubator/openejb/trunk/openejb2/modules/openejb-builder/src/test/java/org/openejb/deployment/PlanParsingTest.java Fri Sep 22 18:00:36 2006
@@ -4,8 +4,6 @@
import java.util.Collections;
import junit.framework.TestCase;
-import org.apache.geronimo.gbean.GBeanData;
-import org.apache.geronimo.gbean.SingleElementCollection;
import org.apache.geronimo.j2ee.deployment.NamingBuilderCollection;
import org.openejb.xbeans.ejbjar.OpenejbOpenejbJarType;
@@ -29,6 +27,7 @@
Collections.EMPTY_LIST,
Collections.EMPTY_LIST,
new NamingBuilderCollection(null, null),
+ new MockResourceEnvironmentSetter(),
null,
null);
}