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/06/30 13:13:50 UTC

svn commit: r789681 [1/2] - in /tuscany/branches/sca-java-1.x: itest/spring/src/main/resources/ itest/spring/src/main/resources/META-INF/ itest/spring/src/main/resources/context/access/ itest/spring/src/main/resources/context/imports/ itest/spring/src/...

Author: ramkumar
Date: Tue Jun 30 11:13:48 2009
New Revision: 789681

URL: http://svn.apache.org/viewvc?rev=789681&view=rev
Log:
Fixes in 1.x for TUSCANY-3069

Added:
    tuscany/branches/sca-java-1.x/itest/spring/src/main/resources/context/access/CalculatorService-context.xml
    tuscany/branches/sca-java-1.x/itest/spring/src/main/resources/context/imports/META-INF/
    tuscany/branches/sca-java-1.x/itest/spring/src/main/resources/context/imports/META-INF/spring/
    tuscany/branches/sca-java-1.x/itest/spring/src/main/resources/context/imports/META-INF/spring/CalculatorService-context.xml
    tuscany/branches/sca-java-1.x/itest/spring/src/main/resources/context/imports/META-INF/spring/SpringImport-context.xml
    tuscany/branches/sca-java-1.x/itest/spring/src/main/resources/context/multiple/META-INF/
    tuscany/branches/sca-java-1.x/itest/spring/src/main/resources/context/multiple/META-INF/spring/
    tuscany/branches/sca-java-1.x/itest/spring/src/main/resources/context/multiple/META-INF/spring/SpringHelloWorld-context.xml
    tuscany/branches/sca-java-1.x/itest/spring/src/main/resources/context/multiple/META-INF/spring/StockQuoteService-context.xml
    tuscany/branches/sca-java-1.x/itest/spring/src/main/resources/context/multiple/META-INF/spring/beanRefContext.xml
    tuscany/branches/sca-java-1.x/itest/spring/src/main/resources/implementation/policies/META-INF/
    tuscany/branches/sca-java-1.x/itest/spring/src/main/resources/implementation/policies/META-INF/spring/
    tuscany/branches/sca-java-1.x/itest/spring/src/main/resources/implementation/policies/META-INF/spring/CalculatorService-context.xml
    tuscany/branches/sca-java-1.x/itest/spring/src/main/resources/location/folder/springapp/
    tuscany/branches/sca-java-1.x/itest/spring/src/main/resources/location/folder/springapp/META-INF/
    tuscany/branches/sca-java-1.x/itest/spring/src/main/resources/location/folder/springapp/META-INF/MANIFEST.MF
    tuscany/branches/sca-java-1.x/itest/spring/src/main/resources/location/folder/springapp/META-INF/spring/
    tuscany/branches/sca-java-1.x/itest/spring/src/main/resources/location/folder/springapp/META-INF/spring/SpringSCAProperty-context.xml
    tuscany/branches/sca-java-1.x/itest/spring/src/main/resources/location/jar/spring-context.jar   (with props)
    tuscany/branches/sca-java-1.x/itest/spring/src/main/resources/org/apache/tuscany/sca/itest/spring/META-INF/
    tuscany/branches/sca-java-1.x/itest/spring/src/main/resources/org/apache/tuscany/sca/itest/spring/META-INF/spring/
    tuscany/branches/sca-java-1.x/itest/spring/src/main/resources/org/apache/tuscany/sca/itest/spring/META-INF/spring/SpringDelegationHelloWorld-context.xml
    tuscany/branches/sca-java-1.x/itest/spring/src/main/resources/org/apache/tuscany/sca/itest/spring/META-INF/spring/SpringHelloWorld-context.xml
    tuscany/branches/sca-java-1.x/itest/spring/src/main/resources/sca/references/META-INF/
    tuscany/branches/sca-java-1.x/itest/spring/src/main/resources/sca/references/META-INF/spring/
    tuscany/branches/sca-java-1.x/itest/spring/src/main/resources/sca/references/META-INF/spring/SpringExplicitReference-context.xml
    tuscany/branches/sca-java-1.x/itest/spring/src/main/resources/sca/references/META-INF/spring/SpringImplicitReference-context.xml
    tuscany/branches/sca-java-1.x/itest/spring/src/main/resources/sca/services/META-INF/
    tuscany/branches/sca-java-1.x/itest/spring/src/main/resources/sca/services/META-INF/spring/
    tuscany/branches/sca-java-1.x/itest/spring/src/main/resources/sca/services/META-INF/spring/SpringExplicitService-context.xml
    tuscany/branches/sca-java-1.x/itest/spring/src/main/resources/sca/services/META-INF/spring/SpringImplicitService-context.xml
    tuscany/branches/sca-java-1.x/itest/spring/src/main/resources/spring/annotations/META-INF/
    tuscany/branches/sca-java-1.x/itest/spring/src/main/resources/spring/annotations/META-INF/spring/
    tuscany/branches/sca-java-1.x/itest/spring/src/main/resources/spring/annotations/META-INF/spring/CalculatorService-context.xml
Removed:
    tuscany/branches/sca-java-1.x/itest/spring/src/main/resources/CalculatorService-context.xml
    tuscany/branches/sca-java-1.x/itest/spring/src/main/resources/META-INF/
Modified:
    tuscany/branches/sca-java-1.x/itest/spring/src/main/resources/context/access/Calculator.composite
    tuscany/branches/sca-java-1.x/itest/spring/src/main/resources/context/imports/Calculator.composite
    tuscany/branches/sca-java-1.x/itest/spring/src/main/resources/context/multiple/StockQuote.composite
    tuscany/branches/sca-java-1.x/itest/spring/src/main/resources/implementation/policies/Calculator.composite
    tuscany/branches/sca-java-1.x/itest/spring/src/main/resources/location/folder/SpringFolderLocation.composite
    tuscany/branches/sca-java-1.x/itest/spring/src/main/resources/location/jar/SpringJarLocation.composite
    tuscany/branches/sca-java-1.x/itest/spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringDelegationHelloWorld.composite
    tuscany/branches/sca-java-1.x/itest/spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringHelloWorld.composite
    tuscany/branches/sca-java-1.x/itest/spring/src/main/resources/sca/references/SpringExplicitReference.composite
    tuscany/branches/sca-java-1.x/itest/spring/src/main/resources/sca/references/SpringImplicitReference.composite
    tuscany/branches/sca-java-1.x/itest/spring/src/main/resources/sca/services/SpringExplicitService.composite
    tuscany/branches/sca-java-1.x/itest/spring/src/main/resources/sca/services/SpringImplicitService.composite
    tuscany/branches/sca-java-1.x/itest/spring/src/main/resources/spring/annotations/Calculator.composite
    tuscany/branches/sca-java-1.x/itest/spring/src/test/java/context/multiple/MultipleContextTestCase.java
    tuscany/branches/sca-java-1.x/itest/spring/src/test/java/context/multiple/StockQuoteServer.java
    tuscany/branches/sca-java-1.x/itest/spring/src/test/java/implementation/policies/CalculatorClient.java
    tuscany/branches/sca-java-1.x/itest/spring/src/test/java/location/folder/SpringFolderLocationTestCase.java
    tuscany/branches/sca-java-1.x/itest/spring/src/test/java/location/jar/SpringJarLocationTestCase.java
    tuscany/branches/sca-java-1.x/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/AbstractHelloWorldTestCase.java
    tuscany/branches/sca-java-1.x/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/AbstractSCATestCase.java
    tuscany/branches/sca-java-1.x/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/SpringDelegationHelloWorldTestCase.java
    tuscany/branches/sca-java-1.x/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/SpringHelloWorldTestCase.java
    tuscany/branches/sca-java-1.x/itest/spring/src/test/java/sca/references/SpringExplicitReferenceTestCase.java
    tuscany/branches/sca-java-1.x/itest/spring/src/test/java/sca/references/SpringImplicitReferenceTestCase.java
    tuscany/branches/sca-java-1.x/itest/spring/src/test/java/sca/services/SpringExplicitServiceTestCase.java
    tuscany/branches/sca-java-1.x/itest/spring/src/test/java/sca/services/SpringImplicitServiceTestCase.java
    tuscany/branches/sca-java-1.x/itest/spring/src/test/java/spring/annotations/CalculatorClient.java
    tuscany/branches/sca-java-1.x/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/runtime/context/SpringContextTie.java
    tuscany/branches/sca-java-1.x/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/runtime/context/SpringImplementationStub.java
    tuscany/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementation.java
    tuscany/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/introspect/SpringXMLComponentTypeLoader.java
    tuscany/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/SpringContextStub.java
    tuscany/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/invocation/SpringImplementationTie.java
    tuscany/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/xml/SpringImplementationProcessor.java

