Diff
Modified: branches/configid/openejb2/modules/openejb-builder/src/java/org/openejb/deployment/OpenEJBModuleBuilder.java (2455 => 2456)
--- branches/configid/openejb2/modules/openejb-builder/src/java/org/openejb/deployment/OpenEJBModuleBuilder.java 2006-02-17 00:14:15 UTC (rev 2455)
+++ branches/configid/openejb2/modules/openejb-builder/src/java/org/openejb/deployment/OpenEJBModuleBuilder.java 2006-02-17 00:32:26 UTC (rev 2456)
@@ -52,12 +52,11 @@
import org.apache.geronimo.deployment.service.ServiceConfigBuilder;
import org.apache.geronimo.deployment.service.EnvironmentBuilder;
import org.apache.geronimo.deployment.util.DeploymentUtil;
-import org.apache.geronimo.deployment.xbeans.ClassFilterType;
import org.apache.geronimo.deployment.xbeans.ArtifactType;
import org.apache.geronimo.deployment.xbeans.GbeanType;
import org.apache.geronimo.deployment.xbeans.EnvironmentType;
import org.apache.geronimo.deployment.xmlbeans.XmlBeansUtil;
-import org.apache.geronimo.deployment.Environment;
+import org.apache.geronimo.kernel.repository.Environment;
import org.apache.geronimo.gbean.GBeanData;
import org.apache.geronimo.gbean.GBeanInfo;
import org.apache.geronimo.gbean.GBeanInfoBuilder;
@@ -115,11 +114,9 @@
import java.io.IOException;
import java.net.MalformedURLException;
import java.net.URI;
-import java.net.URISyntaxException;
import java.net.URL;
import java.security.Permissions;
import java.util.ArrayList;
-import java.util.Arrays;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
Modified: branches/configid/openejb2/modules/openejb-builder/src/test/org/openejb/deployment/CMPEntityBuilderTest.java (2455 => 2456)
--- branches/configid/openejb2/modules/openejb-builder/src/test/org/openejb/deployment/CMPEntityBuilderTest.java 2006-02-17 00:14:15 UTC (rev 2455)
+++ branches/configid/openejb2/modules/openejb-builder/src/test/org/openejb/deployment/CMPEntityBuilderTest.java 2006-02-17 00:32:26 UTC (rev 2456)
@@ -49,7 +49,6 @@
package org.openejb.deployment;
import java.io.File;
-import java.net.URI;
import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.List;
@@ -61,7 +60,6 @@
import org.apache.geronimo.common.DeploymentException;
import org.apache.geronimo.deployment.util.DeploymentUtil;
-import org.apache.geronimo.deployment.Environment;
import org.apache.geronimo.j2ee.deployment.EARContext;
import org.apache.geronimo.j2ee.j2eeobjectnames.J2eeContext;
import org.apache.geronimo.j2ee.j2eeobjectnames.J2eeContextImpl;
@@ -69,7 +67,6 @@
import org.apache.geronimo.kernel.Kernel;
import org.apache.geronimo.kernel.config.ConfigurationModuleType;
import org.apache.geronimo.kernel.repository.Repository;
-import org.apache.geronimo.kernel.repository.Artifact;
import org.apache.geronimo.xbeans.j2ee.EjbJarDocument;
import org.apache.geronimo.xbeans.j2ee.EjbJarType;
import org.apache.xmlbeans.XmlObject;
Modified: branches/configid/openejb2/modules/openejb-builder/src/test/org/openejb/deployment/DeploymentHelper.java (2455 => 2456)
--- branches/configid/openejb2/modules/openejb-builder/src/test/org/openejb/deployment/DeploymentHelper.java 2006-02-17 00:14:15 UTC (rev 2455)
+++ branches/configid/openejb2/modules/openejb-builder/src/test/org/openejb/deployment/DeploymentHelper.java 2006-02-17 00:32:26 UTC (rev 2456)
@@ -54,15 +54,10 @@
import javax.management.MalformedObjectNameException;
import javax.management.ObjectName;
-import org.apache.geronimo.connector.ActivationSpecWrapper;
import org.apache.geronimo.connector.ActivationSpecWrapperGBean;
-import org.apache.geronimo.connector.ResourceAdapterModuleImpl;
import org.apache.geronimo.connector.ResourceAdapterModuleImplGBean;
-import org.apache.geronimo.connector.ResourceAdapterWrapper;
import org.apache.geronimo.connector.ResourceAdapterWrapperGBean;
-import org.apache.geronimo.connector.outbound.connectiontracking.ConnectionTrackingCoordinator;
import org.apache.geronimo.connector.outbound.connectiontracking.ConnectionTrackingCoordinatorGBean;
-import org.apache.geronimo.connector.work.GeronimoWorkManager;
import org.apache.geronimo.connector.work.GeronimoWorkManagerGBean;
import org.apache.geronimo.gbean.GBeanData;
import org.apache.geronimo.j2ee.j2eeobjectnames.J2eeContext;
@@ -72,14 +67,11 @@
import org.apache.geronimo.kernel.GBeanNotFoundException;
import org.apache.geronimo.kernel.InternalKernelException;
import org.apache.geronimo.kernel.Kernel;
-import org.apache.geronimo.kernel.Kernel;
import org.apache.geronimo.kernel.jmx.JMXUtil;
import org.apache.geronimo.pool.ThreadPool;
import org.apache.geronimo.timer.vm.VMStoreThreadPooledNonTransactionalTimer;
import org.apache.geronimo.timer.vm.VMStoreThreadPooledTransactionalTimer;
-import org.apache.geronimo.transaction.context.TransactionContextManager;
import org.apache.geronimo.transaction.context.TransactionContextManagerGBean;
-import org.apache.geronimo.transaction.manager.TransactionManagerImpl;
import org.apache.geronimo.transaction.manager.TransactionManagerImplGBean;
import org.openejb.deployment.mdb.mockra.MockActivationSpec;
import org.openejb.deployment.mdb.mockra.MockResourceAdapter;
@@ -92,24 +84,25 @@
* */
public class DeploymentHelper {
//these have to match the domain and server set in KernelHelper mock config store
- public static final String j2eeDomainName = "test";
- public static final String j2eeServerName = "server";
+ public static final String DOMAIN_NAME = "test";
+ public static final String SERVER_NAME = "server";
+ public static final String BASE_NAME = DOMAIN_NAME + ":J2EEServer=" + SERVER_NAME;
private static final String appName = NameFactory.NULL;
private static final String moduleName = "MockRA";
//type is random to look for problems.
- private static final J2eeContext raContext = new J2eeContextImpl(j2eeDomainName, j2eeServerName, appName, NameFactory.RESOURCE_ADAPTER_MODULE, moduleName, "xxx", NameFactory.JCA_WORK_MANAGER);
+ private static final J2eeContext raContext = new J2eeContextImpl(DOMAIN_NAME, SERVER_NAME, appName, NameFactory.RESOURCE_ADAPTER_MODULE, moduleName, "xxx", NameFactory.JCA_WORK_MANAGER);
public static final ObjectName CONTAINER_NAME = JMXUtil.getObjectName("geronimo.test:ejb=Mock");
- public static final ObjectName TRANSACTIONMANAGER_NAME = JMXUtil.getObjectName(j2eeDomainName + ":type=TransactionManager");
- public static final ObjectName TRANSACTIONCONTEXTMANAGER_NAME = JMXUtil.getObjectName(j2eeDomainName + ":type=TransactionContextManager");
+ public static final ObjectName TRANSACTIONMANAGER_NAME = JMXUtil.getObjectName(DOMAIN_NAME + ":type=TransactionManager");
+ public static final ObjectName TRANSACTIONCONTEXTMANAGER_NAME = JMXUtil.getObjectName(DOMAIN_NAME + ":type=TransactionContextManager");
public static final ObjectName TRACKEDCONNECTIONASSOCIATOR_NAME = JMXUtil.getObjectName("geronimo.test:role=TrackedConnectionAssociator");
public static final ObjectName WORKMANAGER_NAME = JMXUtil.getObjectName("geronimo.server:type=WorkManager,name=DefaultWorkManager");
public static final ObjectName RESOURCE_ADAPTER_MODULE_NAME;
public static final ObjectName RESOURCE_ADAPTER_NAME;
public static final ObjectName ACTIVATIONSPEC_NAME;
- public static final ObjectName THREADPOOL_NAME = JMXUtil.getObjectName(j2eeServerName + ":type=ThreadPool,name=DefaultThreadPool");
- public static final ObjectName TRANSACTIONALTIMER_NAME = JMXUtil.getObjectName(j2eeServerName + ":type=ThreadPooledTimer,name=TransactionalThreaPooledTimer");
- public static final ObjectName NONTRANSACTIONALTIMER_NAME = JMXUtil.getObjectName(j2eeServerName + ":type=ThreadPooledTimer,name=NonTransactionalThreaPooledTimer");
+ public static final ObjectName THREADPOOL_NAME = JMXUtil.getObjectName(SERVER_NAME + ":type=ThreadPool,name=DefaultThreadPool");
+ public static final ObjectName TRANSACTIONALTIMER_NAME = JMXUtil.getObjectName(SERVER_NAME + ":type=ThreadPooledTimer,name=TransactionalThreaPooledTimer");
+ public static final ObjectName NONTRANSACTIONALTIMER_NAME = JMXUtil.getObjectName(SERVER_NAME + ":type=ThreadPooledTimer,name=NonTransactionalThreaPooledTimer");
public static final GBeanData ACTIVATION_SPEC_INFO = new GBeanData(ActivationSpecWrapperGBean.getGBeanInfo());
static {
Modified: branches/configid/openejb2/modules/openejb-builder/src/test/org/openejb/deployment/DeploymentTestContants.java (2455 => 2456)
--- branches/configid/openejb2/modules/openejb-builder/src/test/org/openejb/deployment/DeploymentTestContants.java 2006-02-17 00:14:15 UTC (rev 2455)
+++ branches/configid/openejb2/modules/openejb-builder/src/test/org/openejb/deployment/DeploymentTestContants.java 2006-02-17 00:32:26 UTC (rev 2456)
@@ -62,10 +62,8 @@
import org.apache.geronimo.j2ee.deployment.ResourceReferenceBuilder;
import org.apache.geronimo.j2ee.deployment.ServiceReferenceBuilder;
import org.apache.geronimo.j2ee.deployment.Module;
-import org.apache.geronimo.j2ee.deployment.NamingContext;
import org.apache.geronimo.gbean.GBeanData;
import org.apache.geronimo.deployment.DeploymentContext;
-import org.apache.geronimo.xbeans.j2ee.ServiceRefHandlerType;
/**
* @version $Revision$ $Date$
@@ -73,8 +71,8 @@
public interface DeploymentTestContants {
public static final ObjectName CONFIGURATION_OBJECT_NAME = IGNORE.createConfigurationObjectName();
public static final ObjectName CONNECTION_OBJECT_NAME = IGNORE.createConnectionObjectName();
- public static final String DOMAIN_NAME = DeploymentHelper.j2eeDomainName;
- public static final String SERVER_NAME = DeploymentHelper.j2eeServerName;
+ public static final String DOMAIN_NAME = DeploymentHelper.DOMAIN_NAME;
+ public static final String SERVER_NAME = DeploymentHelper.SERVER_NAME;
public static final ResourceReferenceBuilder resourceReferenceBuilder = new ResourceReferenceBuilder() {
public Reference createResourceRef(String containerId, Class iface) {
Modified: branches/configid/openejb2/modules/openejb-builder/src/test/org/openejb/deployment/KernelHelper.java (2455 => 2456)
--- branches/configid/openejb2/modules/openejb-builder/src/test/org/openejb/deployment/KernelHelper.java 2006-02-17 00:14:15 UTC (rev 2455)
+++ branches/configid/openejb2/modules/openejb-builder/src/test/org/openejb/deployment/KernelHelper.java 2006-02-17 00:32:26 UTC (rev 2456)
@@ -33,6 +33,7 @@
import org.apache.geronimo.kernel.KernelFactory;
import org.apache.geronimo.kernel.Kernel;
import org.apache.geronimo.kernel.repository.Artifact;
+import org.apache.geronimo.kernel.repository.Environment;
import org.apache.geronimo.kernel.config.ConfigurationManagerImpl;
import org.apache.geronimo.kernel.config.Configuration;
import org.apache.geronimo.kernel.config.ConfigurationStore;
@@ -42,7 +43,6 @@
import org.apache.geronimo.kernel.config.ConfigurationManager;
import org.apache.geronimo.kernel.jmx.JMXUtil;
import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
-import org.apache.geronimo.deployment.Environment;
/**
* @version $Rev$ $Date$
@@ -52,15 +52,14 @@
public static final Environment ENVIRONMENT = new Environment();
static {
- Map nameKeys = new HashMap();
- nameKeys.put("domain", "test");
- nameKeys.put("J2EEServer", "server");
+ Map Properties = new HashMap();
+ Properties.put(NameFactory.JSR77_BASE_NAME_PROPERTY, DeploymentHelper.BASE_NAME);
Artifact defaultConfigId = Artifact.create("geronimo/server/1/car");
DEFAULT_ENVIRONMENT.setConfigId(defaultConfigId);
- DEFAULT_ENVIRONMENT.addNameKeys(nameKeys);
+ DEFAULT_ENVIRONMENT.addProperties(Properties);
Artifact configId = Artifact.create("test/test/1/car");
ENVIRONMENT.setConfigId(configId);
- ENVIRONMENT.addNameKeys(nameKeys);
+ ENVIRONMENT.addProperties(Properties);
}
public static Kernel getPreparedKernel() throws Exception {
Modified: branches/configid/openejb2/modules/openejb-builder/src/test-cmp/cmr-mapping/cmr-name-nok-openejb-jar.xml (2455 => 2456)
--- branches/configid/openejb2/modules/openejb-builder/src/test-cmp/cmr-mapping/cmr-name-nok-openejb-jar.xml 2006-02-17 00:14:15 UTC (rev 2455)
+++ branches/configid/openejb2/modules/openejb-builder/src/test-cmp/cmr-mapping/cmr-name-nok-openejb-jar.xml 2006-02-17 00:32:26 UTC (rev 2456)
@@ -6,11 +6,10 @@
<environment>
<configId>
<groupId>foo</groupId>
- <type>car</type>
<artifactId>bar</artifactId>
<version>1</version>
+ <type>car</type>
</configId>
- <classloader></classloader>
</environment>
<cmp-connection-factory>
Modified: branches/configid/openejb2/modules/openejb-builder/src/test-cmp/cmr-mapping/names-ok-openejb-jar.xml (2455 => 2456)
--- branches/configid/openejb2/modules/openejb-builder/src/test-cmp/cmr-mapping/names-ok-openejb-jar.xml 2006-02-17 00:14:15 UTC (rev 2455)
+++ branches/configid/openejb2/modules/openejb-builder/src/test-cmp/cmr-mapping/names-ok-openejb-jar.xml 2006-02-17 00:32:26 UTC (rev 2456)
@@ -6,11 +6,10 @@
<environment>
<configId>
<groupId>foo</groupId>
- <type>car</type>
<artifactId>bar</artifactId>
<version>1</version>
+ <type>car</type>
</configId>
- <classloader></classloader>
</environment>
<cmp-connection-factory>
Modified: branches/configid/openejb2/modules/openejb-builder/src/test-cmp/cmr-mapping/source-name-nok-openejb-jar.xml (2455 => 2456)
--- branches/configid/openejb2/modules/openejb-builder/src/test-cmp/cmr-mapping/source-name-nok-openejb-jar.xml 2006-02-17 00:14:15 UTC (rev 2455)
+++ branches/configid/openejb2/modules/openejb-builder/src/test-cmp/cmr-mapping/source-name-nok-openejb-jar.xml 2006-02-17 00:32:26 UTC (rev 2456)
@@ -6,11 +6,10 @@
<environment>
<configId>
<groupId>foo</groupId>
- <type>car</type>
<artifactId>bar</artifactId>
<version>1</version>
+ <type>car</type>
</configId>
- <classloader></classloader>
</environment>
<cmp-connection-factory>
Modified: branches/configid/openejb2/modules/openejb-builder/src/test-cmp/ejb-ql/openejb-jar.xml (2455 => 2456)
--- branches/configid/openejb2/modules/openejb-builder/src/test-cmp/ejb-ql/openejb-jar.xml 2006-02-17 00:14:15 UTC (rev 2455)
+++ branches/configid/openejb2/modules/openejb-builder/src/test-cmp/ejb-ql/openejb-jar.xml 2006-02-17 00:32:26 UTC (rev 2456)
@@ -6,11 +6,10 @@
<environment>
<configId>
<groupId>foo</groupId>
- <type>car</type>
<artifactId>bar</artifactId>
<version>1</version>
+ <type>car</type>
</configId>
- <classloader></classloader>
</environment>
<cmp-connection-factory>
Modified: branches/configid/openejb2/modules/openejb-builder/src/test-cmp/manytomany/compoundpk/openejb-jar.xml (2455 => 2456)
--- branches/configid/openejb2/modules/openejb-builder/src/test-cmp/manytomany/compoundpk/openejb-jar.xml 2006-02-17 00:14:15 UTC (rev 2455)
+++ branches/configid/openejb2/modules/openejb-builder/src/test-cmp/manytomany/compoundpk/openejb-jar.xml 2006-02-17 00:32:26 UTC (rev 2456)
@@ -6,11 +6,10 @@
<environment>
<configId>
<groupId>foo</groupId>
- <type>car</type>
<artifactId>bar</artifactId>
<version>1</version>
+ <type>car</type>
</configId>
- <classloader></classloader>
</environment>
<cmp-connection-factory>
Modified: branches/configid/openejb2/modules/openejb-builder/src/test-cmp/manytomany/simplepk/openejb-jar.xml (2455 => 2456)
--- branches/configid/openejb2/modules/openejb-builder/src/test-cmp/manytomany/simplepk/openejb-jar.xml 2006-02-17 00:14:15 UTC (rev 2455)
+++ branches/configid/openejb2/modules/openejb-builder/src/test-cmp/manytomany/simplepk/openejb-jar.xml 2006-02-17 00:32:26 UTC (rev 2456)
@@ -6,11 +6,10 @@
<environment>
<configId>
<groupId>foo</groupId>
- <type>car</type>
<artifactId>bar</artifactId>
<version>1</version>
+ <type>car</type>
</configId>
- <classloader></classloader>
</environment>
<cmp-connection-factory>
Modified: branches/configid/openejb2/modules/openejb-builder/src/test-cmp/manytomany/simplepk/unidirectional-openejb-jar.xml (2455 => 2456)
--- branches/configid/openejb2/modules/openejb-builder/src/test-cmp/manytomany/simplepk/unidirectional-openejb-jar.xml 2006-02-17 00:14:15 UTC (rev 2455)
+++ branches/configid/openejb2/modules/openejb-builder/src/test-cmp/manytomany/simplepk/unidirectional-openejb-jar.xml 2006-02-17 00:32:26 UTC (rev 2456)
@@ -6,11 +6,10 @@
<environment>
<configId>
<groupId>foo</groupId>
- <type>car</type>
<artifactId>bar</artifactId>
<version>1</version>
+ <type>car</type>
</configId>
- <classloader></classloader>
</environment>
<cmp-connection-factory>
Modified: branches/configid/openejb2/modules/openejb-builder/src/test-cmp/onetomany/compoundpk/openejb-jar.xml (2455 => 2456)
--- branches/configid/openejb2/modules/openejb-builder/src/test-cmp/onetomany/compoundpk/openejb-jar.xml 2006-02-17 00:14:15 UTC (rev 2455)
+++ branches/configid/openejb2/modules/openejb-builder/src/test-cmp/onetomany/compoundpk/openejb-jar.xml 2006-02-17 00:32:26 UTC (rev 2456)
@@ -6,11 +6,10 @@
<environment>
<configId>
<groupId>foo</groupId>
- <type>car</type>
<artifactId>bar</artifactId>
<version>1</version>
+ <type>car</type>
</configId>
- <classloader></classloader>
</environment>
<cmp-connection-factory>
Modified: branches/configid/openejb2/modules/openejb-builder/src/test-cmp/onetomany/simplepk/openejb-jar.xml (2455 => 2456)
--- branches/configid/openejb2/modules/openejb-builder/src/test-cmp/onetomany/simplepk/openejb-jar.xml 2006-02-17 00:14:15 UTC (rev 2455)
+++ branches/configid/openejb2/modules/openejb-builder/src/test-cmp/onetomany/simplepk/openejb-jar.xml 2006-02-17 00:32:26 UTC (rev 2456)
@@ -6,11 +6,10 @@
<environment>
<configId>
<groupId>foo</groupId>
- <type>car</type>
<artifactId>bar</artifactId>
<version>1</version>
+ <type>car</type>
</configId>
- <classloader></classloader>
</environment>
<cmp-connection-factory>
Modified: branches/configid/openejb2/modules/openejb-builder/src/test-cmp/onetomany/simplepk/unidirectional-openejb-jar.xml (2455 => 2456)
--- branches/configid/openejb2/modules/openejb-builder/src/test-cmp/onetomany/simplepk/unidirectional-openejb-jar.xml 2006-02-17 00:14:15 UTC (rev 2455)
+++ branches/configid/openejb2/modules/openejb-builder/src/test-cmp/onetomany/simplepk/unidirectional-openejb-jar.xml 2006-02-17 00:32:26 UTC (rev 2456)
@@ -6,11 +6,10 @@
<environment>
<configId>
<groupId>foo</groupId>
- <type>car</type>
<artifactId>bar</artifactId>
<version>1</version>
+ <type>car</type>
</configId>
- <classloader></classloader>
</environment>
<cmp-connection-factory>
Modified: branches/configid/openejb2/modules/openejb-builder/src/test-cmp/onetoone/compoundpk/openejb-jar.xml (2455 => 2456)
--- branches/configid/openejb2/modules/openejb-builder/src/test-cmp/onetoone/compoundpk/openejb-jar.xml 2006-02-17 00:14:15 UTC (rev 2455)
+++ branches/configid/openejb2/modules/openejb-builder/src/test-cmp/onetoone/compoundpk/openejb-jar.xml 2006-02-17 00:32:26 UTC (rev 2456)
@@ -6,11 +6,10 @@
<environment>
<configId>
<groupId>foo</groupId>
- <type>car</type>
<artifactId>bar</artifactId>
<version>1</version>
+ <type>car</type>
</configId>
- <classloader></classloader>
</environment>
<cmp-connection-factory>
Modified: branches/configid/openejb2/modules/openejb-builder/src/test-cmp/onetoone/simplepk/openejb-jar.xml (2455 => 2456)
--- branches/configid/openejb2/modules/openejb-builder/src/test-cmp/onetoone/simplepk/openejb-jar.xml 2006-02-17 00:14:15 UTC (rev 2455)
+++ branches/configid/openejb2/modules/openejb-builder/src/test-cmp/onetoone/simplepk/openejb-jar.xml 2006-02-17 00:32:26 UTC (rev 2456)
@@ -6,11 +6,10 @@
<environment>
<configId>
<groupId>foo</groupId>
- <type>car</type>
<artifactId>bar</artifactId>
<version>1</version>
+ <type>car</type>
</configId>
- <classloader></classloader>
</environment>
<cmp-connection-factory>
Modified: branches/configid/openejb2/modules/openejb-builder/src/test-cmp/onetoone/simplepk/unidirectional-openejb-jar.xml (2455 => 2456)
--- branches/configid/openejb2/modules/openejb-builder/src/test-cmp/onetoone/simplepk/unidirectional-openejb-jar.xml 2006-02-17 00:14:15 UTC (rev 2455)
+++ branches/configid/openejb2/modules/openejb-builder/src/test-cmp/onetoone/simplepk/unidirectional-openejb-jar.xml 2006-02-17 00:32:26 UTC (rev 2456)
@@ -6,11 +6,10 @@
<environment>
<configId>
<groupId>foo</groupId>
- <type>car</type>
<artifactId>bar</artifactId>
<version>1</version>
+ <type>car</type>
</configId>
- <classloader></classloader>
</environment>
<cmp-connection-factory>
Modified: branches/configid/openejb2/modules/openejb-builder/src/test-ear/META-INF/geronimo-application.xml (2455 => 2456)
--- branches/configid/openejb2/modules/openejb-builder/src/test-ear/META-INF/geronimo-application.xml 2006-02-17 00:14:15 UTC (rev 2455)
+++ branches/configid/openejb2/modules/openejb-builder/src/test-ear/META-INF/geronimo-application.xml 2006-02-17 00:32:26 UTC (rev 2456)
@@ -20,11 +20,10 @@
<environment>
<configId>
<groupId>foo</groupId>
- <type>car</type>
<artifactId>bar</artifactId>
<version>1</version>
+ <type>car</type>
</configId>
- <classloader></classloader>
</environment>
</application>
\ No newline at end of file
Modified: branches/configid/openejb2/modules/openejb-builder/src/test-ejb-jar/META-INF/openejb-jar.xml (2455 => 2456)
--- branches/configid/openejb2/modules/openejb-builder/src/test-ejb-jar/META-INF/openejb-jar.xml 2006-02-17 00:14:15 UTC (rev 2455)
+++ branches/configid/openejb2/modules/openejb-builder/src/test-ejb-jar/META-INF/openejb-jar.xml 2006-02-17 00:32:26 UTC (rev 2456)
@@ -6,11 +6,10 @@
<environment>
<configId>
<groupId>foo</groupId>
- <type>car</type>
<artifactId>bar</artifactId>
<version>1</version>
+ <type>car</type>
</configId>
- <classloader></classloader>
</environment>
<cmp-connection-factory>
Modified: branches/configid/openejb2/modules/openejb-builder/src/test-resources/plans/plan1.xml (2455 => 2456)
--- branches/configid/openejb2/modules/openejb-builder/src/test-resources/plans/plan1.xml 2006-02-17 00:14:15 UTC (rev 2455)
+++ branches/configid/openejb2/modules/openejb-builder/src/test-resources/plans/plan1.xml 2006-02-17 00:32:26 UTC (rev 2456)
@@ -6,11 +6,10 @@
<environment>
<configId>
<groupId>foo</groupId>
- <type>car</type>
<artifactId>bar</artifactId>
<version>1</version>
+ <type>car</type>
</configId>
- <classloader></classloader>
</environment>
<cmp-connection-factory>
