You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by js...@apache.org on 2007/03/01 07:16:56 UTC

svn commit: r513168 [1/2] - in /incubator/tuscany/branches/sca-java-integration/testing/sca/itest: bindings/bindingsclient/src/main/resources/META-INF/ bindings/bindingsclient/src/main/webapp/META-INF/ bindings/bindingsclient/src/main/webapp/WEB-INF/ b...

Author: jsdelfino
Date: Wed Feb 28 22:16:54 2007
New Revision: 513168

URL: http://svn.apache.org/viewvc?view=rev&rev=513168
Log:
Renamed SCDL files to .composite, moved them out of META-INF and adjusted the integration test cases

Added:
    incubator/tuscany/branches/sca-java-integration/testing/sca/itest/databinding/src/test/resources/DataBindingTest.composite   (with props)
    incubator/tuscany/branches/sca-java-integration/testing/sca/itest/propertyTest/src/main/resources/PropertyTest.composite   (with props)
    incubator/tuscany/branches/sca-java-integration/testing/sca/itest/propertyTest/src/main/resources/fileProperty.txt   (with props)
    incubator/tuscany/branches/sca-java-integration/testing/sca/itest/specTest/src/main/resources/CompositeTest.composite   (with props)
    incubator/tuscany/branches/sca-java-integration/testing/sca/itest/specTest/src/main/resources/myListService.composite   (with props)
    incubator/tuscany/branches/sca-java-integration/testing/sca/itest/specTest/src/main/resources/myServiceInComposite.composite   (with props)
    incubator/tuscany/branches/sca-java-integration/testing/sca/itest/specTest/src/main/resources/myServiceInRecursive.composite   (with props)
    incubator/tuscany/branches/sca-java-integration/testing/sca/itest/specTest/src/main/resources/mySimpleService.composite   (with props)
    incubator/tuscany/branches/sca-java-integration/testing/sca/itest/specTest/src/main/resources/mySimpleServiceInRecursive.composite   (with props)
    incubator/tuscany/branches/sca-java-integration/testing/sca/itest/specTest/src/main/resources/mySimpleServiceInRecursive2.composite   (with props)
    incubator/tuscany/branches/sca-java-integration/testing/sca/itest/specTest/src/main/resources/myTotalService.composite   (with props)
    incubator/tuscany/branches/sca-java-integration/testing/sca/itest/specTest/src/main/resources/myTotalServiceInComposite.composite   (with props)
    incubator/tuscany/branches/sca-java-integration/testing/sca/itest/specTest/src/main/resources/myTotalServiceInCompositeForReferenceOverride.composite   (with props)
    incubator/tuscany/branches/sca-java-integration/testing/sca/itest/specTest/src/main/resources/myTotalServiceInRecursive.composite   (with props)
    incubator/tuscany/branches/sca-java-integration/testing/sca/itest/specTest/src/main/resources/myTotalServiceInRecursiveForReferenceOverride.composite   (with props)
    incubator/tuscany/branches/sca-java-integration/testing/sca/itest/specTest/src/main/resources/myservice.composite   (with props)
    incubator/tuscany/branches/sca-java-integration/testing/sca/itest/wsdl/src/main/resources/SDOWSDLTest.composite   (with props)
    incubator/tuscany/branches/sca-java-integration/testing/sca/itest/wsdl/src/main/resources/WSDLTest.composite   (with props)
Removed:
    incubator/tuscany/branches/sca-java-integration/testing/sca/itest/bindings/bindingsclient/src/main/resources/META-INF/
    incubator/tuscany/branches/sca-java-integration/testing/sca/itest/bindings/bindingsclient/src/main/webapp/META-INF/
    incubator/tuscany/branches/sca-java-integration/testing/sca/itest/bindings/bindingsclient/src/main/webapp/WEB-INF/default.scdl
    incubator/tuscany/branches/sca-java-integration/testing/sca/itest/bindings/bindingscomposite/src/main/resources/META-INF/
    incubator/tuscany/branches/sca-java-integration/testing/sca/itest/bindings/bindingsutility/src/main/resources/META-INF/
    incubator/tuscany/branches/sca-java-integration/testing/sca/itest/databinding/src/test/resources/META-INF/
    incubator/tuscany/branches/sca-java-integration/testing/sca/itest/propertyTest/src/main/resources/META-INF/
    incubator/tuscany/branches/sca-java-integration/testing/sca/itest/specTest/src/main/resources/META-INF/
    incubator/tuscany/branches/sca-java-integration/testing/sca/itest/wsdl/src/main/resources/META-INF/
Modified:
    incubator/tuscany/branches/sca-java-integration/testing/sca/itest/databinding/src/test/java/org/apache/tuscany/databinding/sample/DataBindingBootStrapTestCase.java
    incubator/tuscany/branches/sca-java-integration/testing/sca/itest/propertyTest/src/test/java/org/apache/tuscany/sca/itest/PropertyTestCase.java
    incubator/tuscany/branches/sca-java-integration/testing/sca/itest/specTest/src/test/java/org/apache/tuscany/sca/test/spec/ComponentServiceReferenceListTest.java
    incubator/tuscany/branches/sca-java-integration/testing/sca/itest/specTest/src/test/java/org/apache/tuscany/sca/test/spec/ComponentServiceReferenceTest.java
    incubator/tuscany/branches/sca-java-integration/testing/sca/itest/specTest/src/test/java/org/apache/tuscany/sca/test/spec/ComponentTest.java
    incubator/tuscany/branches/sca-java-integration/testing/sca/itest/specTest/src/test/java/org/apache/tuscany/sca/test/spec/CompositeOneService2LevelTest.java
    incubator/tuscany/branches/sca-java-integration/testing/sca/itest/specTest/src/test/java/org/apache/tuscany/sca/test/spec/CompositeOneServiceTest.java
    incubator/tuscany/branches/sca-java-integration/testing/sca/itest/specTest/src/test/java/org/apache/tuscany/sca/test/spec/CompositeServiceReferenceForRefOverrideTest.java
    incubator/tuscany/branches/sca-java-integration/testing/sca/itest/specTest/src/test/java/org/apache/tuscany/sca/test/spec/CompositeServiceReferenceTest.java
    incubator/tuscany/branches/sca-java-integration/testing/sca/itest/specTest/src/test/java/org/apache/tuscany/sca/test/spec/CompositeTest.java
    incubator/tuscany/branches/sca-java-integration/testing/sca/itest/wsdl/src/test/java/org/apache/tuscany/sca/itest/SDOWSDLTestCase.java
    incubator/tuscany/branches/sca-java-integration/testing/sca/itest/wsdl/src/test/java/org/apache/tuscany/sca/itest/WSDLTestCase.java

Modified: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/databinding/src/test/java/org/apache/tuscany/databinding/sample/DataBindingBootStrapTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/testing/sca/itest/databinding/src/test/java/org/apache/tuscany/databinding/sample/DataBindingBootStrapTestCase.java?view=diff&rev=513168&r1=513167&r2=513168
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/testing/sca/itest/databinding/src/test/java/org/apache/tuscany/databinding/sample/DataBindingBootStrapTestCase.java (original)
+++ incubator/tuscany/branches/sca-java-integration/testing/sca/itest/databinding/src/test/java/org/apache/tuscany/databinding/sample/DataBindingBootStrapTestCase.java Wed Feb 28 22:16:54 2007
@@ -28,6 +28,9 @@
 import javax.xml.stream.XMLInputFactory;
 import javax.xml.stream.XMLStreamReader;
 
+import junit.framework.TestCase;
+
+import org.apache.tuscany.api.SCAContainer;
 import org.apache.tuscany.databinding.jaxb.JAXBContextHelper;
 import org.apache.tuscany.databinding.jaxb.Reader2JAXB;
 import org.apache.tuscany.databinding.sdo.String2DataObject;
