geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject svn commit: r393652 - in /geronimo/branches/1.1: applications/console-standard/src/java/org/apache/geronimo/console/configmanager/ modules/deploy-jsr88/src/java/org/apache/geronimo/deployment/plugin/local/ modules/j2ee-builder/src/test/org/apache/geron...
Date Wed, 12 Apr 2006 23:12:19 GMT
Author: dain
Date: Wed Apr 12 16:12:17 2006
New Revision: 393652

URL: http://svn.apache.org/viewcvs?rev=393652&view=rev
Log:
Uninstall now works cleanly from the command line and config manager portlet with the exception
of ears containing app clients.

Modified:
    geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/configmanager/ConfigManagerPortlet.java
    geronimo/branches/1.1/modules/deploy-jsr88/src/java/org/apache/geronimo/deployment/plugin/local/RedeployCommand.java
    geronimo/branches/1.1/modules/deploy-jsr88/src/java/org/apache/geronimo/deployment/plugin/local/StopCommand.java
    geronimo/branches/1.1/modules/deploy-jsr88/src/java/org/apache/geronimo/deployment/plugin/local/UndeployCommand.java
    geronimo/branches/1.1/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/EARConfigBuilderTest.java
    geronimo/branches/1.1/modules/kernel/src/java/org/apache/geronimo/kernel/config/ConfigurationManager.java
    geronimo/branches/1.1/modules/kernel/src/java/org/apache/geronimo/kernel/config/NoSuchConfigException.java
    geronimo/branches/1.1/modules/kernel/src/java/org/apache/geronimo/kernel/config/SimpleConfigurationManager.java
    geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/configuration/RepositoryConfigurationStore.java
    geronimo/branches/1.1/plugins/geronimo-assembly-plugin/src/java/org/apache/geronimo/plugin/assembly/BaseConfigInstaller.java

Modified: geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/configmanager/ConfigManagerPortlet.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/configmanager/ConfigManagerPortlet.java?rev=393652&r1=393651&r2=393652&view=diff
==============================================================================
--- geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/configmanager/ConfigManagerPortlet.java
(original)
+++ geronimo/branches/1.1/applications/console-standard/src/java/org/apache/geronimo/console/configmanager/ConfigManagerPortlet.java
Wed Apr 12 16:12:17 2006
@@ -18,14 +18,12 @@
 package org.apache.geronimo.console.configmanager;
 
 import java.io.IOException;
-import java.net.URI;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.Iterator;
 import java.util.List;
-import javax.management.ObjectName;
 import javax.portlet.ActionRequest;
 import javax.portlet.ActionResponse;
 import javax.portlet.PortletConfig;
@@ -38,7 +36,6 @@
 import org.apache.geronimo.console.BasePortlet;
 import org.apache.geronimo.kernel.Kernel;
 import org.apache.geronimo.kernel.KernelRegistry;
-import org.apache.geronimo.kernel.config.Configuration;
 import org.apache.geronimo.kernel.config.ConfigurationInfo;
 import org.apache.geronimo.kernel.config.ConfigurationManager;
 import org.apache.geronimo.kernel.config.ConfigurationUtil;
@@ -54,18 +51,8 @@
 
     private static final String UNINSTALL_ACTION = "uninstall";
 
-    private static final String CONTAINSCONFIG_METHOD = "containsConfiguration";
-
-    private static final String UNINSTALL_METHOD = "uninstall";
-
-    private static final String[] CONTAINSCONFIG_SIG = {URI.class.getName()};
-
-    private static final String[] UNINSTALL_SIG = {URI.class.getName()};
-
     private static final String CONFIG_INIT_PARAM = "config-type";
 
-    private String messageInstalled = "";
-
     private String messageStatus = "";
 
     private Kernel kernel;
@@ -76,40 +63,28 @@
 
     private PortletRequestDispatcher helpView;
 
