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/04/15 05:02:13 UTC
svn commit: r528915 - in /incubator/tuscany/java/sca/itest: ./ callback-api/
callback-api/src/main/java/org/apache/tuscany/sca/test/
callback-api/src/main/resources/ callback-basic/
callback-basic/src/main/resources/ callback-complex-type/ callback-com...
Author: jsdelfino
Date: Sat Apr 14 20:02:11 2007
New Revision: 528915
URL: http://svn.apache.org/viewvc?view=rev&rev=528915
Log:
Ported more poms to the new build structure. Added all the integration test modules that build to the main pom.
Added:
incubator/tuscany/java/sca/itest/operation-overloading/src/main/resources/OperationOverload.composite (with props)
Removed:
incubator/tuscany/java/sca/itest/operation-overloading/src/main/java/org/apache/tuscany/sca/test/opoverload/interceptor/
incubator/tuscany/java/sca/itest/operation-overloading/src/main/resources/META-INF/
incubator/tuscany/java/sca/itest/operation-overloading/src/main/resources/org/
Modified:
incubator/tuscany/java/sca/itest/callback-api/pom.xml
incubator/tuscany/java/sca/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiClientImpl.java
incubator/tuscany/java/sca/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiServiceImpl.java
incubator/tuscany/java/sca/itest/callback-api/src/main/resources/CallBackApiTest.composite
incubator/tuscany/java/sca/itest/callback-basic/pom.xml
incubator/tuscany/java/sca/itest/callback-basic/src/main/resources/CallBackBasicTest.composite
incubator/tuscany/java/sca/itest/callback-complex-type/pom.xml
incubator/tuscany/java/sca/itest/callback-complex-type/src/main/resources/CallBackCTypeClient.composite
incubator/tuscany/java/sca/itest/callback-complex-type/src/main/resources/org/apache/tuscany/sca/test/CallBackCTypeServiceImpl.componentType
incubator/tuscany/java/sca/itest/callback-id/pom.xml
incubator/tuscany/java/sca/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdClientImpl.java
incubator/tuscany/java/sca/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdServiceImpl.java
incubator/tuscany/java/sca/itest/callback-id/src/main/resources/CallBackIdClient.composite
incubator/tuscany/java/sca/itest/callback-set-callback/pom.xml
incubator/tuscany/java/sca/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackServiceImpl.java
incubator/tuscany/java/sca/itest/callback-set-callback/src/main/resources/CallBackSetCallbackTest.composite
incubator/tuscany/java/sca/itest/callback-set-conversation/pom.xml
incubator/tuscany/java/sca/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvClientImpl.java
incubator/tuscany/java/sca/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvServiceImpl.java
incubator/tuscany/java/sca/itest/callback-set-conversation/src/main/resources/CallBackSetCallbackConvTest.composite
incubator/tuscany/java/sca/itest/conversations/pom.xml
incubator/tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/test/ConversationsClientImpl.java
incubator/tuscany/java/sca/itest/conversations/src/main/resources/ConversationsTest.composite
incubator/tuscany/java/sca/itest/databindings/common/ (props changed)
incubator/tuscany/java/sca/itest/databindings/interop/ (props changed)
incubator/tuscany/java/sca/itest/databindings/jaxbgen/ (props changed)
incubator/tuscany/java/sca/itest/databindings/pom.xml
incubator/tuscany/java/sca/itest/databindings/sdogen/ (props changed)
incubator/tuscany/java/sca/itest/operation-overloading/pom.xml
incubator/tuscany/java/sca/itest/operation-overloading/src/test/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadATestCase.java
incubator/tuscany/java/sca/itest/pom.xml
incubator/tuscany/java/sca/itest/properties/pom.xml
incubator/tuscany/java/sca/itest/wsdl/pom.xml
Modified: incubator/tuscany/java/sca/itest/callback-api/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/callback-api/pom.xml?view=diff&rev=528915&r1=528914&r2=528915
==============================================================================
--- incubator/tuscany/java/sca/itest/callback-api/pom.xml (original)
+++ incubator/tuscany/java/sca/itest/callback-api/pom.xml Sat Apr 14 20:02:11 2007
@@ -18,18 +18,28 @@
* under the License.
-->
<project>
+ <modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.tuscany.testing</groupId>
- <artifactId>sca-itest</artifactId>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-itest</artifactId>
<version>1.0-incubating-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
+ <artifactId>tuscany-itest-callback-api</artifactId>
+ <name>Apache Tuscany SCA Callback API Integration Tests</name>
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.tuscany.testing</groupId>
- <artifactId>iTest-callback-api</artifactId>
- <version>${testing.version}</version>
- <packaging>jar</packaging>
- <name>Test Suite for SCA Callback API</name>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-host-embedded</artifactId>
+ <version>1.0-incubating-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-implementation-java-runtime</artifactId>
+ <version>1.0-incubating-SNAPSHOT</version>
+ <scope>runtime</scope>
+ </dependency>
+ </dependencies>
</project>
Modified: incubator/tuscany/java/sca/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiClientImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiClientImpl.java?view=diff&rev=528915&r1=528914&r2=528915
==============================================================================
--- incubator/tuscany/java/sca/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiClientImpl.java (original)
+++ incubator/tuscany/java/sca/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiClientImpl.java Sat Apr 14 20:02:11 2007
@@ -18,15 +18,17 @@
*/
package org.apache.tuscany.sca.test;
+import junit.framework.Assert;
+
import org.osoa.sca.annotations.Reference;
import org.osoa.sca.annotations.Service;
-import junit.framework.Assert;
@Service(CallBackApiClient.class)
public class CallBackApiClientImpl implements CallBackApiClient, CallBackApiCallBack {
@Reference
protected CallBackApiService aCallBackService;
+
private static String returnMessage = null;
private static int callBackCount = 0;
private static Object monitor = new Object();
Modified: incubator/tuscany/java/sca/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiServiceImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiServiceImpl.java?view=diff&rev=528915&r1=528914&r2=528915
==============================================================================
--- incubator/tuscany/java/sca/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiServiceImpl.java (original)
+++ incubator/tuscany/java/sca/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiServiceImpl.java Sat Apr 14 20:02:11 2007
@@ -18,18 +18,20 @@
*/
package org.apache.tuscany.sca.test;
-import org.osoa.sca.annotations.Service;
-import org.osoa.sca.annotations.Context;
+import org.osoa.sca.ComponentContext;
import org.osoa.sca.CompositeContext;
import org.osoa.sca.RequestContext;
import org.osoa.sca.ServiceReference;
+import org.osoa.sca.annotations.Context;
+import org.osoa.sca.annotations.Service;
@Service(CallBackApiService.class)
public class CallBackApiServiceImpl implements CallBackApiService {
@Context
- protected CompositeContext compositeContext;
- protected CallBackApiCallBack callback;
+ protected ComponentContext componentContext;
+
+ private CallBackApiCallBack callback;
public void knockKnock(String aString) {
@@ -66,7 +68,7 @@
private CallBackApiCallBack getCallBackInterface() {
System.out.println("CallBackApiServiceImpl getting request context");
- RequestContext rc = compositeContext.getRequestContext();
+ RequestContext rc = componentContext.getRequestContext();
System.out.println("CallBackApiServiceImpl getting callback from request context");
callback = (CallBackApiCallBack) ((ServiceReference) rc.getServiceReference()).getCallback();
System.out.println("CallBackApiServiceImpl returning callback");
Modified: incubator/tuscany/java/sca/itest/callback-api/src/main/resources/CallBackApiTest.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/callback-api/src/main/resources/CallBackApiTest.composite?view=diff&rev=528915&r1=528914&r2=528915
==============================================================================
--- incubator/tuscany/java/sca/itest/callback-api/src/main/resources/CallBackApiTest.composite (original)
+++ incubator/tuscany/java/sca/itest/callback-api/src/main/resources/CallBackApiTest.composite Sat Apr 14 20:02:11 2007
@@ -18,13 +18,12 @@
* under the License.
-->
<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- name="CallBackApiTest">
+ targetNamespace="http://callback"
+ name="CallBackApiTest">
<component name="CallBackApiClient">
<implementation.java class="org.apache.tuscany.sca.test.CallBackApiClientImpl"/>
- <reference name="aCallBackService">
- CallBackApiService
- </reference>
+ <reference name="aCallBackService" target="CallBackApiService"/>
</component>
<component name="CallBackApiService">
Modified: incubator/tuscany/java/sca/itest/callback-basic/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/callback-basic/pom.xml?view=diff&rev=528915&r1=528914&r2=528915
==============================================================================
--- incubator/tuscany/java/sca/itest/callback-basic/pom.xml (original)
+++ incubator/tuscany/java/sca/itest/callback-basic/pom.xml Sat Apr 14 20:02:11 2007
@@ -18,18 +18,28 @@
* under the License.
-->
<project>
+ <modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.tuscany.testing</groupId>
- <artifactId>sca-itest</artifactId>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-itest</artifactId>
<version>1.0-incubating-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
+ <artifactId>tuscany-itest-callback-basic</artifactId>
+ <name>Apache Tuscany SCA Callback Basic Integration Tests</name>
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.tuscany.testing</groupId>
- <artifactId>iTest-Callback-Basic</artifactId>
- <version>${testing.version}</version>
- <packaging>jar</packaging>
- <name>Test Suite for SCA Callback Basic</name>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-host-embedded</artifactId>
+ <version>1.0-incubating-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-implementation-java-runtime</artifactId>
+ <version>1.0-incubating-SNAPSHOT</version>
+ <scope>runtime</scope>
+ </dependency>
+ </dependencies>
</project>
Modified: incubator/tuscany/java/sca/itest/callback-basic/src/main/resources/CallBackBasicTest.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/callback-basic/src/main/resources/CallBackBasicTest.composite?view=diff&rev=528915&r1=528914&r2=528915
==============================================================================
--- incubator/tuscany/java/sca/itest/callback-basic/src/main/resources/CallBackBasicTest.composite (original)
+++ incubator/tuscany/java/sca/itest/callback-basic/src/main/resources/CallBackBasicTest.composite Sat Apr 14 20:02:11 2007
@@ -18,13 +18,12 @@
* under the License.
-->
<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- name="CallBackBasicTest">
+ targetNamespace="http://callback"
+ name="CallBackBasicTest">
<component name="CallBackBasicClient">
<implementation.java class="org.apache.tuscany.sca.test.CallBackBasicClientImpl"/>
- <reference name="aCallBackService">
- CallBackBasicService
- </reference>
+ <reference name="aCallBackService" target="CallBackBasicService"/>
</component>
<component name="CallBackBasicService">
Modified: incubator/tuscany/java/sca/itest/callback-complex-type/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/callback-complex-type/pom.xml?view=diff&rev=528915&r1=528914&r2=528915
==============================================================================
--- incubator/tuscany/java/sca/itest/callback-complex-type/pom.xml (original)
+++ incubator/tuscany/java/sca/itest/callback-complex-type/pom.xml Sat Apr 14 20:02:11 2007
@@ -18,18 +18,28 @@
* under the License.
-->
<project>
+ <modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.tuscany.testing</groupId>
- <artifactId>sca-itest</artifactId>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-itest</artifactId>
<version>1.0-incubating-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
+ <artifactId>tuscany-itest-callback-complex-type</artifactId>
+ <name>Apache Tuscany SCA Callback Complex Type Integration Tests</name>
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.tuscany.testing</groupId>
- <artifactId>iTest-callback-complexType</artifactId>
- <version>${testing.version}</version>
- <packaging>jar</packaging>
- <name>Test Suite for SCA Callback CType</name>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-host-embedded</artifactId>
+ <version>1.0-incubating-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-implementation-java-runtime</artifactId>
+ <version>1.0-incubating-SNAPSHOT</version>
+ <scope>runtime</scope>
+ </dependency>
+ </dependencies>
</project>
Modified: incubator/tuscany/java/sca/itest/callback-complex-type/src/main/resources/CallBackCTypeClient.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/callback-complex-type/src/main/resources/CallBackCTypeClient.composite?view=diff&rev=528915&r1=528914&r2=528915
==============================================================================
--- incubator/tuscany/java/sca/itest/callback-complex-type/src/main/resources/CallBackCTypeClient.composite (original)
+++ incubator/tuscany/java/sca/itest/callback-complex-type/src/main/resources/CallBackCTypeClient.composite Sat Apr 14 20:02:11 2007
@@ -18,13 +18,12 @@
* under the License.
-->
<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- name="CallBackCTypeTest">
+ targetNamespace="http://callback"
+ name="CallBackCTypeTest">
<component name="CallBackCTypeClient">
<implementation.java class="org.apache.tuscany.sca.test.CallBackCTypeClientImpl"/>
- <reference name="aCallBackService">
- CallBackCTypeService
- </reference>
+ <reference name="aCallBackService" target="CallBackCTypeService"/>
</component>
<component name="CallBackCTypeService">
Modified: incubator/tuscany/java/sca/itest/callback-complex-type/src/main/resources/org/apache/tuscany/sca/test/CallBackCTypeServiceImpl.componentType
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/callback-complex-type/src/main/resources/org/apache/tuscany/sca/test/CallBackCTypeServiceImpl.componentType?view=diff&rev=528915&r1=528914&r2=528915
==============================================================================
--- incubator/tuscany/java/sca/itest/callback-complex-type/src/main/resources/org/apache/tuscany/sca/test/CallBackCTypeServiceImpl.componentType (original)
+++ incubator/tuscany/java/sca/itest/callback-complex-type/src/main/resources/org/apache/tuscany/sca/test/CallBackCTypeServiceImpl.componentType Sat Apr 14 20:02:11 2007
@@ -1,8 +1,10 @@
<?xml version="1.0" encoding="ASCII"?>
-<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0" >
+<componentType xmlns="http://www.osoa.org/xmlns/sca/1.0" >
+
<service name="CallBackCTypeService">
<interface.java interface="org.apache.tuscany.sca.test.CallBackCTypeService"
callbackInterface="org.apache.tuscany.sca.test.CallBackCTypeCallBack"/>
</service>
+
</componentType>
Modified: incubator/tuscany/java/sca/itest/callback-id/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/callback-id/pom.xml?view=diff&rev=528915&r1=528914&r2=528915
==============================================================================
--- incubator/tuscany/java/sca/itest/callback-id/pom.xml (original)
+++ incubator/tuscany/java/sca/itest/callback-id/pom.xml Sat Apr 14 20:02:11 2007
@@ -18,18 +18,28 @@
* under the License.
-->
<project>
+ <modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.tuscany.testing</groupId>
- <artifactId>sca-itest</artifactId>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-itest</artifactId>
<version>1.0-incubating-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
+ <artifactId>tuscany-itest-callback-id</artifactId>
+ <name>Apache Tuscany SCA Callback ID Integration Tests</name>
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.tuscany.testing</groupId>
- <artifactId>iTest-Callback-ID</artifactId>
- <version>${testing.version}</version>
- <packaging>jar</packaging>
- <name>Test Suite for SCA Callback ID</name>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-host-embedded</artifactId>
+ <version>1.0-incubating-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-implementation-java-runtime</artifactId>
+ <version>1.0-incubating-SNAPSHOT</version>
+ <scope>runtime</scope>
+ </dependency>
+ </dependencies>
</project>
Modified: incubator/tuscany/java/sca/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdClientImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdClientImpl.java?view=diff&rev=528915&r1=528914&r2=528915
==============================================================================
--- incubator/tuscany/java/sca/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdClientImpl.java (original)
+++ incubator/tuscany/java/sca/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdClientImpl.java Sat Apr 14 20:02:11 2007
@@ -18,19 +18,20 @@
*/
package org.apache.tuscany.sca.test;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Service;
-import org.osoa.sca.annotations.Context;
-import org.osoa.sca.CompositeContext;
+import junit.framework.Assert;
+
+import org.osoa.sca.ComponentContext;
import org.osoa.sca.RequestContext;
import org.osoa.sca.ServiceReference;
-import junit.framework.Assert;
+import org.osoa.sca.annotations.Context;
+import org.osoa.sca.annotations.Reference;
+import org.osoa.sca.annotations.Service;
@Service(CallBackIdClient.class)
public class CallBackIdClientImpl implements CallBackIdClient, CallBackIdCallBack {
@Context
- private CompositeContext compositeContext;
+ protected ComponentContext componentContext;
@Reference
protected CallBackIdService aCallBackService;
@@ -124,7 +125,7 @@
public void callBackMessage(String aString) {
System.out.println("Entering callback callBackMessage: " + aString);
- RequestContext rc = compositeContext.getRequestContext();
+ RequestContext rc = componentContext.getRequestContext();
Object callBackId = rc.getServiceReference().getCallbackID();
synchronized (monitor) {
Modified: incubator/tuscany/java/sca/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdServiceImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdServiceImpl.java?view=diff&rev=528915&r1=528914&r2=528915
==============================================================================
--- incubator/tuscany/java/sca/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdServiceImpl.java (original)
+++ incubator/tuscany/java/sca/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdServiceImpl.java Sat Apr 14 20:02:11 2007
@@ -18,7 +18,7 @@
*/
package org.apache.tuscany.sca.test;
-import org.osoa.sca.CompositeContext;
+import org.osoa.sca.ComponentContext;
import org.osoa.sca.RequestContext;
import org.osoa.sca.annotations.Callback;
import org.osoa.sca.annotations.Context;
@@ -30,7 +30,7 @@
@Callback
protected CallBackIdCallBack callback;
@Context
- protected CompositeContext compositeContext;
+ protected ComponentContext compositeContext;
public void knockKnock(String aString) {
Modified: incubator/tuscany/java/sca/itest/callback-id/src/main/resources/CallBackIdClient.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/callback-id/src/main/resources/CallBackIdClient.composite?view=diff&rev=528915&r1=528914&r2=528915
==============================================================================
--- incubator/tuscany/java/sca/itest/callback-id/src/main/resources/CallBackIdClient.composite (original)
+++ incubator/tuscany/java/sca/itest/callback-id/src/main/resources/CallBackIdClient.composite Sat Apr 14 20:02:11 2007
@@ -18,13 +18,12 @@
* under the License.
-->
<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- name="CallBackIdTest">
+ targetNamespace="http://callback"
+ name="CallBackIdTest">
<component name="CallBackIdClient">
<implementation.java class="org.apache.tuscany.sca.test.CallBackIdClientImpl"/>
- <reference name="aCallBackService">
- CallBackIdService
- </reference>
+ <reference name="aCallBackService" target="CallBackIdService"/>
</component>
<component name="CallBackIdService">
Modified: incubator/tuscany/java/sca/itest/callback-set-callback/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/callback-set-callback/pom.xml?view=diff&rev=528915&r1=528914&r2=528915
==============================================================================
--- incubator/tuscany/java/sca/itest/callback-set-callback/pom.xml (original)
+++ incubator/tuscany/java/sca/itest/callback-set-callback/pom.xml Sat Apr 14 20:02:11 2007
@@ -18,18 +18,28 @@
* under the License.
-->
<project>
+ <modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.tuscany.testing</groupId>
- <artifactId>sca-itest</artifactId>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-itest</artifactId>
<version>1.0-incubating-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
+ <artifactId>tuscany-itest-callback-set-callback</artifactId>
+ <name>Apache Tuscany SCA Set Callback Integration Tests</name>
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.tuscany.testing</groupId>
- <artifactId>iTest-callback-setCallback</artifactId>
- <version>${testing.version}</version>
- <packaging>jar</packaging>
- <name>Test Suite for SCA Callback SetCallback</name>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-host-embedded</artifactId>
+ <version>1.0-incubating-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-implementation-java-runtime</artifactId>
+ <version>1.0-incubating-SNAPSHOT</version>
+ <scope>runtime</scope>
+ </dependency>
+ </dependencies>
</project>
Modified: incubator/tuscany/java/sca/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackServiceImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackServiceImpl.java?view=diff&rev=528915&r1=528914&r2=528915
==============================================================================
--- incubator/tuscany/java/sca/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackServiceImpl.java (original)
+++ incubator/tuscany/java/sca/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackServiceImpl.java Sat Apr 14 20:02:11 2007
@@ -20,7 +20,7 @@
import java.io.File;
-import org.osoa.sca.CompositeContext;
+import org.osoa.sca.ComponentContext;
import org.osoa.sca.RequestContext;
import org.osoa.sca.ServiceReference;
import org.osoa.sca.annotations.Callback;
@@ -33,7 +33,7 @@
@Callback
private CallBackSetCallbackCallback callback;
@Context
- private CompositeContext context;
+ private ComponentContext context;
public void knockKnock(String aString) {
Modified: incubator/tuscany/java/sca/itest/callback-set-callback/src/main/resources/CallBackSetCallbackTest.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/callback-set-callback/src/main/resources/CallBackSetCallbackTest.composite?view=diff&rev=528915&r1=528914&r2=528915
==============================================================================
--- incubator/tuscany/java/sca/itest/callback-set-callback/src/main/resources/CallBackSetCallbackTest.composite (original)
+++ incubator/tuscany/java/sca/itest/callback-set-callback/src/main/resources/CallBackSetCallbackTest.composite Sat Apr 14 20:02:11 2007
@@ -18,16 +18,13 @@
* under the License.
-->
<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- name="CallBackSetCallbackTest">
+ targetNamespace="http://callback"
+ name="CallBackSetCallbackTest">
<component name="CallBackSetCallbackClient">
<implementation.java class="org.apache.tuscany.sca.test.CallBackSetCallbackClientImpl"/>
- <reference name="aCallBackService">
- CallBackSetCallbackService
- </reference>
- <reference name="callBack">
- CallBackSetCallbackCallback
- </reference>
+ <reference name="aCallBackService" target="CallBackSetCallbackService"/>
+ <reference name="callBack" target="CallBackSetCallbackCallback"/>
</component>
<component name="CallBackSetCallbackCallback">
Modified: incubator/tuscany/java/sca/itest/callback-set-conversation/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/callback-set-conversation/pom.xml?view=diff&rev=528915&r1=528914&r2=528915
==============================================================================
--- incubator/tuscany/java/sca/itest/callback-set-conversation/pom.xml (original)
+++ incubator/tuscany/java/sca/itest/callback-set-conversation/pom.xml Sat Apr 14 20:02:11 2007
@@ -18,18 +18,28 @@
* under the License.
-->
<project>
+ <modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.tuscany.testing</groupId>
- <artifactId>sca-itest</artifactId>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-itest</artifactId>
<version>1.0-incubating-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
+ <artifactId>tuscany-itest-callback-set-conversation</artifactId>
+ <name>Apache Tuscany SCA Callback Set Conversation Integration Tests</name>
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.tuscany.testing</groupId>
- <artifactId>iTest-callback-setCallbackConversation</artifactId>
- <version>${testing.version}</version>
- <packaging>jar</packaging>
- <name>Test Suite for SCA Callback SetCallback Conversation</name>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-host-embedded</artifactId>
+ <version>1.0-incubating-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-implementation-java-runtime</artifactId>
+ <version>1.0-incubating-SNAPSHOT</version>
+ <scope>runtime</scope>
+ </dependency>
+ </dependencies>
</project>
Modified: incubator/tuscany/java/sca/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvClientImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvClientImpl.java?view=diff&rev=528915&r1=528914&r2=528915
==============================================================================
--- incubator/tuscany/java/sca/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvClientImpl.java (original)
+++ incubator/tuscany/java/sca/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvClientImpl.java Sat Apr 14 20:02:11 2007
@@ -32,8 +32,6 @@
@Reference
protected CallBackSetCallbackConvService aCallBackService;
- @Reference
- protected CallBackSetCallbackConvCallback callBack;
private CallBackSetCallbackConvObjectCallback aCallbackObject = null;
private Object monitor = new Object();
Modified: incubator/tuscany/java/sca/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvServiceImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvServiceImpl.java?view=diff&rev=528915&r1=528914&r2=528915
==============================================================================
--- incubator/tuscany/java/sca/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvServiceImpl.java (original)
+++ incubator/tuscany/java/sca/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvServiceImpl.java Sat Apr 14 20:02:11 2007
@@ -20,7 +20,7 @@
import java.io.File;
-import org.osoa.sca.CompositeContext;
+import org.osoa.sca.ComponentContext;
import org.osoa.sca.RequestContext;
import org.osoa.sca.ServiceReference;
import org.osoa.sca.annotations.Callback;
@@ -35,7 +35,7 @@
@Callback
private CallBackSetCallbackConvCallback callback;
@Context
- private CompositeContext context;
+ protected ComponentContext context;
public void knockKnock(String aString) {
Modified: incubator/tuscany/java/sca/itest/callback-set-conversation/src/main/resources/CallBackSetCallbackConvTest.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/callback-set-conversation/src/main/resources/CallBackSetCallbackConvTest.composite?view=diff&rev=528915&r1=528914&r2=528915
==============================================================================
--- incubator/tuscany/java/sca/itest/callback-set-conversation/src/main/resources/CallBackSetCallbackConvTest.composite (original)
+++ incubator/tuscany/java/sca/itest/callback-set-conversation/src/main/resources/CallBackSetCallbackConvTest.composite Sat Apr 14 20:02:11 2007
@@ -18,13 +18,12 @@
* under the License.
-->
<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- name="CallBackSetCallbackConvTest">
+ targetNamespace="http://callback"
+ name="CallBackSetCallbackConvTest">
<component name="CallBackSetCallbackConvClient">
<implementation.java class="org.apache.tuscany.sca.test.CallBackSetCallbackConvClientImpl"/>
- <reference name="aCallBackService">
- CallBackSetCallbackConvService
- </reference>
+ <reference name="aCallBackService" target="CallBackSetCallbackConvService"/>
</component>
Modified: incubator/tuscany/java/sca/itest/conversations/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/conversations/pom.xml?view=diff&rev=528915&r1=528914&r2=528915
==============================================================================
--- incubator/tuscany/java/sca/itest/conversations/pom.xml (original)
+++ incubator/tuscany/java/sca/itest/conversations/pom.xml Sat Apr 14 20:02:11 2007
@@ -18,18 +18,28 @@
* under the License.
-->
<project>
+ <modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.tuscany.testing</groupId>
- <artifactId>sca-itest</artifactId>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-itest</artifactId>
<version>1.0-incubating-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
+ <artifactId>tuscany-itest-conversations</artifactId>
+ <name>Apache Tuscany SCA Conversations Integration Tests</name>
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.tuscany.testing</groupId>
- <artifactId>iTest-conversations</artifactId>
- <version>${testing.version}</version>
- <packaging>jar</packaging>
- <name>Test Suite for SCA conversations</name>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-host-embedded</artifactId>
+ <version>1.0-incubating-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-implementation-java-runtime</artifactId>
+ <version>1.0-incubating-SNAPSHOT</version>
+ <scope>runtime</scope>
+ </dependency>
+ </dependencies>
</project>
Modified: incubator/tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/test/ConversationsClientImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/test/ConversationsClientImpl.java?view=diff&rev=528915&r1=528914&r2=528915
==============================================================================
--- incubator/tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/test/ConversationsClientImpl.java (original)
+++ incubator/tuscany/java/sca/itest/conversations/src/main/java/org/apache/tuscany/sca/test/ConversationsClientImpl.java Sat Apr 14 20:02:11 2007
@@ -5,9 +5,8 @@
import junit.framework.Assert;
-import org.osoa.sca.CompositeContext;
+import org.osoa.sca.ComponentContext;
import org.osoa.sca.ConversationEndedException;
-import org.osoa.sca.CurrentCompositeContext;
import org.osoa.sca.ServiceReference;
import org.osoa.sca.annotations.Context;
import org.osoa.sca.annotations.ConversationAttributes;
@@ -33,7 +32,7 @@
@Reference
protected ConversationsLifeCycleService aLifeCycleService;
@Context
- protected CompositeContext myContext; // This is broken Tuscany-965 defect has been opened.
+ protected ComponentContext myContext;
@ConversationID
protected String conversationID;
@@ -176,22 +175,23 @@
// Verify init() is called prior to any business methods. This is performed in the Service when any
// business methos is called.
- myContext = CurrentCompositeContext.getContext();
Assert.assertNotNull("current composite context",myContext);
// This tests creating a conversational session. And that @Init is run prior to business method.
- ServiceReference aServRef;
- aServRef = myContext.newSession("ConversationsLifeCycleService");
+ ServiceReference aServRef = null;
+ //FIXME Port to the 1.0 spec API
+ //aServRef = myContext.newSession("ConversationsLifeCycleService");
Assert.assertNotNull("Conversations - Test2 Service Reference 1 not returned", aServRef);
- //FIXME Port to the 1.0 spec API
+ //FIXME Port to the 1.0 spec API
//Get the session ID.
//Object aConversationID = aServRef.getSessionID();
ConversationsLifeCycleService aConversationsLifeCycleService = (ConversationsLifeCycleService) aServRef;
aConversationsLifeCycleService.knockKnock("Hello");
//Create a new session this time specifying a session ID. Verify the seesion id is what was specified.
- aServRef = myContext.newSession("ConversationsLifeCycleService","Test2-12345");
+ //FIXME Port to the 1.0 spec API
+ //aServRef = myContext.newSession("ConversationsLifeCycleService","Test2-12345");
Assert.assertNotNull("Conversations - Test2 Service Reference 2 not returned", aServRef);
//FIXME Port to the 1.0 spec API
//Get the session ID.
@@ -226,7 +226,6 @@
ConversationsLifeCycleService aConversationsLifeCycleService;
Object aConversationID;
- myContext = CurrentCompositeContext.getContext();
Assert.assertNotNull("current composite context",myContext);
ServiceReference aServRef;
this.removeMarkerFile();
@@ -235,7 +234,9 @@
// test3 variation #1 - Cannot be done annotation not implimented yet. 12/15/2006
//
- aServRef = myContext.newSession("ConversationsLifeCycleService");
+ //FIXME Port to the 1.0 spec API
+ //aServRef = myContext.newSession("ConversationsLifeCycleService");
+ aServRef = null;
Assert.assertNotNull("Conversations - Test3-1 Service Reference not returned", aServRef);
aConversationsLifeCycleService = (ConversationsLifeCycleService) aServRef;
@@ -260,7 +261,8 @@
// test3 variation #2 - Cannot be done annotation not implimented yet. 12/15/2006
//
- aServRef = myContext.newSession("ConversationsLifeCycleService");
+ //FIXME Port to the 1.0 spec API
+ //aServRef = myContext.newSession("ConversationsLifeCycleService");
Assert.assertNotNull("Conversations - Test3-2 Service Reference not returned", aServRef);
aConversationsLifeCycleService = (ConversationsLifeCycleService) aServRef;
@@ -285,7 +287,9 @@
// test3 variation #4 - Client calls endSession()
//
- aServRef = myContext.newSession("ConversationsLifeCycleService");
+ //FIXME Port to the 1.0 spec API
+ //aServRef = myContext.newSession("ConversationsLifeCycleService");
+ aServRef = null;
Assert.assertNotNull("Conversations - Test3-4 Service Reference not returned", aServRef);
aConversationsLifeCycleService = (ConversationsLifeCycleService) aServRef;
@@ -345,7 +349,6 @@
// service matches the client services internal state.
//
- myContext = CurrentCompositeContext.getContext();
Assert.assertNotNull("current composite context",myContext);
boolean result = aService.createServiceReferenceForSelf();
@@ -354,7 +357,9 @@
count = 6;
int returnCount = 0;
- ServiceReference myServiceReference = myContext.createServiceReferenceForSession(this,"ConversationsClient2");
+ //FIXME Port to the 1.0 spec API
+ //ServiceReference myServiceReference = myContext.createServiceReferenceForSession(this,"ConversationsClient2");
+ ServiceReference myServiceReference = null;
Assert.assertNotNull("test5 - createServiceReferenceForSession - myContext.createServiceReferenceForSession(this,ConversationsClient);", myServiceReference);
returnCount = aService.getCount(myServiceReference);
@@ -374,12 +379,13 @@
// a SessionEndedException.
//
- myContext = CurrentCompositeContext.getContext();
Assert.assertNotNull("current composite context",myContext);
// This tests creating a conversational session. This service has a maxAge="5 seconds".
ServiceReference aServRef;
- aServRef = myContext.newSession("ConversationsLifeCycleService");
+ //FIXME Port to the 1.0 spec API
+ //aServRef = myContext.newSession("ConversationsLifeCycleService");
+ aServRef = null;
Assert.assertNotNull("Conversations - Test6 Service Reference not returned", aServRef);
// Run a business method.
Modified: incubator/tuscany/java/sca/itest/conversations/src/main/resources/ConversationsTest.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/conversations/src/main/resources/ConversationsTest.composite?view=diff&rev=528915&r1=528914&r2=528915
==============================================================================
--- incubator/tuscany/java/sca/itest/conversations/src/main/resources/ConversationsTest.composite (original)
+++ incubator/tuscany/java/sca/itest/conversations/src/main/resources/ConversationsTest.composite Sat Apr 14 20:02:11 2007
@@ -18,19 +18,14 @@
* under the License.
-->
<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- name="ConversationsTest">
+ targetNamespace="http://conversations"
+ 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>
+ <reference name="aService" target="ConversationsService"/>
+ <reference name="anotherService" target="AnotherService"/>
+ <reference name="aLifeCycleService" target="ConversationLifeCycleService"/>
</component>
<component name="ConversationsService">
Propchange: incubator/tuscany/java/sca/itest/databindings/common/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Apr 14 20:02:11 2007
@@ -0,0 +1,14 @@
+target
+*.iws
+*.ipr
+*.iml
+.project
+.classpath
+maven.log
+velocity.log*
+junit*.properties
+surefire*.properties
+.settings
+.deployables
+.wtpmodules
+
Propchange: incubator/tuscany/java/sca/itest/databindings/interop/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Apr 14 20:02:11 2007
@@ -0,0 +1,14 @@
+target
+*.iws
+*.ipr
+*.iml
+.project
+.classpath
+maven.log
+velocity.log*
+junit*.properties
+surefire*.properties
+.settings
+.deployables
+.wtpmodules
+
Propchange: incubator/tuscany/java/sca/itest/databindings/jaxbgen/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Apr 14 20:02:11 2007
@@ -0,0 +1,14 @@
+target
+*.iws
+*.ipr
+*.iml
+.project
+.classpath
+maven.log
+velocity.log*
+junit*.properties
+surefire*.properties
+.settings
+.deployables
+.wtpmodules
+
Modified: incubator/tuscany/java/sca/itest/databindings/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/databindings/pom.xml?view=diff&rev=528915&r1=528914&r2=528915
==============================================================================
--- incubator/tuscany/java/sca/itest/databindings/pom.xml (original)
+++ incubator/tuscany/java/sca/itest/databindings/pom.xml Sat Apr 14 20:02:11 2007
@@ -19,10 +19,10 @@
-->
<project>
<parent>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-itest</artifactId>
- <version>1.0-incubating-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-itest</artifactId>
+ <version>1.0-incubating-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Propchange: incubator/tuscany/java/sca/itest/databindings/sdogen/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sat Apr 14 20:02:11 2007
@@ -0,0 +1,14 @@
+target
+*.iws
+*.ipr
+*.iml
+.project
+.classpath
+maven.log
+velocity.log*
+junit*.properties
+surefire*.properties
+.settings
+.deployables
+.wtpmodules
+
Modified: incubator/tuscany/java/sca/itest/operation-overloading/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/operation-overloading/pom.xml?view=diff&rev=528915&r1=528914&r2=528915
==============================================================================
--- incubator/tuscany/java/sca/itest/operation-overloading/pom.xml (original)
+++ incubator/tuscany/java/sca/itest/operation-overloading/pom.xml Sat Apr 14 20:02:11 2007
@@ -18,26 +18,28 @@
* under the License.
-->
<project>
- <parent>
- <groupId>org.apache.tuscany.testing</groupId>
- <artifactId>sca-itest</artifactId>
- <version>1.0-incubating-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <artifactId>iTest-operation-overloading</artifactId>
- <packaging>jar</packaging>
- <name>Test Suite Operator over loading.</name>
- <!-- JAX-WS temporary only until java.net maven2 repo is ready-->
- <dependencies>
- <!-- Required extensions -->
- <!-- End of Required extensions -->
- <dependency>
- <groupId>org.apache.tuscany.sca.kernel</groupId>
- <artifactId>tuscany-core</artifactId>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-itest</artifactId>
+ <version>1.0-incubating-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+ <artifactId>tuscany-itest-operation-overloading</artifactId>
+ <name>Apache Tuscany Operation Overloading Integration Tests</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-host-embedded</artifactId>
<version>1.0-incubating-SNAPSHOT</version>
- <scope>compile</scope>
</dependency>
-
- </dependencies>
+
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-implementation-java-runtime</artifactId>
+ <version>1.0-incubating-SNAPSHOT</version>
+ <scope>runtime</scope>
+ </dependency>
+ </dependencies>
</project>
Added: incubator/tuscany/java/sca/itest/operation-overloading/src/main/resources/OperationOverload.composite
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/operation-overloading/src/main/resources/OperationOverload.composite?view=auto&rev=528915
==============================================================================
--- incubator/tuscany/java/sca/itest/operation-overloading/src/main/resources/OperationOverload.composite (added)
+++ incubator/tuscany/java/sca/itest/operation-overloading/src/main/resources/OperationOverload.composite Sat Apr 14 20:02:11 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"
+ targetNamespace="http://foo"
+ xmlns:foo="http://foo"
+ name="OperationOverload">
+
+ <component name="OverloadASourceComponent">
+ <implementation.java class="org.apache.tuscany.sca.test.opoverload.impl.OverloadASource" />
+ <reference name="overloadASourceTarget" target="OverloadATargetComponent"/>
+ </component>
+
+ <component name="OverloadATargetComponent">
+ <implementation.java class="org.apache.tuscany.sca.test.opoverload.impl.OverloadATarget" />
+ </component>
+
+</composite>
Propchange: incubator/tuscany/java/sca/itest/operation-overloading/src/main/resources/OperationOverload.composite
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: incubator/tuscany/java/sca/itest/operation-overloading/src/test/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadATestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/operation-overloading/src/test/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadATestCase.java?view=diff&rev=528915&r1=528914&r2=528915
==============================================================================
--- incubator/tuscany/java/sca/itest/operation-overloading/src/test/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadATestCase.java (original)
+++ incubator/tuscany/java/sca/itest/operation-overloading/src/test/java/org/apache/tuscany/sca/test/opoverload/impl/OverloadATestCase.java Sat Apr 14 20:02:11 2007
@@ -21,12 +21,14 @@
import java.io.File;
import java.net.URL;
+import junit.framework.TestCase;
+
+import org.apache.tuscany.api.SCARuntime;
import org.apache.tuscany.sca.test.opoverload.OverloadASourceTarget;
-import org.apache.tuscany.test.SCATestCase;
import org.osoa.sca.CompositeContext;
import org.osoa.sca.CurrentCompositeContext;
-public class OverloadATestCase extends SCATestCase {
+public class OverloadATestCase extends TestCase {
private OverloadASourceTarget overloadA;
private CompositeContext context;
@@ -65,10 +67,7 @@
@Override
protected void setUp() throws Exception {
- File cdf = new File (".");
- String currentdir= cdf.getCanonicalPath();
- addExtension("org.apache.tuscany.sca.test.opoverload.interceptor", new URL("file:///" + currentdir + "/src/main/resources/org/apache/tuscany/sca/test/opoverload/interceptor/MessageInterceptor.scdl"));
- super.setUp();
+ SCARuntime.start("OperationOverload.composite");
context = CurrentCompositeContext.getContext();
assertNotNull(context);
overloadA = context.locateService(OverloadASourceTarget.class, "OverloadASourceComponent");
Modified: incubator/tuscany/java/sca/itest/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/pom.xml?view=diff&rev=528915&r1=528914&r2=528915
==============================================================================
--- incubator/tuscany/java/sca/itest/pom.xml (original)
+++ incubator/tuscany/java/sca/itest/pom.xml Sat Apr 14 20:02:11 2007
@@ -36,11 +36,23 @@
<activeByDefault>true</activeByDefault>
</activation>
<modules>
+ <module>callback-api</module>
+ <module>callback-basic</module>
+ <module>callback-complex-type</module>
+ <module>callback-id</module>
+ <module>callback-set-callback</module>
+ <module>callback-set-conversation</module>
<module>contribution</module>
+ <module>conversations</module>
+ <!--
+ <module>databindings</module>
+ -->
<module>exceptions</module>
+ <module>operation-overloading</module>
<!--
<module>properties</module>
<module>spec-api</module>
+ <module>wsdl</module>
-->
</modules>
</profile>
@@ -52,7 +64,7 @@
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.2</version>
- <scope>test</scope>
+ <scope>compile</scope>
</dependency>
<dependency>
Modified: incubator/tuscany/java/sca/itest/properties/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/properties/pom.xml?view=diff&rev=528915&r1=528914&r2=528915
==============================================================================
--- incubator/tuscany/java/sca/itest/properties/pom.xml (original)
+++ incubator/tuscany/java/sca/itest/properties/pom.xml Sat Apr 14 20:02:11 2007
@@ -1,39 +1,39 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<project>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-itest</artifactId>
- <version>1.0-incubating-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
- <artifactId>tuscany-itest-properties</artifactId>
- <name>Apache Tuscany Properties Integration Tests</name>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-embedded</artifactId>
- <version>1.0-incubating-SNAPSHOT</version>
- </dependency>
+<?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.
+-->
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-itest</artifactId>
+ <version>1.0-incubating-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+ <artifactId>tuscany-itest-properties</artifactId>
+ <name>Apache Tuscany Properties Integration Tests</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-host-embedded</artifactId>
+ <version>1.0-incubating-SNAPSHOT</version>
+ </dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
@@ -41,5 +41,5 @@
<version>1.0-incubating-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
- </dependencies>
-</project>
+ </dependencies>
+</project>
Modified: incubator/tuscany/java/sca/itest/wsdl/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/itest/wsdl/pom.xml?view=diff&rev=528915&r1=528914&r2=528915
==============================================================================
--- incubator/tuscany/java/sca/itest/wsdl/pom.xml (original)
+++ incubator/tuscany/java/sca/itest/wsdl/pom.xml Sat Apr 14 20:02:11 2007
@@ -18,73 +18,65 @@
* under the License.
-->
<project>
+ <modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache.tuscany.testing</groupId>
- <artifactId>sca-itest</artifactId>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-itest</artifactId>
<version>1.0-incubating-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
-
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.tuscany.testing</groupId>
- <artifactId>iTest-wsdl</artifactId>
- <version>${testing.version}</version>
- <packaging>jar</packaging>
- <name>Test Suite for SCA WSDL IDL</name>
+ <artifactId>tuscany-itest-wsdl</artifactId>
+ <name>Apache Tuscany WSDL Integration Tests</name>
<dependencies>
<dependency>
- <groupId>org.apache.tuscany.sca.kernel</groupId>
- <artifactId>tuscany-api</artifactId>
- <scope>compile</scope>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-host-embedded</artifactId>
<version>1.0-incubating-SNAPSHOT</version>
- </dependency>
+ </dependency>
+
<dependency>
- <groupId>org.apache.tuscany.sca.kernel</groupId>
- <artifactId>tuscany-core</artifactId>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-implementation-java-runtime</artifactId>
<version>1.0-incubating-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
+
<dependency>
- <groupId>org.apache.tuscany.sca.services.idl</groupId>
- <artifactId>tuscany-wsdl</artifactId>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-interface-wsdl</artifactId>
<version>1.0-incubating-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
+
<dependency>
- <groupId>org.apache.tuscany.sca.extensions.axis2</groupId>
- <artifactId>tuscany-axis2</artifactId>
- <scope>runtime</scope>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-binding-ws-axis2</artifactId>
<version>1.0-incubating-SNAPSHOT</version>
- </dependency>
+ <scope>runtime</scope>
+ </dependency>
+
<dependency>
- <groupId>org.apache.tuscany.sca.services</groupId>
- <artifactId>tuscany-http-jetty</artifactId>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-databinding-sdo</artifactId>
+ <version>1.0-incubating-SNAPSHOT</version>
<scope>runtime</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-databinding-axiom</artifactId>
<version>1.0-incubating-SNAPSHOT</version>
- </dependency>
+ <scope>runtime</scope>
+ </dependency>
+
<dependency>
- <groupId>org.apache.tuscany.sdo</groupId>
- <artifactId>tuscany-sdo-impl</artifactId>
- <version>${sdo.version}</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.tuscany.sca.services.databinding</groupId>
- <artifactId>databinding-sdo</artifactId>
- <version>${scaKernelVersion}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.tuscany.sca.extensions.axis2</groupId>
- <artifactId>databinding-axiom</artifactId>
- <version>${scaKernelVersion}</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.2</version>
- <scope>test</scope>
+ <groupId>org.apache.tuscany.sca</groupId>
+ <artifactId>tuscany-http-jetty</artifactId>
+ <version>1.0-incubating-SNAPSHOT</version>
+ <scope>runtime</scope>
</dependency>
+
</dependencies>
<build>
@@ -107,7 +99,8 @@
</configuration>
</execution>
</executions>
- </plugin>
+ </plugin>
+
<plugin>
<groupId>org.apache.tuscany.sdo</groupId>
<artifactId>tuscany-sdo-plugin</artifactId>
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org