@@ -35,7 +38,6 @@
 import org.apache.tuscany.spi.databinding.TransformationContext;
 import org.apache.tuscany.spi.idl.XMLType;
 import org.apache.tuscany.spi.model.DataType;
-import org.apache.tuscany.test.SCATestCase;
 import org.osoa.sca.CompositeContext;
 import org.osoa.sca.CurrentCompositeContext;
 
@@ -46,7 +48,7 @@
 /**
  * @version $Rev$ $Date$
  */
-public class DataBindingBootStrapTestCase extends SCATestCase {
+public class DataBindingBootStrapTestCase extends TestCase {
     private static final String IPO_XML =
         "<?xml version=\"1.0\"?>" + "<ipo:purchaseOrder"
             + "  xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\""
@@ -111,9 +113,12 @@
     }
 
     protected void setUp() throws Exception {
-        // setApplicationSCDL(getClass(), "META-INF/sca/default.scdl");
-        super.setUp();
+    	SCAContainer.start("DataBindingTest.composite");
         CompositeContext context = CurrentCompositeContext.getContext();
         client = context.locateService(Client.class, "Client");
+    }
+    
+    protected void tearDown() throws Exception {
+    	SCAContainer.stop();
     }
 }

Added: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/databinding/src/test/resources/DataBindingTest.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/testing/sca/itest/databinding/src/test/resources/DataBindingTest.composite?view=auto&rev=513168
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/testing/sca/itest/databinding/src/test/resources/DataBindingTest.composite (added)
+++ incubator/tuscany/branches/sca-java-integration/testing/sca/itest/databinding/src/test/resources/DataBindingTest.composite Wed Feb 28 22:16:54 2007
@@ -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.    
+-->
+<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:db="http://tuscany.apache.org/xmlns/databinding/1.0"
+    name="DataBindingTest">
+    
+    <dbsdo:import.sdo xmlns:dbsdo="http://tuscany.apache.org/xmlns/sca/databinding/sdo/1.0" factory="com.example.ipo.sdo.SdoFactory"/>
+
+    <component name="Client">
+        <implementation.java class="org.apache.tuscany.databinding.sample.ClientImpl" />
+        <reference name="echoReference">Echo</reference>
+    </component>
+
+    <component name="Echo">
+        <implementation.java class="org.apache.tuscany.databinding.sample.EchoImpl" />
+    </component>
+    
+</composite>

Propchange: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/databinding/src/test/resources/DataBindingTest.composite
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/propertyTest/src/main/resources/PropertyTest.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/testing/sca/itest/propertyTest/src/main/resources/PropertyTest.composite?view=auto&rev=513168
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/testing/sca/itest/propertyTest/src/main/resources/PropertyTest.composite (added)
+++ incubator/tuscany/branches/sca-java-integration/testing/sca/itest/propertyTest/src/main/resources/PropertyTest.composite Wed Feb 28 22:16:54 2007
@@ -0,0 +1,184 @@
+<?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.
+-->
+<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+       xmlns:foo="http://foo"
+           name="PropertyTest" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    <property name="number" type="xsd:int">1</property>
+    <property name="complex" type="foo:MyComplexType" >
+        <foo:MyComplexValue xsi:type="foo:MyComplexType" >
+            <foo:a>a</foo:a>
+            <foo:b>b</foo:b>
+            <foo:c>c</foo:c>
+            <foo:d>d</foo:d>
+            <foo:x>
+                <foo:y>y</foo:y>
+                <foo:z>z</foo:z>
+            </foo:x>
+        </foo:MyComplexValue>
+    </property>
+
+    <property name="moreComplex" type="foo:MyMoreComplexType">
+        <foo:MyMoreComplexValue xsi:type="foo:MyMoreComplexType">
+            <foo:stringArray>TestString_1</foo:stringArray>
+            <foo:stringArray>TestString_2</foo:stringArray>
+            <foo:intArray>10</foo:intArray>
+            <foo:integerNumber>27</foo:integerNumber>
+            <foo:floatNumber>79.34</foo:floatNumber>
+            <foo:doubleArray>25.52</foo:doubleArray>
+            <foo:doubleNumber>184.52</foo:doubleNumber>
+            <foo:doubleArray>50.05</foo:doubleArray>
+            <foo:intArray>20</foo:intArray>
+            <foo:numberSetArray>
+                <foo:integerNumber>1</foo:integerNumber>
+                <foo:floatNumber>11</foo:floatNumber>
+                <foo:doubleNumber>111</foo:doubleNumber>
+            </foo:numberSetArray>
+            <foo:numberSetArray>
+                <foo:integerNumber>2</foo:integerNumber>
+                <foo:floatNumber>22</foo:floatNumber>
+                <foo:doubleNumber>222</foo:doubleNumber>
+            </foo:numberSetArray>
+            <foo:numberSet>
+                <foo:integerNumber>54</foo:integerNumber>
+                <foo:floatNumber>158.68</foo:floatNumber>
+                <foo:doubleNumber>369.04</foo:doubleNumber>
+            </foo:numberSet>
+        </foo:MyMoreComplexValue>
+    </property>
+
+    <component name="ABCDComponent">
+        <implementation.java class="org.apache.tuscany.sca.itest.ABCDComponentImpl"/>
+        <reference name="ab">ABComponent</reference>
+        <reference name="cd">CDComponent</reference>
+    </component>
+
+    <component name="ABComponent">
+        <implementation.java class="org.apache.tuscany.sca.itest.ABComponentImpl"/>
+        <property name="a" source="$complex/foo:MyComplexValue/foo:a"/>
+        <property name="b" source="$complex/foo:MyComplexValue/foo:b"/>
+        <property name="f" source="$complex/foo:MyComplexValue/foo:a">f</property>
+        <property name="xpath" source="$complex/foo:MyComplexValue/foo:x/*[local-name()='z']"/>
+        <property name="one" source="$number"/>
+    </component>
+
+    <component name="CDComponent">
+        <implementation.java class="org.apache.tuscany.sca.itest.CDComponentImpl"/>
+        <property name="c" source="$complex/foo:MyComplexValue/foo:c"/>
+        <property name="d" source="$complex/foo:MyComplexValue/foo:d"/>
+        <property name="nosource">aValue</property>
+        <property name="fileProperty" file="fileProperty.txt"/>
+        <property name="nonFileProperty" file="fileProperty.txt" source="$complex/foo:MyComplexValue/foo:c"/>
+        <property name="two" source="$number">2</property>
+    </component>
+
+    <component name="PropertyComponent">
+        <implementation.java class="org.apache.tuscany.sca.itest.PropertyComponentImpl"/>
+        <property name="complexPropertyOne" source="$moreComplex"></property>
+        <property name="complexPropertyTwo">
+            <foo:MyAnotherComplexValue>
+                <foo:stringArray>TestString_1</foo:stringArray>
+                <foo:stringArray>TestString_2</foo:stringArray>
+                <foo:intArray>10</foo:intArray>
+                <foo:integerNumber>27</foo:integerNumber>
+                <foo:floatNumber>79.34</foo:floatNumber>
+                <foo:doubleArray>25.52</foo:doubleArray>
+                <foo:doubleNumber>184.52</foo:doubleNumber>
+                <foo:doubleArray>50.05</foo:doubleArray>
+                <foo:intArray>20</foo:intArray>
+                <foo:numberSetArray>
+                    <foo:integerNumber>1</foo:integerNumber>
+                    <foo:floatNumber>11</foo:floatNumber>
+                    <foo:doubleNumber>111</foo:doubleNumber>
+                </foo:numberSetArray>
+                <foo:numberSetArray>
+                    <foo:integerNumber>2</foo:integerNumber>
+                    <foo:floatNumber>22</foo:floatNumber>
+                    <foo:doubleNumber>222</foo:doubleNumber>
+                </foo:numberSetArray>
+                <foo:numberSet>
+                    <foo:integerNumber>54</foo:integerNumber>
+                    <foo:floatNumber>158.68</foo:floatNumber>
+                    <foo:doubleNumber>369.04</foo:doubleNumber>
+                </foo:numberSet>
+            </foo:MyAnotherComplexValue>
+        </property>
+        <property name="complexPropertyThree" element="foo:PropertyThreeElement">
+            <foo:PropertyThreeElement>
+                <foo:stringArray>TestElementString_1</foo:stringArray>
+                <foo:stringArray>TestElementString_2</foo:stringArray>
+                <foo:intArray>10</foo:intArray>
+                <foo:integerNumber>27</foo:integerNumber>
+                <foo:floatNumber>79.34</foo:floatNumber>
+                <foo:doubleArray>25.52</foo:doubleArray>
+                <foo:doubleNumber>184.52</foo:doubleNumber>
+                <foo:doubleArray>50.05</foo:doubleArray>
+                <foo:intArray>20</foo:intArray>
+                <foo:numberSetArray>
+                    <foo:integerNumber>1</foo:integerNumber>
+                    <foo:floatNumber>11</foo:floatNumber>
+                    <foo:doubleNumber>111</foo:doubleNumber>
+                </foo:numberSetArray>
+                <foo:numberSetArray>
+                    <foo:integerNumber>2</foo:integerNumber>
+                    <foo:floatNumber>22</foo:floatNumber>
+                    <foo:doubleNumber>222</foo:doubleNumber>
+                </foo:numberSetArray>
+                <foo:numberSet>
+                    <foo:integerNumber>54</foo:integerNumber>
+                    <foo:floatNumber>158.68</foo:floatNumber>
+                    <foo:doubleNumber>369.04</foo:doubleNumber>
+                </foo:numberSet>
+            </foo:PropertyThreeElement>
+        </property>
+        <property name="complexPropertyFour" element="foo:PropertyFourElement" >
+            <foo:PropertyFourElement>
+                <foo:integerNumber>1</foo:integerNumber>
+                <foo:floatNumber>11.11</foo:floatNumber>
+                <foo:doubleNumber>111.111</foo:doubleNumber>
+                <foo:numberSet>
+                    <foo:integerNumber>11</foo:integerNumber>
+                    <foo:floatNumber>1111.1111</foo:floatNumber>
+                    <foo:doubleNumber>11111.11111</foo:doubleNumber>
+                </foo:numberSet>
+            </foo:PropertyFourElement>
+            <foo:PropertyFourElement>
+                <foo:integerNumber>2</foo:integerNumber>
+                <foo:floatNumber>22.22</foo:floatNumber>
+                <foo:doubleNumber>222.222</foo:doubleNumber>
+                <foo:numberSet>
+                    <foo:integerNumber>22</foo:integerNumber>
+                    <foo:floatNumber>2222.2222</foo:floatNumber>
+                    <foo:doubleNumber>22222.22222</foo:doubleNumber>
+                </foo:numberSet>
+            </foo:PropertyFourElement>
+            <foo:PropertyFourElement>
+                <foo:integerNumber>3</foo:integerNumber>
+                <foo:floatNumber>33.33</foo:floatNumber>
+                <foo:doubleNumber>333.333</foo:doubleNumber>
+                <foo:numberSet>
+                    <foo:integerNumber>33</foo:integerNumber>
+                    <foo:floatNumber>3333.3333</foo:floatNumber>
+                    <foo:doubleNumber>33333.33333</foo:doubleNumber>
+                </foo:numberSet>
+            </foo:PropertyFourElement>
+        </property>
+    </component>
+</composite>
+

