geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r505556 - /geronimo/server/branches/1.2/modules/geronimo-j2ee/src/main/java/org/apache/geronimo/j2ee/management/impl/J2EEServerImpl.java
Date Fri, 09 Feb 2007 23:34:12 GMT
Author: djencks
Date: Fri Feb  9 15:34:11 2007
New Revision: 505556

URL: http://svn.apache.org/viewvc?view=rev&rev=505556
Log:
GERONIMO-2814 allow the PluginInstaller to escape from rmi-naming.  This is not an ideal solution
but shouldn't break anything

Modified:
    geronimo/server/branches/1.2/modules/geronimo-j2ee/src/main/java/org/apache/geronimo/j2ee/management/impl/J2EEServerImpl.java

Modified: geronimo/server/branches/1.2/modules/geronimo-j2ee/src/main/java/org/apache/geronimo/j2ee/management/impl/J2EEServerImpl.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/1.2/modules/geronimo-j2ee/src/main/java/org/apache/geronimo/j2ee/management/impl/J2EEServerImpl.java?view=diff&rev=505556&r1=505555&r2=505556
==============================================================================
--- geronimo/server/branches/1.2/modules/geronimo-j2ee/src/main/java/org/apache/geronimo/j2ee/management/impl/J2EEServerImpl.java
(original)
+++ geronimo/server/branches/1.2/modules/geronimo-j2ee/src/main/java/org/apache/geronimo/j2ee/management/impl/J2EEServerImpl.java
Fri Feb  9 15:34:11 2007
@@ -73,7 +73,7 @@
     private final Collection securityRealms;
     private final Collection loginServices;
     private final Collection keystoreManagers;
-    private final PluginInstaller pluginInstaller;
+    private final Collection pluginInstallers;
     private final ConfigurationManager configurationManager;
 
     public J2EEServerImpl(String objectName,
@@ -94,7 +94,7 @@
                           Collection securityRealms,
                           Collection loginServices,
                           Collection keystoreManagers,
-                          PluginInstaller configurationInstaller,
+                          Collection configurationInstallers,
                           ConfigurationManager configurationManager,
                           Collection pluginRepoLists) {
 
@@ -122,7 +122,7 @@
         this.securityRealms = securityRealms;
         this.loginServices = loginServices;
         this.keystoreManagers = keystoreManagers;
-        this.pluginInstaller = configurationInstaller;
+        this.pluginInstallers = configurationInstallers;
         this.configurationManager = configurationManager;
         this.pluginRepoLists = pluginRepoLists;
     }
@@ -147,6 +147,7 @@
      * ObjectName must match this pattern:
      * <p/>
      * domain:j2eeType=J2EEServer,name=MyName
+     * @param objectName object name to verify pattern
      */
     private void verifyObjectName(ObjectName objectName) {
         if (objectName.isPattern()) {
@@ -289,7 +290,10 @@
     }
 
     public PluginInstaller getPluginInstaller() {
-        return pluginInstaller;
+        if (pluginInstallers.isEmpty()) {
+            return null;
+        }
+        return (PluginInstaller) pluginInstallers.iterator().next();
     }
 
     public ConfigurationManager getConfigurationManager() {



Mime
View raw message