geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lin...@apache.org
Subject svn commit: r698248 - in /geronimo/server/trunk/framework/modules: geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/jmx/ geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/
Date Tue, 23 Sep 2008 17:10:27 GMT
Author: linsun
Date: Tue Sep 23 10:10:27 2008
New Revision: 698248

URL: http://svn.apache.org/viewvc?rev=698248&view=rev
Log:
GERONIMO-4318 - All the plugins are marked as installable on the install plugins portlet

Modified:
    geronimo/server/trunk/framework/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/jmx/RemoteDeploymentManager.java
    geronimo/server/trunk/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/PluginInstaller.java
    geronimo/server/trunk/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/PluginInstallerGBean.java

Modified: geronimo/server/trunk/framework/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/jmx/RemoteDeploymentManager.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/jmx/RemoteDeploymentManager.java?rev=698248&r1=698247&r2=698248&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/jmx/RemoteDeploymentManager.java
(original)
+++ geronimo/server/trunk/framework/modules/geronimo-deploy-jsr88/src/main/java/org/apache/geronimo/deployment/plugin/jmx/RemoteDeploymentManager.java
Tue Sep 23 10:10:27 2008
@@ -51,6 +51,7 @@
 import org.apache.geronimo.gbean.AbstractNameQuery;
 import org.apache.geronimo.gbean.GBeanInfo;
 import org.apache.geronimo.gbean.GBeanInfoBuilder;
+import org.apache.geronimo.kernel.config.ConfigurationAlreadyExistsException;
 import org.apache.geronimo.kernel.config.NoSuchStoreException;
 import org.apache.geronimo.kernel.repository.Artifact;
 import org.apache.geronimo.kernel.repository.Dependency;
@@ -189,7 +190,7 @@
         }
     }
     
-    public void validatePlugin(PluginType plugin) throws MissingDependencyException {
+    public void validatePlugin(PluginType plugin) throws ConfigurationAlreadyExistsException,
MissingDependencyException {
         PluginInstaller installer = getPluginInstaller();
         try {
             installer.validatePlugin(plugin);

Modified: geronimo/server/trunk/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/PluginInstaller.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/PluginInstaller.java?rev=698248&r1=698247&r2=698248&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/PluginInstaller.java
(original)
+++ geronimo/server/trunk/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/PluginInstaller.java
Tue Sep 23 10:10:27 2008
@@ -21,12 +21,14 @@
 import java.net.URL;
 import java.util.Map;
 import javax.security.auth.login.FailedLoginException;
-import org.apache.geronimo.kernel.repository.Artifact;
-import org.apache.geronimo.kernel.repository.Dependency;
-import org.apache.geronimo.kernel.repository.MissingDependencyException;
+
+import org.apache.geronimo.kernel.config.ConfigurationAlreadyExistsException;
 import org.apache.geronimo.kernel.config.ConfigurationManager;
 import org.apache.geronimo.kernel.config.NoSuchStoreException;
 import org.apache.geronimo.kernel.InvalidGBeanException;
+import org.apache.geronimo.kernel.repository.Artifact;
+import org.apache.geronimo.kernel.repository.Dependency;
+import org.apache.geronimo.kernel.repository.MissingDependencyException;
 import org.apache.geronimo.system.plugin.model.PluginListType;
 import org.apache.geronimo.system.plugin.model.PluginType;
 import org.apache.geronimo.system.plugin.model.AttributesType;
@@ -181,11 +183,13 @@
      * Ensures that a plugin artifact is installable. Checks the Geronimo version,
      * JVM version, and whether or not the plugin is already installed.
      *
-     * @param plugin plugin artifact to check
+     * @param  plugin plugin artifact to check
+     * @throws org.apache.geronimo.kernel.config.ConfigurationAlreadyExistsException
+     *         if a configuration is already installed
      * @throws org.apache.geronimo.kernel.repository.MissingDependencyException
-     *          if a dependency is not satisfied
+     *         if a dependency is not satisfied
      */
-    public void validatePlugin(PluginType plugin) throws MissingDependencyException;
+    public void validatePlugin(PluginType plugin) throws ConfigurationAlreadyExistsException,
MissingDependencyException;
 
     /**
      * Ensures that a plugin's prerequisites are installed

Modified: geronimo/server/trunk/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/PluginInstallerGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/PluginInstallerGBean.java?rev=698248&r1=698247&r2=698248&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/PluginInstallerGBean.java
(original)
+++ geronimo/server/trunk/framework/modules/geronimo-plugin/src/main/java/org/apache/geronimo/system/plugin/PluginInstallerGBean.java
Tue Sep 23 10:10:27 2008
@@ -60,6 +60,7 @@
 import org.apache.geronimo.kernel.InvalidGBeanException;
 import org.apache.geronimo.kernel.Kernel;
 import org.apache.geronimo.kernel.basic.BasicKernel;
+import org.apache.geronimo.kernel.config.ConfigurationAlreadyExistsException;
 import org.apache.geronimo.kernel.config.ConfigurationData;
 import org.apache.geronimo.kernel.config.ConfigurationManager;
 import org.apache.geronimo.kernel.config.ConfigurationStore;
@@ -899,10 +900,12 @@
      * Ensures that a plugin is installable.
      *
      * @param plugin plugin to check
+     * @throws org.apache.geronimo.kernel.config.ConfigurationAlreadyExistsException
+     *         if a configuration is already installed
      * @throws org.apache.geronimo.kernel.repository.MissingDependencyException
-     *          if plugin requires a dependency that is not present
+     *         if a dependency is not satisfied
      */
-    public void validatePlugin(PluginType plugin) throws MissingDependencyException {
+    public void validatePlugin(PluginType plugin) throws ConfigurationAlreadyExistsException,
MissingDependencyException {
         if (plugin.getPluginArtifact().size() != 1) {
             throw new MissingDependencyException("A plugin configuration must include one
plugin artifact, not " + plugin.getPluginArtifact().size(), null, (Stack<Artifact>)
null);
         }
@@ -921,8 +924,8 @@
                 }
                 if (!upgrade) {
                     log.debug("Configuration {} is already installed", artifact);
-//                    throw new MissingDependencyException(
-//                            "Configuration " + artifact + " is already installed.", toArtifact(metadata.getModuleId()),
(Stack<Artifact>) null);
+                    throw new ConfigurationAlreadyExistsException(
+                            "Configuration " + artifact + " is already installed.");
                 }
             }
         }



Mime
View raw message