From 7d824227f4400206ceb3849fb01d461d0b42a9c3 Mon Sep 17 00:00:00 2001 From: ramkumar Date: Tue, 11 Aug 2009 16:45:08 +0000 Subject: Fixes for TUSCANY-3202 git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@803202 13f79535-47bb-0310-9956-ffa450edef68 --- .../itest/spring/src/main/java/helloworld/HelloWorld.java | 3 --- .../imports/META-INF/spring/CalculatorService-context.xml | 3 +++ .../context/imports/META-INF/spring/SpringImport-context.xml | 12 ++++++++++++ .../resources/location/folder/SpringFolderLocation.composite | 4 ++-- .../location/folder/SpringFolderNoManifest.composite | 2 +- .../main/resources/location/jar/SpringJarLocation.composite | 2 +- .../resources/location/jar/SpringJarNoManifest.composite | 2 +- .../sca/itest/spring/SpringDelegationHelloWorld.composite | 4 ++-- .../tuscany/sca/itest/spring/SpringHelloWorld.composite | 2 +- .../src/test/java/context/imports/CalculatorClient.java | 2 +- .../java/org/apache/tuscany/sca/itest/spring/HelloWorld.java | 3 --- .../apache/tuscany/sca/itest/spring/TestHelloWorldBean.java | 2 ++ .../sca/itest/spring/TestHelloWorldDelegatorBean.java | 2 ++ 13 files changed, 28 insertions(+), 15 deletions(-) diff --git a/branches/sca-java-1.x/itest/spring/src/main/java/helloworld/HelloWorld.java b/branches/sca-java-1.x/itest/spring/src/main/java/helloworld/HelloWorld.java index e0987096f6..46f8facf78 100644 --- a/branches/sca-java-1.x/itest/spring/src/main/java/helloworld/HelloWorld.java +++ b/branches/sca-java-1.x/itest/spring/src/main/java/helloworld/HelloWorld.java @@ -19,15 +19,12 @@ package helloworld; -import org.osoa.sca.annotations.Remotable; - /** * Interface for the "hello world" service - predictably simple with a single operation * "sayHello" * * @version $Rev$ $Date$ */ -@Remotable public interface HelloWorld { String sayHello(String s); diff --git a/branches/sca-java-1.x/itest/spring/src/main/resources/context/imports/META-INF/spring/CalculatorService-context.xml b/branches/sca-java-1.x/itest/spring/src/main/resources/context/imports/META-INF/spring/CalculatorService-context.xml index 7c84965629..4532810433 100644 --- a/branches/sca-java-1.x/itest/spring/src/main/resources/context/imports/META-INF/spring/CalculatorService-context.xml +++ b/branches/sca-java-1.x/itest/spring/src/main/resources/context/imports/META-INF/spring/CalculatorService-context.xml @@ -35,5 +35,8 @@ + + + diff --git a/branches/sca-java-1.x/itest/spring/src/main/resources/context/imports/META-INF/spring/SpringImport-context.xml b/branches/sca-java-1.x/itest/spring/src/main/resources/context/imports/META-INF/spring/SpringImport-context.xml index 3faed92fd2..6dbcef46a6 100644 --- a/branches/sca-java-1.x/itest/spring/src/main/resources/context/imports/META-INF/spring/SpringImport-context.xml +++ b/branches/sca-java-1.x/itest/spring/src/main/resources/context/imports/META-INF/spring/SpringImport-context.xml @@ -26,4 +26,16 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/branches/sca-java-1.x/itest/spring/src/main/resources/location/folder/SpringFolderLocation.composite b/branches/sca-java-1.x/itest/spring/src/main/resources/location/folder/SpringFolderLocation.composite index 50d6456737..c6f2111d0e 100644 --- a/branches/sca-java-1.x/itest/spring/src/main/resources/location/folder/SpringFolderLocation.composite +++ b/branches/sca-java-1.x/itest/spring/src/main/resources/location/folder/SpringFolderLocation.composite @@ -28,11 +28,11 @@ - + - + Hello diff --git a/branches/sca-java-1.x/itest/spring/src/main/resources/location/folder/SpringFolderNoManifest.composite b/branches/sca-java-1.x/itest/spring/src/main/resources/location/folder/SpringFolderNoManifest.composite index dafa671288..b0efbfd5b7 100644 --- a/branches/sca-java-1.x/itest/spring/src/main/resources/location/folder/SpringFolderNoManifest.composite +++ b/branches/sca-java-1.x/itest/spring/src/main/resources/location/folder/SpringFolderNoManifest.composite @@ -28,7 +28,7 @@ - + diff --git a/branches/sca-java-1.x/itest/spring/src/main/resources/location/jar/SpringJarLocation.composite b/branches/sca-java-1.x/itest/spring/src/main/resources/location/jar/SpringJarLocation.composite index b0b191801d..7b16c221cf 100644 --- a/branches/sca-java-1.x/itest/spring/src/main/resources/location/jar/SpringJarLocation.composite +++ b/branches/sca-java-1.x/itest/spring/src/main/resources/location/jar/SpringJarLocation.composite @@ -28,7 +28,7 @@ - + diff --git a/branches/sca-java-1.x/itest/spring/src/main/resources/location/jar/SpringJarNoManifest.composite b/branches/sca-java-1.x/itest/spring/src/main/resources/location/jar/SpringJarNoManifest.composite index addb4655fc..c3d49757eb 100644 --- a/branches/sca-java-1.x/itest/spring/src/main/resources/location/jar/SpringJarNoManifest.composite +++ b/branches/sca-java-1.x/itest/spring/src/main/resources/location/jar/SpringJarNoManifest.composite @@ -28,7 +28,7 @@ - + diff --git a/branches/sca-java-1.x/itest/spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringDelegationHelloWorld.composite b/branches/sca-java-1.x/itest/spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringDelegationHelloWorld.composite index bd050135da..7d72242df3 100644 --- a/branches/sca-java-1.x/itest/spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringDelegationHelloWorld.composite +++ b/branches/sca-java-1.x/itest/spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringDelegationHelloWorld.composite @@ -21,8 +21,8 @@ name="SpringHelloWorld"> - - + + diff --git a/branches/sca-java-1.x/itest/spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringHelloWorld.composite b/branches/sca-java-1.x/itest/spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringHelloWorld.composite index 1047d2a210..847056adf6 100644 --- a/branches/sca-java-1.x/itest/spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringHelloWorld.composite +++ b/branches/sca-java-1.x/itest/spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringHelloWorld.composite @@ -21,7 +21,7 @@ name="SpringHelloWorld"> - + diff --git a/branches/sca-java-1.x/itest/spring/src/test/java/context/imports/CalculatorClient.java b/branches/sca-java-1.x/itest/spring/src/test/java/context/imports/CalculatorClient.java index d3bd190cc0..12ced16785 100644 --- a/branches/sca-java-1.x/itest/spring/src/test/java/context/imports/CalculatorClient.java +++ b/branches/sca-java-1.x/itest/spring/src/test/java/context/imports/CalculatorClient.java @@ -41,7 +41,7 @@ public class CalculatorClient { node.start(); CalculatorService calculatorService = - ((SCAClient)node).getService(CalculatorService.class, "CalculatorServiceComponent"); + ((SCAClient)node).getService(CalculatorService.class, "CalculatorServiceComponent/CalculatorServiceBean"); System.out.println("3 + 2=" + calculatorService.add(3, 2)); System.out.println("3 - 2=" + calculatorService.subtract(3, 2)); diff --git a/branches/sca-java-1.x/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/HelloWorld.java b/branches/sca-java-1.x/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/HelloWorld.java index 3957e49bf3..1405310100 100644 --- a/branches/sca-java-1.x/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/HelloWorld.java +++ b/branches/sca-java-1.x/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/HelloWorld.java @@ -19,14 +19,11 @@ package org.apache.tuscany.sca.itest.spring; -import org.osoa.sca.annotations.Remotable; - /** * Interface for the "hello world" service - predictably simple with a single operation * "sayHello" * */ -@Remotable public interface HelloWorld { public String sayHello(String s); diff --git a/branches/sca-java-1.x/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/TestHelloWorldBean.java b/branches/sca-java-1.x/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/TestHelloWorldBean.java index fa7967c964..45b47b47a8 100644 --- a/branches/sca-java-1.x/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/TestHelloWorldBean.java +++ b/branches/sca-java-1.x/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/TestHelloWorldBean.java @@ -18,6 +18,8 @@ */ package org.apache.tuscany.sca.itest.spring; +import helloworld.HelloWorld; + /** * A simple test Spring bean which provides the HelloWorld service * diff --git a/branches/sca-java-1.x/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/TestHelloWorldDelegatorBean.java b/branches/sca-java-1.x/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/TestHelloWorldDelegatorBean.java index b57cc7f366..5dfeeffd97 100644 --- a/branches/sca-java-1.x/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/TestHelloWorldDelegatorBean.java +++ b/branches/sca-java-1.x/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/TestHelloWorldDelegatorBean.java @@ -18,6 +18,8 @@ */ package org.apache.tuscany.sca.itest.spring; +import helloworld.HelloWorld; + /** * A simple test Spring bean which delgates to another bean * -- cgit v1.2.3