You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by ra...@apache.org on 2009/08/11 18:48:30 UTC
svn commit: r803204 - in /tuscany/branches/sca-java-1.5.1:
itest/spring/src/main/java/helloworld/
itest/spring/src/main/resources/context/imports/META-INF/spring/
itest/spring/src/main/resources/location/folder/
itest/spring/src/main/resources/location...
Author: ramkumar
Date: Tue Aug 11 16:48:29 2009
New Revision: 803204
URL: http://svn.apache.org/viewvc?rev=803204&view=rev
Log:
Fixes for TUSCANY-3202
Modified:
tuscany/branches/sca-java-1.5.1/itest/spring/src/main/java/helloworld/HelloWorld.java
tuscany/branches/sca-java-1.5.1/itest/spring/src/main/resources/context/imports/META-INF/spring/CalculatorService-context.xml
tuscany/branches/sca-java-1.5.1/itest/spring/src/main/resources/context/imports/META-INF/spring/SpringImport-context.xml
tuscany/branches/sca-java-1.5.1/itest/spring/src/main/resources/location/folder/SpringFolderLocation.composite
tuscany/branches/sca-java-1.5.1/itest/spring/src/main/resources/location/jar/SpringJarLocation.composite
tuscany/branches/sca-java-1.5.1/itest/spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringDelegationHelloWorld.composite
tuscany/branches/sca-java-1.5.1/itest/spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringHelloWorld.composite
tuscany/branches/sca-java-1.5.1/itest/spring/src/test/java/context/imports/CalculatorClient.java
tuscany/branches/sca-java-1.5.1/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/HelloWorld.java
tuscany/branches/sca-java-1.5.1/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/TestHelloWorldBean.java
tuscany/branches/sca-java-1.5.1/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/TestHelloWorldDelegatorBean.java
tuscany/branches/sca-java-1.5.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/introspect/SpringXMLComponentTypeLoader.java
Modified: tuscany/branches/sca-java-1.5.1/itest/spring/src/main/java/helloworld/HelloWorld.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.5.1/itest/spring/src/main/java/helloworld/HelloWorld.java?rev=803204&r1=803203&r2=803204&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.5.1/itest/spring/src/main/java/helloworld/HelloWorld.java (original)
+++ tuscany/branches/sca-java-1.5.1/itest/spring/src/main/java/helloworld/HelloWorld.java Tue Aug 11 16:48:29 2009
@@ -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);
Modified: tuscany/branches/sca-java-1.5.1/itest/spring/src/main/resources/context/imports/META-INF/spring/CalculatorService-context.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.5.1/itest/spring/src/main/resources/context/imports/META-INF/spring/CalculatorService-context.xml?rev=803204&r1=803203&r2=803204&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.5.1/itest/spring/src/main/resources/context/imports/META-INF/spring/CalculatorService-context.xml (original)
+++ tuscany/branches/sca-java-1.5.1/itest/spring/src/main/resources/context/imports/META-INF/spring/CalculatorService-context.xml Tue Aug 11 16:48:29 2009
@@ -35,5 +35,8 @@
<sca:reference name="subtractService" type="calculator.SubtractService"/>
<sca:reference name="multiplyService" type="calculator.MultiplyService"/>
<sca:reference name="divideService" type="calculator.DivideService"/>
+
+ <bean id="AddServiceBean" class="calculator.AddServiceImpl">
+ </bean>
</beans>
Modified: tuscany/branches/sca-java-1.5.1/itest/spring/src/main/resources/context/imports/META-INF/spring/SpringImport-context.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.5.1/itest/spring/src/main/resources/context/imports/META-INF/spring/SpringImport-context.xml?rev=803204&r1=803203&r2=803204&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.5.1/itest/spring/src/main/resources/context/imports/META-INF/spring/SpringImport-context.xml (original)
+++ tuscany/branches/sca-java-1.5.1/itest/spring/src/main/resources/context/imports/META-INF/spring/SpringImport-context.xml Tue Aug 11 16:48:29 2009
@@ -26,4 +26,16 @@
<import resource="CalculatorService-context.xml"/>
-</beans>
\ No newline at end of file
+ <bean id="CalculatorServiceBean" class="calculator.CalculatorServiceImpl">
+ <property name="addService" ref="addService"/>
+ <property name="subtractService" ref="subtractService"/>
+ <property name="multiplyService" ref="multiplyService"/>
+ <property name="divideService" ref="divideService"/>
+ </bean>
+
+ <sca:reference name="addService" type="calculator.AddService"/>
+ <sca:reference name="subtractService" type="calculator.SubtractService"/>
+ <sca:reference name="multiplyService" type="calculator.MultiplyService"/>
+ <sca:reference name="divideService" type="calculator.DivideService"/>
+
+</beans>
Modified: tuscany/branches/sca-java-1.5.1/itest/spring/src/main/resources/location/folder/SpringFolderLocation.composite
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.5.1/itest/spring/src/main/resources/location/folder/SpringFolderLocation.composite?rev=803204&r1=803203&r2=803204&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.5.1/itest/spring/src/main/resources/location/folder/SpringFolderLocation.composite (original)
+++ tuscany/branches/sca-java-1.5.1/itest/spring/src/main/resources/location/folder/SpringFolderLocation.composite Tue Aug 11 16:48:29 2009
@@ -28,11 +28,11 @@
<component name="ClientComponent">
<implementation.java class="helloworld.HelloWorldProxy"/>
- <reference name="delegate" target="HelloWorldComponent"/>
+ <reference name="delegate" target="HelloWorldComponent/testBean1"/>
</component>
<component name="HelloWorldComponent">
- <implementation.spring location="springapp"/>
+ <implementation.spring location="springapp"/>
<property name="TestProperty">Hello</property>
</component>
Modified: tuscany/branches/sca-java-1.5.1/itest/spring/src/main/resources/location/jar/SpringJarLocation.composite
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.5.1/itest/spring/src/main/resources/location/jar/SpringJarLocation.composite?rev=803204&r1=803203&r2=803204&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.5.1/itest/spring/src/main/resources/location/jar/SpringJarLocation.composite (original)
+++ tuscany/branches/sca-java-1.5.1/itest/spring/src/main/resources/location/jar/SpringJarLocation.composite Tue Aug 11 16:48:29 2009
@@ -28,7 +28,7 @@
<component name="ClientComponent">
<implementation.java class="helloworld.HelloWorldProxy"/>
- <reference name="delegate" target="HelloWorldComponent"/>
+ <reference name="delegate" target="HelloWorldComponent/testBean1"/>
</component>
<component name="HelloWorldComponent">
Modified: tuscany/branches/sca-java-1.5.1/itest/spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringDelegationHelloWorld.composite
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.5.1/itest/spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringDelegationHelloWorld.composite?rev=803204&r1=803203&r2=803204&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.5.1/itest/spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringDelegationHelloWorld.composite (original)
+++ tuscany/branches/sca-java-1.5.1/itest/spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringDelegationHelloWorld.composite Tue Aug 11 16:48:29 2009
@@ -21,8 +21,8 @@
name="SpringHelloWorld">
<component name="ClientComponent">
- <implementation.java class="org.apache.tuscany.sca.itest.spring.HelloWorldProxy"/>
- <reference name="delegate" target="HelloWorldComponent"/>
+ <implementation.java class="helloworld.HelloWorldProxy"/>
+ <reference name="delegate" target="HelloWorldComponent/testBean"/>
</component>
<component name="HelloWorldComponent">
Modified: tuscany/branches/sca-java-1.5.1/itest/spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringHelloWorld.composite
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.5.1/itest/spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringHelloWorld.composite?rev=803204&r1=803203&r2=803204&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.5.1/itest/spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringHelloWorld.composite (original)
+++ tuscany/branches/sca-java-1.5.1/itest/spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringHelloWorld.composite Tue Aug 11 16:48:29 2009
@@ -21,7 +21,7 @@
name="SpringHelloWorld">
<component name="ClientComponent">
- <implementation.java class="org.apache.tuscany.sca.itest.spring.HelloWorldProxy"/>
+ <implementation.java class="helloworld.HelloWorldProxy"/>
<reference name="delegate" target="HelloWorldComponent"/>
</component>
Modified: tuscany/branches/sca-java-1.5.1/itest/spring/src/test/java/context/imports/CalculatorClient.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.5.1/itest/spring/src/test/java/context/imports/CalculatorClient.java?rev=803204&r1=803203&r2=803204&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.5.1/itest/spring/src/test/java/context/imports/CalculatorClient.java (original)
+++ tuscany/branches/sca-java-1.5.1/itest/spring/src/test/java/context/imports/CalculatorClient.java Tue Aug 11 16:48:29 2009
@@ -41,7 +41,7 @@
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));
Modified: tuscany/branches/sca-java-1.5.1/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/HelloWorld.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.5.1/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/HelloWorld.java?rev=803204&r1=803203&r2=803204&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.5.1/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/HelloWorld.java (original)
+++ tuscany/branches/sca-java-1.5.1/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/HelloWorld.java Tue Aug 11 16:48:29 2009
@@ -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);
Modified: tuscany/branches/sca-java-1.5.1/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/TestHelloWorldBean.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.5.1/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/TestHelloWorldBean.java?rev=803204&r1=803203&r2=803204&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.5.1/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/TestHelloWorldBean.java (original)
+++ tuscany/branches/sca-java-1.5.1/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/TestHelloWorldBean.java Tue Aug 11 16:48:29 2009
@@ -18,6 +18,8 @@
*/
package org.apache.tuscany.sca.itest.spring;
+import helloworld.HelloWorld;
+
/**
* A simple test Spring bean which provides the HelloWorld service
*
Modified: tuscany/branches/sca-java-1.5.1/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/TestHelloWorldDelegatorBean.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.5.1/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/TestHelloWorldDelegatorBean.java?rev=803204&r1=803203&r2=803204&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.5.1/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/TestHelloWorldDelegatorBean.java (original)
+++ tuscany/branches/sca-java-1.5.1/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/TestHelloWorldDelegatorBean.java Tue Aug 11 16:48:29 2009
@@ -18,6 +18,8 @@
*/
package org.apache.tuscany.sca.itest.spring;
+import helloworld.HelloWorld;
+
/**
* A simple test Spring bean which delgates to another bean
*
Modified: tuscany/branches/sca-java-1.5.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/introspect/SpringXMLComponentTypeLoader.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.5.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/introspect/SpringXMLComponentTypeLoader.java?rev=803204&r1=803203&r2=803204&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.5.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/introspect/SpringXMLComponentTypeLoader.java (original)
+++ tuscany/branches/sca-java-1.5.1/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/introspect/SpringXMLComponentTypeLoader.java Tue Aug 11 16:48:29 2009
@@ -496,6 +496,9 @@
new SpringBeanIntrospector(assemblyFactory, javaFactory, policyFactory, beanElement.getCustructorArgs());
ComponentType beanComponentType = assemblyFactory.createComponentType();
javaImplementation = beanIntrospector.introspectBean(beanClass, beanComponentType);
+ // Set the service name as bean name
+ for (Service componentService : beanComponentType.getServices())
+ componentService.setName(beanElement.getId());
// Get the service interface defined by this Spring Bean and add to
// the component type of the Spring Assembly
List<Service> beanServices = beanComponentType.getServices();