Modified: tuscany/branches/sca-java-1.x/itest/spring/src/main/resources/context/access/Calculator.composite
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/itest/spring/src/main/resources/context/access/Calculator.composite?rev=789681&r1=789680&r2=789681&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/itest/spring/src/main/resources/context/access/Calculator.composite (original)
+++ tuscany/branches/sca-java-1.x/itest/spring/src/main/resources/context/access/Calculator.composite Tue Jun 30 11:13:48 2009
@@ -24,7 +24,7 @@
            xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0">
 
     <component name="CalculatorServiceComponent">
-        <implementation.spring location="META-INF/sca/context-access/CalculatorService-context.xml"/>
+        <implementation.spring location="CalculatorService-context.xml"/>
         <reference name="addService" target="AddServiceComponent" />
         <reference name="subtractService" target="SubtractServiceComponent" />
         <reference name="multiplyService" target="MultiplyServiceComponent" />

Added: tuscany/branches/sca-java-1.x/itest/spring/src/main/resources/context/access/CalculatorService-context.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/itest/spring/src/main/resources/context/access/CalculatorService-context.xml?rev=789681&view=auto
==============================================================================
--- tuscany/branches/sca-java-1.x/itest/spring/src/main/resources/context/access/CalculatorService-context.xml (added)
+++ tuscany/branches/sca-java-1.x/itest/spring/src/main/resources/context/access/CalculatorService-context.xml Tue Jun 30 11:13:48 2009
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+-->
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:sca="http://www.springframework.org/schema/sca"
+       xsi:schemaLocation="
+       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">
+  
+    <sca:service name="CalculatorService"
+        type="calculator.CalculatorService" target="CalculatorServiceBean"/>
+
+    <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>
+    
+    <bean id="contextAccess" class="context.access.SCAApplicationContextProvider">
+    </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>
\ No newline at end of file

Modified: tuscany/branches/sca-java-1.x/itest/spring/src/main/resources/context/imports/Calculator.composite
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/itest/spring/src/main/resources/context/imports/Calculator.composite?rev=789681&r1=789680&r2=789681&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/itest/spring/src/main/resources/context/imports/Calculator.composite (original)
+++ tuscany/branches/sca-java-1.x/itest/spring/src/main/resources/context/imports/Calculator.composite Tue Jun 30 11:13:48 2009
@@ -24,7 +24,7 @@
            xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0">
 
     <component name="CalculatorServiceComponent">
-        <implementation.spring location="META-INF/sca/context-imports/SpringImport-context.xml"/>
+        <implementation.spring location="META-INF/spring/SpringImport-context.xml"/>
         <reference name="addService" target="AddServiceComponent" />
         <reference name="subtractService" target="SubtractServiceComponent" />
         <reference name="multiplyService" target="MultiplyServiceComponent" />

Added: tuscany/branches/sca-java-1.x/itest/spring/src/main/resources/context/imports/META-INF/spring/CalculatorService-context.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/itest/spring/src/main/resources/context/imports/META-INF/spring/CalculatorService-context.xml?rev=789681&view=auto
==============================================================================
--- tuscany/branches/sca-java-1.x/itest/spring/src/main/resources/context/imports/META-INF/spring/CalculatorService-context.xml (added)
+++ tuscany/branches/sca-java-1.x/itest/spring/src/main/resources/context/imports/META-INF/spring/CalculatorService-context.xml Tue Jun 30 11:13:48 2009
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+-->
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:sca="http://www.springframework.org/schema/sca"
+       xsi:schemaLocation="
+       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="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>

Added: tuscany/branches/sca-java-1.x/itest/spring/src/main/resources/context/imports/META-INF/spring/SpringImport-context.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/itest/spring/src/main/resources/context/imports/META-INF/spring/SpringImport-context.xml?rev=789681&view=auto
==============================================================================
--- tuscany/branches/sca-java-1.x/itest/spring/src/main/resources/context/imports/META-INF/spring/SpringImport-context.xml (added)
+++ tuscany/branches/sca-java-1.x/itest/spring/src/main/resources/context/imports/META-INF/spring/SpringImport-context.xml Tue Jun 30 11:13:48 2009
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+-->
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:sca="http://www.springframework.org/schema/sca"
+       xsi:schemaLocation="
+       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">
+       
+    <import resource="CalculatorService-context.xml"/>
+    
+</beans>
\ No newline at end of file

Added: tuscany/branches/sca-java-1.x/itest/spring/src/main/resources/context/multiple/META-INF/spring/SpringHelloWorld-context.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/itest/spring/src/main/resources/context/multiple/META-INF/spring/SpringHelloWorld-context.xml?rev=789681&view=auto
==============================================================================
--- tuscany/branches/sca-java-1.x/itest/spring/src/main/resources/context/multiple/META-INF/spring/SpringHelloWorld-context.xml (added)
+++ tuscany/branches/sca-java-1.x/itest/spring/src/main/resources/context/multiple/META-INF/spring/SpringHelloWorld-context.xml Tue Jun 30 11:13:48 2009
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    * KIND, either express or implied.  See the License for the
+    * specific language governing permissions and limitations
+    * under the License.    
+-->
+<!-- Application context for the SpringHelloWorld testcase -->
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:sca="http://www.springframework.org/schema/sca"
+       xsi:schemaLocation="
+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="testBean" class="org.apache.tuscany.sca.itest.spring.TestHelloWorldBean" lazy-init="true">
+    </bean>
+
+</beans>
\ No newline at end of file

