geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r332947 - in /geronimo/trunk: applications/console-standard/src/java/org/apache/geronimo/console/configmanager/ applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/activemqCF/ applications/console-standard/src/java...
Date Sun, 13 Nov 2005 08:10:32 GMT
Author: djencks
Date: Sun Nov 13 00:10:19 2005
New Revision: 332947

URL: http://svn.apache.org/viewcvs?rev=332947&view=rev
Log:
separate loadGBeans and start methods on ConfigurationManager

Modified:
    geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/configmanager/ConfigManagerPortlet.java
    geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/configmanager/DeploymentPortlet.java
    geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/activemqCF/ActiveMQConnectorHelper.java
    geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/handlers/CreateDestinationHandler.java
    geronimo/trunk/modules/connector-builder/src/test/org/apache/geronimo/connector/deployment/ConnectorModuleBuilderTest.java
    geronimo/trunk/modules/deploy-jsr88/src/java/org/apache/geronimo/deployment/plugin/local/RedeployCommand.java
    geronimo/trunk/modules/deploy-jsr88/src/java/org/apache/geronimo/deployment/plugin/local/StartCommand.java
    geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java
    geronimo/trunk/modules/jetty-builder/src/java/org/apache/geronimo/jetty/deployment/JettyModuleBuilder.java
    geronimo/trunk/modules/jetty-builder/src/test/org/apache/geronimo/jetty/deployment/JettyModuleBuilderTest.java
    geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/config/ConfigurationManager.java
    geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/config/ConfigurationManagerImpl.java
    geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/main/CommandLine.java
    geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/main/Daemon.java
    geronimo/trunk/modules/system/src/test/org/apache/geronimo/system/configuration/LocalConfigStoreTest.java
    geronimo/trunk/modules/tomcat-builder/src/test/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilderTest.java
    geronimo/trunk/plugins/geronimo-deployment-plugin/src/java/org/apache/geronimo/deployment/mavenplugin/StartServer.java

Modified: geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/configmanager/ConfigManagerPortlet.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/configmanager/ConfigManagerPortlet.java?rev=332947&r1=332946&r2=332947&view=diff
==============================================================================
--- geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/configmanager/ConfigManagerPortlet.java
(original)
+++ geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/configmanager/ConfigManagerPortlet.java
Sun Nov 13 00:10:19 2005
@@ -106,6 +106,7 @@
                 if (!configurationManager.isLoaded(configID)) {
                     configurationManager.load(configID);
                 }
+                configurationManager.loadGBeans(configID);
                 configurationManager.start(configID);
                 messageStatus = "Started application<br /><br />";
             } else if (STOP_ACTION.equals(action)) {

Modified: geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/configmanager/DeploymentPortlet.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/configmanager/DeploymentPortlet.java?rev=332947&r1=332946&r2=332947&view=diff
==============================================================================
--- geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/configmanager/DeploymentPortlet.java
(original)
+++ geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/configmanager/DeploymentPortlet.java
Sun Nov 13 00:10:19 2005
@@ -129,6 +129,7 @@
                     if (!configurationManager.isLoaded(configID)) {
                         configurationManager.load(configID);
                     }
+                    configurationManager.loadGBeans(configID);
                     configurationManager.start(configID);
                 }
             }

Modified: geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/activemqCF/ActiveMQConnectorHelper.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/activemqCF/ActiveMQConnectorHelper.java?rev=332947&r1=332946&r2=332947&view=diff
==============================================================================
--- geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/activemqCF/ActiveMQConnectorHelper.java
(original)
+++ geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/activemqCF/ActiveMQConnectorHelper.java
Sun Nov 13 00:10:19 2005
@@ -193,6 +193,7 @@
                     configurationManager.load(configID);
                 }
 
