Author: rfeng
Date: Mon Aug 20 16:45:54 2007
New Revision: 567880

URL: http://svn.apache.org/viewvc?rev=567880&view=rev
Log:
Fix the pom.xml and composite files

Modified:
    incubator/tuscany/java/sca/itest/exceptions-cross-binding-ws/pom.xml
    
incubator/tuscany/java/sca/itest/exceptions-cross-binding-ws/src/main/resources/ExceptionTest.composite
    
incubator/tuscany/java/sca/itest/exceptions-cross-binding-ws/src/main/resources/intracomposite.composite
    
incubator/tuscany/java/sca/itest/exceptions-cross-binding-ws/src/test/java/org/apache/tuscany/sca/test/exceptions/IntraCompositeTestCaseFIXME.java
    incubator/tuscany/java/sca/itest/exceptions-cross-binding/pom.xml
    
incubator/tuscany/java/sca/itest/exceptions-cross-binding/src/main/resources/ExceptionTest.composite
    
incubator/tuscany/java/sca/itest/exceptions-cross-binding/src/main/resources/intracomposite.composite
    
incubator/tuscany/java/sca/itest/exceptions-cross-binding/src/test/java/org/apache/tuscany/sca/test/exceptions/IntraCompositeTestCaseFIXME.java

Modified: incubator/tuscany/java/sca/itest/exceptions-cross-binding-ws/pom.xml
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/exceptions-cross-binding-ws/pom.xml?rev=567880&r1=567879&r2=567880&view=diff
==============================================================================
--- incubator/tuscany/java/sca/itest/exceptions-cross-binding-ws/pom.xml 
(original)
+++ incubator/tuscany/java/sca/itest/exceptions-cross-binding-ws/pom.xml Mon 
Aug 20 16:45:54 2007
@@ -30,75 +30,90 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-databinding-sdo</artifactId>
-            <version>1.0-incubating-SNAPSHOT</version>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.2</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>com.sun.xml.ws</groupId>
+            <artifactId>jaxws-rt</artifactId>
+            <version>2.1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>javax.jws</groupId>
+            <artifactId>jsr181-api</artifactId>
+            <version>1.0-MR1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>javax.xml.bind</groupId>
+            <artifactId>jaxb-api</artifactId>
+            <version>2.1</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-interface-wsdl</artifactId>
+            <artifactId>tuscany-binding-sca</artifactId>
             <version>1.0-incubating-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
-
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-interface-wsdl-xml</artifactId>
+            <artifactId>tuscany-core-databinding</artifactId>
             <version>1.0-incubating-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
-
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ws-axis2</artifactId>
-            <scope>runtime</scope>
+            <artifactId>tuscany-databinding-jaxb</artifactId>
             <version>1.0-incubating-SNAPSHOT</version>
+            <scope>runtime</scope>
         </dependency>
-
         <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.2</version>
-            <scope>test</scope>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-databinding-sdo</artifactId>
+            <version>1.0-incubating-SNAPSHOT</version>
+            <scope>compile</scope>
         </dependency>
-
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-http-jetty</artifactId>
-            <scope>runtime</scope>
+            <artifactId>tuscany-databinding-axiom</artifactId>
             <version>1.0-incubating-SNAPSHOT</version>
+            <scope>compile</scope>
         </dependency>
-
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-databinding-jaxb</artifactId>
+            <artifactId>tuscany-host-embedded</artifactId>
             <version>1.0-incubating-SNAPSHOT</version>
+            <scope>compile</scope>
         </dependency>
-
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-databinding-axiom</artifactId>
+            <artifactId>tuscany-implementation-java-runtime</artifactId>
             <version>1.0-incubating-SNAPSHOT</version>
+            <scope>compile</scope>
         </dependency>
-
         <dependency>
-            <groupId>com.sun.xml.ws</groupId>
-            <artifactId>jaxws-rt</artifactId>
-            <version>2.1</version>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-interface-java-xml</artifactId>
+            <version>1.0-incubating-SNAPSHOT</version>
+            <scope>compile</scope>
         </dependency>
-
         <dependency>