Propchange: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/propertyTest/src/main/resources/PropertyTest.composite
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/propertyTest/src/main/resources/PropertyTest.composite
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/propertyTest/src/main/resources/fileProperty.txt
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/testing/sca/itest/propertyTest/src/main/resources/fileProperty.txt?view=auto&rev=513168
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/testing/sca/itest/propertyTest/src/main/resources/fileProperty.txt (added)
+++ incubator/tuscany/branches/sca-java-integration/testing/sca/itest/propertyTest/src/main/resources/fileProperty.txt Wed Feb 28 22:16:54 2007
@@ -0,0 +1 @@
+<filePropertyTest>fileValue</filePropertyTest>

Propchange: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/propertyTest/src/main/resources/fileProperty.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/propertyTest/src/main/resources/fileProperty.txt
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Modified: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/propertyTest/src/test/java/org/apache/tuscany/sca/itest/PropertyTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/testing/sca/itest/propertyTest/src/test/java/org/apache/tuscany/sca/itest/PropertyTestCase.java?view=diff&rev=513168&r1=513167&r2=513168
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/testing/sca/itest/propertyTest/src/test/java/org/apache/tuscany/sca/itest/PropertyTestCase.java (original)
+++ incubator/tuscany/branches/sca-java-integration/testing/sca/itest/propertyTest/src/test/java/org/apache/tuscany/sca/itest/PropertyTestCase.java Wed Feb 28 22:16:54 2007
@@ -19,12 +19,12 @@
 
 package org.apache.tuscany.sca.itest;
 
-import java.util.Collection;
+import junit.framework.TestCase;
 
-import org.apache.tuscany.test.SCATestCase;
+import org.apache.tuscany.api.SCAContainer;
 import org.osoa.sca.CurrentCompositeContext;
 
-public class PropertyTestCase extends SCATestCase {
+public class PropertyTestCase extends TestCase {
     private ABComponent abService;
     private CDComponent cdService;  
     private ABCDComponent abcdService;
@@ -140,10 +140,14 @@
     } 
     
     protected void setUp() throws Exception {
-        super.setUp();
+        SCAContainer.start("PropertyTest.composite");
         abService = CurrentCompositeContext.getContext().locateService(ABComponent.class, "ABComponent");
         cdService = CurrentCompositeContext.getContext().locateService(CDComponent.class, "CDComponent");    
         abcdService = CurrentCompositeContext.getContext().locateService(ABCDComponent.class, "ABCDComponent");
         propertyService = CurrentCompositeContext.getContext().locateService(PropertyComponent.class, "PropertyComponent");
+    }
+    
+    protected void tearDown() throws Exception {
+    	SCAContainer.stop();
     }
 }

Added: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/specTest/src/main/resources/CompositeTest.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/testing/sca/itest/specTest/src/main/resources/CompositeTest.composite?view=auto&rev=513168
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/testing/sca/itest/specTest/src/main/resources/CompositeTest.composite (added)
+++ incubator/tuscany/branches/sca-java-integration/testing/sca/itest/specTest/src/main/resources/CompositeTest.composite Wed Feb 28 22:16:54 2007
@@ -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.
+-->
+<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+	   xmlns:foo="http://foo" 
+           name="CompositeTest">
+   
+    <include name="myTotalService" scdlLocation="myTotalService.composite"/>
+    <include name="myListService" scdlLocation="myListService.composite"/>
+    <include name="mySimpleServiceInRecursive" scdlLocation="mySimpleServiceInRecursive.composite"/>
+    <include name="myServiceInRecursive" scdlLocation="myServiceInRecursive.composite"/>
+    <include name="mySimpleServiceInRecursive2" scdlLocation="mySimpleServiceInRecursive2.composite"/>
+    <include name="MyTotalServiceInRecursive" scdlLocation="myTotalServiceInRecursive.composite"/>
+    <include name="MyTotalServiceInRecursiveForReferenceOverride" scdlLocation="myTotalServiceInRecursiveForReferenceOverride.composite"/>
+    
+    
+</composite>