+                configurationManager.loadGBeans(configID);
                 configurationManager.start(configID);
             }
         } catch (DeploymentException e) {

Modified: geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/handlers/CreateDestinationHandler.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/handlers/CreateDestinationHandler.java?rev=332947&r1=332946&r2=332947&view=diff
==============================================================================
--- geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/handlers/CreateDestinationHandler.java
(original)
+++ geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/jmsmanager/handlers/CreateDestinationHandler.java
Sun Nov 13 00:10:19 2005
@@ -156,6 +156,7 @@
                     ConfigurationData.class.getName(), File.class.getName() });
 
             configurationManager.load(configId);
+            configurationManager.loadGBeans(configId);
             configurationManager.start(configId);
 
         } catch (Exception e) {

Modified: geronimo/trunk/modules/connector-builder/src/test/org/apache/geronimo/connector/deployment/ConnectorModuleBuilderTest.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/connector-builder/src/test/org/apache/geronimo/connector/deployment/ConnectorModuleBuilderTest.java?rev=332947&r1=332946&r2=332947&view=diff
==============================================================================
--- geronimo/trunk/modules/connector-builder/src/test/org/apache/geronimo/connector/deployment/ConnectorModuleBuilderTest.java
(original)
+++ geronimo/trunk/modules/connector-builder/src/test/org/apache/geronimo/connector/deployment/ConnectorModuleBuilderTest.java
Sun Nov 13 00:10:19 2005
@@ -395,6 +395,7 @@
             ConfigurationManager configurationManager = (ConfigurationManager) kernel.getProxyManager().createProxy(configurationManagerName,
ConfigurationManager.class);
 
             configurationManager.load(defaultParentId[0]);
+            configurationManager.loadGBeans(defaultParentId[0]);
             configurationManager.start(defaultParentId[0]);
 
             ObjectName serverInfoObjectName = ObjectName.getInstance(j2eeContext.getJ2eeDomainName()
+ ":name=ServerInfo");

Modified: geronimo/trunk/modules/deploy-jsr88/src/java/org/apache/geronimo/deployment/plugin/local/RedeployCommand.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/deploy-jsr88/src/java/org/apache/geronimo/deployment/plugin/local/RedeployCommand.java?rev=332947&r1=332946&r2=332947&view=diff
==============================================================================
--- geronimo/trunk/modules/deploy-jsr88/src/java/org/apache/geronimo/deployment/plugin/local/RedeployCommand.java
(original)
+++ geronimo/trunk/modules/deploy-jsr88/src/java/org/apache/geronimo/deployment/plugin/local/RedeployCommand.java
Sun Nov 13 00:10:19 2005
@@ -110,6 +110,7 @@
                     List list = configurationManager.loadRecursive(configID);
                     for (int j = 0; j < list.size(); j++) {
                         URI name = (URI) list.get(j);
+                        configurationManager.loadGBeans(name);
                         configurationManager.start(name);
                         updateStatus("Started " + name);
                     }

Modified: geronimo/trunk/modules/deploy-jsr88/src/java/org/apache/geronimo/deployment/plugin/local/StartCommand.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/deploy-jsr88/src/java/org/apache/geronimo/deployment/plugin/local/StartCommand.java?rev=332947&r1=332946&r2=332947&view=diff
==============================================================================
--- geronimo/trunk/modules/deploy-jsr88/src/java/org/apache/geronimo/deployment/plugin/local/StartCommand.java
(original)
+++ geronimo/trunk/modules/deploy-jsr88/src/java/org/apache/geronimo/deployment/plugin/local/StartCommand.java
Sun Nov 13 00:10:19 2005
@@ -75,6 +75,7 @@
                     List list = configurationManager.loadRecursive(moduleID);
                     for (int j = 0; j < list.size(); j++) {
                         URI name = (URI) list.get(j);
+                        configurationManager.loadGBeans(name);
                         configurationManager.start(name);
                         String configName = name.toString();
                         List kids = loadChildren(kernel, configName);

Modified: geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java?rev=332947&r1=332946&r2=332947&view=diff
==============================================================================
--- geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java
(original)
+++ geronimo/trunk/modules/j2ee-builder/src/java/org/apache/geronimo/j2ee/deployment/EARConfigBuilder.java
Sun Nov 13 00:10:19 2005
@@ -322,14 +322,14 @@
                 if (geronimoApplication.isSetInverseClassloading()) {
                     earContext.setInverseClassloading(geronimoApplication.getInverseClassloading());
                 }
-                
+
                 ClassFilterType[] filters = geronimoApplication.getHiddenClassesArray();
                 ServiceConfigBuilder.addHiddenClasses(earContext, filters);
-                
+
                 filters = geronimoApplication.getNonOverridableClassesArray();
                 ServiceConfigBuilder.addNonOverridableClasses(earContext, filters);
             }
-            
+
             // each module installs it's files into the output context.. this is different
for each module type
             Set modules = applicationInfo.getModules();
             for (Iterator iterator = modules.iterator(); iterator.hasNext();) {

Modified: geronimo/trunk/modules/jetty-builder/src/java/org/apache/geronimo/jetty/deployment/JettyModuleBuilder.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/jetty-builder/src/java/org/apache/geronimo/jetty/deployment/JettyModuleBuilder.java?rev=332947&r1=332946&r2=332947&view=diff
==============================================================================
--- geronimo/trunk/modules/jetty-builder/src/java/org/apache/geronimo/jetty/deployment/JettyModuleBuilder.java
(original)
+++ geronimo/trunk/modules/jetty-builder/src/java/org/apache/geronimo/jetty/deployment/JettyModuleBuilder.java
Sun Nov 13 00:10:19 2005
@@ -1389,10 +1389,10 @@
         infoBuilder.addAttribute("defaultContextPriorityClassloader", boolean.class, true,
true);
         infoBuilder.addAttribute("defaultWelcomeFiles", List.class, true, true);
         infoBuilder.addAttribute("jettyContainerObjectName", ObjectName.class, true, true);
-        infoBuilder.addReference("DefaultServlets", Object.class);
+        infoBuilder.addReference("DefaultServlets", Object.class, NameFactory.DEFAULT_SERVLET);
         infoBuilder.addReference("DefaultFilters", Object.class);
         infoBuilder.addReference("DefaultFilterMappings", Object.class);
-        infoBuilder.addReference("PojoWebServiceTemplate", Object.class);
+        infoBuilder.addReference("PojoWebServiceTemplate", Object.class, "ServletWebServiceTemplate");
         infoBuilder.addReference("WebServiceBuilder", WebServiceBuilder.class, NameFactory.MODULE_BUILDER);
         infoBuilder.addReference("Repository", Repository.class, NameFactory.GERONIMO_SERVICE);
         infoBuilder.addAttribute("kernel", Kernel.class, false);

Modified: geronimo/trunk/modules/jetty-builder/src/test/org/apache/geronimo/jetty/deployment/JettyModuleBuilderTest.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/jetty-builder/src/test/org/apache/geronimo/jetty/deployment/JettyModuleBuilderTest.java?rev=332947&r1=332946&r2=332947&view=diff
==============================================================================
--- geronimo/trunk/modules/jetty-builder/src/test/org/apache/geronimo/jetty/deployment/JettyModuleBuilderTest.java
(original)
+++ geronimo/trunk/modules/jetty-builder/src/test/org/apache/geronimo/jetty/deployment/JettyModuleBuilderTest.java
Sun Nov 13 00:10:19 2005
@@ -265,6 +265,7 @@
         ConfigurationManager configurationManager = (ConfigurationManager) kernel.getProxyManager().createProxy(configurationManagerName,
ConfigurationManager.class);
 
         configurationManager.load((URI) parentId.get(0));
+        configurationManager.loadGBeans((URI) parentId.get(0));
         configurationManager.start((URI) parentId.get(0));
 
         Collection defaultServlets = new HashSet();

Modified: geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/config/ConfigurationManager.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/config/ConfigurationManager.java?rev=332947&r1=332946&r2=332947&view=diff
==============================================================================
--- geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/config/ConfigurationManager.java
(original)
+++ geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/config/ConfigurationManager.java
Sun Nov 13 00:10:19 2005
@@ -48,7 +48,9 @@
     List listConfigurations(ObjectName store) throws NoSuchStoreException;
 
     /**
-     * Load the specified configuration into the kernel.
+     * Load the specified configuration into the kernel. This does not start the configuration
gbean
+     * and thus does not load or start any gbeans in the configuration.
+     *
      * @param configID the id of the configuration
      * @return the name of the new configuration object mounted into the kernel
      * @throws NoSuchConfigException if no configuration with the given id exists in the
configuration stores
@@ -58,7 +60,9 @@
     ObjectName load(URI configID) throws NoSuchConfigException, IOException, InvalidConfigException;
 
     /**
-     * Load the specified configuration and all parent configurations into the kernel.
+     * Load the specified configuration and all parent configurations into the kernel. This
does not
+     * start any configuration gbeans or load any gbeans from the configurations loaded.
+     *
      * @param configID the id of the configuration
      * @return a list of names of configurations loaded into the kernel
      * @throws NoSuchConfigException if no configuration with the given id exists in the
configuration stores
@@ -68,15 +72,37 @@
     List loadRecursive(URI configID) throws NoSuchConfigException, IOException, InvalidConfigException;
 
     /**
-     * Unloads the specified configuration from the kernel
+     * Unloads the gbeans of the specified configuration, stops the configuration gbean,
and unloads the
+     * configuration gbean from the kernel.
+     *
      * @param configID the name fo the configuration to remove
      * @throws NoSuchConfigException if the configuration is now loaded into the kernel
      */
     void unload(URI configID) throws NoSuchConfigException;
 
-    void start(URI configID) throws InvalidConfigException;
-
+    /**
+     * Load the gbeans of the named configuration into the kernel, but do not start them.
+     * This starts the configuration gbean.  You must have loaded the configuration using
load(uri) or loadRecursive(uri)
+     * before calling this method.
+     *
+     * @param configID
+     * @throws InvalidConfigException
+     */
     void loadGBeans(URI configID) throws InvalidConfigException;
 
+    /**
+     * Start the gbeans in this configuration.  You must have called loadGBeans before calling
this method.
+     *
+     * @param configID
+     * @throws InvalidConfigException
+     */
+    void start(URI configID) throws InvalidConfigException;
+
+    /**
+     * Stop the gbeans in this configuration, but do not stop the configuration gbean.
+     *
+     * @param configID
+     * @throws InvalidConfigException
+     */
     void stop(URI configID) throws InvalidConfigException;
 }

Modified: geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/config/ConfigurationManagerImpl.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/config/ConfigurationManagerImpl.java?rev=332947&r1=332946&r2=332947&view=diff
==============================================================================
--- geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/config/ConfigurationManagerImpl.java
(original)
+++ geronimo/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/config/ConfigurationManagerImpl.java
Sun Nov 13 00:10:19 2005
@@ -127,7 +127,6 @@
     }
 
     public void start(URI configID) throws InvalidConfigException {
-        loadGBeans(configID);
         ObjectName configName;
         try {
             configName = Configuration.getConfigurationObjectName(configID);

Modified: geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/main/CommandLine.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/main/CommandLine.java?rev=332947&r1=332946&r2=332947&view=diff
==============================================================================
--- geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/main/CommandLine.java
(original)
+++ geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/main/CommandLine.java
Sun Nov 13 00:10:19 2005
@@ -126,6 +126,7 @@
                 List list = configurationManager.loadRecursive(configID);
                 for (Iterator iterator = list.iterator(); iterator.hasNext();) {
                     URI name = (URI) iterator.next();
+                    configurationManager.loadGBeans(name);
                     configurationManager.start(name);
                 }
             }

Modified: geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/main/Daemon.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/main/Daemon.java?rev=332947&r1=332946&r2=332947&view=diff
==============================================================================
--- geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/main/Daemon.java (original)
+++ geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/main/Daemon.java Sun
Nov 13 00:10:19 2005
@@ -282,6 +282,7 @@
                         monitor.configurationStarting(configID);
                         for (Iterator iterator = list.iterator(); iterator.hasNext();) {
                             URI name = (URI) iterator.next();
+                            configurationManager.loadGBeans(name);
                             configurationManager.start(name);
                         }
                         monitor.configurationStarted(configID);

Modified: geronimo/trunk/modules/system/src/test/org/apache/geronimo/system/configuration/LocalConfigStoreTest.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/system/src/test/org/apache/geronimo/system/configuration/LocalConfigStoreTest.java?rev=332947&r1=332946&r2=332947&view=diff
==============================================================================
--- geronimo/trunk/modules/system/src/test/org/apache/geronimo/system/configuration/LocalConfigStoreTest.java
(original)
+++ geronimo/trunk/modules/system/src/test/org/apache/geronimo/system/configuration/LocalConfigStoreTest.java
Sun Nov 13 00:10:19 2005
@@ -79,6 +79,7 @@
 
         // load and start the config
         ObjectName configName = configurationManager.load(uri);
+        configurationManager.loadGBeans(uri);
         configurationManager.start(uri);
 
         // make sure the config and the enabled gbean are running
@@ -102,6 +103,7 @@
 
         // now reload and restart the config
         configName = configurationManager.load(uri);
+        configurationManager.loadGBeans(uri);
         configurationManager.start(uri);
 
         // make sure the value was reloaded correctly

Modified: geronimo/trunk/modules/tomcat-builder/src/test/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilderTest.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/tomcat-builder/src/test/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilderTest.java?rev=332947&r1=332946&r2=332947&view=diff
==============================================================================
--- geronimo/trunk/modules/tomcat-builder/src/test/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilderTest.java
(original)
+++ geronimo/trunk/modules/tomcat-builder/src/test/org/apache/geronimo/tomcat/deployment/TomcatModuleBuilderTest.java
Sun Nov 13 00:10:19 2005
@@ -369,6 +369,7 @@
         ConfigurationManager configurationManager = (ConfigurationManager) kernel.getProxyManager().createProxy(configurationManagerName,
ConfigurationManager.class);
 
         configurationManager.load((URI) parentId.get(0));
+        configurationManager.loadGBeans((URI) parentId.get(0));
         configurationManager.start((URI) parentId.get(0));
 
         serverInfoName = new ObjectName("geronimo.system:name=ServerInfo");

Modified: geronimo/trunk/plugins/geronimo-deployment-plugin/src/java/org/apache/geronimo/deployment/mavenplugin/StartServer.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/plugins/geronimo-deployment-plugin/src/java/org/apache/geronimo/deployment/mavenplugin/StartServer.java?rev=332947&r1=332946&r2=332947&view=diff
==============================================================================
--- geronimo/trunk/plugins/geronimo-deployment-plugin/src/java/org/apache/geronimo/deployment/mavenplugin/StartServer.java
(original)
+++ geronimo/trunk/plugins/geronimo-deployment-plugin/src/java/org/apache/geronimo/deployment/mavenplugin/StartServer.java
Sun Nov 13 00:10:19 2005
@@ -124,6 +124,7 @@
                 List list = configurationManager.loadRecursive(configID);
                 for (Iterator iterator = list.iterator(); iterator.hasNext();) {
                     URI name = (URI) iterator.next();
+                    configurationManager.loadGBeans(name);
                     configurationManager.start(name);
                     System.out.println("started gbean: " + name);
                 }



Mime
View raw message