svn commit: r519919 - /geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/util/PortletManager.java

[gd...@apache.org]

Author: gdamour
Date: Mon Mar 19 05:08:19 2007
New Revision: 519919

URL: http://svn.apache.org/viewvc?view=rev&rev=519919
Log:
Should have been ci as part of r519908.

* Do not start jsr88-cli within the server. It defines a GBean implementing
the PluginInstaller type, GBean named ModuleConfigurerRegistry, which
is not intended to be used within a server as the other GBeans of this 
module. This causes a NPE during the installation of plugins via the command
line deployer: CommandInstallCAR tries to execute startInstall
against all the GBeans implementing the PluginInstaller type and this
invokation fails with a NPE against ModuleConfigurerRegistry.

* Push up the DeploymentFactoryImpl implementation to BaseDeploymentFactory,
such that DeploymentFactoryWithKernel can extend it instead of 
DeploymentFactoryImpl. This refactoring is done to ensure that 
DeploymentFactoryWithKernel does not register a DeploymentFactoryImpl
instance with DeploymentFactoryManager (done via a static block).

This fixes GERONIMO-2983 Installation of plugins via the command line is 
broken.

Modified:
    geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/util/PortletManager.java

Modified: geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/util/PortletManager.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/util/PortletManager.java?view=diff&rev=519919&r1=519918&r2=519919
==============================================================================
--- geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/util/PortletManager.java (original)
+++ geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/util/PortletManager.java Mon Mar 19 05:08:19 2007
@@ -22,6 +22,7 @@
 
 import javax.enterprise.deploy.spi.DeploymentManager;
 import javax.enterprise.deploy.spi.exceptions.DeploymentManagerCreationException;
+import javax.enterprise.deploy.spi.factories.DeploymentFactory;
 import javax.naming.InitialContext;
 import javax.naming.NamingException;
 import javax.portlet.PortletRequest;
@@ -35,7 +36,6 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.geronimo.deployment.plugin.factories.DeploymentFactoryImpl;
 import org.apache.geronimo.deployment.plugin.factories.DeploymentFactoryWithKernel;
 import org.apache.geronimo.gbean.AbstractName;
 import org.apache.geronimo.gbean.GBeanData;
@@ -99,7 +99,7 @@
 
     public static DeploymentManager getDeploymentManager(PortletRequest request) {
         Kernel kernel = getKernel();
-        DeploymentFactoryImpl factory = new DeploymentFactoryWithKernel(kernel);
+        DeploymentFactory factory = new DeploymentFactoryWithKernel(kernel);
         try {
             return factory.getDeploymentManager("deployer:geronimo:inVM", null, null);
         } catch (DeploymentManagerCreationException e) {