-            <groupId>javax.jws</groupId>
-            <artifactId>jsr181-api</artifactId>
-            <version>1.0-MR1</version>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-http-jetty</artifactId>
+            <version>1.0-incubating-SNAPSHOT</version>
+            <scope>test</scope>
         </dependency>
-
         <dependency>
-            <groupId>javax.xml.bind</groupId>
-            <artifactId>jaxb-api</artifactId>
-            <version>2.1</version>
-        </dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>servlet-api</artifactId>
+            <version>2.5</version>
+            <scope>test</scope>
+        </dependency>        
     </dependencies>
     <build>
         <plugins>

Modified: 
incubator/tuscany/java/sca/itest/exceptions-cross-binding-ws/src/main/resources/ExceptionTest.composite
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/exceptions-cross-binding-ws/src/main/resources/ExceptionTest.composite?rev=567880&r1=567879&r2=567880&view=diff
==============================================================================
--- 
incubator/tuscany/java/sca/itest/exceptions-cross-binding-ws/src/main/resources/ExceptionTest.composite
 (original)
+++ 
incubator/tuscany/java/sca/itest/exceptions-cross-binding-ws/src/main/resources/ExceptionTest.composite
 Mon Aug 20 16:45:54 2007
@@ -1,26 +1,23 @@
 <?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.
+    * 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="ExceptionTest">
-   
-    <include name="intracomposite" scdlLocation="intracomposite.composite"/>
-     
+<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"; xmlns:foo="http://foo"; 
targetNamespace="http://foo";
+    name="ExceptionTest">
+    <include name="foo:intracomposite" />
 </composite>

Modified: 
incubator/tuscany/java/sca/itest/exceptions-cross-binding-ws/src/main/resources/intracomposite.composite
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/exceptions-cross-binding-ws/src/main/resources/intracomposite.composite?rev=567880&r1=567879&r2=567880&view=diff
==============================================================================
--- 
incubator/tuscany/java/sca/itest/exceptions-cross-binding-ws/src/main/resources/intracomposite.composite
 (original)
+++ 
incubator/tuscany/java/sca/itest/exceptions-cross-binding-ws/src/main/resources/intracomposite.composite
 Mon Aug 20 16:45:54 2007
@@ -17,26 +17,32 @@
     * specific language governing permissions and limitations
     * under the License.
 -->
-<composite name="intracomposite" xmlns="http://www.osoa.org/xmlns/sca/1.0"; 
xmlns:dbsdo="http://tuscany.apache.org/xmlns/sca/databinding/sdo/1.0"; 
xmlns:wsdli="http://www.w3.org/2006/01/wsdl-instance";>
-       <!-- dbsdo:import.sdo 
factory="stockexceptiontestservice.scatesttool.ScatesttoolFactory"/ -->
-       
-       <service name="exchangeJaxbService">
-               <interface.java 
class="org.apache.tuscany.sca.test.exceptions.impl.StockExceptionTestJAXB"/>
-               <binding.ws 
wsdlElement="http://scatesttool.stockexceptiontestservice#wsdl.port(StockExceptionTestService/StockExceptionTestServiceSoapPort)"
 wsdlLocation="http://scatesttool.stockexceptiontestservice 
wsdl/StockExceptionTest.wsdl"/>
-               <reference>exchangeJaxbComponent</reference>
-       </service>
-       
-       <component name="exchangeJaxbComponent">
-               <implementation.java 
class="org.apache.tuscany.sca.test.exceptions.impl.StockExchangeJaxB"/>
-       </component>
-       
-       <component name="stockTraderSDOComponent">
-               <implementation.java 
class="org.apache.tuscany.sca.test.exceptions.impl.StockTraderSDOImpl"/>
-               <reference 
name="exchangeJaxb">stockTraderSDOReference</reference>
-       </component>
-       
-       <reference name="stockTraderSDOReference">
-               <interface.java 
class="org.apache.tuscany.sca.test.exceptions.sdohandgen.StockExceptionTest"/>
-               <binding.ws 
wsdlElement="http://scatesttool.stockexceptiontestservice#wsdl.port(StockExceptionTestService/StockExceptionTestServiceSoapPort)"
 wsdlLocation="http://scatesttool.stockexceptiontestservice 
