Diff
Modified: branches/configid/openejb2/modules/openejb-builder/src/java/org/openejb/deployment/OpenEJBModuleBuilder.java (2428 => 2429)
--- branches/configid/openejb2/modules/openejb-builder/src/java/org/openejb/deployment/OpenEJBModuleBuilder.java 2006-02-05 23:49:24 UTC (rev 2428)
+++ branches/configid/openejb2/modules/openejb-builder/src/java/org/openejb/deployment/OpenEJBModuleBuilder.java 2006-02-08 02:59:57 UTC (rev 2429)
@@ -55,6 +55,7 @@
import org.apache.geronimo.deployment.xbeans.DependencyType;
import org.apache.geronimo.deployment.xbeans.GbeanType;
import org.apache.geronimo.deployment.xmlbeans.XmlBeansUtil;
+import org.apache.geronimo.deployment.Environment;
import org.apache.geronimo.gbean.GBeanData;
import org.apache.geronimo.gbean.GBeanInfo;
import org.apache.geronimo.gbean.GBeanInfoBuilder;
@@ -185,7 +186,7 @@
return createModule(plan, moduleFile, "ejb", null, true);
}
- public Module createModule(Object plan, JarFile moduleFile, String targetPath, URL specDDUrl, URI earConfigId, Object moduleContextInfo) throws DeploymentException {
+ public Module createModule(Object plan, JarFile moduleFile, String targetPath, URL specDDUrl, Environment environment, Object moduleContextInfo) throws DeploymentException {
return createModule(plan, moduleFile, targetPath, specDDUrl, false);
}
@@ -234,7 +235,7 @@
parentId = new ArrayList(defaultParentId);
}
- return new EJBModule(standAlone, configId, parentId, moduleFile, targetPath, ejbJar, openejbJar, specDD);
+ return new EJBModule(standAlone, configId, moduleFile, targetPath, ejbJar, openejbJar, specDD);
}
OpenejbOpenejbJarType getOpenejbJar(Object plan, JarFile moduleFile, boolean standAlone, String targetPath, EjbJarType ejbJar) throws DeploymentException {
Modified: branches/configid/openejb2/modules/openejb-builder/src/schema/openejb-jar-2.1.xsd (2428 => 2429)
--- branches/configid/openejb2/modules/openejb-builder/src/schema/openejb-jar-2.1.xsd 2006-02-05 23:49:24 UTC (rev 2428)
+++ branches/configid/openejb2/modules/openejb-builder/src/schema/openejb-jar-2.1.xsd 2006-02-08 02:59:57 UTC (rev 2429)
@@ -69,11 +69,7 @@
<xs:complexType name="openejb-jarType">
<xs:sequence>
-<!-- <xs:element ref="sys:parent" minOccurs="0" maxOccurs="unbounded"/>-->
-<!-- <xs:element ref="sys:dependency" minOccurs="0" maxOccurs="unbounded"/>-->
-<!-- <xs:element ref="sys:hidden-classes" minOccurs="0" maxOccurs="unbounded"/>-->
-<!-- <xs:element ref="sys:non-overridable-classes" minOccurs="0" maxOccurs="unbounded"/>-->
- <xs:group ref="sys:classloader-infoGroup"/>
+ <xs:element ref="sys:environment"/>
<!-- use a ref to put this element in the naming namespace rather than openejb namespace-->
<xs:element ref="naming:cmp-connection-factory" minOccurs="0"/>
@@ -103,9 +99,6 @@
<xs:element ref="security:security" minOccurs="0"/>
<xs:element ref="sys:gbean" minOccurs="0" maxOccurs="unbounded"/>
</xs:sequence>
- <xs:attribute name="configId" type="xs:string" use="required"/>
- <xs:attribute name="parentId" type="xs:string" use="optional"/>
- <xs:attribute name="inverseClassloading" type="xs:boolean" use="optional"/>
</xs:complexType>
<!-- session bean section-->
Modified: branches/configid/openejb2/modules/openejb-builder/src/test/org/openejb/deployment/CMPEntityBuilderTest.java (2428 => 2429)
--- branches/configid/openejb2/modules/openejb-builder/src/test/org/openejb/deployment/CMPEntityBuilderTest.java 2006-02-05 23:49:24 UTC (rev 2428)
+++ branches/configid/openejb2/modules/openejb-builder/src/test/org/openejb/deployment/CMPEntityBuilderTest.java 2006-02-08 02:59:57 UTC (rev 2429)
@@ -148,7 +148,6 @@
EARContext earContext = new EARContext(tempDir,
new URI("test"),
ConfigurationModuleType.EJB,
- KernelHelper.DEFAULT_PARENTID_LIST,
kernel,
"null",
null,
@@ -193,7 +192,6 @@
EARContext earContext = new EARContext(tempDir,
new URI("test"),
ConfigurationModuleType.EJB,
- KernelHelper.DEFAULT_PARENTID_LIST,
kernel,
"null",
null,
@@ -239,7 +237,6 @@
EARContext earContext = new EARContext(tempDir,
new URI("test"),
ConfigurationModuleType.EJB,
- KernelHelper.DEFAULT_PARENTID_LIST,
kernel,
"null",
null,
Modified: branches/configid/openejb2/modules/openejb-builder/src/test/org/openejb/deployment/KernelHelper.java (2428 => 2429)
--- branches/configid/openejb2/modules/openejb-builder/src/test/org/openejb/deployment/KernelHelper.java 2006-02-05 23:49:24 UTC (rev 2428)
+++ branches/configid/openejb2/modules/openejb-builder/src/test/org/openejb/deployment/KernelHelper.java 2006-02-08 02:59:57 UTC (rev 2429)
@@ -33,6 +33,7 @@
import org.apache.geronimo.gbean.GBeanInfoBuilder;
import org.apache.geronimo.kernel.KernelFactory;
import org.apache.geronimo.kernel.Kernel;
+import org.apache.geronimo.kernel.repository.Artifact;
import org.apache.geronimo.kernel.config.ConfigurationManagerImpl;
import org.apache.geronimo.kernel.config.Configuration;
import org.apache.geronimo.kernel.config.ConfigurationStore;
@@ -44,7 +45,7 @@
import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
/**
- * @version $Rev: $ $Date$
+ * @version $Rev$ $Date$
*/
public class KernelHelper {
public static final URI[] DEFAULT_PARENTID_ARRAY = new URI[] {URI.create("org/apache/geronimo/Server")};
@@ -64,9 +65,9 @@
kernel.startGBean(configurationManagerName);
ConfigurationManager configurationManager = (ConfigurationManager) kernel.getProxyManager().createProxy(configurationManagerName, ConfigurationManager.class);
- configurationManager.load((URI) DEFAULT_PARENTID_LIST.get(0));
- configurationManager.loadGBeans((URI) DEFAULT_PARENTID_LIST.get(0));
- configurationManager.start((URI) DEFAULT_PARENTID_LIST.get(0));
+ configurationManager.load((Artifact) DEFAULT_PARENTID_LIST.get(0));
+ configurationManager.loadGBeans((Artifact) DEFAULT_PARENTID_LIST.get(0));
+ configurationManager.start((Artifact) DEFAULT_PARENTID_LIST.get(0));
return kernel;
}
@@ -79,23 +80,18 @@
this.kernel = kernel;
}
- public URI install(URL source) throws IOException, InvalidConfigException {
+ public Artifact install(URL source) throws IOException, InvalidConfigException {
return null;
}
public void install(ConfigurationData configurationData, File source) throws IOException, InvalidConfigException {
}
- public void uninstall(URI configID) throws NoSuchConfigException, IOException {
+ public void uninstall(Artifact configID) throws NoSuchConfigException, IOException {
}
- public ObjectName loadConfiguration(URI configId) throws NoSuchConfigException, IOException, InvalidConfigException {
- ObjectName configurationObjectName = null;
- try {
- configurationObjectName = Configuration.getConfigurationObjectName(configId);
- } catch (MalformedObjectNameException e) {
- throw new InvalidConfigException(e);
- }
+ public ObjectName loadConfiguration(Artifact configId) throws NoSuchConfigException, IOException, InvalidConfigException {
+ ObjectName configurationObjectName = Configuration.getConfigurationObjectName(configId);
GBeanData configData = new GBeanData(configurationObjectName, Configuration.GBEAN_INFO);
configData.setAttribute("id", configId);
configData.setAttribute("domain", "test");
@@ -111,7 +107,7 @@
return configurationObjectName;
}
- public boolean containsConfiguration(URI configID) {
+ public boolean containsConfiguration(Artifact configID) {
return true;
}
Modified: branches/configid/openejb2/modules/openejb-builder/src/test/org/openejb/deployment/entity/cmp/cmr/AbstractCMRTest.java (2428 => 2429)
--- branches/configid/openejb2/modules/openejb-builder/src/test/org/openejb/deployment/entity/cmp/cmr/AbstractCMRTest.java 2006-02-05 23:49:24 UTC (rev 2428)
+++ branches/configid/openejb2/modules/openejb-builder/src/test/org/openejb/deployment/entity/cmp/cmr/AbstractCMRTest.java 2006-02-08 02:59:57 UTC (rev 2429)
@@ -80,7 +80,6 @@
import org.openejb.deployment.CMPContainerBuilder;
import org.openejb.deployment.CMPEntityBuilderTestUtil;
import org.openejb.deployment.DeploymentHelper;
-import org.openejb.deployment.KernelHelper;
import org.openejb.deployment.MockConnectionProxyFactory;
import org.openejb.deployment.OpenEJBModuleBuilder;
import org.openejb.deployment.Schemata;
@@ -91,14 +90,10 @@
import org.openejb.xbeans.ejbjar.OpenejbOpenejbJarDocument;
import org.openejb.xbeans.ejbjar.OpenejbOpenejbJarType;
import org.tranql.cache.GlobalSchema;
-import org.tranql.cache.cache.FrontEndCache;
import org.tranql.cache.cache.FrontEndCacheDelegate;
import org.tranql.ejb.EJB;
import org.tranql.ejb.EJBSchema;
import org.tranql.ejb.TransactionManagerDelegate;
-import org.tranql.ejbqlcompiler.DerbyDBSyntaxtFactory;
-import org.tranql.ejbqlcompiler.DerbyEJBQLCompilerFactory;
-import org.tranql.sql.BaseSQLSchema;
import org.tranql.sql.SQLSchema;
/**
@@ -174,7 +169,6 @@
EARContext earContext = new EARContext(tempDir,
new URI("test"),
ConfigurationModuleType.EJB,
- KernelHelper.DEFAULT_PARENTID_LIST,
kernel,
NameFactory.NULL,
null,
Modified: branches/configid/openejb2/modules/openejb-builder/src/test/org/openejb/deployment/entity/cmp/ejbql/EJBQLTest.java (2428 => 2429)
--- branches/configid/openejb2/modules/openejb-builder/src/test/org/openejb/deployment/entity/cmp/ejbql/EJBQLTest.java 2006-02-05 23:49:24 UTC (rev 2428)
+++ branches/configid/openejb2/modules/openejb-builder/src/test/org/openejb/deployment/entity/cmp/ejbql/EJBQLTest.java 2006-02-08 02:59:57 UTC (rev 2429)
@@ -82,7 +82,6 @@
import org.openejb.deployment.CMPContainerBuilder;
import org.openejb.deployment.CMPEntityBuilderTestUtil;
import org.openejb.deployment.DeploymentHelper;
-import org.openejb.deployment.KernelHelper;
import org.openejb.deployment.MockConnectionProxyFactory;
import org.openejb.deployment.OpenEJBModuleBuilder;
import org.openejb.deployment.Schemata;
@@ -93,7 +92,6 @@
import org.openejb.xbeans.ejbjar.OpenejbOpenejbJarDocument;
import org.openejb.xbeans.ejbjar.OpenejbOpenejbJarType;
import org.tranql.cache.GlobalSchema;
-import org.tranql.cache.cache.FrontEndCache;
import org.tranql.cache.cache.FrontEndCacheDelegate;
import org.tranql.ejb.EJB;
import org.tranql.ejb.EJBSchema;
@@ -195,7 +193,6 @@
EARContext earContext = new EARContext(tempDir,
new URI("test"),
ConfigurationModuleType.EJB,
- KernelHelper.DEFAULT_PARENTID_LIST,
kernel,
NameFactory.NULL,
null,