Added: tuscany/branches/sca-java-1.x/itest/spring/src/main/resources/context/multiple/META-INF/spring/StockQuoteService-context.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/itest/spring/src/main/resources/context/multiple/META-INF/spring/StockQuoteService-context.xml?rev=789681&view=auto
==============================================================================
--- tuscany/branches/sca-java-1.x/itest/spring/src/main/resources/context/multiple/META-INF/spring/StockQuoteService-context.xml (added)
+++ tuscany/branches/sca-java-1.x/itest/spring/src/main/resources/context/multiple/META-INF/spring/StockQuoteService-context.xml Tue Jun 30 11:13:48 2009
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+-->
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:sca="http://www.springframework.org/schema/sca"
+       xsi:schemaLocation="
+       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">
+       
+    <sca:service name="StockQuoteService"
+        type="bigbank.stockquote.StockQuoteService" target="StockQuoteServiceBean"/>
+
+    <bean id="StockQuoteServiceBean" class="bigbank.stockquote.StockQuoteImpl">
+    </bean>
+    
+    <bean id="applicationContextProvider" class="context.access.SCAApplicationContextProvider">
+    </bean>
+
+</beans>
\ No newline at end of file

Added: tuscany/branches/sca-java-1.x/itest/spring/src/main/resources/context/multiple/META-INF/spring/beanRefContext.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/itest/spring/src/main/resources/context/multiple/META-INF/spring/beanRefContext.xml?rev=789681&view=auto
==============================================================================
--- tuscany/branches/sca-java-1.x/itest/spring/src/main/resources/context/multiple/META-INF/spring/beanRefContext.xml (added)
+++ tuscany/branches/sca-java-1.x/itest/spring/src/main/resources/context/multiple/META-INF/spring/beanRefContext.xml Tue Jun 30 11:13:48 2009
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+-->
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:sca="http://www.springframework.org/schema/sca"
+       xsi:schemaLocation="
+       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="beanRefFactory" class="org.springframework.context.support.ClassPathXmlApplicationContext">
+	   <constructor-arg>
+		  <list>
+			 <value>context/multiple/META-INF/spring/StockQuoteService-context.xml</value>
+			 <value>context/multiple/META-INF/spring/SpringHelloWorld-context.xml</value>
+		  </list>
+	   </constructor-arg>
+    </bean>
+</beans>
\ No newline at end of file

Modified: tuscany/branches/sca-java-1.x/itest/spring/src/main/resources/context/multiple/StockQuote.composite
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/itest/spring/src/main/resources/context/multiple/StockQuote.composite?rev=789681&r1=789680&r2=789681&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/itest/spring/src/main/resources/context/multiple/StockQuote.composite (original)
+++ tuscany/branches/sca-java-1.x/itest/spring/src/main/resources/context/multiple/StockQuote.composite Tue Jun 30 11:13:48 2009
@@ -29,7 +29,7 @@
     </service>
 
     <component name="StockQuoteServiceComponent">
-        <implementation.spring location="META-INF/sca/context-multiple/beanRefContext.xml"/>
+        <implementation.spring location="META-INF/spring/beanRefContext.xml"/>
     </component>
 
 </composite>

Modified: tuscany/branches/sca-java-1.x/itest/spring/src/main/resources/implementation/policies/Calculator.composite
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/itest/spring/src/main/resources/implementation/policies/Calculator.composite?rev=789681&r1=789680&r2=789681&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/itest/spring/src/main/resources/implementation/policies/Calculator.composite (original)
+++ tuscany/branches/sca-java-1.x/itest/spring/src/main/resources/implementation/policies/Calculator.composite Tue Jun 30 11:13:48 2009
@@ -24,7 +24,7 @@
            xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0">
 
     <component name="CalculatorServiceComponent">
-        <implementation.spring location="META-INF/sca/implementation-policies/CalculatorService-context.xml">		
+        <implementation.spring location="META-INF/spring/CalculatorService-context.xml">		
 			<operation name="divide" requires="tuscany:logging"/>
 			<operation name="subtract" requires="tuscany:logging"/>
 		</implementation.spring>
@@ -51,7 +51,7 @@
     </component>
     
     <component name="AnotherCalculatorServiceComponent">
-        <implementation.spring location="META-INF/sca/implementation-policies/CalculatorService-context.xml" requires="tuscany:logging"/>		
+        <implementation.spring location="META-INF/spring/CalculatorService-context.xml" requires="tuscany:logging"/>		
         <reference name="addService" target="AddServiceComponent" />
         <reference name="subtractService" target="SubtractServiceComponent" />
         <reference name="multiplyService" target="MultiplyServiceComponent" />

Added: tuscany/branches/sca-java-1.x/itest/spring/src/main/resources/implementation/policies/META-INF/spring/CalculatorService-context.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/itest/spring/src/main/resources/implementation/policies/META-INF/spring/CalculatorService-context.xml?rev=789681&view=auto
==============================================================================
--- tuscany/branches/sca-java-1.x/itest/spring/src/main/resources/implementation/policies/META-INF/spring/CalculatorService-context.xml (added)
+++ tuscany/branches/sca-java-1.x/itest/spring/src/main/resources/implementation/policies/META-INF/spring/CalculatorService-context.xml Tue Jun 30 11:13:48 2009
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+-->
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:sca="http://www.springframework.org/schema/sca"
+       xsi:schemaLocation="
+       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="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.x/itest/spring/src/main/resources/location/folder/SpringFolderLocation.composite
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/itest/spring/src/main/resources/location/folder/SpringFolderLocation.composite?rev=789681&r1=789680&r2=789681&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/itest/spring/src/main/resources/location/folder/SpringFolderLocation.composite (original)
+++ tuscany/branches/sca-java-1.x/itest/spring/src/main/resources/location/folder/SpringFolderLocation.composite Tue Jun 30 11:13:48 2009
@@ -32,7 +32,7 @@
     </component>
 
     <component name="HelloWorldComponent">
-        <implementation.spring location="META-INF/sca/location-folder"/>
+        <implementation.spring location="springapp"/>
         <property name="TestProperty">Hello</property>
     </component>
 

Added: tuscany/branches/sca-java-1.x/itest/spring/src/main/resources/location/folder/springapp/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/itest/spring/src/main/resources/location/folder/springapp/META-INF/MANIFEST.MF?rev=789681&view=auto
==============================================================================
--- tuscany/branches/sca-java-1.x/itest/spring/src/main/resources/location/folder/springapp/META-INF/MANIFEST.MF (added)
+++ tuscany/branches/sca-java-1.x/itest/spring/src/main/resources/location/folder/springapp/META-INF/MANIFEST.MF Tue Jun 30 11:13:48 2009
@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+Spring-Context: META-INF/spring/SpringSCAProperty-context.xml
+

Added: tuscany/branches/sca-java-1.x/itest/spring/src/main/resources/location/folder/springapp/META-INF/spring/SpringSCAProperty-context.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/itest/spring/src/main/resources/location/folder/springapp/META-INF/spring/SpringSCAProperty-context.xml?rev=789681&view=auto
==============================================================================
--- tuscany/branches/sca-java-1.x/itest/spring/src/main/resources/location/folder/springapp/META-INF/spring/SpringSCAProperty-context.xml (added)
+++ tuscany/branches/sca-java-1.x/itest/spring/src/main/resources/location/folder/springapp/META-INF/spring/SpringSCAProperty-context.xml Tue Jun 30 11:13:48 2009
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    * KIND, either express or implied.  See the License for the
+    * specific language governing permissions and limitations
+    * under the License.    
+-->
+<!-- Application context for the SpringHelloWorld testcase -->
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:sca="http://www.springframework.org/schema/sca"
+       xsi:schemaLocation="
+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">
+    	<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/branches/sca-java-1.x/itest/spring/src/main/resources/location/jar/SpringJarLocation.composite
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/itest/spring/src/main/resources/location/jar/SpringJarLocation.composite?rev=789681&r1=789680&r2=789681&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/itest/spring/src/main/resources/location/jar/SpringJarLocation.composite (original)
+++ tuscany/branches/sca-java-1.x/itest/spring/src/main/resources/location/jar/SpringJarLocation.composite Tue Jun 30 11:13:48 2009
@@ -32,7 +32,7 @@
     </component>
 
     <component name="HelloWorldComponent">