Propchange: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/specTest/src/main/resources/CompositeTest.composite
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/specTest/src/main/resources/CompositeTest.composite
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/specTest/src/main/resources/myListService.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/testing/sca/itest/specTest/src/main/resources/myListService.composite?view=auto&rev=513168
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/testing/sca/itest/specTest/src/main/resources/myListService.composite (added)
+++ incubator/tuscany/branches/sca-java-integration/testing/sca/itest/specTest/src/main/resources/myListService.composite Wed Feb 28 22:16:54 2007
@@ -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.
+-->
+<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+	   xmlns:foo="http://foo" 
+           name="MyListServiceTest">
+   
+    <component name="MyNewListService">
+        <implementation.java class="org.apache.tuscany.sca.test.spec.impl.MyListServiceImpl"/>
+        <!-- 
+		<reference name="myListServiceList">MyNCService/MyListService</reference>
+		<reference name="myListServiceArray">MyListServiceFor2006/MyListService</reference>
+         -->
+		<property name="serviceYear">2007</property>
+    </component>
+    
+   
+</composite>

Propchange: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/specTest/src/main/resources/myListService.composite
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/specTest/src/main/resources/myListService.composite
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/specTest/src/main/resources/myServiceInComposite.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/testing/sca/itest/specTest/src/main/resources/myServiceInComposite.composite?view=auto&rev=513168
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/testing/sca/itest/specTest/src/main/resources/myServiceInComposite.composite (added)
+++ incubator/tuscany/branches/sca-java-integration/testing/sca/itest/specTest/src/main/resources/myServiceInComposite.composite Wed Feb 28 22:16:54 2007
@@ -0,0 +1,53 @@
+<?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.
+-->
+<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+	   xmlns:foo="http://foo" 
+           name="MyServiceInCompositeTest">
+   
+    <service name="MyService">
+        <interface.java interface="org.apache.tuscany.sca.test.spec.MyService"/>
+        <reference>MyServiceComponent/MyService</reference>	   
+    </service>
+
+
+ 	<service name="MyListService">
+        <interface.java interface="org.apache.tuscany.sca.test.spec.MyListService"/>
+        <reference>MyServiceComponent/MyListService</reference>	   
+    </service>
+
+
+ 	<service name="MyListServiceByYear">
+        <interface.java interface="org.apache.tuscany.sca.test.spec.MyListServiceByYear"/>
+        <reference>MyServiceComponent/MyListServiceByYear</reference>	   
+    </service>
+
+
+ 	<service name="MyServiceByDate">
+        <interface.java interface="org.apache.tuscany.sca.test.spec.MyServiceByDate"/>
+        <reference>MyServiceComponent/MyServiceByDate</reference>	   
+    </service>
+
+    <component name="MyServiceComponent">
+        <implementation.java class="org.apache.tuscany.sca.test.spec.impl.MyServiceImpl"/>
+		<property name="location">CARY</property>
+		<property name="year">2007</property>
+    </component>
+    
+</composite>

Propchange: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/specTest/src/main/resources/myServiceInComposite.composite
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/specTest/src/main/resources/myServiceInComposite.composite
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/specTest/src/main/resources/myServiceInRecursive.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/testing/sca/itest/specTest/src/main/resources/myServiceInRecursive.composite?view=auto&rev=513168
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/testing/sca/itest/specTest/src/main/resources/myServiceInRecursive.composite (added)
+++ incubator/tuscany/branches/sca-java-integration/testing/sca/itest/specTest/src/main/resources/myServiceInRecursive.composite Wed Feb 28 22:16:54 2007
@@ -0,0 +1,53 @@
+<?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.
+-->
+<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+	   xmlns:foo="http://foo" 
+           name="MyServiceInRecursiveTest">
+
+  <service name="MyServiceInRecursiveMyService">
+        <interface.java interface="org.apache.tuscany.sca.test.spec.MyService"/>
+        <reference>MyServiceInRecursive/MyService</reference>	   
+    </service>
+
+
+ 	<service name="MyServiceInRecursiveMyListService">
+        <interface.java interface="org.apache.tuscany.sca.test.spec.MyListService"/>
+        <reference>MyServiceInRecursive/MyListService</reference>	   
+    </service>
+
+
+ 	<service name="MyServiceInRecursiveMyListServiceByYear">
+        <interface.java interface="org.apache.tuscany.sca.test.spec.MyListServiceByYear"/>
+        <reference>MyServiceInRecursive/MyListServiceByYear</reference>	   
+    </service>
+
+
+ 	<service name="MyServiceInRecursiveMyServiceByDate">
+        <interface.java interface="org.apache.tuscany.sca.test.spec.MyServiceByDate"/>
+        <reference>MyServiceInRecursive/MyServiceByDate</reference>	   
+    </service>
+
+   
+    <component name="MyServiceInRecursive">
+        <implementation.composite scdlLocation="myServiceInComposite.composite"/>
+    </component>
+    
+    
+</composite>

Propchange: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/specTest/src/main/resources/myServiceInRecursive.composite
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/specTest/src/main/resources/myServiceInRecursive.composite
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/specTest/src/main/resources/mySimpleService.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/testing/sca/itest/specTest/src/main/resources/mySimpleService.composite?view=auto&rev=513168
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/testing/sca/itest/specTest/src/main/resources/mySimpleService.composite (added)
+++ incubator/tuscany/branches/sca-java-integration/testing/sca/itest/specTest/src/main/resources/mySimpleService.composite Wed Feb 28 22:16:54 2007
@@ -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.
+-->
+<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+	   xmlns:foo="http://foo" 
+           name="MySimpleServiceTest">
+   
+    <service name="MyService">
+        <interface.java interface="org.apache.tuscany.sca.test.spec.MyService"/>
+        <reference>MyServiceComponent/MyService</reference>	   
+    </service>
+
+    <component name="MyServiceComponent">
+        <implementation.java class="org.apache.tuscany.sca.test.spec.impl.MyServiceImpl"/>
+		<property name="location">CARY</property>
+		<property name="year">2007</property>
+    </component>
+    
+</composite>

Propchange: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/specTest/src/main/resources/mySimpleService.composite
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/specTest/src/main/resources/mySimpleService.composite
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/specTest/src/main/resources/mySimpleServiceInRecursive.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/testing/sca/itest/specTest/src/main/resources/mySimpleServiceInRecursive.composite?view=auto&rev=513168
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/testing/sca/itest/specTest/src/main/resources/mySimpleServiceInRecursive.composite (added)
+++ incubator/tuscany/branches/sca-java-integration/testing/sca/itest/specTest/src/main/resources/mySimpleServiceInRecursive.composite Wed Feb 28 22:16:54 2007
@@ -0,0 +1,48 @@
+<?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.
+-->
+<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+	   xmlns:foo="http://foo" 
+           name="MySimpleServiceInRecursiveTest">
+   
+    <service name="MySimpleService">
+        <interface.java interface="org.apache.tuscany.sca.test.spec.MyService"/>
+        <reference>MySimpleServiceInRecursive/MyService</reference>	   
+    </service>
+
+   
+    <service name="MySimpleServiceNo" override="no">
+        <interface.java interface="org.apache.tuscany.sca.test.spec.MyService"/>
+        <reference>MySimpleServiceInRecursive/MyService</reference>	   
+    </service>
+
+    <service name="MySimpleServiceMay" override="may">
+        <interface.java interface="org.apache.tuscany.sca.test.spec.MyService"/>
+        <reference>MySimpleServiceInRecursive/MyService</reference>	   
+    </service>
+
+    <service name="MySimpleServiceMust" override="must">
+        <interface.java interface="org.apache.tuscany.sca.test.spec.MyService"/>
+        <reference>MySimpleServiceInRecursive/MyService</reference>	   
+    </service>
+   
+    <component name="MySimpleServiceInRecursive">
+        <implementation.composite scdlLocation="mySimpleService.composite"/>
+    </component>
+</composite>

