geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r388890 - in /geronimo/branches/1.1: configs/j2ee-server/src/plan/ configs/j2ee-system/src/plan/ configs/jetty/src/plan/ configs/ldap-realm/src/plan/ configs/rmi-naming/src/plan/ configs/system-database/src/plan/ modules/j2ee/src/java/org/a...
Date Sun, 26 Mar 2006 09:01:13 GMT
Author: djencks
Date: Sun Mar 26 01:00:55 2006
New Revision: 388890

URL: http://svn.apache.org/viewcvs?rev=388890&view=rev
Log:
Fix a lot of problems, the jetty server can start some configurations before dieing

Modified:
    geronimo/branches/1.1/configs/j2ee-server/src/plan/plan.xml
    geronimo/branches/1.1/configs/j2ee-system/src/plan/plan.xml
    geronimo/branches/1.1/configs/jetty/src/plan/plan.xml
    geronimo/branches/1.1/configs/ldap-realm/src/plan/plan.xml
    geronimo/branches/1.1/configs/rmi-naming/src/plan/plan.xml
    geronimo/branches/1.1/configs/system-database/src/plan/plan.xml
    geronimo/branches/1.1/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/impl/JVMImpl.java
    geronimo/branches/1.1/modules/kernel/src/java/org/apache/geronimo/gbean/AbstractNameQuery.java
    geronimo/branches/1.1/modules/kernel/src/java/org/apache/geronimo/kernel/Jsr77Naming.java
    geronimo/branches/1.1/modules/kernel/src/java/org/apache/geronimo/kernel/config/ConfigurationUtil.java
    geronimo/branches/1.1/modules/service-builder/src/java/org/apache/geronimo/deployment/service/GBeanBuilder.java
    geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/main/Daemon.java
    geronimo/branches/1.1/modules/timer/src/java/org/apache/geronimo/timer/jdbc/JDBCStoreThreadPooledNonTransactionalTimer.java
    geronimo/branches/1.1/modules/timer/src/java/org/apache/geronimo/timer/jdbc/JDBCStoreThreadPooledTransactionalTimer.java
    geronimo/branches/1.1/plugins/geronimo-packaging-plugin/project.xml
    geronimo/branches/1.1/plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/PackageBuilder.java

Modified: geronimo/branches/1.1/configs/j2ee-server/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/j2ee-server/src/plan/plan.xml?rev=388890&r1=388889&r2=388890&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/j2ee-server/src/plan/plan.xml (original)
+++ geronimo/branches/1.1/configs/j2ee-server/src/plan/plan.xml Sun Mar 26 01:00:55 2006
@@ -27,9 +27,9 @@
 
 -->
 <configuration
-    xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1"
+        xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1"
 
-    >
+        >
 
     <gbean name="DefaultThreadPool" class="org.apache.geronimo.pool.ThreadPool">
         <attribute name="keepAliveTime">5000</attribute>
@@ -37,14 +37,17 @@
         <attribute name="poolName">DefaultThreadPool</attribute>
     </gbean>
 
-    <gbean name="ConnectionTracker" class="org.apache.geronimo.connector.outbound.connectiontracking.ConnectionTrackingCoordinatorGBean">
+    <gbean name="ConnectionTracker"
+           class="org.apache.geronimo.connector.outbound.connectiontracking.ConnectionTrackingCoordinatorGBean">
     </gbean>
 
     <gbean name="DefaultWorkManager" class="org.apache.geronimo.connector.work.GeronimoWorkManagerGBean">
         <attribute name="syncMaximumPoolSize">10</attribute>
         <attribute name="startMaximumPoolSize">10</attribute>
         <attribute name="scheduledMaximumPoolSize">10</attribute>
-        <reference name="TransactionContextManager"><name>TransactionContextManager</name></reference>
+        <reference name="TransactionContextManager">
+            <name>TransactionContextManager</name>
+        </reference>
     </gbean>
 
     <gbean name="HOWLTransactionLog" class="org.apache.geronimo.transaction.log.HOWLLog">
@@ -60,27 +63,44 @@
         <attribute name="maxLogFiles">2</attribute>
         <attribute name="minBuffers">4</attribute>
         <attribute name="threadsWaitingForceThreshold">-1</attribute>