-        <implementation.spring location="META-INF/sca/location-jar/spring-context.jar"/>
+        <implementation.spring location="spring-context.jar"/>
         <property name="TestProperty">Hello</property>
     </component>
 

Added: tuscany/branches/sca-java-1.x/itest/spring/src/main/resources/location/jar/spring-context.jar
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/itest/spring/src/main/resources/location/jar/spring-context.jar?rev=789681&view=auto
==============================================================================
Binary file - no diff available.

Propchange: tuscany/branches/sca-java-1.x/itest/spring/src/main/resources/location/jar/spring-context.jar
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: tuscany/branches/sca-java-1.x/itest/spring/src/main/resources/org/apache/tuscany/sca/itest/spring/META-INF/spring/SpringDelegationHelloWorld-context.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/itest/spring/src/main/resources/org/apache/tuscany/sca/itest/spring/META-INF/spring/SpringDelegationHelloWorld-context.xml?rev=789681&view=auto
==============================================================================
--- tuscany/branches/sca-java-1.x/itest/spring/src/main/resources/org/apache/tuscany/sca/itest/spring/META-INF/spring/SpringDelegationHelloWorld-context.xml (added)
+++ tuscany/branches/sca-java-1.x/itest/spring/src/main/resources/org/apache/tuscany/sca/itest/spring/META-INF/spring/SpringDelegationHelloWorld-context.xml Tue Jun 30 11:13:48 2009
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    * KIND, either express or implied.  See the License for the
+    * specific language governing permissions and limitations
+    * under the License.    
+-->
+<!-- Application context for the SpringHelloWorld testcase -->
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:sca="http://www.springframework.org/schema/sca"
+       xsi:schemaLocation="
+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="delegateBean" 
+         class="org.apache.tuscany.sca.itest.spring.TestHelloWorldBean" lazy-init="true">
+    </bean>
+
+    <bean id="testBean" 
+         class="org.apache.tuscany.sca.itest.spring.TestHelloWorldDelegatorBean" lazy-init="true">
+         <property name="delegate"><ref bean="delegateBean"/></property>
+    </bean>
+
+</beans>
\ No newline at end of file

Added: tuscany/branches/sca-java-1.x/itest/spring/src/main/resources/org/apache/tuscany/sca/itest/spring/META-INF/spring/SpringHelloWorld-context.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/itest/spring/src/main/resources/org/apache/tuscany/sca/itest/spring/META-INF/spring/SpringHelloWorld-context.xml?rev=789681&view=auto
==============================================================================
--- tuscany/branches/sca-java-1.x/itest/spring/src/main/resources/org/apache/tuscany/sca/itest/spring/META-INF/spring/SpringHelloWorld-context.xml (added)
+++ tuscany/branches/sca-java-1.x/itest/spring/src/main/resources/org/apache/tuscany/sca/itest/spring/META-INF/spring/SpringHelloWorld-context.xml Tue Jun 30 11:13:48 2009
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    * KIND, either express or implied.  See the License for the
+    * specific language governing permissions and limitations
+    * under the License.    
+-->
+<!-- Application context for the SpringHelloWorld testcase -->
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:sca="http://www.springframework.org/schema/sca"
+       xsi:schemaLocation="
+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="testBean" class="org.apache.tuscany.sca.itest.spring.TestHelloWorldBean" lazy-init="true">
+    </bean>
+
+</beans>
\ No newline at end of file

Modified: tuscany/branches/sca-java-1.x/itest/spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringDelegationHelloWorld.composite
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/itest/spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringDelegationHelloWorld.composite?rev=789681&r1=789680&r2=789681&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/itest/spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringDelegationHelloWorld.composite (original)
+++ tuscany/branches/sca-java-1.x/itest/spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringDelegationHelloWorld.composite Tue Jun 30 11:13:48 2009
@@ -26,7 +26,7 @@
     </component>
 
     <component name="HelloWorldComponent">
-        <implementation.spring location="META-INF/sca/SpringDelegationHelloWorld-context.xml"/>
+        <implementation.spring location="META-INF/spring/SpringDelegationHelloWorld-context.xml"/>
     </component>
 
 </composite>

Modified: tuscany/branches/sca-java-1.x/itest/spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringHelloWorld.composite
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/itest/spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringHelloWorld.composite?rev=789681&r1=789680&r2=789681&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/itest/spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringHelloWorld.composite (original)
+++ tuscany/branches/sca-java-1.x/itest/spring/src/main/resources/org/apache/tuscany/sca/itest/spring/SpringHelloWorld.composite Tue Jun 30 11:13:48 2009
@@ -26,7 +26,7 @@
     </component>
 
     <component name="HelloWorldComponent">
-        <implementation.spring location="META-INF/sca/SpringHelloWorld-context.xml"/>
+        <implementation.spring location="META-INF/spring/SpringHelloWorld-context.xml"/>
     </component>
 
 </composite>

Added: tuscany/branches/sca-java-1.x/itest/spring/src/main/resources/sca/references/META-INF/spring/SpringExplicitReference-context.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/itest/spring/src/main/resources/sca/references/META-INF/spring/SpringExplicitReference-context.xml?rev=789681&view=auto
==============================================================================
--- tuscany/branches/sca-java-1.x/itest/spring/src/main/resources/sca/references/META-INF/spring/SpringExplicitReference-context.xml (added)
+++ tuscany/branches/sca-java-1.x/itest/spring/src/main/resources/sca/references/META-INF/spring/SpringExplicitReference-context.xml Tue Jun 30 11:13:48 2009
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    * KIND, either express or implied.  See the License for the
+    * specific language governing permissions and limitations
+    * under the License.    
+-->
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:sca="http://www.springframework.org/schema/sca"
+       xsi:schemaLocation="
+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="testBean" class="mock.TestReferenceBean">
+        <property name="bean" ref="testReference"/>
+    </bean>
+
+    <sca:reference name="testReference" type="helloworld.HelloWorld"/>
+
+</beans>