Propchange: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/specTest/src/main/resources/mySimpleServiceInRecursive.composite
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/specTest/src/main/resources/mySimpleServiceInRecursive.composite
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/specTest/src/main/resources/mySimpleServiceInRecursive2.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/testing/sca/itest/specTest/src/main/resources/mySimpleServiceInRecursive2.composite?view=auto&rev=513168
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/testing/sca/itest/specTest/src/main/resources/mySimpleServiceInRecursive2.composite (added)
+++ incubator/tuscany/branches/sca-java-integration/testing/sca/itest/specTest/src/main/resources/mySimpleServiceInRecursive2.composite Wed Feb 28 22:16:54 2007
@@ -0,0 +1,47 @@
+<?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.
+-->
+<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+	   xmlns:foo="http://foo" 
+           name="MySimpleServiceInRecursiveTest">
+   
+    <service name="MySimpleServiceDefault">
+        <interface.java interface="org.apache.tuscany.sca.test.spec.MyService"/>
+        <reference>MySimpleServiceInRecursiveComponent/MySimpleService</reference>	   
+    </service>
+
+    <service name="MySimpleServiceNo" override="no">
+        <interface.java interface="org.apache.tuscany.sca.test.spec.MyService"/>
+        <reference>MySimpleServiceInRecursiveComponent/MySimpleServiceNo</reference>	   
+    </service>
+
+    <service name="MySimpleServiceMay" override="may">
+        <interface.java interface="org.apache.tuscany.sca.test.spec.MyService"/>
+        <reference>MySimpleServiceInRecursiveComponent/MySimpleServiceMay</reference>	   
+    </service>
+
+    <service name="MySimpleServiceMust" override="must">
+        <interface.java interface="org.apache.tuscany.sca.test.spec.MyService"/>
+        <reference>MySimpleServiceInRecursiveComponent/MySimpleServiceMust</reference>	   
+    </service>
+   
+    <component name="MySimpleServiceInRecursiveComponent">
+        <implementation.composite scdlLocation="mySimpleServiceInRecursive.composite"/>
+    </component>
+</composite>

Propchange: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/specTest/src/main/resources/mySimpleServiceInRecursive2.composite
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/specTest/src/main/resources/mySimpleServiceInRecursive2.composite
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/specTest/src/main/resources/myTotalService.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/testing/sca/itest/specTest/src/main/resources/myTotalService.composite?view=auto&rev=513168
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/testing/sca/itest/specTest/src/main/resources/myTotalService.composite (added)
+++ incubator/tuscany/branches/sca-java-integration/testing/sca/itest/specTest/src/main/resources/myTotalService.composite Wed Feb 28 22:16:54 2007
@@ -0,0 +1,32 @@
+<?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.
+-->
+<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+	   xmlns:foo="http://foo" 
+           name="MyTotalServiceTest">
+   
+    <include name="myservice" scdlLocation="myservice.composite"/>
+    
+    <component name="MyTotalService">
+        <implementation.java class="org.apache.tuscany.sca.test.spec.impl.MyTotalServiceImpl"/>
+		<reference name="myService">MyNCService/MyService</reference>
+		<reference name="myListService">MyNCService/MyListService</reference>
+    </component>
+    
+</composite>

Propchange: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/specTest/src/main/resources/myTotalService.composite
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/specTest/src/main/resources/myTotalService.composite
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/specTest/src/main/resources/myTotalServiceInComposite.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/testing/sca/itest/specTest/src/main/resources/myTotalServiceInComposite.composite?view=auto&rev=513168
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/testing/sca/itest/specTest/src/main/resources/myTotalServiceInComposite.composite (added)
+++ incubator/tuscany/branches/sca-java-integration/testing/sca/itest/specTest/src/main/resources/myTotalServiceInComposite.composite Wed Feb 28 22:16:54 2007
@@ -0,0 +1,43 @@
+<?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.
+-->
+<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+	   xmlns:foo="http://foo" 
+           name="MyTotalServiceReferenceOverrideTest">
+   
+ 	<service name="MyTotalService">
+        <interface.java interface="org.apache.tuscany.sca.test.spec.MyTotalService"/>
+        <reference>MyTotalServiceComponent</reference>	   
+    </service>
+   
+    <component name="MyTotalServiceComponent">
+        <implementation.java class="org.apache.tuscany.sca.test.spec.impl.MyTotalServiceImpl"/>
+		<reference name="myService">MyServiceRef</reference>
+		<reference name="myListService">MyListServiceRef</reference>
+    </component>
+    
+    <reference name="MyServiceRef">
+        <interface.java interface="org.apache.tuscany.sca.test.spec.MyService"/>
+    </reference>
+
+    <reference name="MyListServiceRef">
+        <interface.java interface="org.apache.tuscany.sca.test.spec.MyListService"/>
+    </reference>
+
+</composite>

Propchange: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/specTest/src/main/resources/myTotalServiceInComposite.composite
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/specTest/src/main/resources/myTotalServiceInComposite.composite
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/specTest/src/main/resources/myTotalServiceInCompositeForReferenceOverride.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/testing/sca/itest/specTest/src/main/resources/myTotalServiceInCompositeForReferenceOverride.composite?view=auto&rev=513168
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/testing/sca/itest/specTest/src/main/resources/myTotalServiceInCompositeForReferenceOverride.composite (added)
+++ incubator/tuscany/branches/sca-java-integration/testing/sca/itest/specTest/src/main/resources/myTotalServiceInCompositeForReferenceOverride.composite Wed Feb 28 22:16:54 2007
@@ -0,0 +1,81 @@
+<?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.
+-->
+<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+	   xmlns:foo="http://foo" 
+           name="MyTotalServiceTest">
+   
+ 	<service name="MyTotalServiceNo">
+        <interface.java interface="org.apache.tuscany.sca.test.spec.MyTotalService"/>
+        <reference>MyTotalServiceComponentNo</reference>	   
+    </service>
+   
+    <component name="MyTotalServiceComponentNo">
+        <implementation.java class="org.apache.tuscany.sca.test.spec.impl.MyTotalServiceImpl"/>
+		<reference name="myService">MyServiceRefNo</reference>
+		<reference name="myListService">MyListServiceRefNo</reference>
+    </component>
+    
+    <reference name="MyServiceRefNo" override="no">
+        <interface.java interface="org.apache.tuscany.sca.test.spec.MyService"/>
+    </reference>
+
+    <reference name="MyListServiceRefNo" override="no">
+        <interface.java interface="org.apache.tuscany.sca.test.spec.MyListService"/>
+    </reference>
+
+ 	<service name="MyTotalServiceMay">
+        <interface.java interface="org.apache.tuscany.sca.test.spec.MyTotalService"/>
+        <reference>MyTotalServiceComponentMay</reference>	   
+    </service>
+   
+    <component name="MyTotalServiceComponentMay">
+        <implementation.java class="org.apache.tuscany.sca.test.spec.impl.MyTotalServiceImpl"/>
+		<reference name="myService">MyServiceRefMay</reference>
+		<reference name="myListService">MyListServiceRefMay</reference>
+    </component>
+    
+    <reference name="MyServiceRefMay" override="may">
+        <interface.java interface="org.apache.tuscany.sca.test.spec.MyService"/>
+    </reference>
+
+    <reference name="MyListServiceRefMay" override="may">
+        <interface.java interface="org.apache.tuscany.sca.test.spec.MyListService"/>
+    </reference>
+
+ 	<service name="MyTotalServiceMust">
+        <interface.java interface="org.apache.tuscany.sca.test.spec.MyTotalService"/>
+        <reference>MyTotalServiceComponentMust</reference>	   
+    </service>
+   
+    <component name="MyTotalServiceComponentMust">
+        <implementation.java class="org.apache.tuscany.sca.test.spec.impl.MyTotalServiceImpl"/>
+		<reference name="myService">MyServiceRefMust</reference>
+		<reference name="myListService">MyListServiceRefMust</reference>
+    </component>
+    
+    <reference name="MyServiceRefMust" override="must">
+        <interface.java interface="org.apache.tuscany.sca.test.spec.MyService"/>
+    </reference>
+
+    <reference name="MyListServiceRefMust" override="must">
+        <interface.java interface="org.apache.tuscany.sca.test.spec.MyListService"/>
+    </reference>
+
+</composite>