-        <reference name="XidFactory"><name>XidFactory</name></reference>
-        <reference name="ServerInfo"><module>geronimo/j2ee-system/${pom.currentVersion}/car</module><name>ServerInfo</name></reference>
+        <reference name="XidFactory">
+            <name>XidFactory</name>
+        </reference>
+        <reference name="ServerInfo">
+            <name>ServerInfo</name>
+        </reference>
     </gbean>
-    
+
     <gbean name="XidFactory" class="org.apache.geronimo.transaction.manager.XidFactoryImplGBean">
         <attribute name="tmId">71,84,77,73,68</attribute>
     </gbean>
 
     <gbean name="TransactionManager" class="org.apache.geronimo.transaction.manager.TransactionManagerImplGBean">
         <attribute name="defaultTransactionTimeoutSeconds">600</attribute>
-        <reference name="XidFactory"><name>XidFactory</name></reference>
-        <reference name="TransactionLog"><name>HOWLTransactionLog</name></reference>
+        <reference name="XidFactory">
+            <name>XidFactory</name>
+        </reference>
+        <reference name="TransactionLog">
+            <name>HOWLTransactionLog</name>
+        </reference>
         <references name="ResourceManagers">
-            <pattern><type>JCAManagedConnectionFactory</type></pattern>
-            <pattern><type>ActivationSpec</type></pattern>
+            <pattern>
+                <type>JCAManagedConnectionFactory</type>
+            </pattern>
+            <pattern>
+                <type>ActivationSpec</type>
+            </pattern>
         </references>
     </gbean>
 
-    <gbean name="TransactionContextManager" class="org.apache.geronimo.transaction.context.TransactionContextManagerGBean">
-        <reference name="TransactionManager"><name>TransactionManager</name></reference>
-        <reference name="XidImporter"><name>TransactionManager</name></reference>
+    <gbean name="TransactionContextManager"
+           class="org.apache.geronimo.transaction.context.TransactionContextManagerGBean">
+        <reference name="TransactionManager">
+            <name>TransactionManager</name>
+        </reference>
+        <reference name="XidImporter">
+            <name>TransactionManager</name>
+        </reference>
     </gbean>
 
     <!-- EJB Protocol -->
@@ -91,8 +111,12 @@
         <attribute name="allowHosts">${PlanClientAddresses}</attribute>
         <attribute name="logOnSuccess">HOST,NAME,THREADID,USERID</attribute>
         <attribute name="logOnFailure">HOST,NAME</attribute>
-        <reference name="Executor"><name>DefaultThreadPool</name></reference>
-        <reference name="Server"><name>EJBServer</name></reference>
+        <reference name="Executor">
+            <name>DefaultThreadPool</name>
+        </reference>
+        <reference name="Server">
+            <name>EJBServer</name>
+        </reference>
     </gbean>
 
     <gbean name="EJBServer" class="org.openejb.server.ejbd.EjbServerGBean">
@@ -107,16 +131,24 @@
     <!-- pattern domain name must match the domain of the j2eeServer attribute of the
EAR builder in the deployer plan -->
     <gbean name="ContainerIndex" class="org.openejb.ContainerIndex">
         <references name="EJBContainers">
-            <pattern><type>StatelessSessionBean</type></pattern>
-            <pattern><type>StatefulSessionBean</type></pattern>
-            <pattern><type>EntityBean</type></pattern>
+            <pattern>
+                <type>StatelessSessionBean</type>
+            </pattern>
+            <pattern>
+                <type>StatefulSessionBean</type>
+            </pattern>
+            <pattern>
+                <type>EntityBean</type>
+            </pattern>
         </references>
     </gbean>
 
     <!-- JSR77 Management Objects -->
     <gbean name="geronimo.server" class="org.apache.geronimo.j2ee.management.impl.J2EEDomainImpl"/>
     <gbean name="geronimo" class="org.apache.geronimo.j2ee.management.impl.J2EEServerImpl">
-        <reference name="ServerInfo"><name>ServerInfo</name></reference>
+        <reference name="ServerInfo">
+            <name>ServerInfo</name>
+        </reference>
     </gbean>
 
     <gbean name="JVM" class="org.apache.geronimo.j2ee.management.impl.JVMImpl"/>