-    private static final Collection EXCLUDED;
-
-    static {
-        // Add list of the configurationIDs that you do not want to list to this
-        // List.
-        EXCLUDED = new ArrayList();
-    }
-
-    public void processAction(ActionRequest actionRequest,
-                              ActionResponse actionResponse) throws PortletException, IOException
{
+    public void processAction(ActionRequest actionRequest, ActionResponse actionResponse)
throws PortletException, IOException {
         String action = actionRequest.getParameter("action");
         actionResponse.setRenderParameter("message", ""); // set to blank first
         try {
-            ConfigurationManager configurationManager = ConfigurationUtil
-                    .getConfigurationManager(kernel);
+            ConfigurationManager configurationManager = ConfigurationUtil.getConfigurationManager(kernel);
             String config = getConfigID(actionRequest);
-            Artifact configID = Artifact.create(config);
+            Artifact configId = Artifact.create(config);
 
             if (START_ACTION.equals(action)) {
-                configurationManager.loadConfiguration(configID);
-                configurationManager.startConfiguration(configID);
+                configurationManager.loadConfiguration(configId);
+                configurationManager.startConfiguration(configId);
                 messageStatus = "Started application<br /><br />";
             } else if (STOP_ACTION.equals(action)) {
-                configurationManager.stopConfiguration(configID);
-                configurationManager.unloadConfiguration(configID);
+                configurationManager.stopConfiguration(configId);
+                configurationManager.unloadConfiguration(configId);
                 messageStatus = "Stopped application<br /><br />";
             } else if (UNINSTALL_ACTION.equals(action)) {
-                uninstallConfig(actionRequest);
+                configurationManager.uninstallConfiguration(configId);
                 messageStatus = "Uninstalled application<br /><br />";
             } else {
-                messageStatus = "Invalid value for changeState: " + action
-                        + "<br /><br />";
-                throw new PortletException("Invalid value for changeState: "
-                        + action);
+                messageStatus = "Invalid value for changeState: " + action + "<br /><br
/>";
+                throw new PortletException("Invalid value for changeState: " + action);
             }
         } catch (NoSuchConfigException e) {
             // ignore this for now
@@ -125,49 +100,12 @@
     }
 
     /**
-     * Uninstall an application configuration
-     *
-     * @param actionRequest
-     * @throws PortletException
-     * @throws Exception
-     */
-    private void uninstallConfig(ActionRequest actionRequest)
-            throws PortletException, Exception {
-        ConfigurationManager configManager = ConfigurationUtil
-                .getConfigurationManager(kernel);
-        List configStores = configManager.listStores();
-        int size = configStores.size();
-        String configID = getConfigID(actionRequest);
-        Artifact configURI = Artifact.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[]{configURI}, CONTAINSCONFIG_SIG);
-            if (result.booleanValue()) {
-                // stop config if running
-                if (configManager.isLoaded(configURI)) {
-                    if (kernel.isRunning(Configuration.getConfigurationAbstractName(configURI)))
{
-
-                        configManager.stopConfiguration(configURI);
-                        configManager.unloadConfiguration(configURI);
-                    }
-                }
-                kernel.invoke(configStore, UNINSTALL_METHOD, new Object[]{configURI}, UNINSTALL_SIG);
-            }
-        }
-    }
-
-    /**
      * Check if a configuration should be listed here. This method depends on the "config-type"
portlet parameter
      * which is set in portle.xml.
      */
     private boolean shouldListConfig(ConfigurationInfo info) {
         String configType = getInitParameter(CONFIG_INIT_PARAM);
-        if (configType != null && !info.getType().getName().equalsIgnoreCase(configType))
-            return false;
-        else
-            return true;
+        return configType == null || info.getType().getName().equalsIgnoreCase(configType);
     }
 
     /*
@@ -178,8 +116,7 @@
      * actionRequest.getParameter("configId")); } return configID; }
      */
 
-    private String getConfigID(ActionRequest actionRequest)
-            throws PortletException {
+    private String getConfigID(ActionRequest actionRequest) {
         return actionRequest.getParameter("configId");
     }
 
@@ -205,9 +142,11 @@
             }
         });
         renderRequest.setAttribute("configurations", configInfo);
-        messageInstalled = configInfo.size() == 0 ? "No modules found of this type<br
/><br />"
-                : "";
-        renderRequest.setAttribute("messageInstalled", messageInstalled);
+        if (configInfo.size() == 0) {
+            renderRequest.setAttribute("messageInstalled", "No modules found of this type<br
/><br />");
+        } else {
+            renderRequest.setAttribute("messageInstalled", "");
+        }
         renderRequest.setAttribute("messageStatus", messageStatus);
         messageStatus = "";
         if (WindowState.NORMAL.equals(renderRequest.getWindowState())) {
@@ -217,8 +156,7 @@
         }
     }
 
