[openejb-scm] [2473] branches/configid/openejb2/modules/openejb-builder/src/schema: Integrate artifact resolver/manager code further.

[djencks]

Title: [2473] branches/configid/openejb2/modules/openejb-builder/src/schema: Integrate artifact resolver/manager code further.

Revision

2473

Author

djencks

Date

2006-02-20 15:18:09 -0500 (Mon, 20 Feb 2006)

Log Message

Integrate artifact resolver/manager code further.  Many configurations build.

Modified Paths

branches/configid/openejb2/modules/openejb-builder/src/schema/openejb-jar-2.1.xsd
branches/configid/openejb2/modules/openejb-builder/src/test/org/openejb/deployment/DeploymentTestSuite.java
branches/configid/openejb2/modules/openejb-builder/src/test/org/openejb/deployment/KernelHelper.java

Diff

Modified: branches/configid/openejb2/modules/openejb-builder/src/schema/openejb-jar-2.1.xsd (2472 => 2473)

--- branches/configid/openejb2/modules/openejb-builder/src/schema/openejb-jar-2.1.xsd	2006-02-20 01:37:31 UTC (rev 2472)
+++ branches/configid/openejb2/modules/openejb-builder/src/schema/openejb-jar-2.1.xsd	2006-02-20 20:18:09 UTC (rev 2473)
@@ -69,7 +69,7 @@
 
     <xs:complexType name="openejb-jarType">
         <xs:sequence>
-            <xs:element ref="sys:environment"/>
+            <xs:element ref="sys:environment" minOccurs="0"/>
 
             <!-- use a ref to put this element in the naming namespace rather than openejb namespace-->
             <xs:element ref="naming:cmp-connection-factory" minOccurs="0"/>

Modified: branches/configid/openejb2/modules/openejb-builder/src/test/org/openejb/deployment/DeploymentTestSuite.java (2472 => 2473)

--- branches/configid/openejb2/modules/openejb-builder/src/test/org/openejb/deployment/DeploymentTestSuite.java	2006-02-20 01:37:31 UTC (rev 2472)
+++ branches/configid/openejb2/modules/openejb-builder/src/test/org/openejb/deployment/DeploymentTestSuite.java	2006-02-20 20:18:09 UTC (rev 2473)
@@ -198,9 +198,12 @@
             config.setName(CONFIGURATION_OBJECT_NAME);
             config.setAttribute("baseURL", tempDir.toURL());
             config.setAttribute("environment", configurationData.getEnvironment());
-            config.setReferencePattern("ConfigurationStore", JMXUtil.getObjectName("foo:j2eeType=ConfigurationStore,name=mock"));
+//            config.setReferencePattern("ConfigurationStore", JMXUtil.getObjectName("foo:j2eeType=ConfigurationStore,name=mock"));
+            config.setReferencePattern("Repositories", new ObjectName("*:name=Repository,*"));
+            config.setReferencePattern("ArtifactManager", new ObjectName("*:name=ArtifactManager,*"));
+            config.setReferencePattern("ArtifactResolver", new ObjectName("*:name=ArtifactResolver,*"));
+            config.setAttribute("configurationStore", configurationStore);
 
-
             ObjectName containerIndexObjectName = ObjectName.getInstance(DOMAIN_NAME + ":type=ContainerIndex");
             GBeanData containerIndexGBean = new GBeanData(containerIndexObjectName, ContainerIndex.GBEAN_INFO);
             Set ejbContainerNames = new HashSet();

Modified: branches/configid/openejb2/modules/openejb-builder/src/test/org/openejb/deployment/KernelHelper.java (2472 => 2473)

--- branches/configid/openejb2/modules/openejb-builder/src/test/org/openejb/deployment/KernelHelper.java	2006-02-20 01:37:31 UTC (rev 2472)
+++ branches/configid/openejb2/modules/openejb-builder/src/test/org/openejb/deployment/KernelHelper.java	2006-02-20 20:18:09 UTC (rev 2473)
@@ -36,6 +36,8 @@
 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.repository.DefaultArtifactManager;
+import org.apache.geronimo.kernel.repository.DefaultArtifactResolver;
 import org.apache.geronimo.kernel.config.ConfigurationManagerImpl;
 import org.apache.geronimo.kernel.config.Configuration;
 import org.apache.geronimo.kernel.config.ConfigurationStore;
@@ -72,9 +74,19 @@
         kernel.loadGBean(store, KernelHelper.class.getClassLoader());
         kernel.startGBean(store.getName());
 
+        GBeanData manager = new GBeanData(JMXUtil.getObjectName("foo:name=ArtifactManager"), DefaultArtifactManager.GBEAN_INFO);
+        kernel.loadGBean(manager, KernelHelper.class.getClassLoader());
+        kernel.startGBean(manager.getName());
+
+        GBeanData resolver = new GBeanData(JMXUtil.getObjectName("foo:name=ArtifactResolver"), DefaultArtifactResolver.GBEAN_INFO);
+        resolver.setReferencePattern("ArtifactManager", manager.getName());
+//            resolver.setReferencePattern("Repositories", repository.getName());
+        kernel.loadGBean(resolver, KernelHelper.class.getClassLoader());
+        kernel.startGBean(resolver.getName());
+
         ObjectName configurationManagerName = new ObjectName(":j2eeType=ConfigurationManager,name=Basic");
         GBeanData configurationManagerData = new GBeanData(configurationManagerName, ConfigurationManagerImpl.GBEAN_INFO);
-        configurationManagerData.setReferencePatterns("Stores", Collections.singleton(store.getName()));
+        configurationManagerData.setReferencePattern("Stores", store.getName());
         kernel.loadGBean(configurationManagerData, KernelHelper.class.getClassLoader());
         kernel.startGBean(configurationManagerName);
         ConfigurationManager configurationManager = (ConfigurationManager) kernel.getProxyManager().createProxy(configurationManagerName, ConfigurationManager.class);
@@ -114,6 +126,7 @@
             environment.getProperties().put(NameFactory.JSR77_BASE_NAME_PROPERTY, "geronimo.test:J2EEServer=geronimo");
             configData.setAttribute("environment", environment);
             configData.setAttribute("gBeanState", NO_OBJECTS_OS);
+            configData.setAttribute("configurationStore", this);
 
             try {
                 kernel.loadGBean(configData, Configuration.class.getClassLoader());