Added: tuscany/branches/sca-java-1.x/itest/spring/src/main/resources/sca/references/META-INF/spring/SpringImplicitReference-context.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/itest/spring/src/main/resources/sca/references/META-INF/spring/SpringImplicitReference-context.xml?rev=789681&view=auto
==============================================================================
--- tuscany/branches/sca-java-1.x/itest/spring/src/main/resources/sca/references/META-INF/spring/SpringImplicitReference-context.xml (added)
+++ tuscany/branches/sca-java-1.x/itest/spring/src/main/resources/sca/references/META-INF/spring/SpringImplicitReference-context.xml Tue Jun 30 11:13:48 2009
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    * KIND, either express or implied.  See the License for the
+    * specific language governing permissions and limitations
+    * under the License.    
+-->
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:sca="http://www.springframework.org/schema/sca"
+       xsi:schemaLocation="
+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="testBean" class="mock.TestReferenceBean">
+        <!-- Here is the implicit reference - a property with a ref not satisifed within the
+         * Spring application context.
+         -->
+        <property name="bean" ref="testReference"/>
+    </bean>
+
+</beans>

Modified: tuscany/branches/sca-java-1.x/itest/spring/src/main/resources/sca/references/SpringExplicitReference.composite
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/itest/spring/src/main/resources/sca/references/SpringExplicitReference.composite?rev=789681&r1=789680&r2=789681&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/itest/spring/src/main/resources/sca/references/SpringExplicitReference.composite (original)
+++ tuscany/branches/sca-java-1.x/itest/spring/src/main/resources/sca/references/SpringExplicitReference.composite Tue Jun 30 11:13:48 2009
@@ -21,7 +21,7 @@
            name="SpringExplicitReference">
 
     <component name="ClientComponent">
-        <implementation.spring location="META-INF/sca/sca-references/SpringExplicitReference-context.xml"/>
+        <implementation.spring location="META-INF/spring/SpringExplicitReference-context.xml"/>
         <reference name="testReference" target="ReferenceComponent"/>
     </component>
 

Modified: tuscany/branches/sca-java-1.x/itest/spring/src/main/resources/sca/references/SpringImplicitReference.composite
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/itest/spring/src/main/resources/sca/references/SpringImplicitReference.composite?rev=789681&r1=789680&r2=789681&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/itest/spring/src/main/resources/sca/references/SpringImplicitReference.composite (original)
+++ tuscany/branches/sca-java-1.x/itest/spring/src/main/resources/sca/references/SpringImplicitReference.composite Tue Jun 30 11:13:48 2009
@@ -28,7 +28,7 @@
            name="SpringImplicitReference">
 
     <component name="ClientComponent">
-        <implementation.spring location="META-INF/sca/sca-references/SpringImplicitReference-context.xml"/>
+        <implementation.spring location="META-INF/spring/SpringImplicitReference-context.xml"/>
         <reference name="testReference" target="ReferenceComponent"/>
     </component>
 

Added: tuscany/branches/sca-java-1.x/itest/spring/src/main/resources/sca/services/META-INF/spring/SpringExplicitService-context.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/itest/spring/src/main/resources/sca/services/META-INF/spring/SpringExplicitService-context.xml?rev=789681&view=auto
==============================================================================
--- tuscany/branches/sca-java-1.x/itest/spring/src/main/resources/sca/services/META-INF/spring/SpringExplicitService-context.xml (added)
+++ tuscany/branches/sca-java-1.x/itest/spring/src/main/resources/sca/services/META-INF/spring/SpringExplicitService-context.xml Tue Jun 30 11:13:48 2009
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    * KIND, either express or implied.  See the License for the
+    * specific language governing permissions and limitations
+    * under the License.    
+-->
+<!-- Application context for the SpringExplicitHelloWorld testcase 
+In this case, the service offered by the Spring application is specified
+explicitly using an sca:service element                                  -->
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:sca="http://www.springframework.org/schema/sca"
+       xsi:schemaLocation="
+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">
+
+    <sca:service name="fooService" 
+                 type="helloworld.HelloWorld" 
+                 target="testBean"/>
+
+    <bean id="testBean" 
+          class="mock.TestHelloWorldBean" 
+          lazy-init="true">
+    </bean>
+
+</beans>
\ No newline at end of file

Added: tuscany/branches/sca-java-1.x/itest/spring/src/main/resources/sca/services/META-INF/spring/SpringImplicitService-context.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/itest/spring/src/main/resources/sca/services/META-INF/spring/SpringImplicitService-context.xml?rev=789681&view=auto
==============================================================================
--- tuscany/branches/sca-java-1.x/itest/spring/src/main/resources/sca/services/META-INF/spring/SpringImplicitService-context.xml (added)
+++ tuscany/branches/sca-java-1.x/itest/spring/src/main/resources/sca/services/META-INF/spring/SpringImplicitService-context.xml Tue Jun 30 11:13:48 2009
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    * KIND, either express or implied.  See the License for the
+    * specific language governing permissions and limitations
+    * under the License.    
+-->
+<!-- Application context for the SpringHelloWorld testcase -->
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:sca="http://www.springframework.org/schema/sca"
+       xsi:schemaLocation="
+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="testBean" class="mock.TestHelloWorldBean" lazy-init="true">
+    </bean>
+
+</beans>
\ No newline at end of file

Modified: tuscany/branches/sca-java-1.x/itest/spring/src/main/resources/sca/services/SpringExplicitService.composite
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/itest/spring/src/main/resources/sca/services/SpringExplicitService.composite?rev=789681&r1=789680&r2=789681&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/itest/spring/src/main/resources/sca/services/SpringExplicitService.composite (original)
+++ tuscany/branches/sca-java-1.x/itest/spring/src/main/resources/sca/services/SpringExplicitService.composite Tue Jun 30 11:13:48 2009
@@ -27,7 +27,7 @@
     </component>
 
     <component name="HelloWorldComponent">
-        <implementation.spring location="META-INF/sca/sca-services/SpringExplicitService-context.xml"/>
+        <implementation.spring location="META-INF/spring/SpringExplicitService-context.xml"/>
     </component>
 
 </composite>

Modified: tuscany/branches/sca-java-1.x/itest/spring/src/main/resources/sca/services/SpringImplicitService.composite
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/itest/spring/src/main/resources/sca/services/SpringImplicitService.composite?rev=789681&r1=789680&r2=789681&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/itest/spring/src/main/resources/sca/services/SpringImplicitService.composite (original)
+++ tuscany/branches/sca-java-1.x/itest/spring/src/main/resources/sca/services/SpringImplicitService.composite Tue Jun 30 11:13:48 2009
@@ -26,7 +26,7 @@
     </component>
 
     <component name="HelloWorldComponent">
-        <implementation.spring location="META-INF/sca/sca-services/SpringImplicitService-context.xml"/>
+        <implementation.spring location="META-INF/spring/SpringImplicitService-context.xml"/>
     </component>
 
 </composite>

Modified: tuscany/branches/sca-java-1.x/itest/spring/src/main/resources/spring/annotations/Calculator.composite
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/itest/spring/src/main/resources/spring/annotations/Calculator.composite?rev=789681&r1=789680&r2=789681&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/itest/spring/src/main/resources/spring/annotations/Calculator.composite (original)
+++ tuscany/branches/sca-java-1.x/itest/spring/src/main/resources/spring/annotations/Calculator.composite Tue Jun 30 11:13:48 2009
@@ -24,7 +24,7 @@
            xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0">
 
     <component name="CalculatorServiceComponent">
-        <implementation.spring location="META-INF/sca/spring-annotation/CalculatorService-context.xml"/>
+        <implementation.spring location="META-INF/spring/CalculatorService-context.xml"/>
         <property name="message">HelloWorld</property>
         <reference name="addService" target="AddServiceComponent" />
         <reference name="subtractService" target="SubtractServiceComponent" />