-    protected void doHelp(RenderRequest renderRequest,
-                          RenderResponse renderResponse) throws PortletException, IOException
{
+    protected void doHelp(RenderRequest renderRequest, RenderResponse renderResponse) throws
PortletException, IOException {
         helpView.include(renderRequest, renderResponse);
     }
 

Modified: geronimo/branches/1.1/modules/deploy-jsr88/src/java/org/apache/geronimo/deployment/plugin/local/RedeployCommand.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/deploy-jsr88/src/java/org/apache/geronimo/deployment/plugin/local/RedeployCommand.java?rev=393652&r1=393651&r2=393652&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/deploy-jsr88/src/java/org/apache/geronimo/deployment/plugin/local/RedeployCommand.java
(original)
+++ geronimo/branches/1.1/modules/deploy-jsr88/src/java/org/apache/geronimo/deployment/plugin/local/RedeployCommand.java
Wed Apr 12 16:12:17 2006
@@ -19,22 +19,18 @@
 import org.apache.geronimo.deployment.plugin.TargetImpl;
 import org.apache.geronimo.deployment.plugin.TargetModuleIDImpl;
 import org.apache.geronimo.deployment.util.DeploymentUtil;
-import org.apache.geronimo.kernel.GBeanNotFoundException;
 import org.apache.geronimo.kernel.InternalKernelException;
 import org.apache.geronimo.kernel.Kernel;
 import org.apache.geronimo.kernel.repository.Artifact;
-import org.apache.geronimo.kernel.config.Configuration;
 import org.apache.geronimo.kernel.config.ConfigurationManager;
 import org.apache.geronimo.kernel.config.ConfigurationUtil;
 import org.apache.geronimo.kernel.config.NoSuchConfigException;
-import org.apache.geronimo.gbean.AbstractName;
 
 import javax.enterprise.deploy.shared.CommandType;
 import javax.enterprise.deploy.spi.TargetModuleID;
 import javax.management.ObjectName;
 import java.io.File;
 import java.io.InputStream;
-import java.net.URI;
 
 /**
  * @version $Rev$ $Date$

Modified: geronimo/branches/1.1/modules/deploy-jsr88/src/java/org/apache/geronimo/deployment/plugin/local/StopCommand.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/deploy-jsr88/src/java/org/apache/geronimo/deployment/plugin/local/StopCommand.java?rev=393652&r1=393651&r2=393652&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/deploy-jsr88/src/java/org/apache/geronimo/deployment/plugin/local/StopCommand.java
(original)
+++ geronimo/branches/1.1/modules/deploy-jsr88/src/java/org/apache/geronimo/deployment/plugin/local/StopCommand.java
Wed Apr 12 16:12:17 2006
@@ -20,7 +20,6 @@
 import org.apache.geronimo.kernel.Kernel;
 import org.apache.geronimo.kernel.config.ConfigurationManager;
 import org.apache.geronimo.kernel.config.ConfigurationUtil;
-import org.apache.geronimo.kernel.config.InvalidConfigException;
 import org.apache.geronimo.kernel.repository.Artifact;
 
 import javax.enterprise.deploy.shared.CommandType;
@@ -46,12 +45,9 @@
                 for (int i = 0; i < modules.length; i++) {
                     TargetModuleID module = modules[i];
                     Artifact moduleID = Artifact.create(module.getModuleID());
-                    try {
-                        configurationManager.stopConfiguration(moduleID);
-                    } catch (InvalidConfigException e) {
-                        updateStatus("Module "+moduleID+" is not running.");
-                        continue;
-                    }
+                    configurationManager.stopConfiguration(moduleID);
+
+
                     configurationManager.unloadConfiguration(moduleID);
                     addModule(module);
                 }

Modified: geronimo/branches/1.1/modules/deploy-jsr88/src/java/org/apache/geronimo/deployment/plugin/local/UndeployCommand.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/deploy-jsr88/src/java/org/apache/geronimo/deployment/plugin/local/UndeployCommand.java?rev=393652&r1=393651&r2=393652&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/deploy-jsr88/src/java/org/apache/geronimo/deployment/plugin/local/UndeployCommand.java
(original)
+++ geronimo/branches/1.1/modules/deploy-jsr88/src/java/org/apache/geronimo/deployment/plugin/local/UndeployCommand.java
Wed Apr 12 16:12:17 2006
@@ -16,22 +16,18 @@
  */
 package org.apache.geronimo.deployment.plugin.local;
 
-import org.apache.geronimo.deployment.plugin.TargetImpl;
+import java.net.URI;
+import javax.enterprise.deploy.shared.CommandType;
+import javax.enterprise.deploy.spi.TargetModuleID;
+
 import org.apache.geronimo.deployment.plugin.TargetModuleIDImpl;
-import org.apache.geronimo.kernel.GBeanNotFoundException;
 import org.apache.geronimo.kernel.InternalKernelException;
 import org.apache.geronimo.kernel.Kernel;
 import org.apache.geronimo.kernel.config.ConfigurationManager;
 import org.apache.geronimo.kernel.config.ConfigurationUtil;
-import org.apache.geronimo.kernel.config.InvalidConfigException;
 import org.apache.geronimo.kernel.config.NoSuchConfigException;
 import org.apache.geronimo.kernel.repository.Artifact;
 
-import javax.enterprise.deploy.shared.CommandType;
-import javax.enterprise.deploy.spi.TargetModuleID;
-import javax.management.ObjectName;
-import java.net.URI;
-
 /**
  * @version $Rev$ $Date$
  */
@@ -55,20 +51,11 @@
 
                     Artifact moduleID = Artifact.create(module.getModuleID());
                     try {
-                        try {
-                            configurationManager.stopConfiguration(moduleID);
-                        } catch (InvalidConfigException e) {
-                            if(e.getCause() instanceof GBeanNotFoundException) {
-                                GBeanNotFoundException gnf = (GBeanNotFoundException) e.getCause();
-                                if(clean(gnf.getGBeanName().getKeyProperty("name")).equals(moduleID.toString()))
{
-                                    // the module is not running
-                                } else {
-                                    throw gnf;
-                                }
-                            }
-                        }
+                        configurationManager.stopConfiguration(moduleID);
+
+
                         configurationManager.unloadConfiguration(moduleID);
-                        updateStatus("Module "+moduleID+" unloaded.");
+                        updateStatus("Module " + moduleID + " unloaded.");
                     } catch (InternalKernelException e) {
                         // this is cause by the kernel being already shutdown
                     } catch (NoSuchConfigException e) {
@@ -76,11 +63,8 @@
                     }
 
                     try {
-                        TargetImpl target = (TargetImpl) module.getTarget();
-                        ObjectName storeName = target.getObjectName();
-                        URI configID = URI.create(module.getModuleID());
-                        kernel.invoke(storeName, "uninstall", new Object[]{configID}, UNINSTALL_SIG);
-                        updateStatus("Module "+moduleID+" uninstalled.");
+                        configurationManager.uninstallConfiguration(moduleID);
+                        updateStatus("Module " + moduleID + " uninstalled.");
                         addModule(module);
                     } catch (NoSuchConfigException e) {
                         // module was already undeployed - just continue
@@ -89,8 +73,9 @@
             } finally {
                 ConfigurationUtil.releaseConfigurationManager(kernel, configurationManager);
             }
+
             //todo: this will probably never happen because the command line args are compared
to actual modules
-            if(getModuleCount() < modules.length) {
+            if (getModuleCount() < modules.length) {
                 updateStatus("Some of the modules to undeploy were not previously deployed.
 This is not treated as an error.");
             }
             complete("Completed");

Modified: geronimo/branches/1.1/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/EARConfigBuilderTest.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/EARConfigBuilderTest.java?rev=393652&r1=393651&r2=393652&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/EARConfigBuilderTest.java
(original)
+++ geronimo/branches/1.1/modules/j2ee-builder/src/test/org/apache/geronimo/j2ee/deployment/EARConfigBuilderTest.java
Wed Apr 12 16:12:17 2006
@@ -563,7 +563,7 @@
         public URL resolve(Artifact configId, String moduleName, URI uri) throws NoSuchConfigException,
MalformedURLException {
             File file = (File) locations.get(configId);
             if (file == null) {
-                throw new NoSuchConfigException("nothing for configid " + configId);
+                throw new NoSuchConfigException(configId);
             }
             return new URL(file.toURL(), uri.toString());
         }

Modified: geronimo/branches/1.1/modules/kernel/src/java/org/apache/geronimo/kernel/config/ConfigurationManager.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/kernel/src/java/org/apache/geronimo/kernel/config/ConfigurationManager.java?rev=393652&r1=393651&r2=393652&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/kernel/src/java/org/apache/geronimo/kernel/config/ConfigurationManager.java
(original)
+++ geronimo/branches/1.1/modules/kernel/src/java/org/apache/geronimo/kernel/config/ConfigurationManager.java
Wed Apr 12 16:12:17 2006
@@ -111,11 +111,13 @@
      * @param configID
      * @throws InvalidConfigException
      */
-    void stopConfiguration(Artifact configID) throws InvalidConfigException;
+    void stopConfiguration(Artifact configID) throws NoSuchConfigException;
 
-    void stopConfiguration(Configuration configuration) throws InvalidConfigException;
+    void stopConfiguration(Configuration configuration) throws NoSuchConfigException;
 
     boolean isRunning(Artifact configurationId);
 
     List listConfigurations();
+
+    void uninstallConfiguration(Artifact configId) throws IOException, NoSuchConfigException;
 }

Modified: geronimo/branches/1.1/modules/kernel/src/java/org/apache/geronimo/kernel/config/NoSuchConfigException.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/kernel/src/java/org/apache/geronimo/kernel/config/NoSuchConfigException.java?rev=393652&r1=393651&r2=393652&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/kernel/src/java/org/apache/geronimo/kernel/config/NoSuchConfigException.java
(original)
+++ geronimo/branches/1.1/modules/kernel/src/java/org/apache/geronimo/kernel/config/NoSuchConfigException.java
Wed Apr 12 16:12:17 2006
@@ -17,24 +17,22 @@
 
 package org.apache.geronimo.kernel.config;
 
+import org.apache.geronimo.kernel.repository.Artifact;
+
 /**
  * Exception indicating the requestion Configuration could not be located.
  * 
  * @version $Rev$ $Date$
  */
 public class NoSuchConfigException extends Exception {
-    public NoSuchConfigException() {
-    }
-
-    public NoSuchConfigException(Throwable cause) {
-        super(cause);
-    }
+    private final Artifact configId;
 
-    public NoSuchConfigException(String message) {
-        super(message);
+    public NoSuchConfigException(Artifact configId) {
+        super(configId.toString());
+        this.configId = configId;
     }
 
-    public NoSuchConfigException(String message, Throwable cause) {
-        super(message, cause);
+    public Artifact getConfigId() {
+        return configId;
     }
 }

Modified: geronimo/branches/1.1/modules/kernel/src/java/org/apache/geronimo/kernel/config/SimpleConfigurationManager.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/kernel/src/java/org/apache/geronimo/kernel/config/SimpleConfigurationManager.java?rev=393652&r1=393651&r2=393652&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/kernel/src/java/org/apache/geronimo/kernel/config/SimpleConfigurationManager.java
(original)
+++ geronimo/branches/1.1/modules/kernel/src/java/org/apache/geronimo/kernel/config/SimpleConfigurationManager.java
Wed Apr 12 16:12:17 2006
@@ -81,7 +81,6 @@
 
     public ConfigurationStore getStoreForConfiguration(Artifact configuration) {
         List storeSnapshot = getStores();
-        List result = new ArrayList(storeSnapshot.size());
         for (int i = 0; i < storeSnapshot.size(); i++) {
             ConfigurationStore store = (ConfigurationStore) storeSnapshot.get(i);
             if(store.containsConfiguration(configuration)) {
@@ -307,7 +306,7 @@
                 return configurationData;
             }
         }
-        throw new NoSuchConfigException("No configuration with id: " + configId);
+        throw new NoSuchConfigException(configId);
     }
 
     private LinkedHashSet resolveParentIds(ConfigurationData configurationData) throws MissingDependencyException,
InvalidConfigException {
@@ -393,16 +392,20 @@
         throw new UnsupportedOperationException();
     }
 
-    public void stopConfiguration(Configuration configuration) throws InvalidConfigException
{
+    public void stopConfiguration(Configuration configuration) throws NoSuchConfigException
{
         stopConfiguration(configuration.getId());
     }
 
-    public synchronized void stopConfiguration(Artifact id) throws InvalidConfigException
{
+    public synchronized void stopConfiguration(Artifact id) throws NoSuchConfigException
{
         ConfigurationStatus configurationStatus = (ConfigurationStatus) configurations.get(id);
         if (configurationStatus == null) {
-            throw new InvalidConfigurationException("Configuration is not loaded " + id);
+            throw new NoSuchConfigException(id);
         }
 
+        stopConfiguration(configurationStatus);
+    }
+
+    private void stopConfiguration(ConfigurationStatus configurationStatus) {
         List stopList = configurationStatus.stop();
         for (Iterator iterator = stopList.iterator(); iterator.hasNext();) {
             Configuration configuration = (Configuration) iterator.next();
@@ -420,6 +423,10 @@
 
     public synchronized void unloadConfiguration(Artifact id) throws NoSuchConfigException
{
         ConfigurationStatus configurationStatus = (ConfigurationStatus) configurations.get(id);
+        unloadConfiguration(configurationStatus);
+    }
+
+    private void unloadConfiguration(ConfigurationStatus configurationStatus) {
         List unloadList = configurationStatus.unload();
         for (Iterator iterator = unloadList.iterator(); iterator.hasNext();) {
             Configuration configuration = (Configuration) iterator.next();
@@ -434,6 +441,23 @@
         } catch (Exception e) {
             log.debug("Problem unloading config: " + configuration.getId(), e);
         }
+    }
+
+    public synchronized void uninstallConfiguration(Artifact configId) throws IOException,
NoSuchConfigException {
+        ConfigurationStatus configurationStatus = (ConfigurationStatus) configurations.get(configId);
+        if (configurationStatus != null) {
+            stopConfiguration(configurationStatus);
+            unloadConfiguration(configurationStatus);
+        }
+
+        List storeSnapshot = getStores();
+        for (int i = 0; i < storeSnapshot.size(); i++) {
+            ConfigurationStore store = (ConfigurationStore) storeSnapshot.get(i);
+            if(store.containsConfiguration(configId)) {
+                store.uninstall(configId);
+            }
+        }
+
     }
 
     private List getStores() {

Modified: geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/configuration/RepositoryConfigurationStore.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/configuration/RepositoryConfigurationStore.java?rev=393652&r1=393651&r2=393652&view=diff
==============================================================================
--- geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/configuration/RepositoryConfigurationStore.java
(original)
+++ geronimo/branches/1.1/modules/system/src/java/org/apache/geronimo/system/configuration/RepositoryConfigurationStore.java
Wed Apr 12 16:12:17 2006
@@ -83,7 +83,7 @@
         File location = repository.getLocation(configId);
 
         if (!location.exists() && !location.canRead()) {
-            throw new NoSuchConfigException("Configuration not found: " + configId);
+            throw new NoSuchConfigException(configId);
         }
 
         ConfigurationData configurationData;

Modified: geronimo/branches/1.1/plugins/geronimo-assembly-plugin/src/java/org/apache/geronimo/plugin/assembly/BaseConfigInstaller.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/plugins/geronimo-assembly-plugin/src/java/org/apache/geronimo/plugin/assembly/BaseConfigInstaller.java?rev=393652&r1=393651&r2=393652&view=diff
==============================================================================
--- geronimo/branches/1.1/plugins/geronimo-assembly-plugin/src/java/org/apache/geronimo/plugin/assembly/BaseConfigInstaller.java
(original)
+++ geronimo/branches/1.1/plugins/geronimo-assembly-plugin/src/java/org/apache/geronimo/plugin/assembly/BaseConfigInstaller.java
Wed Apr 12 16:12:17 2006
@@ -134,7 +134,7 @@
 
         // does this configuration exist?
         if (!sourceRepo.contains(configId)) {
-            throw new NoSuchConfigException(configId.toString());
+            throw new NoSuchConfigException(configId);
         }
 
         // is this config already installed?



Mime
View raw message