Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 44689 invoked from network); 9 Feb 2007 23:34:33 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 9 Feb 2007 23:34:33 -0000 Received: (qmail 53354 invoked by uid 500); 9 Feb 2007 23:34:41 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 53220 invoked by uid 500); 9 Feb 2007 23:34:40 -0000 Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: dev@geronimo.apache.org List-Id: Delivered-To: mailing list scm@geronimo.apache.org Received: (qmail 53209 invoked by uid 99); 9 Feb 2007 23:34:40 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 09 Feb 2007 15:34:40 -0800 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 09 Feb 2007 15:34:32 -0800 Received: by eris.apache.org (Postfix, from userid 65534) id C403E1A981A; Fri, 9 Feb 2007 15:34:12 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit 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 -0000 To: scm@geronimo.apache.org From: djencks@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070209233412.C403E1A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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: *

* 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() {