geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ammul...@apache.org
Subject svn commit: r331048 - /geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/configmanager/ConfigManagerPortlet.java
Date Sun, 06 Nov 2005 00:07:29 GMT
Author: ammulder
Date: Sat Nov  5 16:07:27 2005
New Revision: 331048

URL: http://svn.apache.org/viewcvs?rev=331048&view=rev
Log:
Temporary fixes for deployment portlet (GERONIMO-1047)

Modified:
    geronimo/trunk/applications/console-standard/src/java/org/apache/geronimo/console/configmanager/ConfigManagerPortlet.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=331048&r1=331047&r2=331048&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
Sat Nov  5 16:07:27 2005
@@ -148,29 +148,27 @@
         List configStores = configManager.listStores();
         int size = configStores.size();
         String configID = getConfigID(actionRequest);
+        URI configURI = URI.create(configID);
         for (int i = 0; i < size; i++) {
             ObjectName configStore = (ObjectName) configStores.get(i);
             Boolean result = (Boolean) kernel.invoke(configStore,
                     CONTAINSCONFIG_METHOD,
-                    new Object[]{URI.create(configID)}, CONTAINSCONFIG_SIG);
+                    new Object[]{configURI}, CONTAINSCONFIG_SIG);
             if (result.booleanValue() == true) {
                 // stop config if running
-                if (configManager.isLoaded(URI.create(configID))) {
+                if (configManager.isLoaded(configURI)) {
                     //int state = kernel.getConfigurationState(configID);
                     int state = kernel
                             .getGBeanState(JMXUtil
                             .getObjectName(ObjectNameConstants.CONFIG_GBEAN_PREFIX
                             + "\"" + configID + "\""));
                     if (state == State.RUNNING.toInt()) {
-                        //kernel.stopConfiguration(configID);
-                        kernel
-                                .stopGBean(JMXUtil
-                                .getObjectName(ObjectNameConstants.CONFIG_GBEAN_PREFIX
-                                + "\"" + configID + "\""));
+
+                        configManager.stop(configURI);
+                        configManager.unload(configURI);
                     }
                 }
-                kernel.invoke(configStore, UNINSTALL_METHOD, new Object[]{URI
-                        .create(configID)}, UNINSTALL_SIG);
+                kernel.invoke(configStore, UNINSTALL_METHOD, new Object[]{configURI}, UNINSTALL_SIG);
             }
         }
     }



Mime
View raw message