wsdl/StockExceptionTest.wsdl"/>
-       </reference>
+<composite name="intracomposite" xmlns="http://www.osoa.org/xmlns/sca/1.0";
+    xmlns:dbsdo="http://tuscany.apache.org/xmlns/sca/databinding/sdo/1.0";
+    xmlns:wsdli="http://www.w3.org/2006/01/wsdl-instance";>
+    <!-- dbsdo:import.sdo 
factory="stockexceptiontestservice.scatesttool.ScatesttoolFactory"/ -->
+
+    <service name="exchangeJaxbService">
+        <interface.java 
class="org.apache.tuscany.sca.test.exceptions.impl.StockExceptionTestJAXB" />
+        <binding.ws
+            
wsdlElement="http://scatesttool.stockexceptiontestservice#wsdl.port(StockExceptionTestService/StockExceptionTestServiceSoapPort)"
+            wsdlLocation="http://scatesttool.stockexceptiontestservice 
wsdl/StockExceptionTest.wsdl" />
+        <reference>exchangeJaxbComponent</reference>
+    </service>
+
+    <component name="exchangeJaxbComponent">
+        <implementation.java 
class="org.apache.tuscany.sca.test.exceptions.impl.StockExchangeJaxB" />
+    </component>
+
+    <component name="stockTraderSDOComponent">
+        <implementation.java 
class="org.apache.tuscany.sca.test.exceptions.impl.StockTraderSDOImpl" />
+        <reference name="exchangeJaxb" target="stockTraderSDOReference"/>
+    </component>
+
+    <reference name="stockTraderSDOReference">
+        <interface.java 
class="org.apache.tuscany.sca.test.exceptions.sdohandgen.StockExceptionTest" />
+        <binding.ws
+            
wsdlElement="http://scatesttool.stockexceptiontestservice#wsdl.port(StockExceptionTestService/StockExceptionTestServiceSoapPort)"
+            wsdlLocation="http://scatesttool.stockexceptiontestservice 
wsdl/StockExceptionTest.wsdl" />
+    </reference>
 </composite>

Modified: 
incubator/tuscany/java/sca/itest/exceptions-cross-binding-ws/src/test/java/org/apache/tuscany/sca/test/exceptions/IntraCompositeTestCaseFIXME.java
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/exceptions-cross-binding-ws/src/test/java/org/apache/tuscany/sca/test/exceptions/IntraCompositeTestCaseFIXME.java?rev=567880&r1=567879&r2=567880&view=diff
==============================================================================
--- 
incubator/tuscany/java/sca/itest/exceptions-cross-binding-ws/src/test/java/org/apache/tuscany/sca/test/exceptions/IntraCompositeTestCaseFIXME.java
 (original)
+++ 
incubator/tuscany/java/sca/itest/exceptions-cross-binding-ws/src/test/java/org/apache/tuscany/sca/test/exceptions/IntraCompositeTestCaseFIXME.java
 Mon Aug 20 16:45:54 2007
@@ -20,14 +20,16 @@
 
 import junit.framework.TestCase;
 
+import org.apache.tuscany.sca.databinding.TransformationException;
+import org.apache.tuscany.sca.host.embedded.SCADomain;
 import org.apache.tuscany.sca.test.exceptions.impl.StockTraderSDO;
 import 
org.apache.tuscany.sca.test.exceptions.sdohandgen.InvalidSymbolSDOException;
 
 import stockexceptiontestservice.scatesttool.InvalidSymbolFault;
 import stockexceptiontestservice.scatesttool.StockOffer;
 
-//FIXME Fix this test case
 public class IntraCompositeTestCaseFIXME extends TestCase {
+    private SCADomain domain;
     private StockTraderSDO stockTrader;
 
     public void testTrading() {
@@ -70,26 +72,21 @@
 
         assertNotNull(ret);
 
-//FIXME        
-//        assertEquals(TransformationException.class, ret.getClass());
+        assertEquals(TransformationException.class, ret.getClass());
 
     }
 
     @Override
     protected void setUp() throws Exception {
-//FIXME Port the latest APIs         
-//     SCARuntime.start("ExceptionTest.composite");
-//
-//     context = CurrentCompositeContext.getContext();
-//        assertNotNull(context);
-//        stockTrader = context.locateService(StockTraderSDO.class, 
"stockTraderSDOComponent");
-//
-//        assertNotNull(context);
+        domain = SCADomain.newInstance("ExceptionTest.composite");
+        stockTrader = domain.getService(StockTraderSDO.class, 
"stockTraderSDOComponent");
+        assertNotNull(stockTrader);
     }