Modified: geronimo/branches/1.1/configs/j2ee-system/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/j2ee-system/src/plan/plan.xml?rev=388890&r1=388889&r2=388890&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/j2ee-system/src/plan/plan.xml (original)
+++ geronimo/branches/1.1/configs/j2ee-system/src/plan/plan.xml Sun Mar 26 01:00:55 2006
@@ -81,8 +81,9 @@
 
   <!--Configuration Manager service-->
   <gbean name="ConfigurationManager" class="org.apache.geronimo.kernel.config.EditableKernelConfigurationManager">
+    <reference name="Repositories">
+    </reference>
     <reference name="Stores">
-      <!--<gbean-name>*:j2eeType=ConfigurationStore,*</gbean-name>-->
     </reference>
     <reference name="AttributeStore">
       <name>AttributeManager</name>

Modified: geronimo/branches/1.1/configs/jetty/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/jetty/src/plan/plan.xml?rev=388890&r1=388889&r2=388890&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/jetty/src/plan/plan.xml (original)
+++ geronimo/branches/1.1/configs/jetty/src/plan/plan.xml Sun Mar 26 01:00:55 2006
@@ -41,7 +41,6 @@
             </pattern>
         </references>
         <reference name="ServerInfo">
-            <module>geronimo/j2ee-system/${pom.currentVersion}/car</module>
             <name>ServerInfo</name>
         </reference>
     </gbean>
@@ -56,7 +55,6 @@
             <name>JettyWebContainer</name>
         </reference>
         <reference name="ServerInfo">
-            <!--<module>geronimo/j2ee-system/${pom.currentVersion}/car</module>-->
             <name>ServerInfo</name>
         </reference>
         <attribute name="filename">var/log/jetty_yyyy_mm_dd.log</attribute>
@@ -103,7 +101,6 @@
             <name>JettyWebContainer</name>
         </reference>
         <reference name="ServerInfo">
-            <!--<module>geronimo/j2ee-system/${pom.currentVersion}/car</module>-->
             <name>ServerInfo</name>
         </reference>
     </gbean>

Modified: geronimo/branches/1.1/configs/ldap-realm/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/ldap-realm/src/plan/plan.xml?rev=388890&r1=388889&r2=388890&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/ldap-realm/src/plan/plan.xml (original)
+++ geronimo/branches/1.1/configs/ldap-realm/src/plan/plan.xml Sun Mar 26 01:00:55 2006
@@ -31,12 +31,10 @@
             	<name>ldap-login</name>
         </reference> 
         <reference name="ServerInfo">
-            <module>geronimo/j2ee-system/${pom.currentVersion}/car</module>
             <name>ServerInfo</name>
         </reference>
         <!-- Add -->
         <reference name="LoginService">
-            <module>geronimo/j2ee-security/${pom.currentVersion}/car</module>
             <name>JaasLoginService</name>
          </reference>
     </gbean>
@@ -53,7 +51,6 @@
         <attribute name="applicationConfigName">ldaptest</attribute>
         <attribute name="realmName">ldap-realm</attribute>
         <reference name="LoginService">
-            <module>geronimo/j2ee-security/${pom.currentVersion}/car</module>
             <name>JaasLoginService</name>
          </reference>
     </gbean>

Modified: geronimo/branches/1.1/configs/rmi-naming/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/rmi-naming/src/plan/plan.xml?rev=388890&r1=388889&r2=388890&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/rmi-naming/src/plan/plan.xml (original)
+++ geronimo/branches/1.1/configs/rmi-naming/src/plan/plan.xml Sun Mar 26 01:00:55 2006
@@ -54,7 +54,6 @@
             javax.net.ssl.trustStore=var/security/keystore
         </attribute>
         <reference name="ServerInfo">
-            <module>geronimo/j2ee-system/${pom.currentVersion}/car</module>
             <name>ServerInfo</name>
         </reference>
     </gbean>

