svn commit: r959025 - in /geronimo/server/trunk/framework: configs/rmi-naming/src/main/plan/plan.xml modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/rmi/RMIRegistryService.java

[ga...@apache.org]

Author: gawor
Date: Tue Jun 29 16:47:48 2010
New Revision: 959025

URL: http://svn.apache.org/viewvc?rev=959025&view=rev
Log:
let's make java.rmi.server.RMIClassLoaderSpi property configurable

Modified:
    geronimo/server/trunk/framework/configs/rmi-naming/src/main/plan/plan.xml
    geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/rmi/RMIRegistryService.java

Modified: geronimo/server/trunk/framework/configs/rmi-naming/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/configs/rmi-naming/src/main/plan/plan.xml?rev=959025&r1=959024&r2=959025&view=diff
==============================================================================
--- geronimo/server/trunk/framework/configs/rmi-naming/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/framework/configs/rmi-naming/src/main/plan/plan.xml Tue Jun 29 16:47:48 2010
@@ -25,6 +25,7 @@
     <gbean name="RMIRegistry" class="org.apache.geronimo.kernel.rmi.RMIRegistryService">
         <attribute name="port">${planNamingPort}</attribute>
         <attribute name="host">${ServerHostname}</attribute>
+        <attribute name="classLoaderSpi">org.apache.geronimo.kernel.rmi.RMIClassLoaderSpiImpl</attribute>
     </gbean>
 
     <gbean name="JavaGlobalContext" class="org.apache.geronimo.gjndi.FederatedContextGBean">

Modified: geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/rmi/RMIRegistryService.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/rmi/RMIRegistryService.java?rev=959025&r1=959024&r2=959025&view=diff
==============================================================================
--- geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/rmi/RMIRegistryService.java (original)
+++ geronimo/server/trunk/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/rmi/RMIRegistryService.java Tue Jun 29 16:47:48 2010
@@ -36,10 +36,12 @@ import org.apache.geronimo.gbean.GBeanLi
  * @version $Rev$ $Date$
  */
 public class RMIRegistryService implements GBeanLifecycle {
+    
     private static final Logger log = LoggerFactory.getLogger(RMIRegistryService.class);
     
     private int port = Registry.REGISTRY_PORT;
     private String host = "0.0.0.0";
+    private String classLoaderSpi;
     private Registry registry;
 
     public int getPort() {
@@ -62,8 +64,18 @@ public class RMIRegistryService implemen
         return "rmi";
     }
 
+    public String getClassLoaderSpi() {
+        return classLoaderSpi;
+    }
+    
+    public void setClassLoaderSpi(String classLoaderSpi) {
+        this.classLoaderSpi = classLoaderSpi;
+    }
+    
     public void doStart() throws Exception {
-        System.setProperty("java.rmi.server.RMIClassLoaderSpi",RMIClassLoaderSpiImpl.class.getName());
+        if (classLoaderSpi != null) {
+            System.setProperty("java.rmi.server.RMIClassLoaderSpi", classLoaderSpi);
+        }
         if (System.getProperty("java.rmi.server.hostname") == null && host != null && !host.equals("0.0.0.0")) {
             System.setProperty("java.rmi.server.hostname", host);
         }
@@ -97,6 +109,7 @@ public class RMIRegistryService implemen
         infoFactory.addAttribute("host", String.class, true, true);
         infoFactory.addAttribute("protocol", String.class, false);
         infoFactory.addAttribute("port", int.class, true, true);
+        infoFactory.addAttribute("classLoaderSpi", String.class, true);
         infoFactory.addAttribute("listenAddress", InetSocketAddress.class, false);
         GBEAN_INFO = infoFactory.getBeanInfo();
     }