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 06:14:58 UTC
svn commit: r513146 - in
/incubator/tuscany/branches/sca-java-integration/testing/sca/itest:
callBackAPITest/src/main/resources/
callBackAPITest/src/main/resources/META-INF/
callBackAPITest/src/test/java/org/apache/tuscany/sca/test/
callBackBasicTest/s...
Author: jsdelfino
Date: Wed Feb 28 21:14:55 2007
New Revision: 513146
URL: http://svn.apache.org/viewvc?view=rev&rev=513146
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/callBackAPITest/src/main/resources/CallBackApiTest.composite (with props)
incubator/tuscany/branches/sca-java-integration/testing/sca/itest/callBackBasicTest/src/main/resources/CallBackBasicTest.composite (with props)
incubator/tuscany/branches/sca-java-integration/testing/sca/itest/callBackCTypeTest/src/main/resources/CallBackCTypeClient.composite (with props)
incubator/tuscany/branches/sca-java-integration/testing/sca/itest/callBackIDTest/src/main/resources/CallBackIdClient.composite (with props)
incubator/tuscany/branches/sca-java-integration/testing/sca/itest/callBackSetCallbackConvTest/src/main/resources/CallBackSetCallbackConvTest.composite (with props)
incubator/tuscany/branches/sca-java-integration/testing/sca/itest/callBackSetCallbackTest/src/main/resources/CallBackSetCallbackTest.composite (with props)
incubator/tuscany/branches/sca-java-integration/testing/sca/itest/conversationsTest/src/main/resources/ConversationsTest.composite (with props)
incubator/tuscany/branches/sca-java-integration/testing/sca/itest/exceptionTests/src/main/resources/ExceptionTest.composite (with props)
incubator/tuscany/branches/sca-java-integration/testing/sca/itest/exceptionTests/src/main/resources/intracomposite.composite (with props)
incubator/tuscany/branches/sca-java-integration/testing/sca/itest/exceptionXbindingTest/src/main/resources/ExceptionTest.composite (with props)
incubator/tuscany/branches/sca-java-integration/testing/sca/itest/exceptionXbindingTest/src/main/resources/intracomposite.composite (with props)
incubator/tuscany/branches/sca-java-integration/testing/sca/itest/exceptionXbindingWSTest/src/main/resources/ExceptionTest.composite (with props)
incubator/tuscany/branches/sca-java-integration/testing/sca/itest/exceptionXbindingWSTest/src/main/resources/intracomposite.composite (with props)
Removed:
incubator/tuscany/branches/sca-java-integration/testing/sca/itest/callBackAPITest/src/main/resources/META-INF/
incubator/tuscany/branches/sca-java-integration/testing/sca/itest/callBackBasicTest/src/main/resources/META-INF/
incubator/tuscany/branches/sca-java-integration/testing/sca/itest/callBackCTypeTest/src/main/resources/META-INF/
incubator/tuscany/branches/sca-java-integration/testing/sca/itest/callBackIDTest/src/main/resources/META-INF/
incubator/tuscany/branches/sca-java-integration/testing/sca/itest/callBackSetCallbackConvTest/src/main/resources/META-INF/
incubator/tuscany/branches/sca-java-integration/testing/sca/itest/callBackSetCallbackTest/src/main/resources/META-INF/
incubator/tuscany/branches/sca-java-integration/testing/sca/itest/conversationsTest/src/main/resources/META-INF/
incubator/tuscany/branches/sca-java-integration/testing/sca/itest/exceptionTests/src/main/resources/META-INF/
incubator/tuscany/branches/sca-java-integration/testing/sca/itest/exceptionXbindingTest/src/main/resources/META-INF/
incubator/tuscany/branches/sca-java-integration/testing/sca/itest/exceptionXbindingWSTest/src/main/resources/META-INF/
Modified:
incubator/tuscany/branches/sca-java-integration/testing/sca/itest/callBackAPITest/src/test/java/org/apache/tuscany/sca/test/CallBackApiTest.java
incubator/tuscany/branches/sca-java-integration/testing/sca/itest/callBackBasicTest/src/test/java/org/apache/tuscany/sca/test/CallBackBasicTestCase.java
incubator/tuscany/branches/sca-java-integration/testing/sca/itest/callBackCTypeTest/src/test/java/org/apache/tuscany/sca/test/CallBackCTypeTest.java
incubator/tuscany/branches/sca-java-integration/testing/sca/itest/callBackIDTest/src/test/java/org/apache/tuscany/sca/test/CallBackIdTest.java
incubator/tuscany/branches/sca-java-integration/testing/sca/itest/callBackSetCallbackConvTest/src/test/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvTest.java
incubator/tuscany/branches/sca-java-integration/testing/sca/itest/callBackSetCallbackTest/src/test/java/org/apache/tuscany/sca/test/CallBackSetCallbackTest.java
incubator/tuscany/branches/sca-java-integration/testing/sca/itest/conversationsTest/src/test/java/org/apache/tuscany/sca/test/ConversationsTest.java
incubator/tuscany/branches/sca-java-integration/testing/sca/itest/exceptionTests/src/test/java/org/apache/tuscany/sca/test/exceptions/IntraCompositeTestCase.java
incubator/tuscany/branches/sca-java-integration/testing/sca/itest/exceptionXbindingTest/src/test/java/org/apache/tuscany/sca/test/exceptions/IntraCompositeTestCase.java
incubator/tuscany/branches/sca-java-integration/testing/sca/itest/exceptionXbindingWSTest/src/test/java/org/apache/tuscany/sca/test/exceptions/IntraCompositeTestCase.java
Added: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/callBackAPITest/src/main/resources/CallBackApiTest.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/testing/sca/itest/callBackAPITest/src/main/resources/CallBackApiTest.composite?view=auto&rev=513146
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/testing/sca/itest/callBackAPITest/src/main/resources/CallBackApiTest.composite (added)
+++ incubator/tuscany/branches/sca-java-integration/testing/sca/itest/callBackAPITest/src/main/resources/CallBackApiTest.composite Wed Feb 28 21:14:55 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"
+ name="CallBackApiTest">
+
+ <component name="CallBackApiClient">
+ <implementation.java class="org.apache.tuscany.sca.test.CallBackApiClientImpl"/>
+ <reference name="aCallBackService">
+ CallBackApiService
+ </reference>
+ </component>
+
+ <component name="CallBackApiService">
+ <implementation.java class="org.apache.tuscany.sca.test.CallBackApiServiceImpl"/>
+ </component>
+
+</composite>
Propchange: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/callBackAPITest/src/main/resources/CallBackApiTest.composite
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/callBackAPITest/src/main/resources/CallBackApiTest.composite
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/callBackAPITest/src/test/java/org/apache/tuscany/sca/test/CallBackApiTest.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/testing/sca/itest/callBackAPITest/src/test/java/org/apache/tuscany/sca/test/CallBackApiTest.java?view=diff&rev=513146&r1=513145&r2=513146
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/testing/sca/itest/callBackAPITest/src/test/java/org/apache/tuscany/sca/test/CallBackApiTest.java (original)
+++ incubator/tuscany/branches/sca-java-integration/testing/sca/itest/callBackAPITest/src/test/java/org/apache/tuscany/sca/test/CallBackApiTest.java Wed Feb 28 21:14:55 2007
@@ -20,10 +20,10 @@
import junit.framework.TestCase;
-import org.apache.tuscany.test.SCATestCase;
+import org.apache.tuscany.api.SCAContainer;
import org.osoa.sca.CurrentCompositeContext;
-public class CallBackApiTest extends SCATestCase {
+public class CallBackApiTest extends TestCase {
private CallBackApiClient aCallBackClient;
@@ -32,9 +32,14 @@
}
protected void setUp() throws Exception {
- super.setUp();
+ SCAContainer.start("CallBackApiTest.composite");
+
aCallBackClient =
CurrentCompositeContext.getContext().locateService(CallBackApiClient.class, "CallBackApiClient");
+ }
+
+ protected void tearDown() throws Exception {
+ SCAContainer.stop();
}
}
Added: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/callBackBasicTest/src/main/resources/CallBackBasicTest.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/testing/sca/itest/callBackBasicTest/src/main/resources/CallBackBasicTest.composite?view=auto&rev=513146
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/testing/sca/itest/callBackBasicTest/src/main/resources/CallBackBasicTest.composite (added)
+++ incubator/tuscany/branches/sca-java-integration/testing/sca/itest/callBackBasicTest/src/main/resources/CallBackBasicTest.composite Wed Feb 28 21:14:55 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"
+ name="CallBackBasicTest">
+
+ <component name="CallBackBasicClient">
+ <implementation.java class="org.apache.tuscany.sca.test.CallBackBasicClientImpl"/>
+ <reference name="aCallBackService">
+ CallBackBasicService
+ </reference>
+ </component>
+
+ <component name="CallBackBasicService">
+ <implementation.java class="org.apache.tuscany.sca.test.CallBackBasicServiceImpl"/>
+ </component>
+
+</composite>
Propchange: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/callBackBasicTest/src/main/resources/CallBackBasicTest.composite
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/callBackBasicTest/src/main/resources/CallBackBasicTest.composite
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/callBackBasicTest/src/test/java/org/apache/tuscany/sca/test/CallBackBasicTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/testing/sca/itest/callBackBasicTest/src/test/java/org/apache/tuscany/sca/test/CallBackBasicTestCase.java?view=diff&rev=513146&r1=513145&r2=513146
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/testing/sca/itest/callBackBasicTest/src/test/java/org/apache/tuscany/sca/test/CallBackBasicTestCase.java (original)
+++ incubator/tuscany/branches/sca-java-integration/testing/sca/itest/callBackBasicTest/src/test/java/org/apache/tuscany/sca/test/CallBackBasicTestCase.java Wed Feb 28 21:14:55 2007
@@ -4,7 +4,6 @@
import org.apache.tuscany.api.SCAContainer;
import org.osoa.sca.CurrentCompositeContext;
-import org.osoa.sca.annotations.Reference;
public class CallBackBasicTestCase extends TestCase {
@@ -15,9 +14,7 @@
}
protected void setUp() throws Exception {
- super.setUp();
-
- SCAContainer.start();
+ SCAContainer.start("CallBackBasicTest.composite");
aCallBackClient = CurrentCompositeContext.getContext().locateService(CallBackBasicClient.class, "CallBackBasicClient");
}
@@ -25,8 +22,6 @@
@Override
protected void tearDown() throws Exception {
SCAContainer.stop();
-
- super.tearDown();
}
Added: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/callBackCTypeTest/src/main/resources/CallBackCTypeClient.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/testing/sca/itest/callBackCTypeTest/src/main/resources/CallBackCTypeClient.composite?view=auto&rev=513146
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/testing/sca/itest/callBackCTypeTest/src/main/resources/CallBackCTypeClient.composite (added)
+++ incubator/tuscany/branches/sca-java-integration/testing/sca/itest/callBackCTypeTest/src/main/resources/CallBackCTypeClient.composite Wed Feb 28 21:14:55 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"
+ name="CallBackCTypeTest">
+
+ <component name="CallBackCTypeClient">
+ <implementation.java class="org.apache.tuscany.sca.test.CallBackCTypeClientImpl"/>
+ <reference name="aCallBackService">
+ CallBackCTypeService
+ </reference>
+ </component>
+
+ <component name="CallBackCTypeService">
+ <implementation.java class="org.apache.tuscany.sca.test.CallBackCTypeServiceImpl"/>
+ </component>
+
+</composite>
Propchange: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/callBackCTypeTest/src/main/resources/CallBackCTypeClient.composite
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/callBackCTypeTest/src/main/resources/CallBackCTypeClient.composite
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/callBackCTypeTest/src/test/java/org/apache/tuscany/sca/test/CallBackCTypeTest.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/testing/sca/itest/callBackCTypeTest/src/test/java/org/apache/tuscany/sca/test/CallBackCTypeTest.java?view=diff&rev=513146&r1=513145&r2=513146
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/testing/sca/itest/callBackCTypeTest/src/test/java/org/apache/tuscany/sca/test/CallBackCTypeTest.java (original)
+++ incubator/tuscany/branches/sca-java-integration/testing/sca/itest/callBackCTypeTest/src/test/java/org/apache/tuscany/sca/test/CallBackCTypeTest.java Wed Feb 28 21:14:55 2007
@@ -20,10 +20,10 @@
import junit.framework.TestCase;
-import org.apache.tuscany.test.SCATestCase;
+import org.apache.tuscany.api.SCAContainer;
import org.osoa.sca.CurrentCompositeContext;
-public class CallBackCTypeTest extends SCATestCase {
+public class CallBackCTypeTest extends TestCase {
private CallBackCTypeClient aCallBackClient;
@@ -32,9 +32,14 @@
}
protected void setUp() throws Exception {
- super.setUp();
+ SCAContainer.start("CallBackCTypeClient.composite");
+
aCallBackClient =
CurrentCompositeContext.getContext().locateService(CallBackCTypeClient.class, "CallBackCTypeClient");
+ }
+
+ protected void tearDown() throws Exception {
+ SCAContainer.stop();
}
}
Added: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/callBackIDTest/src/main/resources/CallBackIdClient.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/testing/sca/itest/callBackIDTest/src/main/resources/CallBackIdClient.composite?view=auto&rev=513146
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/testing/sca/itest/callBackIDTest/src/main/resources/CallBackIdClient.composite (added)
+++ incubator/tuscany/branches/sca-java-integration/testing/sca/itest/callBackIDTest/src/main/resources/CallBackIdClient.composite Wed Feb 28 21:14:55 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"
+ name="CallBackIdTest">
+
+ <component name="CallBackIdClient">
+ <implementation.java class="org.apache.tuscany.sca.test.CallBackIdClientImpl"/>
+ <reference name="aCallBackService">
+ CallBackIdService
+ </reference>
+ </component>
+
+ <component name="CallBackIdService">
+ <implementation.java class="org.apache.tuscany.sca.test.CallBackIdServiceImpl"/>
+ </component>
+
+</composite>
Propchange: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/callBackIDTest/src/main/resources/CallBackIdClient.composite
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/callBackIDTest/src/main/resources/CallBackIdClient.composite
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/callBackIDTest/src/test/java/org/apache/tuscany/sca/test/CallBackIdTest.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/testing/sca/itest/callBackIDTest/src/test/java/org/apache/tuscany/sca/test/CallBackIdTest.java?view=diff&rev=513146&r1=513145&r2=513146
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/testing/sca/itest/callBackIDTest/src/test/java/org/apache/tuscany/sca/test/CallBackIdTest.java (original)
+++ incubator/tuscany/branches/sca-java-integration/testing/sca/itest/callBackIDTest/src/test/java/org/apache/tuscany/sca/test/CallBackIdTest.java Wed Feb 28 21:14:55 2007
@@ -2,11 +2,10 @@
import junit.framework.TestCase;
-import org.apache.tuscany.test.SCATestCase;
+import org.apache.tuscany.api.SCAContainer;
import org.osoa.sca.CurrentCompositeContext;
-import org.osoa.sca.annotations.Reference;
-public class CallBackIdTest extends SCATestCase {
+public class CallBackIdTest extends TestCase {
private CallBackIdClient aCallBackClient;
@@ -15,10 +14,12 @@
}
protected void setUp() throws Exception {
- super.setUp();
- aCallBackClient = CurrentCompositeContext.getContext().locateService(CallBackIdClient.class, "CallBackIdClient");
+ SCAContainer.start("CallBackIdClient.composite");
+
+ aCallBackClient = CurrentCompositeContext.getContext().locateService(CallBackIdClient.class, "CallBackIdClient");
+ }
+
+ protected void tearDown() throws Exception {
+ SCAContainer.stop();
}
-
-
-
}
Added: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/callBackSetCallbackConvTest/src/main/resources/CallBackSetCallbackConvTest.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/testing/sca/itest/callBackSetCallbackConvTest/src/main/resources/CallBackSetCallbackConvTest.composite?view=auto&rev=513146
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/testing/sca/itest/callBackSetCallbackConvTest/src/main/resources/CallBackSetCallbackConvTest.composite (added)
+++ incubator/tuscany/branches/sca-java-integration/testing/sca/itest/callBackSetCallbackConvTest/src/main/resources/CallBackSetCallbackConvTest.composite Wed Feb 28 21:14:55 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"
+ name="CallBackSetCallbackConvTest">
+
+ <component name="CallBackSetCallbackConvClient">
+ <implementation.java class="org.apache.tuscany.sca.test.CallBackSetCallbackConvClientImpl"/>
+ <reference name="aCallBackService">
+ CallBackSetCallbackConvService
+ </reference>
+ </component>
+
+
+ <component name="CallBackSetCallbackConvService">
+ <implementation.java class="org.apache.tuscany.sca.test.CallBackSetCallbackConvServiceImpl"/>
+ </component>
+</composite>
Propchange: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/callBackSetCallbackConvTest/src/main/resources/CallBackSetCallbackConvTest.composite
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/callBackSetCallbackConvTest/src/main/resources/CallBackSetCallbackConvTest.composite
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/callBackSetCallbackConvTest/src/test/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvTest.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/testing/sca/itest/callBackSetCallbackConvTest/src/test/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvTest.java?view=diff&rev=513146&r1=513145&r2=513146
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/testing/sca/itest/callBackSetCallbackConvTest/src/test/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvTest.java (original)
+++ incubator/tuscany/branches/sca-java-integration/testing/sca/itest/callBackSetCallbackConvTest/src/test/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvTest.java Wed Feb 28 21:14:55 2007
@@ -20,10 +20,10 @@
import junit.framework.TestCase;
-import org.apache.tuscany.test.SCATestCase;
+import org.apache.tuscany.api.SCAContainer;
import org.osoa.sca.CurrentCompositeContext;
-public class CallBackSetCallbackConvTest extends SCATestCase {
+public class CallBackSetCallbackConvTest extends TestCase {
private CallBackSetCallbackConvClient aCallBackClient;
@@ -32,10 +32,15 @@
}
protected void setUp() throws Exception {
- super.setUp();
+ SCAContainer.start("CallBackSetCallbackConvTest.composite");
+
aCallBackClient =
CurrentCompositeContext.getContext().locateService(CallBackSetCallbackConvClient.class,
"CallBackSetCallbackConvClient");
+ }
+
+ protected void tearDown() throws Exception {
+ SCAContainer.stop();
}
}
Added: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/callBackSetCallbackTest/src/main/resources/CallBackSetCallbackTest.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/testing/sca/itest/callBackSetCallbackTest/src/main/resources/CallBackSetCallbackTest.composite?view=auto&rev=513146
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/testing/sca/itest/callBackSetCallbackTest/src/main/resources/CallBackSetCallbackTest.composite (added)
+++ incubator/tuscany/branches/sca-java-integration/testing/sca/itest/callBackSetCallbackTest/src/main/resources/CallBackSetCallbackTest.composite Wed Feb 28 21:14:55 2007
@@ -0,0 +1,40 @@
+<?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"
+ name="CallBackSetCallbackTest">
+
+ <component name="CallBackSetCallbackClient">
+ <implementation.java class="org.apache.tuscany.sca.test.CallBackSetCallbackClientImpl"/>
+ <reference name="aCallBackService">
+ CallBackSetCallbackService
+ </reference>
+ <reference name="callBack">
+ CallBackSetCallbackCallback
+ </reference>
+ </component>
+
+ <component name="CallBackSetCallbackCallback">
+ <implementation.java class="org.apache.tuscany.sca.test.CallBackSetCallbackCallbackImpl"/>
+ </component>
+
+ <component name="CallBackSetCallbackService">
+ <implementation.java class="org.apache.tuscany.sca.test.CallBackSetCallbackServiceImpl"/>
+ </component>
+</composite>
Propchange: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/callBackSetCallbackTest/src/main/resources/CallBackSetCallbackTest.composite
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/callBackSetCallbackTest/src/main/resources/CallBackSetCallbackTest.composite
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/callBackSetCallbackTest/src/test/java/org/apache/tuscany/sca/test/CallBackSetCallbackTest.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/testing/sca/itest/callBackSetCallbackTest/src/test/java/org/apache/tuscany/sca/test/CallBackSetCallbackTest.java?view=diff&rev=513146&r1=513145&r2=513146
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/testing/sca/itest/callBackSetCallbackTest/src/test/java/org/apache/tuscany/sca/test/CallBackSetCallbackTest.java (original)
+++ incubator/tuscany/branches/sca-java-integration/testing/sca/itest/callBackSetCallbackTest/src/test/java/org/apache/tuscany/sca/test/CallBackSetCallbackTest.java Wed Feb 28 21:14:55 2007
@@ -20,10 +20,10 @@
import junit.framework.TestCase;
-import org.apache.tuscany.test.SCATestCase;
+import org.apache.tuscany.api.SCAContainer;
import org.osoa.sca.CurrentCompositeContext;
-public class CallBackSetCallbackTest extends SCATestCase {
+public class CallBackSetCallbackTest extends TestCase {
private CallBackSetCallbackClient aCallBackClient;
@@ -32,10 +32,15 @@
}
protected void setUp() throws Exception {
- super.setUp();
+ SCAContainer.start("CallBackSetCallbackTest.composite");
+
aCallBackClient =
CurrentCompositeContext.getContext().locateService(CallBackSetCallbackClient.class,
"CallBackSetCallbackClient");
+ }
+
+ protected void tearDown() throws Exception {
+ SCAContainer.stop();
}
}
Added: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/conversationsTest/src/main/resources/ConversationsTest.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/testing/sca/itest/conversationsTest/src/main/resources/ConversationsTest.composite?view=auto&rev=513146
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/testing/sca/itest/conversationsTest/src/main/resources/ConversationsTest.composite (added)
+++ incubator/tuscany/branches/sca-java-integration/testing/sca/itest/conversationsTest/src/main/resources/ConversationsTest.composite Wed Feb 28 21:14:55 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"
+ name="ConversationsTest">
+
+ <component name="ConversationsClient">
+ <implementation.java class="org.apache.tuscany.sca.test.ConversationsClientImpl"/>
+ <reference name="aService">
+ ConversationsService
+ </reference>
+ <reference name="anotherService">
+ AnotherService
+ </reference>
+ <reference name="aLifeCycleService">
+ ConversationLifeCycleService
+ </reference>
+ </component>
+
+ <component name="ConversationsService">
+ <implementation.java class="org.apache.tuscany.sca.test.ConversationsServiceImpl"/>
+ </component>
+
+ <component name="AnotherService">
+ <implementation.java class="org.apache.tuscany.sca.test.AnotherServiceImpl"/>
+ </component>
+
+ <component name="ConversationLifeCycleService">
+ <implementation.java class="org.apache.tuscany.sca.test.ConversationsLifeCycleServiceImpl"/>
+ </component>
+
+</composite>
Propchange: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/conversationsTest/src/main/resources/ConversationsTest.composite
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/conversationsTest/src/main/resources/ConversationsTest.composite
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/conversationsTest/src/test/java/org/apache/tuscany/sca/test/ConversationsTest.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/testing/sca/itest/conversationsTest/src/test/java/org/apache/tuscany/sca/test/ConversationsTest.java?view=diff&rev=513146&r1=513145&r2=513146
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/testing/sca/itest/conversationsTest/src/test/java/org/apache/tuscany/sca/test/ConversationsTest.java (original)
+++ incubator/tuscany/branches/sca-java-integration/testing/sca/itest/conversationsTest/src/test/java/org/apache/tuscany/sca/test/ConversationsTest.java Wed Feb 28 21:14:55 2007
@@ -2,11 +2,10 @@
import junit.framework.TestCase;
-import org.apache.tuscany.test.SCATestCase;
+import org.apache.tuscany.api.SCAContainer;
import org.osoa.sca.CurrentCompositeContext;
-import org.osoa.sca.annotations.Reference;
-public class ConversationsTest extends SCATestCase {
+public class ConversationsTest extends TestCase {
private ConversationsClient aConversationsClient;
@@ -15,11 +14,14 @@
}
protected void setUp() throws Exception {
- super.setUp();
- aConversationsClient = CurrentCompositeContext.getContext().locateService(ConversationsClient.class, "ConversationsClient/org.apache.tuscany.sca.test.ConversationsClient");
+ SCAContainer.start("ConversationsTest.composite");
+
+ aConversationsClient = CurrentCompositeContext.getContext().locateService(ConversationsClient.class, "ConversationsClient/org.apache.tuscany.sca.test.ConversationsClient");
}
-
-
+
+ protected void tearDown() throws Exception {
+ SCAContainer.stop();
+ }
}
Added: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/exceptionTests/src/main/resources/ExceptionTest.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/testing/sca/itest/exceptionTests/src/main/resources/ExceptionTest.composite?view=auto&rev=513146
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/testing/sca/itest/exceptionTests/src/main/resources/ExceptionTest.composite (added)
+++ incubator/tuscany/branches/sca-java-integration/testing/sca/itest/exceptionTests/src/main/resources/ExceptionTest.composite Wed Feb 28 21:14:55 2007
@@ -0,0 +1,26 @@
+<?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="ExceptionTest">
+
+ <include name="intracomposite" scdlLocation="intracomposite.composite"/>
+
+</composite>
Propchange: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/exceptionTests/src/main/resources/ExceptionTest.composite
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/exceptionTests/src/main/resources/ExceptionTest.composite
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/exceptionTests/src/main/resources/intracomposite.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/testing/sca/itest/exceptionTests/src/main/resources/intracomposite.composite?view=auto&rev=513146
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/testing/sca/itest/exceptionTests/src/main/resources/intracomposite.composite (added)
+++ incubator/tuscany/branches/sca-java-integration/testing/sca/itest/exceptionTests/src/main/resources/intracomposite.composite Wed Feb 28 21:14:55 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="intracomposite">
+
+ <component name="main">
+ <implementation.java class="org.apache.tuscany.sca.test.exceptions.impl.ExceptionHandlerImpl"/>
+ <reference name="exceptionThrower">exceptionThrower</reference>
+ </component>
+
+ <component name="exceptionThrower">
+ <implementation.java class="org.apache.tuscany.sca.test.exceptions.impl.ExceptionThrowerImpl"/>
+ </component>
+
+</composite>
Propchange: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/exceptionTests/src/main/resources/intracomposite.composite
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/exceptionTests/src/main/resources/intracomposite.composite
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/exceptionTests/src/test/java/org/apache/tuscany/sca/test/exceptions/IntraCompositeTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/testing/sca/itest/exceptionTests/src/test/java/org/apache/tuscany/sca/test/exceptions/IntraCompositeTestCase.java?view=diff&rev=513146&r1=513145&r2=513146
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/testing/sca/itest/exceptionTests/src/test/java/org/apache/tuscany/sca/test/exceptions/IntraCompositeTestCase.java (original)
+++ incubator/tuscany/branches/sca-java-integration/testing/sca/itest/exceptionTests/src/test/java/org/apache/tuscany/sca/test/exceptions/IntraCompositeTestCase.java Wed Feb 28 21:14:55 2007
@@ -21,11 +21,10 @@
import junit.framework.TestCase;
import org.apache.tuscany.api.SCAContainer;
-import org.apache.tuscany.test.SCATestCase;
import org.osoa.sca.CompositeContext;
import org.osoa.sca.CurrentCompositeContext;
-public class IntraCompositeTestCase extends SCATestCase {
+public class IntraCompositeTestCase extends TestCase {
private ExceptionHandler exceptionHandler;
private CompositeContext context;
@@ -42,12 +41,17 @@
@Override
protected void setUp() throws Exception {
- super.setUp();
+ SCAContainer.start("ExceptionTest.composite");
context = CurrentCompositeContext.getContext();
assertNotNull(context);
exceptionHandler = context.locateService(ExceptionHandler.class, "main");
assertNotNull(context);
+ }
+
+ @Override
+ protected void tearDown() throws Exception {
+ SCAContainer.stop();
}
}
Added: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/exceptionXbindingTest/src/main/resources/ExceptionTest.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/testing/sca/itest/exceptionXbindingTest/src/main/resources/ExceptionTest.composite?view=auto&rev=513146
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/testing/sca/itest/exceptionXbindingTest/src/main/resources/ExceptionTest.composite (added)
+++ incubator/tuscany/branches/sca-java-integration/testing/sca/itest/exceptionXbindingTest/src/main/resources/ExceptionTest.composite Wed Feb 28 21:14:55 2007
@@ -0,0 +1,26 @@
+<?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="ExceptionTest">
+
+ <include name="intracomposite" scdlLocation="intracomposite.composite"/>
+
+</composite>
Propchange: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/exceptionXbindingTest/src/main/resources/ExceptionTest.composite
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/exceptionXbindingTest/src/main/resources/ExceptionTest.composite
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/exceptionXbindingTest/src/main/resources/intracomposite.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/testing/sca/itest/exceptionXbindingTest/src/main/resources/intracomposite.composite?view=auto&rev=513146
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/testing/sca/itest/exceptionXbindingTest/src/main/resources/intracomposite.composite (added)
+++ incubator/tuscany/branches/sca-java-integration/testing/sca/itest/exceptionXbindingTest/src/main/resources/intracomposite.composite Wed Feb 28 21:14:55 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"
+ xmlns:dbsdo="http://tuscany.apache.org/xmlns/sca/databinding/sdo/1.0" name="intracomposite">
+
+ <dbsdo:import.sdo factory="stockexceptiontestservice.scatesttool.ScatesttoolFactory" />
+
+ <component name="stockTraderSDOComponent">
+ <implementation.java class="org.apache.tuscany.sca.test.exceptions.impl.StockTraderSDOImpl" />
+ <reference name="exchangeJaxb">exchangeJaxbComponent</reference>
+ </component>
+
+ <component name="exchangeJaxbComponent">
+ <implementation.java class="org.apache.tuscany.sca.test.exceptions.impl.StockExchangeJaxB" />
+ </component>
+
+</composite>
Propchange: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/exceptionXbindingTest/src/main/resources/intracomposite.composite
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/exceptionXbindingTest/src/main/resources/intracomposite.composite
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/exceptionXbindingTest/src/test/java/org/apache/tuscany/sca/test/exceptions/IntraCompositeTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/testing/sca/itest/exceptionXbindingTest/src/test/java/org/apache/tuscany/sca/test/exceptions/IntraCompositeTestCase.java?view=diff&rev=513146&r1=513145&r2=513146
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/testing/sca/itest/exceptionXbindingTest/src/test/java/org/apache/tuscany/sca/test/exceptions/IntraCompositeTestCase.java (original)
+++ incubator/tuscany/branches/sca-java-integration/testing/sca/itest/exceptionXbindingTest/src/test/java/org/apache/tuscany/sca/test/exceptions/IntraCompositeTestCase.java Wed Feb 28 21:14:55 2007
@@ -18,19 +18,19 @@
*/
package org.apache.tuscany.sca.test.exceptions;
-import junit.framework.AssertionFailedError;
+import junit.framework.TestCase;
+import org.apache.tuscany.api.SCAContainer;
import org.apache.tuscany.sca.test.exceptions.impl.StockTraderSDO;
import org.apache.tuscany.sca.test.exceptions.sdohandgen.InvalidSymbolSDOException;
import org.apache.tuscany.spi.databinding.TransformationException;
-import org.apache.tuscany.test.SCATestCase;
import org.osoa.sca.CompositeContext;
import org.osoa.sca.CurrentCompositeContext;
import stockexceptiontestservice.scatesttool.InvalidSymbolFault;
import stockexceptiontestservice.scatesttool.StockOffer;
-public class IntraCompositeTestCase extends SCATestCase {
+public class IntraCompositeTestCase extends TestCase {
private StockTraderSDO stockTrader;
private CompositeContext context;
@@ -81,11 +81,17 @@
@Override
protected void setUp() throws Exception {
- super.setUp();
+ SCAContainer.start("ExceptionTest.composite");
+
context = CurrentCompositeContext.getContext();
assertNotNull(context);
stockTrader = context.locateService(StockTraderSDO.class, "stockTraderSDOComponent");
assertNotNull(context);
+ }
+
+ @Override
+ protected void tearDown() throws Exception {
+ SCAContainer.stop();
}
}
Added: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/exceptionXbindingWSTest/src/main/resources/ExceptionTest.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/testing/sca/itest/exceptionXbindingWSTest/src/main/resources/ExceptionTest.composite?view=auto&rev=513146
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/testing/sca/itest/exceptionXbindingWSTest/src/main/resources/ExceptionTest.composite (added)
+++ incubator/tuscany/branches/sca-java-integration/testing/sca/itest/exceptionXbindingWSTest/src/main/resources/ExceptionTest.composite Wed Feb 28 21:14:55 2007
@@ -0,0 +1,26 @@
+<?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="ExceptionTest">
+
+ <include name="intracomposite" scdlLocation="intracomposite.composite"/>
+
+</composite>
Propchange: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/exceptionXbindingWSTest/src/main/resources/ExceptionTest.composite
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/exceptionXbindingWSTest/src/main/resources/ExceptionTest.composite
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/exceptionXbindingWSTest/src/main/resources/intracomposite.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/testing/sca/itest/exceptionXbindingWSTest/src/main/resources/intracomposite.composite?view=auto&rev=513146
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/testing/sca/itest/exceptionXbindingWSTest/src/main/resources/intracomposite.composite (added)
+++ incubator/tuscany/branches/sca-java-integration/testing/sca/itest/exceptionXbindingWSTest/src/main/resources/intracomposite.composite Wed Feb 28 21:14:55 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 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 endpoint="http://scatesttool.stockexceptiontestservice#wsdl.endpoint(StockExceptionTestService/StockExceptionTestServiceSoapPort)" location="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 endpoint="http://scatesttool.stockexceptiontestservice#wsdl.endpoint(StockExceptionTestService/StockExceptionTestServiceSoapPort)" location="wsdl/StockExceptionTest.wsdl"/>
+ location="wsdl/StockExceptionTest.wsdl" />
+ </reference>
+</composite>
Propchange: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/exceptionXbindingWSTest/src/main/resources/intracomposite.composite
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/exceptionXbindingWSTest/src/main/resources/intracomposite.composite
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: incubator/tuscany/branches/sca-java-integration/testing/sca/itest/exceptionXbindingWSTest/src/test/java/org/apache/tuscany/sca/test/exceptions/IntraCompositeTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-integration/testing/sca/itest/exceptionXbindingWSTest/src/test/java/org/apache/tuscany/sca/test/exceptions/IntraCompositeTestCase.java?view=diff&rev=513146&r1=513145&r2=513146
==============================================================================
--- incubator/tuscany/branches/sca-java-integration/testing/sca/itest/exceptionXbindingWSTest/src/test/java/org/apache/tuscany/sca/test/exceptions/IntraCompositeTestCase.java (original)
+++ incubator/tuscany/branches/sca-java-integration/testing/sca/itest/exceptionXbindingWSTest/src/test/java/org/apache/tuscany/sca/test/exceptions/IntraCompositeTestCase.java Wed Feb 28 21:14:55 2007
@@ -18,19 +18,19 @@
*/
package org.apache.tuscany.sca.test.exceptions;
-import junit.framework.AssertionFailedError;
+import junit.framework.TestCase;
+import org.apache.tuscany.api.SCAContainer;
import org.apache.tuscany.sca.test.exceptions.impl.StockTraderSDO;
import org.apache.tuscany.sca.test.exceptions.sdohandgen.InvalidSymbolSDOException;
import org.apache.tuscany.spi.databinding.TransformationException;
-import org.apache.tuscany.test.SCATestCase;
import org.osoa.sca.CompositeContext;
import org.osoa.sca.CurrentCompositeContext;
import stockexceptiontestservice.scatesttool.InvalidSymbolFault;
import stockexceptiontestservice.scatesttool.StockOffer;
-public class IntraCompositeTestCase extends SCATestCase {
+public class IntraCompositeTestCase extends TestCase {
private StockTraderSDO stockTrader;
private CompositeContext context;
@@ -81,11 +81,17 @@
@Override
protected void setUp() throws Exception {
- super.setUp();
- context = CurrentCompositeContext.getContext();
+ SCAContainer.start("ExceptionTest.composite");
+
+ context = CurrentCompositeContext.getContext();
assertNotNull(context);
stockTrader = context.locateService(StockTraderSDO.class, "stockTraderSDOComponent");
assertNotNull(context);
+ }
+
+ @Override
+ 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