Modified: geronimo/branches/1.1/configs/system-database/src/plan/plan.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/system-database/src/plan/plan.xml?rev=388890&r1=388889&r2=388890&view=diff
==============================================================================
--- geronimo/branches/1.1/configs/system-database/src/plan/plan.xml (original)
+++ geronimo/branches/1.1/configs/system-database/src/plan/plan.xml Sun Mar 26 01:00:55 2006
@@ -64,14 +64,14 @@
         <reference name="TransactionContextManager"><name>TransactionContextManager</name></reference>
         <reference name="ManagedConnectionFactoryWrapper"><name>SystemDatasource</name></reference>
         <reference name="ThreadPool"><name>DefaultThreadPool</name></reference>
-        <reference name="DerbySystem"><name>DerbySystem</name></reference>
+        <dependency><name>DerbySystem</name></dependency>
     </gbean>
 
     <gbean name="NonTransactionalThreadPooledTimer" class="org.apache.geronimo.timer.jdbc.JDBCStoreThreadPooledNonTransactionalTimer">
         <reference name="TransactionContextManager"><name>TransactionContextManager</name></reference>
         <reference name="ManagedConnectionFactoryWrapper"><name>SystemDatasource</name></reference>
         <reference name="ThreadPool"><name>DefaultThreadPool</name></reference>
-        <reference name="DerbySystem"><name>DerbySystem</name></reference>
+        <dependency><name>DerbySystem</name></dependency>
     </gbean>
 
 </connector>