Propchange: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/specTest/src/main/resources/myTotalServiceInCompositeForReferenceOverride.composite
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/specTest/src/main/resources/myTotalServiceInCompositeForReferenceOverride.composite
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/specTest/src/main/resources/myTotalServiceInRecursive.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/testing/sca/itest/specTest/src/main/resources/myTotalServiceInRecursive.composite?view=auto&rev=513168
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/testing/sca/itest/specTest/src/main/resources/myTotalServiceInRecursive.composite (added)
+++ incubator/tuscany/branches/sca-java-integration/testing/sca/itest/specTest/src/main/resources/myTotalServiceInRecursive.composite Wed Feb 28 22:16:54 2007
@@ -0,0 +1,62 @@
+<?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.
+-->
+<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+	   xmlns:foo="http://foo" 
+           name="MyTotalServiceInRecursiveTest">
+   
+    <component name="MyServiceInComposite">
+        <implementation.composite scdlLocation="myServiceInComposite.composite"/>
+    </component>
+    
+    <component name="MyTotalServiceFromRecursive">
+        <implementation.java class="org.apache.tuscany.sca.test.spec.impl.MyTotalServiceImpl"/>
+		<reference name="myService">MyServiceInComposite/MyService</reference>
+		<reference name="myListService">MyServiceInComposite/MyListService</reference>
+    </component>
+    
+ 	<service name="MyTotalServiceInCompositeWithRecursiveUseService">
+        <interface.java interface="org.apache.tuscany.sca.test.spec.MyTotalService"/>
+        <reference>MyTotalServiceInCompositeWithRecursive</reference>	   
+    </service>
+   
+ 	<service name="MyTotalServiceInCompositeWithComponentServiceUseService">
+        <interface.java interface="org.apache.tuscany.sca.test.spec.MyTotalService"/>
+        <reference>MyTotalServiceInCompositeWithComponentService</reference>	   
+    </service>
+    
+    <component name="MyTotalServiceInCompositeWithRecursive">
+        <implementation.composite scdlLocation="myTotalServiceInComposite.composite"/>
+		<reference name="MyServiceRef">MyServiceInComposite/MyService</reference>
+		<reference name="MyListServiceRef">MyServiceInComposite/MyListService</reference>
+    </component>
+
+    <component name="MyTotalServiceInCompositeWithComponentService">
+        <implementation.composite scdlLocation="myTotalServiceInComposite.composite"/>
+		<reference name="MyServiceRef">MyServiceInComponent/MyService</reference>
+		<reference name="MyListServiceRef">MyServiceInComponent/MyListService</reference>
+    </component>
+
+    <component name="MyServiceInComponent">
+        <implementation.java class="org.apache.tuscany.sca.test.spec.impl.MyServiceImpl"/>
+		<property name="location">CARY</property>
+		<property name="year">2007</property>
+    </component>
+    
+</composite>

Propchange: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/specTest/src/main/resources/myTotalServiceInRecursive.composite
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/specTest/src/main/resources/myTotalServiceInRecursive.composite
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/specTest/src/main/resources/myTotalServiceInRecursiveForReferenceOverride.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/testing/sca/itest/specTest/src/main/resources/myTotalServiceInRecursiveForReferenceOverride.composite?view=auto&rev=513168
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/testing/sca/itest/specTest/src/main/resources/myTotalServiceInRecursiveForReferenceOverride.composite (added)
+++ incubator/tuscany/branches/sca-java-integration/testing/sca/itest/specTest/src/main/resources/myTotalServiceInRecursiveForReferenceOverride.composite Wed Feb 28 22:16:54 2007
@@ -0,0 +1,55 @@
+<?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.
+-->
+<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+	   xmlns:foo="http://foo" 
+           name="MyTotalServiceInRecursiveTest">
+   
+	<service name="MyTotalServiceNo">
+        <interface.java interface="org.apache.tuscany.sca.test.spec.MyTotalService"/>
+        <reference>MyTotalServiceForReferenceComponent/MyTotalServiceNo</reference>	   
+    </service>
+
+	<service name="MyTotalServiceMay">
+        <interface.java interface="org.apache.tuscany.sca.test.spec.MyTotalService"/>
+        <reference>MyTotalServiceForReferenceComponent/MyTotalServiceMay</reference>	   
+    </service>
+
+	<service name="MyTotalServiceMust">
+        <interface.java interface="org.apache.tuscany.sca.test.spec.MyTotalService"/>
+        <reference>MyTotalServiceForReferenceComponent/MyTotalServiceMust</reference>	   
+    </service>
+      
+    <component name="MyTotalServiceForReferenceComponent">
+        <implementation.composite scdlLocation="myTotalServiceInCompositeForReferenceOverride.composite"/>
+		<reference name="MyServiceRefNo">MyServiceInComposite/MyService</reference>
+		<reference name="MyListServiceRefNo">MyServiceInComposite/MyListService</reference>
+		<reference name="MyServiceRefMay">MyServiceInComposite/MyService</reference>
+		<reference name="MyListServiceRefMay">MyServiceInComposite/MyListService</reference>
+		<reference name="MyServiceRefMust">MyServiceInComposite/MyService</reference>
+		<reference name="MyListServiceRefMust">MyServiceInComposite/MyListService</reference>
+    </component>
+
+    <component name="MyServiceInComponent">
+        <implementation.java class="org.apache.tuscany.sca.test.spec.impl.MyServiceImpl"/>
+		<property name="location">CARY</property>
+		<property name="year">2007</property>
+    </component>
+    
+</composite>

Propchange: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/specTest/src/main/resources/myTotalServiceInRecursiveForReferenceOverride.composite
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/specTest/src/main/resources/myTotalServiceInRecursiveForReferenceOverride.composite
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/specTest/src/main/resources/myservice.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/testing/sca/itest/specTest/src/main/resources/myservice.composite?view=auto&rev=513168
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/testing/sca/itest/specTest/src/main/resources/myservice.composite (added)
+++ incubator/tuscany/branches/sca-java-integration/testing/sca/itest/specTest/src/main/resources/myservice.composite Wed Feb 28 22:16:54 2007
@@ -0,0 +1,51 @@
+<?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.
+-->
+<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+	   xmlns:foo="http://foo" 
+           name="MyServiceComposite">
+   
+    <component name="MyService">
+        <implementation.java class="org.apache.tuscany.sca.test.spec.impl.MyServiceImpl"/>
+    </component>
+    
+    <component name="MyNCService">
+        <implementation.java class="org.apache.tuscany.sca.test.spec.impl.MyServiceImpl"/>
+		<property name="location">NC</property>
+		<property name="year">2007</property>
+    </component>
+
+    <component name="MyServiceByDate">
+        <implementation.java class="org.apache.tuscany.sca.test.spec.impl.MyServiceImpl"/>
+    </component>
+
+    <component name="MyListService">
+        <implementation.java class="org.apache.tuscany.sca.test.spec.impl.MyServiceImpl"/>
+    </component>
+
+    <component name="MyListServiceFor2006">
+        <implementation.java class="org.apache.tuscany.sca.test.spec.impl.MyServiceImpl"/>
+		<property name="year">2006</property>
+    </component>
+
+    <component name="MyListServiceByYear">
+        <implementation.java class="org.apache.tuscany.sca.test.spec.impl.MyServiceImpl"/>
+    </component>
+
+</composite>

