Author: rfeng
Date: Fri Oct  6 14:07:14 2006
New Revision: 453762

URL: http://svn.apache.org/viewvc?view=rev&rev=453762
Log:
Switch to safer ports (7777 is the default for java debugging)

Modified:
    
incubator/tuscany/java/sca/services/bindings/binding.rmi/src/main/java/org/apache/tuscany/binding/rmi/RMIService.java
    
incubator/tuscany/java/sca/services/bindings/binding.rmi/src/test/java/org/apache/tuscany/binding/rmi/RMIServiceTestCase.java
    
incubator/tuscany/java/sca/services/bindings/binding.rmi/src/test/java/org/apache/tuscany/binding/rmi/host/RMIHostImplTestCase.java

Modified: 
incubator/tuscany/java/sca/services/bindings/binding.rmi/src/main/java/org/apache/tuscany/binding/rmi/RMIService.java
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/bindings/binding.rmi/src/main/java/org/apache/tuscany/binding/rmi/RMIService.java?view=diff&rev=453762&r1=453761&r2=453762
==============================================================================
--- 
incubator/tuscany/java/sca/services/bindings/binding.rmi/src/main/java/org/apache/tuscany/binding/rmi/RMIService.java
 (original)
+++ 
incubator/tuscany/java/sca/services/bindings/binding.rmi/src/main/java/org/apache/tuscany/binding/rmi/RMIService.java
 Fri Oct  6 14:07:14 2006
@@ -84,7 +84,7 @@
 
     public void stop() {
         try {
-            rmiHost.unregisterService(serviceName, Integer.decode(port));
+            rmiHost.unregisterService(serviceName, getPort(port));
         } catch (RMIHostException e) {
             throw new NoRemoteServiceException(e.getMessage());
         }

Modified: 
incubator/tuscany/java/sca/services/bindings/binding.rmi/src/test/java/org/apache/tuscany/binding/rmi/RMIServiceTestCase.java
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/bindings/binding.rmi/src/test/java/org/apache/tuscany/binding/rmi/RMIServiceTestCase.java?view=diff&rev=453762&r1=453761&r2=453762
==============================================================================
--- 
incubator/tuscany/java/sca/services/bindings/binding.rmi/src/test/java/org/apache/tuscany/binding/rmi/RMIServiceTestCase.java
 (original)
+++ 
incubator/tuscany/java/sca/services/bindings/binding.rmi/src/test/java/org/apache/tuscany/binding/rmi/RMIServiceTestCase.java
 Fri Oct  6 14:07:14 2006
@@ -38,15 +38,15 @@
 

     @SuppressWarnings("unchecked")

     public void testCreateRmiService() {

-        RMIService s = new RMIService("bla", null, null, new RMIHostImpl(), 
null, "9876", "bla", Runnable.class) {

+        RMIService s = new RMIService("bla023", null, null, new RMIHostImpl(), 
null, "9996", "bla", Runnable.class) {

             public WireInvocationHandler getHandler() {

                 return null;

             }

         };

         s.start();

         try {

-        s.stop();

-        } catch (RMIHostRuntimeException e){

+            s.stop();

+        } catch (RMIHostRuntimeException e) {

             // expected

         }

     }


Modified: 
incubator/tuscany/java/sca/services/bindings/binding.rmi/src/test/java/org/apache/tuscany/binding/rmi/host/RMIHostImplTestCase.java
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/bindings/binding.rmi/src/test/java/org/apache/tuscany/binding/rmi/host/RMIHostImplTestCase.java?view=diff&rev=453762&r1=453761&r2=453762
==============================================================================
--- 
incubator/tuscany/java/sca/services/bindings/binding.rmi/src/test/java/org/apache/tuscany/binding/rmi/host/RMIHostImplTestCase.java
 (original)
+++ 
incubator/tuscany/java/sca/services/bindings/binding.rmi/src/test/java/org/apache/tuscany/binding/rmi/host/RMIHostImplTestCase.java
 Fri Oct  6 14:07:14 2006
@@ -40,35 +40,37 @@
 

     public void testRegisterService1() throws RMIHostRuntimeException, 
RMIHostException {

         RMIHostImpl host = new RMIHostImpl();

-        host.registerService("foo1", new Remote() {

-        });

+        host.registerService("foo1", new MockRemote());

         host.unregisterService("foo1");

     }

 

     public void testRegisterService2() throws RMIHostRuntimeException, 
RMIHostException {

         RMIHostImpl host = new RMIHostImpl();

-        host.registerService("bar1", 9999, new Remote() {

-        });

+        host.registerService("bar1", 9999, new MockRemote());

         host.unregisterService("bar1", 9999);

     }

 

     public void testRegisterServiceAlreadyBound() throws 
RMIHostRuntimeException, RMIHostException {

         RMIHostImpl host = new RMIHostImpl();

-        host.registerService("bar2", 7777, new Remote() {});

+        host.registerService("bar2", 9997, new MockRemote());

         try {

-        host.registerService("bar2", 7777, new Remote() {});

+            host.registerService("bar2", 9997, new MockRemote());

         } catch (RMIHostException e) {

             // expected

-            host.unregisterService("bar2", 7777);

+            host.unregisterService("bar2", 9997);

         }

     }

+

     public void testUnRegisterService() throws RMIHostRuntimeException, 
RMIHostException {

         RMIHostImpl host = new RMIHostImpl();

         try {

-            host.unregisterService("bar3", 8888);

+            host.unregisterService("bar3", 9998);

             fail();

         } catch (RMIHostException e) {

             // expected

         }

+    }

+

+    private static class MockRemote implements Remote {

     }

 }




---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to