-    
+
     @Override
     protected void tearDown() throws Exception {
-//FIXME Port the latest APIs        
-//     SCARuntime.stop();
+        if (domain != null) {
+            domain.close();
+        }
     }
 }

Modified: incubator/tuscany/java/sca/itest/exceptions-cross-binding/pom.xml
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/exceptions-cross-binding/pom.xml?rev=567880&r1=567879&r2=567880&view=diff
==============================================================================
--- incubator/tuscany/java/sca/itest/exceptions-cross-binding/pom.xml (original)
+++ incubator/tuscany/java/sca/itest/exceptions-cross-binding/pom.xml Mon Aug 
20 16:45:54 2007
@@ -30,41 +30,85 @@
 
     <dependencies>
         <dependency>
+            <groupId>com.sun.xml.ws</groupId>
+            <artifactId>jaxws-rt</artifactId>
+            <version>2.1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>javax.jws</groupId>
+            <artifactId>jsr181-api</artifactId>
+            <version>1.0-MR1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>javax.xml.bind</groupId>
+            <artifactId>jaxb-api</artifactId>
+            <version>2.1</version>
+        </dependency>
+
+       <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-databinding-sdo</artifactId>
+            <artifactId>tuscany-binding-sca</artifactId>
             <version>1.0-incubating-SNAPSHOT</version>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-core-databinding</artifactId>
+            <version>1.0-incubating-SNAPSHOT</version>
+            <scope>runtime</scope>
         </dependency>
-
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding-jaxb</artifactId>
             <version>1.0-incubating-SNAPSHOT</version>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-databinding-sdo</artifactId>
+            <version>1.0-incubating-SNAPSHOT</version>
+            <scope>compile</scope>
         </dependency>
-
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-databinding-axiom</artifactId>
             <version>1.0-incubating-SNAPSHOT</version>
+            <scope>compile</scope>
         </dependency>
-
         <dependency>
-            <groupId>com.sun.xml.ws</groupId>
-            <artifactId>jaxws-rt</artifactId>
-            <version>2.1</version>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-host-embedded</artifactId>
+            <version>1.0-incubating-SNAPSHOT</version>
+            <scope>compile</scope>
         </dependency>
-
         <dependency>
-            <groupId>javax.jws</groupId>
-            <artifactId>jsr181-api</artifactId>
-            <version>1.0-MR1</version>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-java-runtime</artifactId>
+            <version>1.0-incubating-SNAPSHOT</version>
+            <scope>compile</scope>
         </dependency>
-
         <dependency>
-            <groupId>javax.xml.bind</groupId>
-            <artifactId>jaxb-api</artifactId>
-            <version>2.1</version>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-interface-java-xml</artifactId>
+            <version>1.0-incubating-SNAPSHOT</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-http-jetty</artifactId>
+            <version>1.0-incubating-SNAPSHOT</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>servlet-api</artifactId>
+            <version>2.5</version>
+            <scope>test</scope>
         </dependency>
     </dependencies>
+
     <build>
         <plugins>
             <plugin>

Modified: 
incubator/tuscany/java/sca/itest/exceptions-cross-binding/src/main/resources/ExceptionTest.composite
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/exceptions-cross-binding/src/main/resources/ExceptionTest.composite?rev=567880&r1=567879&r2=567880&view=diff
==============================================================================
--- 
incubator/tuscany/java/sca/itest/exceptions-cross-binding/src/main/resources/ExceptionTest.composite
 (original)
+++ 
incubator/tuscany/java/sca/itest/exceptions-cross-binding/src/main/resources/ExceptionTest.composite
 Mon Aug 20 16:45:54 2007
@@ -1,26 +1,25 @@
 <?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.