Added: tuscany/branches/sca-java-1.x/itest/spring/src/main/resources/spring/annotations/META-INF/spring/CalculatorService-context.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/itest/spring/src/main/resources/spring/annotations/META-INF/spring/CalculatorService-context.xml?rev=789681&view=auto
==============================================================================
--- tuscany/branches/sca-java-1.x/itest/spring/src/main/resources/spring/annotations/META-INF/spring/CalculatorService-context.xml (added)
+++ tuscany/branches/sca-java-1.x/itest/spring/src/main/resources/spring/annotations/META-INF/spring/CalculatorService-context.xml Tue Jun 30 11:13:48 2009
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+-->
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:sca="http://www.springframework.org/schema/sca"
+       xsi:schemaLocation="
+       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="CalculatorServiceBean" class="spring.annotations.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"/>
+    
+    <sca:property id="msg" name="message" type="java.lang.String"/>
+
+</beans>

Modified: tuscany/branches/sca-java-1.x/itest/spring/src/test/java/context/multiple/MultipleContextTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/itest/spring/src/test/java/context/multiple/MultipleContextTestCase.java?rev=789681&r1=789680&r2=789681&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/itest/spring/src/test/java/context/multiple/MultipleContextTestCase.java (original)
+++ tuscany/branches/sca-java-1.x/itest/spring/src/test/java/context/multiple/MultipleContextTestCase.java Tue Jun 30 11:13:48 2009
@@ -19,11 +19,12 @@
 package context.multiple;
 
 import junit.framework.TestCase;
-
+import org.junit.Ignore;
 /**
  * Tests out the big bank service
  *
  */
