[openejb-scm] [2512] branches/configid/openejb2/etc: Changed openejb version to 2.1 and geronimo version to 1.1

[dain]

Title: [2512] branches/configid/openejb2/etc: Changed openejb version to 2.1 and geronimo version to 1.1

Revision

2512

Author

dain

Date

2006-02-26 00:23:48 -0500 (Sun, 26 Feb 2006)

Log Message

Changed openejb version to 2.1 and geronimo version to 1.1

Modified Paths

• branches/configid/openejb2/etc/project.properties
• branches/configid/openejb2/modules/openejb-builder/src/test/org/openejb/deployment/KernelHelper.java

Diff

Modified: branches/configid/openejb2/etc/project.properties (2511 => 2512)

--- branches/configid/openejb2/etc/project.properties	2006-02-26 05:12:08 UTC (rev 2511)
+++ branches/configid/openejb2/etc/project.properties	2006-02-26 05:23:48 UTC (rev 2512)
@@ -51,8 +51,8 @@
 #####################################################
 activeio_version=2.0-r118
 activemq_version=3.2.1
-geronimo_version=1.0.1-SNAPSHOT
-openejb_version=2.0.1-SNAPSHOT
+geronimo_version=1.1-SNAPSHOT
+openejb_version=2.1-SNAPSHOT
 tranql_version=1.2.1
 tranql_connector_version=1.1
 

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

--- branches/configid/openejb2/modules/openejb-builder/src/test/org/openejb/deployment/KernelHelper.java	2006-02-26 05:12:08 UTC (rev 2511)
+++ branches/configid/openejb2/modules/openejb-builder/src/test/org/openejb/deployment/KernelHelper.java	2006-02-26 05:23:48 UTC (rev 2512)
@@ -16,6 +16,18 @@
  */
 package org.openejb.deployment;
 
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.IOException;
+import java.io.ObjectOutputStream;
+import java.net.MalformedURLException;
+import java.net.URI;
+import java.net.URL;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import javax.management.ObjectName;
+
 import org.apache.geronimo.deployment.util.DeploymentUtil;
 import org.apache.geronimo.gbean.GBeanData;
 import org.apache.geronimo.gbean.GBeanInfo;
@@ -36,18 +48,6 @@
 import org.apache.geronimo.kernel.repository.DefaultArtifactResolver;
 import org.apache.geronimo.kernel.repository.Environment;
 
-import javax.management.ObjectName;
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.IOException;
-import java.io.ObjectOutputStream;
-import java.net.MalformedURLException;
-import java.net.URI;
-import java.net.URL;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
 /**
  * @version $Rev$ $Date$
  */
@@ -100,17 +100,11 @@
 
 
     public static class MockConfigStore implements ConfigurationStore {
-        private final Kernel kernel;
         private static final Map locations = new HashMap();
 
-        public MockConfigStore(Kernel kernel) {
-            this.kernel = kernel;
+        public MockConfigStore() {
         }
 
-        public Artifact install(URL source) throws IOException, InvalidConfigException {
-            return null;
-        }
-
         public void install(ConfigurationData configurationData) throws IOException, InvalidConfigException {
         }
 
@@ -168,8 +162,6 @@
         static {
             GBeanInfoBuilder infoBuilder = GBeanInfoBuilder.createStatic(MockConfigStore.class, NameFactory.CONFIGURATION_STORE);
             infoBuilder.addInterface(ConfigurationStore.class);
-            infoBuilder.addAttribute("kernel", Kernel.class, false);
-            infoBuilder.setConstructor(new String[] {"kernel"});
             GBEAN_INFO = infoBuilder.getBeanInfo();
 
             ByteArrayOutputStream baos = new ByteArrayOutputStream();