Modified: geronimo/branches/1.1/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/impl/JVMImpl.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/impl/JVMImpl.java?rev=388890&r1=388889&r2=388890&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/impl/JVMImpl.java
(original)
+++ geronimo/branches/1.1/modules/j2ee/src/java/org/apache/geronimo/j2ee/management/impl/JVMImpl.java
Sun Mar 26 01:00:55 2006
@@ -96,7 +96,7 @@
             throw new InvalidObjectNameException("JVM object must contain a J2EEServer property",
objectName);
         }
         if (keyPropertyList.size() != 3) {
-            throw new InvalidObjectNameException("J2EEServer object name can only have J2EEServer,
j2eeType, and name", objectName);
+            throw new InvalidObjectNameException("JVM object name can only have J2EEServer,
j2eeType, and name", objectName);
         }
     }
 

Modified: geronimo/branches/1.1/modules/kernel/src/java/org/apache/geronimo/gbean/AbstractNameQuery.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/kernel/src/java/org/apache/geronimo/gbean/AbstractNameQuery.java?rev=388890&r1=388889&r2=388890&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/kernel/src/java/org/apache/geronimo/gbean/AbstractNameQuery.java
(original)
+++ geronimo/branches/1.1/modules/kernel/src/java/org/apache/geronimo/gbean/AbstractNameQuery.java
Sun Mar 26 01:00:55 2006
@@ -156,7 +156,7 @@
 
     private static List split(String source, char delim) {
         List parts = new ArrayList();
-        if (source != null) {
+        if (source != null && source.length() > 0) {
             for (int index = source.indexOf(delim); index >= 0; index = source.indexOf(delim))
{
                 String part = source.substring(0, index);
                 source = source.substring(index + 1);

Modified: geronimo/branches/1.1/modules/kernel/src/java/org/apache/geronimo/kernel/Jsr77Naming.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/kernel/src/java/org/apache/geronimo/kernel/Jsr77Naming.java?rev=388890&r1=388889&r2=388890&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/kernel/src/java/org/apache/geronimo/kernel/Jsr77Naming.java
(original)
+++ geronimo/branches/1.1/modules/kernel/src/java/org/apache/geronimo/kernel/Jsr77Naming.java
Sun Mar 26 01:00:55 2006
@@ -19,6 +19,9 @@
 import java.util.HashMap;
 import java.util.Hashtable;
 import java.util.Map;
+import java.util.HashSet;
+import java.util.Arrays;
+
 import javax.management.MalformedObjectNameException;
 import javax.management.ObjectName;
 
@@ -70,11 +73,26 @@
      */
     private static ObjectName createObjectName(Map nameMap) {
         Hashtable objectNameMap = new Hashtable(nameMap);
-        if (!"J2EEServer".equals(nameMap.get(J2EE_TYPE))) {
+        String type = (String) nameMap.get(J2EE_TYPE);
+        if ("JVM".equals(type)) {
+            objectNameMap.keySet().retainAll(Arrays.asList(new String[] {J2EE_TYPE, J2EE_NAME,
"J2EEServer"}));
+            objectNameMap.put("J2EEServer", DEFAULT_SERVER_NAME);
+        } else if ("J2EEDomain".equals(type)) {
+            //special case J2EEDomain gbean
+            objectNameMap.clear();
+            objectNameMap.put(J2EE_TYPE, "J2EEDomain");
+            objectNameMap.put(J2EE_NAME, DEFAULT_DOMAIN_NAME);
+            objectNameMap.put("J2EEServer", DEFAULT_SERVER_NAME);
+        } else if ("J2EEServer".equals(type)) {
+            //special case J2EEServer gbean
+            objectNameMap.clear();
+            objectNameMap.put(J2EE_TYPE, "J2EEServer");
+            objectNameMap.put(J2EE_NAME, DEFAULT_SERVER_NAME);
+        } else {
             objectNameMap.put("J2EEServer", DEFAULT_SERVER_NAME);
         }
 
-        ObjectName moduleObjectName = null;
+        ObjectName moduleObjectName;
         try {
             moduleObjectName = ObjectName.getInstance(DEFAULT_DOMAIN_NAME, objectNameMap);
         } catch (MalformedObjectNameException e) {

Modified: geronimo/branches/1.1/modules/kernel/src/java/org/apache/geronimo/kernel/config/ConfigurationUtil.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/kernel/src/java/org/apache/geronimo/kernel/config/ConfigurationUtil.java?rev=388890&r1=388889&r2=388890&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/kernel/src/java/org/apache/geronimo/kernel/config/ConfigurationUtil.java
(original)
+++ geronimo/branches/1.1/modules/kernel/src/java/org/apache/geronimo/kernel/config/ConfigurationUtil.java
Sun Mar 26 01:00:55 2006
@@ -62,6 +62,8 @@
         } finally {
             ois.close();
         }
+        ConfigurationResolver configurationResolver = new ConfigurationResolver(configuration.getAbstractName().getArtifact(),
null);
+        configuration.setAttribute("configurationResolver", configurationResolver);
 
         return loadBootstrapConfiguration(kernel, configuration, classLoader);
     }

Modified: geronimo/branches/1.1/modules/service-builder/src/java/org/apache/geronimo/deployment/service/GBeanBuilder.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/service-builder/src/java/org/apache/geronimo/deployment/service/GBeanBuilder.java?rev=388890&r1=388889&r2=388890&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/service-builder/src/java/org/apache/geronimo/deployment/service/GBeanBuilder.java
(original)
+++ geronimo/branches/1.1/modules/service-builder/src/java/org/apache/geronimo/deployment/service/GBeanBuilder.java
Sun Mar 26 01:00:55 2006
@@ -179,8 +179,8 @@
         if (module != null) {
             nameMap.put("J2EEModule", module);
         }
-        String interfaceType = referenceInfo == null? null: referenceInfo.getReferenceType();
-        return new AbstractNameQuery(artifact, nameMap, Collections.singleton(interfaceType));
+        Set interfaceTypes = referenceInfo == null? null: Collections.singleton(referenceInfo.getReferenceType());
+        return new AbstractNameQuery(artifact, nameMap, interfaceTypes);
     }
 
     public GBeanData getGBeanData() {

Modified: geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/main/Daemon.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/main/Daemon.java?rev=388890&r1=388889&r2=388890&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/main/Daemon.java
(original)
+++ geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/main/Daemon.java
Sun Mar 26 01:00:55 2006
@@ -22,6 +22,7 @@
 import org.apache.geronimo.common.GeronimoEnvironment;
 import org.apache.geronimo.gbean.GBeanQuery;
 import org.apache.geronimo.gbean.AbstractName;
+import org.apache.geronimo.gbean.AbstractNameQuery;
 import org.apache.geronimo.kernel.Kernel;
 import org.apache.geronimo.kernel.KernelFactory;
 import org.apache.geronimo.kernel.config.ConfigurationManager;
@@ -41,7 +42,7 @@
 import java.util.Set;
 
 /**
- * @version $Rev: 384141 $ $Date$
+ * @version $Rev:385659 $ $Date$
  */
 public class Daemon {
     private final static String ARGUMENT_NO_PROGRESS = "--quiet";
@@ -253,7 +254,7 @@
 
             monitor.systemStarted(kernel);
 
-            GBeanQuery query = new GBeanQuery(null, PersistentConfigurationList.class.getName());
+            AbstractNameQuery query = new AbstractNameQuery(PersistentConfigurationList.class.getName());
 
             if (configs.isEmpty()) {
                 // --override wasn't used (nothing explicit), see what was running before

Modified: geronimo/branches/1.1/modules/timer/src/java/org/apache/geronimo/timer/jdbc/JDBCStoreThreadPooledNonTransactionalTimer.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/timer/src/java/org/apache/geronimo/timer/jdbc/JDBCStoreThreadPooledNonTransactionalTimer.java?rev=388890&r1=388889&r2=388890&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/timer/src/java/org/apache/geronimo/timer/jdbc/JDBCStoreThreadPooledNonTransactionalTimer.java
(original)
+++ geronimo/branches/1.1/modules/timer/src/java/org/apache/geronimo/timer/jdbc/JDBCStoreThreadPooledNonTransactionalTimer.java
Sun Mar 26 01:00:55 2006
@@ -41,7 +41,6 @@
     public JDBCStoreThreadPooledNonTransactionalTimer(ConnectionFactorySource managedConnectionFactoryWrapper,
                                                       TransactionContextManager transactionContextManager,
                                                       Executor threadPool,
-                                                      Serializable derbySystem,
                                                       Kernel kernel) throws SQLException
{
         super(new NontransactionalExecutorTaskFactory(transactionContextManager),
                 new JDBCWorkerPersistence(kernel.getKernelName(), (DataSource)managedConnectionFactoryWrapper.$getResource(),
false), threadPool, transactionContextManager);
@@ -57,11 +56,10 @@
         infoFactory.addReference("ManagedConnectionFactoryWrapper", ConnectionFactorySource.class,
NameFactory.JCA_MANAGED_CONNECTION_FACTORY);
         infoFactory.addReference("ThreadPool", Executor.class, NameFactory.GERONIMO_SERVICE);
         infoFactory.addReference("TransactionContextManager", TransactionContextManager.class,
NameFactory.TRANSACTION_CONTEXT_MANAGER);
-        infoFactory.addReference("DerbySystem", Serializable.class, NameFactory.GERONIMO_SERVICE);
-        
+
         infoFactory.addAttribute("kernel", Kernel.class, false);
 
-        infoFactory.setConstructor(new String[]{"ManagedConnectionFactoryWrapper", "TransactionContextManager",
"ThreadPool", "DerbySystem", "kernel"});
+        infoFactory.setConstructor(new String[]{"ManagedConnectionFactoryWrapper", "TransactionContextManager",
"ThreadPool", "kernel"});
         GBEAN_INFO = infoFactory.getBeanInfo();
     }
 

Modified: geronimo/branches/1.1/modules/timer/src/java/org/apache/geronimo/timer/jdbc/JDBCStoreThreadPooledTransactionalTimer.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/timer/src/java/org/apache/geronimo/timer/jdbc/JDBCStoreThreadPooledTransactionalTimer.java?rev=388890&r1=388889&r2=388890&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/timer/src/java/org/apache/geronimo/timer/jdbc/JDBCStoreThreadPooledTransactionalTimer.java
(original)
+++ geronimo/branches/1.1/modules/timer/src/java/org/apache/geronimo/timer/jdbc/JDBCStoreThreadPooledTransactionalTimer.java
Sun Mar 26 01:00:55 2006
@@ -45,7 +45,6 @@
             TransactionContextManager transactionContextManager,
             ConnectionFactorySource managedConnectionFactoryWrapper,
             Executor threadPool,
-            Serializable derbySystem,
             Kernel kernel) throws SQLException {
         super(new TransactionalExecutorTaskFactory(transactionContextManager, repeatCount),
                 new JDBCWorkerPersistence(kernel.getKernelName(), (DataSource)managedConnectionFactoryWrapper.$getResource(),
false), threadPool, transactionContextManager);
@@ -62,10 +61,9 @@
         infoFactory.addReference("TransactionContextManager", TransactionContextManager.class,
NameFactory.TRANSACTION_CONTEXT_MANAGER);
         infoFactory.addReference("ManagedConnectionFactoryWrapper", ConnectionFactorySource.class,
NameFactory.JCA_MANAGED_CONNECTION_FACTORY);
         infoFactory.addReference("ThreadPool", Executor.class, NameFactory.GERONIMO_SERVICE);
-        infoFactory.addReference("DerbySystem", Serializable.class, NameFactory.GERONIMO_SERVICE);
         infoFactory.addAttribute("kernel", Kernel.class, false);
 
-        infoFactory.setConstructor(new String[] {"repeatCount", "TransactionContextManager",
"ManagedConnectionFactoryWrapper", "ThreadPool", "DerbySystem", "kernel"});
+        infoFactory.setConstructor(new String[] {"repeatCount", "TransactionContextManager",
"ManagedConnectionFactoryWrapper", "ThreadPool", "kernel"});
         GBEAN_INFO = infoFactory.getBeanInfo();
     }
 

Modified: geronimo/branches/1.1/plugins/geronimo-packaging-plugin/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/plugins/geronimo-packaging-plugin/project.xml?rev=388890&r1=388889&r2=388890&view=diff
==============================================================================
--- geronimo/branches/1.1/plugins/geronimo-packaging-plugin/project.xml (original)
+++ geronimo/branches/1.1/plugins/geronimo-packaging-plugin/project.xml Sun Mar 26 01:00:55
2006
@@ -42,6 +42,15 @@
                 <packaging.classpath>true</packaging.classpath>
             </properties>
         </dependency>
+        <!-- needed for PlanProcessor to load EnvironmentBuilder which uses DeploymentException
-->
+        <dependency>
+            <groupId>geronimo</groupId>
+            <artifactId>geronimo-common</artifactId>
+            <version>1.1-SNAPSHOT</version>
+            <properties>
+                <packaging.classpath>true</packaging.classpath>
+            </properties>
+        </dependency>
 <!--
         <dependency>
             <groupId>geronimo</groupId>

Modified: geronimo/branches/1.1/plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/PackageBuilder.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/PackageBuilder.java?rev=388890&r1=388889&r2=388890&view=diff
==============================================================================
--- geronimo/branches/1.1/plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/PackageBuilder.java
(original)
+++ geronimo/branches/1.1/plugins/geronimo-packaging-plugin/src/java/org/apache/geronimo/plugin/packaging/PackageBuilder.java
Sun Mar 26 01:00:55 2006
@@ -16,35 +16,29 @@
  */
 package org.apache.geronimo.plugin.packaging;
 
+import java.io.File;
+import java.net.URI;
+import java.util.Iterator;
+import java.util.List;
+
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.geronimo.gbean.GBeanData;
-import org.apache.geronimo.gbean.GBeanInfo;
-import org.apache.geronimo.gbean.GReferenceInfo;
 import org.apache.geronimo.gbean.AbstractName;
 import org.apache.geronimo.gbean.AbstractNameQuery;
+import org.apache.geronimo.gbean.GBeanData;
+import org.apache.geronimo.gbean.GBeanInfo;
 import org.apache.geronimo.kernel.Kernel;
 import org.apache.geronimo.kernel.KernelFactory;
 import org.apache.geronimo.kernel.KernelRegistry;
 import org.apache.geronimo.kernel.Naming;
+import org.apache.geronimo.kernel.config.ConfigurationData;
 import org.apache.geronimo.kernel.config.ConfigurationManager;
-import org.apache.geronimo.kernel.config.KernelConfigurationManager;
 import org.apache.geronimo.kernel.config.ConfigurationUtil;
-import org.apache.geronimo.kernel.config.ConfigurationData;
+import org.apache.geronimo.kernel.config.KernelConfigurationManager;
 import org.apache.geronimo.kernel.repository.Artifact;
 import org.apache.geronimo.kernel.repository.DefaultArtifactManager;
 import org.apache.geronimo.kernel.repository.DefaultArtifactResolver;
 import org.apache.log4j.BasicConfigurator;
-
-import javax.management.MalformedObjectNameException;
-import javax.management.ObjectName;
-import java.io.File;
-import java.net.URI;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-import java.util.Map;
-import java.util.HashMap;
 
 /**
  * JellyBean that builds a Geronimo Configuration using the local Mavem



Mime
View raw message