+    * 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="ExceptionTest">
-   
-    <include name="intracomposite" scdlLocation="intracomposite.composite"/>
-     
+<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"; xmlns:foo="http://foo"; 
targetNamespace="http://foo";
+    name="ExceptionTest">
+
+    <include name="foo:intracomposite" />
+
 </composite>

Modified: 
incubator/tuscany/java/sca/itest/exceptions-cross-binding/src/main/resources/intracomposite.composite
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/exceptions-cross-binding/src/main/resources/intracomposite.composite?rev=567880&r1=567879&r2=567880&view=diff
==============================================================================
--- 
incubator/tuscany/java/sca/itest/exceptions-cross-binding/src/main/resources/intracomposite.composite
 (original)
+++ 
incubator/tuscany/java/sca/itest/exceptions-cross-binding/src/main/resources/intracomposite.composite
 Mon Aug 20 16:45:54 2007
@@ -17,12 +17,12 @@
     * specific language governing permissions and limitations
     * under the License.
 -->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"; xmlns:foo="http://foo";
+<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"; 
targetNamespace="http://foo"; xmlns:foo="http://foo";
     xmlns:dbsdo="http://tuscany.apache.org/xmlns/sca/databinding/sdo/1.0"; 
name="intracomposite">
 
     <component name="stockTraderSDOComponent">
         <implementation.java 
class="org.apache.tuscany.sca.test.exceptions.impl.StockTraderSDOImpl" />
-        <reference name="exchangeJaxb">exchangeJaxbComponent</reference>
+        <reference name="exchangeJaxb" 
target="exchangeJaxbComponent"></reference>
     </component>
 
     <component name="exchangeJaxbComponent">

Modified: 
incubator/tuscany/java/sca/itest/exceptions-cross-binding/src/test/java/org/apache/tuscany/sca/test/exceptions/IntraCompositeTestCaseFIXME.java
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/exceptions-cross-binding/src/test/java/org/apache/tuscany/sca/test/exceptions/IntraCompositeTestCaseFIXME.java?rev=567880&r1=567879&r2=567880&view=diff
==============================================================================
--- 
incubator/tuscany/java/sca/itest/exceptions-cross-binding/src/test/java/org/apache/tuscany/sca/test/exceptions/IntraCompositeTestCaseFIXME.java
 (original)
+++ 
incubator/tuscany/java/sca/itest/exceptions-cross-binding/src/test/java/org/apache/tuscany/sca/test/exceptions/IntraCompositeTestCaseFIXME.java
 Mon Aug 20 16:45:54 2007
@@ -21,14 +21,16 @@
 import junit.framework.TestCase;
 
 import org.apache.tuscany.sca.databinding.TransformationException;
+import org.apache.tuscany.sca.host.embedded.SCADomain;
 import org.apache.tuscany.sca.test.exceptions.impl.StockTraderSDO;
 import 
org.apache.tuscany.sca.test.exceptions.sdohandgen.InvalidSymbolSDOException;
 
 import stockexceptiontestservice.scatesttool.InvalidSymbolFault;
 import stockexceptiontestservice.scatesttool.StockOffer;
 
-//FIXME Fix this test case
 public class IntraCompositeTestCaseFIXME extends TestCase {
+    private SCADomain domain;
+
     private StockTraderSDO stockTrader;
 
     public void testTrading() {
@@ -77,19 +79,15 @@
 
     @Override
     protected void setUp() throws Exception {
-//FIXME Port to the latest APIs        
-//     SCARuntime.start("ExceptionTest.composite");
-//     
-//        context = CurrentCompositeContext.getContext();
-//        assertNotNull(context);
-//        stockTrader = context.locateService(StockTraderSDO.class, 
"stockTraderSDOComponent");
-//
-//        assertNotNull(context);
+        domain = SCADomain.newInstance("ExceptionTest.composite");
+        stockTrader = domain.getService(StockTraderSDO.class, 
"stockTraderSDOComponent");
+        assertNotNull(stockTrader);
     }
-    
+
     @Override
     protected void tearDown() throws Exception {
-//FIXME Port the latest APIs        
-//     SCARuntime.stop();
+        if (domain != null) {
+            domain.close();
+        }
     }
 }



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to