Return-Path: Delivered-To: apmail-ws-tuscany-commits-archive@locus.apache.org Received: (qmail 55059 invoked from network); 28 Sep 2006 13:24:59 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 28 Sep 2006 13:24:59 -0000 Received: (qmail 91227 invoked by uid 500); 28 Sep 2006 13:24:59 -0000 Delivered-To: apmail-ws-tuscany-commits-archive@ws.apache.org Received: (qmail 91043 invoked by uid 500); 28 Sep 2006 13:24:59 -0000 Mailing-List: contact tuscany-commits-help@ws.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: tuscany-dev@ws.apache.org Delivered-To: mailing list tuscany-commits@ws.apache.org Received: (qmail 91013 invoked by uid 99); 28 Sep 2006 13:24:58 -0000 Received: from idunn.apache.osuosl.org (HELO idunn.apache.osuosl.org) (140.211.166.84) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 28 Sep 2006 06:24:58 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=5.0 tests=ALL_TRUSTED,NO_REAL_NAME Received: from [140.211.166.113] ([140.211.166.113:62365] helo=eris.apache.org) by idunn.apache.osuosl.org (ecelerity 2.1.1.8 r(12930)) with ESMTP id 71/02-05478-2FCCB154 for ; Thu, 28 Sep 2006 06:24:10 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 983831A981F; Thu, 28 Sep 2006 06:23:06 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r450848 - in /incubator/tuscany/java/sca/services/bindings/binding.rmi/src: main/java/org/apache/tuscany/binding/rmi/RMIService.java test/java/org/apache/tuscany/binding/rmi/BindingTestCase.java Date: Thu, 28 Sep 2006 13:23:06 -0000 To: tuscany-commits@ws.apache.org From: antelder@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20060928132306.983831A981F@eris.apache.org> X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: antelder Date: Thu Sep 28 06:23:05 2006 New Revision: 450848 URL: http://svn.apache.org/viewvc?view=rev&rev=450848 Log: Apply RMI fix from Venkat till his access is sortted out 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/BindingTestCase.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=450848&r1=450847&r2=450848 ============================================================================== --- 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 Thu Sep 28 06:23:05 2006 @@ -97,7 +97,7 @@ enhancer.setCallback(new RemoteMethodHandler(getHandler(), interfaze)); if (!Remote.class.isAssignableFrom(serviceInterface)) { - RMIServiceClassLoader classloader = new RMIServiceClassLoader(); + RMIServiceClassLoader classloader = new RMIServiceClassLoader(Thread.currentThread().getContextClassLoader()); final byte[] byteCode = generateRemoteInterface(serviceInterface); serviceInterface = classloader.defineClass(byteCode); enhancer.setClassLoader(classloader); @@ -149,6 +149,9 @@ } private class RMIServiceClassLoader extends ClassLoader { + public RMIServiceClassLoader(ClassLoader parent) { + super(parent); + } public Class defineClass(byte[] byteArray) { return defineClass(null, byteArray, 0, byteArray.length); } Modified: incubator/tuscany/java/sca/services/bindings/binding.rmi/src/test/java/org/apache/tuscany/binding/rmi/BindingTestCase.java URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/services/bindings/binding.rmi/src/test/java/org/apache/tuscany/binding/rmi/BindingTestCase.java?view=diff&rev=450848&r1=450847&r2=450848 ============================================================================== --- incubator/tuscany/java/sca/services/bindings/binding.rmi/src/test/java/org/apache/tuscany/binding/rmi/BindingTestCase.java (original) +++ incubator/tuscany/java/sca/services/bindings/binding.rmi/src/test/java/org/apache/tuscany/binding/rmi/BindingTestCase.java Thu Sep 28 06:23:05 2006 @@ -1,37 +1,33 @@ package org.apache.tuscany.binding.rmi; import helloworld.HelloWorldRmiService; -import helloworld.HelloWorldService; import org.apache.tuscany.test.SCATestCase; import org.osoa.sca.CompositeContext; import org.osoa.sca.CurrentCompositeContext; public class BindingTestCase extends SCATestCase { - private HelloWorldService helloWorldService; private HelloWorldRmiService helloWorldRmiService; public void testRmiService() { - //System.out.println(helloWorldRmiService.sayRmiHello("Tuscany World!")); + assertEquals("Hello from the RMI Service to - Tuscany World! thro the RMI Reference", + helloWorldRmiService.sayRmiHello("Tuscany World!")); } protected void setUp() throws Exception { - //addExtension("rmi.binding", - // getClass().getClassLoader().getResource("META-INF/sca/rmi_extension.scdl")); + addExtension("rmi.binding", + getClass().getClassLoader().getResource("META-INF/sca/rmi_extension.scdl")); - //super.setUp(); - //System.out.println("Hit Enter"); - //System.in.read(); - - //CompositeContext context = CurrentCompositeContext.getContext(); - //helloWorldRmiService = context.locateService(HelloWorldRmiService.class, - // "HelloWorldRmiServiceComponent"); + super.setUp(); + CompositeContext context = CurrentCompositeContext.getContext(); + helloWorldRmiService = context.locateService(HelloWorldRmiService.class, + "HelloWorldRmiServiceComponent"); } protected void tearDown() throws Exception { - //super.tearDown(); + super.tearDown(); } } --------------------------------------------------------------------- To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org For additional commands, e-mail: tuscany-commits-help@ws.apache.org