Propchange: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/specTest/src/main/resources/myservice.composite
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/specTest/src/main/resources/myservice.composite
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Modified: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/specTest/src/test/java/org/apache/tuscany/sca/test/spec/ComponentServiceReferenceListTest.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/testing/sca/itest/specTest/src/test/java/org/apache/tuscany/sca/test/spec/ComponentServiceReferenceListTest.java?view=diff&rev=513168&r1=513167&r2=513168
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/testing/sca/itest/specTest/src/test/java/org/apache/tuscany/sca/test/spec/ComponentServiceReferenceListTest.java (original)
+++ incubator/tuscany/branches/sca-java-integration/testing/sca/itest/specTest/src/test/java/org/apache/tuscany/sca/test/spec/ComponentServiceReferenceListTest.java Wed Feb 28 22:16:54 2007
@@ -18,15 +18,13 @@
  */
 package org.apache.tuscany.sca.test.spec;
 
-import org.apache.tuscany.sca.test.spec.MyListService;
-import org.apache.tuscany.sca.test.spec.MyListServiceByYear;
-import org.apache.tuscany.test.SCATestCase;
+import junit.framework.TestCase;
+
+import org.apache.tuscany.api.SCAContainer;
 import org.osoa.sca.CompositeContext;
 import org.osoa.sca.CurrentCompositeContext;
 
-import junit.framework.TestCase;
-
-public class ComponentServiceReferenceListTest extends SCATestCase {
+public class ComponentServiceReferenceListTest extends TestCase {
     private MyListService myListService;
     private MyListServiceByYear myListServiceByYear;
 
@@ -43,9 +41,13 @@
     }
 
     protected void setUp() throws Exception {
-        super.setUp();
+    	SCAContainer.start("CompositeTest.composite");
         context = CurrentCompositeContext.getContext();
         myListService = context.locateService(MyListService.class, "MyNewListService");
         myListServiceByYear = context.locateService(MyListServiceByYear.class, "MyNewListService");
+    }
+    
+    protected void tearDown() throws Exception {
+    	SCAContainer.stop();
     }
 }

Modified: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/specTest/src/test/java/org/apache/tuscany/sca/test/spec/ComponentServiceReferenceTest.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/testing/sca/itest/specTest/src/test/java/org/apache/tuscany/sca/test/spec/ComponentServiceReferenceTest.java?view=diff&rev=513168&r1=513167&r2=513168
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/testing/sca/itest/specTest/src/test/java/org/apache/tuscany/sca/test/spec/ComponentServiceReferenceTest.java (original)
+++ incubator/tuscany/branches/sca-java-integration/testing/sca/itest/specTest/src/test/java/org/apache/tuscany/sca/test/spec/ComponentServiceReferenceTest.java Wed Feb 28 22:16:54 2007
@@ -20,15 +20,14 @@
 
 import java.util.Date;
 
-import org.apache.tuscany.sca.test.spec.MyTotalService;
-import org.apache.tuscany.test.SCATestCase;
+import junit.framework.TestCase;
+
+import org.apache.tuscany.api.SCAContainer;
 import org.osoa.sca.CompositeContext;
 import org.osoa.sca.CurrentCompositeContext;
 import org.osoa.sca.RequestContext;
 
-import junit.framework.TestCase;
-
-public class ComponentServiceReferenceTest extends SCATestCase {
+public class ComponentServiceReferenceTest extends TestCase {
     private MyTotalService myService;
     private CompositeContext context;
 
@@ -76,8 +75,12 @@
     }
 
     protected void setUp() throws Exception {
-        super.setUp();
+    	SCAContainer.start("CompositeTest.composite");
         context = CurrentCompositeContext.getContext();
         myService = context.locateService(MyTotalService.class, "MyTotalService");
+    }
+    
+    protected void tearDown() throws Exception {
+    	SCAContainer.stop();
     }
 }

Modified: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/specTest/src/test/java/org/apache/tuscany/sca/test/spec/ComponentTest.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/testing/sca/itest/specTest/src/test/java/org/apache/tuscany/sca/test/spec/ComponentTest.java?view=diff&rev=513168&r1=513167&r2=513168
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/testing/sca/itest/specTest/src/test/java/org/apache/tuscany/sca/test/spec/ComponentTest.java (original)
+++ incubator/tuscany/branches/sca-java-integration/testing/sca/itest/specTest/src/test/java/org/apache/tuscany/sca/test/spec/ComponentTest.java Wed Feb 28 22:16:54 2007
@@ -20,19 +20,14 @@
 
 import java.util.Date;
 
+import junit.framework.TestCase;
+
 import org.apache.tuscany.api.SCAContainer;
-import org.apache.tuscany.sca.test.spec.MyListService;
-import org.apache.tuscany.sca.test.spec.MyListServiceByYear;
-import org.apache.tuscany.sca.test.spec.MyService;
-import org.apache.tuscany.sca.test.spec.MyServiceByDate;
-import org.apache.tuscany.test.SCATestCase;
 import org.osoa.sca.CompositeContext;
 import org.osoa.sca.CurrentCompositeContext;
 import org.osoa.sca.RequestContext;
 
-import junit.framework.TestCase;
-
-public class ComponentTest extends SCATestCase {
+public class ComponentTest extends TestCase {
     private MyService myService;
     private MyServiceByDate myServiceByDate;
     private MyListService myListService;
@@ -97,7 +92,6 @@
     }
 
     protected void setUp() throws Exception {
-        super.setUp();
         SCAContainer.start();
         context = CurrentCompositeContext.getContext();
         myService = context.locateService(MyService.class, "MyService");
@@ -108,9 +102,7 @@
         myListServiceFor2006 = context.locateService(MyListService.class, "MyListServiceFor2006");
     }
     
-    @Override
     protected void tearDown() throws Exception {
     	SCAContainer.stop();
-    	super.tearDown();
     }
 }

Modified: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/specTest/src/test/java/org/apache/tuscany/sca/test/spec/CompositeOneService2LevelTest.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/testing/sca/itest/specTest/src/test/java/org/apache/tuscany/sca/test/spec/CompositeOneService2LevelTest.java?view=diff&rev=513168&r1=513167&r2=513168
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/testing/sca/itest/specTest/src/test/java/org/apache/tuscany/sca/test/spec/CompositeOneService2LevelTest.java (original)
+++ incubator/tuscany/branches/sca-java-integration/testing/sca/itest/specTest/src/test/java/org/apache/tuscany/sca/test/spec/CompositeOneService2LevelTest.java Wed Feb 28 22:16:54 2007
@@ -20,13 +20,12 @@
 
 import junit.framework.TestCase;
 
-import org.apache.tuscany.sca.test.spec.MyService;
-import org.apache.tuscany.test.SCATestCase;
+import org.apache.tuscany.api.SCAContainer;
 import org.osoa.sca.CompositeContext;
 import org.osoa.sca.CurrentCompositeContext;
 import org.osoa.sca.RequestContext;
 
-public class CompositeOneService2LevelTest extends SCATestCase {
+public class CompositeOneService2LevelTest extends TestCase {
     private MyService myService;
     private MyService myServiceDefault;
     private MyService myServiceNo;
@@ -113,12 +112,16 @@
     }
 
     protected void setUp() throws Exception {
-        super.setUp();
+    	SCAContainer.start("CompositeTest.composite");
         context = CurrentCompositeContext.getContext();
         myService = context.locateService(MyService.class, "MySimpleServiceInRecursiveComponent");
         myServiceDefault = context.locateService(MyService.class, "MySimpleServiceDefault");
         myServiceNo = context.locateService(MyService.class, "MySimpleServiceNo");
         myServiceMay = context.locateService(MyService.class, "MySimpleServiceMay");
         myServiceMust = context.locateService(MyService.class, "MySimpleServiceMust");
+    }
+    
+    protected void tearDown() throws Exception {
+    	SCAContainer.stop();
     }
 }

