geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dblev...@apache.org
Subject svn commit: rev 53831 - in geronimo/trunk/modules: assembly/src/plan core/src/java/org/apache/geronimo/rmi core/src/test/org/apache/geronimo/rmi system/src/java/org/apache/geronimo/system system/src/java/org/apache/geronimo/system/rmi system/src/test/org/apache/geronimo/system/rmi
Date Tue, 05 Oct 2004 23:01:24 GMT
Author: dblevins
Date: Tue Oct  5 16:01:23 2004
New Revision: 53831

Added:
   geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/rmi/
   geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/rmi/RMIClassLoaderSpiImpl.java
      - copied, changed from rev 53824, geronimo/trunk/modules/core/src/java/org/apache/geronimo/rmi/RMIClassLoaderSpiImpl.java
   geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/rmi/RMIRegistryService.java
      - copied, changed from rev 53824, geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/RMIRegistryService.java
   geronimo/trunk/modules/system/src/test/org/apache/geronimo/system/rmi/
   geronimo/trunk/modules/system/src/test/org/apache/geronimo/system/rmi/RMIClassLoaderSpiImplTest.java
      - copied, changed from rev 53824, geronimo/trunk/modules/core/src/test/org/apache/geronimo/rmi/RMIClassLoaderSpiImplTest.java
Removed:
   geronimo/trunk/modules/core/src/java/org/apache/geronimo/rmi/RMIClassLoaderSpiImpl.java
   geronimo/trunk/modules/core/src/test/org/apache/geronimo/rmi/RMIClassLoaderSpiImplTest.java
   geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/RMIRegistryService.java
Modified:
   geronimo/trunk/modules/assembly/src/plan/system-plan.xml
Log:
Moved the RMIRegistryService and RMIClassLoaderSpiImpl into o.a.g.system.rmi

Now we can start the rmi service without getting classpath exceptions


Modified: geronimo/trunk/modules/assembly/src/plan/system-plan.xml
==============================================================================
--- geronimo/trunk/modules/assembly/src/plan/system-plan.xml	(original)
+++ geronimo/trunk/modules/assembly/src/plan/system-plan.xml	Tue Oct  5 16:01:23 2004
@@ -82,7 +82,7 @@
     </gbean>
 
     <!-- RMI Registry -->
-    <gbean name="geronimo.server:role=RMIRegistry" class="org.apache.geronimo.system.RMIRegistryService">
+    <gbean name="geronimo.server:role=RMIRegistry" class="org.apache.geronimo.system.rmi.RMIRegistryService">
         <attribute name="port" type="int">1099</attribute>
     </gbean>
 

Copied: geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/rmi/RMIClassLoaderSpiImpl.java
(from rev 53824, geronimo/trunk/modules/core/src/java/org/apache/geronimo/rmi/RMIClassLoaderSpiImpl.java)
==============================================================================
--- geronimo/trunk/modules/core/src/java/org/apache/geronimo/rmi/RMIClassLoaderSpiImpl.java
(original)
+++ geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/rmi/RMIClassLoaderSpiImpl.java
Tue Oct  5 16:01:23 2004
@@ -1,6 +1,6 @@
 /**
  *
- * Copyright 2003-2004 The Apache Software Foundation
+ * Copyright 2004 The Apache Software Foundation
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package org.apache.geronimo.rmi;
+package org.apache.geronimo.system.rmi;
 
 import java.net.MalformedURLException;
 import java.net.URL;

Copied: geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/rmi/RMIRegistryService.java
(from rev 53824, geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/RMIRegistryService.java)
==============================================================================
--- geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/RMIRegistryService.java
(original)
+++ geronimo/trunk/modules/system/src/java/org/apache/geronimo/system/rmi/RMIRegistryService.java
Tue Oct  5 16:01:23 2004
@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.geronimo.system;
+package org.apache.geronimo.system.rmi;
 
 import java.rmi.registry.LocateRegistry;
 import java.rmi.registry.Registry;
@@ -46,6 +46,7 @@
     }
 
     public void doStart() throws WaitingException, Exception {
+        System.setProperty("java.rmi.server.RMIClassLoaderSpi",RMIClassLoaderSpiImpl.class.getName());
         registry = LocateRegistry.createRegistry(port);
         log.info("Started RMI Registry on port " + port);
     }

Copied: geronimo/trunk/modules/system/src/test/org/apache/geronimo/system/rmi/RMIClassLoaderSpiImplTest.java
(from rev 53824, geronimo/trunk/modules/core/src/test/org/apache/geronimo/rmi/RMIClassLoaderSpiImplTest.java)
==============================================================================
--- geronimo/trunk/modules/core/src/test/org/apache/geronimo/rmi/RMIClassLoaderSpiImplTest.java
(original)
+++ geronimo/trunk/modules/system/src/test/org/apache/geronimo/system/rmi/RMIClassLoaderSpiImplTest.java
Tue Oct  5 16:01:23 2004
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package org.apache.geronimo.rmi;
+package org.apache.geronimo.system.rmi;
 
 import java.net.MalformedURLException;
 import java.net.URL;
@@ -30,42 +30,38 @@
  * @version $Rev$ $Date$
  */
 public class RMIClassLoaderSpiImplTest
-    extends TestCase
-{
+        extends TestCase {
     private String baseURL;
     private String normalizedBaseURL;
-    
-    protected void setUp() throws Exception
-    {
+
+    protected void setUp() throws Exception {
         File dir = new File(System.getProperty("user.home"));
-        
+
         baseURL = dir.toURL().toString();
         if (baseURL.endsWith("/")) {
             baseURL = baseURL.substring(0, baseURL.length() - 1);
         }
-        
+
         normalizedBaseURL = dir.toURI().toURL().toString();
         if (normalizedBaseURL.endsWith("/")) {
             normalizedBaseURL = normalizedBaseURL.substring(0, normalizedBaseURL.length()
- 1);
         }
-        
+
         System.out.println("Using base URL: " + baseURL);
         System.out.println("Using normalized base URL: " + normalizedBaseURL);
     }
-    
-    public void testNormalizeURL() throws MalformedURLException
-    {
+
+    public void testNormalizeURL() throws MalformedURLException {
         URL url = new URL(baseURL + "/Apache Group/Geronimo");
         URL normal = RMIClassLoaderSpiImpl.normalizeURL(url);
         assertEquals(normalizedBaseURL + "/Apache%20Group/Geronimo", normal.toString());
     }
-    
-    public void testNormalizeCodebase() throws MalformedURLException
-    {
+
+    public void testNormalizeCodebase() throws MalformedURLException {
         String codebase = baseURL + "/Apache Group/Geronimo " + baseURL + "/Apache Group/Apache2";
-        
+
         String normal = RMIClassLoaderSpiImpl.normalizeCodebase(codebase);
-        assertEquals(normalizedBaseURL + "/Apache%20Group/Geronimo " + 
+        assertEquals(normalizedBaseURL + "/Apache%20Group/Geronimo " +
                      normalizedBaseURL + "/Apache%20Group/Apache2", normal);
     }
 }

Mime
View raw message