+@Ignore("TUSCANY-3069")
 public class MultipleContextTestCase extends TestCase {
 
     public void testServer() throws Exception {

Modified: tuscany/branches/sca-java-1.x/itest/spring/src/test/java/context/multiple/StockQuoteServer.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/itest/spring/src/test/java/context/multiple/StockQuoteServer.java?rev=789681&r1=789680&r2=789681&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/itest/spring/src/test/java/context/multiple/StockQuoteServer.java (original)
+++ tuscany/branches/sca-java-1.x/itest/spring/src/test/java/context/multiple/StockQuoteServer.java Tue Jun 30 11:13:48 2009
@@ -18,6 +18,9 @@
  */
 package context.multiple;
 
+import java.io.File;
+
+import org.apache.tuscany.sca.node.SCAContribution;
 import org.apache.tuscany.sca.node.SCANode;
 import org.apache.tuscany.sca.node.SCANodeFactory;
 import org.springframework.context.ApplicationContext;
@@ -34,7 +37,8 @@
         System.out.println("Starting the Sample SCA StockQuote Service...");
 
         SCANodeFactory factory = SCANodeFactory.newInstance();
-        SCANode node = factory.createSCANodeFromClassLoader("context/multiple/StockQuote.composite", StockQuoteServer.class.getClassLoader());
+        SCANode node = factory.createSCANode(new File("src/main/resources/context/multiple/StockQuote.composite").toURL().toString(),
+                new SCAContribution("TestContribution", new File("src/main/resources/context/multiple/").toURL().toString()));
         node.start();
         
         // Method 1: To access the Spring Application Context instance

Modified: tuscany/branches/sca-java-1.x/itest/spring/src/test/java/implementation/policies/CalculatorClient.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/itest/spring/src/test/java/implementation/policies/CalculatorClient.java?rev=789681&r1=789680&r2=789681&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/itest/spring/src/test/java/implementation/policies/CalculatorClient.java (original)
+++ tuscany/branches/sca-java-1.x/itest/spring/src/test/java/implementation/policies/CalculatorClient.java Tue Jun 30 11:13:48 2009
@@ -46,8 +46,9 @@
         }
 
         SCANodeFactory factory = SCANodeFactory.newInstance();
-        SCANode node = factory.createSCANodeFromClassLoader("implementation/policies/Calculator.composite", CalculatorServiceImpl.class.getClassLoader());
-        node.start();        
+        SCANode node = factory.createSCANode(new File("src/main/resources/implementation/policies/Calculator.composite").toURL().toString(),
+                new SCAContribution("TestContribution", new File("src/main/resources/implementation/policies/").toURL().toString()));
+        node.start();       
               
         CalculatorService calculatorService = 
             ((SCAClient)node).getService(CalculatorService.class, "CalculatorServiceComponent");

Modified: tuscany/branches/sca-java-1.x/itest/spring/src/test/java/location/folder/SpringFolderLocationTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/itest/spring/src/test/java/location/folder/SpringFolderLocationTestCase.java?rev=789681&r1=789680&r2=789681&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/itest/spring/src/test/java/location/folder/SpringFolderLocationTestCase.java (original)
+++ tuscany/branches/sca-java-1.x/itest/spring/src/test/java/location/folder/SpringFolderLocationTestCase.java Tue Jun 30 11:13:48 2009
@@ -37,5 +37,9 @@
  */
 public class SpringFolderLocationTestCase extends AbstractHelloWorldTestCase {
     // super class does it all getting composite based on this class name
+	
+	public SpringFolderLocationTestCase() {
+        super("SpringFolderLocation.composite", "location/folder");        
+    }
 }
 

Modified: tuscany/branches/sca-java-1.x/itest/spring/src/test/java/location/jar/SpringJarLocationTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/itest/spring/src/test/java/location/jar/SpringJarLocationTestCase.java?rev=789681&r1=789680&r2=789681&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/itest/spring/src/test/java/location/jar/SpringJarLocationTestCase.java (original)
+++ tuscany/branches/sca-java-1.x/itest/spring/src/test/java/location/jar/SpringJarLocationTestCase.java Tue Jun 30 11:13:48 2009
@@ -37,5 +37,9 @@
  */
 public class SpringJarLocationTestCase extends AbstractHelloWorldTestCase {
     // super class does it all getting composite based on this class name
+	
+	public SpringJarLocationTestCase() {
+        super("SpringJarLocation.composite", "location/jar");        
+    }
 }
 

Modified: tuscany/branches/sca-java-1.x/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/AbstractHelloWorldTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/AbstractHelloWorldTestCase.java?rev=789681&r1=789680&r2=789681&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/AbstractHelloWorldTestCase.java (original)
+++ tuscany/branches/sca-java-1.x/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/AbstractHelloWorldTestCase.java Tue Jun 30 11:13:48 2009
@@ -19,7 +19,6 @@
 
 package org.apache.tuscany.sca.itest.spring;
 
-
 /**
  * Basic "hello world" style test case for testing Spring component implementation
  *
@@ -29,6 +28,10 @@
     /**
      * Calls the hello world service and checks that it gives the right response...
      */
+	public AbstractHelloWorldTestCase(String compositeName, String contributionLocation) {
+        super(compositeName, contributionLocation);        
+    }
+	
     public void testHello() throws Exception {
         assertEquals("Hello petra", service.sayHello("petra"));
     }

Modified: tuscany/branches/sca-java-1.x/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/AbstractSCATestCase.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/AbstractSCATestCase.java?rev=789681&r1=789680&r2=789681&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/AbstractSCATestCase.java (original)
+++ tuscany/branches/sca-java-1.x/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/AbstractSCATestCase.java Tue Jun 30 11:13:48 2009
@@ -21,16 +21,36 @@
 
 import junit.framework.TestCase;
 
+import java.io.File;
+import java.net.MalformedURLException;
+
 import org.apache.tuscany.sca.host.embedded.SCADomain;
 
 public abstract class AbstractSCATestCase<T> extends TestCase {
 
     protected SCADomain domain;
+    protected String compositeName;
+    protected String contributionLocation;
     protected T service;
+    
+    public AbstractSCATestCase(String compositeName, String contributionLocation) {
+        super();
+        this.compositeName = compositeName;
+        this.contributionLocation = contributionLocation;
+        try {
+            if (contributionLocation != null) {
+                File f = new File("target/classes/" + contributionLocation);
+                this.contributionLocation = f.toURL().toString();
+            }
+        } catch (MalformedURLException e) {
+            e.printStackTrace();
+        }
+    }
 
     @Override
     protected void setUp() throws Exception {
-        domain = SCADomain.newInstance(getCompositeName());
+    	domain = SCADomain.newInstance("http://localhost", contributionLocation, compositeName);
+        //domain = SCADomain.newInstance(getCompositeName());
         service = domain.getService(getServiceClass(), "ClientComponent");
     }
 

Modified: tuscany/branches/sca-java-1.x/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/SpringDelegationHelloWorldTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/SpringDelegationHelloWorldTestCase.java?rev=789681&r1=789680&r2=789681&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/SpringDelegationHelloWorldTestCase.java (original)
+++ tuscany/branches/sca-java-1.x/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/SpringDelegationHelloWorldTestCase.java Tue Jun 30 11:13:48 2009
@@ -28,4 +28,8 @@
  */
 public class SpringDelegationHelloWorldTestCase extends AbstractHelloWorldTestCase {
     // super class does it all getting composite based on this class name
+	
+	public SpringDelegationHelloWorldTestCase() {
+        super("SpringDelegationHelloWorld.composite", "org/apache/tuscany/sca/itest/spring");        
+    }
 }

Modified: tuscany/branches/sca-java-1.x/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/SpringHelloWorldTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/SpringHelloWorldTestCase.java?rev=789681&r1=789680&r2=789681&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/SpringHelloWorldTestCase.java (original)
+++ tuscany/branches/sca-java-1.x/itest/spring/src/test/java/org/apache/tuscany/sca/itest/spring/SpringHelloWorldTestCase.java Tue Jun 30 11:13:48 2009
@@ -29,4 +29,8 @@
  */
 public class SpringHelloWorldTestCase extends AbstractHelloWorldTestCase {
     // super class does it all getting composite based on this class name
+	
+	public SpringHelloWorldTestCase() {
+        super("SpringHelloWorld.composite", "org/apache/tuscany/sca/itest/spring");        
+    }
 }

Modified: tuscany/branches/sca-java-1.x/itest/spring/src/test/java/sca/references/SpringExplicitReferenceTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/itest/spring/src/test/java/sca/references/SpringExplicitReferenceTestCase.java?rev=789681&r1=789680&r2=789681&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/itest/spring/src/test/java/sca/references/SpringExplicitReferenceTestCase.java (original)
+++ tuscany/branches/sca-java-1.x/itest/spring/src/test/java/sca/references/SpringExplicitReferenceTestCase.java Tue Jun 30 11:13:48 2009
@@ -38,4 +38,8 @@
  */
 public class SpringExplicitReferenceTestCase extends AbstractHelloWorldTestCase {
     // super class does it all getting composite based on this class name
+	
+	public SpringExplicitReferenceTestCase() {
+        super("SpringExplicitReference.composite", "sca/references");        
+    }
 }

Modified: tuscany/branches/sca-java-1.x/itest/spring/src/test/java/sca/references/SpringImplicitReferenceTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/itest/spring/src/test/java/sca/references/SpringImplicitReferenceTestCase.java?rev=789681&r1=789680&r2=789681&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/itest/spring/src/test/java/sca/references/SpringImplicitReferenceTestCase.java (original)
+++ tuscany/branches/sca-java-1.x/itest/spring/src/test/java/sca/references/SpringImplicitReferenceTestCase.java Tue Jun 30 11:13:48 2009
@@ -39,6 +39,10 @@
  */
 public class SpringImplicitReferenceTestCase extends AbstractHelloWorldTestCase {
     // super class does it all getting composite based on this class name
+	
+	public SpringImplicitReferenceTestCase() {
+        super("SpringImplicitReference.composite", "sca/references");        
+    }
 }
 
 

Modified: tuscany/branches/sca-java-1.x/itest/spring/src/test/java/sca/services/SpringExplicitServiceTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/itest/spring/src/test/java/sca/services/SpringExplicitServiceTestCase.java?rev=789681&r1=789680&r2=789681&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/itest/spring/src/test/java/sca/services/SpringExplicitServiceTestCase.java (original)
+++ tuscany/branches/sca-java-1.x/itest/spring/src/test/java/sca/services/SpringExplicitServiceTestCase.java Tue Jun 30 11:13:48 2009
@@ -33,4 +33,8 @@
  */
 public class SpringExplicitServiceTestCase extends AbstractHelloWorldTestCase {
     // super class does it all getting composite based on this class name
+	
+	public SpringExplicitServiceTestCase() {
+        super("SpringExplicitService.composite", "sca/services");        
+    }
 }

Modified: tuscany/branches/sca-java-1.x/itest/spring/src/test/java/sca/services/SpringImplicitServiceTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/itest/spring/src/test/java/sca/services/SpringImplicitServiceTestCase.java?rev=789681&r1=789680&r2=789681&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/itest/spring/src/test/java/sca/services/SpringImplicitServiceTestCase.java (original)
+++ tuscany/branches/sca-java-1.x/itest/spring/src/test/java/sca/services/SpringImplicitServiceTestCase.java Tue Jun 30 11:13:48 2009
@@ -31,4 +31,8 @@
  */
 public class SpringImplicitServiceTestCase extends AbstractHelloWorldTestCase {
     // super class does it all getting composite based on this class name
+	
+	public SpringImplicitServiceTestCase() {
+        super("SpringImplicitService.composite", "sca/services");        
+    }
 }

Modified: tuscany/branches/sca-java-1.x/itest/spring/src/test/java/spring/annotations/CalculatorClient.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/itest/spring/src/test/java/spring/annotations/CalculatorClient.java?rev=789681&r1=789680&r2=789681&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/itest/spring/src/test/java/spring/annotations/CalculatorClient.java (original)
+++ tuscany/branches/sca-java-1.x/itest/spring/src/test/java/spring/annotations/CalculatorClient.java Tue Jun 30 11:13:48 2009
@@ -27,7 +27,6 @@
 import org.apache.tuscany.sca.node.SCANodeFactory;
 
 import calculator.CalculatorService;
-import calculator.CalculatorServiceImpl;
 
 
 /**

Modified: tuscany/branches/sca-java-1.x/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/runtime/context/SpringContextTie.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/runtime/context/SpringContextTie.java?rev=789681&r1=789680&r2=789681&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/runtime/context/SpringContextTie.java (original)
+++ tuscany/branches/sca-java-1.x/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/runtime/context/SpringContextTie.java Tue Jun 30 11:13:48 2009
@@ -88,6 +88,7 @@
     private AbstractApplicationContext createApplicationContext(SCAParentApplicationContext scaParentContext, URL resource) {
 
         XmlBeanFactory beanFactory = new XmlBeanFactory(new UrlResource(resource));
+        beanFactory.setBeanClassLoader(implementation.getClassLoader());
         AbstractApplicationContext appContext = null;
         
         for (String bean : beanFactory.getBeanDefinitionNames()) {
@@ -123,8 +124,9 @@
                         }
                 }            
                                                                                    
-	            appContext = new ClassPathXmlApplicationContext(listValues, false, scaParentContext);                                   
+	            appContext = new ClassPathXmlApplicationContext(listValues, false, scaParentContext);	            
 	            appContext.refresh();
+	            appContext.getBeanFactory().setBeanClassLoader(implementation.getClassLoader());
 	            if (isAnnotationSupported)
 	            	includeAnnotationProcessors(appContext.getBeanFactory());
 	            return appContext;
@@ -135,6 +137,7 @@
         if (isAnnotationSupported)
         	includeAnnotationProcessors(beanFactory);
         appContext = new GenericApplicationContext(beanFactory, scaParentContext);
+        appContext.setClassLoader(implementation.getClassLoader());
         return appContext;
     }
 

Modified: tuscany/branches/sca-java-1.x/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/runtime/context/SpringImplementationStub.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/runtime/context/SpringImplementationStub.java?rev=789681&r1=789680&r2=789681&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/runtime/context/SpringImplementationStub.java (original)
+++ tuscany/branches/sca-java-1.x/modules/implementation-spring-runtime/src/main/java/org/apache/tuscany/sca/implementation/spring/runtime/context/SpringImplementationStub.java Tue Jun 30 11:13:48 2009
@@ -6,15 +6,15 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
- * under the License.    
+ * under the License.
  */
 
 package org.apache.tuscany.sca.implementation.spring.runtime.context;
@@ -29,7 +29,7 @@
  * It enables the Spring code in the runtime module to invoke methods on a
  * Tuscany SpringImplementation without the Spring runtime module
  * needing to know about any Tuscany classes. See the SpringImplementationTie class
- * in the implementation-spring module for what the tie does. 
+ * in the implementation-spring module for what the tie does.
  */
 public class SpringImplementationStub {
 
@@ -39,7 +39,8 @@
     Method getComponentName;
     Method getComponentTie;
     Method getPropertyValueTie;
-    
+    Method getClassLoader;
+
     public SpringImplementationStub(Object tie) {
         this.tie = tie;
         Class<?> tieClass = tie.getClass();
@@ -49,11 +50,12 @@
             getComponentName = tieClass.getMethod("getComponentName");
             getComponentTie = tieClass.getMethod("getComponentTie");
             getPropertyValueTie = tieClass.getMethod("getPropertyValueTie");
+            getClassLoader = tieClass.getMethod("getClassLoader");
         } catch (Exception e) {
             throw new RuntimeException(e);
         }
     }
-    
+
     public String getURI() {
         try {
 
@@ -114,4 +116,14 @@
             throw new RuntimeException(e);
         }
     }
+
+    public ClassLoader getClassLoader() {
+        try {
+
+            return (ClassLoader) getClassLoader.invoke(tie);
+
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
 }

Modified: tuscany/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementation.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementation.java?rev=789681&r1=789680&r2=789681&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementation.java (original)
+++ tuscany/branches/sca-java-1.x/modules/implementation-spring/src/main/java/org/apache/tuscany/sca/implementation/spring/SpringImplementation.java Tue Jun 30 11:13:48 2009
@@ -6,15 +6,15 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
- * under the License.    
+ * under the License.
  */
 package org.apache.tuscany.sca.implementation.spring;
 
@@ -35,9 +35,9 @@
 import org.apache.tuscany.sca.runtime.RuntimeComponent;
 
 /**
- * Represents a Spring implementation. 
- * 
- * @version $Rev: 511195 $ $Date: 2007-02-24 02:29:46 +0000 (Sat, 24 Feb 2007) $ 
+ * Represents a Spring implementation.
+ *
+ * @version $Rev: 511195 $ $Date: 2007-02-24 02:29:46 +0000 (Sat, 24 Feb 2007) $
  */
 public class SpringImplementation extends ImplementationImpl implements Implementation, ComponentPreProcessor, Extensible {
 
@@ -53,6 +53,8 @@
     // List of unresolved bean property references
     private Hashtable<String, Reference> unresolvedBeanRef;
 
+    private ClassLoader classLoader;
+
     public SpringImplementation() {
         this.location = null;
         this.resource = null;
@@ -84,8 +86,8 @@
         return resource;
     }
 
-    /* 
-     * Returns the componentType for this Spring implementation 
+    /*
+     * Returns the componentType for this Spring implementation
      */
     public ComponentType getComponentType() {
         return componentType;
@@ -145,35 +147,35 @@
     } // end method setPropertyClass
 
     /**
-     * Gets the Java Class for an SCA property 
+     * Gets the Java Class for an SCA property
      * @param propertyName - the property name
      * @return - a Class object for the type of the property
      */
     public Class getPropertyClass(String propertyName) {
         return propertyMap.get(propertyName);
     } // end method getPropertyClass
-    
+
     public void setUnresolvedBeanRef(String refName, Reference reference) {
         if (refName == null || reference == null)
             return;
         unresolvedBeanRef.put(refName, reference);
         return;
     } // end method setUnresolvedBeanRef
-    
+
     public Reference getUnresolvedBeanRef(String refName) {
         return unresolvedBeanRef.get(refName);
     } // end method getUnresolvedBeanRef
-    
-    
+
+
     /**
-     * Use preProcess to validate and map the references and properties dynamically 
+     * Use preProcess to validate and map the references and properties dynamically
      */
     public void preProcess(Component component) {
         if (!(component instanceof RuntimeComponent))
             return;
-        
+
         RuntimeComponent rtc = (RuntimeComponent) component;
-        
+
         for (Reference reference : rtc.getReferences()) {
             if (unresolvedBeanRef.containsKey(reference.getName())) {
             	Reference ref = unresolvedBeanRef.get(reference.getName());
@@ -184,14 +186,14 @@
         }
 
         for (Property property : rtc.getProperties()) {
-        	if (unresolvedBeanRef.containsKey(property.getName())) {        		
+        	if (unresolvedBeanRef.containsKey(property.getName())) {
         		componentType.getProperties().add(createProperty(property));
         		this.setPropertyClass(property.getName(), property.getClass());
         		unresolvedBeanRef.remove(property.getName());
             }
-        }      
+        }
     }
-    
+
     protected Reference createReference(Reference reference, InterfaceContract interfaze) {
         Reference newReference;
         try {
@@ -203,7 +205,7 @@
         }
         return newReference;
     }
-    
+
     protected Property createProperty(Property property) {
         Property newProperty;
         try {
@@ -213,4 +215,12 @@
         }
         return newProperty;
     }
+
+    public ClassLoader getClassLoader() {
+        return classLoader;
+    }
+
+    public void setClassLoader(ClassLoader classLoader) {
+        this.classLoader = classLoader;
+    }
 }