Modified: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/specTest/src/test/java/org/apache/tuscany/sca/test/spec/CompositeOneServiceTest.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/testing/sca/itest/specTest/src/test/java/org/apache/tuscany/sca/test/spec/CompositeOneServiceTest.java?view=diff&rev=513168&r1=513167&r2=513168
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/testing/sca/itest/specTest/src/test/java/org/apache/tuscany/sca/test/spec/CompositeOneServiceTest.java (original)
+++ incubator/tuscany/branches/sca-java-integration/testing/sca/itest/specTest/src/test/java/org/apache/tuscany/sca/test/spec/CompositeOneServiceTest.java Wed Feb 28 22:16:54 2007
@@ -20,13 +20,12 @@
 
 import junit.framework.TestCase;
 
-import org.apache.tuscany.sca.test.spec.MyService;
-import org.apache.tuscany.test.SCATestCase;
+import org.apache.tuscany.api.SCAContainer;
 import org.osoa.sca.CompositeContext;
 import org.osoa.sca.CurrentCompositeContext;
 import org.osoa.sca.RequestContext;
 
-public class CompositeOneServiceTest extends SCATestCase {
+public class CompositeOneServiceTest extends TestCase {
     private MyService myService;
     private CompositeContext context;
 
@@ -72,8 +71,12 @@
     }
 
     protected void setUp() throws Exception {
-        super.setUp();
+    	SCAContainer.start("CompositeTest.composite");
         context = CurrentCompositeContext.getContext();
         myService = context.locateService(MyService.class, "MySimpleServiceInRecursive");
+    }
+    
+    protected void tearDown() throws Exception {
+    	SCAContainer.stop();
     }
 }

Modified: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/specTest/src/test/java/org/apache/tuscany/sca/test/spec/CompositeServiceReferenceForRefOverrideTest.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/testing/sca/itest/specTest/src/test/java/org/apache/tuscany/sca/test/spec/CompositeServiceReferenceForRefOverrideTest.java?view=diff&rev=513168&r1=513167&r2=513168
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/testing/sca/itest/specTest/src/test/java/org/apache/tuscany/sca/test/spec/CompositeServiceReferenceForRefOverrideTest.java (original)
+++ incubator/tuscany/branches/sca-java-integration/testing/sca/itest/specTest/src/test/java/org/apache/tuscany/sca/test/spec/CompositeServiceReferenceForRefOverrideTest.java Wed Feb 28 22:16:54 2007
@@ -20,14 +20,13 @@
 
 import java.util.Date;
 
-import org.apache.tuscany.sca.test.spec.MyTotalService;
-import org.apache.tuscany.test.SCATestCase;
+import junit.framework.TestCase;
+
+import org.apache.tuscany.api.SCAContainer;
 import org.osoa.sca.CompositeContext;
 import org.osoa.sca.CurrentCompositeContext;
 
-import junit.framework.TestCase;
-
-public class CompositeServiceReferenceForRefOverrideTest extends SCATestCase {
+public class CompositeServiceReferenceForRefOverrideTest extends TestCase {
     private MyTotalService myService1;
     private MyTotalService myService2;
     private MyTotalService myService3;
@@ -71,10 +70,14 @@
     }
 
     protected void setUp() throws Exception {
-        super.setUp();
+    	SCAContainer.start("CompositeTest.composite");
         context = CurrentCompositeContext.getContext();
         myService1 = context.locateService(MyTotalService.class, "MyTotalServiceNo");
         myService2 = context.locateService(MyTotalService.class, "MyTotalServiceMay");
         myService3 = context.locateService(MyTotalService.class, "MyTotalServiceMust");
+    }
+    
+    protected void tearDown() throws Exception {
+    	SCAContainer.stop();
     }
 }

Modified: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/specTest/src/test/java/org/apache/tuscany/sca/test/spec/CompositeServiceReferenceTest.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/testing/sca/itest/specTest/src/test/java/org/apache/tuscany/sca/test/spec/CompositeServiceReferenceTest.java?view=diff&rev=513168&r1=513167&r2=513168
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/testing/sca/itest/specTest/src/test/java/org/apache/tuscany/sca/test/spec/CompositeServiceReferenceTest.java (original)
+++ incubator/tuscany/branches/sca-java-integration/testing/sca/itest/specTest/src/test/java/org/apache/tuscany/sca/test/spec/CompositeServiceReferenceTest.java Wed Feb 28 22:16:54 2007
@@ -20,14 +20,13 @@
 
 import java.util.Date;
 
-import org.apache.tuscany.sca.test.spec.MyTotalService;
-import org.apache.tuscany.test.SCATestCase;
+import junit.framework.TestCase;
+
+import org.apache.tuscany.api.SCAContainer;
 import org.osoa.sca.CompositeContext;
 import org.osoa.sca.CurrentCompositeContext;
 
-import junit.framework.TestCase;
-
-public class CompositeServiceReferenceTest extends SCATestCase {
+public class CompositeServiceReferenceTest extends TestCase {
     private MyTotalService myService1;
     private MyTotalService myService2;
     private MyTotalService myService3;
@@ -80,7 +79,7 @@
     }
 
     protected void setUp() throws Exception {
-        super.setUp();
+    	SCAContainer.start("CompositeTest.composite");
         context = CurrentCompositeContext.getContext();
         myService1 = context.locateService(MyTotalService.class, "MyTotalServiceFromRecursive");
         myService2 = context.locateService(MyTotalService.class, "MyTotalServiceInCompositeWithRecursive");
@@ -88,5 +87,9 @@
         myService4 = context.locateService(MyTotalService.class, "MyTotalServiceInCompositeWithRecursiveUseService");
         myService5 =
             context.locateService(MyTotalService.class, "MyTotalServiceInCompositeWithComponentServiceUseService");
+    }
+    
+    protected void tearDown() throws Exception {
+    	SCAContainer.stop();
     }
 }

Modified: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/specTest/src/test/java/org/apache/tuscany/sca/test/spec/CompositeTest.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/testing/sca/itest/specTest/src/test/java/org/apache/tuscany/sca/test/spec/CompositeTest.java?view=diff&rev=513168&r1=513167&r2=513168
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/testing/sca/itest/specTest/src/test/java/org/apache/tuscany/sca/test/spec/CompositeTest.java (original)
+++ incubator/tuscany/branches/sca-java-integration/testing/sca/itest/specTest/src/test/java/org/apache/tuscany/sca/test/spec/CompositeTest.java Wed Feb 28 22:16:54 2007
@@ -20,18 +20,14 @@
 
 import java.util.Date;
 
-import org.apache.tuscany.sca.test.spec.MyListService;
-import org.apache.tuscany.sca.test.spec.MyListServiceByYear;
-import org.apache.tuscany.sca.test.spec.MyService;
-import org.apache.tuscany.sca.test.spec.MyServiceByDate;
-import org.apache.tuscany.test.SCATestCase;
+import junit.framework.TestCase;
+
+import org.apache.tuscany.api.SCAContainer;
 import org.osoa.sca.CompositeContext;
 import org.osoa.sca.CurrentCompositeContext;
 import org.osoa.sca.RequestContext;
 
-import junit.framework.TestCase;
-
-public class CompositeTest extends SCATestCase {
+public class CompositeTest extends TestCase {
     private MyService myService;
     private MyServiceByDate myServiceByDate;
     private MyListService myListService;
@@ -83,12 +79,16 @@
     }
 
     protected void setUp() throws Exception {
-        super.setUp();
+    	SCAContainer.start("CompositeTest.composite");
         context = CurrentCompositeContext.getContext();
         myService = context.locateService(MyService.class, "MyServiceInRecursiveMyService");
         myServiceByDate = context.locateService(MyServiceByDate.class, "MyServiceInRecursiveMyServiceByDate");
         myListService = context.locateService(MyListService.class, "MyServiceInRecursiveMyListService");
         myListServiceByYear =
             context.locateService(MyListServiceByYear.class, "MyServiceInRecursiveMyListServiceByYear");
+    }
+    
+    protected void tearDown() throws Exception {
+    	SCAContainer.stop();
     }
 }



---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org