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/05/26 13:17:27 UTC
svn commit: r778651 - in
/tuscany/java/sca/itest/implementation-spring/src/main: java/helloworld/
resources/META-INF/sca/location-folder/META-INF/spring/
resources/META-INF/sca/location-jar/ resources/location/folder/
resources/location/jar/ resources/...
Author: ramkumar
Date: Tue May 26 11:17:26 2009
New Revision: 778651
URL: http://svn.apache.org/viewvc?rev=778651&view=rev
Log:
Fixes for TUSCANY-3061
Modified:
tuscany/java/sca/itest/implementation-spring/src/main/java/helloworld/HelloWorld.java
tuscany/java/sca/itest/implementation-spring/src/main/java/helloworld/HelloWorldProxy.java
tuscany/java/sca/itest/implementation-spring/src/main/resources/META-INF/sca/location-folder/META-INF/spring/SpringSCAProperty-context.xml
tuscany/java/sca/itest/implementation-spring/src/main/resources/META-INF/sca/location-jar/spring-context.jar
tuscany/java/sca/itest/implementation-spring/src/main/resources/location/folder/SpringFolderLocation.composite
tuscany/java/sca/itest/implementation-spring/src/main/resources/location/jar/SpringJarLocation.composite
tuscany/java/sca/itest/implementation-spring/src/main/resources/sca/references/SpringExplicitReference.composite
tuscany/java/sca/itest/implementation-spring/src/main/resources/sca/references/SpringImplicitReference.composite
tuscany/java/sca/itest/implementation-spring/src/main/resources/sca/services/SpringExplicitService.composite
tuscany/java/sca/itest/implementation-spring/src/main/resources/sca/services/SpringImplicitService.composite
Modified: tuscany/java/sca/itest/implementation-spring/src/main/java/helloworld/HelloWorld.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/implementation-spring/src/main/java/helloworld/HelloWorld.java?rev=778651&r1=778650&r2=778651&view=diff
==============================================================================
--- tuscany/java/sca/itest/implementation-spring/src/main/java/helloworld/HelloWorld.java (original)
+++ tuscany/java/sca/itest/implementation-spring/src/main/java/helloworld/HelloWorld.java Tue May 26 11:17:26 2009
@@ -19,7 +19,7 @@
package helloworld;
-import org.osoa.sca.annotations.Remotable;
+import org.oasisopen.sca.annotation.Remotable;
/**
* Interface for the "hello world" service - predictably simple with a single operation
Modified: tuscany/java/sca/itest/implementation-spring/src/main/java/helloworld/HelloWorldProxy.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/implementation-spring/src/main/java/helloworld/HelloWorldProxy.java?rev=778651&r1=778650&r2=778651&view=diff
==============================================================================
--- tuscany/java/sca/itest/implementation-spring/src/main/java/helloworld/HelloWorldProxy.java (original)
+++ tuscany/java/sca/itest/implementation-spring/src/main/java/helloworld/HelloWorldProxy.java Tue May 26 11:17:26 2009
@@ -19,7 +19,7 @@
package helloworld;
-import org.osoa.sca.annotations.Reference;
+import org.oasisopen.sca.annotation.Reference;
/**
* A simple proxy Java class which implements the HelloWorld interface but which uses
Modified: tuscany/java/sca/itest/implementation-spring/src/main/resources/META-INF/sca/location-folder/META-INF/spring/SpringSCAProperty-context.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/implementation-spring/src/main/resources/META-INF/sca/location-folder/META-INF/spring/SpringSCAProperty-context.xml?rev=778651&r1=778650&r2=778651&view=diff
==============================================================================
--- tuscany/java/sca/itest/implementation-spring/src/main/resources/META-INF/sca/location-folder/META-INF/spring/SpringSCAProperty-context.xml (original)
+++ tuscany/java/sca/itest/implementation-spring/src/main/resources/META-INF/sca/location-folder/META-INF/spring/SpringSCAProperty-context.xml Tue May 26 11:17:26 2009
@@ -25,14 +25,10 @@
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/sca http://www.osoa.org/xmlns/sca/1.0/spring-sca.xsd">
- <bean id="testBean1" class="mock.TestSCAPropertyBean" lazy-init="true">
+ <bean id="testBean" class="mock.TestSCAPropertyBean" lazy-init="true">
<property name="hello" ref="TestProperty"/>
</bean>
- <bean id="testBean2" class="mock.TestSCAPropertyBean" lazy-init="true">
- <property name="hello"><ref bean="TestProperty"/></property>
- </bean>
-
<sca:property id="foo" name="TestProperty" type="java.lang.String"/>
</beans>
\ No newline at end of file
Modified: tuscany/java/sca/itest/implementation-spring/src/main/resources/META-INF/sca/location-jar/spring-context.jar
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/implementation-spring/src/main/resources/META-INF/sca/location-jar/spring-context.jar?rev=778651&r1=778650&r2=778651&view=diff
==============================================================================
Binary files - no diff available.
Modified: tuscany/java/sca/itest/implementation-spring/src/main/resources/location/folder/SpringFolderLocation.composite
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/implementation-spring/src/main/resources/location/folder/SpringFolderLocation.composite?rev=778651&r1=778650&r2=778651&view=diff
==============================================================================
--- tuscany/java/sca/itest/implementation-spring/src/main/resources/location/folder/SpringFolderLocation.composite (original)
+++ tuscany/java/sca/itest/implementation-spring/src/main/resources/location/folder/SpringFolderLocation.composite Tue May 26 11:17:26 2009
@@ -23,7 +23,7 @@
* is set in this composite and is used to compute the response to a service invocation from
* the ClientComponent.
-->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
name="SpringFolderLocation">
<component name="ClientComponent">
Modified: tuscany/java/sca/itest/implementation-spring/src/main/resources/location/jar/SpringJarLocation.composite
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/implementation-spring/src/main/resources/location/jar/SpringJarLocation.composite?rev=778651&r1=778650&r2=778651&view=diff
==============================================================================
--- tuscany/java/sca/itest/implementation-spring/src/main/resources/location/jar/SpringJarLocation.composite (original)
+++ tuscany/java/sca/itest/implementation-spring/src/main/resources/location/jar/SpringJarLocation.composite Tue May 26 11:17:26 2009
@@ -23,7 +23,7 @@
* is set in this composite and is used to compute the response to a service invocation from
* the ClientComponent.
-->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
name="SpringJarLocation">
<component name="ClientComponent">
Modified: tuscany/java/sca/itest/implementation-spring/src/main/resources/sca/references/SpringExplicitReference.composite
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/implementation-spring/src/main/resources/sca/references/SpringExplicitReference.composite?rev=778651&r1=778650&r2=778651&view=diff
==============================================================================
--- tuscany/java/sca/itest/implementation-spring/src/main/resources/sca/references/SpringExplicitReference.composite (original)
+++ tuscany/java/sca/itest/implementation-spring/src/main/resources/sca/references/SpringExplicitReference.composite Tue May 26 11:17:26 2009
@@ -17,15 +17,15 @@
* specific language governing permissions and limitations
* under the License.
-->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
name="SpringExplicitReference">
<component name="ClientComponent">
<implementation.spring location="META-INF/sca/sca-references/SpringExplicitReference-context.xml"/>
- <reference name="testReference" target="ReferenceComponent"/>
+ <reference name="testReference" target="ExplicitReferenceComponent"/>
</component>
- <component name="ReferenceComponent">
+ <component name="ExplicitReferenceComponent">
<implementation.java class="helloworld.HelloWorldImpl"/>
</component>
Modified: tuscany/java/sca/itest/implementation-spring/src/main/resources/sca/references/SpringImplicitReference.composite
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/implementation-spring/src/main/resources/sca/references/SpringImplicitReference.composite?rev=778651&r1=778650&r2=778651&view=diff
==============================================================================
--- tuscany/java/sca/itest/implementation-spring/src/main/resources/sca/references/SpringImplicitReference.composite (original)
+++ tuscany/java/sca/itest/implementation-spring/src/main/resources/sca/references/SpringImplicitReference.composite Tue May 26 11:17:26 2009
@@ -24,15 +24,15 @@
* The reference is satisified by a wire to a ReferenceComponent which is implemented
* by a plain Java POJO.
-->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
name="SpringImplicitReference">
<component name="ClientComponent">
<implementation.spring location="META-INF/sca/sca-references/SpringImplicitReference-context.xml"/>
- <reference name="testReference" target="ReferenceComponent"/>
+ <reference name="testReference" target="ImplicitReferenceComponent"/>
</component>
- <component name="ReferenceComponent">
+ <component name="ImplicitReferenceComponent">
<implementation.java class="helloworld.HelloWorldImpl"/>
</component>
Modified: tuscany/java/sca/itest/implementation-spring/src/main/resources/sca/services/SpringExplicitService.composite
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/implementation-spring/src/main/resources/sca/services/SpringExplicitService.composite?rev=778651&r1=778650&r2=778651&view=diff
==============================================================================
--- tuscany/java/sca/itest/implementation-spring/src/main/resources/sca/services/SpringExplicitService.composite (original)
+++ tuscany/java/sca/itest/implementation-spring/src/main/resources/sca/services/SpringExplicitService.composite Tue May 26 11:17:26 2009
@@ -17,16 +17,16 @@
* specific language governing permissions and limitations
* under the License.
-->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
+ xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1"
name="SpringExplicitService">
<component name="ClientComponent">
<implementation.java class="helloworld.HelloWorldProxy"/>
- <reference name="delegate" target="HelloWorldComponent"/>
+ <reference name="delegate" target="ExplicitServiceComponent"/>
</component>
- <component name="HelloWorldComponent">
+ <component name="ExplicitServiceComponent">
<implementation.spring location="META-INF/sca/sca-services/SpringExplicitService-context.xml"/>
</component>
Modified: tuscany/java/sca/itest/implementation-spring/src/main/resources/sca/services/SpringImplicitService.composite
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/implementation-spring/src/main/resources/sca/services/SpringImplicitService.composite?rev=778651&r1=778650&r2=778651&view=diff
==============================================================================
--- tuscany/java/sca/itest/implementation-spring/src/main/resources/sca/services/SpringImplicitService.composite (original)
+++ tuscany/java/sca/itest/implementation-spring/src/main/resources/sca/services/SpringImplicitService.composite Tue May 26 11:17:26 2009
@@ -17,15 +17,15 @@
* specific language governing permissions and limitations
* under the License.
-->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200903"
name="SpringImplicitService">
<component name="ClientComponent">
<implementation.java class="helloworld.HelloWorldProxy"/>
- <reference name="delegate" target="HelloWorldComponent"/>
+ <reference name="delegate" target="ImplicitServiceComponent"/>
</component>
- <component name="HelloWorldComponent">
+ <component name="ImplicitServiceComponent">
<implementation.spring location="META-INF/sca/sca-services/SpringImplicitService-context.xml"/>
</component>