From 92977fad04986ea0a6d4859d17a5939d604100a5 Mon Sep 17 00:00:00 2001
From: ramkumar <ramkumar@13f79535-47bb-0310-9956-ffa450edef68>
Date: Tue, 26 May 2009 11:17:26 +0000
Subject: Fixes for TUSCANY-3061

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@778651 13f79535-47bb-0310-9956-ffa450edef68
---
 .../src/main/java/helloworld/HelloWorld.java          |   2 +-
 .../src/main/java/helloworld/HelloWorldProxy.java     |   2 +-
 .../META-INF/spring/SpringSCAProperty-context.xml     |   6 +-----
 .../META-INF/sca/location-jar/spring-context.jar      | Bin 1471 -> 1454 bytes
 .../location/folder/SpringFolderLocation.composite    |   2 +-
 .../location/jar/SpringJarLocation.composite          |   2 +-
 .../sca/references/SpringExplicitReference.composite  |   6 +++---
 .../sca/references/SpringImplicitReference.composite  |   6 +++---
 .../sca/services/SpringExplicitService.composite      |   8 ++++----
 .../sca/services/SpringImplicitService.composite      |   6 +++---
 10 files changed, 18 insertions(+), 22 deletions(-)

diff --git a/java/sca/itest/implementation-spring/src/main/java/helloworld/HelloWorld.java b/java/sca/itest/implementation-spring/src/main/java/helloworld/HelloWorld.java
index e0987096f6..830052ae19 100644
--- a/java/sca/itest/implementation-spring/src/main/java/helloworld/HelloWorld.java
+++ b/java/sca/itest/implementation-spring/src/main/java/helloworld/HelloWorld.java
@@ -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
diff --git a/java/sca/itest/implementation-spring/src/main/java/helloworld/HelloWorldProxy.java b/java/sca/itest/implementation-spring/src/main/java/helloworld/HelloWorldProxy.java
index 4d4b5a2931..0e2374d599 100644
--- a/java/sca/itest/implementation-spring/src/main/java/helloworld/HelloWorldProxy.java
+++ b/java/sca/itest/implementation-spring/src/main/java/helloworld/HelloWorldProxy.java
@@ -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
diff --git a/java/sca/itest/implementation-spring/src/main/resources/META-INF/sca/location-folder/META-INF/spring/SpringSCAProperty-context.xml b/java/sca/itest/implementation-spring/src/main/resources/META-INF/sca/location-folder/META-INF/spring/SpringSCAProperty-context.xml
index d2f406294d..8613e6c82a 100644
--- a/java/sca/itest/implementation-spring/src/main/resources/META-INF/sca/location-folder/META-INF/spring/SpringSCAProperty-context.xml
+++ b/java/sca/itest/implementation-spring/src/main/resources/META-INF/sca/location-folder/META-INF/spring/SpringSCAProperty-context.xml
@@ -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
diff --git a/java/sca/itest/implementation-spring/src/main/resources/META-INF/sca/location-jar/spring-context.jar b/java/sca/itest/implementation-spring/src/main/resources/META-INF/sca/location-jar/spring-context.jar
index d8ee59a610..504d59e5ff 100644
Binary files a/java/sca/itest/implementation-spring/src/main/resources/META-INF/sca/location-jar/spring-context.jar and b/java/sca/itest/implementation-spring/src/main/resources/META-INF/sca/location-jar/spring-context.jar differ
diff --git a/java/sca/itest/implementation-spring/src/main/resources/location/folder/SpringFolderLocation.composite b/java/sca/itest/implementation-spring/src/main/resources/location/folder/SpringFolderLocation.composite
index 7f6268f6b5..d33ae8ca4b 100644
--- a/java/sca/itest/implementation-spring/src/main/resources/location/folder/SpringFolderLocation.composite
+++ b/java/sca/itest/implementation-spring/src/main/resources/location/folder/SpringFolderLocation.composite
@@ -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">
diff --git a/java/sca/itest/implementation-spring/src/main/resources/location/jar/SpringJarLocation.composite b/java/sca/itest/implementation-spring/src/main/resources/location/jar/SpringJarLocation.composite
index 1f8792e4d8..e47b6526ff 100644
--- a/java/sca/itest/implementation-spring/src/main/resources/location/jar/SpringJarLocation.composite
+++ b/java/sca/itest/implementation-spring/src/main/resources/location/jar/SpringJarLocation.composite
@@ -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">
diff --git a/java/sca/itest/implementation-spring/src/main/resources/sca/references/SpringExplicitReference.composite b/java/sca/itest/implementation-spring/src/main/resources/sca/references/SpringExplicitReference.composite
index ea0d002414..4aa9b7a56d 100644
--- a/java/sca/itest/implementation-spring/src/main/resources/sca/references/SpringExplicitReference.composite
+++ b/java/sca/itest/implementation-spring/src/main/resources/sca/references/SpringExplicitReference.composite
@@ -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>
 
diff --git a/java/sca/itest/implementation-spring/src/main/resources/sca/references/SpringImplicitReference.composite b/java/sca/itest/implementation-spring/src/main/resources/sca/references/SpringImplicitReference.composite
index 256eeb2dcc..ae972f8647 100644
--- a/java/sca/itest/implementation-spring/src/main/resources/sca/references/SpringImplicitReference.composite
+++ b/java/sca/itest/implementation-spring/src/main/resources/sca/references/SpringImplicitReference.composite
@@ -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>
 
diff --git a/java/sca/itest/implementation-spring/src/main/resources/sca/services/SpringExplicitService.composite b/java/sca/itest/implementation-spring/src/main/resources/sca/services/SpringExplicitService.composite
index 5f851517e8..b259b9d657 100644
--- a/java/sca/itest/implementation-spring/src/main/resources/sca/services/SpringExplicitService.composite
+++ b/java/sca/itest/implementation-spring/src/main/resources/sca/services/SpringExplicitService.composite
@@ -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>
 
diff --git a/java/sca/itest/implementation-spring/src/main/resources/sca/services/SpringImplicitService.composite b/java/sca/itest/implementation-spring/src/main/resources/sca/services/SpringImplicitService.composite
index 482c81df23..8ab04edc63 100644
--- a/java/sca/itest/implementation-spring/src/main/resources/sca/services/SpringImplicitService.composite
+++ b/java/sca/itest/implementation-spring/src/main/resources/sca/services/SpringImplicitService.composite
@@ -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>
 
-- 
cgit v1.2.3