geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r698663 - 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 Wed, 24 Sep 2008 17:29:23 GMT
Author: djencks
Date: Wed Sep 24 10:29:22 2008
New Revision: 698663

URL: http://svn.apache.org/viewvc?rev=698663&view=rev
Log:
GERONIMO-4318 revert change that breaks plugin farming and running multiple servers off of
one repository

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=698663&r1=698662&r2=698663&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
Wed Sep 24 10:29:22 2008
@@ -51,7 +51,6 @@
 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;
@@ -190,7 +189,7 @@
         }
     }
     
-    public void validatePlugin(PluginType plugin) throws ConfigurationAlreadyExistsException,
MissingDependencyException {
+    public void validatePlugin(PluginType plugin) throws 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=698663&r1=698662&r2=698663&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
Wed Sep 24 10:29:22 2008
@@ -21,14 +21,12 @@
 import java.net.URL;
 import java.util.Map;
 import javax.security.auth.login.FailedLoginException;
-
-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.kernel.config.ConfigurationManager;
+import org.apache.geronimo.kernel.config.NoSuchStoreException;
+import org.apache.geronimo.kernel.InvalidGBeanException;
 import org.apache.geronimo.system.plugin.model.PluginListType;
 import org.apache.geronimo.system.plugin.model.PluginType;
 import org.apache.geronimo.system.plugin.model.AttributesType;
@@ -183,13 +181,11 @@
      * 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
-     * @throws org.apache.geronimo.kernel.config.ConfigurationAlreadyExistsException
-     *         if a configuration is already installed
+     * @param plugin plugin artifact to check
      * @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 ConfigurationAlreadyExistsException,
MissingDependencyException;
+    public void validatePlugin(PluginType plugin) throws 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=698663&r1=698662&r2=698663&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
Wed Sep 24 10:29:22 2008
@@ -60,7 +60,6 @@
 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;
@@ -900,12 +899,10 @@
      * 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 a dependency is not satisfied
+     *          if plugin requires a dependency that is not present
      */
-    public void validatePlugin(PluginType plugin) throws ConfigurationAlreadyExistsException,
MissingDependencyException {
+    public void validatePlugin(PluginType plugin) throws 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);
         }
@@ -924,8 +921,8 @@
                 }
                 if (!upgrade) {
                     log.debug("Configuration {} is already installed", artifact);
-                    throw new ConfigurationAlreadyExistsException(
-                            "Configuration " + artifact + " is already installed.");
+//                    throw new MissingDependencyException(
+//                            "Configuration " + artifact + " is already installed.", toArtifact(metadata.getModuleId()),
(Stack<Artifact>) null);
                 }
             }
         }



Mime
View raw message