gammaRef = componentContext.getServiceReference(Gamma.class, "gamma");
- gammaRef.getService().start();
- return gammaRef;
- }
-
-}
diff --git a/tags/java/sca/1.3.1-RC0/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/Gamma.java b/tags/java/sca/1.3.1-RC0/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/Gamma.java
deleted file mode 100644
index e32051373f..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/Gamma.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.itest.callablerefreturn;
-
-import org.osoa.sca.annotations.Conversational;
-import org.osoa.sca.annotations.EndsConversation;
-import org.osoa.sca.annotations.Remotable;
-
-@Remotable
-@Conversational
-public interface Gamma
-{
- void start();
-
- void doSomething();
-
- @EndsConversation
- void stop();
-}
diff --git a/tags/java/sca/1.3.1-RC0/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/GammaImpl.java b/tags/java/sca/1.3.1-RC0/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/GammaImpl.java
deleted file mode 100644
index adf5a1c1ce..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/callablereferences/src/main/java/org/apache/tuscany/sca/itest/callablerefreturn/GammaImpl.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.itest.callablerefreturn;
-
-import org.osoa.sca.annotations.ConversationID;
-import org.osoa.sca.annotations.Scope;
-
-@Scope("CONVERSATION")
-public class GammaImpl implements Gamma
-{
- @ConversationID
- protected String conversationId;
-
-
- public void start()
- {
- System.out.println("Gamma:start(), conversationId=" + conversationId);
- }
-
-
- public void doSomething()
- {
- System.out.println("Gamma:doSomething(), conversationId=" + conversationId);
- }
-
-
- public void stop()
- {
- System.out.println("Gamma:stop(), conversationId=" + conversationId);
- }
-}
diff --git a/tags/java/sca/1.3.1-RC0/itest/callablereferences/src/main/resources/CallableReferenceConversationalTest.composite b/tags/java/sca/1.3.1-RC0/itest/callablereferences/src/main/resources/CallableReferenceConversationalTest.composite
deleted file mode 100644
index 0bf8f7ef1e..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/callablereferences/src/main/resources/CallableReferenceConversationalTest.composite
+++ /dev/null
@@ -1,29 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/tags/java/sca/1.3.1-RC0/itest/callablereferences/src/main/resources/CallableReferenceReturnTest.composite b/tags/java/sca/1.3.1-RC0/itest/callablereferences/src/main/resources/CallableReferenceReturnTest.composite
deleted file mode 100644
index 5b3add1e61..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/callablereferences/src/main/resources/CallableReferenceReturnTest.composite
+++ /dev/null
@@ -1,39 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/callablereferences/src/main/resources/CallableReferenceTest.composite b/tags/java/sca/1.3.1-RC0/itest/callablereferences/src/main/resources/CallableReferenceTest.composite
deleted file mode 100644
index 49b75f56e4..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/callablereferences/src/main/resources/CallableReferenceTest.composite
+++ /dev/null
@@ -1,45 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/tags/java/sca/1.3.1-RC0/itest/callablereferences/src/main/resources/nodeA/CompositeA.composite b/tags/java/sca/1.3.1-RC0/itest/callablereferences/src/main/resources/nodeA/CompositeA.composite
deleted file mode 100644
index 9216f44191..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/callablereferences/src/main/resources/nodeA/CompositeA.composite
+++ /dev/null
@@ -1,46 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/tags/java/sca/1.3.1-RC0/itest/callablereferences/src/main/resources/nodeA/META-INF/sca-contribution.xml b/tags/java/sca/1.3.1-RC0/itest/callablereferences/src/main/resources/nodeA/META-INF/sca-contribution.xml
deleted file mode 100644
index 95021f72a4..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/callablereferences/src/main/resources/nodeA/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
-
-
\ No newline at end of file
diff --git a/tags/java/sca/1.3.1-RC0/itest/callablereferences/src/main/resources/nodeB/CompositeB.composite b/tags/java/sca/1.3.1-RC0/itest/callablereferences/src/main/resources/nodeB/CompositeB.composite
deleted file mode 100644
index 42d739564c..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/callablereferences/src/main/resources/nodeB/CompositeB.composite
+++ /dev/null
@@ -1,43 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/tags/java/sca/1.3.1-RC0/itest/callablereferences/src/main/resources/nodeB/META-INF/sca-contribution.xml b/tags/java/sca/1.3.1-RC0/itest/callablereferences/src/main/resources/nodeB/META-INF/sca-contribution.xml
deleted file mode 100644
index 2edda61601..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/callablereferences/src/main/resources/nodeB/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
-
-
\ No newline at end of file
diff --git a/tags/java/sca/1.3.1-RC0/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceConversationalTestCase.java b/tags/java/sca/1.3.1-RC0/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceConversationalTestCase.java
deleted file mode 100644
index a9cbb5d0a1..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceConversationalTestCase.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.itest.callableref;
-
-import junit.framework.Assert;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.apache.tuscany.sca.itest.callablerefconversational.ConversationalService;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.osoa.sca.ServiceReference;
-
-/**
- * Simple test case that creates a ServiceReference to a Conversational Component
- * using ComponentContext.createSelfReference()
- *
- * This test case is for TUSCANY-2208
- *
- * @version $Date$ $Revision$
- */
-public class CallableReferenceConversationalTestCase {
- private static SCADomain domain;
- private static ConversationalService acomponent;
-
- @BeforeClass
- public static void init() throws Exception {
- domain = SCADomain.newInstance("CallableReferenceConversationalTest.composite");
- Assert.assertNotNull(domain);
- acomponent = domain.getService(ConversationalService.class, "ConversationalComponent");
- }
-
- @AfterClass
- public static void destroy() throws Exception {
- if (domain != null) {
- domain.close();
- }
- }
-
- /**
- * This is a dummy test so that this Unit Test has a test so it will build.
- * Once TUSCANY-2208 is fixed, this dummy test method can be removed
- */
- @Test
- public void dummyTestRemoveWhenTuscany2208IsFixed() {
- }
-
- /**
- * Tests creating Self References and validate them with Conversation IDs
- */
- // Disabled until TUSCANY-2208 is fixed
- // @Test
- public void testCreateSelfRefUsingConvID() {
- Assert.assertNotNull(acomponent);
-
- final Object origConvID = acomponent.getConversationID();
- Assert.assertNotNull(origConvID);
- final ServiceReference ref = acomponent.createSelfRef();
- Assert.assertNotNull(ref);
-
- final ConversationalService resolvedRef = ref.getService();
- Assert.assertNotNull(resolvedRef);
- final Object newConvID = resolvedRef.getConversationID();
- Assert.assertNotNull(newConvID);
-
- Assert.assertEquals(origConvID, newConvID);
- }
-
- /**
- * Tests creating Self References and validate them with user specified data
- */
- // Disabled until TUSCANY-2208 is fixed
- // @Test
- public void testCreateSelfRefUsingUserData() {
- Assert.assertNotNull(acomponent);
-
- final String origUserData = acomponent.getUserData();
- Assert.assertEquals(ConversationalService.DEFAULT_USER_DATA, origUserData);
-
- final String userData = "Some new user data set at " + System.currentTimeMillis();
- acomponent.setUserData(userData);
-
- final ServiceReference ref = acomponent.createSelfRef();
- Assert.assertNotNull(ref);
-
- final ConversationalService resolvedRef = ref.getService();
- Assert.assertNotNull(resolvedRef);
- final String newUserData = resolvedRef.getUserData();
- Assert.assertNotNull(newUserData);
-
- Assert.assertEquals(userData, newUserData);
- }
-}
diff --git a/tags/java/sca/1.3.1-RC0/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceRemoteTestCase.java b/tags/java/sca/1.3.1-RC0/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceRemoteTestCase.java
deleted file mode 100644
index a52f4de71b..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceRemoteTestCase.java
+++ /dev/null
@@ -1,145 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.itest.callableref;
-
-
-import static junit.framework.Assert.assertEquals;
-
-import java.io.File;
-
-import junit.framework.Assert;
-
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode2;
-import org.apache.tuscany.sca.node.SCANode2Factory;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-
-/**
- * Runs a distributed domain in a single VM by using and in memory
- * implementation of the distributed domain
- */
-public class CallableReferenceRemoteTestCase {
-
- private static SCANode2 nodeA;
- private static SCANode2 nodeB;
-
- private static AComponent acomponent;
-
- @BeforeClass
- public static void init() throws Exception {
-
- try {
-
- System.out.println("Setting up nodes");
-
- SCANode2Factory nodeFactory = SCANode2Factory.newInstance();
- nodeA = nodeFactory.createSCANode(new File("src/main/resources/nodeA/CompositeA.composite").toURL().toString(),
- new SCAContribution("TestContribution",
- new File("src/main/resources/nodeA").toURL().toString()));
-
-
- nodeB = nodeFactory.createSCANode(new File("src/main/resources/nodeB/CompositeB.composite").toURL().toString(),
- new SCAContribution("TestContribution",
- new File("src/main/resources/nodeB").toURL().toString()));
-
-
- nodeA.start();
- nodeB.start();
-
- acomponent = ((SCAClient)nodeA).getService(AComponent.class, "AComponent/AComponent");
-
- } catch (Throwable ex) {
- System.out.println(ex.toString());
- // Print detailed cause information.
- ex.printStackTrace();
- StringBuffer sb = new StringBuffer();
- Throwable cause = ex.getCause();
- while ( cause != null ) {
- sb.append( " " );
- System.out.println( sb.toString() + "Cause: " + cause );
- if (cause instanceof java.lang.reflect.InvocationTargetException)
- System.out.println( sb.toString() + "Target Exception: " + ((java.lang.reflect.InvocationTargetException)cause).getTargetException() );
- cause = cause.getCause();
- }
- }
- }
-
- @AfterClass
- public static void destroy() throws Exception {
- // stop the nodes and hence the domains they contain
- nodeA.stop();
- nodeB.stop();
- }
-
- //@Test
- public void testKeepServerRunning1() throws Exception {
- System.out.println("press enter to continue");
- System.in.read();
- }
-
- @Test
- public void testBReference() {
- assertEquals("BComponent", acomponent.fooB());
- }
-
- @Test
- public void testBCast() {
- assertEquals("BComponent", acomponent.fooB1());
- }
-
- @Test
- public void testCReference() {
- assertEquals("CComponent", acomponent.fooC());
- }
-
- @Test
- public void testCServiceReference() {
- assertEquals("CComponent", acomponent.fooC1());
- }
-
- @Test
- public void testDReferenceString() {
- assertEquals("DAComponent", acomponent.fooStringD());
- }
-
- @Test
- public void testDReference() {
- assertEquals("DAComponent", acomponent.fooD());
- }
-
-
- @Test
- public void testBCReference() {
- assertEquals("BCComponent", acomponent.fooBC());
- }
-
- @Test
- public void testRequiredFalseReference() {
- try {
- acomponent.getDReference().foo(null);
- } catch (Exception e) {
- Assert.assertTrue(true);
- }
- }
-
-}
diff --git a/tags/java/sca/1.3.1-RC0/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceReturnTestCase.java b/tags/java/sca/1.3.1-RC0/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceReturnTestCase.java
deleted file mode 100644
index f2d8fe5d64..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceReturnTestCase.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.itest.callableref;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.apache.tuscany.sca.itest.callablerefreturn.Alpha;
-import org.junit.AfterClass;
-import org.junit.Assert;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-public class CallableReferenceReturnTestCase {
- private static SCADomain domain;
- private static Alpha alpha;
-
- @BeforeClass
- public static void init() throws Exception {
- domain = SCADomain.newInstance("CallableReferenceReturnTest.composite");
- alpha = domain.getService(Alpha.class, "Alpha");
- }
-
- @AfterClass
- public static void destroy() throws Exception {
- domain.close();
- }
-
- @Test
- public void testCallableReferenceReturn() {
- Assert.assertTrue(alpha.run());
- }
-
-}
diff --git a/tags/java/sca/1.3.1-RC0/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceTestCase.java b/tags/java/sca/1.3.1-RC0/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceTestCase.java
deleted file mode 100644
index 2b7750b443..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/callablereferences/src/test/java/org/apache/tuscany/sca/itest/callableref/CallableReferenceTestCase.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.itest.callableref;
-
-import static junit.framework.Assert.assertEquals;
-import junit.framework.Assert;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-public class CallableReferenceTestCase {
- private static SCADomain domain;
- private static AComponent acomponent;
-
- @BeforeClass
- public static void init() throws Exception {
- domain = SCADomain.newInstance("CallableReferenceTest.composite");
- acomponent = domain.getService(AComponent.class, "AComponent");
- }
-
- @AfterClass
- public static void destroy() throws Exception {
- domain.close();
- }
-
- @Test
- public void testBReference() {
- assertEquals("BComponent", acomponent.fooB());
- }
-
- @Test
- public void testBCast() {
- assertEquals("BComponent", acomponent.fooB1());
- }
-
- @Test
- public void testCReference() {
- assertEquals("CComponent", acomponent.fooC());
- }
-
- @Test
- public void testCServiceReference() {
- assertEquals("CComponent", acomponent.fooC1());
- }
-
- @Test
- public void testDReference() {
- assertEquals("DAComponent", acomponent.fooD());
- }
-
- @Test
- public void testBCReference() {
- assertEquals("BCComponent", acomponent.fooBC());
- }
-
- @Test
- public void testRequiredFalseReference() {
- try {
- acomponent.getDReference().foo(null);
- } catch (Exception e) {
- Assert.assertTrue(true);
- }
- }
-
-}
diff --git a/tags/java/sca/1.3.1-RC0/itest/callback-api/pom.xml b/tags/java/sca/1.3.1-RC0/itest/callback-api/pom.xml
deleted file mode 100644
index d98fbcab3b..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/callback-api/pom.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-
-
-
- 4.0.0
-
- org.apache.tuscany.sca
- tuscany-itest
- 1.3.1
- ../pom.xml
-
- itest-callback-api
- Apache Tuscany SCA Callback API Integration Tests
-
-
-
- org.apache.tuscany.sca
- tuscany-host-embedded
- 1.3.1
-
-
-
- org.apache.tuscany.sca
- tuscany-implementation-java-runtime
- 1.3.1
- runtime
-
-
-
-
- ${basedir}/../build-was-integration.xml
- ${basedir}/../wasAdmin.py
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiCallBack.java b/tags/java/sca/1.3.1-RC0/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiCallBack.java
deleted file mode 100644
index de17ba2f0d..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiCallBack.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.test;
-
-import org.osoa.sca.annotations.Remotable;
-
-@Remotable
-/**
- *
- */
-public interface CallBackApiCallBack {
- /**
- * This function is defined in CallBackApiClientImpl
- */
- public void callBackMessage(String aString);
-
- /**
- * This function is defined in CallBackApiClientImpl
- */
- public void callBackIncrement(String aString);
-
-}
diff --git a/tags/java/sca/1.3.1-RC0/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiClient.java b/tags/java/sca/1.3.1-RC0/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiClient.java
deleted file mode 100644
index 5fd4a71466..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiClient.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.test;
-
-import org.osoa.sca.annotations.Remotable;
-
-@Remotable
-public interface CallBackApiClient {
- /**
- * This function is defined in CallBackApiClientImpl
- */
- public void run();
-
-}
diff --git a/tags/java/sca/1.3.1-RC0/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiClientImpl.java b/tags/java/sca/1.3.1-RC0/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiClientImpl.java
deleted file mode 100644
index 274984abb3..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiClientImpl.java
+++ /dev/null
@@ -1,206 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.test;
-
-import junit.framework.Assert;
-
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Service;
-
-@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();
-
- /**
- * This test calls function test 3a,3a1,3b,3c
- */
- public void run() {
-
- // This tests basic callback patterns.
-
- // Test3a is the basic callback where the target calls back prior to
- // returning to the client.
- test3a();
-
- test3a1();
-
- // Test3b is where the target does not call back to the client.
- test3b();
-
- // Test3c is where the target calls back multiple times to the client.
- test3c();
-
- return;
- }
-
- /**
- * This test is the basic callback where the target calls back prior to returning to the client.
- */
-
- private void test3a() {
- aCallBackService.knockKnock("Knock Knock");
- int count = 0;
-
- //
- // If we can't get a response in 30 seconds consider this a failure
- //
-
- synchronized (monitor) {
- while (returnMessage == null && count++ < 30) {
- try {
- monitor.wait(1000L);
- } catch (InterruptedException e) {
- e.printStackTrace();
- }
- }
- }
-
- Assert.assertEquals("CallBackApiITest - test3a", "Who's There", this.getReturnMessage());
-
- }
-
- /**
- * This test is the basic callback where the target calls back prior to returning to the client.
- */
- private void test3a1() {
- aCallBackService.knockKnockByRef("Knock Knock");
- int count = 0;
-
- //
- // If we can't get a response in 30 seconds consider this a failure
- //
-
- synchronized (monitor) {
- while (returnMessage == null && count++ < 30) {
- try {
- monitor.wait(1000L);
- } catch (InterruptedException e) {
- e.printStackTrace();
- }
- }
- }
-
- Assert.assertEquals("CallBackApiITest - test3a", "Who's There", this.getReturnMessage());
-
- }
-
- /**
- * This test is the basic callback where the target does not call back to the client
- */
- private void test3b() {
- aCallBackService.noCallBack("No Reply Desired");
- Assert.assertEquals("CallBackApiITest - test3b", 1, 1);
- return;
- }
-
- /**
- * This test is the basic callback where the target calls back multiple times to the client
- */
-
- private void test3c() {
- aCallBackService.multiCallBack("Call me back 3 times");
- int count = 0;
-
- //
- // If we can't get a response in 30 seconds consider this a failure
- //
-
- synchronized (monitor) {
- while (this.getCallBackCount() < 3 && count++ < 30) {
- try {
- monitor.wait(1000L);
- } catch (InterruptedException e) {
- e.printStackTrace();
- }
- }
- }
-
- Assert.assertEquals("CallBackApiITest - test3c", 3, this.getCallBackCount());
- return;
- }
-
- /**
- * This function returns a string
- *
- * @param void
- * @return String result string
- */
-
- public String getReturnMessage() {
- return returnMessage;
- }
-
- /**
- * This function set the returnMessage string
- *
- * @param String
- */
- public void setReturnMessage(String aReturnMessage) {
- returnMessage = aReturnMessage;
- }
-
- /**
- * This function returns the callBackCount variable
- *
- * @return Integer callBackCount variable
- */
- public int getCallBackCount() {
- return callBackCount;
- }
-
- /**
- * This function increments callBackCount variable by 1
- */
- public void incrementCallBackCount() {
- callBackCount++;
- }
-
- /**
- * This function prints a message synched with setReturnMessage function
- *
- * @param String
- */
- public void callBackMessage(String aString) {
- System.out.println("Entering callback callBackMessage: " + aString);
- synchronized (monitor) {
- this.setReturnMessage(aString);
- monitor.notify();
- }
- }
-
- /**
- * This function prints a message synched with incrementCallBackCount function
- *
- * @param String
- */
- public void callBackIncrement(String aString) {
- System.out.println("Entering callback increment: " + aString);
- synchronized (monitor) {
- this.incrementCallBackCount();
- monitor.notify();
- }
- }
-
-}
diff --git a/tags/java/sca/1.3.1-RC0/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiService.java b/tags/java/sca/1.3.1-RC0/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiService.java
deleted file mode 100644
index 33de1e7739..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiService.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.test;
-
-import org.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.Remotable;
-
-@Remotable
-@Callback(CallBackApiCallBack.class)
-/**
- *
- */
-public interface CallBackApiService {
- /**
- * This function is defined in CallBackApiServiceImpl
- */
- public void knockKnock(String aString);
-
- /**
- * This function is defined in CallBackApiServiceImpl
- */
- public void knockKnockByRef(String aString);
-
- /**
- * This function is defined in CallBackApiServiceImpl
- */
- public void noCallBack(String aString);
-
- /**
- * This function is defined in CallBackApiServiceImpl
- */
- public void multiCallBack(String aString);
-
-}
diff --git a/tags/java/sca/1.3.1-RC0/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiServiceImpl.java b/tags/java/sca/1.3.1-RC0/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiServiceImpl.java
deleted file mode 100644
index 61e2c7ee8f..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/callback-api/src/main/java/org/apache/tuscany/sca/test/CallBackApiServiceImpl.java
+++ /dev/null
@@ -1,123 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.test;
-
-import org.osoa.sca.CallableReference;
-import org.osoa.sca.ComponentContext;
-import org.osoa.sca.RequestContext;
-import org.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.Context;
-import org.osoa.sca.annotations.Service;
-
-@Service(CallBackApiService.class)
-public class CallBackApiServiceImpl implements CallBackApiService {
-
- @Context
- protected ComponentContext componentContext;
- /**
- * Object of CallBackApiCallBack class
- */
- private CallBackApiCallBack callback;
-
- @Callback
- protected CallableReference callbackRef;
-
- /**
- * This function get an object of CallBackApiServiceImpl by calling getCallBackInterface function and calls the
- * callBackMessage function.
- *
- * @param aString String passed by a function call
- */
-
- public void knockKnock(String aString) {
-
- System.out.println("CallBackApiServiceImpl message received: " + aString);
- callback = this.getCallBackInterface();
- callback.callBackMessage("Who's There");
- System.out.println("CallBackApiServiceImpl response sent");
- return;
-
- }
-
- /**
- * This function calls the callBackMessage function.
- * The reference to this function is received from Call back reference to the class CallBackApiService.
- *
- * @param aString String passed by a function call
- */
- public void knockKnockByRef(String aString) {
-
- System.out.println("CallBackApiServiceImpl message received: " + aString);
- callbackRef.getService().callBackMessage("Who's There");
- System.out.println("CallBackApiServiceImpl response sent");
- return;
-
- }
-
- /**
- * This function get an object of CallBackApiServiceImpl by calling getCallBackInterface function.
- * This function then places multiple callBack using the callbackIncrement function defined in
- * callBack.ApiServiceImpl
- *
- * @param aString String passed by a function call
- */
- public void multiCallBack(String aString) {
-
- callback = this.getCallBackInterface();
-
- System.out.println("CallBackApiServiceImpl message received: " + aString);
- callback.callBackIncrement("Who's There 1");
- System.out.println("CallBackApiServiceImpl response sent");
- callback.callBackIncrement("Who's There 2");
- System.out.println("CallBackApiServiceImpl response sent");
- callback.callBackIncrement("Who's There 3");
- System.out.println("CallBackApiServiceImpl response sent");
- return;
-
- }
-
- /**
- * This function does not callBack any function.
- *
- * @param aString String passed by a function call
- */
- public void noCallBack(String aString) {
-
- System.out.println("CallBackApiServiceImpl message received: " + aString);
-
- return;
-
- }
-
- /**
- * This function get an object of CallBackApiServiceImpl from the present componentContext
- *
- * @param void
- */
- private CallBackApiCallBack getCallBackInterface() {
- System.out.println("CallBackApiServiceImpl getting request context");
- RequestContext rc = componentContext.getRequestContext();
- System.out.println("CallBackApiServiceImpl getting callback from request context");
- callback = rc.getCallback();
- System.out.println("CallBackApiServiceImpl returning callback");
- return callback;
-
- }
-
-}
diff --git a/tags/java/sca/1.3.1-RC0/itest/callback-api/src/main/resources/CallBackApiTest.composite b/tags/java/sca/1.3.1-RC0/itest/callback-api/src/main/resources/CallBackApiTest.composite
deleted file mode 100644
index 946c4862ee..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/callback-api/src/main/resources/CallBackApiTest.composite
+++ /dev/null
@@ -1,33 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/callback-api/src/main/resources/META-INF/sca-contribution.xml b/tags/java/sca/1.3.1-RC0/itest/callback-api/src/main/resources/META-INF/sca-contribution.xml
deleted file mode 100644
index 19eb25631e..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/callback-api/src/main/resources/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
-
-
\ No newline at end of file
diff --git a/tags/java/sca/1.3.1-RC0/itest/callback-api/src/test/java/org/apache/tuscany/sca/test/CallBackApiTestCase.java b/tags/java/sca/1.3.1-RC0/itest/callback-api/src/test/java/org/apache/tuscany/sca/test/CallBackApiTestCase.java
deleted file mode 100644
index 9471049c74..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/callback-api/src/test/java/org/apache/tuscany/sca/test/CallBackApiTestCase.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.test;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-public class CallBackApiTestCase extends TestCase {
-
- private static SCADomain domain;
- private CallBackApiClient aCallBackClient;
-
- /**
- * This function uses the Instance of CallBackApiClient.class
- * This function calls the run function defined in the CallBackApiClinet Interface
- * which in turn executes the following test cases.
- * 1. Basic callback patterns
- * 2. Test in which the target does not call back to the client
- * 3. Test in which the target calls back multiple times to the client.
- */
- public void testCallBackBasic() {
- aCallBackClient.run();
- }
-
- /**
- * This function creates the SCADomain instance and gets an Instance of CallBackApiClient.class
- */
- @Override
- protected void setUp() throws Exception {
- if (domain == null) {
- domain = SCADomain.newInstance("CallBackApiTest.composite");
- }
-
- aCallBackClient = domain.getService(CallBackApiClient.class, "CallBackApiClient");
- }
-
- /**
- * This function destroys the SCADomain instance that was created in setUp()
- */
- @Override
- protected void tearDown() throws Exception {
- domain.close();
- }
-
-}
diff --git a/tags/java/sca/1.3.1-RC0/itest/callback-basic/pom.xml b/tags/java/sca/1.3.1-RC0/itest/callback-basic/pom.xml
deleted file mode 100644
index 6b22ed2177..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/callback-basic/pom.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-
-
-
- 4.0.0
-
- org.apache.tuscany.sca
- tuscany-itest
- 1.3.1
- ../pom.xml
-
- itest-callback-basic
- Apache Tuscany SCA Callback Basic Integration Tests
-
-
-
- org.apache.tuscany.sca
- tuscany-host-embedded
- 1.3.1
-
-
-
- org.apache.tuscany.sca
- tuscany-implementation-java-runtime
- 1.3.1
- runtime
-
-
-
-
- ${basedir}/../build-was-integration.xml
- ${basedir}/../wasAdmin.py
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicCallBack.java b/tags/java/sca/1.3.1-RC0/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicCallBack.java
deleted file mode 100644
index 5e9d3d6821..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicCallBack.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.test;
-
-import org.osoa.sca.annotations.Remotable;
-
-@Remotable
-/**
- *
- */
-public interface CallBackBasicCallBack {
-
- public void callBackMessage(String aString);
-
- public void callBackIncrement(String aString);
-
-}
diff --git a/tags/java/sca/1.3.1-RC0/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClient.java b/tags/java/sca/1.3.1-RC0/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClient.java
deleted file mode 100644
index 9f4019f28c..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClient.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.test;
-
-import org.osoa.sca.annotations.Remotable;
-
-@Remotable
-public interface CallBackBasicClient {
-
- public void run();
-
-}
diff --git a/tags/java/sca/1.3.1-RC0/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClientImpl.java b/tags/java/sca/1.3.1-RC0/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClientImpl.java
deleted file mode 100644
index e0e6d7eb8c..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClientImpl.java
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.test;
-
-import junit.framework.Assert;
-
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Service;
-
-@Service(CallBackBasicClient.class)
-public class CallBackBasicClientImpl implements CallBackBasicClient, CallBackBasicCallBack {
-
- @Reference
- protected CallBackBasicService aCallBackService;
- private static String returnMessage = null;
- private static int callBackCount = 0;
- private static Object monitor = new Object();
-
- public void run() {
-
- // This tests basic callback patterns.
-
- // Test1 is the basic callback where the target calls back prior to
- // returning to the client.
- test1a();
-
- // Test2 is where the target does not call back to the client.
- test1b();
-
- // Test3 is where the target calls back multiple times to the client.
- test1c();
-
- return;
- }
-
- private void test1a() {
- aCallBackService.knockKnock("Knock Knock");
- int count = 0;
-
- //
- // If we can't get a response in 30 seconds consider this a failure
- //
-
- synchronized (monitor) {
- while (returnMessage == null && count++ < 30) {
- try {
- monitor.wait(1000L);
- } catch (InterruptedException e) {
- e.printStackTrace();
- }
- }
- }
-
- Assert.assertEquals("CallBackBasicITest - test1a", "Who's There", this.getReturnMessage());
-
- }
-
- private void test1b() {
- aCallBackService.noCallBack("No Reply Desired");
- Assert.assertEquals("CallBackBasicITest - test1b", 1, 1);
-
- return;
- }
-
- private void test1c() {
- aCallBackService.multiCallBack("Call me back 3 times");
- int count = 0;
-
- //
- // If we can't get a response in 30 seconds consider this a failure
- //
-
- synchronized (monitor) {
- while (this.getCallBackCount() < 3 && count++ < 30) {
- try {
- monitor.wait(1000L);
- } catch (InterruptedException e) {
- e.printStackTrace();
- }
- }
- }
-
- Assert.assertEquals("CallBackBasicITest - test1c", 3, this.getCallBackCount());
- return;
- }
-
- public String getReturnMessage() {
- return returnMessage;
- }
-
- public void setReturnMessage(String aReturnMessage) {
- returnMessage = aReturnMessage;
- }
-
- public int getCallBackCount() {
- return callBackCount;
- }
-
- public void incrementCallBackCount() {
- callBackCount++;
- }
-
- public void callBackMessage(String aString) {
- System.out.println("Entering callback callBackMessage: " + aString);
- synchronized (monitor) {
- this.setReturnMessage(aString);
- monitor.notify();
- }
- }
-
- public void callBackIncrement(String aString) {
- System.out.println("Entering callback increment: " + aString);
- synchronized (monitor) {
- this.incrementCallBackCount();
- monitor.notify();
- }
- }
-
-}
diff --git a/tags/java/sca/1.3.1-RC0/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicService.java b/tags/java/sca/1.3.1-RC0/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicService.java
deleted file mode 100644
index bd41fa7037..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicService.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.test;
-
-import org.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.Remotable;
-
-@Remotable
-@Callback(CallBackBasicCallBack.class)
-/**
- *
- */
-public interface CallBackBasicService {
-
- public void knockKnock(String aString);
-
- public void noCallBack(String aString);
-
- public void multiCallBack(String aString);
-
-}
diff --git a/tags/java/sca/1.3.1-RC0/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicServiceImpl.java b/tags/java/sca/1.3.1-RC0/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicServiceImpl.java
deleted file mode 100644
index 4ca2dc9af9..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/callback-basic/src/main/java/org/apache/tuscany/sca/test/CallBackBasicServiceImpl.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.test;
-
-import org.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.Service;
-
-@Service(CallBackBasicService.class)
-public class CallBackBasicServiceImpl implements CallBackBasicService {
-
- @Callback
- protected CallBackBasicCallBack callback;
-
- public void knockKnock(String aString) {
-
- System.out.println("CallBackBasicServiceImpl message received: " + aString);
- callback.callBackMessage("Who's There");
- System.out.println("CallBackBasicServiceImpl response sent");
- return;
-
- }
-
- public void multiCallBack(String aString) {
-
- System.out.println("CallBackBasicServiceImpl message received: " + aString);
- callback.callBackIncrement("Who's There 1");
- System.out.println("CallBackBasicServiceImpl response sent");
- callback.callBackIncrement("Who's There 2");
- System.out.println("CallBackBasicServiceImpl response sent");
- callback.callBackIncrement("Who's There 3");
- System.out.println("CallBackBasicServiceImpl response sent");
- return;
-
- }
-
- public void noCallBack(String aString) {
-
- System.out.println("CallBackBasicServiceImpl message received: " + aString);
- // System.out.println("CallBackBasicServiceImpl No response desired");
- return;
-
- }
-}
diff --git a/tags/java/sca/1.3.1-RC0/itest/callback-basic/src/main/resources/CallBackBasicTest.composite b/tags/java/sca/1.3.1-RC0/itest/callback-basic/src/main/resources/CallBackBasicTest.composite
deleted file mode 100644
index c506956088..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/callback-basic/src/main/resources/CallBackBasicTest.composite
+++ /dev/null
@@ -1,33 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/callback-basic/src/main/resources/META-INF/sca-contribution.xml b/tags/java/sca/1.3.1-RC0/itest/callback-basic/src/main/resources/META-INF/sca-contribution.xml
deleted file mode 100644
index adf28214f6..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/callback-basic/src/main/resources/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
-
-
\ No newline at end of file
diff --git a/tags/java/sca/1.3.1-RC0/itest/callback-basic/src/test/java/org/apache/tuscany/sca/test/CallBackBasicTestCase.java b/tags/java/sca/1.3.1-RC0/itest/callback-basic/src/test/java/org/apache/tuscany/sca/test/CallBackBasicTestCase.java
deleted file mode 100644
index 32c26a348a..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/callback-basic/src/test/java/org/apache/tuscany/sca/test/CallBackBasicTestCase.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * 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.
- */
-
-package org.apache.tuscany.sca.test;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-public class CallBackBasicTestCase extends TestCase {
-
- private static SCADomain domain;
- private CallBackBasicClient aCallBackClient;
-
- public void testCallBackBasic() {
- aCallBackClient.run();
- }
-
- @Override
- protected void setUp() throws Exception {
- if( domain==null ) {
- domain = SCADomain.newInstance("CallBackBasicTest.composite");
- }
-
- aCallBackClient = domain.getService(CallBackBasicClient.class, "CallBackBasicClient");
- }
-
- @Override
- protected void tearDown() throws Exception {
- domain.close();
- }
-
-
-}
diff --git a/tags/java/sca/1.3.1-RC0/itest/callback-complex-type/pom.xml b/tags/java/sca/1.3.1-RC0/itest/callback-complex-type/pom.xml
deleted file mode 100644
index 0068f2f922..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/callback-complex-type/pom.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-
-
-
- 4.0.0
-
- org.apache.tuscany.sca
- tuscany-itest
- 1.3.1
- ../pom.xml
-
- itest-callback-complex-type
- Apache Tuscany SCA Callback Complex Type Integration Tests
-
-
-
- org.apache.tuscany.sca
- tuscany-host-embedded
- 1.3.1
-
-
-
- org.apache.tuscany.sca
- tuscany-implementation-java-runtime
- 1.3.1
- runtime
-
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeCallBack.java b/tags/java/sca/1.3.1-RC0/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeCallBack.java
deleted file mode 100644
index 9fddb850ba..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeCallBack.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.test;
-
-import org.osoa.sca.annotations.Remotable;
-
-@Remotable
-/**
- *
- */
-public interface CallBackCTypeCallBack {
-
- public void callBackMessage(String aString);
-
- public void callBackIncrement(String aString);
-
-}
diff --git a/tags/java/sca/1.3.1-RC0/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeClient.java b/tags/java/sca/1.3.1-RC0/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeClient.java
deleted file mode 100644
index 739983c277..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeClient.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.test;
-
-import org.osoa.sca.annotations.Remotable;
-
-@Remotable
-public interface CallBackCTypeClient {
-
- public void run();
-
-}
diff --git a/tags/java/sca/1.3.1-RC0/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeClientImpl.java b/tags/java/sca/1.3.1-RC0/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeClientImpl.java
deleted file mode 100644
index d2b03fcde7..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeClientImpl.java
+++ /dev/null
@@ -1,142 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.test;
-
-import junit.framework.Assert;
-
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Service;
-
-@Service(CallBackCTypeClient.class)
-public class CallBackCTypeClientImpl implements CallBackCTypeClient, CallBackCTypeCallBack {
-
- @Reference
- protected CallBackCTypeService aCallBackService;
- private static String returnMessage = null;
- private static int callBackCount = 0;
- private static Object monitor = new Object();
-
- public CallBackCTypeClientImpl() {
- }
-
- public void run() {
-
- // This test is the same as the Basic Callback except it uses a
- // componentType side file.
- // This test currently fails because the integration test environment
- // does not properly copy
- // the componentType files to the target folder. This is documented in
- // Tuscany-967.
-
- // Test12a is the basic callback where the target calls back prior to
- // returning to the client.
- test12a();
-
- // Test12b is where the target does not call back to the client.
- test12b();
-
- // Test12c is where the target calls back multiple times to the client.
- test12c();
-
- return;
- }
-
- private void test12a() {
- aCallBackService.knockKnock("Knock Knock");
- int count = 0;
-
- //
- // If we can't get a response in 30 seconds consider this a failure
- //
-
- synchronized (monitor) {
- while (returnMessage == null && count++ < 30) {
- try {
- monitor.wait(1000L);
- } catch (InterruptedException e) {
- e.printStackTrace();
- }
- }
- }
-
- Assert.assertEquals("CallBackBasicITest - test12a -", "Who's There", this.getReturnMessage());
-
- }
-
- private void test12b() {
- aCallBackService.noCallBack("No Reply Desired");
- Assert.assertEquals("CallBackBasicITest - test12b -", 1, 1);
- return;
- }
-
- private void test12c() {
- aCallBackService.multiCallBack("Call me back 3 times");
- int count = 0;
-
- //
- // If we can't get a response in 30 seconds consider this a failure
- //
-
- synchronized (monitor) {
- while (this.getCallBackCount() < 3 && count++ < 30) {
- try {
- monitor.wait(1000L);
- } catch (InterruptedException e) {
- e.printStackTrace();
- }
- }
- }
-
- Assert.assertEquals("CallBackBasicITest - test12c -", 3, this.getCallBackCount());
- return;
- }
-
- public String getReturnMessage() {
- return returnMessage;
- }
-
- public void setReturnMessage(String aReturnMessage) {
- returnMessage = aReturnMessage;
- }
-
- public int getCallBackCount() {
- return callBackCount;
- }
-
- public void incrementCallBackCount() {
- callBackCount++;
- }
-
- public void callBackMessage(String aString) {
- System.out.println("Entering callback callBackMessage: " + aString);
- synchronized (monitor) {
- this.setReturnMessage(aString);
- monitor.notify();
- }
- }
-
- public void callBackIncrement(String aString) {
- System.out.println("Entering callback increment: " + aString);
- synchronized (monitor) {
- this.incrementCallBackCount();
- monitor.notify();
- }
- }
-
-}
diff --git a/tags/java/sca/1.3.1-RC0/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeService.java b/tags/java/sca/1.3.1-RC0/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeService.java
deleted file mode 100644
index ffbf4f35fa..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeService.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.test;
-
-import org.osoa.sca.annotations.Remotable;
-
-@Remotable
-// @Callback(CallBackCTypeCallBack.class)
-/**
- *
- */
-public interface CallBackCTypeService {
-
- public void knockKnock(String aString);
-
- public void noCallBack(String aString);
-
- public void multiCallBack(String aString);
-
-}
diff --git a/tags/java/sca/1.3.1-RC0/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeServiceImpl.java b/tags/java/sca/1.3.1-RC0/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeServiceImpl.java
deleted file mode 100644
index dc31ed156b..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/callback-complex-type/src/main/java/org/apache/tuscany/sca/test/CallBackCTypeServiceImpl.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.test;
-
-import org.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.Service;
-
-@Service(CallBackCTypeService.class)
-public class CallBackCTypeServiceImpl implements CallBackCTypeService {
-
- @Callback
- protected CallBackCTypeCallBack callback;
-
- public CallBackCTypeServiceImpl() {
- }
-
- public void knockKnock(String aString) {
-
- System.out.println("CallBackCTypeServiceImpl message received: " + aString);
- callback.callBackMessage("Who's There");
- System.out.println("CallBackCTypeServiceImpl response sent");
- return;
-
- }
-
- public void multiCallBack(String aString) {
-
- System.out.println("CallBackCTypeServiceImpl message received: " + aString);
- callback.callBackIncrement("Who's There 1");
- System.out.println("CallBackCTypeServiceImpl response sent");
- callback.callBackIncrement("Who's There 2");
- System.out.println("CallBackCTypeServiceImpl response sent");
- callback.callBackIncrement("Who's There 3");
- System.out.println("CallBackCTypeServiceImpl response sent");
- return;
-
- }
-
- public void noCallBack(String aString) {
-
- System.out.println("CallBackCTypeServiceImpl message received: " + aString);
- System.out.println("CallBackCTypeServiceImpl No response desired");
- return;
-
- }
-}
diff --git a/tags/java/sca/1.3.1-RC0/itest/callback-complex-type/src/main/resources/CallBackCTypeClient.composite b/tags/java/sca/1.3.1-RC0/itest/callback-complex-type/src/main/resources/CallBackCTypeClient.composite
deleted file mode 100644
index 3f48f16389..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/callback-complex-type/src/main/resources/CallBackCTypeClient.composite
+++ /dev/null
@@ -1,33 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/callback-complex-type/src/main/resources/org/apache/tuscany/sca/test/CallBackCTypeServiceImpl.componentType b/tags/java/sca/1.3.1-RC0/itest/callback-complex-type/src/main/resources/org/apache/tuscany/sca/test/CallBackCTypeServiceImpl.componentType
deleted file mode 100644
index ff38134df5..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/callback-complex-type/src/main/resources/org/apache/tuscany/sca/test/CallBackCTypeServiceImpl.componentType
+++ /dev/null
@@ -1,28 +0,0 @@
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/tags/java/sca/1.3.1-RC0/itest/callback-complex-type/src/test/java/org/apache/tuscany/sca/test/CallBackCTypeTestCaseFIXME.java b/tags/java/sca/1.3.1-RC0/itest/callback-complex-type/src/test/java/org/apache/tuscany/sca/test/CallBackCTypeTestCaseFIXME.java
deleted file mode 100644
index 33d1afaecd..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/callback-complex-type/src/test/java/org/apache/tuscany/sca/test/CallBackCTypeTestCaseFIXME.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.test;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-//FIXME Fix this test case
-public class CallBackCTypeTestCaseFIXME extends TestCase {
-
- private SCADomain domain;
- private CallBackCTypeClient aCallBackClient;
-
- public void testCallBackBasic() {
- aCallBackClient.run();
- }
-
- @Override
- protected void setUp() throws Exception {
- domain = SCADomain.newInstance("CallBackCTypeClient.composite");
-
- aCallBackClient =
- domain.getService(CallBackCTypeClient.class, "CallBackCTypeClient");
- }
-
- @Override
- protected void tearDown() throws Exception {
- domain.close();
- }
-
-}
diff --git a/tags/java/sca/1.3.1-RC0/itest/callback-id/pom.xml b/tags/java/sca/1.3.1-RC0/itest/callback-id/pom.xml
deleted file mode 100644
index 7e27fba5ab..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/callback-id/pom.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-
-
-
- 4.0.0
-
- org.apache.tuscany.sca
- tuscany-itest
- 1.3.1
- ../pom.xml
-
- itest-callback-id
- Apache Tuscany SCA Callback ID Integration Tests
-
-
-
- org.apache.tuscany.sca
- tuscany-host-embedded
- 1.3.1
-
-
-
- org.apache.tuscany.sca
- tuscany-implementation-java-runtime
- 1.3.1
- runtime
-
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdCallBack.java b/tags/java/sca/1.3.1-RC0/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdCallBack.java
deleted file mode 100644
index b14560a8c3..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdCallBack.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.test;
-
-import org.osoa.sca.annotations.Remotable;
-
-@Remotable
-/**
- *
- */
-public interface CallBackIdCallBack {
-
- public void callBackMessage(String aString);
-
-}
diff --git a/tags/java/sca/1.3.1-RC0/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdClient.java b/tags/java/sca/1.3.1-RC0/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdClient.java
deleted file mode 100644
index a9e551f8b4..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdClient.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.test;
-
-import org.osoa.sca.annotations.Remotable;
-
-@Remotable
-public interface CallBackIdClient {
-
- public void run();
-
-}
diff --git a/tags/java/sca/1.3.1-RC0/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdClientImpl.java b/tags/java/sca/1.3.1-RC0/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdClientImpl.java
deleted file mode 100644
index 59c9c3d069..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdClientImpl.java
+++ /dev/null
@@ -1,147 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.test;
-
-import junit.framework.Assert;
-
-import org.osoa.sca.ComponentContext;
-import org.osoa.sca.RequestContext;
-import org.osoa.sca.ServiceReference;
-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
- protected ComponentContext componentContext;
-
- @Reference
- protected ServiceReference aCallBackService;
-
- private static String returnMessage = null;
- private static Object monitor = new Object();
- private static Object callBackId;
-
- public void run() {
-
- // This tests the use of the set/get callbackId API both SCA generated
- // and client specified.
-
- // Test1 uses a SCA generated callback ID and compare that with the
- // callbackID returned during callback.
- test11a();
-
- // Test2 uses a Client specified callback ID and compare that with the
- // callbackID returned during callback.
- test11b();
-
- return;
- }
-
- private void test11a() {
-
- // Retrieve this services callback ID and save it. Once the callback is
- // received the callback ID will be compared with the one
- // returned. Equal is good.
-
- Object origCallBackId = aCallBackService.getCallbackID();
- aCallBackService.getService().knockKnock("Knock Knock - Test1");
- int count = 0;
-
- //
- // If we cannot get a response in 30 seconds consider this a failure
- //
-
- synchronized (monitor) {
- while (returnMessage == null && count++ < 30) {
- try {
- monitor.wait(1000L);
- } catch (InterruptedException e) {
- e.printStackTrace();
- }
- }
- }
-
- Assert.assertEquals("CallBackIdITest - test11a - SCA Generated Id", origCallBackId, this.getCallBackId());
-
- }
-
- private void test11b() {
-
- // Set the services callback ID and save it. Once the callback is
- // received the callback ID will be compared with the one
- // returned. Equal is good.
-
- String origCallBackId = "CallBackId1";
- aCallBackService.setCallbackID(origCallBackId);
-
- aCallBackService.getService().knockKnock("Knock Knock - Test2");
- int count = 0;
-
- //
- // If we can't get a response in 30 seconds consider this a failure
- //
-
- synchronized (monitor) {
- while (returnMessage == null && count++ < 30) {
- try {
- monitor.wait(1000L);
- } catch (InterruptedException e) {
- e.printStackTrace();
- }
- }
- }
-
- Assert
- .assertEquals("CallBackIdITest - 11b - Client Specified Id", origCallBackId, (String)this.getCallBackId());
-
- }
-
- public String getReturnMessage() {
- return returnMessage;
- }
-
- public void setReturnMessage(String aReturnMessage) {
- returnMessage = aReturnMessage;
- }
-
- public void callBackMessage(String aString) {
-
- System.out.println("Entering callback callBackMessage: " + aString);
- RequestContext rc = componentContext.getRequestContext();
- Object callBackId = rc.getServiceReference().getCallbackID();
-
- synchronized (monitor) {
- this.setReturnMessage(aString);
- this.setCallBackId(callBackId);
- monitor.notify();
- }
- }
-
- protected Object getCallBackId() {
- return callBackId;
- }
-
- protected void setCallBackId(Object aCallBackId) {
- callBackId = aCallBackId;
- }
-
-}
diff --git a/tags/java/sca/1.3.1-RC0/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdService.java b/tags/java/sca/1.3.1-RC0/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdService.java
deleted file mode 100644
index 18c592a1c1..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdService.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.test;
-
-import org.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.Remotable;
-
-@Remotable
-@Callback(CallBackIdCallBack.class)
-/**
- *
- */
-public interface CallBackIdService {
-
- public void knockKnock(String aString);
-
-}
diff --git a/tags/java/sca/1.3.1-RC0/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdServiceImpl.java b/tags/java/sca/1.3.1-RC0/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdServiceImpl.java
deleted file mode 100644
index 8b0a4b69cf..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/callback-id/src/main/java/org/apache/tuscany/sca/test/CallBackIdServiceImpl.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.test;
-
-import org.osoa.sca.ComponentContext;
-import org.osoa.sca.RequestContext;
-import org.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.Context;
-import org.osoa.sca.annotations.Service;
-
-@Service(CallBackIdService.class)
-public class CallBackIdServiceImpl implements CallBackIdService {
-
- @Callback
- protected CallBackIdCallBack callback;
- @Context
- protected ComponentContext compositeContext;
-
- public void knockKnock(String aString) {
-
- System.out.println("CallBackIdServiceImpl message received: " + aString);
- RequestContext rc = compositeContext.getRequestContext();
- Object callBackId = rc.getServiceReference().getCallbackID();
- System.out.println("CallBackIdServiceImpl callbackID: " + callBackId);
-
- callback.callBackMessage("Who's There");
- System.out.println("CallBackIdServiceImpl response sent");
- return;
-
- }
-
-}
diff --git a/tags/java/sca/1.3.1-RC0/itest/callback-id/src/main/resources/CallBackIdClient.composite b/tags/java/sca/1.3.1-RC0/itest/callback-id/src/main/resources/CallBackIdClient.composite
deleted file mode 100644
index c9a6ba6258..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/callback-id/src/main/resources/CallBackIdClient.composite
+++ /dev/null
@@ -1,33 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/callback-id/src/test/java/org/apache/tuscany/sca/test/CallBackIdTestCase.java b/tags/java/sca/1.3.1-RC0/itest/callback-id/src/test/java/org/apache/tuscany/sca/test/CallBackIdTestCase.java
deleted file mode 100644
index 771fbb8ff7..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/callback-id/src/test/java/org/apache/tuscany/sca/test/CallBackIdTestCase.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.test;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-public class CallBackIdTestCase extends TestCase {
-
- private SCADomain domain;
- private CallBackIdClient aCallBackClient;
-
- public void testCallBackBasic() {
- aCallBackClient.run();
- }
-
- @Override
- protected void setUp() throws Exception {
- domain = SCADomain.newInstance("CallBackIdClient.composite");
-
- aCallBackClient = domain.getService(CallBackIdClient.class, "CallBackIdClient");
- }
-
- @Override
- protected void tearDown() throws Exception {
- domain.close();
- }
-}
diff --git a/tags/java/sca/1.3.1-RC0/itest/callback-multiple-wires/pom.xml b/tags/java/sca/1.3.1-RC0/itest/callback-multiple-wires/pom.xml
deleted file mode 100644
index 290e1942d2..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/callback-multiple-wires/pom.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-
-
-
- 4.0.0
-
- org.apache.tuscany.sca
- tuscany-itest
- 1.3.1
- ../pom.xml
-
- itest-callback-multiple-wires
- Apache Tuscany SCA Callback With Mutiple Wires Test
-
-
-
- org.apache.tuscany.sca
- tuscany-host-embedded
- 1.3.1
-
-
-
- org.apache.tuscany.sca
- tuscany-implementation-java-runtime
- 1.3.1
- runtime
-
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClient.java b/tags/java/sca/1.3.1-RC0/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClient.java
deleted file mode 100644
index 7c80d222fc..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClient.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.test.callback;
-
-/**
- * The client interface
- */
-public interface MyClient {
-
- void aClientMethod();
-}
diff --git a/tags/java/sca/1.3.1-RC0/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClientImpl1.java b/tags/java/sca/1.3.1-RC0/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClientImpl1.java
deleted file mode 100644
index df91f3d268..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClientImpl1.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.test.callback;
-
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
-
-/**
- * Demonstrates a component-to-component callback invocation
- */
-@Service(MyClient.class)
-@Scope("COMPOSITE")
-public class MyClientImpl1 implements MyClient, MyServiceCallback {
-
- private MyService myService;
- static String result;
-
- @Reference
- public void setMyService(MyService myService) {
- this.myService = myService;
- }
-
- public void aClientMethod() {
- myService.someMethod("-> someMethod1");
- }
-
- public void receiveResult(String result) {
- System.out.println("Work thread " + Thread.currentThread());
- System.out.println("Result: " + result);
- MyClientImpl1.result = result;
- }
-}
diff --git a/tags/java/sca/1.3.1-RC0/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClientImpl2.java b/tags/java/sca/1.3.1-RC0/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClientImpl2.java
deleted file mode 100644
index a0a9564002..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyClientImpl2.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.test.callback;
-
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
-
-/**
- * Demonstrates a component-to-component callback invocation
- */
-@Service(MyClient.class)
-@Scope("COMPOSITE")
-public class MyClientImpl2 implements MyClient, MyServiceCallback {
-
- private MyService myService;
- static String result;
-
- @Reference
- public void setMyService(MyService myService) {
- this.myService = myService;
- }
-
- public void aClientMethod() {
- myService.someMethod("-> someMethod2");
- }
-
- public void receiveResult(String result) {
- System.out.println("Work thread " + Thread.currentThread());
- System.out.println("Result: " + result);
- MyClientImpl2.result = result;
- }
-}
diff --git a/tags/java/sca/1.3.1-RC0/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyService.java b/tags/java/sca/1.3.1-RC0/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyService.java
deleted file mode 100644
index cfd601f546..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyService.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.test.callback;
-
-import org.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.OneWay;
-
-/**
- * This service that will be invoked in a non-blocking fashion
- */
-@Callback(MyServiceCallback.class)
-public interface MyService {
-
- @OneWay
- void someMethod(String arg);
-}
diff --git a/tags/java/sca/1.3.1-RC0/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyServiceCallback.java b/tags/java/sca/1.3.1-RC0/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyServiceCallback.java
deleted file mode 100644
index f198efae51..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyServiceCallback.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.test.callback;
-
-/**
- * The callback interface for {@link MyService}.
- */
-public interface MyServiceCallback {
-
- void receiveResult(String result);
-}
diff --git a/tags/java/sca/1.3.1-RC0/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyServiceImpl.java b/tags/java/sca/1.3.1-RC0/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyServiceImpl.java
deleted file mode 100644
index d19b3fe355..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/callback-multiple-wires/src/main/java/org/apache/tuscany/sca/test/callback/MyServiceImpl.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.test.callback;
-
-import org.osoa.sca.RequestContext;
-import org.osoa.sca.annotations.Context;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
-
-/**
- * This class implements MyService and uses a callback.
- */
-@Service(MyService.class)
-@Scope("COMPOSITE")
-public class MyServiceImpl implements MyService {
-
- @Context
- protected RequestContext requestContext;
-
- public void someMethod(String arg) {
- // invoke the callback
- try {
- MyServiceCallback myServiceCallback = requestContext.getCallback();
- myServiceCallback.receiveResult(arg + " -> receiveResult");
- } catch(RuntimeException e) {
- System.out.println("RuntimeException invoking receiveResult: " + e.toString());
- }
- }
-}
diff --git a/tags/java/sca/1.3.1-RC0/itest/callback-multiple-wires/src/main/resources/CallbackMultiWireTest.composite b/tags/java/sca/1.3.1-RC0/itest/callback-multiple-wires/src/main/resources/CallbackMultiWireTest.composite
deleted file mode 100644
index 3dae3ca3a8..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/callback-multiple-wires/src/main/resources/CallbackMultiWireTest.composite
+++ /dev/null
@@ -1,38 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/callback-multiple-wires/src/test/java/org/apache/tuscany/sca/test/callback/CallbackMultiWireTestCase.java b/tags/java/sca/1.3.1-RC0/itest/callback-multiple-wires/src/test/java/org/apache/tuscany/sca/test/callback/CallbackMultiWireTestCase.java
deleted file mode 100644
index 3c83e4bedd..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/callback-multiple-wires/src/test/java/org/apache/tuscany/sca/test/callback/CallbackMultiWireTestCase.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.test.callback;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-/**
- * A TestCase that demonstrates resolving the client service and initiating the callback sequence
- */
-public class CallbackMultiWireTestCase extends TestCase {
-
- private SCADomain scaDomain;
- private MyClient myClient1;
- private MyClient myClient2;
-
- @Override
- protected void setUp() throws Exception {
- scaDomain = SCADomain.newInstance("CallbackMultiWireTest.composite");
- myClient1 = scaDomain.getService(MyClient.class, "MyClientComponent1");
- myClient2 = scaDomain.getService(MyClient.class, "MyClientComponent2");
- }
-
- @Override
- protected void tearDown() throws Exception {
- scaDomain.close();
- }
-
- public void test() throws Exception {
- System.out.println("Main thread " + Thread.currentThread());
- myClient1.aClientMethod();
- myClient2.aClientMethod();
- System.out.println("Sleeping ...");
- Thread.sleep(300);
- assertEquals("-> someMethod1 -> receiveResult", MyClientImpl1.result);
- assertEquals("-> someMethod2 -> receiveResult", MyClientImpl2.result);
- }
-}
diff --git a/tags/java/sca/1.3.1-RC0/itest/callback-separatethread/pom.xml b/tags/java/sca/1.3.1-RC0/itest/callback-separatethread/pom.xml
deleted file mode 100644
index 6752e89f71..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/callback-separatethread/pom.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-
-
-
- 4.0.0
-
- org.apache.tuscany.sca
- tuscany-itest
- 1.3.1
- ../pom.xml
-
- itest-callback-separatethread
- Apache Tuscany SCA Callback Using Separate Thread Integration Tests
-
-
-
- org.apache.tuscany.sca
- tuscany-host-embedded
- 1.3.1
-
-
-
- org.apache.tuscany.sca
- tuscany-implementation-java-runtime
- 1.3.1
- runtime
-
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadClient.java b/tags/java/sca/1.3.1-RC0/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadClient.java
deleted file mode 100644
index f812a39058..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadClient.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * 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.
- */
-
-package org.apache.tuscany.sca.itest;
-
-import org.osoa.sca.annotations.Remotable;
-
-/**
- * This is the client interface for the call backs in a separate thread tests
- */
-@Remotable
-public interface CallBackSeparateThreadClient {
-
- /**
- * This tests call back patterns using separate threads.
- */
- void runTests();
-}
diff --git a/tags/java/sca/1.3.1-RC0/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadClientImpl.java b/tags/java/sca/1.3.1-RC0/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadClientImpl.java
deleted file mode 100644
index e861f8a3d1..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadClientImpl.java
+++ /dev/null
@@ -1,172 +0,0 @@
-/*
- * 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.
- */
-
-package org.apache.tuscany.sca.itest;
-
-import java.util.concurrent.atomic.AtomicInteger;
-
-import junit.framework.Assert;
-
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Service;
-
-/**
- * This is the client implementation for the call backs in a separate thread tests
- */
-@Service(CallBackSeparateThreadClient.class)
-public class CallBackSeparateThreadClientImpl implements CallBackSeparateThreadClient, EventProcessorCallBack {
- /**
- * Used to sleep for 60 seconds.
- */
- private static final int SIXTY_SECONDS = 60 * 1000;
-
- /**
- * Counts the number of one second call backs
- */
- private static final AtomicInteger oneSecondCallbackCount = new AtomicInteger();
-
- /**
- * Counts the number of five second call backs
- */
- private static final AtomicInteger fiveSecondCallbackCount = new AtomicInteger();
-
- /**
- * This is our injected reference to the EventProcessorService
- */
- @Reference
- protected EventProcessorService aCallBackService;
-
- /**
- * This tests call back patterns using separate threads.
- */
- public void runTests() {
- // Register for 1 second call back
- registerFor1SecondCallback();
-
- // Wait for a few 1 second call backs
- System.out.println("Waiting for some 1 second calls");
- waitForSome1SecondCallbacks();
-
- // Register for 5 second call back
- registerFor5SecondCallback();
-
- // Wait for a few 1 second call backs
- System.out.println("Waiting for some 1 second calls");
- waitForSome1SecondCallbacks();
-
- // Wait for a few 5 second call backs
- System.out.println("Waiting for some 5 second calls");
- waitForSome5SecondCallbacks();
-
- System.out.println("Done");
- }
-
- /**
- * Waits for some one second call backs to be fired
- */
- private void waitForSome1SecondCallbacks() {
- // Reset the one second call back count
- oneSecondCallbackCount.set(0);
-
- // Wait until we have 10 1 second call backs or 60 seconds has passed
- final long start = System.currentTimeMillis();
- do {
- if (oneSecondCallbackCount.get() >= 10) {
- System.out.println("Received enough 1 second notifications");
- return;
- }
-
- try {
- Thread.sleep(500);
- } catch (InterruptedException e) {
- Assert.fail("Unexpeceted exception " + e);
- }
- }
- while (System.currentTimeMillis() - start < SIXTY_SECONDS);
-
- // If we get to here then we did not receive enough events
- Assert.fail("Did not receive enough 1 second events");
- }
-
- /**
- * Waits for some five second call backs to be fired
- */
- private void waitForSome5SecondCallbacks() {
- // Reset the five second call back count
- fiveSecondCallbackCount.set(0);
-
- // Wait until we have 4 5 second call backs or 60 seconds has passed
- final long start = System.currentTimeMillis();
- do
- {
- if (fiveSecondCallbackCount.get() >= 4) {
- System.out.println("Received enough 5 second notifications");
- return;
- }
-
- try
- {
- Thread.sleep(500);
- }
- catch (InterruptedException e)
- {
- Assert.fail("Unexpeceted exception " + e);
- }
- }
- while (System.currentTimeMillis() - start < SIXTY_SECONDS);
-
- // If we get to here then we did not receive enough events
- Assert.fail("Did not receive enough 5 second events");
- }
-
- /**
- * Register to receive one second call backs
- */
- private void registerFor1SecondCallback() {
- aCallBackService.registerForEvent("ONE");
- return;
- }
-
- /**
- * Register to receive five second call backs
- */
- private void registerFor5SecondCallback() {
- aCallBackService.registerForEvent("FIVE");
- }
-
- /**
- * Method that is called when an Event is delivered.
- *
- * @param aEventName The name of the Event
- * @param aEventData The Event data
- */
- public void eventNotification(String aEventName, Object aEventData) {
- // System.out.println("Received Event : " + aEventName + " " + aEventData);
-
- if (aEventName.equals("ONE")) {
- final int newValue = oneSecondCallbackCount.incrementAndGet();
- //System.out.println("Received total of " + newValue + " 1 second call backs");
- } else if (aEventName.equals("FIVE")) {
- final int newValue = fiveSecondCallbackCount.incrementAndGet();
- //System.out.println("Received total of " + newValue + " 5 second call backs");
- }
- else
- System.out.println("Unknown event type of " + aEventName);
- }
-}
diff --git a/tags/java/sca/1.3.1-RC0/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorCallBack.java b/tags/java/sca/1.3.1-RC0/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorCallBack.java
deleted file mode 100644
index ae41f596fc..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorCallBack.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * 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.
- */
-
-package org.apache.tuscany.sca.itest;
-
-
-import org.osoa.sca.annotations.Remotable;
-
-/**
- * The call back interface for the EventProcessorService that is implemented
- * by the client to receive event notifications
- */
-@Remotable
-public interface EventProcessorCallBack {
- /**
- * Call back notifying client of an Event
- *
- * @param aEventName The name of the Event
- * @param aEventData The data for the Event
- */
- void eventNotification(String aEventName, Object aEventData);
-}
diff --git a/tags/java/sca/1.3.1-RC0/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorService.java b/tags/java/sca/1.3.1-RC0/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorService.java
deleted file mode 100644
index c22b8cceec..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorService.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * 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.
- */
-
-package org.apache.tuscany.sca.itest;
-
-import org.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.Conversational;
-import org.osoa.sca.annotations.Remotable;
-
-
-/**
- * Sample Event Processor Service
- */
-@Conversational
-@Callback(EventProcessorCallBack.class)
-@Remotable
-public interface EventProcessorService {
-
- /**
- * Registers the client to receive notifications for the specified event
- *
- * @param aEventName The name of the Event to register
- */
- void registerForEvent(String aEventName);
-
- /**
- * Unregisters the client so it no longer receives notifications for the specified event
- *
- * @param aEventName The name of the Event to unregister
- */
- void unregisterForEvent(String aEventName);
-}
diff --git a/tags/java/sca/1.3.1-RC0/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorServiceImpl.java b/tags/java/sca/1.3.1-RC0/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorServiceImpl.java
deleted file mode 100644
index 4d672b3a8b..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/callback-separatethread/src/main/java/org/apache/tuscany/sca/itest/EventProcessorServiceImpl.java
+++ /dev/null
@@ -1,197 +0,0 @@
-/*
- * 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.
- */
-
-package org.apache.tuscany.sca.itest;
-
-import java.util.Map;
-import java.util.Timer;
-import java.util.TimerTask;
-import java.util.UUID;
-import java.util.concurrent.ConcurrentHashMap;
-
-import org.osoa.sca.CallableReference;
-import org.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.Destroy;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
-
-/**
- * Sample Event Processor Service Implementation
- */
-@Service(EventProcessorService.class)
-@Scope("CONVERSATION")
-public class EventProcessorServiceImpl implements EventProcessorService {
-
- /**
- * Reference to the call back
- */
- @Callback
- protected CallableReference clientCallback;
-
- /**
- * This map contains the call backs for each of the registered Event names
- */
- private final Map> eventListeners;
-
- /**
- * The list of all Event Generators we create
- */
- private final EventGenerator[] allEventGenerators;
-
- /**
- * Constructor. Starts the Event Generators
- */
- public EventProcessorServiceImpl() {
- eventListeners = new ConcurrentHashMap>();
-
- // We will simulate an Event generator
- allEventGenerators = new EventGenerator[2];
- allEventGenerators[0] = new EventGenerator("ONE", 1); // Generate the SECOND event every second
- allEventGenerators[1] = new EventGenerator("FIVE", 5); // Generate the FIVE event every 5 seconds
- }
-
- /**
- * Registers the client to receive notifications for the specified event
- *
- * @param aEventName The name of the Event to register
- */
- public void registerForEvent(String aEventName)
- {
- // Register for the Event
- eventListeners.put(aEventName, clientCallback);
-
- // Send the "register" started event to the client
- receiveEvent(aEventName, "SameThread: Registered to receive notifications for " + aEventName);
- }
-
- /**
- * Unregisters the client so it no longer receives notifications for the specified event
- *
- * @param aEventName The name of the Event to unregister
- */
- public void unregisterForEvent(String aEventName)
- {
- // Send the "register" started event to the client
- receiveEvent(aEventName, "SameThread: Unregister from receiving notifications for " + aEventName);
-
- eventListeners.remove(aEventName);
- }
-
- /**
- * This method is called whenever the EventProcessorService receives an Event
- *
- * @param aEventName The name of the Event received
- * @param aEventData The Event data
- */
- private void receiveEvent(String aEventName, Object aEventData)
- {
- // Get the listener for the Event
- final CallableReference callback = eventListeners.get(aEventName);
- if (callback == null)
- {
- //System.out.println("No registered listeners for " + aEventName);
- return;
- }
-
- // Trigger the call back
- // System.out.println("Notifying " + callback + " of event " + aEventName);
- callback.getService().eventNotification(aEventName, aEventData);
- // System.out.println("Done notify " + callback + " of event " + aEventName);
- }
-
- /**
- * Shuts down the Event Processor
- */
- @Destroy
- public void shutdown()
- {
- System.out.println("Shutting down the EventProcessor");
-
- // Clear list of call back locations as we don't want to send any more notifications
- eventListeners.clear();
-
- // Stop the Event Generators
- for (EventGenerator generator : allEventGenerators)
- {
- generator.stop();
- }
- }
-
- /**
- * Utility class for generating Events
- */
- private class EventGenerator
- {
- /**
- * The Timer we are using to generate the events
- */
- private final Timer timer = new Timer();
-
- /**
- * Constructor
- *
- * @param aEventName The name of the Event to generate
- * @param frequencyInSeconds How frequently we should generate the Events
- */
- private EventGenerator(String aEventName, int frequencyInSeconds)
- {
- timer.schedule(new EventGeneratorTimerTask(aEventName),
- frequencyInSeconds * 1000, frequencyInSeconds * 1000);
- }
-
- /**
- * Stop this Event Generator
- */
- private void stop()
- {
- timer.cancel();
- }
-
- /**
- * The TimerTask that is invoked by the Timer for the EventGenerator
- */
- private class EventGeneratorTimerTask extends TimerTask
- {
- /**
- * The name of the Event we should generate
- */
- private final String eventName;
-
- /**
- * Constructor
- *
- * @param aEventName The name of the Event we should generate
- */
- private EventGeneratorTimerTask(String aEventName)
- {
- eventName = aEventName;
- }
-
- /**
- * Timer calls this method and it will generate an Event
- */
- @Override
- public void run()
- {
- // System.out.println("Generating new event " + eventName);
- receiveEvent(eventName, "Separate Thread Notification: " + UUID.randomUUID().toString());
- }
- }
- }
-}
diff --git a/tags/java/sca/1.3.1-RC0/itest/callback-separatethread/src/main/resources/CallBackSeparateThreadTest.composite b/tags/java/sca/1.3.1-RC0/itest/callback-separatethread/src/main/resources/CallBackSeparateThreadTest.composite
deleted file mode 100644
index e111e5074c..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/callback-separatethread/src/main/resources/CallBackSeparateThreadTest.composite
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/callback-separatethread/src/test/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadTestCase.java b/tags/java/sca/1.3.1-RC0/itest/callback-separatethread/src/test/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadTestCase.java
deleted file mode 100644
index f7e7be2133..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/callback-separatethread/src/test/java/org/apache/tuscany/sca/itest/CallBackSeparateThreadTestCase.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * 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.
- */
-
-package org.apache.tuscany.sca.itest;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-/**
- * This test case will attempt to trigger a call back using a separate thread
- */
-public class CallBackSeparateThreadTestCase extends TestCase {
-
- /**
- * The SCADomain we are using
- */
- private SCADomain domain;
-
- /**
- * The client the tests should use
- */
- private CallBackSeparateThreadClient aCallBackClient;
-
- /**
- * Run the call back in separate thread tests
- */
- public void testCallBackSeparateThread() {
- aCallBackClient.runTests();
- }
-
- /**
- * Load the Call back in separate thread composite and look up the client.
- */
- @Override
- protected void setUp() throws Exception {
- domain = SCADomain.newInstance("CallBackSeparateThreadTest.composite");
- aCallBackClient = domain.getService(CallBackSeparateThreadClient.class, "CallBackSeparateThreadClient");
- }
-
- /**
- * Shutdown the SCA domain
- */
- @Override
- protected void tearDown() throws Exception {
- domain.close();
- }
-}
diff --git a/tags/java/sca/1.3.1-RC0/itest/callback-set-callback/pom.xml b/tags/java/sca/1.3.1-RC0/itest/callback-set-callback/pom.xml
deleted file mode 100644
index 4786aff6b8..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/callback-set-callback/pom.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-
-
-
- 4.0.0
-
- org.apache.tuscany.sca
- tuscany-itest
- 1.3.1
- ../pom.xml
-
- itest-callback-set-callback
- Apache Tuscany SCA Set Callback Integration Tests
-
-
-
- org.apache.tuscany.sca
- tuscany-host-embedded
- 1.3.1
-
-
-
- org.apache.tuscany.sca
- tuscany-implementation-java-runtime
- 1.3.1
- runtime
-
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCalbackService.java b/tags/java/sca/1.3.1-RC0/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCalbackService.java
deleted file mode 100644
index 3b9599f53f..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCalbackService.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.test;
-
-import org.osoa.sca.annotations.Callback;
-
-// @Remotable
-@Callback(CallBackSetCallbackCallback.class)
-/**
- *
- */
-public interface CallBackSetCalbackService {
-
- public void knockKnock(String aString);
-
- public boolean setCallbackIllegally(String aString);
-
-}
diff --git a/tags/java/sca/1.3.1-RC0/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackBadCallback.java b/tags/java/sca/1.3.1-RC0/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackBadCallback.java
deleted file mode 100644
index 48752f2ea1..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackBadCallback.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.test;
-
-import junit.framework.Assert;
-
-public class CallBackSetCallbackBadCallback {
-
- public CallBackSetCallbackBadCallback() {
- super();
- }
-
- public void callback(String aString) {
- //
- // This callback method should never be called.
- //
- System.out.println("CallBackSetCallbackBadCallback: callback called");
- Assert.fail("CallBackSetCallbackBadCallback: callback called");
- return;
- }
-
-}
diff --git a/tags/java/sca/1.3.1-RC0/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackCallback.java b/tags/java/sca/1.3.1-RC0/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackCallback.java
deleted file mode 100644
index ad0e0603a3..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackCallback.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.test;
-
-// @Remotable
-/**
- *
- */
-public interface CallBackSetCallbackCallback {
-
- public void callBackMessage(String aString);
-
- public void callBackIncrement(String aString);
-
-}
diff --git a/tags/java/sca/1.3.1-RC0/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackCallbackImpl.java b/tags/java/sca/1.3.1-RC0/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackCallbackImpl.java
deleted file mode 100644
index 0a22b0e01f..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackCallbackImpl.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.test;
-
-import java.io.File;
-
-import org.osoa.sca.annotations.Service;
-
-@Service(CallBackSetCallbackCallback.class)
-public class CallBackSetCallbackCallbackImpl implements CallBackSetCallbackCallback {
-
- private static String returnMessage = null;
- private static int callBackCount = 0;
-
- public String getReturnMessage() {
- return returnMessage;
- }
-
- public void setReturnMessage(String aReturnMessage) {
- returnMessage = aReturnMessage;
- }
-
- public int getCallBackCount() {
- return callBackCount;
- }
-
- public void incrementCallBackCount() {
- callBackCount++;
- }
-
- public void callBackMessage(String aString) {
-
- System.out.println("Entering CallBackSetCallbackCallbackImpl callBackMessage: " + aString);
-
- File aFile = new File("target/test4_marker");
- try {
- aFile.createNewFile();
- } catch (Exception ex) {
- System.out.println("Error Creating target/test4_marker marker file");
- ex.printStackTrace();
- }
-
- }
-
- public void callBackIncrement(String aString) {
- System.out.println("Entering callback increment: " + aString);
- this.incrementCallBackCount();
- }
-
-}
diff --git a/tags/java/sca/1.3.1-RC0/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackClient.java b/tags/java/sca/1.3.1-RC0/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackClient.java
deleted file mode 100644
index 94cb6aa73b..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackClient.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.test;
-
-import org.osoa.sca.annotations.Remotable;
-
-@Remotable
-public interface CallBackSetCallbackClient {
-
- public void run();
-
-}
diff --git a/tags/java/sca/1.3.1-RC0/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackClientImpl.java b/tags/java/sca/1.3.1-RC0/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackClientImpl.java
deleted file mode 100644
index 66e4d3fc05..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackClientImpl.java
+++ /dev/null
@@ -1,190 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.test;
-
-import java.io.File;
-
-import junit.framework.Assert;
-
-import org.osoa.sca.NoRegisteredCallbackException;
-import org.osoa.sca.ServiceReference;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Service;
-
-@Service(CallBackSetCallbackClient.class)
-public class CallBackSetCallbackClientImpl implements CallBackSetCallbackClient {
-
- @Reference
- protected ServiceReference aCallBackService;
- @Reference
- protected ServiceReference callBack;
-
- public void run() {
-
- // This test various aspects of the setCallback() API in a stateless
- // scope.
-
- /*
- * test4 Client does not implement the callback interface but calls
- * setCallback with a service reference before invoking the target,
- * Verify successful execution.
- */
-
- test4();
-
- /*
- * test5 The client does not implement the callback interface and does
- * not call setCallback() before invoking the target. Verify a
- * NoRegisteredCallbackException is thrown.
- */
-
- test5();
-
- /*
- * test6() The client calls setCallback() with an object that is not a
- * service reference and the callback interface is stateless. Verify
- * that an appropriate exception is thrown. When calling setCallback
- * with an object the interface must be stateful. Stateless interfaces
- * require a service Reference.
- */
-
- test6();
-
- /*
- * test10 The target calls setCallback() on its own service reference,
- * e.g. getRequestContext().getServiceReference().getCallback(). Verify
- * an appropriate exception occurs.
- */
-
- test10();
-
- return;
- }
-
- private void test4() {
-
- //
- // Since callbacks do not synchronously return and this test results in
- // a callback to a component other
- // than this client I am using a marker file to determine the outcome.
- // The presence of the marker
- // file will be used for the Assertion test. If it exists then the
- // callback occurred and all is good.
- //
-
- // Make sure the marker file is not present before starting the test.
- File aFile = new File("target/test4_marker");
- if (aFile.exists())
- aFile.delete();
-
- aCallBackService.setCallback(callBack);
-
- aCallBackService.getService().knockKnock("Knock Knock");
-
- // Lets give the callback a little time to complete....
-
- int count = 0;
- long timeout = 1000;
-
- while (count++ < 30 && (aFile.exists() == false)) {
- try {
- Thread.sleep(timeout);
- } catch (InterruptedException ie) {
- }
- }
-
- Assert.assertEquals("CallBackSetCallback - Test4", true, aFile.exists());
-
- aCallBackService.setCallback(null); // leave this in the default state for next test
-
- }
-
- private void test5() {
-
- boolean correctException = false;
-
- //
- // The backend service is expecting a callback reference to be set. This
- // test will not
- // set one so an exception is expected. According to the spec if a
- // client calls a method on
- // a service reference prior to calling setCallback() then a
- // NoRegisteredCallbackException
- // will be thrown on the client.
- //
-
- try {
- aCallBackService.getService().knockKnock("Knock Knock");
- } catch (NoRegisteredCallbackException NotRegEx) {
- correctException = true;
- } catch (Exception ex) {
- ex.printStackTrace();
- }
-
- Assert.assertEquals("CallBackSetCallback - Test5", true, correctException);
-
- }
-
- private void test6() {
-
- boolean correctException = false;
-
- //
- // This test is to specify an Object that is not a service reference
- // that does implement
- // the callback interface. However because this callback service is
- // stateless the expected
- // result is an appropriate exception.
- //
-
- try {
- aCallBackService.setCallback(new CallBackSetCallbackObjectCallback());
- aCallBackService.getService().knockKnock("Knock Knock");
- }
- //
- // This should catch an appropriate exception.
- //
- catch (IllegalArgumentException goodEx) {
- correctException = true;
- } catch (Exception ex) {
- ex.printStackTrace();
- }
-
- Assert.assertEquals("CallBackSetCallback - Test6", true, correctException);
-
- }
-
- private void test10() {
-
- //
- // The appropriate exception should be thrown and caught on the service side.
- // If this happens, the setCallbackIllegally() method will return true.
- // If not, this method will return false.
- //
-
- aCallBackService.setCallback(callBack); // ensure no client-side exception
-
- boolean result = aCallBackService.getService().setCallbackIllegally
- ("Try to set callback on your own service reference");
-
- Assert.assertEquals("CallBackSetCallback - Test10", true, result);
-
- }
-
-}
diff --git a/tags/java/sca/1.3.1-RC0/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackObjectCallback.java b/tags/java/sca/1.3.1-RC0/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackObjectCallback.java
deleted file mode 100644
index afedcdf7f1..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackObjectCallback.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.test;
-
-public class CallBackSetCallbackObjectCallback implements CallBackSetCallbackCallback {
-
- private int callBackCount = 0;
-
- public CallBackSetCallbackObjectCallback() {
- super();
- }
-
- public void incrementCallBackCount() {
- callBackCount++;
- }
-
- public void callBackMessage(String aString) {
-
- System.out.println("Entering CallBackSetCallbackObjectCallback callBackMessage: " + aString);
-
- }
-
- public void callBackIncrement(String aString) {
- System.out.println("Entering callback increment: " + aString);
- this.incrementCallBackCount();
- }
-
-}
diff --git a/tags/java/sca/1.3.1-RC0/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackServiceImpl.java b/tags/java/sca/1.3.1-RC0/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackServiceImpl.java
deleted file mode 100644
index 4a6c9dbaa6..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/callback-set-callback/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackServiceImpl.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.test;
-
-import org.osoa.sca.ComponentContext;
-import org.osoa.sca.RequestContext;
-import org.osoa.sca.ServiceReference;
-import org.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.Context;
-import org.osoa.sca.annotations.Service;
-
-@Service(CallBackSetCalbackService.class)
-public class CallBackSetCallbackServiceImpl implements CallBackSetCalbackService {
-
- @Callback
- protected CallBackSetCallbackCallback callback;
- @Context
- protected ComponentContext context;
-
- public void knockKnock(String aString) {
-
- try {
- System.out.println("CallBackBasicServiceImpl message received: " + aString);
- callback.callBackMessage("Who's There");
- System.out.println("CallBackBasicServiceImpl response sent");
- return;
- } catch (Exception ex) {
- ex.printStackTrace();
- }
-
- }
-
- public boolean setCallbackIllegally(String aString) {
-
- System.out.println("CallBackBasicServiceImpl.setCallbackIllegally() message received: " + aString);
-
- boolean exceptionProduced = false;
- RequestContext requestContext = null;
- ServiceReference serviceRef = null;
-
- try {
- requestContext = context.getRequestContext();
- serviceRef = (ServiceReference) requestContext.getServiceReference();
- serviceRef.setCallback(serviceRef);
- } catch (ClassCastException goodEx) {
- exceptionProduced = true;
- System.out.println("Test10 appropriate exception caught during setCallback to own service reference");
- } catch (Exception badEx) {
- System.out.println("CallBackBasicServiceImpl.setCallbackIllegally() " + badEx.toString());
- badEx.printStackTrace();
- }
-
- // Return a flag indicating whether we got the exception we are looking for
- return exceptionProduced;
-
- }
-}
diff --git a/tags/java/sca/1.3.1-RC0/itest/callback-set-callback/src/main/resources/CallBackSetCallbackTest.composite b/tags/java/sca/1.3.1-RC0/itest/callback-set-callback/src/main/resources/CallBackSetCallbackTest.composite
deleted file mode 100644
index 3552ddecab..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/callback-set-callback/src/main/resources/CallBackSetCallbackTest.composite
+++ /dev/null
@@ -1,37 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/callback-set-callback/src/test/java/org/apache/tuscany/sca/test/CallBackSetCallbackTestCase.java b/tags/java/sca/1.3.1-RC0/itest/callback-set-callback/src/test/java/org/apache/tuscany/sca/test/CallBackSetCallbackTestCase.java
deleted file mode 100644
index 496ae0b1a5..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/callback-set-callback/src/test/java/org/apache/tuscany/sca/test/CallBackSetCallbackTestCase.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.test;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-//FIXME Fix this test case
-public class CallBackSetCallbackTestCase extends TestCase {
-
- private SCADomain domain;
- private CallBackSetCallbackClient aCallBackClient;
-
- public void testCallBackSetCallback() {
- aCallBackClient.run();
- }
-
- @Override
- protected void setUp() throws Exception {
- domain = SCADomain.newInstance("CallBackSetCallbackTest.composite");
-
- aCallBackClient =
- domain.getService(CallBackSetCallbackClient.class,
- "CallBackSetCallbackClient");
- }
-
- @Override
- protected void tearDown() throws Exception {
- domain.close();
- }
-
-}
diff --git a/tags/java/sca/1.3.1-RC0/itest/callback-set-conversation/pom.xml b/tags/java/sca/1.3.1-RC0/itest/callback-set-conversation/pom.xml
deleted file mode 100644
index decbd3a7cd..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/callback-set-conversation/pom.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-
-
-
- 4.0.0
-
- org.apache.tuscany.sca
- tuscany-itest
- 1.3.1
- ../pom.xml
-
- itest-callback-set-conversation
- Apache Tuscany SCA Callback Set Conversation Integration Tests
-
-
-
- org.apache.tuscany.sca
- tuscany-host-embedded
- 1.3.1
-
-
-
- org.apache.tuscany.sca
- tuscany-implementation-java-runtime
- 1.3.1
- runtime
-
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvBadCallback.java b/tags/java/sca/1.3.1-RC0/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvBadCallback.java
deleted file mode 100644
index d97c69eaed..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvBadCallback.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.test;
-
-import java.io.Serializable;
-
-import junit.framework.Assert;
-
-public class CallBackSetCallbackConvBadCallback implements Serializable {
-
- public CallBackSetCallbackConvBadCallback() {
- super();
- }
-
- public void callback(String aString) {
- //
- // This callback method should never be called.
- //
- System.out.println("CallBackSetCallbackBadCallback: callback called");
- Assert.fail("CallBackSetCallbackConvBadCallback: callback called");
- }
-
-}
diff --git a/tags/java/sca/1.3.1-RC0/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvCallback.java b/tags/java/sca/1.3.1-RC0/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvCallback.java
deleted file mode 100644
index a704fd0ece..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvCallback.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.test;
-
-import org.osoa.sca.annotations.Conversational;
-
-// @Remotable
-@Conversational
-/**
- *
- */
-public interface CallBackSetCallbackConvCallback {
-
- public void callBackMessage(String aString);
-
- public void callBackIncrement(String aString);
-
-}
diff --git a/tags/java/sca/1.3.1-RC0/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvClient.java b/tags/java/sca/1.3.1-RC0/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvClient.java
deleted file mode 100644
index 013424bf5e..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvClient.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.test;
-
-import org.osoa.sca.annotations.Remotable;
-
-@Remotable
-public interface CallBackSetCallbackConvClient {
-
- public void run();
-
-}
diff --git a/tags/java/sca/1.3.1-RC0/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvClientImpl.java b/tags/java/sca/1.3.1-RC0/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvClientImpl.java
deleted file mode 100644
index 5d692e7728..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvClientImpl.java
+++ /dev/null
@@ -1,163 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.test;
-
-import junit.framework.Assert;
-
-import org.osoa.sca.ComponentContext;
-import org.osoa.sca.ServiceReference;
-import org.osoa.sca.annotations.Context;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
-
-@Service(CallBackSetCallbackConvClient.class)
-@Scope("CONVERSATION")
-public class CallBackSetCallbackConvClientImpl implements CallBackSetCallbackConvClient {
-
- @Context
- protected ComponentContext componentContext;
-
- @Reference
- protected CallBackSetCallbackConvService aCallBackService;
-
- private CallBackSetCallbackConvObjectCallback aCallbackObject = null;
-
- public void run() {
-
- // This tests aspects of the setCallback() API within a conversational
- // scope.
-
- /*
- * test7 The client calls setCallback() with an object that is not a
- * service reference and the callback interface is stateful. Verify
- * successful execution.
- */
- test7();
-
- /*
- * test8() The client calls setCallback() with an object that does not
- * implement the callback interface. Verify an appropriate exception is
- * thrown. This requires a STATEFUL interface.
- */
- test8();
-
- /*
- * test9 The client calls setCallback() with an object that is not
- * Serializable. Verify an appropriate exception is thrown. This
- * requires a STATEFUL callback interface. Move from the stateless test
- * case.
- */
- test9();
-
- return;
- }
-
- private void test7() {
-
- //
- // This test is to specify an Object that is not a service reference
- // that does implement
- // the callback interface and is Serializable. Verify successful
- // execution.
- //
-
- aCallbackObject = new CallBackSetCallbackConvObjectCallback();
- aCallbackObject.incrementCallBackCount();
-
- ServiceReference aCallBackServiceRef
- = componentContext.cast(aCallBackService);
- aCallBackServiceRef.setCallback(aCallbackObject);
- aCallBackService.knockKnock("Knock Knock 7");
-
- Assert.assertEquals("CallBackSetCallbackConv - Test7", 2, aCallbackObject.getCount());
-
- }
-
- private void test8() {
-
- boolean correctException = false;
-
- //
- // This test is to specify an Object that is not a service reference
- // that does not implement
- // the callback interface. The expected result is an appropriate
- // exception.
- //
-
- try {
- ServiceReference aCallBackServiceRef
- = componentContext.cast(aCallBackService);
- aCallBackServiceRef.setCallback(new CallBackSetCallbackConvBadCallback());
- aCallBackService.knockKnock("Knock Knock 8");
- }
-
- //
- // This should catch an appropriate exception.
- //
-
- catch (IllegalArgumentException goodEx)
- {
- System.out.println("correct exception " + goodEx);
- correctException = true;
- }
-
- catch (Exception ex) {
- // This means an inappropriate exception occurred
- ex.printStackTrace();
- }
-
- Assert.assertEquals("CallBackSetCallbackConv - Test8", true, correctException);
-
- }
-
- private void test9() {
-
- boolean correctException = false;
-
- //
- // This test is to specify an Object that is not a service reference
- // that does implement
- // the callback interface but does not implement Serializable. Verify
- // an appropriate exception
- // is thrown.
- //
-
- try {
- ServiceReference aCallBackServiceRef
- = componentContext.cast(aCallBackService);
- aCallBackServiceRef.setCallback(new CallBackSetCallbackConvNonSerCallback());
- aCallBackService.knockKnock("Knock Knock 9");
- }
- //
- // This should catch an appropriate exception.
- //
- catch (IllegalArgumentException goodEx)
- {
- System.out.println("correct exception " + goodEx);
- correctException = true;
- } catch (Exception ex) {
- ex.printStackTrace();
- }
-
- Assert.assertEquals("CallBackSetCallbackConv - Test9", true, correctException);
-
- }
-
-}
diff --git a/tags/java/sca/1.3.1-RC0/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvNonSerCallback.java b/tags/java/sca/1.3.1-RC0/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvNonSerCallback.java
deleted file mode 100644
index 75a4a3a6a0..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvNonSerCallback.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.test;
-
-import junit.framework.Assert;
-
-public class CallBackSetCallbackConvNonSerCallback implements CallBackSetCallbackConvCallback {
-
- private int callBackCount = 0;
-
- public CallBackSetCallbackConvNonSerCallback() {
- super();
- }
-
- public synchronized void incrementCallBackCount() {
- callBackCount++;
- }
-
- public synchronized int getCount() {
- return callBackCount;
- }
-
- public void callBackMessage(String aString) {
- //
- // This callback method should never be called.
- //
- System.out.println("Entering CallBackSetCallbackConvNonSerCallback callBackMessage: " + aString);
- Assert.fail("CallBackSetCallbackConvNonSerCallback: callbackMessage called");
- }
-
- public void callBackIncrement(String aString) {
- //
- // This callback method should never be called.
- //
- System.out.println("Entering callbackIncrement: " + aString);
- this.incrementCallBackCount();
- Assert.fail("CallBackSetCallbackConvNonSerCallback: callbackIncrement called");
- }
-
-}
diff --git a/tags/java/sca/1.3.1-RC0/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvObjectCallback.java b/tags/java/sca/1.3.1-RC0/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvObjectCallback.java
deleted file mode 100644
index e7a3b144f6..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvObjectCallback.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.test;
-
-import java.io.Serializable;
-
-public class CallBackSetCallbackConvObjectCallback implements CallBackSetCallbackConvCallback, Serializable
-{
- private int callBackCount = 0;
-
- public CallBackSetCallbackConvObjectCallback() {
- super();
- }
-
- public synchronized void incrementCallBackCount() {
- callBackCount++;
- }
-
- public synchronized int getCount() {
- return callBackCount;
- }
-
- public void callBackMessage(String aString) {
-
- System.out.println("Entering CallBackSetCallbackObjectCallback callBackMessage: " + aString);
-
- }
-
- public void callBackIncrement(String aString) {
-
- System.out.println("Entering callback increment: " + aString);
-
- this.incrementCallBackCount();
- }
-
-}
diff --git a/tags/java/sca/1.3.1-RC0/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvService.java b/tags/java/sca/1.3.1-RC0/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvService.java
deleted file mode 100644
index 692b6dfc35..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvService.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.test;
-
-import org.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.Conversational;
-
-// @Remotable
-@Conversational
-@Callback(CallBackSetCallbackConvCallback.class)
-/**
- *
- */
-public interface CallBackSetCallbackConvService {
-
- public void knockKnock(String aString);
-
- public void setCallbackIllegally(String aString);
-
-}
diff --git a/tags/java/sca/1.3.1-RC0/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvServiceImpl.java b/tags/java/sca/1.3.1-RC0/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvServiceImpl.java
deleted file mode 100644
index bca94ce407..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/callback-set-conversation/src/main/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvServiceImpl.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.test;
-
-import java.io.File;
-
-import org.osoa.sca.ComponentContext;
-import org.osoa.sca.RequestContext;
-import org.osoa.sca.ServiceReference;
-import org.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.Context;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
-
-@Service(CallBackSetCallbackConvService.class)
-@Scope("CONVERSATION")
-public class CallBackSetCallbackConvServiceImpl implements CallBackSetCallbackConvService {
-
- @Callback
- protected CallBackSetCallbackConvCallback callback;
- @Context
- protected ComponentContext context;
-
- public void knockKnock(String aString) {
-
- System.out.println("CallBackSetCallbackConvServiceImpl message received: " + aString);
- callback.callBackMessage("Who's There");
- callback.callBackIncrement("This should do it");
- System.out.println("CallBackSetCallbackConvServiceImpl response sent");
-
- }
-
- public void setCallbackIllegally(String aString) {
-
- System.out.println("CallBackBasicServiceImpl.setCallbackIllegally() message received: " + aString);
-
- boolean exceptionProduced = false;
- RequestContext requestContext = null;
- ServiceReference serviceRef = null;
-
- // Context is not working properly so we can't trust that this is
- // working.....
- try {
- requestContext = context.getRequestContext();
- serviceRef = (ServiceReference) requestContext.getServiceReference();
- } catch (Exception ex) {
- System.out.println("CallBackBasicServiceImpl.setCallbackIllegally() " + ex.toString());
- ex.printStackTrace();
- return;
- }
-
- // Ok, call setCallback with my own service reference.
- try {
- serviceRef.setCallback(serviceRef);
- } catch (NullPointerException npe) {
- // This is not an appropriate exception.
- System.out.println("Test10 NPE exception during setCallback to own service reference");
- npe.printStackTrace();
- return;
- }
- // This needs to catch the appropriate exception, once we figure out
- // what is needs to be!
- catch (Exception ex) {
- exceptionProduced = true;
- System.out.println("Test10 appropriate exception caught during setCallback to own service reference");
- }
- ;
-
- // If we get the exception we are looking for then create the marker
- // file.
- if (exceptionProduced == true) {
- File aFile = new File("target/test10_marker");
- try {
- aFile.createNewFile();
- } catch (Exception ex) {
- System.out.println("Error Creating target/test10_marker marker file");
- ex.printStackTrace();
- }
- }
-
- }
-}
diff --git a/tags/java/sca/1.3.1-RC0/itest/callback-set-conversation/src/main/resources/CallBackSetCallbackConvTest.composite b/tags/java/sca/1.3.1-RC0/itest/callback-set-conversation/src/main/resources/CallBackSetCallbackConvTest.composite
deleted file mode 100644
index ce73417f94..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/callback-set-conversation/src/main/resources/CallBackSetCallbackConvTest.composite
+++ /dev/null
@@ -1,33 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/callback-set-conversation/src/test/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvTestCase.java b/tags/java/sca/1.3.1-RC0/itest/callback-set-conversation/src/test/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvTestCase.java
deleted file mode 100644
index 45bdaea9ab..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/callback-set-conversation/src/test/java/org/apache/tuscany/sca/test/CallBackSetCallbackConvTestCase.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.test;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-public class CallBackSetCallbackConvTestCase extends TestCase {
-
- private SCADomain domain;
- private CallBackSetCallbackConvClient aCallBackClient;
-
- public void testCallBackSetCallback() {
- aCallBackClient.run();
- }
-
- @Override
- protected void setUp() throws Exception {
- domain = SCADomain.newInstance("CallBackSetCallbackConvTest.composite");
-
- aCallBackClient =
- domain.getService(CallBackSetCallbackConvClient.class,
- "CallBackSetCallbackConvClient");
- }
-
- @Override
- protected void tearDown() throws Exception {
- domain.close();
- }
-
-}
diff --git a/tags/java/sca/1.3.1-RC0/itest/component-type/pom.xml b/tags/java/sca/1.3.1-RC0/itest/component-type/pom.xml
deleted file mode 100644
index c31c9c5fc4..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/component-type/pom.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-
-
-
- 4.0.0
-
- org.apache.tuscany.sca
- tuscany-itest
- 1.3.1
- ../pom.xml
-
- itest-component-type
- Apache Tuscany SCA Component Type Integration Tests
-
-
-
- org.apache.tuscany.sca
- tuscany-host-embedded
- 1.3.1
-
-
-
- org.apache.tuscany.sca
- tuscany-implementation-java-runtime
- 1.3.1
- runtime
-
-
-
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/component-type/src/main/java/calculator/AddService.java b/tags/java/sca/1.3.1-RC0/itest/component-type/src/main/java/calculator/AddService.java
deleted file mode 100644
index 188451ebac..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/component-type/src/main/java/calculator/AddService.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * 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.
- */
-package calculator;
-
-/**
- * The Add service interface
- */
-public interface AddService {
-
- double add(double n1, double n2);
-
-}
diff --git a/tags/java/sca/1.3.1-RC0/itest/component-type/src/main/java/calculator/AddServiceImpl.java b/tags/java/sca/1.3.1-RC0/itest/component-type/src/main/java/calculator/AddServiceImpl.java
deleted file mode 100644
index 8b6fe066a6..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/component-type/src/main/java/calculator/AddServiceImpl.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * 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.
- */
-package calculator;
-
-/**
- * An implementation of the Add service
- */
-public class AddServiceImpl implements AddService {
-
- public double add(double n1, double n2) {
- return n1 + n2;
- }
-
-}
diff --git a/tags/java/sca/1.3.1-RC0/itest/component-type/src/main/java/calculator/CalculatorClient.java b/tags/java/sca/1.3.1-RC0/itest/component-type/src/main/java/calculator/CalculatorClient.java
deleted file mode 100644
index 08afd922b3..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/component-type/src/main/java/calculator/CalculatorClient.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * 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.
- */
-
-package calculator;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-/**
- * This client program shows how to create an SCA runtime, start it,
- * and locate and invoke a SCA component
- */
-public class CalculatorClient {
- public static void main(String[] args) throws Exception {
-
- SCADomain scaDomain = SCADomain.newInstance("Calculator.composite");
-
- CalculatorService calculatorService =
- scaDomain.getService(CalculatorService.class, "CalculatorServiceComponent/CalculatorService");
-
- // Calculate
- System.out.println("3 + 2=" + calculatorService.add(3, 2));
- System.out.println("3 - 2=" + calculatorService.subtract(3, 2));
- System.out.println("3 * 2=" + calculatorService.multiply(3, 2));
- System.out.println("3 / 2=" + calculatorService.divide(3, 2));
-
- scaDomain.close();
- }
-
-}
diff --git a/tags/java/sca/1.3.1-RC0/itest/component-type/src/main/java/calculator/CalculatorService.java b/tags/java/sca/1.3.1-RC0/itest/component-type/src/main/java/calculator/CalculatorService.java
deleted file mode 100644
index 031fa8b912..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/component-type/src/main/java/calculator/CalculatorService.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * 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.
- */
-package calculator;
-
-
-/**
- * The Calculator service interface.
- */
-public interface CalculatorService {
-
- double add(double n1, double n2);
-
- double subtract(double n1, double n2);
-
- double multiply(double n1, double n2);
-
- double divide(double n1, double n2);
-
-}
diff --git a/tags/java/sca/1.3.1-RC0/itest/component-type/src/main/java/calculator/CalculatorServiceImpl.java b/tags/java/sca/1.3.1-RC0/itest/component-type/src/main/java/calculator/CalculatorServiceImpl.java
deleted file mode 100644
index 1209ac128a..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/component-type/src/main/java/calculator/CalculatorServiceImpl.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * 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.
- */
-package calculator;
-
-/**
- * An implementation of the Calculator service.
- */
-public class CalculatorServiceImpl implements CalculatorService {
-
- private AddService addService;
- private SubtractService subtractService;
- private MultiplyService multiplyService;
- private DivideService divideService;
-
- public void setAddService(AddService addService) {
- this.addService = addService;
- }
-
- public void setSubtractService(SubtractService subtractService) {
- this.subtractService = subtractService;
- }
-
- public void setDivideService(DivideService divideService) {
- this.divideService = divideService;
- }
-
- public void setMultiplyService(MultiplyService multiplyService) {
- this.multiplyService = multiplyService;
- }
-
- public double add(double n1, double n2) {
- return addService.add(n1, n2);
- }
-
- public double subtract(double n1, double n2) {
- return subtractService.subtract(n1, n2);
- }
-
- public double multiply(double n1, double n2) {
- return multiplyService.multiply(n1, n2);
- }
-
- public double divide(double n1, double n2) {
- return divideService.divide(n1, n2);
- }
-
-}
diff --git a/tags/java/sca/1.3.1-RC0/itest/component-type/src/main/java/calculator/DivideService.java b/tags/java/sca/1.3.1-RC0/itest/component-type/src/main/java/calculator/DivideService.java
deleted file mode 100644
index 30d248208b..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/component-type/src/main/java/calculator/DivideService.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * 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.
- */
-package calculator;
-
-/**
- * The divide service interface
- */
-public interface DivideService {
-
- double divide(double n1, double n2);
-
-}
diff --git a/tags/java/sca/1.3.1-RC0/itest/component-type/src/main/java/calculator/DivideServiceImpl.java b/tags/java/sca/1.3.1-RC0/itest/component-type/src/main/java/calculator/DivideServiceImpl.java
deleted file mode 100644
index f7ac0b7287..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/component-type/src/main/java/calculator/DivideServiceImpl.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * 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.
- */
-package calculator;
-
-/**
- * An implementation of the Divide service.
- */
-public class DivideServiceImpl implements DivideService {
-
- public double divide(double n1, double n2) {
- return n1 / n2;
- }
-
-}
diff --git a/tags/java/sca/1.3.1-RC0/itest/component-type/src/main/java/calculator/MultiplyService.java b/tags/java/sca/1.3.1-RC0/itest/component-type/src/main/java/calculator/MultiplyService.java
deleted file mode 100644
index 5290605938..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/component-type/src/main/java/calculator/MultiplyService.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * 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.
- */
-package calculator;
-
-/**
- * The interface for the multiply service
- */
-public interface MultiplyService {
-
- double multiply(double n1, double n2);
-
-}
diff --git a/tags/java/sca/1.3.1-RC0/itest/component-type/src/main/java/calculator/MultiplyServiceImpl.java b/tags/java/sca/1.3.1-RC0/itest/component-type/src/main/java/calculator/MultiplyServiceImpl.java
deleted file mode 100644
index b7dca792b2..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/component-type/src/main/java/calculator/MultiplyServiceImpl.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * 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.
- */
-package calculator;
-
-/**
- * An implementation of the Multiply service.
- */
-public class MultiplyServiceImpl implements MultiplyService {
-
- public double multiply(double n1, double n2) {
- return n1 * n2;
- }
-
-}
diff --git a/tags/java/sca/1.3.1-RC0/itest/component-type/src/main/java/calculator/SubtractService.java b/tags/java/sca/1.3.1-RC0/itest/component-type/src/main/java/calculator/SubtractService.java
deleted file mode 100644
index bf0d1882b6..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/component-type/src/main/java/calculator/SubtractService.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * 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.
- */
-package calculator;
-
-/**
- * The interface for the multiply service
- */
-public interface SubtractService {
-
- double subtract(double n1, double n2);
-
-}
diff --git a/tags/java/sca/1.3.1-RC0/itest/component-type/src/main/java/calculator/SubtractServiceImpl.java b/tags/java/sca/1.3.1-RC0/itest/component-type/src/main/java/calculator/SubtractServiceImpl.java
deleted file mode 100644
index 77b128ab8d..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/component-type/src/main/java/calculator/SubtractServiceImpl.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * 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.
- */
-package calculator;
-
-/**
- * An implementation of the subtract service.
- */
-public class SubtractServiceImpl implements SubtractService {
-
- public double subtract(double n1, double n2) {
- return n1 - n2;
- }
-
-}
diff --git a/tags/java/sca/1.3.1-RC0/itest/component-type/src/main/resources/Calculator.composite b/tags/java/sca/1.3.1-RC0/itest/component-type/src/main/resources/Calculator.composite
deleted file mode 100644
index b229787657..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/component-type/src/main/resources/Calculator.composite
+++ /dev/null
@@ -1,49 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/component-type/src/main/resources/calculator/AddServiceImpl.componentType b/tags/java/sca/1.3.1-RC0/itest/component-type/src/main/resources/calculator/AddServiceImpl.componentType
deleted file mode 100644
index 00c48e5a35..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/component-type/src/main/resources/calculator/AddServiceImpl.componentType
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/tags/java/sca/1.3.1-RC0/itest/component-type/src/main/resources/calculator/CalculatorServiceImpl.componentType b/tags/java/sca/1.3.1-RC0/itest/component-type/src/main/resources/calculator/CalculatorServiceImpl.componentType
deleted file mode 100644
index 74bedc0a98..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/component-type/src/main/resources/calculator/CalculatorServiceImpl.componentType
+++ /dev/null
@@ -1,43 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/tags/java/sca/1.3.1-RC0/itest/component-type/src/main/resources/calculator/DivideServiceImpl.componentType b/tags/java/sca/1.3.1-RC0/itest/component-type/src/main/resources/calculator/DivideServiceImpl.componentType
deleted file mode 100644
index 289fcc3e11..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/component-type/src/main/resources/calculator/DivideServiceImpl.componentType
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/tags/java/sca/1.3.1-RC0/itest/component-type/src/main/resources/calculator/MultiplyServiceImpl.componentType b/tags/java/sca/1.3.1-RC0/itest/component-type/src/main/resources/calculator/MultiplyServiceImpl.componentType
deleted file mode 100644
index 2d8a879cda..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/component-type/src/main/resources/calculator/MultiplyServiceImpl.componentType
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/tags/java/sca/1.3.1-RC0/itest/component-type/src/main/resources/calculator/SubtractServiceImpl.componentType b/tags/java/sca/1.3.1-RC0/itest/component-type/src/main/resources/calculator/SubtractServiceImpl.componentType
deleted file mode 100644
index 6214955141..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/component-type/src/main/resources/calculator/SubtractServiceImpl.componentType
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/tags/java/sca/1.3.1-RC0/itest/component-type/src/test/java/calculator/CalculatorTestCase.java b/tags/java/sca/1.3.1-RC0/itest/component-type/src/test/java/calculator/CalculatorTestCase.java
deleted file mode 100644
index 08fc8e33bf..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/component-type/src/test/java/calculator/CalculatorTestCase.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * 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.
- */
-package calculator;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-/**
- * This shows how to test the Calculator service component.
- */
-public class CalculatorTestCase extends TestCase {
-
- private CalculatorService calculatorService;
- private SCADomain scaDomain;
-
- @Override
- protected void setUp() throws Exception {
- scaDomain = SCADomain.newInstance("Calculator.composite");
- calculatorService = scaDomain.getService(CalculatorService.class, "CalculatorServiceComponent/CalculatorService");
- }
-
- @Override
- protected void tearDown() throws Exception {
- scaDomain.close();
- }
-
- public void testCalculator() throws Exception {
- // Calculate
- assertEquals(calculatorService.add(3, 2), 5.0);
- assertEquals(calculatorService.subtract(3, 2), 1.0);
- assertEquals(calculatorService.multiply(3, 2), 6.0);
- assertEquals(calculatorService.divide(3, 2), 1.5);
-
- }
-}
diff --git a/tags/java/sca/1.3.1-RC0/itest/contribution-classloader/contribution-classes/build-jar.xml b/tags/java/sca/1.3.1-RC0/itest/contribution-classloader/contribution-classes/build-jar.xml
deleted file mode 100644
index 299ce6864f..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/contribution-classloader/contribution-classes/build-jar.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/contribution-classloader/contribution-classes/pom.xml b/tags/java/sca/1.3.1-RC0/itest/contribution-classloader/contribution-classes/pom.xml
deleted file mode 100644
index 60291859ea..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/contribution-classloader/contribution-classes/pom.xml
+++ /dev/null
@@ -1,203 +0,0 @@
-
-
-
- 4.0.0
-
- org.apache.tuscany.sca
- tuscany-itest
- 1.3.1
- ../pom.xml
-
- itest-contribution-classloader-classes
- Apache Tuscany Contribution ClassLoader Test : Contribution Classes
-
-
-
- org.apache.tuscany.sca
- tuscany-host-embedded
- 1.3.1
-
-
-
- org.apache.tuscany.sca
- tuscany-implementation-java-runtime
- 1.3.1
- runtime
-
-
-
- junit
- junit
- 4.2
- test
-
-
-
-
-
- itest-contribution-classloader-classes
-
-
- org.apache.maven.plugins
- maven-antrun-plugin
- 1.1
-
-
-
- ant
- ant-trax
- 1.6.5
-
-
-
-
-
- create-jar
- generate-test-sources
-
- run
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/customer/Customer.java b/tags/java/sca/1.3.1-RC0/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/customer/Customer.java
deleted file mode 100644
index 814c38777a..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/customer/Customer.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * 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.
- */
-package supplychain.customer;
-
-import org.osoa.sca.annotations.OneWay;
-
-/**
- * This is the business interface of the Customer service component.
- */
-public interface Customer {
-
- public void purchaseGoods();
-
- @OneWay
- public void notifyShipment(String order);
-
- public int outstandingOrderCount();
-
-}
diff --git a/tags/java/sca/1.3.1-RC0/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java b/tags/java/sca/1.3.1-RC0/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java
deleted file mode 100644
index e4daf0ec02..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/customer/JavaCustomerComponentImpl.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * 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.
- */
-package supplychain.customer;
-
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
-
-import supplychain.retailer.Retailer;
-
-/**
- * This class implements the Customer service component (POJO implementation).
- */
-@Service(Customer.class)
-@Scope("COMPOSITE")
-public class JavaCustomerComponentImpl implements Customer {
-
- private static int outstandingOrderCount;
-
- private Retailer retailer;
-
- public JavaCustomerComponentImpl() {
- System.out.println("Created " + this.getClass().getName() +
- " using: " + this.getClass().getClassLoader());
- }
-
- @Reference
- public void setRetailer(Retailer retailer) {
- this.retailer = retailer;
- }
-
- public void purchaseGoods() {
- outstandingOrderCount++;
- retailer.submitOrder("Order");
- }
-
- public void notifyShipment(String order) {
- outstandingOrderCount--;
- System.out.print("Work thread " + Thread.currentThread() + " - ");
- System.out.println(order);
- }
-
- public int outstandingOrderCount() {
- return outstandingOrderCount;
- }
-
-}
diff --git a/tags/java/sca/1.3.1-RC0/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/illegal/JavaCustomerComponentImpl.java b/tags/java/sca/1.3.1-RC0/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/illegal/JavaCustomerComponentImpl.java
deleted file mode 100644
index e4b3bc7048..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/illegal/JavaCustomerComponentImpl.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * 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.
- */
-package supplychain.illegal;
-
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
-
-import supplychain.customer.Customer;
-import supplychain.retailer.JavaRetailerComponentImpl;
-import supplychain.retailer.Retailer;
-import supplychain.warehouse.JavaWarehouseComponentImpl;
-import supplychain.warehouse.Warehouse;
-
-/**
- * This class implements the Customer service component (POJO implementation).
- */
-@Service(Customer.class)
-@Scope("COMPOSITE")
-public class JavaCustomerComponentImpl implements Customer {
-
- private static int outstandingOrderCount;
-
- private Retailer retailer;
-
- public JavaCustomerComponentImpl() {
- System.out.println("Created " + this.getClass().getName() +
- " using: " + this.getClass().getClassLoader());
- }
-
- @Reference
- public void setRetailer(Retailer retailer) {
- this.retailer = retailer;
- }
-
- public void purchaseGoods() {
-
- Retailer retailerImpl = new JavaRetailerComponentImpl();
- System.out.println("Created a retailer from Customer " + retailerImpl);
-
- Warehouse warehouseImpl = new JavaWarehouseComponentImpl();
- System.out.println("Created a warehouse from Customer " + warehouseImpl);
-
- outstandingOrderCount++;
- retailer.submitOrder("Order");
- }
-
- public void notifyShipment(String order) {
- outstandingOrderCount--;
- System.out.print("Work thread " + Thread.currentThread() + " - ");
- System.out.println(order);
- }
-
- public int outstandingOrderCount() {
- return outstandingOrderCount;
- }
-
-}
diff --git a/tags/java/sca/1.3.1-RC0/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java b/tags/java/sca/1.3.1-RC0/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java
deleted file mode 100644
index 698aa2aa5d..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/retailer/JavaRetailerComponentImpl.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * 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.
- */
-package supplychain.retailer;
-
-
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
-
-import supplychain.warehouse.Warehouse;
-
-/**
- * This class implements the Retailer service component (POJO implementation).
- */
-@Service(Retailer.class)
-@Scope("STATELESS")
-public class JavaRetailerComponentImpl implements Retailer {
-
- private Warehouse warehouse;
-
- public JavaRetailerComponentImpl() {
- System.out.println("Created " + this.getClass().getName() +
- " using: " + this.getClass().getClassLoader());
- }
-
- @Reference
- public void setWarehouse(Warehouse warehouse) {
- this.warehouse = warehouse;
- }
-
-
- public Warehouse getWarehouse() {
- return warehouse;
- }
-
- public void submitOrder(String order) {
-
- warehouse.fulfillOrder(order + ", submitted");
-
- }
-
-
-
-
-}
diff --git a/tags/java/sca/1.3.1-RC0/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/retailer/Retailer.java b/tags/java/sca/1.3.1-RC0/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/retailer/Retailer.java
deleted file mode 100644
index 1e87d59af1..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/retailer/Retailer.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * 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.
- */
-package supplychain.retailer;
-
-/**
- * This is the business interface of the Retailer service component.
- */
-public interface Retailer {
-
- public void submitOrder(String order);
-
-}
diff --git a/tags/java/sca/1.3.1-RC0/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java b/tags/java/sca/1.3.1-RC0/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java
deleted file mode 100644
index 9e01f00a79..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/shipper/JavaShipperComponentImpl.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * 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.
- */
-package supplychain.shipper;
-
-
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
-
-import supplychain.customer.Customer;
-
-/**
- * This class implements the Shipper service component (POJO implementation).
- */
-@Service(Shipper.class)
-@Scope("COMPOSITE")
-public class JavaShipperComponentImpl implements Shipper {
-
- private Customer customer;
-
- public JavaShipperComponentImpl() {
- System.out.println("Created " + this.getClass().getCanonicalName() +
- " using: " + this.getClass().getClassLoader());
- }
-
- @Reference
- public void setCustomer(Customer customer) {
- this.customer = customer;
- }
-
- public void processShipment(String order) {
- customer.notifyShipment(order + ", shipped");
- }
-
-
-}
diff --git a/tags/java/sca/1.3.1-RC0/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/shipper/Shipper.java b/tags/java/sca/1.3.1-RC0/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/shipper/Shipper.java
deleted file mode 100644
index 2514928c10..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/shipper/Shipper.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * 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.
- */
-package supplychain.shipper;
-
-/**
- * This is the business interface of the Shipper service component.
- */
-public interface Shipper {
-
- public void processShipment(String order);
-
-}
diff --git a/tags/java/sca/1.3.1-RC0/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java b/tags/java/sca/1.3.1-RC0/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java
deleted file mode 100644
index cdd12d589d..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/warehouse/JavaWarehouseComponentImpl.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * 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.
- */
-package supplychain.warehouse;
-
-import org.osoa.sca.annotations.Scope;
-
-import supplychain.shipper.Shipper;
-
-/**
- * This class implements the Warehouse service component (POJO implementation).
- */
-@Scope("STATELESS")
-public class JavaWarehouseComponentImpl implements Warehouse {
-
- private Shipper shipper;
-
- public JavaWarehouseComponentImpl() {
- System.out.println("Created " + this.getClass().getCanonicalName() +
- " using: " + this.getClass().getClassLoader());
- }
-
- public void setShipper(Shipper shipper) {
- this.shipper = shipper;
- }
-
- public void fulfillOrder(String order) {
- shipper.processShipment(order + ", fulfilled");
- }
-
-
-}
diff --git a/tags/java/sca/1.3.1-RC0/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/warehouse/Warehouse.java b/tags/java/sca/1.3.1-RC0/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/warehouse/Warehouse.java
deleted file mode 100644
index 6f1f6b8730..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/contribution-classloader/contribution-classes/src/main/java/supplychain/warehouse/Warehouse.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * 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.
- */
-package supplychain.warehouse;
-
-/**
- * This is the business interface of the Warehouse service component.
- */
-public interface Warehouse {
-
- public void fulfillOrder(String order);
-
-}
diff --git a/tags/java/sca/1.3.1-RC0/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/complete-supplychain-sca-contribution.xml b/tags/java/sca/1.3.1-RC0/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/complete-supplychain-sca-contribution.xml
deleted file mode 100644
index 714d1826e1..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/complete-supplychain-sca-contribution.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
-
-
-
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/customer-impl-sca-contribution.xml b/tags/java/sca/1.3.1-RC0/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/customer-impl-sca-contribution.xml
deleted file mode 100644
index 7f7dc969e2..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/customer-impl-sca-contribution.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
-
-
-
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/customer-interface-sca-contribution.xml b/tags/java/sca/1.3.1-RC0/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/customer-interface-sca-contribution.xml
deleted file mode 100644
index 7f7dc969e2..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/customer-interface-sca-contribution.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
-
-
-
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/customer-sca-contribution.xml b/tags/java/sca/1.3.1-RC0/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/customer-sca-contribution.xml
deleted file mode 100644
index 8a2bec308f..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/customer-sca-contribution.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/illegal-customer-sca-contribution.xml b/tags/java/sca/1.3.1-RC0/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/illegal-customer-sca-contribution.xml
deleted file mode 100644
index c77c4c1c7e..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/illegal-customer-sca-contribution.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
-
-
-
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/illegal1-supplychain-sca-contribution.xml b/tags/java/sca/1.3.1-RC0/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/illegal1-supplychain-sca-contribution.xml
deleted file mode 100644
index 210a68011f..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/illegal1-supplychain-sca-contribution.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/illegal2-supplychain-sca-contribution.xml b/tags/java/sca/1.3.1-RC0/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/illegal2-supplychain-sca-contribution.xml
deleted file mode 100644
index d118cceef9..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/illegal2-supplychain-sca-contribution.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/retailer-sca-contribution.xml b/tags/java/sca/1.3.1-RC0/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/retailer-sca-contribution.xml
deleted file mode 100644
index d37b6659da..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/retailer-sca-contribution.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/shipper-sca-contribution.xml b/tags/java/sca/1.3.1-RC0/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/shipper-sca-contribution.xml
deleted file mode 100644
index 77b28d9023..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/shipper-sca-contribution.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/supplychain-sca-contribution.xml b/tags/java/sca/1.3.1-RC0/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/supplychain-sca-contribution.xml
deleted file mode 100644
index 8ec290a831..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/supplychain-sca-contribution.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/warehouse-sca-contribution.xml b/tags/java/sca/1.3.1-RC0/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/warehouse-sca-contribution.xml
deleted file mode 100644
index 1398416978..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/contribution-classloader/contribution-classes/src/main/resources/META-INF/warehouse-sca-contribution.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/contribution-classloader/contribution-classes/src/main/resources/supplychain/illegalsupplychain.composite b/tags/java/sca/1.3.1-RC0/itest/contribution-classloader/contribution-classes/src/main/resources/supplychain/illegalsupplychain.composite
deleted file mode 100644
index db1f0d34e7..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/contribution-classloader/contribution-classes/src/main/resources/supplychain/illegalsupplychain.composite
+++ /dev/null
@@ -1,48 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/contribution-classloader/contribution-classes/src/main/resources/supplychain/supplychain.composite b/tags/java/sca/1.3.1-RC0/itest/contribution-classloader/contribution-classes/src/main/resources/supplychain/supplychain.composite
deleted file mode 100644
index 5be79b741a..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/contribution-classloader/contribution-classes/src/main/resources/supplychain/supplychain.composite
+++ /dev/null
@@ -1,48 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/contribution-classloader/contribution-classes/src/main/resources/supplychain/warehouse/JavaWarehouseComponentImpl.componentType b/tags/java/sca/1.3.1-RC0/itest/contribution-classloader/contribution-classes/src/main/resources/supplychain/warehouse/JavaWarehouseComponentImpl.componentType
deleted file mode 100644
index a76fae8090..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/contribution-classloader/contribution-classes/src/main/resources/supplychain/warehouse/JavaWarehouseComponentImpl.componentType
+++ /dev/null
@@ -1,28 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/contribution-classloader/contribution-test/pom.xml b/tags/java/sca/1.3.1-RC0/itest/contribution-classloader/contribution-test/pom.xml
deleted file mode 100644
index 077061f36a..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/contribution-classloader/contribution-test/pom.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-
-
-
- 4.0.0
-
- org.apache.tuscany.sca
- tuscany-itest
- 1.3.1
- ../pom.xml
-
- itest-contribution-classloader-test
- Apache Tuscany Contribution Classloader tests
-
-
-
- org.apache.tuscany.sca
- tuscany-host-embedded
- 1.3.1
-
-
-
- org.apache.tuscany.sca
- tuscany-implementation-java-runtime
- 1.3.1
- runtime
-
-
-
- org.apache.tuscany.sca
- tuscany-monitor-logging
- 1.3.1
- runtime
-
-
-
- junit
- junit
- 4.2
- test
-
-
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/contribution-classloader/contribution-test/src/test/java/org/apache/tuscany/sca/test/contribution/ContributionTestCase.java b/tags/java/sca/1.3.1-RC0/itest/contribution-classloader/contribution-test/src/test/java/org/apache/tuscany/sca/test/contribution/ContributionTestCase.java
deleted file mode 100644
index 692f16f6f6..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/contribution-classloader/contribution-test/src/test/java/org/apache/tuscany/sca/test/contribution/ContributionTestCase.java
+++ /dev/null
@@ -1,373 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.test.contribution;
-
-
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.net.URLClassLoader;
-
-import org.apache.tuscany.sca.contribution.Contribution;
-import org.apache.tuscany.sca.contribution.resolver.ClassReference;
-import org.apache.tuscany.sca.contribution.service.ContributionResolveException;
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-
-/*
- *
- * Contribution ClassLoading integration tests
- */
-
-public class ContributionTestCase {
-
- private SupplyChain supplyChain;
-
-
- @Before
- public void setUp() throws Exception {
- supplyChain = new SupplyChain();
- }
-
-
- @After
- public void tearDown() throws Exception {
-
- supplyChain.tearDown();
-
- }
-
-
- /**
- * Test static ClassLoading for classes that are visible from contribution
- *
- * @throws Exception
- */
- public void staticClassLoadingTestForVisibleClasses() throws Exception {
-
- Contribution customerContribution = supplyChain.getContribution("Customer");
- ClassReference customerClassRef = new ClassReference("supplychain.customer.Customer");
- customerClassRef = customerContribution.getModelResolver().resolveModel(ClassReference.class, customerClassRef);
- Class> customerClass = customerClassRef.getJavaClass();
-
- Class customerClassFromContribution = customerContribution.getClassLoader().loadClass("supplychain.customer.Customer");
- Assert.assertEquals(customerClass, customerClassFromContribution);
-
- Object customer = supplyChain.getCustomer(customerClass);
-
- Method m = customerClass.getMethod("purchaseGoods");
- m.invoke(customer);
-
-
- m = customerClass.getMethod("outstandingOrderCount");
-
- int retries = 10;
- int outstandingCount = 1;
- while (retries-- > 0) {
-
- outstandingCount = (int)(Integer)m.invoke(customer);
- if (outstandingCount == 0)
- break;
- else
- Thread.sleep(100);
- }
- Assert.assertEquals(0, outstandingCount);
-
-
- }
-
-
- /**
- * Test dynamic ClassLoading for classes that are visible from contribution
- *
- * @throws Exception
- */
- public void dynamicClassLoadingTestForVisibleClasses() throws Exception {
-
- Contribution customerContribution = supplyChain.getContribution("Customer");
- Contribution retailerContribution = supplyChain.getContribution("Retailer");
- Contribution warehouseContribution = supplyChain.getContribution("Warehouse");
- Contribution shipperContribution = supplyChain.getContribution("Shipper");
- Contribution supplyChainContribution = supplyChain.getContribution("SupplyChain");
-
- ClassReference customerClassRef = new ClassReference("supplychain.customer.Customer");
- customerClassRef = customerContribution.getModelResolver().resolveModel(ClassReference.class, customerClassRef);
- Class customerClass = customerClassRef.getJavaClass();
-
- Class customerClassFromContribution = customerContribution.getClassLoader().loadClass("supplychain.customer.Customer");
- Assert.assertEquals(customerClass, customerClassFromContribution);
-
- Object customer = supplyChain.getCustomer(customerClass);
- Assert.assertTrue(customerClass.isInstance(customer));
-
- ClassReference retailerClassRef = new ClassReference("supplychain.retailer.Retailer");
- retailerClassRef = retailerContribution.getModelResolver().resolveModel(ClassReference.class, retailerClassRef);
- Class retailerClass = retailerClassRef.getJavaClass();
-
- Class retailerClassFromContribution = retailerContribution.getClassLoader().loadClass("supplychain.retailer.Retailer");
- Assert.assertEquals(retailerClass, retailerClassFromContribution);
-
- Class retailerClassFromCustomer = customerContribution.getClassLoader().loadClass("supplychain.retailer.Retailer");
- Assert.assertEquals(retailerClass, retailerClassFromCustomer);
-
- ClassReference warehouseClassRef = new ClassReference("supplychain.warehouse.Warehouse");
- warehouseClassRef = warehouseContribution.getModelResolver().resolveModel(ClassReference.class, warehouseClassRef);
- Class warehouseClass = warehouseClassRef.getJavaClass();
-
- Class warehouseClassFromContribution = warehouseContribution.getClassLoader().loadClass("supplychain.warehouse.Warehouse");
- Assert.assertEquals(warehouseClass, warehouseClassFromContribution);
-
- Class warehouseClassFromRetailer = retailerContribution.getClassLoader().loadClass("supplychain.warehouse.Warehouse");
- Assert.assertEquals(warehouseClass, warehouseClassFromRetailer);
-
- ClassReference shipperClassRef = new ClassReference("supplychain.shipper.Shipper");
- shipperClassRef = shipperContribution.getModelResolver().resolveModel(ClassReference.class, shipperClassRef);
- Class shipperClass = shipperClassRef.getJavaClass();
-
- Class shipperClassFromContribution = shipperContribution.getClassLoader().loadClass("supplychain.shipper.Shipper");
- Assert.assertEquals(shipperClass, shipperClassFromContribution);
-
- Class shipperClassFromWarehouse = shipperContribution.getClassLoader().loadClass("supplychain.shipper.Shipper");
- Assert.assertEquals(shipperClass, shipperClassFromWarehouse);
-
- Class customerClassFromShipper = shipperContribution.getClassLoader().loadClass("supplychain.customer.Customer");
- Assert.assertEquals(customerClass, customerClassFromShipper);
-
- Class customerClassFromSupplyChain = supplyChainContribution.getClassLoader().loadClass("supplychain.customer.Customer");
- Assert.assertEquals(customerClass, customerClassFromSupplyChain);
- Class retailerClassFromSupplyChain = supplyChainContribution.getClassLoader().loadClass("supplychain.retailer.Retailer");
- Assert.assertEquals(retailerClass, retailerClassFromSupplyChain);
- Class warehouseClassFromSupplyChain = supplyChainContribution.getClassLoader().loadClass("supplychain.warehouse.Warehouse");
- Assert.assertEquals(warehouseClass, warehouseClassFromSupplyChain);
- Class shipperClassFromSupplyChain = supplyChainContribution.getClassLoader().loadClass("supplychain.shipper.Shipper");
- Assert.assertEquals(shipperClass, shipperClassFromSupplyChain);
-
- }
-
- /**
- * Test dynamic ClassLoading for classes that are visible from contribution
- *
- * @throws Exception
- */
- public void dynamicClassLoadingTestForNonImportedClasses() throws Exception {
-
- Contribution customerContribution = supplyChain.getContribution("Customer");
- Contribution shipperContribution = supplyChain.getContribution("Shipper");
-
- Class customerClass = customerContribution.getClassLoader().loadClass("supplychain.customer.Customer");
- Class shipperClass = shipperContribution.getClassLoader().loadClass("supplychain.shipper.Shipper");
-
- try {
- customerClass.getClassLoader().loadClass("supplychain.warehouse.Warehouse");
- Assert.fail("Non-imported class loaded incorrectly");
- } catch (ClassNotFoundException e) {
- }
- try {
- customerClass.getClassLoader().loadClass("supplychain.shipper.JavaShipperComponentImpl");
- Assert.fail("Non-imported class loaded incorrectly");
- } catch (ClassNotFoundException e) {
- }
-
- try {
- Class.forName("supplychain.warehouse.Warehouse", true, customerClass.getClassLoader());
- Assert.fail("Non-imported class loaded incorrectly");
- } catch (ClassNotFoundException e) {
- }
- try {
- Class.forName("supplychain.shipper.JavaShipperComponentImpl", true, customerClass.getClassLoader());
- Assert.fail("Non-imported class loaded incorrectly");
- } catch (ClassNotFoundException e) {
- }
-
- try {
- shipperClass.getClassLoader().loadClass("supplychain.warehouse.JavaWarehouseComponentImpl");
- Assert.fail("Non-imported class loaded incorrectly");
- } catch (ClassNotFoundException e) {
- }
- try {
- shipperClass.getClassLoader().loadClass("supplychain.retailer.Retailer");
- Assert.fail("Non-imported class loaded incorrectly");
- } catch (ClassNotFoundException e) {
- }
-
- try {
- Class.forName("supplychain.warehouse.JavaWarehouseComponentImpl", true, shipperClass.getClassLoader());
- Assert.fail("Non-imported class loaded incorrectly");
- } catch (ClassNotFoundException e) {
- }
- try {
- Class.forName("supplychain.retailer.Retailer", true, shipperClass.getClassLoader());
- Assert.fail("Non-imported class loaded incorrectly");
- } catch (ClassNotFoundException e) {
- }
-
-
- }
-
-
- /**
- * This test ensures that classes from imported packages can be statically loaded
- * from other contributions even though the classes are not on CLASSPATH or on the
- * parent ClassLoader, or the thread context ClassLoader.
- *
- * @throws Exception
- */
- @Test
- public void testValidStaticClassLoading() throws Exception {
-
- supplyChain.setUp(this.getClass().getClassLoader());
-
- staticClassLoadingTestForVisibleClasses();
- }
-
- /**
- * This test ensures that all imported classes are loaded from the exporting contributions
- * rather than the parent classLoader. If any of the interface classes were incorrectly loaded
- * through the parent ClassLoader, LinkageError should result.
- *
- * @throws Exception
- */
- @Test
- public void testValidStaticClassLoadingWithContributionsInParentClassLoader() throws Exception {
-
-
- URLClassLoader parentClassLoader = new URLClassLoader(
- supplyChain.getContributionURLs(),
- this.getClass().getClassLoader());
-
- supplyChain.setUp(parentClassLoader);
-
- staticClassLoadingTestForVisibleClasses();
- }
-
-
- /**
- * This test ensures that classes from imported packages can be dynamically loaded from
- * other contributions even though the classes are not on CLASSPATH or on the
- * parent ClassLoader, or the thread context ClassLoader.
- *
- * @throws Exception
- */
- @Test
- public void testValidDynamicClassLoading() throws Exception {
-
- supplyChain.setUp(this.getClass().getClassLoader());
-
- dynamicClassLoadingTestForVisibleClasses();
- }
-
- /**
- * This test ensures that all imported classes are dynamically loaded from the exporting
- * contributions rather than the parent classLoader. If any of the interface classes were
- * incorrectly loaded through the parent, NoClassDefFoundError or LinkageError should result.
- *
- * @throws Exception
- */
- @Test
- public void testValidDynamicClassLoadingWithContributionsInParentClassLoader() throws Exception {
-
-
- URLClassLoader parentClassLoader = new URLClassLoader(
- supplyChain.getContributionURLs(),
- this.getClass().getClassLoader());
-
- supplyChain.setUp(parentClassLoader);
-
- dynamicClassLoadingTestForVisibleClasses();
- }
-
- @Test
- public void testIllegalStaticClassLoading1() throws Exception {
- // FIXME we have commented this code as we are not throwing exceptions anymore
- // need to deal with monitor logs to catch the errors.
-
- /*try {
- supplyChain.setUp(this.getClass().getClassLoader(), SupplyChain.SUPPLYCHAIN_ILLEGAL_1);
-
- Assert.fail("Composite containing unresolved references resolved incorrectly");
- } catch (ContributionResolveException e) {
- }*/
- }
-
- @Test
- public void testIllegalStaticClassLoading2() throws Exception {
-
- supplyChain.setUp(this.getClass().getClassLoader(), SupplyChain.SUPPLYCHAIN_ILLEGAL_2);
-
- Contribution customerContribution = supplyChain.getContribution("Customer");
- ClassReference customerClassRef = new ClassReference("supplychain.customer.Customer");
- customerClassRef = customerContribution.getModelResolver().resolveModel(ClassReference.class, customerClassRef);
- Class> customerClass = customerClassRef.getJavaClass();
-
- Object customer = supplyChain.getCustomer(customerClass);
-
- try {
- Method m = customerClass.getMethod("purchaseGoods");
- m.invoke(customer);
-
- Assert.fail("Classloading exception not thrown as expected");
- } catch (InvocationTargetException e) {
-
- Throwable cause = e.getCause();
- Assert.assertTrue(cause instanceof NoClassDefFoundError);
- Assert.assertTrue(cause.getMessage().indexOf("JavaWarehouseComponentImpl") > -1); }
-
- }
-
- /**
- * This test ensures that classes from imported packages can be dynamically loaded from
- * other contributions even though the classes are not on CLASSPATH or on the
- * parent ClassLoader, or the thread context ClassLoader.
- *
- * @throws Exception
- */
- @Test
- public void testIllegalDynamicClassLoading() throws Exception {
-
- supplyChain.setUp(this.getClass().getClassLoader());
-
- dynamicClassLoadingTestForNonImportedClasses();
- }
-
-
- /**
- * Self-contained contribution containing composites, componentType files and implementations
- * should not require import/export statements for these files to find each other or for Tuscany
- * to load these files.
- * @throws Exception
- */
- @Test
- public void testSelfContainedContribution() throws Exception {
-
- supplyChain.setUp(this.getClass().getClassLoader(), SupplyChain.SUPPLYCHAIN_SELFCONTAINED);
-
- staticClassLoadingTestForVisibleClasses();
- }
-
- @Test
- public void testContributionsWithSplitPackage() throws Exception {
-
- supplyChain.setUp(this.getClass().getClassLoader(), SupplyChain.SUPPLYCHAIN_SPLITPACKAGE);
-
- staticClassLoadingTestForVisibleClasses();
-
- dynamicClassLoadingTestForNonImportedClasses();
- }
-}
diff --git a/tags/java/sca/1.3.1-RC0/itest/contribution-classloader/contribution-test/src/test/java/org/apache/tuscany/sca/test/contribution/SupplyChain.java b/tags/java/sca/1.3.1-RC0/itest/contribution-classloader/contribution-test/src/test/java/org/apache/tuscany/sca/test/contribution/SupplyChain.java
deleted file mode 100644
index 1ec7aaaa3a..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/contribution-classloader/contribution-test/src/test/java/org/apache/tuscany/sca/test/contribution/SupplyChain.java
+++ /dev/null
@@ -1,231 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.test.contribution;
-
-
-import java.io.File;
-import java.net.URL;
-import java.util.Hashtable;
-
-import org.apache.tuscany.sca.assembly.Composite;
-import org.apache.tuscany.sca.contribution.Contribution;
-import org.apache.tuscany.sca.contribution.service.ContributionService;
-import org.apache.tuscany.sca.host.embedded.impl.EmbeddedSCADomain;
-import org.junit.Assert;
-
-/*
- *
- * Contribution ClassLoading integration tests
- */
-
-public class SupplyChain {
-
- public static final int SUPPLYCHAIN = 0;
- public static final int SUPPLYCHAIN_ILLEGAL_1 = 1;
- public static final int SUPPLYCHAIN_ILLEGAL_2 = 2;
- public static final int SUPPLYCHAIN_SELFCONTAINED = 3;
- public static final int SUPPLYCHAIN_SPLITPACKAGE = 4;
-
- private String folderName = "../contribution-classes/target/classes";
-
- private String customerJarName = "Customer";
- private String retailerJarName = "Retailer";
- private String warehouseJarName = "Warehouse";
- private String shipperJarName = "Shipper";
- private String supplychainJarName = "SupplyChain";
- private String illegalSupplyChain1JarName = "IllegalSupplyChain1";
- private String illegalSupplyChain2JarName = "IllegalSupplyChain2";
- private String illegalCustomerJarName = "IllegalCustomer";
- private String completeSupplychainJarName = "CompleteSupplyChain";
- private String customerInterfaceJarName = "CustomerInterface";
- private String customerImplJarName = "CustomerImpl";
-
-
- private EmbeddedSCADomain domain;
- private ContributionService contributionService;
- private int supplyChainVersion;
-
- private Hashtable contributions = new Hashtable();
-
- private URL customerContribURL;
- private URL retailerContribURL;
- private URL warehouseContribURL;
- private URL shipperContribURL;
- private URL supplyChainContribURL;
- private URL illegalSupplyChain1ContribURL;
- private URL illegalSupplyChain2ContribURL;
- private URL illegalCustomerContribURL;
- private URL completeSupplyChainContribURL;
- private URL customerInterfaceContribURL;
- private URL customerImplContribURL;
-
- public SupplyChain() throws Exception {
-
- customerContribURL = new File(folderName + "/" + customerJarName + ".jar").toURI().toURL();
- retailerContribURL = new File(folderName + "/" + retailerJarName + ".jar").toURI().toURL();
- warehouseContribURL = new File(folderName + "/" + warehouseJarName + ".jar").toURI().toURL();
- shipperContribURL = new File(folderName + "/" + shipperJarName + ".jar").toURI().toURL();
- supplyChainContribURL = new File(folderName + "/" + supplychainJarName + ".jar").toURI().toURL();
- illegalSupplyChain1ContribURL = new File(folderName + "/" + illegalSupplyChain1JarName + ".jar").toURI().toURL();
- illegalSupplyChain2ContribURL = new File(folderName + "/" + illegalSupplyChain2JarName + ".jar").toURI().toURL();
- illegalCustomerContribURL = new File(folderName + "/" + illegalCustomerJarName + ".jar").toURI().toURL();
- completeSupplyChainContribURL = new File(folderName + "/" + completeSupplychainJarName + ".jar").toURI().toURL();
- customerInterfaceContribURL = new File(folderName + "/" + customerInterfaceJarName + ".jar").toURI().toURL();
- customerImplContribURL = new File(folderName + "/" + customerImplJarName + ".jar").toURI().toURL();
- }
-
- public void setUp(ClassLoader parentClassLoader) throws Exception {
- this.setUp(parentClassLoader, SUPPLYCHAIN);
- }
-
- public void setUp(ClassLoader parentClassLoader, int supplyChainVersion) throws Exception {
-
- this.supplyChainVersion = supplyChainVersion;
-
- Thread.currentThread().setContextClassLoader(parentClassLoader);
-
- //Create an embedded SCA domain
- domain = new EmbeddedSCADomain(parentClassLoader, "http://localhost");
-
- //Start the domain
- domain.start();
-
- this.contributionService = domain.getContributionService();
-
- addContributions(supplyChainVersion);
- }
-
- protected void addContributions(int supplyChainVersion) throws Exception {
-
- Contribution contribution;
-
- if (supplyChainVersion != SUPPLYCHAIN_SELFCONTAINED) {
- contribution = contributionService.contribute("Shipper", shipperContribURL, true);
- contributions.put("Shipper", contribution);
- contribution = contributionService.contribute("Warehouse", warehouseContribURL, true);
- contributions.put("Warehouse", contribution);
- contribution = contributionService.contribute("Retailer", retailerContribURL, true);
- contributions.put("Retailer", contribution);
- }
-
- switch (supplyChainVersion) {
- case SUPPLYCHAIN:
- contribution = contributionService.contribute("Customer", customerContribURL, true);
- contributions.put("Customer", contribution);
-
- contribution = contributionService.contribute("SupplyChain", supplyChainContribURL, true);
- contributions.put("SupplyChain", contribution);
- break;
- case SUPPLYCHAIN_ILLEGAL_1:
- contribution = contributionService.contribute("Customer", customerContribURL, true);
- contributions.put("Customer", contribution);
-
- contribution = contributionService.contribute("SupplyChain", illegalSupplyChain1ContribURL, true);
- contributions.put("SupplyChain", contribution);
- break;
- case SUPPLYCHAIN_ILLEGAL_2:
- contribution = contributionService.contribute("Customer", illegalCustomerContribURL, true);
- contributions.put("Customer", contribution);
-
- contribution = contributionService.contribute("SupplyChain", illegalSupplyChain2ContribURL, true);
- contributions.put("SupplyChain", contribution);
- break;
- case SUPPLYCHAIN_SELFCONTAINED:
- contribution = contributionService.contribute("SupplyChain", completeSupplyChainContribURL, true);
- contributions.put("SupplyChain", contribution);
- break;
- case SUPPLYCHAIN_SPLITPACKAGE:
- contribution = contributionService.contribute("Customer", customerInterfaceContribURL, true);
- contributions.put("Customer", contribution);
-
- contribution = contributionService.contribute("CustomerImpl", customerImplContribURL, true);
- contributions.put("CustomerImpl", contribution);
-
- contribution = contributionService.contribute("SupplyChain", supplyChainContribURL, true);
- contributions.put("SupplyChain", contribution);
- break;
- }
-
- // SUPPLYCHAIN_ILLEGAL_1 should throw an exception when the composite is resolved, and hence
- // should not get this far.
- Assert.assertTrue(supplyChainVersion != SUPPLYCHAIN_ILLEGAL_1);
-
-
- for (Contribution c : contributions.values()) {
-
- for (Composite deployable : c.getDeployables()) {
- domain.getDomainComposite().getIncludes().add(deployable);
- domain.buildComposite(deployable);
- }
-
- }
-
- // Start Components from my composite
- for (Composite deployable : contributions.get("SupplyChain").getDeployables() ) {
- domain.getCompositeActivator().activate(deployable);
- domain.getCompositeActivator().start(deployable);
- }
- }
-
- public void tearDown() throws Exception {
-
- if (domain == null)
- return;
-
- for (String contributionURI : contributions.keySet()) {
- contributionService.remove(contributionURI);
- }
-
-
- if (contributions.get("SupplyChain") != null) {
- // Stop Components from my composite
- for (Composite deployable : contributions.get("SupplyChain").getDeployables() ) {
- domain.getCompositeActivator().stop(deployable);
- domain.getCompositeActivator().deactivate(deployable);
- }
- }
-
- domain.stop();
-
- domain.close();
- }
-
- public Contribution getContribution(String uri) {
- if (supplyChainVersion == SUPPLYCHAIN_SELFCONTAINED)
- return contributions.get("SupplyChain");
- else
- return contributions.get(uri);
- }
-
- public Object getCustomer(Class> customerClass) {
- return domain.getService(customerClass, "CustomerComponent");
- }
-
- public URL[] getContributionURLs() {
- return new URL[] {
- customerContribURL,
- retailerContribURL,
- warehouseContribURL,
- shipperContribURL,
- supplyChainContribURL
- };
- }
-
-
-}
diff --git a/tags/java/sca/1.3.1-RC0/itest/contribution-classloader/contribution-test/src/test/java/org/apache/tuscany/sca/test/contribution/TuscanyClassloadingTestCaseFIXME.java b/tags/java/sca/1.3.1-RC0/itest/contribution-classloader/contribution-test/src/test/java/org/apache/tuscany/sca/test/contribution/TuscanyClassloadingTestCaseFIXME.java
deleted file mode 100644
index b123951ef6..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/contribution-classloader/contribution-test/src/test/java/org/apache/tuscany/sca/test/contribution/TuscanyClassloadingTestCaseFIXME.java
+++ /dev/null
@@ -1,381 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.test.contribution;
-
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Method;
-import java.net.URL;
-import java.net.URLClassLoader;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-
-import org.apache.tuscany.sca.assembly.Composite;
-import org.apache.tuscany.sca.extensibility.ServiceDiscovery;
-import org.apache.tuscany.sca.host.embedded.impl.EmbeddedSCADomain;
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-import org.osoa.sca.ServiceReference;
-
-/*
- *
- * Contribution ClassLoading integration tests
- */
-
-//FIXME This test case needs some serious rework!
-// First it is very dependent on the names of the Tuscany runtime JARs
-// and this is going to be difficult to maintain
-// Second its usage of reflection requires the Tuscany implementation classes
-// to be made public and this breaks isolation between modules.
-public class TuscanyClassloadingTestCaseFIXME {
-
- // private static final int SCA_API = 1;
- // private static final int TUSCANY_CORE_SPI = 2;
- // private static final int TUSCANY_RUNTIME = 3;
- // private static final int TUSCANY_EXTENSIONS = 4;
- // private static final int TUSCANY_DEPENDENCIES = 0;
-
- private static final String[] scaApiJars = {"sca-api"};
- private static final String[] tuscanyCoreSpiJars =
- {"core-spi", "interface", "interface-java", "interface-wsdl", "assembly", "policy", "databinding",
- "contribution", "definitions"};
- private static final String[] tuscanyRuntimeJars =
- {
-
- "binding-sca-xml", "binding-sca", "assembly-java-dsl", "assembly-xml", "assembly-xsd", "contribution-impl",
- "contribution-java", "contribution-namespace", "core-databinding", "core-spring", "core", "definitions-xml",
- "domain-api", "domain-impl", "domain", "extension-helper", "host-embedded", "interface-java-xml",
- "interface-wsdl-xml", "java2wsdl", "node-api", "node-impl", "node", "osgi-runtime", "policy-logging",
- "policy-security", "policy-transaction", "policy-xml", "wsdl2java"};
- private static final String[] tuscanyExtensionJars =
- {"binding-dwr", "binding-ejb", "binding-feed", "binding-http", "binding-jms", "binding-jsonrpc",
- "binding-notification", "binding-rmi", "binding-sca-axis2", "binding-ws-axis2", "binding-ws-xml",
- "binding-ws", "databinding-axiom", "databinding-fastinfoset", "databinding-jaxb", "databinding-json",
- "databinding-saxon", "databinding-sdo-axiom", "databinding-sdo", "databinding-xmlbeans", "host-http",
- "host-jetty", "host-rmi", "host-tomcat", "host-webapp", "implementation-das.jar", "implementation-data.jar",
- "implementation-java-runtime", "implementation-java-xml", "implementation-java",
- "implementation-node-runtime", "implementation-node-xml", "implementation-node",
- "implementation-notification", "implementation-osgi", "implementation-resource", "implementation-script",
- "implementation-spring", "implementation-xquery", "contribution-osgi"};
-
- private Class> embeddedDomainClass;
- Object domain;
-
- @Before
- public void setUp() throws Exception {
-
- embeddedDomainClass = getEmbeddedDomainClass();
-
- Constructor c = embeddedDomainClass.getConstructor(ClassLoader.class, String.class);
- // Create an embedded domain
- domain = c.newInstance(embeddedDomainClass.getClassLoader(), "http://localhost");
-
- // Start the domain
- invokeNoArgsMethod(domain, "start");
-
- }
-
- @After
- public void tearDown() throws Exception {
-
- // Stop the domain
- invokeNoArgsMethod(domain, "stop");
-
- }
-
- /**
- * Create a ClassLoader hierarchy for Tuscany runtime
- * Dependencies <- SCA-API <- Core-SPI+ Runtime <- Extensions
- * Load the embedded SCA domain class using the runtime ClassLoader
- *
- * @return embedded SCA domain class
- * @throws Exception
- */
- private Class> getEmbeddedDomainClass() throws Exception {
-
- URL[] scaApiUrls;
- URL[] runtimeUrls;
- URL[] extensionUrls;
- URL[] dependencyUrls;
-
- // When the test is run under Eclipse, the ClassLoader for the test is
- // sun.misc.Launcher$AppClassLoader. The first code path is taken.
- // When the test is run under Maven, the ClassLoader for the test is
- // org.apache.maven.surefire.booter.IsolatedClassLoader, which is a subclass
- // of URLClassLoader. The second code path is taken.
- if (!(this.getClass().getClassLoader() instanceof URLClassLoader)) {
- String classPath = System.getProperty("java.class.path");
- String[] classPathEntries = classPath.split(System.getProperty("path.separator"));
- HashSet dependentJars = new HashSet();
- for (int i = 0; i < classPathEntries.length; i++) {
- dependentJars.add(classPathEntries[i]);
- }
-
- scaApiUrls = getTuscanyClassLoaderURLs(classPathEntries, dependentJars, scaApiJars);
- runtimeUrls =
- getTuscanyClassLoaderURLs(classPathEntries, dependentJars, tuscanyCoreSpiJars, tuscanyRuntimeJars);
- extensionUrls = getTuscanyClassLoaderURLs(classPathEntries, dependentJars, tuscanyExtensionJars);
- dependencyUrls = getTuscanyClassLoaderURLs(classPathEntries, dependentJars);
- } else {
- HashSet dependentJars = new HashSet();
- URL[] classPathEntries = ((URLClassLoader)this.getClass().getClassLoader()).getURLs();
- for (int i = 0; i < classPathEntries.length; i++) {
- dependentJars.add(classPathEntries[i]);
- }
- scaApiUrls = getTuscanyClassLoaderURLs(classPathEntries, dependentJars, scaApiJars);
- runtimeUrls =
- getTuscanyClassLoaderURLs(classPathEntries, dependentJars, tuscanyCoreSpiJars, tuscanyRuntimeJars);
- extensionUrls = getTuscanyClassLoaderURLs(classPathEntries, dependentJars, tuscanyExtensionJars);
- dependencyUrls = getTuscanyClassLoaderURLs(classPathEntries, dependentJars);
-
- }
-
- boolean useSingleClassLoader =
- (scaApiUrls == null || scaApiUrls.length == 0) || (runtimeUrls == null || runtimeUrls.length == 0)
- || (extensionUrls == null || extensionUrls.length == 0)
- || (dependencyUrls == null || dependencyUrls.length == 0);
-
- if (useSingleClassLoader) {
- return EmbeddedSCADomain.class;
- } else {
-
- ClassLoader dependencyLoader = new URLClassLoader(dependencyUrls, null);
- ClassLoader scaApiLoader = new URLClassLoader(scaApiUrls, dependencyLoader);
- ClassLoader runtimeClassLoader = new URLClassLoader(runtimeUrls, scaApiLoader);
- ClassLoader extensionClassLoader = new URLClassLoader(extensionUrls, runtimeClassLoader);
-
- Class> serviceDiscoveryClass = runtimeClassLoader.loadClass(ServiceDiscovery.class.getName());
- Method getInstanceMethod = serviceDiscoveryClass.getMethod("getInstance");
- Object serviceDiscoveryObj = getInstanceMethod.invoke(null);
- Method registerClassLoaderMethod =
- serviceDiscoveryClass.getMethod("registerClassLoader", ClassLoader.class);
- registerClassLoaderMethod.invoke(serviceDiscoveryObj, extensionClassLoader);
-
- Thread.currentThread().setContextClassLoader(extensionClassLoader);
-
- return runtimeClassLoader.loadClass(EmbeddedSCADomain.class.getName());
-
- }
-
- }
-
- /**
- * From the list of entries in the test ClassLoader, match
- * Tuscany jars corresponding to a ClassLoader, and return the list
- * of matching entries as URLs.
- * This method is used when the test is run under eclipse, using CLASSPATH
- * based application ClassLoader.
- *
- * @param classPathEntries List of entries on CLASSPATH
- * @param dependentJars Complete set of jars, remove jars corresponding to this
- * ClassLoader from the set.
- * @param jars List of Tuscany jars corresponding to this ClassLoader
- * @return Matching URLs for the ClassLoader
- * @throws IOException
- */
- private URL[] getTuscanyClassLoaderURLs(String[] classPathEntries, HashSet dependentJars, String[]... jars)
- throws IOException {
-
- String pathSeparator = System.getProperty("file.separator");
- HashSet classPathEntrySet;
-
- if (jars.length == 0)
- classPathEntrySet = dependentJars;
- else {
- classPathEntrySet = new HashSet();
-
- for (int i = 0; i < classPathEntries.length; i++) {
-
- String classPathEntry = classPathEntries[i];
- for (int j = 0; j < jars.length; j++) {
- String[] jarList = jars[j];
- if (jarList != null) {
- for (int k = 0; k < jarList.length; k++) {
- String jarName = "tuscany-" + jarList[k];
- String alternateJarName = "modules" + pathSeparator + jarList[k];
- if (classPathEntry.indexOf(jarName) >= 0 || classPathEntry.indexOf(alternateJarName) >= 0) {
- classPathEntrySet.add(classPathEntry);
- dependentJars.remove(classPathEntry);
- }
- }
- }
- }
- }
-
- }
- ArrayList urls = new ArrayList();
-
- for (String fileName : classPathEntrySet) {
- File file = new File((String)fileName);
- if (!file.exists()) {
- throw new FileNotFoundException(fileName);
-
- } else {
- urls.add(file.toURL());
-
- }
- }
-
- return (URL[])urls.toArray(new URL[urls.size()]);
- }
-
- /**
- * From the list of URLs of the test ClassLoader, match
- * Tuscany jars corresponding to a ClassLoader, and return the matching URLs
- * This method is used when the test is run under Maven. The test ClassLoader is
- * org.apache.maven.surefire.booter.IsolatedClassLoader, which is a subclass
- * of URLClassLoader
- *
- * @param classPathEntries List of URLs from the test ClassLoader
- * @param dependentJars Complete set of jars, remove jars corresponding to this
- * ClassLoader from the set.
- * @param jars List of Tuscany jars corresponding to this ClassLoader
- * @return Matching URLs for the ClassLoader
- * @throws IOException
- */
- private URL[] getTuscanyClassLoaderURLs(URL[] classPathEntries, HashSet dependentJars, String[]... jars)
- throws IOException {
-
- String pathSeparator = System.getProperty("file.separator");
- HashSet classPathEntrySet;
-
- if (jars.length == 0)
- classPathEntrySet = dependentJars;
- else {
- classPathEntrySet = new HashSet();
-
- for (int i = 0; i < classPathEntries.length; i++) {
-
- URL classPathEntry = classPathEntries[i];
- String classPathEntryStr = classPathEntry.getPath();
- for (int j = 0; j < jars.length; j++) {
- String[] jarList = jars[j];
- if (jarList != null) {
- for (int k = 0; k < jarList.length; k++) {
- String jarName = "tuscany-" + jarList[k];
- String alternateJarName = "modules" + pathSeparator + jarList[k];
- if (classPathEntryStr.indexOf(jarName) >= 0 || classPathEntryStr.indexOf(alternateJarName) >= 0) {
- classPathEntrySet.add(classPathEntry);
- dependentJars.remove(classPathEntry);
- }
- }
- }
- }
- }
-
- }
- return (URL[])classPathEntrySet.toArray(new URL[classPathEntrySet.size()]);
- }
-
- private Object invokeNoArgsMethod(Object obj, String methodName) throws Exception {
-
- return obj.getClass().getMethod(methodName).invoke(obj);
- }
-
- private Object invokeOneArgMethod(Object obj, String methodName, Class argType, Object arg) throws Exception {
-
- return obj.getClass().getMethod(methodName, argType).invoke(obj, arg);
- }
-
- /**
- *
- * Load Tuscany runtime using multiple ClassLoaders, and run supplychain
- * test.
- *
- * @throws Exception
- */
- @SuppressWarnings("unchecked")
- @Test
- public void test() throws Exception {
-
- ClassLoader runtimeClassloader = embeddedDomainClass.getClassLoader();
-
- if (runtimeClassloader == this.getClass().getClassLoader()) {
- System.out.println("Runtime and test loaded using the same classloader " + runtimeClassloader);
- } else {
- System.out
- .println("Running test using separate Tuscany classloaders, runtime classloader=" + runtimeClassloader);
- ClassLoader apiClassLoader =
- runtimeClassloader.loadClass(ServiceReference.class.getName()).getClassLoader();
- Assert.assertTrue(apiClassLoader != runtimeClassloader);
-
- try {
- runtimeClassloader.loadClass("org.apache.tuscany.sca.implementation.java.JavaImplementation");
- Assert.fail("Loaded extension class incorrectly from runtimeClassLoader");
- } catch (ClassNotFoundException e) {
- }
-
- }
-
- // Contribute supplychain (as single contribution)
- Object contributionService = invokeNoArgsMethod(domain, "getContributionService");
- Method contributeMethod =
- contributionService.getClass().getMethod("contribute", String.class, URL.class, boolean.class);
-
- String folderName = "../contribution-classes/target/classes";
- String supplychainJarName = "CompleteSupplyChain";
- URL supplyChainContribURL = new File(folderName + "/" + supplychainJarName + ".jar").toURL();
- Object contribution = contributeMethod.invoke(contributionService, "SupplyChain", supplyChainContribURL, true);
-
- Object composite = ((List)invokeNoArgsMethod(contribution, "getDeployables")).get(0);
- Object domainComposite = invokeNoArgsMethod(domain, "getDomainComposite");
- List includes = (List)invokeNoArgsMethod(domainComposite, "getIncludes");
- includes.add(composite);
- //Object compositeBuilder = invokeNoArgsMethod(domain, "getCompositeBuilder");
- Object compositeActivator = invokeNoArgsMethod(domain, "getCompositeActivator");
-
- Class compositeClass = embeddedDomainClass.getClassLoader().loadClass(Composite.class.getName());
- invokeOneArgMethod(domain, "buildComposite", compositeClass, composite);
- invokeOneArgMethod(compositeActivator, "activate", compositeClass, composite);
- invokeOneArgMethod(compositeActivator, "start", compositeClass, composite);
-
- // Get customer service
- Method getClassLoaderMethod = contribution.getClass().getMethod("getClassLoader");
- ClassLoader classLoader = (ClassLoader)getClassLoaderMethod.invoke(contribution);
-
- Class customerClass = classLoader.loadClass("supplychain.customer.Customer");
- Method getServiceMethod = embeddedDomainClass.getMethod("getService", Class.class, String.class);
- Object customer = getServiceMethod.invoke(domain, customerClass, "CustomerComponent");
-
- // Invoke purchaseGoods
- Method m = customerClass.getMethod("purchaseGoods");
- m.invoke(customer);
-
- m = customerClass.getMethod("outstandingOrderCount");
-
- int retries = 10;
- int outstandingCount = 1;
- while (retries-- > 0) {
-
- outstandingCount = (int)(Integer)m.invoke(customer);
- if (outstandingCount == 0)
- break;
- else
- Thread.sleep(100);
- }
- Assert.assertEquals(0, outstandingCount);
-
- }
-
-}
diff --git a/tags/java/sca/1.3.1-RC0/itest/contribution-classloader/pom.xml b/tags/java/sca/1.3.1-RC0/itest/contribution-classloader/pom.xml
deleted file mode 100644
index 8547351ae8..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/contribution-classloader/pom.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-
-
-
- 4.0.0
-
- org.apache.tuscany.sca
- tuscany-itest
- 1.3.1
- ../pom.xml
-
- itest-contribution-classloader
- pom
- Apache Tuscany Contribution ClassLoader Integration Tests
-
-
- contribution-classes
- contribution-test
-
-
-
-
- org.apache.tuscany.sca
- tuscany-host-embedded
- 1.3.1
-
-
-
- org.apache.tuscany.sca
- tuscany-contribution-impl
- 1.3.1
-
-
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/contribution-import-export/export-composite/pom.xml b/tags/java/sca/1.3.1-RC0/itest/contribution-import-export/export-composite/pom.xml
deleted file mode 100644
index fced0427c9..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/contribution-import-export/export-composite/pom.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-
-
-
- 4.0.0
-
- org.apache.tuscany.sca
- tuscany-itest
- 1.3.1
- ../pom.xml
-
- itest-contribution-export-composite
- Apache Tuscany SCA Contribution Export Integration Tests
-
-
-
- org.apache.tuscany.sca
- tuscany-host-embedded
- 1.3.1
-
-
-
- org.apache.tuscany.sca
- tuscany-implementation-java-runtime
- 1.3.1
- runtime
-
-
-
- org.apache.tuscany.sca
- tuscany-binding-ws-axis2
- 1.3.1
- runtime
-
-
-
- org.apache.tuscany.sca
- tuscany-host-tomcat
- 1.3.1
- runtime
-
-
-
- junit
- junit
- 4.2
- test
-
-
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/contribution-import-export/export-composite/src/main/java/hello/Hello.java b/tags/java/sca/1.3.1-RC0/itest/contribution-import-export/export-composite/src/main/java/hello/Hello.java
deleted file mode 100644
index e65422136f..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/contribution-import-export/export-composite/src/main/java/hello/Hello.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * 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.
- */
-package hello;
-
-import org.osoa.sca.annotations.Remotable;
-
-/**
- * This is the business interface of the Hello service.
- */
-@Remotable
-public interface Hello {
-
- public String getGreetings(String name);
-}
diff --git a/tags/java/sca/1.3.1-RC0/itest/contribution-import-export/export-composite/src/main/java/hello/HelloImpl.java b/tags/java/sca/1.3.1-RC0/itest/contribution-import-export/export-composite/src/main/java/hello/HelloImpl.java
deleted file mode 100644
index 5369c18497..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/contribution-import-export/export-composite/src/main/java/hello/HelloImpl.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * 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.
- */
-package hello;
-
-import org.osoa.sca.annotations.Service;
-
-/**
- * This class implements the HelloWorld service.
- */
-@Service(Hello.class)
-public class HelloImpl implements Hello {
-
- public String getGreetings(String name) {
- return "Hello " + name;
- }
-
-}
diff --git a/tags/java/sca/1.3.1-RC0/itest/contribution-import-export/export-composite/src/main/resources/META-INF/sca-contribution.xml b/tags/java/sca/1.3.1-RC0/itest/contribution-import-export/export-composite/src/main/resources/META-INF/sca-contribution.xml
deleted file mode 100644
index 3c14560a56..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/contribution-import-export/export-composite/src/main/resources/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/tags/java/sca/1.3.1-RC0/itest/contribution-import-export/export-composite/src/main/resources/hello.composite b/tags/java/sca/1.3.1-RC0/itest/contribution-import-export/export-composite/src/main/resources/hello.composite
deleted file mode 100644
index 636b7111d9..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/contribution-import-export/export-composite/src/main/resources/hello.composite
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/contribution-import-export/export-composite/src/test/java/org/apache/tuscany/sca/test/contribution/HelloTestCase.java b/tags/java/sca/1.3.1-RC0/itest/contribution-import-export/export-composite/src/test/java/org/apache/tuscany/sca/test/contribution/HelloTestCase.java
deleted file mode 100644
index 72b77564d2..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/contribution-import-export/export-composite/src/test/java/org/apache/tuscany/sca/test/contribution/HelloTestCase.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.test.contribution;
-
-import hello.Hello;
-
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URL;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.assembly.Composite;
-import org.apache.tuscany.sca.contribution.Contribution;
-import org.apache.tuscany.sca.contribution.service.ContributionService;
-import org.apache.tuscany.sca.host.embedded.impl.EmbeddedSCADomain;
-
-/**
- * Tests that the helloworld server is available
- */
-public class HelloTestCase extends TestCase {
- private ClassLoader cl;
- private EmbeddedSCADomain domain;
-
- @Override
- protected void setUp() throws Exception {
- // Create a test embedded SCA domain
- cl = getClass().getClassLoader();
- domain = new EmbeddedSCADomain(cl, "http://localhost");
-
- // Start the domain
- domain.start();
-
- // Contribute the SCA contribution
- ContributionService contributionService = domain.getContributionService();
-
- URL helloURL = getContributionURL(Hello.class);
-
- // File helloContrib = new File("./target/classes/");
- // URL helloURL = helloContrib.toURL();
- Contribution consumerContribution =
- contributionService.contribute("http://import-export/hello", helloURL, false);
- Composite consumerComposite = consumerContribution.getDeployables().get(0);
- domain.getDomainComposite().getIncludes().add(consumerComposite);
- domain.buildComposite(consumerComposite);
-
- // Start Components from my composite
- domain.getCompositeActivator().activate(consumerComposite);
- domain.getCompositeActivator().start(consumerComposite);
- }
-
- private URL getContributionURL(Class> cls) throws MalformedURLException {
- String flag = "/" + cls.getName().replace('.', '/') + ".class";
- URL url = cls.getResource(flag);
- String root = url.toExternalForm();
- root = root.substring(0, root.length() - flag.length() + 1);
- if (root.startsWith("jar:") && root.endsWith("!/")) {
- root = root.substring(4, root.length() - 2);
- }
- url = new URL(root);
- return url;
- }
-
- public void testHello() throws IOException {
- Hello hello = domain.getService(Hello.class, "HelloServiceComponent");
- assertNotNull(hello);
- assertEquals(hello.getGreetings("lresende"), "Hello lresende");
- }
-
- @Override
- public void tearDown() throws Exception {
- domain.close();
- }
-
-}
diff --git a/tags/java/sca/1.3.1-RC0/itest/contribution-import-export/export-java/pom.xml b/tags/java/sca/1.3.1-RC0/itest/contribution-import-export/export-java/pom.xml
deleted file mode 100644
index 61cc3434af..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/contribution-import-export/export-java/pom.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-
-
-
- 4.0.0
-
- org.apache.tuscany.sca
- tuscany-itest
- 1.3.1
- ../pom.xml
-
- itest-contribution-export-java
- Apache Tuscany SCA Contribution Java Export Integration Tests
-
-
-
- org.apache.tuscany.sca
- tuscany-host-embedded
- 1.3.1
-
-
-
- org.apache.tuscany.sca
- tuscany-implementation-java-runtime
- 1.3.1
- runtime
-
-
-
- org.apache.tuscany.sca
- tuscany-binding-ws-axis2
- 1.3.1
- runtime
-
-
-
- org.apache.tuscany.sca
- tuscany-host-tomcat
- 1.3.1
- runtime
-
-
-
- junit
- junit
- 4.2
- test
-
-
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/contribution-import-export/export-java/src/main/java/helloworld/HelloWorldService.java b/tags/java/sca/1.3.1-RC0/itest/contribution-import-export/export-java/src/main/java/helloworld/HelloWorldService.java
deleted file mode 100644
index 74d22ed830..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/contribution-import-export/export-java/src/main/java/helloworld/HelloWorldService.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * 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.
- */
-package helloworld;
-
-import org.osoa.sca.annotations.Remotable;
-
-/**
- * This is the business interface of the HelloWorld greetings service.
- */
-@Remotable
-public interface HelloWorldService {
-
- public String getGreetings(String name);
-}
diff --git a/tags/java/sca/1.3.1-RC0/itest/contribution-import-export/export-java/src/main/resources/META-INF/sca-contribution.xml b/tags/java/sca/1.3.1-RC0/itest/contribution-import-export/export-java/src/main/resources/META-INF/sca-contribution.xml
deleted file mode 100644
index dc33dfa560..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/contribution-import-export/export-java/src/main/resources/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
-
-
\ No newline at end of file
diff --git a/tags/java/sca/1.3.1-RC0/itest/contribution-import-export/export-java/src/main/resources/helloworld/HelloWorldImpl.componentType b/tags/java/sca/1.3.1-RC0/itest/contribution-import-export/export-java/src/main/resources/helloworld/HelloWorldImpl.componentType
deleted file mode 100644
index 5a14b41650..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/contribution-import-export/export-java/src/main/resources/helloworld/HelloWorldImpl.componentType
+++ /dev/null
@@ -1,30 +0,0 @@
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/tags/java/sca/1.3.1-RC0/itest/contribution-import-export/export-resource/pom.xml b/tags/java/sca/1.3.1-RC0/itest/contribution-import-export/export-resource/pom.xml
deleted file mode 100644
index 6897808378..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/contribution-import-export/export-resource/pom.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
- 4.0.0
-
- org.apache.tuscany.sca
- tuscany-itest
- 1.3.1
- ../pom.xml
-
- itest-contribution-export-resource
- Apache Tuscany SCA Contribution Resource Export Integration Tests
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/contribution-import-export/export-resource/src/main/resources/META-INF/sca-contribution.xml b/tags/java/sca/1.3.1-RC0/itest/contribution-import-export/export-resource/src/main/resources/META-INF/sca-contribution.xml
deleted file mode 100644
index f11eacb416..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/contribution-import-export/export-resource/src/main/resources/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
-
-
\ No newline at end of file
diff --git a/tags/java/sca/1.3.1-RC0/itest/contribution-import-export/export-resource/src/main/resources/ufservices/store.html b/tags/java/sca/1.3.1-RC0/itest/contribution-import-export/export-resource/src/main/resources/ufservices/store.html
deleted file mode 100644
index 1ff281373a..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/contribution-import-export/export-resource/src/main/resources/ufservices/store.html
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
-
-Store
-
-
-
-Sample Store Page
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/contribution-import-export/export-wsdl/pom.xml b/tags/java/sca/1.3.1-RC0/itest/contribution-import-export/export-wsdl/pom.xml
deleted file mode 100644
index 1d43d2d050..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/contribution-import-export/export-wsdl/pom.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
- 4.0.0
-
- org.apache.tuscany.sca
- tuscany-itest
- 1.3.1
- ../pom.xml
-
- itest-contribution-export-wsdl
- Apache Tuscany SCA Contribution WSDL Export Integration Tests
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/contribution-import-export/export-wsdl/src/main/resources/META-INF/sca-contribution.xml b/tags/java/sca/1.3.1-RC0/itest/contribution-import-export/export-wsdl/src/main/resources/META-INF/sca-contribution.xml
deleted file mode 100644
index b7394ec14b..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/contribution-import-export/export-wsdl/src/main/resources/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
-
-
\ No newline at end of file
diff --git a/tags/java/sca/1.3.1-RC0/itest/contribution-import-export/export-wsdl/src/main/resources/helloworld.wsdl b/tags/java/sca/1.3.1-RC0/itest/contribution-import-export/export-wsdl/src/main/resources/helloworld.wsdl
deleted file mode 100644
index 9b31363e1a..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/contribution-import-export/export-wsdl/src/main/resources/helloworld.wsdl
+++ /dev/null
@@ -1,76 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/contribution-import-export/export-wsdl/src/main/resources/helloworld.xsd b/tags/java/sca/1.3.1-RC0/itest/contribution-import-export/export-wsdl/src/main/resources/helloworld.xsd
deleted file mode 100644
index d3c83b08c6..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/contribution-import-export/export-wsdl/src/main/resources/helloworld.xsd
+++ /dev/null
@@ -1,35 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/tags/java/sca/1.3.1-RC0/itest/contribution-import-export/import-composite/pom.xml b/tags/java/sca/1.3.1-RC0/itest/contribution-import-export/import-composite/pom.xml
deleted file mode 100644
index 6b167b834e..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/contribution-import-export/import-composite/pom.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-
-
-
- 4.0.0
-
- org.apache.tuscany.sca
- tuscany-itest
- 1.3.1
- ../pom.xml
-
- itest-contribution-import-composite
- Apache Tuscany SCA Contribution Import Integration Tests
-
-
-
- org.apache.tuscany.sca
- itest-contribution-export-composite
- 1.3.1
-
-
-
- org.apache.tuscany.sca
- tuscany-host-embedded
- 1.3.1
-
-
-
- org.apache.tuscany.sca
- tuscany-implementation-java-runtime
- 1.3.1
- runtime
-
-
-
- org.apache.tuscany.sca
- tuscany-binding-ws-axis2
- 1.3.1
- runtime
-
-
-
- org.apache.tuscany.sca
- tuscany-host-tomcat
- 1.3.1
- runtime
-
-
-
- junit
- junit
- 4.2
- test
-
-
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldImpl.java b/tags/java/sca/1.3.1-RC0/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldImpl.java
deleted file mode 100644
index 966f56d7d5..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldImpl.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * 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.
- */
-package helloworld;
-
-import hello.Hello;
-
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Service;
-
-/**
- * This class implements the HelloWorld service.
- */
-@Service(HelloWorldService.class)
-public class HelloWorldImpl implements HelloWorldService {
- @Reference
- protected Hello helloServiceRef;
-
- public String getGreetings(String name) {
- return helloServiceRef.getGreetings(name);
- }
-
-}
diff --git a/tags/java/sca/1.3.1-RC0/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldServer.java b/tags/java/sca/1.3.1-RC0/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldServer.java
deleted file mode 100644
index 3d43290380..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldServer.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * 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.
- */
-package helloworld;
-
-import java.io.IOException;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-/**
- * This server program shows how to create an SCA runtime, and start it which
- * activates the helloworld Web service endpoint.
- */
-public class HelloWorldServer {
-
- public static void main(String[] args) {
-
- SCADomain scaDomain = SCADomain.newInstance("helloworldws.composite");
-
- try {
- System.out.println("HelloWorld server started (press enter to shutdown)");
- System.in.read();
- } catch (IOException e) {
- e.printStackTrace();
- }
-
- scaDomain.close();
- System.out.println("HelloWorld server stopped");
- }
-
-}
diff --git a/tags/java/sca/1.3.1-RC0/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldService.java b/tags/java/sca/1.3.1-RC0/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldService.java
deleted file mode 100644
index 74d22ed830..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/contribution-import-export/import-composite/src/main/java/helloworld/HelloWorldService.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * 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.
- */
-package helloworld;
-
-import org.osoa.sca.annotations.Remotable;
-
-/**
- * This is the business interface of the HelloWorld greetings service.
- */
-@Remotable
-public interface HelloWorldService {
-
- public String getGreetings(String name);
-}
diff --git a/tags/java/sca/1.3.1-RC0/itest/contribution-import-export/import-composite/src/main/resources/META-INF/sca-contribution.xml b/tags/java/sca/1.3.1-RC0/itest/contribution-import-export/import-composite/src/main/resources/META-INF/sca-contribution.xml
deleted file mode 100644
index 9f3f5be452..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/contribution-import-export/import-composite/src/main/resources/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/tags/java/sca/1.3.1-RC0/itest/contribution-import-export/import-composite/src/main/resources/helloworld.wsdl b/tags/java/sca/1.3.1-RC0/itest/contribution-import-export/import-composite/src/main/resources/helloworld.wsdl
deleted file mode 100644
index 9b31363e1a..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/contribution-import-export/import-composite/src/main/resources/helloworld.wsdl
+++ /dev/null
@@ -1,76 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/contribution-import-export/import-composite/src/main/resources/helloworld.xsd b/tags/java/sca/1.3.1-RC0/itest/contribution-import-export/import-composite/src/main/resources/helloworld.xsd
deleted file mode 100644
index d3c83b08c6..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/contribution-import-export/import-composite/src/main/resources/helloworld.xsd
+++ /dev/null
@@ -1,35 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/tags/java/sca/1.3.1-RC0/itest/contribution-import-export/import-composite/src/main/resources/helloworldws.composite b/tags/java/sca/1.3.1-RC0/itest/contribution-import-export/import-composite/src/main/resources/helloworldws.composite
deleted file mode 100644
index e2f852ff7e..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/contribution-import-export/import-composite/src/main/resources/helloworldws.composite
+++ /dev/null
@@ -1,39 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/contribution-import-export/import-composite/src/test/java/org/apache/tuscany/test/contribution/HelloWorldServerTestCase.java b/tags/java/sca/1.3.1-RC0/itest/contribution-import-export/import-composite/src/test/java/org/apache/tuscany/test/contribution/HelloWorldServerTestCase.java
deleted file mode 100644
index 1176a89143..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/contribution-import-export/import-composite/src/test/java/org/apache/tuscany/test/contribution/HelloWorldServerTestCase.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.test.contribution;
-
-import hello.Hello;
-import helloworld.HelloWorldService;
-
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.Socket;
-import java.net.URL;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.assembly.Composite;
-import org.apache.tuscany.sca.contribution.Contribution;
-import org.apache.tuscany.sca.contribution.service.ContributionService;
-import org.apache.tuscany.sca.host.embedded.impl.EmbeddedSCADomain;
-
-/**
- * Tests that the helloworld server is available
- */
-public class HelloWorldServerTestCase extends TestCase {
- private ClassLoader cl;
- private EmbeddedSCADomain domain;
- private Contribution helloWorldContribution;
- private Contribution compositeContribution;
-
- @Override
- protected void setUp() throws Exception {
- //Create a test embedded SCA domain
- cl = getClass().getClassLoader();
- domain = new EmbeddedSCADomain(cl, "http://localhost");
-
- //Start the domain
- domain.start();
-
- // Contribute the SCA contribution
- ContributionService contributionService = domain.getContributionService();
-
- // File compositeContribLocation = new File("../export-composite/target/classes");
- // URL compositeContribURL = compositeContribLocation.toURL();
- URL compositeContribURL = getContributionURL(Hello.class);
- compositeContribution =
- contributionService.contribute("http://import-export/export-composite", compositeContribURL, false);
- for (Composite deployable : compositeContribution.getDeployables()) {
- domain.getDomainComposite().getIncludes().add(deployable);
- domain.buildComposite(deployable);
- }
-
-// File helloWorldContribLocation = new File("./target/classes/");
-// URL helloWorldContribURL = helloWorldContribLocation.toURL();
- URL helloWorldContribURL = getContributionURL(HelloWorldService.class);
- helloWorldContribution =
- contributionService.contribute("http://import-export/helloworld", helloWorldContribURL, false);
- for (Composite deployable : helloWorldContribution.getDeployables()) {
- domain.getDomainComposite().getIncludes().add(deployable);
- domain.buildComposite(deployable);
- }
-
- // Start Components from my composite
- for (Composite deployable : helloWorldContribution.getDeployables()) {
- domain.getCompositeActivator().activate(deployable);
- domain.getCompositeActivator().start(deployable);
- }
- }
-
- private URL getContributionURL(Class> cls) throws MalformedURLException {
- String flag = "/" + cls.getName().replace('.', '/') + ".class";
- URL url = cls.getResource(flag);
- String root = url.toExternalForm();
- root = root.substring(0, root.length() - flag.length() + 1);
- if (root.startsWith("jar:") && root.endsWith("!/")) {
- root = root.substring(4, root.length() - 2);
- }
- url = new URL(root);
- return url;
- }
-
- public void testPing() throws IOException {
- new Socket("127.0.0.1", 8085);
- }
-
- public void testServiceCall() throws IOException {
- HelloWorldService helloWorldService =
- domain.getService(HelloWorldService.class, "HelloWorldServiceComponent/HelloWorldService");
- assertNotNull(helloWorldService);
-
- assertEquals("Hello Smith", helloWorldService.getGreetings("Smith"));
- }
-
- @Override
- public void tearDown() throws Exception {
- ContributionService contributionService = domain.getContributionService();
-
- // Remove the contribution from the in-memory repository
- contributionService.remove("http://import-export/helloworld");
- contributionService.remove("http://import-export/export-composite");
-
- //Stop Components from my composite
- for (Composite deployable : helloWorldContribution.getDeployables()) {
- domain.getCompositeActivator().stop(deployable);
- domain.getCompositeActivator().deactivate(deployable);
- }
-
- domain.stop();
- domain.close();
- }
-
-}
diff --git a/tags/java/sca/1.3.1-RC0/itest/contribution-import-export/import-java/pom.xml b/tags/java/sca/1.3.1-RC0/itest/contribution-import-export/import-java/pom.xml
deleted file mode 100644
index 86aebab405..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/contribution-import-export/import-java/pom.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-
-
-
- 4.0.0
-
- org.apache.tuscany.sca
- tuscany-itest
- 1.3.1
- ../pom.xml
-
- itest-contribution-import-java
- Apache Tuscany SCA Contribution Java Import Java Integration Tests
-
-
-
- org.apache.tuscany.sca
- itest-contribution-export-java
- 1.3.1
-
-
-
- org.apache.tuscany.sca
- tuscany-host-embedded
- 1.3.1
-
-
-
- org.apache.tuscany.sca
- tuscany-implementation-java-runtime
- 1.3.1
- runtime
-
-
-
- org.apache.tuscany.sca
- tuscany-binding-ws-axis2
- 1.3.1
- runtime
-
-
-
- org.apache.tuscany.sca
- tuscany-host-tomcat
- 1.3.1
- runtime
-
-
-
- junit
- junit
- 4.2
- test
-
-
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/contribution-import-export/import-java/src/main/java/helloworld/HelloWorldImpl.java b/tags/java/sca/1.3.1-RC0/itest/contribution-import-export/import-java/src/main/java/helloworld/HelloWorldImpl.java
deleted file mode 100644
index 4cdcc1fd0b..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/contribution-import-export/import-java/src/main/java/helloworld/HelloWorldImpl.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * 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.
- */
-package helloworld;
-
-import org.osoa.sca.annotations.Service;
-
-/**
- * This class implements the HelloWorld service.
- */
-@Service(HelloWorldService.class)
-public class HelloWorldImpl implements HelloWorldService {
-
- public String getGreetings(String name) {
- return "Hello " + name;
- }
-
-}
diff --git a/tags/java/sca/1.3.1-RC0/itest/contribution-import-export/import-java/src/main/resources/META-INF/sca-contribution.xml b/tags/java/sca/1.3.1-RC0/itest/contribution-import-export/import-java/src/main/resources/META-INF/sca-contribution.xml
deleted file mode 100644
index 224e2c4d79..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/contribution-import-export/import-java/src/main/resources/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/tags/java/sca/1.3.1-RC0/itest/contribution-import-export/import-java/src/main/resources/helloworldws.composite b/tags/java/sca/1.3.1-RC0/itest/contribution-import-export/import-java/src/main/resources/helloworldws.composite
deleted file mode 100644
index 9b650e4acc..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/contribution-import-export/import-java/src/main/resources/helloworldws.composite
+++ /dev/null
@@ -1,29 +0,0 @@
-
-
-
-
-
-
-
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/contribution-import-export/import-java/src/test/java/org/apache/tuscany/sca/test/contribution/HelloWorldServerTestCase.java b/tags/java/sca/1.3.1-RC0/itest/contribution-import-export/import-java/src/test/java/org/apache/tuscany/sca/test/contribution/HelloWorldServerTestCase.java
deleted file mode 100644
index 431988cc04..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/contribution-import-export/import-java/src/test/java/org/apache/tuscany/sca/test/contribution/HelloWorldServerTestCase.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.test.contribution;
-
-import helloworld.HelloWorldImpl;
-import helloworld.HelloWorldService;
-
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URL;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.assembly.Composite;
-import org.apache.tuscany.sca.contribution.Contribution;
-import org.apache.tuscany.sca.contribution.service.ContributionService;
-import org.apache.tuscany.sca.host.embedded.impl.EmbeddedSCADomain;
-
-/**
- * Tests that the helloworld server is available
- */
-public class HelloWorldServerTestCase extends TestCase {
- private ClassLoader cl;
- private EmbeddedSCADomain domain;
- private Contribution helloWorldContribution;
- private Contribution javaContribution;
-
- @Override
- protected void setUp() throws Exception {
- //Create a test embedded SCA domain
- cl = getClass().getClassLoader();
- domain = new EmbeddedSCADomain(cl, "http://localhost");
-
- //Start the domain
- domain.start();
-
- // Contribute the SCA contribution
- ContributionService contributionService = domain.getContributionService();
-
- //File javaContribLocation = new File("../export-java/target/classes");
- //URL javaContribURL = javaContribLocation.toURL();
- URL javaContribURL = getContributionURL(HelloWorldService.class);
- javaContribution = contributionService.contribute("http://import-export/export-java", javaContribURL, false);
- for (Composite deployable : javaContribution.getDeployables()) {
- domain.getDomainComposite().getIncludes().add(deployable);
- domain.buildComposite(deployable);
- }
-
- //File helloWorldContribLocation = new File("./target/classes/");
- //URL helloWorldContribURL = helloWorldContribLocation.toURL();
- URL helloWorldContribURL = getContributionURL(HelloWorldImpl.class);
- helloWorldContribution = contributionService.contribute("http://import-export/helloworld", helloWorldContribURL, false);
- for (Composite deployable : helloWorldContribution.getDeployables()) {
- domain.getDomainComposite().getIncludes().add(deployable);
- domain.buildComposite(deployable);
- }
-
- // Start Components from my composite
- for (Composite deployable : helloWorldContribution.getDeployables()) {
- domain.getCompositeActivator().activate(deployable);
- domain.getCompositeActivator().start(deployable);
- }
- }
-
- private URL getContributionURL(Class> cls) throws MalformedURLException {
- String flag = "/" + cls.getName().replace('.', '/') + ".class";
- URL url = cls.getResource(flag);
- String root = url.toExternalForm();
- root = root.substring(0, root.length() - flag.length() + 1);
- if (root.startsWith("jar:") && root.endsWith("!/")) {
- root = root.substring(4, root.length() - 2);
- }
- url = new URL(root);
- return url;
- }
-
- public void testPing() throws IOException {
- HelloWorldService helloWorldService =
- domain.getService(HelloWorldService.class, "HelloWorldServiceComponent/HelloWorldService");
- assertNotNull(helloWorldService);
- assertEquals("Hello test", helloWorldService.getGreetings("test"));
- }
-
- public void testServiceCall() throws IOException {
- HelloWorldService helloWorldService =
- domain.getService(HelloWorldService.class, "HelloWorldServiceComponent/HelloWorldService");
- assertNotNull(helloWorldService);
-
- assertEquals("Hello Smith", helloWorldService.getGreetings("Smith"));
- }
-
- @Override
- public void tearDown() throws Exception {
- ContributionService contributionService = domain.getContributionService();
-
- // Remove the contribution from the in-memory repository
- contributionService.remove("http://import-export/helloworld");
- contributionService.remove("http://import-export/export-java");
-
- // Stop Components from my composite
- for (Composite deployable : helloWorldContribution.getDeployables()) {
- domain.getCompositeActivator().stop(deployable);
- domain.getCompositeActivator().deactivate(deployable);
- }
-
- domain.stop();
-
- domain.close();
- }
-
-}
diff --git a/tags/java/sca/1.3.1-RC0/itest/contribution-import-export/import-resource/pom.xml b/tags/java/sca/1.3.1-RC0/itest/contribution-import-export/import-resource/pom.xml
deleted file mode 100644
index c025b31c1d..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/contribution-import-export/import-resource/pom.xml
+++ /dev/null
@@ -1,95 +0,0 @@
-
-
-
- 4.0.0
-
- org.apache.tuscany.sca
- tuscany-itest
- 1.3.1
- ../pom.xml
-
- itest-contribution-import-resource
- Apache Tuscany SCA Contribution Resource Import Java Integration Tests
-
-
-
-
- org.apache.tuscany.sca
- itest-contribution-export-resource
- 1.3.1
-
-
-
- org.apache.tuscany.sca
- tuscany-host-embedded
- 1.3.1
- runtime
-
-
-
- org.apache.tuscany.sca
- tuscany-implementation-java-runtime
- 1.3.1
- runtime
-
-
-
- org.apache.tuscany.sca
- tuscany-host-http
- 1.3.1
-
-
-
- org.apache.tuscany.sca
- tuscany-binding-http-runtime
- 1.3.1
- runtime
-
-
-
- org.apache.tuscany.sca
- tuscany-implementation-resource-runtime
- 1.3.1
- test
-
-
-
- javax.servlet
- servlet-api
- 2.5
- provided
-
-
-
- org.apache.tuscany.sca
- tuscany-host-tomcat
- 1.3.1
- runtime
-
-
-
- junit
- junit
- 4.2
- test
-
-
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/contribution-import-export/import-resource/src/main/resources/META-INF/sca-contribution.xml b/tags/java/sca/1.3.1-RC0/itest/contribution-import-export/import-resource/src/main/resources/META-INF/sca-contribution.xml
deleted file mode 100644
index ac6d7becb3..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/contribution-import-export/import-resource/src/main/resources/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/tags/java/sca/1.3.1-RC0/itest/contribution-import-export/import-resource/src/main/resources/store.composite b/tags/java/sca/1.3.1-RC0/itest/contribution-import-export/import-resource/src/main/resources/store.composite
deleted file mode 100644
index bb5a7b764f..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/contribution-import-export/import-resource/src/main/resources/store.composite
+++ /dev/null
@@ -1,33 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/contribution-import-export/import-resource/src/test/java/org/apache/tuscany/sca/test/contribution/StoreTestCase.java b/tags/java/sca/1.3.1-RC0/itest/contribution-import-export/import-resource/src/test/java/org/apache/tuscany/sca/test/contribution/StoreTestCase.java
deleted file mode 100644
index 1b7542b7d9..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/contribution-import-export/import-resource/src/test/java/org/apache/tuscany/sca/test/contribution/StoreTestCase.java
+++ /dev/null
@@ -1,129 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.test.contribution;
-
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.Socket;
-import java.net.URL;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.assembly.Composite;
-import org.apache.tuscany.sca.contribution.Contribution;
-import org.apache.tuscany.sca.contribution.service.ContributionService;
-import org.apache.tuscany.sca.host.embedded.impl.EmbeddedSCADomain;
-
-/**
- * Tests that the helloworld server is available
- */
-public class StoreTestCase extends TestCase {
- private ClassLoader cl;
- private EmbeddedSCADomain domain;
- private Contribution storeContribution;
- private Contribution resourceContribution;
-
- @Override
- protected void setUp() throws Exception {
- //Create a test embedded SCA domain
- cl = getClass().getClassLoader();
- domain = new EmbeddedSCADomain(cl, "http://localhost");
-
- //Start the domain
- domain.start();
-
- // Contribute the SCA contribution
- ContributionService contributionService = domain.getContributionService();
-
- URL javaContribURL = getContributionURL(cl, "ufservices/store.html");
- resourceContribution = contributionService.contribute("http://import-export/export-resource", javaContribURL, false);
- for (Composite deployable : resourceContribution.getDeployables()) {
- domain.getDomainComposite().getIncludes().add(deployable);
- domain.buildComposite(deployable);
- }
-
- URL storeContributionURL = getContributionURL(cl, "store.composite");
-
- storeContribution =
- contributionService.contribute("http://import-export/store", storeContributionURL, false);
- for (Composite deployable : storeContribution.getDeployables()) {
- domain.getDomainComposite().getIncludes().add(deployable);
- domain.buildComposite(deployable);
- }
-
- // Start Components from my composite
- for (Composite deployable : storeContribution.getDeployables()) {
- domain.getCompositeActivator().activate(deployable);
- domain.getCompositeActivator().start(deployable);
- }
- }
-
- public void testPing() throws IOException {
- new Socket("127.0.0.1", 8085);
- }
-
-
- @Override
- public void tearDown() throws Exception {
- ContributionService contributionService = domain.getContributionService();
-
- // Remove the contribution from the in-memory repository
- contributionService.remove("http://import-export/store");
- contributionService.remove("http://import-export/export-resource");
-
- // Stop Components from my composite
- for (Composite deployable : storeContribution.getDeployables()) {
- domain.getCompositeActivator().stop(deployable);
- domain.getCompositeActivator().deactivate(deployable);
- }
-
- domain.stop();
-
- domain.close();
- }
-
-
- /**
- * Utility methods
- */
-
-
- private URL getContributionURL(ClassLoader cl, Class> cls) throws MalformedURLException {
- String flag = "/" + cls.getName().replace('.', '/') + ".class";
- URL url = cl.getResource(flag);
- String root = url.toExternalForm();
- root = root.substring(0, root.length() - flag.length() + 1);
- if (root.startsWith("jar:") && root.endsWith("!/")) {
- root = root.substring(4, root.length() - 2);
- }
- url = new URL(root);
- return url;
- }
-
- private URL getContributionURL(ClassLoader cl, String uri) throws MalformedURLException {
- URL url = cl.getResource(uri);
- String root = url.toExternalForm();
- root = root.substring(0, root.length() - uri.length());
- if (root.startsWith("jar:") && root.endsWith("!/")) {
- root = root.substring(4, root.length() - 2);
- }
- url = new URL(root);
- return url;
- }
-}
diff --git a/tags/java/sca/1.3.1-RC0/itest/contribution-import-export/import-wsdl/pom.xml b/tags/java/sca/1.3.1-RC0/itest/contribution-import-export/import-wsdl/pom.xml
deleted file mode 100644
index 167ff3d506..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/contribution-import-export/import-wsdl/pom.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-
-
-
- 4.0.0
-
- org.apache.tuscany.sca
- tuscany-itest
- 1.3.1
- ../pom.xml
-
- itest-contribution-import-wsdl
- Apache Tuscany SCA Contribution WSDL Import Integration Tests
-
-
-
- org.apache.tuscany.sca
- itest-contribution-export-wsdl
- 1.3.1
-
-
-
- org.apache.tuscany.sca
- tuscany-host-embedded
- 1.3.1
-
-
-
- org.apache.tuscany.sca
- tuscany-implementation-java-runtime
- 1.3.1
- runtime
-
-
-
- org.apache.tuscany.sca
- tuscany-binding-ws-axis2
- 1.3.1
- runtime
-
-
-
- org.apache.tuscany.sca
- tuscany-host-tomcat
- 1.3.1
- runtime
-
-
-
- junit
- junit
- 4.2
- test
-
-
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldImpl.java b/tags/java/sca/1.3.1-RC0/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldImpl.java
deleted file mode 100644
index 4cdcc1fd0b..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldImpl.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * 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.
- */
-package helloworld;
-
-import org.osoa.sca.annotations.Service;
-
-/**
- * This class implements the HelloWorld service.
- */
-@Service(HelloWorldService.class)
-public class HelloWorldImpl implements HelloWorldService {
-
- public String getGreetings(String name) {
- return "Hello " + name;
- }
-
-}
diff --git a/tags/java/sca/1.3.1-RC0/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldServer.java b/tags/java/sca/1.3.1-RC0/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldServer.java
deleted file mode 100644
index 3d43290380..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldServer.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * 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.
- */
-package helloworld;
-
-import java.io.IOException;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-/**
- * This server program shows how to create an SCA runtime, and start it which
- * activates the helloworld Web service endpoint.
- */
-public class HelloWorldServer {
-
- public static void main(String[] args) {
-
- SCADomain scaDomain = SCADomain.newInstance("helloworldws.composite");
-
- try {
- System.out.println("HelloWorld server started (press enter to shutdown)");
- System.in.read();
- } catch (IOException e) {
- e.printStackTrace();
- }
-
- scaDomain.close();
- System.out.println("HelloWorld server stopped");
- }
-
-}
diff --git a/tags/java/sca/1.3.1-RC0/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldService.java b/tags/java/sca/1.3.1-RC0/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldService.java
deleted file mode 100644
index 74d22ed830..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/contribution-import-export/import-wsdl/src/main/java/helloworld/HelloWorldService.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * 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.
- */
-package helloworld;
-
-import org.osoa.sca.annotations.Remotable;
-
-/**
- * This is the business interface of the HelloWorld greetings service.
- */
-@Remotable
-public interface HelloWorldService {
-
- public String getGreetings(String name);
-}
diff --git a/tags/java/sca/1.3.1-RC0/itest/contribution-import-export/import-wsdl/src/main/resources/META-INF/sca-contribution.xml b/tags/java/sca/1.3.1-RC0/itest/contribution-import-export/import-wsdl/src/main/resources/META-INF/sca-contribution.xml
deleted file mode 100644
index d46fe0b57c..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/contribution-import-export/import-wsdl/src/main/resources/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/tags/java/sca/1.3.1-RC0/itest/contribution-import-export/import-wsdl/src/main/resources/helloworldws.composite b/tags/java/sca/1.3.1-RC0/itest/contribution-import-export/import-wsdl/src/main/resources/helloworldws.composite
deleted file mode 100644
index 5008a2ea5b..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/contribution-import-export/import-wsdl/src/main/resources/helloworldws.composite
+++ /dev/null
@@ -1,33 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/contribution-import-export/import-wsdl/src/test/java/org/apache/tuscany/sca/test/contribution/HelloWorldServerTestCase.java b/tags/java/sca/1.3.1-RC0/itest/contribution-import-export/import-wsdl/src/test/java/org/apache/tuscany/sca/test/contribution/HelloWorldServerTestCase.java
deleted file mode 100644
index 5c40606e50..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/contribution-import-export/import-wsdl/src/test/java/org/apache/tuscany/sca/test/contribution/HelloWorldServerTestCase.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.test.contribution;
-
-import helloworld.HelloWorldService;
-
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.Socket;
-import java.net.URL;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.assembly.Composite;
-import org.apache.tuscany.sca.contribution.Contribution;
-import org.apache.tuscany.sca.contribution.service.ContributionService;
-import org.apache.tuscany.sca.host.embedded.impl.EmbeddedSCADomain;
-
-/**
- * Tests that the helloworld server is available
- */
-public class HelloWorldServerTestCase extends TestCase {
- private ClassLoader cl;
- private EmbeddedSCADomain domain;
- private Contribution wsdlContribution;
- private Contribution consumerContribution;
-
- @Override
- protected void setUp() throws Exception {
- // Create a test embedded SCA domain
- cl = getClass().getClassLoader();
- domain = new EmbeddedSCADomain(cl, "http://localhost");
-
- //Start the domain
- domain.start();
-
- // Contribute the SCA contribution
- ContributionService contributionService = domain.getContributionService();
-
- // File wsdlContribLocation = new File("../export-wsdl/target/classes");
- // URL wsdlContribURL = wsdlContribLocation.toURL();
- URL wsdlContribURL = getContributionURL(getClass().getClassLoader(), "helloworld.wsdl");
- wsdlContribution = contributionService.contribute("http://import-export/export-wsdl", wsdlContribURL, false);
- for (Composite deployable : wsdlContribution.getDeployables()) {
- domain.getDomainComposite().getIncludes().add(deployable);
- domain.buildComposite(deployable);
- }
-
- // File helloWorldContribLocation = new File("./target/classes/");
- // URL helloWorldContribURL = helloWorldContribLocation.toURL();
- URL helloWorldContribURL = getContributionURL(HelloWorldService.class);
- consumerContribution =
- contributionService.contribute("http://import-export/helloworld", helloWorldContribURL, false);
- for (Composite deployable : consumerContribution.getDeployables()) {
- domain.getDomainComposite().getIncludes().add(deployable);
- domain.buildComposite(deployable);
- }
-
- // Start Components from my composite
- for (Composite deployable : consumerContribution.getDeployables()) {
- domain.getCompositeActivator().activate(deployable);
- domain.getCompositeActivator().start(deployable);
- }
- }
-
- public void testPing() throws IOException {
- new Socket("127.0.0.1", 8085);
- }
-
- private URL getContributionURL(Class> cls) throws MalformedURLException {
- String flag = "/" + cls.getName().replace('.', '/') + ".class";
- URL url = cls.getResource(flag);
- String root = url.toExternalForm();
- root = root.substring(0, root.length() - flag.length() + 1);
- if (root.startsWith("jar:") && root.endsWith("!/")) {
- root = root.substring(4, root.length() - 2);
- }
- url = new URL(root);
- return url;
- }
-
- private URL getContributionURL(ClassLoader cl, String flag) throws MalformedURLException {
- URL url = cl.getResource(flag);
- String root = url.toExternalForm();
- root = root.substring(0, root.length() - flag.length());
- if (root.startsWith("jar:") && root.endsWith("!/")) {
- root = root.substring(4, root.length() - 2);
- }
- url = new URL(root);
- // System.out.println(url);
- return url;
- }
-
- public void testServiceCall() throws IOException {
- HelloWorldService helloWorldService =
- domain.getService(HelloWorldService.class, "HelloWorldServiceComponent/HelloWorldService");
- assertNotNull(helloWorldService);
-
- assertEquals("Hello Smith", helloWorldService.getGreetings("Smith"));
- }
-
- @Override
- public void tearDown() throws Exception {
- ContributionService contributionService = domain.getContributionService();
-
- // Remove the contribution from the in-memory repository
- contributionService.remove("http://import-export/helloworld");
- contributionService.remove("http://import-export/export-wsdl");
-
- // Stop Components from my composite
- for (Composite deployable : consumerContribution.getDeployables()) {
- domain.getCompositeActivator().stop(deployable);
- domain.getCompositeActivator().deactivate(deployable);
- }
-
- domain.stop();
-
- domain.close();
- }
-
-}
diff --git a/tags/java/sca/1.3.1-RC0/itest/contribution-import-export/pom.xml b/tags/java/sca/1.3.1-RC0/itest/contribution-import-export/pom.xml
deleted file mode 100644
index 504560ff63..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/contribution-import-export/pom.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-
-
-
- 4.0.0
-
- org.apache.tuscany.sca
- tuscany-itest
- 1.3.1
- ../pom.xml
-
- itest-contribution-import-export
- pom
- Apache Tuscany SCA Contribution Import/Export Integration Tests
-
-
- export-composite
- export-java
- export-resource
- export-wsdl
- import-composite
- import-java
- import-resource
- import-wsdl
-
-
-
-
- org.apache.tuscany.sca
- tuscany-host-embedded
- 1.3.1
-
-
-
- org.apache.tuscany.sca
- tuscany-contribution-impl
- 1.3.1
-
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/contribution-multiple/pom.xml b/tags/java/sca/1.3.1-RC0/itest/contribution-multiple/pom.xml
deleted file mode 100644
index 0011f79a13..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/contribution-multiple/pom.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-
-
-
- 4.0.0
-
- org.apache.tuscany.sca
- tuscany-itest
- 1.3.1
- ../pom.xml
-
- itest-contribution-multiple
- Apache Tuscany SCA Multiple Contribution Integration Tests
-
-
-
- org.apache.tuscany.sca
- tuscany-host-embedded
- 1.3.1
-
-
-
- org.apache.tuscany.sca
- tuscany-contribution-impl
- 1.3.1
-
-
-
- org.apache.tuscany.sca
- tuscany-implementation-java-runtime
- 1.3.1
- runtime
-
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/contribution-multiple/src/test/java/hello/Hello.java b/tags/java/sca/1.3.1-RC0/itest/contribution-multiple/src/test/java/hello/Hello.java
deleted file mode 100644
index 7e574a7db3..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/contribution-multiple/src/test/java/hello/Hello.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * 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.
- */
-package hello;
-
-/**
- * This is the business interface of the Hello service.
- */
-public interface Hello {
-
- public String getGreetings(String name);
-}
diff --git a/tags/java/sca/1.3.1-RC0/itest/contribution-multiple/src/test/java/hello/HelloImpl.java b/tags/java/sca/1.3.1-RC0/itest/contribution-multiple/src/test/java/hello/HelloImpl.java
deleted file mode 100644
index ff9f6e75f3..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/contribution-multiple/src/test/java/hello/HelloImpl.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * 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.
- */
-package hello;
-
-import org.osoa.sca.annotations.Service;
-
-/**
- * This class implements the HelloWorld service.
- */
-@Service(Hello.class)
-public class HelloImpl implements Hello {
-
- public String getGreetings(String name) {
- return "Hello " + name;
- }
-
-}
diff --git a/tags/java/sca/1.3.1-RC0/itest/contribution-multiple/src/test/java/helloworld/HelloWorldImpl.java b/tags/java/sca/1.3.1-RC0/itest/contribution-multiple/src/test/java/helloworld/HelloWorldImpl.java
deleted file mode 100644
index c062afaed0..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/contribution-multiple/src/test/java/helloworld/HelloWorldImpl.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * 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.
- */
-package helloworld;
-
-import hello.Hello;
-
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Service;
-
-/**
- * This class implements the HelloWorld service.
- */
-@Service(HelloWorldService.class)
-public class HelloWorldImpl implements HelloWorldService {
- @Reference
- protected Hello helloServiceRef;
-
- public String getGreetings(String name) {
- return helloServiceRef.getGreetings(name);
- }
-
-}
diff --git a/tags/java/sca/1.3.1-RC0/itest/contribution-multiple/src/test/java/helloworld/HelloWorldService.java b/tags/java/sca/1.3.1-RC0/itest/contribution-multiple/src/test/java/helloworld/HelloWorldService.java
deleted file mode 100644
index 5251fc0a45..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/contribution-multiple/src/test/java/helloworld/HelloWorldService.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * 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.
- */
-package helloworld;
-
-
-/**
- * This is the business interface of the HelloWorld greetings service.
- */
-public interface HelloWorldService {
-
- public String getGreetings(String name);
-}
diff --git a/tags/java/sca/1.3.1-RC0/itest/contribution-multiple/src/test/java/test/ContributionCycleTestCaseFIXME.java b/tags/java/sca/1.3.1-RC0/itest/contribution-multiple/src/test/java/test/ContributionCycleTestCaseFIXME.java
deleted file mode 100644
index ec5123eb2d..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/contribution-multiple/src/test/java/test/ContributionCycleTestCaseFIXME.java
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
- * 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.
- */
-package test;
-
-import helloworld.HelloWorldService;
-
-import java.io.IOException;
-import java.net.URL;
-
-import org.apache.tuscany.sca.assembly.Composite;
-import org.apache.tuscany.sca.contribution.Contribution;
-import org.apache.tuscany.sca.contribution.service.ContributionService;
-import org.apache.tuscany.sca.host.embedded.impl.EmbeddedSCADomain;
-
-import junit.framework.TestCase;
-
-/**
- * Test multiple contributions scenario
- *
- * FIXME This test case causes a StackOverflowException instead of
- * reporting an error when a composite is not found, as there's a
- * dependency cycle in the test contributions and the model resolvers
- * do not handle import cycles properly.
- *
- */
-public class ContributionCycleTestCaseFIXME extends TestCase {
-
- private String helloContribution_dir = "target/test-classes/contribution-cycle-export";
- private String helloWorldContribution_one_dir = "target/test-classes/contribution-cycle-import";
-
- private ClassLoader cl;
- private EmbeddedSCADomain domain;
- private Contribution helloContribution;
- private Contribution helloWorldContribution_one;
-
- protected void setUp() throws Exception {
- URL helloContribution_URL = new java.io.File(helloContribution_dir).toURI().toURL();
- URL helloWorldContribution_one_URL = new java.io.File(helloWorldContribution_one_dir).toURI().toURL();
-
- // Create a test embedded SCA domain
- cl = getClass().getClassLoader();
- domain = new EmbeddedSCADomain(cl, "http://localhost");
-
- // Start the domain
- domain.start();
-
- // Contribute the SCA contribution
- ContributionService contributionService = domain.getContributionService();
-
- helloContribution =
- contributionService.contribute("http://contribution-multiple/helloworld", helloContribution_URL, false);
-
- for (Composite deployable : helloContribution.getDeployables()) {
- domain.getDomainComposite().getIncludes().add(deployable);
- domain.buildComposite(deployable);
- }
- for (Composite deployable : helloContribution.getDeployables()) {
- domain.getCompositeActivator().activate(deployable);
- domain.getCompositeActivator().start(deployable);
- }
-
- helloWorldContribution_one =
- contributionService.contribute("http://contribution-multiple/helloworld_one", helloWorldContribution_one_URL, false);
- for (Composite deployable : helloWorldContribution_one.getDeployables()) {
- domain.getDomainComposite().getIncludes().add(deployable);
- domain.buildComposite(deployable);
- }
-
- for (Composite deployable : helloWorldContribution_one.getDeployables()) {
- domain.getCompositeActivator().activate(deployable);
- domain.getCompositeActivator().start(deployable);
- }
-
- }
-
- public void testServiceCall() throws IOException {
- HelloWorldService helloWorldService_one =
- domain.getService(HelloWorldService.class, "HelloWorldServiceComponent_one/HelloWorldService");
- assertNotNull(helloWorldService_one);
-
- assertEquals("Hello Smith", helloWorldService_one.getGreetings("Smith"));
-
- }
-
- public void tearDown() throws Exception {
- ContributionService contributionService = domain.getContributionService();
-
- // Remove the contribution from the in-memory repository
- contributionService.remove("http://contribution-multiple/helloworld");
- contributionService.remove("http://contribution-multiple/helloworld_one");
-
- // Stop Components from my composite
- for (Composite deployable : helloWorldContribution_one.getDeployables()) {
- domain.getCompositeActivator().stop(deployable);
- domain.getCompositeActivator().deactivate(deployable);
- }
- for (Composite deployable : helloContribution.getDeployables()) {
- domain.getCompositeActivator().stop(deployable);
- domain.getCompositeActivator().deactivate(deployable);
- }
- // domain.stop();
- domain.close();
- }
-
-}
diff --git a/tags/java/sca/1.3.1-RC0/itest/contribution-multiple/src/test/java/test/ContributionMultipleTestCaseFIXME.java b/tags/java/sca/1.3.1-RC0/itest/contribution-multiple/src/test/java/test/ContributionMultipleTestCaseFIXME.java
deleted file mode 100644
index 133c98f357..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/contribution-multiple/src/test/java/test/ContributionMultipleTestCaseFIXME.java
+++ /dev/null
@@ -1,131 +0,0 @@
-/*
- * 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.
- */
-package test;
-
-import helloworld.HelloWorldService;
-
-import java.io.IOException;
-import java.net.URL;
-
-import org.apache.tuscany.sca.assembly.Composite;
-import org.apache.tuscany.sca.contribution.Contribution;
-import org.apache.tuscany.sca.contribution.service.ContributionService;
-import org.apache.tuscany.sca.host.embedded.impl.EmbeddedSCADomain;
-
-import junit.framework.TestCase;
-
-/**
- * Test multiple contribution scenario
- * Contributed by TUSCANY-1718
- */
-public class ContributionMultipleTestCaseFIXME extends TestCase {
-
- private String helloContribution_dir = "target/test-classes/contribution-export";
- private String helloWorldContribution_one_dir = "target/test-classes/contribution-import-one";
- private String helloWorldContribution_two_dir = "target/test-classes/contribution-import-two";
-
- private ClassLoader cl;
- private EmbeddedSCADomain domain;
- private Contribution helloContribution;
- private Contribution helloWorldContribution_one;
- private Contribution helloWorldContribution_two;
-
- protected void setUp() throws Exception {
- URL helloContribution_URL = new java.io.File(helloContribution_dir).toURI().toURL();
- URL helloWorldContribution_one_URL = new java.io.File(helloWorldContribution_one_dir).toURI().toURL();
- URL helloWorldContribution_two_URL = new java.io.File(helloWorldContribution_two_dir).toURI().toURL();
-
- // Create a test embedded SCA domain
- cl = getClass().getClassLoader();
- domain = new EmbeddedSCADomain(cl, "http://localhost");
-
- // Start the domain
- domain.start();
-
- // Contribute the SCA contribution
- ContributionService contributionService = domain.getContributionService();
-
- helloContribution =
- contributionService.contribute("http://contribution-multiple/helloworld", helloContribution_URL, false);
-
- helloWorldContribution_one =
- contributionService.contribute("http://contribution-multiple/helloworld_one", helloWorldContribution_one_URL, false);
-
- helloWorldContribution_two =
- contributionService.contribute("http://contribution-multiple/helloworld_two", helloWorldContribution_two_URL, false);
-
- for (Composite deployable : helloContribution.getDeployables()) {
- domain.getDomainComposite().getIncludes().add(deployable);
- }
-
- for (Composite deployable : helloWorldContribution_one.getDeployables()) {
- domain.getDomainComposite().getIncludes().add(deployable);
- }
-
- for (Composite deployable : helloWorldContribution_two.getDeployables()) {
- domain.getDomainComposite().getIncludes().add(deployable);
- }
-
- domain.buildComposite(domain.getDomainComposite());
- domain.getCompositeActivator().activate(domain.getDomainComposite());
- domain.getCompositeActivator().start(domain.getDomainComposite());
-
- }
-
- public void testServiceCall() throws IOException {
- HelloWorldService helloWorldService_one =
- domain.getService(HelloWorldService.class, "HelloWorldServiceComponent_one/HelloWorldService");
- assertNotNull(helloWorldService_one);
-
- assertEquals("Hello Smith", helloWorldService_one.getGreetings("Smith"));
-
- HelloWorldService helloWorldService_two =
- domain.getService(HelloWorldService.class, "HelloWorldServiceComponent_two/HelloWorldService");
- assertNotNull(helloWorldService_two);
-
- assertEquals("Hello Smith", helloWorldService_two.getGreetings("Smith"));
-
- }
-
- public void tearDown() throws Exception {
- ContributionService contributionService = domain.getContributionService();
-
- // Remove the contribution from the in-memory repository
- contributionService.remove("http://contribution-multiple/helloworld");
- contributionService.remove("http://contribution-multiple/helloworld_one");
- contributionService.remove("http://contribution-multiple/helloworld_two");
-
- // Stop Components from my composite
- for (Composite deployable : helloWorldContribution_two.getDeployables()) {
- domain.getCompositeActivator().stop(deployable);
- domain.getCompositeActivator().deactivate(deployable);
- }
- for (Composite deployable : helloWorldContribution_one.getDeployables()) {
- domain.getCompositeActivator().stop(deployable);
- domain.getCompositeActivator().deactivate(deployable);
- }
- for (Composite deployable : helloContribution.getDeployables()) {
- domain.getCompositeActivator().stop(deployable);
- domain.getCompositeActivator().deactivate(deployable);
- }
- // domain.stop();
- domain.close();
- }
-
-}
diff --git a/tags/java/sca/1.3.1-RC0/itest/contribution-multiple/src/test/java/test/ContributionTestCase.java b/tags/java/sca/1.3.1-RC0/itest/contribution-multiple/src/test/java/test/ContributionTestCase.java
deleted file mode 100644
index 790b6fed98..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/contribution-multiple/src/test/java/test/ContributionTestCase.java
+++ /dev/null
@@ -1,145 +0,0 @@
-/*
- * 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.
- */
-package test;
-
-import helloworld.HelloWorldService;
-
-import java.io.IOException;
-import java.net.URL;
-
-import org.apache.tuscany.sca.assembly.Composite;
-import org.apache.tuscany.sca.contribution.Contribution;
-import org.apache.tuscany.sca.contribution.service.ContributionService;
-import org.apache.tuscany.sca.host.embedded.impl.EmbeddedSCADomain;
-
-import junit.framework.TestCase;
-
-/**
- * Test multiple contribution scenario
- * Contributed by TUSCANY-1756
- */
-public class ContributionTestCase extends TestCase {
-
- private String helloContribution_dir = "target/test-classes/contribution-export";
- //private String helloWorldContribution_one_dir = "target/test-classes/contribution-import-one";
- private String helloWorldContribution_two_dir = "target/test-classes/contribution-import-two";
-
- private ClassLoader cl;
- private EmbeddedSCADomain domain;
- private Contribution helloContribution;
- //private Contribution helloWorldContribution_one;
- private Contribution helloWorldContribution_two;
-
- protected void setUp() throws Exception {
- URL helloContribution_URL = new java.io.File(helloContribution_dir).toURI().toURL();
- //URL helloWorldContribution_one_URL = new java.io.File(helloWorldContribution_one_dir).toURI().toURL();
- URL helloWorldContribution_two_URL = new java.io.File(helloWorldContribution_two_dir).toURI().toURL();
-
- // Create a test embedded SCA domain
- cl = getClass().getClassLoader();
- domain = new EmbeddedSCADomain(cl, "http://localhost");
-
- // Start the domain
- domain.start();
-
- // Contribute the SCA contribution
- ContributionService contributionService = domain.getContributionService();
-
- helloContribution =
- contributionService.contribute("http://contribution-multiple/helloworld", helloContribution_URL, false);
-
- //helloWorldContribution_one =
- // contributionService.contribute("http://contribution-multiple/helloworld_one", helloWorldContribution_one_URL, false);
-
- helloWorldContribution_two =
- contributionService.contribute("http://contribution-multiple/helloworld_two", helloWorldContribution_two_URL, false);
-
- for (Composite deployable : helloContribution.getDeployables()) {
- domain.getDomainComposite().getIncludes().add(deployable);
- domain.buildComposite(deployable);
- }
-
- //for (Composite deployable : helloWorldContribution_one.getDeployables()) {
- // domain.getDomainComposite().getIncludes().add(deployable);
- // domain.buildComposite(deployable);
- //}
-
- for (Composite deployable : helloWorldContribution_two.getDeployables()) {
- domain.getDomainComposite().getIncludes().add(deployable);
- domain.buildComposite(deployable);
- }
-
- for (Composite deployable : helloContribution.getDeployables()) {
- domain.getCompositeActivator().activate(deployable);
- domain.getCompositeActivator().start(deployable);
- }
-
- //for (Composite deployable : helloWorldContribution_one.getDeployables()) {
- // domain.getCompositeActivator().activate(deployable);
- // domain.getCompositeActivator().start(deployable);
- //}
-
- for (Composite deployable : helloWorldContribution_two.getDeployables()) {
- domain.getCompositeActivator().activate(deployable);
- domain.getCompositeActivator().start(deployable);
- }
-
- }
-
- public void testServiceCall() throws IOException {
- //HelloWorldService helloWorldService_one =
- //domain.getService(HelloWorldService.class, "HelloWorldServiceComponent_one/HelloWorldService");
- //assertNotNull(helloWorldService_one);
-
- //assertEquals("Hello Smith", helloWorldService_one.getGreetings("Smith"));
-
- HelloWorldService helloWorldService_two =
- domain.getService(HelloWorldService.class, "HelloWorldServiceComponent_two/HelloWorldService");
- assertNotNull(helloWorldService_two);
-
- assertEquals("Hello Smith", helloWorldService_two.getGreetings("Smith"));
-
- }
-
- public void tearDown() throws Exception {
- ContributionService contributionService = domain.getContributionService();
-
- // Remove the contribution from the in-memory repository
- contributionService.remove("http://contribution-multiple/helloworld");
- //contributionService.remove("http://contribution-multiple/helloworld_one");
- contributionService.remove("http://contribution-multiple/helloworld_two");
-
- // Stop Components from my composite
- for (Composite deployable : helloWorldContribution_two.getDeployables()) {
- domain.getCompositeActivator().stop(deployable);
- domain.getCompositeActivator().deactivate(deployable);
- }
- //for (Composite deployable : helloWorldContribution_one.getDeployables()) {
- // domain.getCompositeActivator().stop(deployable);
- // domain.getCompositeActivator().deactivate(deployable);
- //}
- for (Composite deployable : helloContribution.getDeployables()) {
- domain.getCompositeActivator().stop(deployable);
- domain.getCompositeActivator().deactivate(deployable);
- }
- // domain.stop();
- domain.close();
- }
-
-}
diff --git a/tags/java/sca/1.3.1-RC0/itest/contribution-multiple/src/test/resources/contribution-cycle-export/META-INF/sca-contribution.xml b/tags/java/sca/1.3.1-RC0/itest/contribution-multiple/src/test/resources/contribution-cycle-export/META-INF/sca-contribution.xml
deleted file mode 100644
index 8b76783c3d..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/contribution-multiple/src/test/resources/contribution-cycle-export/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/tags/java/sca/1.3.1-RC0/itest/contribution-multiple/src/test/resources/contribution-cycle-export/hello.composite b/tags/java/sca/1.3.1-RC0/itest/contribution-multiple/src/test/resources/contribution-cycle-export/hello.composite
deleted file mode 100644
index aeeab337fa..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/contribution-multiple/src/test/resources/contribution-cycle-export/hello.composite
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/contribution-multiple/src/test/resources/contribution-cycle-import/META-INF/sca-contribution.xml b/tags/java/sca/1.3.1-RC0/itest/contribution-multiple/src/test/resources/contribution-cycle-import/META-INF/sca-contribution.xml
deleted file mode 100644
index bfbf74373a..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/contribution-multiple/src/test/resources/contribution-cycle-import/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/tags/java/sca/1.3.1-RC0/itest/contribution-multiple/src/test/resources/contribution-cycle-import/helloworld_one.composite b/tags/java/sca/1.3.1-RC0/itest/contribution-multiple/src/test/resources/contribution-cycle-import/helloworld_one.composite
deleted file mode 100644
index 7a8003577e..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/contribution-multiple/src/test/resources/contribution-cycle-import/helloworld_one.composite
+++ /dev/null
@@ -1,35 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/contribution-multiple/src/test/resources/contribution-export/META-INF/sca-contribution.xml b/tags/java/sca/1.3.1-RC0/itest/contribution-multiple/src/test/resources/contribution-export/META-INF/sca-contribution.xml
deleted file mode 100644
index bea6f39932..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/contribution-multiple/src/test/resources/contribution-export/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/tags/java/sca/1.3.1-RC0/itest/contribution-multiple/src/test/resources/contribution-export/hello.composite b/tags/java/sca/1.3.1-RC0/itest/contribution-multiple/src/test/resources/contribution-export/hello.composite
deleted file mode 100644
index aeeab337fa..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/contribution-multiple/src/test/resources/contribution-export/hello.composite
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/contribution-multiple/src/test/resources/contribution-import-one/META-INF/sca-contribution.xml b/tags/java/sca/1.3.1-RC0/itest/contribution-multiple/src/test/resources/contribution-import-one/META-INF/sca-contribution.xml
deleted file mode 100644
index bfbf74373a..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/contribution-multiple/src/test/resources/contribution-import-one/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/tags/java/sca/1.3.1-RC0/itest/contribution-multiple/src/test/resources/contribution-import-one/helloworld_one.composite b/tags/java/sca/1.3.1-RC0/itest/contribution-multiple/src/test/resources/contribution-import-one/helloworld_one.composite
deleted file mode 100644
index 45cb504ea4..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/contribution-multiple/src/test/resources/contribution-import-one/helloworld_one.composite
+++ /dev/null
@@ -1,35 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/contribution-multiple/src/test/resources/contribution-import-two/META-INF/sca-contribution.xml b/tags/java/sca/1.3.1-RC0/itest/contribution-multiple/src/test/resources/contribution-import-two/META-INF/sca-contribution.xml
deleted file mode 100644
index cbabdcd4fc..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/contribution-multiple/src/test/resources/contribution-import-two/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/tags/java/sca/1.3.1-RC0/itest/contribution-multiple/src/test/resources/contribution-import-two/helloworld_two.composite b/tags/java/sca/1.3.1-RC0/itest/contribution-multiple/src/test/resources/contribution-import-two/helloworld_two.composite
deleted file mode 100644
index 4c9225de34..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/contribution-multiple/src/test/resources/contribution-import-two/helloworld_two.composite
+++ /dev/null
@@ -1,35 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/contribution/pom.xml b/tags/java/sca/1.3.1-RC0/itest/contribution/pom.xml
deleted file mode 100644
index 68ccdf1e72..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/contribution/pom.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-
-
-
- 4.0.0
-
- org.apache.tuscany.sca
- tuscany-itest
- 1.3.1
- ../pom.xml
-
- itest-contribution
- Apache Tuscany SCA Contribution Integration Tests
-
-
-
- org.apache.tuscany.sca
- tuscany-host-embedded
- 1.3.1
-
-
-
- org.apache.tuscany.sca
- tuscany-contribution-impl
- 1.3.1
-
-
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/contribution/src/main/java/calculator/AddService.java b/tags/java/sca/1.3.1-RC0/itest/contribution/src/main/java/calculator/AddService.java
deleted file mode 100644
index 4e72f92fda..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/contribution/src/main/java/calculator/AddService.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * 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.
- */
-package calculator;
-
-/**
- * It is an Interface which has method declarations. Methods which are to be accessed as a service are declared in this
- * interface. Implementation for these methods is provided in AddServiceImpl Class
- */
-public interface AddService {
-
- /**
- * This is an add method which takes 2 parameters of double type and returns the sum of two parameters
- */
- double add(double n1, double n2);
-
-}
diff --git a/tags/java/sca/1.3.1-RC0/itest/contribution/src/main/java/calculator/AddServiceImpl.java b/tags/java/sca/1.3.1-RC0/itest/contribution/src/main/java/calculator/AddServiceImpl.java
deleted file mode 100644
index e9c635e3c8..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/contribution/src/main/java/calculator/AddServiceImpl.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * 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.
- */
-package calculator;
-
-/**
- * An implementation of the Add service
- */
-public class AddServiceImpl implements AddService {
-
- public double add(double n1, double n2) {
- return n1 + n2;
- }
-
-}
diff --git a/tags/java/sca/1.3.1-RC0/itest/contribution/src/main/java/calculator/CalculatorClient.java b/tags/java/sca/1.3.1-RC0/itest/contribution/src/main/java/calculator/CalculatorClient.java
deleted file mode 100644
index 40ca4d9b0f..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/contribution/src/main/java/calculator/CalculatorClient.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * 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.
- */
-
-package calculator;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-/**
- * This client program shows how to create an SCA runtime, start it,
- * and locate and invoke a SCA component
- */
-public class CalculatorClient {
- public static void main(String[] args) throws Exception {
-
- SCADomain domain = SCADomain.newInstance("Calculator.composite");
-
- CalculatorService calculatorService = domain.getService(CalculatorService.class,
- "CalculatorServiceComponent");
-
- // Calculate
- System.out.println("3 + 2=" + calculatorService.add(3, 2));
- System.out.println("3 - 2=" + calculatorService.subtract(3, 2));
- System.out.println("3 * 2=" + calculatorService.multiply(3, 2));
- System.out.println("3 / 2=" + calculatorService.divide(3, 2));
-
- domain.close();
-
- }
-
-}
\ No newline at end of file
diff --git a/tags/java/sca/1.3.1-RC0/itest/contribution/src/main/java/calculator/CalculatorService.java b/tags/java/sca/1.3.1-RC0/itest/contribution/src/main/java/calculator/CalculatorService.java
deleted file mode 100644
index f288af0174..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/contribution/src/main/java/calculator/CalculatorService.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * 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.
- */
-package calculator;
-
-/**
- * This is a Calculator service interface. All the methods which are to be accessed as a service are declared in this
- * interface but not the implementation of those methods.
- */
-public interface CalculatorService {
-
- double add(double n1, double n2);
-
- double subtract(double n1, double n2);
-
- double multiply(double n1, double n2);
-
- double divide(double n1, double n2);
-
-}
diff --git a/tags/java/sca/1.3.1-RC0/itest/contribution/src/main/java/calculator/CalculatorServiceImpl.java b/tags/java/sca/1.3.1-RC0/itest/contribution/src/main/java/calculator/CalculatorServiceImpl.java
deleted file mode 100644
index ae4ed12b7b..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/contribution/src/main/java/calculator/CalculatorServiceImpl.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * 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.
- */
-package calculator;
-
-import org.osoa.sca.annotations.Reference;
-
-
-/**
- * An implementation of the Calculator service.
- */
-public class CalculatorServiceImpl implements CalculatorService {
-
- private AddService addService;
- private SubtractService subtractService;
- private MultiplyService multiplyService;
- private DivideService divideService;
-
- @Reference
- public void setAddService(AddService addService) {
- this.addService = addService;
- }
-
- @Reference
- public void setSubtractService(SubtractService subtractService) {
- this.subtractService = subtractService;
- }
-
- @Reference
- public void setDivideService(DivideService divideService) {
- this.divideService = divideService;
- }
-
- @Reference
- public void setMultiplyService(MultiplyService multiplyService) {
- this.multiplyService = multiplyService;
- }
-
- public double add(double n1, double n2) {
- return addService.add(n1, n2);
- }
-
- public double subtract(double n1, double n2) {
- return subtractService.subtract(n1, n2);
- }
-
- public double multiply(double n1, double n2) {
- return multiplyService.multiply(n1, n2);
- }
-
- public double divide(double n1, double n2) {
- return divideService.divide(n1, n2);
- }
-
-}
diff --git a/tags/java/sca/1.3.1-RC0/itest/contribution/src/main/java/calculator/DivideService.java b/tags/java/sca/1.3.1-RC0/itest/contribution/src/main/java/calculator/DivideService.java
deleted file mode 100644
index ad99418f5b..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/contribution/src/main/java/calculator/DivideService.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * 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.
- */
-package calculator;
-
-/**
- * This is an interface for Divide Service which has divide method declared which is implemented in DivideServiceImpl
- * class
- */
-public interface DivideService {
-
- /**
- * This is a divide method which takes 2 parameters of double type and returns the result of division
- */
- double divide(double n1, double n2);
-
-}
diff --git a/tags/java/sca/1.3.1-RC0/itest/contribution/src/main/java/calculator/DivideServiceImpl.java b/tags/java/sca/1.3.1-RC0/itest/contribution/src/main/java/calculator/DivideServiceImpl.java
deleted file mode 100644
index 8c33862f6d..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/contribution/src/main/java/calculator/DivideServiceImpl.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * 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.
- */
-package calculator;
-
-/**
- * An implementation of the Divide service.
- */
-public class DivideServiceImpl implements DivideService {
-
- public double divide(double n1, double n2) {
- return n1 / n2;
- }
-
-}
diff --git a/tags/java/sca/1.3.1-RC0/itest/contribution/src/main/java/calculator/MultiplyService.java b/tags/java/sca/1.3.1-RC0/itest/contribution/src/main/java/calculator/MultiplyService.java
deleted file mode 100644
index 3987b0a54f..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/contribution/src/main/java/calculator/MultiplyService.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * 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.
- */
-package calculator;
-
-/**
- * This is an interface for Multiply Service which has multiply method declared which is implemented in
- * MultiplyServiceImpl class
- */
-public interface MultiplyService {
-
- /**
- * This is a multiply method which takes 2 parameters of double type and returns the result of multiplication of the
- * two parameters
- */
- double multiply(double n1, double n2);
-
-}
diff --git a/tags/java/sca/1.3.1-RC0/itest/contribution/src/main/java/calculator/MultiplyServiceImpl.java b/tags/java/sca/1.3.1-RC0/itest/contribution/src/main/java/calculator/MultiplyServiceImpl.java
deleted file mode 100644
index c7fbc73c00..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/contribution/src/main/java/calculator/MultiplyServiceImpl.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * 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.
- */
-package calculator;
-
-/**
- * An implementation of the Multiply service.
- */
-public class MultiplyServiceImpl implements MultiplyService {
-
- public double multiply(double n1, double n2) {
- return n1 * n2;
- }
-
-}
diff --git a/tags/java/sca/1.3.1-RC0/itest/contribution/src/main/java/calculator/SubtractService.java b/tags/java/sca/1.3.1-RC0/itest/contribution/src/main/java/calculator/SubtractService.java
deleted file mode 100644
index 25e0ed6ca7..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/contribution/src/main/java/calculator/SubtractService.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * 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.
- */
-package calculator;
-
-/**
- * This is an interface for Subtract Service which has subtract method declared which is implemented in
- * SubtractServiceImpl class
- */
-
-public interface SubtractService {
-
- /**
- * This is a subtract method which takes 2 parameters of double type and returns the result of subtraction.
- */
- double subtract(double n1, double n2);
-
-}
diff --git a/tags/java/sca/1.3.1-RC0/itest/contribution/src/main/java/calculator/SubtractServiceImpl.java b/tags/java/sca/1.3.1-RC0/itest/contribution/src/main/java/calculator/SubtractServiceImpl.java
deleted file mode 100644
index 1a7f145ad8..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/contribution/src/main/java/calculator/SubtractServiceImpl.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * 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.
- */
-package calculator;
-
-/**
- * An implementation of the subtract service.
- */
-public class SubtractServiceImpl implements SubtractService {
-
- public double subtract(double n1, double n2) {
- return n1 - n2;
- }
-
-}
diff --git a/tags/java/sca/1.3.1-RC0/itest/contribution/src/main/resources/ContributionTest.composite b/tags/java/sca/1.3.1-RC0/itest/contribution/src/main/resources/ContributionTest.composite
deleted file mode 100644
index d814e439e2..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/contribution/src/main/resources/ContributionTest.composite
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/contribution/src/main/resources/calculator/Calculator.composite b/tags/java/sca/1.3.1-RC0/itest/contribution/src/main/resources/calculator/Calculator.composite
deleted file mode 100644
index 657a2f95d8..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/contribution/src/main/resources/calculator/Calculator.composite
+++ /dev/null
@@ -1,51 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/contribution/src/main/resources/calculator/sca-contribution.xml b/tags/java/sca/1.3.1-RC0/itest/contribution/src/main/resources/calculator/sca-contribution.xml
deleted file mode 100644
index e95796d83a..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/contribution/src/main/resources/calculator/sca-contribution.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
-
-
\ No newline at end of file
diff --git a/tags/java/sca/1.3.1-RC0/itest/contribution/src/test/java/org/apache/tuscany/sca/test/contribution/ContributionServiceTestCase.java b/tags/java/sca/1.3.1-RC0/itest/contribution/src/test/java/org/apache/tuscany/sca/test/contribution/ContributionServiceTestCase.java
deleted file mode 100644
index 97b2e5d6ed..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/contribution/src/test/java/org/apache/tuscany/sca/test/contribution/ContributionServiceTestCase.java
+++ /dev/null
@@ -1,218 +0,0 @@
-/*
- * 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.
- */
-
-package org.apache.tuscany.sca.test.contribution;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URL;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-import java.security.PrivilegedActionException;
-import java.security.PrivilegedExceptionAction;
-import java.util.List;
-
-import javax.xml.namespace.QName;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.assembly.Composite;
-import org.apache.tuscany.sca.assembly.DefaultAssemblyFactory;
-import org.apache.tuscany.sca.contribution.Artifact;
-import org.apache.tuscany.sca.contribution.Contribution;
-import org.apache.tuscany.sca.contribution.service.ContributionService;
-import org.apache.tuscany.sca.contribution.service.util.FileHelper;
-import org.apache.tuscany.sca.contribution.service.util.IOHelper;
-import org.apache.tuscany.sca.host.embedded.impl.EmbeddedSCADomain;
-
-/**
- * This is more intended to be a integration test then a unit test. *
- */
-public class ContributionServiceTestCase extends TestCase {
- private static final String CONTRIBUTION_001_ID = "contribution001/";
- private static final String CONTRIBUTION_002_ID = "contribution002/";
- private static final String JAR_CONTRIBUTION = "/repository/sample-calculator.jar";
- private static final String FOLDER_CONTRIBUTION = "target/classes/";
-
- private ClassLoader cl;
- private EmbeddedSCADomain domain;
- private ContributionService contributionService;
-
- /**
- * setUp() is a method in JUnit Frame Work which is executed before all others methods in the class extending
- * unit.framework.TestCase. So this method is used to create a test Embedded SCA Domain, to start the SCA Domain and
- * to get a reference to the contribution service
- */
-
- @Override
- protected void setUp() throws Exception {
- //Create a test embedded SCA domain
- cl = getClass().getClassLoader();
- domain = new EmbeddedSCADomain(cl, "http://localhost");
-
- //Start the domain
- domain.start();
-
- //get a reference to the contribution service
- contributionService = domain.getContributionService();
- }
-
- /**
- * Method prefixed with 'test' is a test method where testing logic is written using various assert methods. This
- * test verifies the string assigned to contrututionId with the value retrieved from the SCA runtime.
- */
- public void testContributeJAR() throws Exception {
- URL contributionLocation = getClass().getResource(JAR_CONTRIBUTION);
- //URL contributionLocation = new URL("file:/D:/dev/Opensource/Apache/Tuscany/source/java/sca/samples/calculator/target/sample-calculator.jar");
- String contributionId = CONTRIBUTION_001_ID;
- contributionService.contribute(contributionId, contributionLocation, false);
- assertNotNull(contributionService.getContribution(contributionId));
- }
-
- /**
- * Method prefixed with 'test' is a test method where testing logic is written using various assert methods. This
- * test verifies the string assigned to contrututionId with the value retrieved from the SCA runtime using
- * contributionService.
- */
- public void testStoreContributionPackageInRepository() throws Exception {
- URL contributionLocation = getClass().getResource(JAR_CONTRIBUTION);
- String contributionId = CONTRIBUTION_001_ID;
- contributionService.contribute(contributionId, contributionLocation, true);
-
- assertTrue(FileHelper.toFile(new URL(contributionService.getContribution(contributionId).getLocation()))
- .exists());
-
- assertNotNull(contributionId);
-
- Contribution contributionModel = contributionService.getContribution(contributionId);
-
- File contributionFile = FileHelper.toFile(new URL(contributionModel.getLocation()));
- assertTrue(contributionFile.exists());
- }
-
- /**
- * Method prefixed with 'test' is a test method where testing logic is written using various assert methods. This
- * test verifies the string assigned to contrututionId with the value retrieved from the SCA runtime using
- * contributionService.
- */
- public void testStoreContributionStreamInRepository() throws Exception {
- URL contributionLocation = getClass().getResource(JAR_CONTRIBUTION);
- String contributionId = CONTRIBUTION_001_ID;
-
- InputStream contributionStream = contributionLocation.openStream();
- try {
- contributionService.contribute(contributionId, contributionLocation, contributionStream);
- } finally {
- IOHelper.closeQuietly(contributionStream);
- }
-
- assertTrue(FileHelper.toFile(new URL(contributionService.getContribution(contributionId).getLocation()))
- .exists());
-
- assertNotNull(contributionId);
-
- Contribution contributionModel = contributionService.getContribution(contributionId);
-
- File contributionFile = FileHelper.toFile(new URL(contributionModel.getLocation()));
- assertTrue(contributionFile.exists());
- }
-
- /**
- * Method prefixed with 'test' is a test method where testing logic is written using various assert methods. This
- * test verifies the string assigned to contributionId1,contributionId2 with the value retrieved from the SCA
- * runtime using contributionService.
- */
- public void testStoreDuplicatedContributionInRepository() throws Exception {
- URL contributionLocation = getClass().getResource(JAR_CONTRIBUTION);
- String contributionId1 = CONTRIBUTION_001_ID;
- contributionService.contribute(contributionId1, contributionLocation, true);
- assertNotNull(contributionService.getContribution(contributionId1));
- String contributionId2 = CONTRIBUTION_002_ID;
- contributionService.contribute(contributionId2, contributionLocation, true);
- assertNotNull(contributionService.getContribution(contributionId2));
- }
-
- /**
- * Method prefixed with 'test' is a test method where testing logic is written using various assert methods. This
- * test verifies the string assigned to contributionId with the value retrieved from the SCA runtime using
- * contributionService.
- */
- public void testContributeFolder() throws Exception {
- final File rootContributionFolder = new File(FOLDER_CONTRIBUTION);
- String contributionId = CONTRIBUTION_001_ID;
- //first rename the sca-contribution metadata file
- //File calculatorMetadataFile = new File("target/classes/calculator/sca-contribution.xml");
- //File metadataDirectory = new File("target/classes/META-INF/");
- //if (!metadataDirectory.exists()) {
- // FileHelper.forceMkdir(metadataDirectory);
- //}
- //FileHelper.copyFileToDirectory(calculatorMetadataFile, metadataDirectory);
-
- // Requires permission to read user.dir property. Requires PropertyPermision in security policy.
- URL contributionFolderURL;
- try {
- contributionFolderURL = AccessController.doPrivileged(new PrivilegedExceptionAction() {
- public URL run() throws IOException {
- return rootContributionFolder.toURL();
- }
- });
- } catch (PrivilegedActionException e) {
- throw (IOException)e.getException();
- }
- contributionService.contribute(contributionId, contributionFolderURL, false);
- assertNotNull(contributionService.getContribution(contributionId));
- }
-
- /**
- * Method prefixed with 'test' is a test method where testing logic is written using various assert methods. This
- * test verifies the string assigned to contributionId, artifactId with the value retrieved from the SCA runtime
- * using contributionService.
- */
- public void testAddDeploymentComposites() throws Exception {
- URL contributionLocation = getClass().getResource(JAR_CONTRIBUTION);
- String contributionId = CONTRIBUTION_001_ID;
- Contribution contribution = contributionService.contribute(contributionId, contributionLocation, false);
- assertNotNull(contributionService.getContribution(contributionId));
-
- String artifactId = "contributionComposite.composite";
- Composite composite = (new DefaultAssemblyFactory()).createComposite();
- composite.setName(new QName(null, "contributionComposite"));
- composite.setURI("contributionComposite.composite");
-
- contributionService.addDeploymentComposite(contribution, composite);
-
- List deployables = contributionService.getContribution(contributionId).getDeployables();
- Composite composite1 = (Composite)deployables.get(deployables.size() - 1);
- assertEquals("contributionComposite", composite1.getName().toString());
-
- Artifact artifact = null;
- contribution = contributionService.getContribution(contributionId);
- String id = artifactId.toString();
- for (Artifact a : contribution.getArtifacts()) {
- if (id.equals(a.getURI())) {
- artifact = a;
- break;
- }
- }
- Composite composite2 = (Composite)artifact.getModel();
- assertEquals("contributionComposite", composite2.getName().toString());
- }
-
-}
diff --git a/tags/java/sca/1.3.1-RC0/itest/contribution/src/test/resources/deployables/sample-calculator.jar b/tags/java/sca/1.3.1-RC0/itest/contribution/src/test/resources/deployables/sample-calculator.jar
deleted file mode 100644
index 0ca3a1b781..0000000000
Binary files a/tags/java/sca/1.3.1-RC0/itest/contribution/src/test/resources/deployables/sample-calculator.jar and /dev/null differ
diff --git a/tags/java/sca/1.3.1-RC0/itest/contribution/src/test/resources/repository/sample-calculator.jar b/tags/java/sca/1.3.1-RC0/itest/contribution/src/test/resources/repository/sample-calculator.jar
deleted file mode 100644
index 0ca3a1b781..0000000000
Binary files a/tags/java/sca/1.3.1-RC0/itest/contribution/src/test/resources/repository/sample-calculator.jar and /dev/null differ
diff --git a/tags/java/sca/1.3.1-RC0/itest/conversations-ws/pom.xml b/tags/java/sca/1.3.1-RC0/itest/conversations-ws/pom.xml
deleted file mode 100644
index 2f325f838d..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/conversations-ws/pom.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-
-
-
- 4.0.0
-
- org.apache.tuscany.sca
- tuscany-itest
- 1.3.1
- ../pom.xml
-
- itest-conversations-ws
- Apache Tuscany SCA Conversations Over binding.ws Integration Tests
-
-
-
-
-
- org.apache.tuscany.sca
- tuscany-node2-impl
- 1.3.1
-
-
-
- org.apache.tuscany.sca
- tuscany-binding-ws-axis2
- 1.3.1
-
-
-
- org.apache.tuscany.sca
- tuscany-host-tomcat
- 1.3.1
- runtime
-
-
-
- org.apache.tuscany.sca
- tuscany-implementation-java-runtime
- 1.3.1
- runtime
-
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/BusinessException.java b/tags/java/sca/1.3.1-RC0/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/BusinessException.java
deleted file mode 100644
index 9cd88620e3..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/BusinessException.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.itest.conversational;
-
-public class BusinessException extends Exception {
-
- private String message;
-
- public BusinessException() {
- super();
- }
-
- public BusinessException(String message) {
- super(message);
- setMessage(message);
- }
-
- public String getMessage() {
- return message;
- }
-
- public void setMessage(String message) {
- this.message = message;
- }
-}
diff --git a/tags/java/sca/1.3.1-RC0/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationIdService.java b/tags/java/sca/1.3.1-RC0/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationIdService.java
deleted file mode 100644
index 53dadc3dc7..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationIdService.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * 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.
- */
-
-package org.apache.tuscany.sca.itest.conversational;
-
-import org.osoa.sca.annotations.Conversational;
-
-@Conversational
-public interface ConversationIdService {
-
- String getCIDField();
- String getCIDSetter();
-}
diff --git a/tags/java/sca/1.3.1-RC0/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalCallback.java b/tags/java/sca/1.3.1-RC0/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalCallback.java
deleted file mode 100644
index cb7a032e85..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalCallback.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.itest.conversational;
-
-import org.osoa.sca.annotations.Conversational;
-import org.osoa.sca.annotations.EndsConversation;
-import org.osoa.sca.annotations.Remotable;
-
-
-/**
- * The callback interface used when testing conversational callbacks
- *
- * @version $Rev: 537240 $ $Date: 2007-05-11 18:35:03 +0100 (Fri, 11 May 2007) $
- */
-@Remotable
-@Conversational
-public interface ConversationalCallback {
-
- // public void init();
-
- // public void destroy();
-
- public void initializeCount(int count);
-
- public void incrementCount();
-
- public int retrieveCount();
-
- public void businessException() throws BusinessException;
-
- @EndsConversation
- public String endConversation();
-
-}
diff --git a/tags/java/sca/1.3.1-RC0/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalClient.java b/tags/java/sca/1.3.1-RC0/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalClient.java
deleted file mode 100644
index 2532346349..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalClient.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.itest.conversational;
-
-import org.osoa.sca.annotations.Remotable;
-
-/**
- * The client for the conversational itest. Is implemented by clients
- * offering both stateless and stateful callbacks
- *
- * @version $Rev: 537240 $ $Date: 2007-05-11 18:35:03 +0100 (Fri, 11 May 2007) $
- */
-
-@Remotable
-public interface ConversationalClient {
-
- public int runConversationFromInjectedReference();
- public int runConversationFromInjectedReference2();
- public int runConversationFromServiceReference();
- public int runConversationWithUserDefinedConversationId();
- public String runConversationCheckUserDefinedConversationId();
- public int runConversationCheckingScope();
- public int runConversationWithCallback();
- public int runConversationHavingPassedReference();
- public String runConversationBusinessException();
- public String runConversationBusinessExceptionCallback();
- public int runConversationCallingEndedConversation();
- public int runConversationCallingEndedConversationCallback();
- public String runConversationCallingEndedConversationCheckConversationId();
- public String runConversationCallingEndedConversationCallbackCheckConversationId();
- public int runConversationAgeTimeout();
- public int runConversationIdleTimeout();
- public int runConversationPrincipleError();
-}
diff --git a/tags/java/sca/1.3.1-RC0/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalReferenceClient.java b/tags/java/sca/1.3.1-RC0/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalReferenceClient.java
deleted file mode 100644
index 8f008fa711..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalReferenceClient.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.itest.conversational;
-
-import org.osoa.sca.CallableReference;
-import org.osoa.sca.annotations.Remotable;
-
-/**
- * The client that calls into an existing conversation by accepting
- * a reference to that conversation
- *
- * @version $Rev: 537240 $ $Date: 2007-05-11 18:35:03 +0100 (Fri, 11 May 2007) $
- */
-
-@Remotable
-public interface ConversationalReferenceClient {
-
- public void incrementCount(CallableReference conversationalService);
-
-}
diff --git a/tags/java/sca/1.3.1-RC0/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalService.java b/tags/java/sca/1.3.1-RC0/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalService.java
deleted file mode 100644
index 1e36ce6917..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalService.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.itest.conversational;
-
-import org.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.Conversational;
-import org.osoa.sca.annotations.EndsConversation;
-import org.osoa.sca.annotations.Remotable;
-
-
-/**
- * The service interface used when testing conversations
- *
- * @version $Rev: 537240 $ $Date: 2007-05-11 18:35:03 +0100 (Fri, 11 May 2007) $
- */
-@Remotable
-@Conversational
-@Callback(ConversationalCallback.class)
-public interface ConversationalService {
-
- public void initializeCount(int count);
-
- public void incrementCount();
-
- public int retrieveCount();
-
- //public void businessException() throws BusinessException;
-
- public void initializeCountCallback(int count);
-
- public void incrementCountCallback();
-
- public int retrieveCountCallback();
-
- //public void businessExceptionCallback() throws BusinessException;
-
- @EndsConversation
- public String endConversation();
-
- public String endConversationCallback();
-
-}
diff --git a/tags/java/sca/1.3.1-RC0/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalServiceNonConversationalCallback.java b/tags/java/sca/1.3.1-RC0/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalServiceNonConversationalCallback.java
deleted file mode 100644
index b4d3fe3d71..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalServiceNonConversationalCallback.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.itest.conversational;
-
-import org.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.Conversational;
-import org.osoa.sca.annotations.EndsConversation;
-import org.osoa.sca.annotations.Remotable;
-
-
-/**
- * The service interface used when testing conversations
- *
- * @version $Rev: 537240 $ $Date: 2007-05-11 18:35:03 +0100 (Fri, 11 May 2007) $
- */
-@Remotable
-@Conversational
-@Callback(NonConversationalCallback.class)
-public interface ConversationalServiceNonConversationalCallback {
-
-
- public void initializeCount(int count);
-
- public void incrementCount();
-
- public int retrieveCount();
-
- public void businessException() throws BusinessException;
-
- public void initializeCountCallback(int count);
-
- public void incrementCountCallback();
-
- public int retrieveCountCallback();
-
- public void businessExceptionCallback() throws BusinessException;
-
- @EndsConversation
- public String endConversation();
-
- public String endConversationCallback();
-
-}
diff --git a/tags/java/sca/1.3.1-RC0/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallback.java b/tags/java/sca/1.3.1-RC0/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallback.java
deleted file mode 100644
index ed3a01c10b..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallback.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.itest.conversational;
-
-import org.osoa.sca.annotations.Remotable;
-
-
-/**
- * The callback interface used when testing conversational callbacks
- *
- * @version $Rev: 537240 $ $Date: 2007-05-11 18:35:03 +0100 (Fri, 11 May 2007) $
- */
-@Remotable
-public interface NonConversationalCallback {
-
- public void initializeCount(int count);
-
- public void incrementCount();
-
- public int retrieveCount();
-
- public void businessException() throws BusinessException;
-
- public String endConversation();
-
-}
diff --git a/tags/java/sca/1.3.1-RC0/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationAgeComponentImpl.java b/tags/java/sca/1.3.1-RC0/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationAgeComponentImpl.java
deleted file mode 100644
index 1603916cca..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationAgeComponentImpl.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * 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.
- */
-
-package org.apache.tuscany.sca.itest.conversational.impl;
-
-import org.apache.tuscany.sca.itest.conversational.BusinessException;
-import org.apache.tuscany.sca.itest.conversational.ConversationalService;
-import org.osoa.sca.annotations.ConversationAttributes;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
-
-@Service(ConversationalService.class)
-@Scope("CONVERSATION")
-@ConversationAttributes(maxAge="1 seconds")
-public class ConversationAgeComponentImpl implements ConversationalService {
-
- private int count;
-
- public void businessException() throws BusinessException {
- }
-
- public void businessExceptionCallback() throws BusinessException {
- }
-
- public void destroy() {
- }
-
- public String endConversation() {
- return null;
- }
-
- public String endConversationCallback() {
- return null;
- }
-
- public void incrementCount() {
- }
-
- public void incrementCountCallback() {
- }
-
- public void init() {
- }
-
- public void initializeCount(int count) {
- this.count = count;
- }
-
- public void initializeCountCallback(int count) {
- }
-
- public int retrieveCount() {
- return count;
- }
-
- public int retrieveCountCallback() {
- return 0;
- }
-
-}
diff --git a/tags/java/sca/1.3.1-RC0/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationIdComponentImpl.java b/tags/java/sca/1.3.1-RC0/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationIdComponentImpl.java
deleted file mode 100644
index accc1eee27..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationIdComponentImpl.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * 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.
- */
-
-package org.apache.tuscany.sca.itest.conversational.impl;
-
-import org.apache.tuscany.sca.itest.conversational.ConversationIdService;
-import org.osoa.sca.annotations.ConversationID;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
-
-@Service(ConversationIdService.class)
-@Scope("CONVERSATION")
-public class ConversationIdComponentImpl implements ConversationIdService {
-
- @ConversationID
- public String cid;
-
- private String setterCid;
-
- public String getCIDField() {
- return cid;
- }
- public String getCIDSetter() {
- return setterCid;
- }
-
-
- @ConversationID
- public void setCID(String cid) {
- this.setterCid = cid;
- }
-}
diff --git a/tags/java/sca/1.3.1-RC0/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationMaxIdleComponentImpl.java b/tags/java/sca/1.3.1-RC0/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationMaxIdleComponentImpl.java
deleted file mode 100644
index 90f6de86ac..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationMaxIdleComponentImpl.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * 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.
- */
-
-package org.apache.tuscany.sca.itest.conversational.impl;
-
-import org.apache.tuscany.sca.itest.conversational.BusinessException;
-import org.apache.tuscany.sca.itest.conversational.ConversationalService;
-import org.osoa.sca.annotations.ConversationAttributes;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
-
-@Service(ConversationalService.class)
-@Scope("CONVERSATION")
-@ConversationAttributes(maxIdleTime="1 seconds")
-public class ConversationMaxIdleComponentImpl implements ConversationalService {
-
- private int count;
-
- public void businessException() throws BusinessException {
- }
-
- public void businessExceptionCallback() throws BusinessException {
- }
-
- public void destroy() {
- }
-
- public String endConversation() {
- return null;
- }
-
- public String endConversationCallback() {
- return null;
- }
-
- public void incrementCount() {
- }
-
- public void incrementCountCallback() {
- }
-
- public void init() {
- }
-
- public void initializeCount(int count) {
- this.count = count;
- }
-
- public void initializeCountCallback(int count) {
- }
-
- public int retrieveCount() {
- return count;
- }
-
- public int retrieveCountCallback() {
- return 0;
- }
-
-}
diff --git a/tags/java/sca/1.3.1-RC0/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulImpl.java b/tags/java/sca/1.3.1-RC0/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulImpl.java
deleted file mode 100644
index 3f7a90b3dc..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulImpl.java
+++ /dev/null
@@ -1,322 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.itest.conversational.impl;
-
-import org.apache.tuscany.sca.itest.conversational.BusinessException;
-import org.apache.tuscany.sca.itest.conversational.ConversationalCallback;
-import org.apache.tuscany.sca.itest.conversational.ConversationalClient;
-import org.apache.tuscany.sca.itest.conversational.ConversationalReferenceClient;
-import org.apache.tuscany.sca.itest.conversational.ConversationalService;
-import org.osoa.sca.ComponentContext;
-import org.osoa.sca.ServiceReference;
-import org.osoa.sca.annotations.Context;
-import org.osoa.sca.annotations.ConversationAttributes;
-import org.osoa.sca.annotations.Destroy;
-import org.osoa.sca.annotations.Init;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
-
-/**
- * The client for the conversational itest which presents a stateful
- * callback interface
- *
- * @version $Rev: 537240 $ $Date: 2007-05-11 18:35:03 +0100 (Fri, 11 May 2007) $
- */
-
-@Service(interfaces={ConversationalClient.class})
-@Scope("CONVERSATION")
-@ConversationAttributes(maxAge="10 minutes",
- maxIdleTime="5 minutes",
- singlePrincipal=false)
-public class ConversationalClientStatefulImpl implements ConversationalClient, ConversationalCallback {
-
- @Context
- protected ComponentContext componentContext;
-
- @Reference
- protected ConversationalService conversationalService;
-
- @Reference
- protected ConversationalService conversationalService2;
-
- @Reference
- protected ConversationalReferenceClient conversationalReferenceClient;
-
- private int clientCount = 0;
- private int callbackCount = 0;
-
-
- // a static member variable that records the number of times this service is called
- public static StringBuffer calls = new StringBuffer();
-
- // From ConversationalClient
- public int runConversationFromInjectedReference(){
- calls.append("runConversationFromInjectedReference,");
- conversationalService.initializeCount(1);
- conversationalService.incrementCount();
- clientCount = conversationalService.retrieveCount();
- conversationalService.endConversation();
-
- return clientCount;
- }
- public int runConversationFromInjectedReference2(){
- calls.append("runConversationFromInjectedReference2,");
-
- conversationalService2.initializeCount(1);
- conversationalService2.incrementCount();
-
- // stick in a call to the first reference to
- // make sure the two references don't clash
- conversationalService.initializeCount(1);
-
- clientCount = conversationalService2.retrieveCount();
- conversationalService2.endConversation();
-
- // end the conversation through the first reference
- conversationalService.endConversation();
-
- return clientCount;
- }
- public int runConversationFromServiceReference(){
- calls.append("runConversationFromServiceReference,");
- ServiceReference serviceReference = componentContext.getServiceReference(ConversationalService.class,
- "conversationalService");
- ConversationalService callableReference = serviceReference.getService();
-
- callableReference.initializeCount(1);
- callableReference.incrementCount();
- clientCount = callableReference.retrieveCount();
- callableReference.endConversation();
-
- // serviceReference.getConversation().end();
-
- return clientCount;
- }
- public int runConversationWithUserDefinedConversationId(){
- calls.append("runConversationWithUserDefinedConversationId,");
- ServiceReference serviceReference = componentContext.getServiceReference(ConversationalService.class,
- "conversationalService");
- serviceReference.setConversationID("MyConversation1");
-
- ConversationalService callableReference = serviceReference.getService();
-
- callableReference.initializeCount(1);
- callableReference.incrementCount();
- clientCount = callableReference.retrieveCount();
- callableReference.endConversation();
-
- // serviceReference.getConversation().end();
-
- return clientCount;
- }
- public String runConversationCheckUserDefinedConversationId(){
- calls.append("runConversationCheckUserDefinedConversationId,");
- ServiceReference serviceReference = componentContext.getServiceReference(ConversationalService.class,
- "conversationalService");
- serviceReference.setConversationID("MyConversation2");
-
- ConversationalService callableReference = serviceReference.getService();
-
- callableReference.initializeCount(1);
- callableReference.incrementCount();
- clientCount = callableReference.retrieveCount();
-
- String clientConversationId = serviceReference.getConversationID().toString();
- String serverConversationId = callableReference.endConversation();
-
- if (clientConversationId.equals("MyConversation2") &&
- serverConversationId.equals("MyConversation2") ) {
- return clientConversationId;
- } else {
- return "client = " + clientConversationId +
- "server = " + serverConversationId;
- }
-
- }
- public int runConversationCheckingScope(){
- calls.append("runConversationCheckingScope,");
- // run a conversation
- return runConversationFromInjectedReference();
-
- // test will then use a static method to find out how many times
- // init/destroy were called
- }
- public int runConversationWithCallback(){
- calls.append("runConversationWithCallback,");
- callbackCount = 2;
- conversationalService.initializeCountCallback(1);
- conversationalService.incrementCountCallback();
- clientCount = conversationalService.retrieveCountCallback();
- conversationalService.endConversationCallback();
-
- return clientCount;
- }
- public int runConversationHavingPassedReference(){
- calls.append("runConversationHavingPassedReference,");
- ServiceReference serviceReference = componentContext.getServiceReference(ConversationalService.class,
- "conversationalService");
- ConversationalService callableReference = serviceReference.getService();
-
- callableReference.initializeCount(1);
- callableReference.incrementCount();
- conversationalReferenceClient.incrementCount(serviceReference);
- clientCount = callableReference.retrieveCount();
- callableReference.endConversation();
-
- serviceReference.getConversation().end();
-
- return clientCount;
- }
- public String runConversationBusinessException(){
- calls.append("runConversationbusinessException,");
- try {
- conversationalService.initializeCount(1);
-// conversationalService.businessException();
- clientCount = conversationalService.retrieveCount();
- conversationalService.endConversation();
- } catch(Exception ex) {
- return ex.getMessage();
- }
-
- return "No Exception Returned";
- }
-
- public String runConversationBusinessExceptionCallback(){
- calls.append("runConversationbusinessExceptionCallback,");
- try {
- conversationalService.initializeCountCallback(1);
-// conversationalService.businessExceptionCallback();
- clientCount = conversationalService.retrieveCountCallback();
- conversationalService.endConversationCallback();
- } catch(Exception ex) {
- return ex.getMessage();
- }
-
- return "No Exception Returned";
- }
-
- public int runConversationCallingEndedConversation(){
- calls.append("runConversationCallingEndedConversation,");
- conversationalService.initializeCount(1);
- conversationalService.endConversation();
- return conversationalService.retrieveCount();
- }
-
- public int runConversationCallingEndedConversationCallback(){
- calls.append("runConversationCallingEndedConversationCallback,");
- conversationalService.initializeCountCallback(1);
- conversationalService.endConversationCallback();
- return conversationalService.retrieveCountCallback();
- }
-
- public String runConversationCallingEndedConversationCheckConversationId(){
- calls.append("runConversationCallingEndedConversationCheckConversationId,");
- ServiceReference serviceReference = componentContext.getServiceReference(ConversationalService.class,
- "conversationalService");
- serviceReference.setConversationID("MyConversation3");
-
- ConversationalService callableReference = serviceReference.getService();
-
- callableReference.initializeCount(1);
- callableReference.incrementCount();
- clientCount = callableReference.retrieveCount();
- callableReference.endConversation();
-
- if (serviceReference.getConversation() ==null ) {
- return null;
- } else {
- return serviceReference.getConversation().getConversationID().toString();
- }
- }
-
- public String runConversationCallingEndedConversationCallbackCheckConversationId(){
- calls.append("runConversationCallingEndedConversationCallbackCheckConversationId,");
- ServiceReference serviceReference = componentContext.getServiceReference(ConversationalService.class,
- "conversationalService");
- serviceReference.setConversationID("MyConversation3");
-
- ConversationalService callableReference = serviceReference.getService();
-
- callableReference.initializeCount(1);
- callableReference.incrementCount();
- clientCount = callableReference.retrieveCount();
- callableReference.endConversationCallback();
-
- if (serviceReference.getConversation() ==null ) {
- return null;
- } else {
- return serviceReference.getConversation().getConversationID().toString();
- }
- }
-
- public int runConversationAgeTimeout(){
- calls.append("runConversationAgeTimeout,");
- // done in other testing
- return clientCount;
- }
- public int runConversationIdleTimeout(){
- calls.append("runConversationIdleTimeout,");
- // done in other testing
- return clientCount;
- }
- public int runConversationPrincipleError(){
- calls.append("runConversationPrincipleError,");
- // TODO - when policy framework is done
- return clientCount;
- }
-
-
- // From ConversationalCallback
- @Init
- public void init(){
- calls.append("init,");
- }
-
- @Destroy
- public void destroy(){
- calls.append("destroy,");
- }
-
- public void initializeCount(int count){
- calls.append("initializeCount,");
- callbackCount += count;
- }
-
- public void incrementCount(){
- calls.append("incrementCount,");
- callbackCount++;
- }
-
- public int retrieveCount(){
- calls.append("retrieveCount,");
- return callbackCount;
- }
-
- public void businessException() throws BusinessException {
- throw new BusinessException("Business Exception");
- }
-
- public String endConversation(){
- calls.append("endConversation,");
- callbackCount = 0;
- return null;
- }
-
-}
diff --git a/tags/java/sca/1.3.1-RC0/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulNonConversationalCallbackImpl.java b/tags/java/sca/1.3.1-RC0/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulNonConversationalCallbackImpl.java
deleted file mode 100644
index ab91498132..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulNonConversationalCallbackImpl.java
+++ /dev/null
@@ -1,311 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.itest.conversational.impl;
-
-import org.apache.tuscany.sca.itest.conversational.BusinessException;
-import org.apache.tuscany.sca.itest.conversational.ConversationalClient;
-import org.apache.tuscany.sca.itest.conversational.ConversationalReferenceClient;
-import org.apache.tuscany.sca.itest.conversational.ConversationalService;
-import org.apache.tuscany.sca.itest.conversational.NonConversationalCallback;
-import org.osoa.sca.ComponentContext;
-import org.osoa.sca.ServiceReference;
-import org.osoa.sca.annotations.Context;
-import org.osoa.sca.annotations.ConversationAttributes;
-import org.osoa.sca.annotations.Destroy;
-import org.osoa.sca.annotations.Init;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
-
-/**
- * The client for the conversational itest which presents a stateful
- * callback interface
- *
- * @version $Rev: 537240 $ $Date: 2007-05-11 18:35:03 +0100 (Fri, 11 May 2007) $
- */
-
-@Service(interfaces={ConversationalClient.class})
-@Scope("CONVERSATION")
-@ConversationAttributes(maxAge="10 minutes",
- maxIdleTime="5 minutes",
- singlePrincipal=false)
-public class ConversationalClientStatefulNonConversationalCallbackImpl implements ConversationalClient, NonConversationalCallback {
-
- @Context
- protected ComponentContext componentContext;
-
- @Reference
- protected ConversationalService conversationalService;
-
- @Reference
- protected ConversationalService conversationalService2;
-
- @Reference
- protected ConversationalReferenceClient conversationalReferenceClient;
-
- private int clientCount = 0;
- private int callbackCount = 0;
-
-
- // a static member variable that records the number of times this service is called
- public static StringBuffer calls = new StringBuffer();
-
- // From ConversationalClient
- public int runConversationFromInjectedReference(){
- calls.append("runConversationFromInjectedReference,");
- conversationalService.initializeCount(1);
- conversationalService.incrementCount();
- clientCount = conversationalService.retrieveCount();
- conversationalService.endConversation();
-
- return clientCount;
- }
- public int runConversationFromInjectedReference2(){
- calls.append("runConversationFromInjectedReference2,");
-
- conversationalService2.initializeCount(1);
- conversationalService2.incrementCount();
-
- // stick in a call to the first reference to
- // make sure the two references don't clash
- conversationalService.initializeCount(1);
-
- clientCount = conversationalService2.retrieveCount();
- conversationalService2.endConversation();
-
- // end the conversation through the first reference
- conversationalService.endConversation();
-
- return clientCount;
- }
- public int runConversationFromServiceReference(){
- calls.append("runConversationFromServiceReference,");
- ServiceReference serviceReference = componentContext.getServiceReference(ConversationalService.class,
- "conversationalService");
- ConversationalService callableReference = serviceReference.getService();
-
- callableReference.initializeCount(1);
- callableReference.incrementCount();
- clientCount = callableReference.retrieveCount();
- callableReference.endConversation();
-
- // serviceReference.getConversation().end();
-
- return clientCount;
- }
- public int runConversationWithUserDefinedConversationId(){
- calls.append("runConversationWithUserDefinedConversationId,");
- ServiceReference serviceReference = componentContext.getServiceReference(ConversationalService.class,
- "conversationalService");
- serviceReference.setConversationID("MyConversation1");
-
- ConversationalService callableReference = serviceReference.getService();
-
- callableReference.initializeCount(1);
- callableReference.incrementCount();
- clientCount = callableReference.retrieveCount();
- callableReference.endConversation();
-
- // serviceReference.getConversation().end();
-
- return clientCount;
- }
- public String runConversationCheckUserDefinedConversationId(){
- calls.append("runConversationCheckUserDefinedConversationId,");
- ServiceReference serviceReference = componentContext.getServiceReference(ConversationalService.class,
- "conversationalService");
- serviceReference.setConversationID("MyConversation2");
-
- ConversationalService callableReference = serviceReference.getService();
-
- callableReference.initializeCount(1);
- callableReference.incrementCount();
- clientCount = callableReference.retrieveCount();
- return callableReference.endConversation();
-
- }
- public int runConversationCheckingScope(){
- calls.append("runConversationCheckingScope,");
- // run a conversation
- return runConversationFromInjectedReference();
-
- // test will then use a static method to find out how many times
- // init/destroy were called
- }
- public int runConversationWithCallback(){
- calls.append("runConversationWithCallback,");
- callbackCount = 2;
- conversationalService.initializeCountCallback(1);
- conversationalService.incrementCountCallback();
- clientCount = conversationalService.retrieveCountCallback();
- conversationalService.endConversationCallback();
-
- return clientCount;
- }
- public int runConversationHavingPassedReference(){
- calls.append("runConversationHavingPassedReference,");
- ServiceReference serviceReference = componentContext.getServiceReference(ConversationalService.class,
- "conversationalService");
- ConversationalService callableReference = serviceReference.getService();
-
- callableReference.initializeCount(1);
- callableReference.incrementCount();
- conversationalReferenceClient.incrementCount(serviceReference);
- clientCount = callableReference.retrieveCount();
- callableReference.endConversation();
-
- // serviceReference.getConversation().end();
-
- return clientCount;
- }
- public String runConversationBusinessException(){
- calls.append("runConversationbusinessException,");
- try {
- conversationalService.initializeCount(1);
-// conversationalService.businessException();
- clientCount = conversationalService.retrieveCount();
- conversationalService.endConversation();
- } catch(Exception ex) {
- return ex.getMessage();
- }
-
- return "No Exception Returned";
- }
-
- public String runConversationBusinessExceptionCallback(){
- calls.append("runConversationbusinessExceptionCallback,");
- try {
- conversationalService.initializeCountCallback(1);
-// conversationalService.businessExceptionCallback();
- clientCount = conversationalService.retrieveCountCallback();
- conversationalService.endConversationCallback();
- } catch(Exception ex) {
- return ex.getMessage();
- }
-
- return "No Exception Returned";
- }
-
- public String runConversationCallingEndedConversationCheckConversationId(){
- calls.append("runConversationCallingEndedConversationCheckConversationId,");
- ServiceReference serviceReference = componentContext.getServiceReference(ConversationalService.class,
- "conversationalService");
- serviceReference.setConversationID("MyConversation3");
-
- ConversationalService callableReference = serviceReference.getService();
-
- callableReference.initializeCount(1);
- callableReference.incrementCount();
- clientCount = callableReference.retrieveCount();
- callableReference.endConversation();
-
- if (serviceReference.getConversation() ==null ) {
- return null;
- } else {
- return serviceReference.getConversation().getConversationID().toString();
- }
- }
-
- public String runConversationCallingEndedConversationCallbackCheckConversationId(){
- calls.append("runConversationCallingEndedConversationCallbackCheckConversationId,");
- ServiceReference serviceReference = componentContext.getServiceReference(ConversationalService.class,
- "conversationalService");
- serviceReference.setConversationID("MyConversation3");
-
- ConversationalService callableReference = serviceReference.getService();
-
- callableReference.initializeCount(1);
- callableReference.incrementCount();
- clientCount = callableReference.retrieveCount();
- callableReference.endConversationCallback();
-
- if (serviceReference.getConversation() ==null ) {
- return null;
- } else {
- return serviceReference.getConversation().getConversationID().toString();
- }
- }
-
- public int runConversationCallingEndedConversation(){
- calls.append("runConversationCallingEndedConversation,");
- conversationalService.initializeCount(1);
- conversationalService.endConversation();
- return conversationalService.retrieveCount();
- }
-
- public int runConversationCallingEndedConversationCallback(){
- calls.append("runConversationCallingEndedConversationCallback,");
- conversationalService.initializeCountCallback(1);
- conversationalService.endConversationCallback();
- return conversationalService.retrieveCountCallback();
- }
-
- public int runConversationAgeTimeout(){
- calls.append("runConversationAgeTimeout,");
- // done in other testing
- return clientCount;
- }
- public int runConversationIdleTimeout(){
- calls.append("runConversationIdleTimeout,");
- // done in other testing
- return clientCount;
- }
- public int runConversationPrincipleError(){
- calls.append("runConversationPrincipleError,");
- // TODO - when policy framework is done
- return clientCount;
- }
-
-
- // From ConversationalCallback
- @Init
- public void init(){
- calls.append("init,");
- }
-
- @Destroy
- public void destroy(){
- calls.append("destroy,");
- }
-
- public void initializeCount(int count){
- calls.append("initializeCount,");
- callbackCount += count;
- }
-
- public void incrementCount(){
- calls.append("incrementCount,");
- callbackCount++;
- }
-
- public int retrieveCount(){
- calls.append("retrieveCount,");
- return callbackCount;
- }
-
- public void businessException() throws BusinessException {
- throw new BusinessException("Business Exception");
- }
-
- public String endConversation(){
- calls.append("endConversation,");
- return null;
- }
-
-}
diff --git a/tags/java/sca/1.3.1-RC0/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatelessImpl.java b/tags/java/sca/1.3.1-RC0/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatelessImpl.java
deleted file mode 100644
index e4f83656de..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatelessImpl.java
+++ /dev/null
@@ -1,318 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.itest.conversational.impl;
-
-import org.apache.tuscany.sca.itest.conversational.BusinessException;
-import org.apache.tuscany.sca.itest.conversational.ConversationalCallback;
-import org.apache.tuscany.sca.itest.conversational.ConversationalClient;
-import org.apache.tuscany.sca.itest.conversational.ConversationalReferenceClient;
-import org.apache.tuscany.sca.itest.conversational.ConversationalService;
-import org.osoa.sca.ComponentContext;
-import org.osoa.sca.ServiceReference;
-import org.osoa.sca.annotations.Context;
-import org.osoa.sca.annotations.Destroy;
-import org.osoa.sca.annotations.Init;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Service;
-
-/**
- * The client for the conversational itest which presents a stateful
- * callback interface
- *
- * @version $Rev: 537240 $ $Date: 2007-05-11 18:35:03 +0100 (Fri, 11 May 2007) $
- */
-
-@Service(interfaces={ConversationalClient.class})
-public class ConversationalClientStatelessImpl implements ConversationalClient, ConversationalCallback {
-
- @Context
- protected ComponentContext componentContext;
-
- @Reference
- protected ConversationalService conversationalService;
-
- @Reference
- protected ConversationalService conversationalService2;
-
- @Reference
- protected ConversationalReferenceClient conversationalReferenceClient;
-
- private int clientCount = 0;
- private int callbackCount = 0;
-
- // a static member variable that records the number of times this service is called
- public static StringBuffer calls = new StringBuffer();
-
- // From ConversationalClient
- public int runConversationFromInjectedReference(){
- calls.append("runConversationFromInjectedReference,");
- conversationalService.initializeCount(1);
- conversationalService.incrementCount();
- clientCount = conversationalService.retrieveCount();
- conversationalService.endConversation();
-
- return clientCount;
- }
- public int runConversationFromInjectedReference2(){
- calls.append("runConversationFromInjectedReference2,");
-
- // now test the second reference
- conversationalService2.initializeCount(1);
- conversationalService2.incrementCount();
-
- // stick in a call to the first reference to
- // make sure the two references don't clash
- conversationalService.initializeCount(1);
-
- clientCount = conversationalService2.retrieveCount();
- conversationalService2.endConversation();
-
- // end the conversation through the first reference
- conversationalService.endConversation();
-
- return clientCount;
- }
- public int runConversationFromServiceReference(){
- calls.append("runConversationFromServiceReference,");
- ServiceReference serviceReference = componentContext.getServiceReference(ConversationalService.class,
- "conversationalService");
- ConversationalService callableReference = serviceReference.getService();
-
- callableReference.initializeCount(1);
- callableReference.incrementCount();
- clientCount = callableReference.retrieveCount();
- callableReference.endConversation();
-
- // serviceReference.getConversation().end();
-
- return clientCount;
- }
- public int runConversationWithUserDefinedConversationId(){
- calls.append("runConversationWithUserDefinedConversationId,");
- ServiceReference serviceReference = componentContext.getServiceReference(ConversationalService.class,
- "conversationalService");
- serviceReference.setConversationID("MyConversation1");
-
- ConversationalService callableReference = serviceReference.getService();
-
- callableReference.initializeCount(1);
- callableReference.incrementCount();
- clientCount = callableReference.retrieveCount();
- callableReference.endConversation();
-
- // serviceReference.getConversation().end();
-
- return clientCount;
- }
- public String runConversationCheckUserDefinedConversationId(){
- calls.append("runConversationCheckUserDefinedConversationId,");
- ServiceReference serviceReference = componentContext.getServiceReference(ConversationalService.class,
- "conversationalService");
- serviceReference.setConversationID("MyConversation2");
-
- ConversationalService callableReference = serviceReference.getService();
-
- callableReference.initializeCount(1);
- callableReference.incrementCount();
- clientCount = callableReference.retrieveCount();
-
- String clientConversationId = serviceReference.getConversationID().toString();
- String serverConfersationId = callableReference.endConversation();
-
- if (clientConversationId.equals("MyConversation2") &&
- serverConfersationId.equals("MyConversation2") ) {
- return clientConversationId;
- } else {
- return "client = " + clientConversationId +
- "server = " + serverConfersationId;
- }
- }
- public int runConversationCheckingScope(){
- calls.append("runConversationCheckingScope,");
- // run a conversation
- return runConversationFromInjectedReference();
-
- // test will then use a static method to find out how many times
- // init/destroy were called
- }
- public int runConversationWithCallback(){
- calls.append("runConversationWithCallback,");
- conversationalService.initializeCountCallback(1);
- conversationalService.incrementCountCallback();
- clientCount = conversationalService.retrieveCountCallback();
- conversationalService.endConversationCallback();
-
- return clientCount;
- }
-
- public int runConversationHavingPassedReference(){
- calls.append("runConversationHavingPassedReference,");
- ServiceReference serviceReference = componentContext.getServiceReference(ConversationalService.class,
- "conversationalService");
- ConversationalService callableReference = serviceReference.getService();
-
- callableReference.initializeCount(1);
- callableReference.incrementCount();
- conversationalReferenceClient.incrementCount(serviceReference);
- clientCount = callableReference.retrieveCount();
- callableReference.endConversation();
-
- serviceReference.getConversation().end();
-
- return clientCount;
- }
-
- public String runConversationBusinessException(){
- calls.append("runConversationbusinessException,");
- try {
- conversationalService.initializeCount(1);
-// conversationalService.businessException();
- clientCount = conversationalService.retrieveCount();
- conversationalService.endConversation();
- } catch(Exception ex) {
- return ex.getMessage();
- }
-
- return "No Exception Returned";
- }
-
- public String runConversationBusinessExceptionCallback(){
- calls.append("runConversationbusinessExceptionCallback,");
- try {
- conversationalService.initializeCountCallback(1);
-// conversationalService.businessExceptionCallback();
- clientCount = conversationalService.retrieveCountCallback();
- conversationalService.endConversationCallback();
- } catch(Exception ex) {
- return ex.getMessage();
- }
-
- return "No Exception Returned";
- }
-
- public int runConversationCallingEndedConversation(){
- calls.append("runConversationCallingEndedConversation,");
- conversationalService.initializeCount(1);
- conversationalService.endConversation();
- return conversationalService.retrieveCount();
- }
-
- public int runConversationCallingEndedConversationCallback(){
- calls.append("runConversationCallingEndedConversationCallback,");
- conversationalService.initializeCountCallback(1);
- conversationalService.endConversationCallback();
- return conversationalService.retrieveCountCallback();
- }
-
- public String runConversationCallingEndedConversationCheckConversationId(){
- calls.append("runConversationCallingEndedConversationCheckConversationId,");
- ServiceReference serviceReference = componentContext.getServiceReference(ConversationalService.class,
- "conversationalService");
- serviceReference.setConversationID("MyConversation3");
-
- ConversationalService callableReference = serviceReference.getService();
-
- callableReference.initializeCount(1);
- callableReference.incrementCount();
- clientCount = callableReference.retrieveCount();
- callableReference.endConversation();
-
- if (serviceReference.getConversation() ==null ) {
- return null;
- } else {
- return serviceReference.getConversation().getConversationID().toString();
- }
- }
-
- public String runConversationCallingEndedConversationCallbackCheckConversationId(){
- calls.append("runConversationCallingEndedConversationCallbackCheckConversationId,");
- ServiceReference serviceReference = componentContext.getServiceReference(ConversationalService.class,
- "conversationalService");
- serviceReference.setConversationID("MyConversation3");
-
- ConversationalService callableReference = serviceReference.getService();
-
- callableReference.initializeCount(1);
- callableReference.incrementCount();
- clientCount = callableReference.retrieveCount();
- callableReference.endConversationCallback();
-
- if (serviceReference.getConversation() ==null ) {
- return null;
- } else {
- return serviceReference.getConversation().getConversationID().toString();
- }
- }
-
- public int runConversationAgeTimeout(){
- calls.append("runConversationAgeTimeout,");
- // done in other testing
- return clientCount;
- }
- public int runConversationIdleTimeout(){
- calls.append("runConversationIdleTimeout,");
- // done in other testing
- return clientCount;
- }
- public int runConversationPrincipleError(){
- calls.append("runConversationPrincipleError,");
- // TODO - when policy framework is done
- return clientCount;
- }
-
-
- // From ConversationalCallback
- @Init
- public void init(){
- calls.append("init,");
-
- }
-
- @Destroy
- public void destroy(){
- calls.append("destroy,");
-
- }
-
- public void initializeCount(int count){
- calls.append("initializeCount,");
- callbackCount = 0;
- }
-
- public void incrementCount(){
- calls.append("incrementCount,");
- callbackCount++;
- }
-
- public int retrieveCount(){
- calls.append("retrieveCount,");
- return callbackCount;
- }
-
- public void businessException() throws BusinessException {
- throw new BusinessException("Business Exception");
- }
-
- public String endConversation(){
- calls.append("endConversation,");
- callbackCount = 0;
- return null;
- }
-
-}
diff --git a/tags/java/sca/1.3.1-RC0/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalReferenceClientImpl.java b/tags/java/sca/1.3.1-RC0/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalReferenceClientImpl.java
deleted file mode 100644
index 8fe7c5b6ba..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalReferenceClientImpl.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.itest.conversational.impl;
-
-import org.apache.tuscany.sca.itest.conversational.ConversationalReferenceClient;
-import org.apache.tuscany.sca.itest.conversational.ConversationalService;
-import org.osoa.sca.CallableReference;
-import org.osoa.sca.annotations.Service;
-
-/**
- * A client component that accepts a reference to an ongoing conversation
- * and takes part in that conversation
- *
- * @version $Rev: 537240 $ $Date: 2007-05-11 18:35:03 +0100 (Fri, 11 May 2007) $
- */
-
-@Service(interfaces={ConversationalReferenceClient.class})
-public class ConversationalReferenceClientImpl implements ConversationalReferenceClient{
-
- public void incrementCount(CallableReference conversationalService){
- ConversationalService callableReference = conversationalService.getService();
-
- callableReference.incrementCount();
- }
-
-
-}
diff --git a/tags/java/sca/1.3.1-RC0/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceRequestImpl.java b/tags/java/sca/1.3.1-RC0/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceRequestImpl.java
deleted file mode 100644
index 9f4857f703..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceRequestImpl.java
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.itest.conversational.impl;
-
-import java.util.HashMap;
-
-import org.apache.tuscany.sca.itest.conversational.BusinessException;
-import org.apache.tuscany.sca.itest.conversational.ConversationalCallback;
-import org.apache.tuscany.sca.itest.conversational.ConversationalService;
-import org.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.ConversationID;
-import org.osoa.sca.annotations.Destroy;
-import org.osoa.sca.annotations.Init;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
-
-
-/**
- * The service used when testing stateful conversations
- *
- * @version $Rev: 537240 $ $Date: 2007-05-11 18:35:03 +0100 (Fri, 11 May 2007) $
- */
-@Service(ConversationalService.class)
-@Scope("REQUEST")
-public class ConversationalServiceRequestImpl implements ConversationalService {
-
- @ConversationID
- protected String conversationId;
-
- @Callback
- protected ConversationalCallback conversationalCallback;
-
- // static area in which to hold conversational data
- private static HashMap conversationalState = new HashMap();
-
- // a static member variable that records the number of times this service is called
- public static StringBuffer calls = new StringBuffer();
-
- @Init
- public void init(){
- calls.append("init,");
- }
-
- @Destroy
- public void destroy(){
- calls.append("destroy,");
- }
-
- public void initializeCount(int count){
- calls.append("initializeCount,");
- Integer conversationalCount = new Integer(count);
- conversationalState.put(conversationId, conversationalCount);
- }
-
- public void incrementCount(){
- calls.append("incrementCount,");
- Integer conversationalCount = conversationalState.get(conversationId);
- conversationalCount++;
- conversationalState.put(conversationId, conversationalCount);
- }
-
- public int retrieveCount(){
- calls.append("retrieveCount,");
- Integer count = conversationalState.get(conversationId);
- if (count != null){
- return count.intValue();
- } else {
- return -999;
- }
- }
-
- public void businessException() throws BusinessException {
- throw new BusinessException("Business Exception");
- }
-
- public void initializeCountCallback(int count){
- calls.append("initializeCountCallback,");
- initializeCount(count);
- conversationalCallback.initializeCount(count);
- }
-
- public void incrementCountCallback(){
- calls.append("incrementCountCallback,");
- incrementCount();
- conversationalCallback.incrementCount();
- }
-
- public int retrieveCountCallback(){
- calls.append("retrieveCountCallback,");
- return conversationalCallback.retrieveCount();
- }
-
- public void businessExceptionCallback() throws BusinessException {
- calls.append("businessExceptionCallback,");
- conversationalCallback.businessException();
- }
-
- public String endConversation(){
- calls.append("endConversation,");
- conversationalState.remove(conversationId);
- return conversationId;
- }
-
- public String endConversationCallback(){
- calls.append("endConversationCallback,");
- return conversationalCallback.endConversation();
- }
-}
diff --git a/tags/java/sca/1.3.1-RC0/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulImpl.java b/tags/java/sca/1.3.1-RC0/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulImpl.java
deleted file mode 100644
index 4b06251414..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulImpl.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.itest.conversational.impl;
-
-import org.apache.tuscany.sca.itest.conversational.BusinessException;
-import org.apache.tuscany.sca.itest.conversational.ConversationalCallback;
-import org.apache.tuscany.sca.itest.conversational.ConversationalService;
-import org.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.ConversationAttributes;
-import org.osoa.sca.annotations.ConversationID;
-import org.osoa.sca.annotations.Destroy;
-import org.osoa.sca.annotations.Init;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
-
-
-/**
- * The service used when testing stateful conversations
- *
- * @version $Rev: 537240 $ $Date: 2007-05-11 18:35:03 +0100 (Fri, 11 May 2007) $
- */
-@Service(ConversationalService.class)
-@Scope("CONVERSATION")
-@ConversationAttributes(maxAge="10 minutes",
- maxIdleTime="5 minutes",
- singlePrincipal=false)
-public class ConversationalServiceStatefulImpl implements ConversationalService {
-
- @ConversationID
- protected String conversationId;
-
- @Callback
- protected ConversationalCallback conversationalCallback;
-
- // local count - accumulates during the conversation
- private int count = 0;
-
- // a static member variable that records the number of times this service is called
- public static StringBuffer calls = new StringBuffer();
-
- @Init
- public void init(){
- calls.append("init,");
- }
-
- @Destroy
- public void destroy(){
- calls.append("destroy,");
- }
-
- public void initializeCount(int count){
- calls.append("initializeCount,");
- this.count = count;
- }
-
- public void incrementCount(){
- calls.append("incrementCount,");
- count++;
- }
-
- public int retrieveCount(){
- calls.append("retrieveCount,");
- return count;
- }
-
- public void businessException() throws BusinessException {
- calls.append("businessException,");
- throw new BusinessException("Business Exception");
- }
-
- public void initializeCountCallback(int count){
- calls.append("initializeCountCallback,");
- this.count = count;
- conversationalCallback.initializeCount(count);
- }
-
- public void incrementCountCallback(){
- calls.append("incrementCountCallback,");
- count++;
- conversationalCallback.incrementCount();
- }
-
- public int retrieveCountCallback(){
- calls.append("retrieveCountCallback,");
- return conversationalCallback.retrieveCount();
- }
-
- public void businessExceptionCallback() throws BusinessException {
- calls.append("businessExceptionCallback,");
- conversationalCallback.businessException();
- }
-
- public String endConversation(){
- calls.append("endConversation,");
- count = 0;
- return conversationId;
- }
-
- public String endConversationCallback(){
- calls.append("endConversationCallback,");
- return conversationalCallback.endConversation();
- }
-}
diff --git a/tags/java/sca/1.3.1-RC0/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulNonConversationalCallbackImpl.java b/tags/java/sca/1.3.1-RC0/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulNonConversationalCallbackImpl.java
deleted file mode 100644
index be039748fc..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulNonConversationalCallbackImpl.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.itest.conversational.impl;
-
-import org.apache.tuscany.sca.itest.conversational.BusinessException;
-import org.apache.tuscany.sca.itest.conversational.ConversationalServiceNonConversationalCallback;
-import org.apache.tuscany.sca.itest.conversational.NonConversationalCallback;
-import org.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.ConversationAttributes;
-import org.osoa.sca.annotations.ConversationID;
-import org.osoa.sca.annotations.Destroy;
-import org.osoa.sca.annotations.Init;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
-
-
-/**
- * The service used when testing stateful conversations
- *
- * @version $Rev: 537240 $ $Date: 2007-05-11 18:35:03 +0100 (Fri, 11 May 2007) $
- */
-@Service(ConversationalServiceNonConversationalCallback.class)
-@Scope("CONVERSATION")
-@ConversationAttributes(maxAge="10 minutes",
- maxIdleTime="5 minutes",
- singlePrincipal=false)
-public class ConversationalServiceStatefulNonConversationalCallbackImpl implements ConversationalServiceNonConversationalCallback {
-
- @ConversationID
- protected String conversationId;
-
- @Callback
- protected NonConversationalCallback nonConversationalCallback;
-
- // local count - accumulates during the conversation
- private int count = 0;
-
- // a static member variable that records the number of times this service is called
- public static StringBuffer calls = new StringBuffer();
-
- @Init
- public void init(){
- calls.append("init,");
- }
-
- @Destroy
- public void destroy(){
- calls.append("destroy,");
- }
-
- public void initializeCount(int count){
- calls.append("initializeCount,");
- this.count = count;
- }
-
- public void incrementCount(){
- calls.append("incrementCount,");
- count++;
- }
-
- public int retrieveCount(){
- calls.append("retrieveCount,");
- return count;
- }
-
- public void businessException() throws BusinessException {
- throw new BusinessException("Business Exception");
- }
-
- public void initializeCountCallback(int count){
- calls.append("initializeCountCallback,");
- this.count = count;
- nonConversationalCallback.initializeCount(count);
- }
-
- public void incrementCountCallback(){
- calls.append("incrementCountCallback,");
- count++;
- nonConversationalCallback.incrementCount();
- }
-
- public int retrieveCountCallback(){
- calls.append("retrieveCountCallback,");
- return nonConversationalCallback.retrieveCount();
- }
-
- public void businessExceptionCallback() throws BusinessException {
- calls.append("businessExceptionCallback,");
- nonConversationalCallback.businessException();
- }
-
- public String endConversation(){
- calls.append("endConversation,");
- count = 0;
- return conversationId;
- }
-
- public String endConversationCallback(){
- calls.append("endConversationCallback,");
- return nonConversationalCallback.endConversation();
- }
-}
diff --git a/tags/java/sca/1.3.1-RC0/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessImpl.java b/tags/java/sca/1.3.1-RC0/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessImpl.java
deleted file mode 100644
index 42f2f1a603..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessImpl.java
+++ /dev/null
@@ -1,122 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.itest.conversational.impl;
-
-import java.util.HashMap;
-
-import org.apache.tuscany.sca.itest.conversational.BusinessException;
-import org.apache.tuscany.sca.itest.conversational.ConversationalCallback;
-import org.apache.tuscany.sca.itest.conversational.ConversationalService;
-import org.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.ConversationID;
-import org.osoa.sca.annotations.Destroy;
-import org.osoa.sca.annotations.Init;
-import org.osoa.sca.annotations.Service;
-
-
-/**
- * The service used when testing stateful conversations
- *
- * @version $Rev: 537240 $ $Date: 2007-05-11 18:35:03 +0100 (Fri, 11 May 2007) $
- */
-@Service(ConversationalService.class)
-public class ConversationalServiceStatelessImpl implements ConversationalService {
-
- @ConversationID
- protected String conversationId;
-
- @Callback
- protected ConversationalCallback conversationalCallback;
-
- // static area in which to hold conversational data
- private static HashMap conversationalState = new HashMap();
-
- // a static member variable that records the number of times this service is called
- public static StringBuffer calls = new StringBuffer();
-
- @Init
- public void init(){
- calls.append("init,");
- }
-
- @Destroy
- public void destroy(){
- calls.append("destroy,");
- }
-
- public void initializeCount(int count){
- calls.append("initializeCount,");
- Integer conversationalCount = new Integer(count);
- conversationalState.put(conversationId, conversationalCount);
- }
-
- public void incrementCount(){
- calls.append("incrementCount,");
- Integer conversationalCount = conversationalState.get(conversationId);
- conversationalCount++;
- conversationalState.put(conversationId, conversationalCount);
- }
-
- public int retrieveCount(){
- calls.append("retrieveCount,");
- Integer count = conversationalState.get(conversationId);
- if (count != null){
- return count.intValue();
- } else {
- return -999;
- }
- }
-
- public void businessException() throws BusinessException {
- throw new BusinessException("Business Exception");
- }
-
- public void initializeCountCallback(int count){
- calls.append("initializeCountCallback,");
- initializeCount(count);
- conversationalCallback.initializeCount(count);
- }
-
- public void incrementCountCallback(){
- calls.append("incrementCountCallback,");
- incrementCount();
- conversationalCallback.incrementCount();
- }
-
- public int retrieveCountCallback(){
- calls.append("retrieveCountCallback,");
- return conversationalCallback.retrieveCount();
- }
-
- public void businessExceptionCallback() throws BusinessException {
- calls.append("businessExceptionCallback,");
- conversationalCallback.businessException();
- }
-
- public String endConversation(){
- calls.append("endConversation,");
- conversationalState.remove(conversationId);
- return conversationId;
- }
-
- public String endConversationCallback(){
- calls.append("endConversationCallback,");
- return conversationalCallback.endConversation();
- }
-}
diff --git a/tags/java/sca/1.3.1-RC0/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessScopeImpl.java b/tags/java/sca/1.3.1-RC0/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessScopeImpl.java
deleted file mode 100644
index a852aeda56..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/conversations-ws/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessScopeImpl.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- * 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.
- */
-
-package org.apache.tuscany.sca.itest.conversational.impl;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.tuscany.sca.itest.conversational.BusinessException;
-import org.apache.tuscany.sca.itest.conversational.ConversationalService;
-import org.osoa.sca.annotations.ConversationID;
-import org.osoa.sca.annotations.Service;
-
-@Service(ConversationalService.class)
-public class ConversationalServiceStatelessScopeImpl implements ConversationalService {
-
- @ConversationID
- protected String cid;
-
- static Map state = new HashMap();
-
- public void destroy() {
- // TODO Auto-generated method stub
-
- }
-
- public String endConversation() {
- state.remove(cid);
- return cid;
- }
-
- public String endConversationCallback() {
- // TODO Auto-generated method stub
- return null;
-
- }
-
- public void incrementCount() {
- state.put(cid, Integer.valueOf(state.get(cid)+1));
- }
-
- public void businessException() throws BusinessException {
- throw new BusinessException("Business Exception");
- }
-
- public void incrementCountCallback() {
- // TODO Auto-generated method stub
-
- }
-
- public void init() {
- // TODO Auto-generated method stub
-
- }
-
- public void initializeCount(int count) {
- state.put(cid, Integer.valueOf(count));
- }
-
- public void initializeCountCallback(int count) {
- // TODO Auto-generated method stub
-
- }
-
- public void businessExceptionCallback() throws BusinessException {
- throw new BusinessException("Business Exception");
- }
-
- public int retrieveCount() {
- return state.get(cid);
- }
-
- public int retrieveCountCallback() {
- // TODO Auto-generated method stub
- return 0;
- }
-
-}
diff --git a/tags/java/sca/1.3.1-RC0/itest/conversations-ws/src/main/resources/Conversational/META-INF/sca-contribution.xml b/tags/java/sca/1.3.1-RC0/itest/conversations-ws/src/main/resources/Conversational/META-INF/sca-contribution.xml
deleted file mode 100644
index d5a1ff7410..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/conversations-ws/src/main/resources/Conversational/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
-
-
\ No newline at end of file
diff --git a/tags/java/sca/1.3.1-RC0/itest/conversations-ws/src/main/resources/Conversational/conversational.composite b/tags/java/sca/1.3.1-RC0/itest/conversations-ws/src/main/resources/Conversational/conversational.composite
deleted file mode 100644
index c4da99145d..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/conversations-ws/src/main/resources/Conversational/conversational.composite
+++ /dev/null
@@ -1,169 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/conversations-ws/src/main/resources/ConversationalWSDL/ConversationalServiceStateful.wsdl b/tags/java/sca/1.3.1-RC0/itest/conversations-ws/src/main/resources/ConversationalWSDL/ConversationalServiceStateful.wsdl
deleted file mode 100644
index 20a92c9dc7..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/conversations-ws/src/main/resources/ConversationalWSDL/ConversationalServiceStateful.wsdl
+++ /dev/null
@@ -1,383 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/conversations-ws/src/main/resources/ConversationalWSDL/META-INF/sca-contribution.xml b/tags/java/sca/1.3.1-RC0/itest/conversations-ws/src/main/resources/ConversationalWSDL/META-INF/sca-contribution.xml
deleted file mode 100644
index 73d078674c..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/conversations-ws/src/main/resources/ConversationalWSDL/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
-
-
\ No newline at end of file
diff --git a/tags/java/sca/1.3.1-RC0/itest/conversations-ws/src/main/resources/ConversationalWSDL/conversationalWSDL.composite b/tags/java/sca/1.3.1-RC0/itest/conversations-ws/src/main/resources/ConversationalWSDL/conversationalWSDL.composite
deleted file mode 100644
index 9c6b0a2b34..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/conversations-ws/src/main/resources/ConversationalWSDL/conversationalWSDL.composite
+++ /dev/null
@@ -1,46 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationWSDLTestCase.java b/tags/java/sca/1.3.1-RC0/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationWSDLTestCase.java
deleted file mode 100644
index d05e4712a1..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationWSDLTestCase.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * 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.
- */
-
-package org.apache.tuscany.sca.itest.conversational;
-
-
-import java.io.File;
-
-
-import org.apache.tuscany.sca.itest.conversational.impl.ConversationalClientStatelessImpl;
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode2;
-import org.apache.tuscany.sca.node.SCANode2Factory;
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-
-public class ConversationWSDLTestCase {
-
- private SCANode2 node;
- private ConversationalClient conversationalStatelessClientStatefulService;
-
- @Before
- public void setUp() throws Exception {
- SCANode2Factory nodeFactory = SCANode2Factory.newInstance();
- node = nodeFactory.createSCANode(new File("src/main/resources/ConversationalWSDL/conversationalWSDL.composite").toURL().toString(),
- new SCAContribution("TestContribution",
- new File("src/main/resources/ConversationalWSDL").toURL().toString()));
-
-
- node.start();
-
- conversationalStatelessClientStatefulService = ((SCAClient)node).getService(ConversationalClient.class, "ConversationalStatelessClientStatefulService");
-
-
- ConversationalClientStatelessImpl.calls = new StringBuffer();
- }
-
- @After
- public void tearDown() throws Exception {
- node.stop();
- conversationalStatelessClientStatefulService = null;
- }
-
- @Test
- public void testStatelessStatefulConversationFromInjectedReference() {
- int count = conversationalStatelessClientStatefulService.runConversationFromInjectedReference();
- Assert.assertEquals(2, count);
- }
-
- //@Test
- public void testKeepServerRunning() throws Exception {
- System.out.println("press enter to continue");
- System.in.read();
- }
-
-}
diff --git a/tags/java/sca/1.3.1-RC0/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallbackTestCase.java b/tags/java/sca/1.3.1-RC0/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallbackTestCase.java
deleted file mode 100644
index 7eec461476..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallbackTestCase.java
+++ /dev/null
@@ -1,198 +0,0 @@
-/*
- * 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.
- */
-
-package org.apache.tuscany.sca.itest.conversational;
-
-import java.io.File;
-
-import junit.framework.Assert;
-
-import org.apache.tuscany.sca.itest.conversational.impl.ConversationalClientStatefulImpl;
-import org.apache.tuscany.sca.itest.conversational.impl.ConversationalClientStatefulNonConversationalCallbackImpl;
-import org.apache.tuscany.sca.itest.conversational.impl.ConversationalClientStatelessImpl;
-import org.apache.tuscany.sca.itest.conversational.impl.ConversationalServiceStatefulImpl;
-import org.apache.tuscany.sca.itest.conversational.impl.ConversationalServiceStatefulNonConversationalCallbackImpl;
-import org.apache.tuscany.sca.itest.conversational.impl.ConversationalServiceStatelessImpl;
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode2;
-import org.apache.tuscany.sca.node.SCANode2Factory;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-public class NonConversationalCallbackTestCase {
-
- private static SCANode2 node;
- private static ConversationalClient conversationalStatelessClientStatelessService;
- private static ConversationalClient conversationalStatelessClientStatefulService;
- private static ConversationalClient conversationalStatefulClientStatelessService;
- private static ConversationalClient conversationalStatefulClientStatefulService;
- private static ConversationalClient conversationalStatelessClientRequestService;
- private static ConversationalClient conversationalStatefulClientNonConversationalCallbackStatelessService;
-
- @BeforeClass
- public static void setUp() throws Exception {
- try {
- SCANode2Factory nodeFactory = SCANode2Factory.newInstance();
- node = nodeFactory.createSCANode(new File("src/main/resources/Conversational/conversational.composite").toURL().toString(),
- new SCAContribution("TestContribution",
- new File("src/main/resources/Conversational").toURL().toString()));
-
-
- node.start();
-
- conversationalStatelessClientStatelessService = ((SCAClient)node).getService(ConversationalClient.class,
- "ConversationalStatelessClientStatelessService");
-
- conversationalStatelessClientStatefulService = ((SCAClient)node).getService(ConversationalClient.class,
- "ConversationalStatelessClientStatefulService");
-
- conversationalStatefulClientStatelessService = ((SCAClient)node).getService(ConversationalClient.class,
- "ConversationalStatefulClientStatelessService");
-
- conversationalStatefulClientStatefulService = ((SCAClient)node).getService(ConversationalClient.class,
- "ConversationalStatefulClientStatefulService");
- conversationalStatelessClientRequestService = ((SCAClient)node).getService(ConversationalClient.class,
- "ConversationalStatelessClientRequestService");
- conversationalStatefulClientNonConversationalCallbackStatelessService = ((SCAClient)node).getService(ConversationalClient.class,
- "ConversationalStatefulClientNonConversationalCallbackStatefulService");
-
- // reset the place where we record the sequence of calls passing
- // through each component instance
- ConversationalServiceStatelessImpl.calls = new StringBuffer();
- ConversationalServiceStatefulImpl.calls = new StringBuffer();
- ConversationalClientStatelessImpl.calls = new StringBuffer();
- ConversationalClientStatefulImpl.calls = new StringBuffer();
-
- } catch(Exception ex) {
- System.err.println(ex.toString());
- }
-
- }
-
- @AfterClass
- public static void tearDown() throws Exception {
- node.stop();
- conversationalStatelessClientStatelessService = null;
- conversationalStatelessClientStatefulService = null;
- conversationalStatefulClientStatelessService = null;
- conversationalStatefulClientStatefulService = null;
- conversationalStatelessClientRequestService = null;
- conversationalStatefulClientNonConversationalCallbackStatelessService = null;
- }
-
- private static void resetCallStack() {
-
- // reset the place where we record the sequence of calls passing
- // through each component instance
- ConversationalServiceStatelessImpl.calls = new StringBuffer();
- ConversationalServiceStatefulImpl.calls = new StringBuffer();
- ConversationalClientStatelessImpl.calls = new StringBuffer();
- ConversationalClientStatefulImpl.calls = new StringBuffer();
- ConversationalClientStatefulNonConversationalCallbackImpl.calls = new StringBuffer();
-
- }
-
- // stateful client non conversational callback stateful service tests
- // ==================================================================
-
- @Test
- public void testStatefulNonConversationalCallbackStatefulConversationFromInjectedReference() {
- int count = conversationalStatefulClientNonConversationalCallbackStatelessService.runConversationFromInjectedReference();
- Assert.assertEquals(2, count);
- }
-
- @Test
- public void testStatefulNonConversationalCallbackStatefulConversationFromInjectedReference2() {
- int count = conversationalStatefulClientNonConversationalCallbackStatelessService.runConversationFromInjectedReference2();
- Assert.assertEquals(2, count);
- }
-
- @Test
- public void testStatefulNonConversationalCallbackStatefulConversationFromServiceReference() {
- int count = conversationalStatefulClientNonConversationalCallbackStatelessService.runConversationFromServiceReference();
- Assert.assertEquals(2, count);
- }
-
- @Test
- public void testStatefulNonConversationalCallbackStatefulConversationWithUserDefinedConversationId() {
- int count = conversationalStatefulClientNonConversationalCallbackStatelessService.runConversationWithUserDefinedConversationId();
- Assert.assertEquals(2, count);
- }
-
- @Test
- public void testStatefulNonConversationalCallbackStatefulConversationCheckUserDefinedConversationId() {
- String conversationId = conversationalStatefulClientNonConversationalCallbackStatelessService.runConversationCheckUserDefinedConversationId();
- Assert.assertEquals("MyConversation2", conversationId);
- }
-
- @Test
- public void testStatefulNonConversationalCallbackStatefulConversationCheckingScope() {
- resetCallStack();
- ConversationalServiceStatefulNonConversationalCallbackImpl.calls = new StringBuffer();
- conversationalStatefulClientNonConversationalCallbackStatelessService.runConversationCheckingScope();
- Assert.assertEquals("init,initializeCount,incrementCount,retrieveCount,endConversation,destroy,",
- ConversationalServiceStatefulNonConversationalCallbackImpl.calls.toString());
- }
-
- //@Test
- public void testStatefulNonConversationalCallbackStatefulConversationWithCallback() {
- resetCallStack();
- ConversationalClientStatefulNonConversationalCallbackImpl.calls = new StringBuffer();
- int count = conversationalStatefulClientNonConversationalCallbackStatelessService.runConversationWithCallback();
- Assert.assertEquals(0, count);
-
- Assert.assertEquals("init,runConversationWithCallback,init,initializeCount,destroy,init,incrementCount,destroy,init,retrieveCount,destroy,init,endConversation,destroy,",
- ConversationalClientStatefulNonConversationalCallbackImpl.calls.toString());
- }
-
- //@Test
- public void testStatefulNonConversationalCallbackStatefulConversationHavingPassedReference() {
- int count = conversationalStatefulClientNonConversationalCallbackStatelessService.runConversationHavingPassedReference();
- Assert.assertEquals(0, count);
- }
-
- @Test
- public void testStatefulNonConversationalCallbackStatefulConversationCallingEndedConversation() {
- int count = conversationalStatefulClientNonConversationalCallbackStatelessService.runConversationCallingEndedConversation();
- Assert.assertEquals(0, count);
- }
-
- //@Test
- public void testStatefulNonConversationalCallbackStatefulConversationCallingEndedConversationCallback() {
- int count = conversationalStatefulClientNonConversationalCallbackStatelessService.runConversationCallingEndedConversationCallback();
- Assert.assertEquals(0, count);
- }
-
- @Test
- public void testStatefulNonConversationalCallbackStatefulConversationCallingEndedConversationCheckConversationId() {
- String id = conversationalStatefulClientNonConversationalCallbackStatelessService.runConversationCallingEndedConversationCheckConversationId();
- Assert.assertEquals(null, id);
- }
-
- //@Test
- public void testStatefulNonConversationalCallbackStatefulConversationCallingEndedConversationCallbackCheckConversationId() {
- String id = conversationalStatefulClientNonConversationalCallbackStatelessService.runConversationCallingEndedConversationCallbackCheckConversationId();
- Assert.assertEquals("MyConversation3", id);
- }
-
-
-
-}
diff --git a/tags/java/sca/1.3.1-RC0/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/RequestScopeTestCase.java b/tags/java/sca/1.3.1-RC0/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/RequestScopeTestCase.java
deleted file mode 100644
index 39ab4319f7..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/RequestScopeTestCase.java
+++ /dev/null
@@ -1,209 +0,0 @@
-/*
- * 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.
- */
-
-package org.apache.tuscany.sca.itest.conversational;
-
-import java.io.File;
-
-
-import junit.framework.Assert;
-
-import org.apache.tuscany.sca.itest.conversational.impl.ConversationalClientStatefulImpl;
-import org.apache.tuscany.sca.itest.conversational.impl.ConversationalClientStatefulNonConversationalCallbackImpl;
-import org.apache.tuscany.sca.itest.conversational.impl.ConversationalClientStatelessImpl;
-import org.apache.tuscany.sca.itest.conversational.impl.ConversationalServiceRequestImpl;
-import org.apache.tuscany.sca.itest.conversational.impl.ConversationalServiceStatefulImpl;
-import org.apache.tuscany.sca.itest.conversational.impl.ConversationalServiceStatelessImpl;
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode2;
-import org.apache.tuscany.sca.node.SCANode2Factory;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-public class RequestScopeTestCase {
-
- private static SCANode2 node;
- private static ConversationalClient conversationalStatelessClientStatelessService;
- private static ConversationalClient conversationalStatelessClientStatefulService;
- private static ConversationalClient conversationalStatefulClientStatelessService;
- private static ConversationalClient conversationalStatefulClientStatefulService;
- private static ConversationalClient conversationalStatelessClientRequestService;
- private static ConversationalClient conversationalStatefulClientNonConversationalCallbackStatelessService;
-
- @BeforeClass
- public static void setUp() throws Exception {
- try {
- SCANode2Factory nodeFactory = SCANode2Factory.newInstance();
- node = nodeFactory.createSCANode(new File("src/main/resources/Conversational/conversational.composite").toURL().toString(),
- new SCAContribution("TestContribution",
- new File("src/main/resources/Conversational").toURL().toString()));
-
-
- node.start();
-
- conversationalStatelessClientStatelessService = ((SCAClient)node).getService(ConversationalClient.class,
- "ConversationalStatelessClientStatelessService");
-
- conversationalStatelessClientStatefulService = ((SCAClient)node).getService(ConversationalClient.class,
- "ConversationalStatelessClientStatefulService");
-
- conversationalStatefulClientStatelessService = ((SCAClient)node).getService(ConversationalClient.class,
- "ConversationalStatefulClientStatelessService");
-
- conversationalStatefulClientStatefulService = ((SCAClient)node).getService(ConversationalClient.class,
- "ConversationalStatefulClientStatefulService");
- conversationalStatelessClientRequestService = ((SCAClient)node).getService(ConversationalClient.class,
- "ConversationalStatelessClientRequestService");
- conversationalStatefulClientNonConversationalCallbackStatelessService = ((SCAClient)node).getService(ConversationalClient.class,
- "ConversationalStatefulClientNonConversationalCallbackStatefulService");
-
- // reset the place where we record the sequence of calls passing
- // through each component instance
- ConversationalServiceStatelessImpl.calls = new StringBuffer();
- ConversationalServiceStatefulImpl.calls = new StringBuffer();
- ConversationalClientStatelessImpl.calls = new StringBuffer();
- ConversationalClientStatefulImpl.calls = new StringBuffer();
-
- } catch(Exception ex) {
- System.err.println(ex.toString());
- }
-
- }
-
- @AfterClass
- public static void tearDown() throws Exception {
- node.stop();
- conversationalStatelessClientStatelessService = null;
- conversationalStatelessClientStatefulService = null;
- conversationalStatefulClientStatelessService = null;
- conversationalStatefulClientStatefulService = null;
- conversationalStatelessClientRequestService = null;
- conversationalStatefulClientNonConversationalCallbackStatelessService = null;
- }
-
- private static void resetCallStack() {
-
- // reset the place where we record the sequence of calls passing
- // through each component instance
- ConversationalServiceStatelessImpl.calls = new StringBuffer();
- ConversationalServiceStatefulImpl.calls = new StringBuffer();
- ConversationalClientStatelessImpl.calls = new StringBuffer();
- ConversationalClientStatefulImpl.calls = new StringBuffer();
- ConversationalClientStatefulNonConversationalCallbackImpl.calls = new StringBuffer();
-
- }
-
- // stateless client request scope service tests
- // ============================================
- @Test
- public void testStatelessRequestConversationFromInjectedReference() {
- int count = conversationalStatelessClientRequestService.runConversationFromInjectedReference();
- Assert.assertEquals(2, count);
- }
-
- //@Test
- public void testStatelessRequestConversationFromInjectedReference2() {
- int count = conversationalStatelessClientRequestService.runConversationFromInjectedReference2();
- Assert.assertEquals(1, count);
- }
-
- @Test
- public void testStatelessRequestConversationFromServiceReference() {
- int count = conversationalStatelessClientRequestService.runConversationFromServiceReference();
- Assert.assertEquals(2, count);
- }
-
- @Test
- public void testStatelessRequestConversationWithUserDefinedConversationId() {
- int count = conversationalStatelessClientRequestService.runConversationWithUserDefinedConversationId();
- Assert.assertEquals(2, count);
- }
-
- //@Test
- public void testStatelessRequestConversationCheckUserDefinedConversationId() {
- String conversationId = conversationalStatelessClientRequestService.runConversationCheckUserDefinedConversationId();
- Assert.assertEquals("MyConversation2", conversationId);
- }
-
- //@Test
- public void testStatelessRequestConversationCheckingScope() {
- resetCallStack();
- ConversationalServiceRequestImpl.calls = new StringBuffer();
- conversationalStatelessClientRequestService.runConversationCheckingScope();
- Assert.assertEquals("init,initializeCount,incrementCount,retrieveCount,endConversation,",
- ConversationalServiceRequestImpl.calls.toString());
- //init,initializeCount,init,incrementCount,init,retrieveCount,init,endConversation,
- }
-
- @Test
- public void testStatelessRequestConversationWithCallback() {
- resetCallStack();
- ConversationalClientStatelessImpl.calls = new StringBuffer();
- int count = conversationalStatelessClientRequestService.runConversationWithCallback();
- Assert.assertEquals(0, count);
-
- Assert.assertEquals("init,runConversationWithCallback,init,initializeCount,destroy,init,incrementCount,destroy,init,retrieveCount,destroy,init,endConversation,destroy,destroy,",
- ConversationalClientStatelessImpl.calls.toString());
- }
-
- //@Test
- public void testStatelessRequestConversationHavingPassedReference() {
- int count = conversationalStatelessClientRequestService.runConversationHavingPassedReference();
- Assert.assertEquals(3, count);
- }
-
- //@Test
- public void testStatelessRequestConversationBusinessException() {
- String message = conversationalStatelessClientRequestService.runConversationBusinessException();
- Assert.assertEquals("Business Exception", message);
- }
-
- //@Test
- public void testStatelessRequestConversationBusinessExceptionCallback() {
- String message = conversationalStatelessClientRequestService.runConversationBusinessExceptionCallback();
- Assert.assertEquals("Business Exception", message);
- }
-
- @Test
- public void testStatelessRequestConversationCallingEndedConversation() {
- int count = conversationalStatelessClientRequestService.runConversationCallingEndedConversation();
- Assert.assertEquals(-999, count);
- }
-
- @Test
- public void testStatelessRequestConversationCallingEndedConversationCallback() {
- int count = conversationalStatelessClientRequestService.runConversationCallingEndedConversationCallback();
- Assert.assertEquals(0, count);
- }
-
- @Test
- public void testStatelessRequestConversationCallingEndedConversationCheckConversationId() {
- String id = conversationalStatelessClientRequestService.runConversationCallingEndedConversationCheckConversationId();
- Assert.assertEquals(null, id);
- }
-
- //@Test
- public void testStatelessRequestConversationCallingEndedConversationCallbackCheckConversationId() {
- String id = conversationalStatelessClientRequestService.runConversationCallingEndedConversationCallbackCheckConversationId();
- Assert.assertEquals(null, id);
- }
-
-}
diff --git a/tags/java/sca/1.3.1-RC0/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatefulStatefulTestCase.java b/tags/java/sca/1.3.1-RC0/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatefulStatefulTestCase.java
deleted file mode 100644
index 28df937283..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatefulStatefulTestCase.java
+++ /dev/null
@@ -1,193 +0,0 @@
-/*
- * 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.
- */
-
-package org.apache.tuscany.sca.itest.conversational;
-
-import java.io.File;
-
-
-import junit.framework.Assert;
-
-import org.apache.tuscany.sca.itest.conversational.impl.ConversationalClientStatefulImpl;
-import org.apache.tuscany.sca.itest.conversational.impl.ConversationalClientStatefulNonConversationalCallbackImpl;
-import org.apache.tuscany.sca.itest.conversational.impl.ConversationalClientStatelessImpl;
-import org.apache.tuscany.sca.itest.conversational.impl.ConversationalServiceStatefulImpl;
-import org.apache.tuscany.sca.itest.conversational.impl.ConversationalServiceStatelessImpl;
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode2;
-import org.apache.tuscany.sca.node.SCANode2Factory;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-public class StatefulStatefulTestCase {
-
- private static SCANode2 node;
- private static ConversationalClient conversationalStatelessClientStatelessService;
- private static ConversationalClient conversationalStatelessClientStatefulService;
- private static ConversationalClient conversationalStatefulClientStatelessService;
- private static ConversationalClient conversationalStatefulClientStatefulService;
- private static ConversationalClient conversationalStatelessClientRequestService;
- private static ConversationalClient conversationalStatefulClientNonConversationalCallbackStatelessService;
-
- @BeforeClass
- public static void setUp() throws Exception {
- try {
- SCANode2Factory nodeFactory = SCANode2Factory.newInstance();
- node = nodeFactory.createSCANode(new File("src/main/resources/Conversational/conversational.composite").toURL().toString(),
- new SCAContribution("TestContribution",
- new File("src/main/resources/Conversational").toURL().toString()));
-
-
- node.start();
-
- conversationalStatelessClientStatelessService = ((SCAClient)node).getService(ConversationalClient.class,
- "ConversationalStatelessClientStatelessService");
-
- conversationalStatelessClientStatefulService = ((SCAClient)node).getService(ConversationalClient.class,
- "ConversationalStatelessClientStatefulService");
-
- conversationalStatefulClientStatelessService = ((SCAClient)node).getService(ConversationalClient.class,
- "ConversationalStatefulClientStatelessService");
-
- conversationalStatefulClientStatefulService = ((SCAClient)node).getService(ConversationalClient.class,
- "ConversationalStatefulClientStatefulService");
- conversationalStatelessClientRequestService = ((SCAClient)node).getService(ConversationalClient.class,
- "ConversationalStatelessClientRequestService");
- conversationalStatefulClientNonConversationalCallbackStatelessService = ((SCAClient)node).getService(ConversationalClient.class,
- "ConversationalStatefulClientNonConversationalCallbackStatefulService");
-
- // reset the place where we record the sequence of calls passing
- // through each component instance
- ConversationalServiceStatelessImpl.calls = new StringBuffer();
- ConversationalServiceStatefulImpl.calls = new StringBuffer();
- ConversationalClientStatelessImpl.calls = new StringBuffer();
- ConversationalClientStatefulImpl.calls = new StringBuffer();
-
- } catch(Exception ex) {
- System.err.println(ex.toString());
- }
-
- }
-
- @AfterClass
- public static void tearDown() throws Exception {
- node.stop();
- conversationalStatelessClientStatelessService = null;
- conversationalStatelessClientStatefulService = null;
- conversationalStatefulClientStatelessService = null;
- conversationalStatefulClientStatefulService = null;
- conversationalStatelessClientRequestService = null;
- conversationalStatefulClientNonConversationalCallbackStatelessService = null;
- }
-
- private static void resetCallStack() {
-
- // reset the place where we record the sequence of calls passing
- // through each component instance
- ConversationalServiceStatelessImpl.calls = new StringBuffer();
- ConversationalServiceStatefulImpl.calls = new StringBuffer();
- ConversationalClientStatelessImpl.calls = new StringBuffer();
- ConversationalClientStatefulImpl.calls = new StringBuffer();
- ConversationalClientStatefulNonConversationalCallbackImpl.calls = new StringBuffer();
-
- }
-
- // stateful client stateful service tests
- // ======================================
- @Test
- public void testStatefulStatefulConversationFromInjectedReference() {
- int count = conversationalStatefulClientStatefulService.runConversationFromInjectedReference();
- Assert.assertEquals(2, count);
- }
-
- @Test
- public void testStatefulStatefulConversationFromInjectedReference2() {
- int count = conversationalStatefulClientStatefulService.runConversationFromInjectedReference2();
- Assert.assertEquals(2, count);
- }
-
- @Test
- public void testStatefulStatefulConversationFromServiceReference() {
- int count = conversationalStatefulClientStatefulService.runConversationFromServiceReference();
- Assert.assertEquals(2, count);
- }
-
- @Test
- public void testStatefulStatefulConversationWithUserDefinedConversationId() {
- int count = conversationalStatefulClientStatefulService.runConversationWithUserDefinedConversationId();
- Assert.assertEquals(2, count);
- }
-
- @Test
- public void testStatefulStatefulConversationCheckUserDefinedConversationId() {
- String conversationId = conversationalStatefulClientStatefulService.runConversationCheckUserDefinedConversationId();
- Assert.assertEquals("MyConversation2", conversationId);
- }
-
- @Test
- public void testStatefulStatefulConversationCheckingScope() {
- resetCallStack();
- conversationalStatefulClientStatefulService.runConversationCheckingScope();
- Assert.assertEquals("init,initializeCount,incrementCount,retrieveCount,endConversation,destroy,",
- ConversationalServiceStatefulImpl.calls.toString());
- }
-
- @Test
- public void testStatefulStatefulConversationWithCallback() {
- resetCallStack();
- int count = conversationalStatefulClientStatefulService.runConversationWithCallback();
- Assert.assertEquals(4, count);
-
- Assert.assertEquals("init,runConversationWithCallback,initializeCount,incrementCount,retrieveCount,endConversation,destroy,",
- ConversationalClientStatefulImpl.calls.toString());
- }
-
- //@Test
- public void testStatefulStatefulConversationHavingPassedReference() {
- int count = conversationalStatefulClientStatefulService.runConversationHavingPassedReference();
- Assert.assertEquals(3, count);
- }
-
- @Test
- public void testStatefulStatefulConversationCallingEndedConversation() {
- int count = conversationalStatefulClientStatefulService.runConversationCallingEndedConversation();
- Assert.assertEquals(0, count);
- }
-
- @Test
- public void testStatefulStatefulConversationCallingEndedConversationCallback() {
- int count = conversationalStatefulClientStatefulService.runConversationCallingEndedConversationCallback();
- Assert.assertEquals(0, count);
- }
-
- @Test
- public void testStatefulStatefulConversationCallingEndedConversationCheckConversationId() {
- String id = conversationalStatefulClientStatefulService.runConversationCallingEndedConversationCheckConversationId();
- Assert.assertEquals(null, id);
- }
-
- @Test
- public void testStatefulStatefulConversationCallingEndedConversationCallbackCheckConversationId() {
- String id = conversationalStatefulClientStatefulService.runConversationCallingEndedConversationCallbackCheckConversationId();
- Assert.assertEquals(null, id);
- }
-
-}
diff --git a/tags/java/sca/1.3.1-RC0/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatefulStatelessTestCase.java b/tags/java/sca/1.3.1-RC0/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatefulStatelessTestCase.java
deleted file mode 100644
index 02295b0ca6..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatefulStatelessTestCase.java
+++ /dev/null
@@ -1,193 +0,0 @@
-/*
- * 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.
- */
-
-package org.apache.tuscany.sca.itest.conversational;
-
-import java.io.File;
-
-
-import junit.framework.Assert;
-
-import org.apache.tuscany.sca.itest.conversational.impl.ConversationalClientStatefulImpl;
-import org.apache.tuscany.sca.itest.conversational.impl.ConversationalClientStatefulNonConversationalCallbackImpl;
-import org.apache.tuscany.sca.itest.conversational.impl.ConversationalClientStatelessImpl;
-import org.apache.tuscany.sca.itest.conversational.impl.ConversationalServiceStatefulImpl;
-import org.apache.tuscany.sca.itest.conversational.impl.ConversationalServiceStatelessImpl;
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode2;
-import org.apache.tuscany.sca.node.SCANode2Factory;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-public class StatefulStatelessTestCase {
-
- private static SCANode2 node;
- private static ConversationalClient conversationalStatelessClientStatelessService;
- private static ConversationalClient conversationalStatelessClientStatefulService;
- private static ConversationalClient conversationalStatefulClientStatelessService;
- private static ConversationalClient conversationalStatefulClientStatefulService;
- private static ConversationalClient conversationalStatelessClientRequestService;
- private static ConversationalClient conversationalStatefulClientNonConversationalCallbackStatelessService;
-
- @BeforeClass
- public static void setUp() throws Exception {
- try {
- SCANode2Factory nodeFactory = SCANode2Factory.newInstance();
- node = nodeFactory.createSCANode(new File("src/main/resources/Conversational/conversational.composite").toURL().toString(),
- new SCAContribution("TestContribution",
- new File("src/main/resources/Conversational").toURL().toString()));
-
-
- node.start();
-
- conversationalStatelessClientStatelessService = ((SCAClient)node).getService(ConversationalClient.class,
- "ConversationalStatelessClientStatelessService");
-
- conversationalStatelessClientStatefulService = ((SCAClient)node).getService(ConversationalClient.class,
- "ConversationalStatelessClientStatefulService");
-
- conversationalStatefulClientStatelessService = ((SCAClient)node).getService(ConversationalClient.class,
- "ConversationalStatefulClientStatelessService");
-
- conversationalStatefulClientStatefulService = ((SCAClient)node).getService(ConversationalClient.class,
- "ConversationalStatefulClientStatefulService");
- conversationalStatelessClientRequestService = ((SCAClient)node).getService(ConversationalClient.class,
- "ConversationalStatelessClientRequestService");
- conversationalStatefulClientNonConversationalCallbackStatelessService = ((SCAClient)node).getService(ConversationalClient.class,
- "ConversationalStatefulClientNonConversationalCallbackStatefulService");
-
- // reset the place where we record the sequence of calls passing
- // through each component instance
- ConversationalServiceStatelessImpl.calls = new StringBuffer();
- ConversationalServiceStatefulImpl.calls = new StringBuffer();
- ConversationalClientStatelessImpl.calls = new StringBuffer();
- ConversationalClientStatefulImpl.calls = new StringBuffer();
-
- } catch(Exception ex) {
- System.err.println(ex.toString());
- }
-
- }
-
- @AfterClass
- public static void tearDown() throws Exception {
- node.stop();
- conversationalStatelessClientStatelessService = null;
- conversationalStatelessClientStatefulService = null;
- conversationalStatefulClientStatelessService = null;
- conversationalStatefulClientStatefulService = null;
- conversationalStatelessClientRequestService = null;
- conversationalStatefulClientNonConversationalCallbackStatelessService = null;
- }
-
- private static void resetCallStack() {
-
- // reset the place where we record the sequence of calls passing
- // through each component instance
- ConversationalServiceStatelessImpl.calls = new StringBuffer();
- ConversationalServiceStatefulImpl.calls = new StringBuffer();
- ConversationalClientStatelessImpl.calls = new StringBuffer();
- ConversationalClientStatefulImpl.calls = new StringBuffer();
- ConversationalClientStatefulNonConversationalCallbackImpl.calls = new StringBuffer();
-
- }
-
- // stateful client stateless service tests
- // =======================================
- @Test
- public void testStatefulStatelessConversationFromInjectedReference() {
- int count = conversationalStatefulClientStatelessService.runConversationFromInjectedReference();
- Assert.assertEquals(2, count);
- }
-
- @Test
- public void testStatefulStatelessConversationFromInjectedReference2() {
- int count = conversationalStatefulClientStatelessService.runConversationFromInjectedReference2();
- Assert.assertEquals(2, count);
- }
-
- @Test
- public void testStatefulStatelessConversationFromServiceReference() {
- int count = conversationalStatefulClientStatelessService.runConversationFromServiceReference();
- Assert.assertEquals(2, count);
- }
-
- @Test
- public void testStatefulStatelessConversationWithUserDefinedConversationId() {
- int count = conversationalStatefulClientStatelessService.runConversationWithUserDefinedConversationId();
- Assert.assertEquals(2, count);
- }
-
- @Test
- public void testStatefulStatelessConversationCheckUserDefinedConversationId() {
- String conversationId = conversationalStatefulClientStatelessService.runConversationCheckUserDefinedConversationId();
- Assert.assertEquals("MyConversation2", conversationId);
- }
-
- @Test
- public void testStatefulStatelessConversationCheckingScope() {
- resetCallStack();
- conversationalStatefulClientStatelessService.runConversationCheckingScope();
- Assert.assertEquals("init,initializeCount,destroy,init,incrementCount,destroy,init,retrieveCount,destroy,init,endConversation,destroy,",
- ConversationalServiceStatelessImpl.calls.toString());
- }
-
- @Test
- public void testStatefulStatelessConversationWithCallback() {
- resetCallStack();
- int count = conversationalStatefulClientStatelessService.runConversationWithCallback();
- Assert.assertEquals(4, count);
-
- Assert.assertEquals("init,runConversationWithCallback,initializeCount,incrementCount,retrieveCount,endConversation,destroy,",
- ConversationalClientStatefulImpl.calls.toString());
- }
-
- //@Test
- public void testStatefulStatelessConversationHavingPassedReference() {
- int count = conversationalStatefulClientStatelessService.runConversationHavingPassedReference();
- Assert.assertEquals(3, count);
- }
-
- @Test
- public void testStatefulStatelessConversationCallingEndedConversation() {
- int count = conversationalStatefulClientStatelessService.runConversationCallingEndedConversation();
- Assert.assertEquals(-999, count);
- }
-
- @Test
- public void testStatefulStatelessConversationCallingEndedConversationCallback() {
- int count = conversationalStatefulClientStatelessService.runConversationCallingEndedConversationCallback();
- Assert.assertEquals(0, count);
- }
-
- @Test
- public void testStatefulStatelessConversationCallingEndedConversationCheckConversationId() {
- String id = conversationalStatefulClientStatelessService.runConversationCallingEndedConversationCheckConversationId();
- Assert.assertEquals(null, id);
- }
-
- @Test
- public void testStatefulStatelessConversationCallingEndedConversationCallbackCheckConversationId() {
- String id = conversationalStatefulClientStatelessService.runConversationCallingEndedConversationCallbackCheckConversationId();
- Assert.assertEquals(null, id);
- }
-
-}
diff --git a/tags/java/sca/1.3.1-RC0/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatelessStatefulTestCase.java b/tags/java/sca/1.3.1-RC0/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatelessStatefulTestCase.java
deleted file mode 100644
index fce6ee0d50..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatelessStatefulTestCase.java
+++ /dev/null
@@ -1,205 +0,0 @@
-/*
- * 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.
- */
-
-package org.apache.tuscany.sca.itest.conversational;
-
-import java.io.File;
-
-import junit.framework.Assert;
-
-import org.apache.tuscany.sca.itest.conversational.impl.ConversationalClientStatefulImpl;
-import org.apache.tuscany.sca.itest.conversational.impl.ConversationalClientStatefulNonConversationalCallbackImpl;
-import org.apache.tuscany.sca.itest.conversational.impl.ConversationalClientStatelessImpl;
-import org.apache.tuscany.sca.itest.conversational.impl.ConversationalServiceStatefulImpl;
-import org.apache.tuscany.sca.itest.conversational.impl.ConversationalServiceStatelessImpl;
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode2;
-import org.apache.tuscany.sca.node.SCANode2Factory;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-public class StatelessStatefulTestCase {
-
- private static SCANode2 node;
- private static ConversationalClient conversationalStatelessClientStatelessService;
- private static ConversationalClient conversationalStatelessClientStatefulService;
- private static ConversationalClient conversationalStatefulClientStatelessService;
- private static ConversationalClient conversationalStatefulClientStatefulService;
- private static ConversationalClient conversationalStatelessClientRequestService;
- private static ConversationalClient conversationalStatefulClientNonConversationalCallbackStatelessService;
-
- @BeforeClass
- public static void setUp() throws Exception {
- try {
- SCANode2Factory nodeFactory = SCANode2Factory.newInstance();
- node = nodeFactory.createSCANode(new File("src/main/resources/Conversational/conversational.composite").toURL().toString(),
- new SCAContribution("TestContribution",
- new File("src/main/resources/Conversational").toURL().toString()));
-
-
- node.start();
-
- conversationalStatelessClientStatelessService = ((SCAClient)node).getService(ConversationalClient.class,
- "ConversationalStatelessClientStatelessService");
-
- conversationalStatelessClientStatefulService = ((SCAClient)node).getService(ConversationalClient.class,
- "ConversationalStatelessClientStatefulService");
-
- conversationalStatefulClientStatelessService = ((SCAClient)node).getService(ConversationalClient.class,
- "ConversationalStatefulClientStatelessService");
-
- conversationalStatefulClientStatefulService = ((SCAClient)node).getService(ConversationalClient.class,
- "ConversationalStatefulClientStatefulService");
- conversationalStatelessClientRequestService = ((SCAClient)node).getService(ConversationalClient.class,
- "ConversationalStatelessClientRequestService");
- conversationalStatefulClientNonConversationalCallbackStatelessService = ((SCAClient)node).getService(ConversationalClient.class,
- "ConversationalStatefulClientNonConversationalCallbackStatefulService");
-
- // reset the place where we record the sequence of calls passing
- // through each component instance
- ConversationalServiceStatelessImpl.calls = new StringBuffer();
- ConversationalServiceStatefulImpl.calls = new StringBuffer();
- ConversationalClientStatelessImpl.calls = new StringBuffer();
- ConversationalClientStatefulImpl.calls = new StringBuffer();
-
- } catch(Exception ex) {
- System.err.println(ex.toString());
- }
-
- }
-
- @AfterClass
- public static void tearDown() throws Exception {
- node.stop();
- conversationalStatelessClientStatelessService = null;
- conversationalStatelessClientStatefulService = null;
- conversationalStatefulClientStatelessService = null;
- conversationalStatefulClientStatefulService = null;
- conversationalStatelessClientRequestService = null;
- conversationalStatefulClientNonConversationalCallbackStatelessService = null;
- }
-
- private static void resetCallStack() {
-
- // reset the place where we record the sequence of calls passing
- // through each component instance
- ConversationalServiceStatelessImpl.calls = new StringBuffer();
- ConversationalServiceStatefulImpl.calls = new StringBuffer();
- ConversationalClientStatelessImpl.calls = new StringBuffer();
- ConversationalClientStatefulImpl.calls = new StringBuffer();
- ConversationalClientStatefulNonConversationalCallbackImpl.calls = new StringBuffer();
-
- }
-
- // stateless client stateful service tests
- // =======================================
- @Test
- public void testStatelessStatefulConversationFromInjectedReference() {
- int count = conversationalStatelessClientStatefulService.runConversationFromInjectedReference();
- Assert.assertEquals(2, count);
- }
-
- @Test
- public void testStatelessStatefulConversationFromInjectedReference2() {
- int count = conversationalStatelessClientStatefulService.runConversationFromInjectedReference2();
- Assert.assertEquals(2, count);
- }
-
- @Test
- public void testStatelessStatefulConversationFromServiceReference() {
- int count = conversationalStatelessClientStatefulService.runConversationFromServiceReference();
- Assert.assertEquals(2, count);
- }
-
- @Test
- public void testStatelessStatefulConversationWithUserDefinedConversationId() {
- int count = conversationalStatelessClientStatefulService.runConversationWithUserDefinedConversationId();
- Assert.assertEquals(2, count);
- }
-
- @Test
- public void testStatelessStatefulConversationCheckUserDefinedConversationId() {
- String conversationId = conversationalStatelessClientStatefulService.runConversationCheckUserDefinedConversationId();
- Assert.assertEquals("MyConversation2", conversationId);
- }
-
- @Test
- public void testStatelessStatefulConversationCheckingScope() {
- resetCallStack();
- conversationalStatelessClientStatefulService.runConversationCheckingScope();
- Assert.assertEquals("init,initializeCount,incrementCount,retrieveCount,endConversation,destroy,",
- ConversationalServiceStatefulImpl.calls.toString());
- }
-
- @Test
- public void testStatelessStatefulConversationWithCallback() {
- resetCallStack();
- int count = conversationalStatelessClientStatefulService.runConversationWithCallback();
- Assert.assertEquals(0, count);
-
- Assert.assertEquals("init,runConversationWithCallback,init,initializeCount,destroy,init,incrementCount,destroy,init,retrieveCount,destroy,init,endConversation,destroy,destroy,",
- ConversationalClientStatelessImpl.calls.toString());
- }
-
- //@Test
- public void testStatelessStatefulConversationHavingPassedReference() {
- int count = conversationalStatelessClientStatefulService.runConversationHavingPassedReference();
- Assert.assertEquals(3, count);
- }
-
- //@Test
- public void testStatelessStatefulConversationBusinessException() {
- String message = conversationalStatelessClientStatefulService.runConversationBusinessException();
- Assert.assertEquals("Business Exception", message);
- }
-
- //@Test
- public void testStatelessStatefulConversationBusinessExceptionCallback() {
- String message = conversationalStatelessClientStatefulService.runConversationBusinessExceptionCallback();
- Assert.assertEquals("Business Exception", message);
- }
-
- @Test
- public void testStatelessStatefulConversationCallingEndedConversation() {
- int count = conversationalStatelessClientStatefulService.runConversationCallingEndedConversation();
- Assert.assertEquals(0, count);
- }
-
- @Test
- public void testStatelessStatefulConversationCallingEndedConversationCallback() {
- int count = conversationalStatelessClientStatefulService.runConversationCallingEndedConversationCallback();
- Assert.assertEquals(0, count);
- }
-
- @Test
- public void testStatelessStatefulConversationCallingEndedConversationCheckConversationId() {
- String id = conversationalStatelessClientStatefulService.runConversationCallingEndedConversationCheckConversationId();
- Assert.assertEquals(null, id);
- }
-
- //@Test
- public void testStatelessStatefulConversationCallingEndedConversationCallbackCheckConversationId() {
- String id = conversationalStatelessClientStatefulService.runConversationCallingEndedConversationCallbackCheckConversationId();
- Assert.assertEquals(null, id);
- }
-
-
-}
diff --git a/tags/java/sca/1.3.1-RC0/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatelessStatelessTestCase.java b/tags/java/sca/1.3.1-RC0/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatelessStatelessTestCase.java
deleted file mode 100644
index 6df7767823..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/conversations-ws/src/test/java/org/apache/tuscany/sca/itest/conversational/StatelessStatelessTestCase.java
+++ /dev/null
@@ -1,192 +0,0 @@
-/*
- * 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.
- */
-
-package org.apache.tuscany.sca.itest.conversational;
-
-import java.io.File;
-
-import junit.framework.Assert;
-
-import org.apache.tuscany.sca.itest.conversational.impl.ConversationalClientStatefulImpl;
-import org.apache.tuscany.sca.itest.conversational.impl.ConversationalClientStatefulNonConversationalCallbackImpl;
-import org.apache.tuscany.sca.itest.conversational.impl.ConversationalClientStatelessImpl;
-import org.apache.tuscany.sca.itest.conversational.impl.ConversationalServiceStatefulImpl;
-import org.apache.tuscany.sca.itest.conversational.impl.ConversationalServiceStatelessImpl;
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCAContribution;
-import org.apache.tuscany.sca.node.SCANode2;
-import org.apache.tuscany.sca.node.SCANode2Factory;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-public class StatelessStatelessTestCase {
-
- private static SCANode2 node;
- private static ConversationalClient conversationalStatelessClientStatelessService;
- private static ConversationalClient conversationalStatelessClientStatefulService;
- private static ConversationalClient conversationalStatefulClientStatelessService;
- private static ConversationalClient conversationalStatefulClientStatefulService;
- private static ConversationalClient conversationalStatelessClientRequestService;
- private static ConversationalClient conversationalStatefulClientNonConversationalCallbackStatelessService;
-
- @BeforeClass
- public static void setUp() throws Exception {
- try {
- SCANode2Factory nodeFactory = SCANode2Factory.newInstance();
- node = nodeFactory.createSCANode(new File("src/main/resources/Conversational/conversational.composite").toURL().toString(),
- new SCAContribution("TestContribution",
- new File("src/main/resources/Conversational").toURL().toString()));
-
-
- node.start();
-
- conversationalStatelessClientStatelessService = ((SCAClient)node).getService(ConversationalClient.class,
- "ConversationalStatelessClientStatelessService");
-
- conversationalStatelessClientStatefulService = ((SCAClient)node).getService(ConversationalClient.class,
- "ConversationalStatelessClientStatefulService");
-
- conversationalStatefulClientStatelessService = ((SCAClient)node).getService(ConversationalClient.class,
- "ConversationalStatefulClientStatelessService");
-
- conversationalStatefulClientStatefulService = ((SCAClient)node).getService(ConversationalClient.class,
- "ConversationalStatefulClientStatefulService");
- conversationalStatelessClientRequestService = ((SCAClient)node).getService(ConversationalClient.class,
- "ConversationalStatelessClientRequestService");
- conversationalStatefulClientNonConversationalCallbackStatelessService = ((SCAClient)node).getService(ConversationalClient.class,
- "ConversationalStatefulClientNonConversationalCallbackStatefulService");
-
- // reset the place where we record the sequence of calls passing
- // through each component instance
- ConversationalServiceStatelessImpl.calls = new StringBuffer();
- ConversationalServiceStatefulImpl.calls = new StringBuffer();
- ConversationalClientStatelessImpl.calls = new StringBuffer();
- ConversationalClientStatefulImpl.calls = new StringBuffer();
-
- } catch(Exception ex) {
- System.err.println(ex.toString());
- }
-
- }
-
- @AfterClass
- public static void tearDown() throws Exception {
- node.stop();
- conversationalStatelessClientStatelessService = null;
- conversationalStatelessClientStatefulService = null;
- conversationalStatefulClientStatelessService = null;
- conversationalStatefulClientStatefulService = null;
- conversationalStatelessClientRequestService = null;
- conversationalStatefulClientNonConversationalCallbackStatelessService = null;
- }
-
- private static void resetCallStack() {
-
- // reset the place where we record the sequence of calls passing
- // through each component instance
- ConversationalServiceStatelessImpl.calls = new StringBuffer();
- ConversationalServiceStatefulImpl.calls = new StringBuffer();
- ConversationalClientStatelessImpl.calls = new StringBuffer();
- ConversationalClientStatefulImpl.calls = new StringBuffer();
- ConversationalClientStatefulNonConversationalCallbackImpl.calls = new StringBuffer();
-
- }
-
-
- // stateless client stateless service tests
- // ========================================
-
- @Test
- public void testStatelessStatelessConversationFromInjectedReference() {
- int count = conversationalStatelessClientStatelessService.runConversationFromInjectedReference();
- Assert.assertEquals(2, count);
- }
-
- @Test
- public void testStatelessStatelessConversationFromInjectedReference2() {
- int count = conversationalStatelessClientStatelessService.runConversationFromInjectedReference2();
- Assert.assertEquals(2, count);
- }
-
- @Test
- public void testStatelessStatelessConversationFromServiceReference() {
- int count = conversationalStatelessClientStatelessService.runConversationFromServiceReference();
- Assert.assertEquals(2, count);
- }
-
- @Test
- public void testStatelessStatelessConversationWithUserDefinedConversationId() {
- int count = conversationalStatelessClientStatelessService.runConversationWithUserDefinedConversationId();
- Assert.assertEquals(2, count);
- }
- @Test
- public void testStatelessStatelessConversationCheckUserDefinedConversationId() {
- String conversationId = conversationalStatelessClientStatelessService.runConversationCheckUserDefinedConversationId();
- Assert.assertEquals("MyConversation2", conversationId);
- }
-
- @Test
- public void testStatelessStatelessConversationCheckingScope() {
- resetCallStack();
- conversationalStatelessClientStatelessService.runConversationCheckingScope();
- Assert.assertEquals("init,initializeCount,destroy,init,incrementCount,destroy,init,retrieveCount,destroy,init,endConversation,destroy,",
- ConversationalServiceStatelessImpl.calls.toString());
- }
-
- @Test
- public void testStatelessStatelessConversationWithCallback() {
- resetCallStack();
- int count = conversationalStatelessClientStatelessService.runConversationWithCallback();
- Assert.assertEquals(0, count);
-
- Assert.assertEquals("init,runConversationWithCallback,init,initializeCount,destroy,init,incrementCount,destroy,init,retrieveCount,destroy,init,endConversation,destroy,destroy,",
- ConversationalClientStatelessImpl.calls.toString());
- }
- //@Test
- public void testStatelessStatelessConversationHavingPassedReference() {
- int count = conversationalStatelessClientStatelessService.runConversationHavingPassedReference();
- Assert.assertEquals(3, count);
- }
-
- @Test
- public void testStatelessStatelessConversationCallingEndedConversation() {
- int count = conversationalStatelessClientStatelessService.runConversationCallingEndedConversation();
- Assert.assertEquals(-999, count);
- }
-
- @Test
- public void testStatelessStatelessConversationCallingEndedConversationCallback() {
- int count = conversationalStatelessClientStatelessService.runConversationCallingEndedConversationCallback();
- Assert.assertEquals(0, count);
- }
-
- @Test
- public void testStatelessStatelessConversationCallingEndedConversationCheckConversationId() {
- String id = conversationalStatelessClientStatelessService.runConversationCallingEndedConversationCheckConversationId();
- Assert.assertEquals(null, id);
- }
-
- //@Test
- public void testStatelessStatelessConversationCallingEndedConversationCallbackCheckConversationId() {
- String id = conversationalStatelessClientStatelessService.runConversationCallingEndedConversationCallbackCheckConversationId();
- Assert.assertEquals(null, id);
- }
-
-}
diff --git a/tags/java/sca/1.3.1-RC0/itest/conversations/pom.xml b/tags/java/sca/1.3.1-RC0/itest/conversations/pom.xml
deleted file mode 100644
index e64db1bbe1..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/conversations/pom.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-
-
-
- 4.0.0
-
- org.apache.tuscany.sca
- tuscany-itest
- 1.3.1
- ../pom.xml
-
- itest-conversations
- Apache Tuscany SCA Conversations Integration Tests
-
-
-
- org.apache.tuscany.sca
- tuscany-host-embedded
- 1.3.1
-
-
-
- org.apache.tuscany.sca
- tuscany-implementation-java-runtime
- 1.3.1
- runtime
-
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/Record.java b/tags/java/sca/1.3.1-RC0/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/Record.java
deleted file mode 100644
index a3b83dfc14..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/Record.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.itest;
-
-import java.io.Serializable;
-
-/**
- * @version $Rev$ $Date$
- */
-public class Record implements Serializable {
- public String id;
- public String conversationId;
-}
diff --git a/tags/java/sca/1.3.1-RC0/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/TestResult.java b/tags/java/sca/1.3.1-RC0/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/TestResult.java
deleted file mode 100644
index 8e98b9cbd4..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/TestResult.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.itest;
-
-import java.util.Hashtable;
-
-/**
- * @version $Rev$ $Date$
- */
-public class TestResult {
- public static Hashtable results = new Hashtable();
- private static int completed = 0;
- public static synchronized void updateCompleted() {
- ++completed;
- }
-
- public static synchronized int getCompleted() {
- return completed;
- }
-}
diff --git a/tags/java/sca/1.3.1-RC0/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/AService.java b/tags/java/sca/1.3.1-RC0/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/AService.java
deleted file mode 100644
index e7583c339a..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/AService.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.itest.conversational;
-
-import org.osoa.sca.annotations.Conversational;
-
-/**
- * Simple conversational Service that uses another Conversational Service
- */
-@Conversational
-public interface AService {
-
- /**
- * Returns the state for this service.
- *
- * @return The state for this service
- */
- String getState();
-
- /**
- * Returns the state for the other service that this service is using
- *
- * @return The state for the other service that this service is using
- */
- String getStateOnB();
-
- /**
- * Sets the state for this service.
- *
- * @param aState The state for this service
- */
- void setState(String aState);
-
- /**
- * Sets the state for the other service that this service is using
- *
- * @param aState The state for the other service that this service is using
- */
- void setStateOnB(String aState);
-}
diff --git a/tags/java/sca/1.3.1-RC0/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Alpha.java b/tags/java/sca/1.3.1-RC0/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Alpha.java
deleted file mode 100644
index bc4a5fc571..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Alpha.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.itest.conversational;
-
-import org.osoa.sca.annotations.OneWay;
-import org.osoa.sca.annotations.Remotable;
-
-/**
- * @version $Rev$ $Date$
- */
-
-@Remotable
-public interface Alpha {
- @OneWay
- void run(int param);
-}
diff --git a/tags/java/sca/1.3.1-RC0/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/BService.java b/tags/java/sca/1.3.1-RC0/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/BService.java
deleted file mode 100644
index 77d7f4c007..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/BService.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.itest.conversational;
-
-import org.osoa.sca.annotations.Conversational;
-
-/**
- * Simple conversational Service
- */
-@Conversational
-public interface BService {
-
- /**
- * Returns the state for this service.
- *
- * @return The state for this service
- */
- String getState();
-
- /**
- * Sets the state for this service.
- *
- * @param aState The state for this service
- */
- void setState(String aState);
-}
diff --git a/tags/java/sca/1.3.1-RC0/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Beta.java b/tags/java/sca/1.3.1-RC0/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Beta.java
deleted file mode 100644
index e422938b27..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Beta.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.itest.conversational;
-
-import org.osoa.sca.CallableReference;
-import org.osoa.sca.annotations.Remotable;
-
-/**
- * @version $Rev$ $Date$
- */
-
-@Remotable
-public interface Beta {
- CallableReference getRef(int param);
-}
diff --git a/tags/java/sca/1.3.1-RC0/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/CService.java b/tags/java/sca/1.3.1-RC0/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/CService.java
deleted file mode 100644
index a6dbf56797..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/CService.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.itest.conversational;
-
-import org.osoa.sca.annotations.Conversational;
-
-/**
- * Simple conversational Service that uses another Conversational Service
- */
-@Conversational
-public interface CService {
-
- String getState();
-
- void setState(String aState);
-
- Object getConversationID();
-
- Object getConversationObjectConversationId();
-
- void setConversationID(String theID);
-
- void endConversation();
-
- void endConversationViaAnnotatedMethod();
-}
diff --git a/tags/java/sca/1.3.1-RC0/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Constants.java b/tags/java/sca/1.3.1-RC0/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Constants.java
deleted file mode 100644
index 3f04e9f09e..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Constants.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.itest.conversational;
-
-public interface Constants {
-
- String A_INITIAL_VALUE = "Initial Value of A";
- String B_INITIAL_VALUE = "Initial Value of B";
-}
diff --git a/tags/java/sca/1.3.1-RC0/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationIdService.java b/tags/java/sca/1.3.1-RC0/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationIdService.java
deleted file mode 100644
index 53dadc3dc7..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationIdService.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * 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.
- */
-
-package org.apache.tuscany.sca.itest.conversational;
-
-import org.osoa.sca.annotations.Conversational;
-
-@Conversational
-public interface ConversationIdService {
-
- String getCIDField();
- String getCIDSetter();
-}
diff --git a/tags/java/sca/1.3.1-RC0/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalCallback.java b/tags/java/sca/1.3.1-RC0/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalCallback.java
deleted file mode 100644
index 8cad88d2f4..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalCallback.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.itest.conversational;
-
-import org.osoa.sca.annotations.Conversational;
-import org.osoa.sca.annotations.EndsConversation;
-import org.osoa.sca.annotations.Remotable;
-
-
-/**
- * The callback interface used when testing conversational callbacks
- *
- * @version $Rev: 537240 $ $Date: 2007-05-11 18:35:03 +0100 (Fri, 11 May 2007) $
- */
-@Remotable
-@Conversational
-public interface ConversationalCallback {
-
- public void init();
-
- public void destroy();
-
- public void initializeCount(int count);
-
- public void incrementCount();
-
- public int retrieveCount();
-
- public void businessException() throws Exception;
-
- @EndsConversation
- public String endConversation();
-
-}
diff --git a/tags/java/sca/1.3.1-RC0/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalClient.java b/tags/java/sca/1.3.1-RC0/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalClient.java
deleted file mode 100644
index 2532346349..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalClient.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.itest.conversational;
-
-import org.osoa.sca.annotations.Remotable;
-
-/**
- * The client for the conversational itest. Is implemented by clients
- * offering both stateless and stateful callbacks
- *
- * @version $Rev: 537240 $ $Date: 2007-05-11 18:35:03 +0100 (Fri, 11 May 2007) $
- */
-
-@Remotable
-public interface ConversationalClient {
-
- public int runConversationFromInjectedReference();
- public int runConversationFromInjectedReference2();
- public int runConversationFromServiceReference();
- public int runConversationWithUserDefinedConversationId();
- public String runConversationCheckUserDefinedConversationId();
- public int runConversationCheckingScope();
- public int runConversationWithCallback();
- public int runConversationHavingPassedReference();
- public String runConversationBusinessException();
- public String runConversationBusinessExceptionCallback();
- public int runConversationCallingEndedConversation();
- public int runConversationCallingEndedConversationCallback();
- public String runConversationCallingEndedConversationCheckConversationId();
- public String runConversationCallingEndedConversationCallbackCheckConversationId();
- public int runConversationAgeTimeout();
- public int runConversationIdleTimeout();
- public int runConversationPrincipleError();
-}
diff --git a/tags/java/sca/1.3.1-RC0/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalReferenceClient.java b/tags/java/sca/1.3.1-RC0/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalReferenceClient.java
deleted file mode 100644
index 8f008fa711..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalReferenceClient.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.itest.conversational;
-
-import org.osoa.sca.CallableReference;
-import org.osoa.sca.annotations.Remotable;
-
-/**
- * The client that calls into an existing conversation by accepting
- * a reference to that conversation
- *
- * @version $Rev: 537240 $ $Date: 2007-05-11 18:35:03 +0100 (Fri, 11 May 2007) $
- */
-
-@Remotable
-public interface ConversationalReferenceClient {
-
- public void incrementCount(CallableReference conversationalService);
-
-}
diff --git a/tags/java/sca/1.3.1-RC0/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalService.java b/tags/java/sca/1.3.1-RC0/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalService.java
deleted file mode 100644
index 546382cfd1..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalService.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.itest.conversational;
-
-import org.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.Conversational;
-import org.osoa.sca.annotations.EndsConversation;
-import org.osoa.sca.annotations.Remotable;
-
-
-/**
- * The service interface used when testing conversations
- *
- * @version $Rev: 537240 $ $Date: 2007-05-11 18:35:03 +0100 (Fri, 11 May 2007) $
- */
-@Remotable
-@Conversational
-@Callback(ConversationalCallback.class)
-public interface ConversationalService {
-
- public void init();
-
- public void destroy();
-
- public void initializeCount(int count);
-
- public void incrementCount();
-
- public int retrieveCount();
-
- public void businessException() throws Exception;
-
- public void initializeCountCallback(int count);
-
- public void incrementCountCallback();
-
- public int retrieveCountCallback();
-
- public void businessExceptionCallback() throws Exception;
-
- @EndsConversation
- public String endConversation();
-
- public String endConversationCallback();
-
-}
diff --git a/tags/java/sca/1.3.1-RC0/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalServiceNonConversationalCallback.java b/tags/java/sca/1.3.1-RC0/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalServiceNonConversationalCallback.java
deleted file mode 100644
index f1a21cc18f..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/ConversationalServiceNonConversationalCallback.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.itest.conversational;
-
-import org.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.Conversational;
-import org.osoa.sca.annotations.EndsConversation;
-import org.osoa.sca.annotations.Remotable;
-
-
-/**
- * The service interface used when testing conversations
- *
- * @version $Rev: 537240 $ $Date: 2007-05-11 18:35:03 +0100 (Fri, 11 May 2007) $
- */
-@Remotable
-@Conversational
-@Callback(NonConversationalCallback.class)
-public interface ConversationalServiceNonConversationalCallback {
-
- public void init();
-
- public void destroy();
-
- public void initializeCount(int count);
-
- public void incrementCount();
-
- public int retrieveCount();
-
- public void businessException() throws Exception;
-
- public void initializeCountCallback(int count);
-
- public void incrementCountCallback();
-
- public int retrieveCountCallback();
-
- public void businessExceptionCallback() throws Exception;
-
- @EndsConversation
- public String endConversation();
-
- public String endConversationCallback();
-
-}
diff --git a/tags/java/sca/1.3.1-RC0/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/DService.java b/tags/java/sca/1.3.1-RC0/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/DService.java
deleted file mode 100644
index 74afbfb763..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/DService.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.itest.conversational;
-
-import org.osoa.sca.annotations.Conversational;
-import org.osoa.sca.annotations.EndsConversation;
-
-/**
- * Simple conversational Service
- */
-@Conversational
-public interface DService {
-
- /**
- * Returns the state for this service.
- *
- * @return The state for this service
- */
- String getState();
-
- /**
- * Sets the state for this service.
- *
- * @param aState The state for this service
- */
- void setState(String aState);
-
- @EndsConversation
- void endConversationViaAnnotatedMethod();
-}
diff --git a/tags/java/sca/1.3.1-RC0/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Gamma.java b/tags/java/sca/1.3.1-RC0/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Gamma.java
deleted file mode 100644
index 5f97b16088..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/Gamma.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.itest.conversational;
-
-import org.apache.tuscany.sca.itest.Record;
-import org.osoa.sca.annotations.Conversational;
-import org.osoa.sca.annotations.EndsConversation;
-import org.osoa.sca.annotations.Remotable;
-
-/**
- * @version $Rev$ $Date$
- */
-
-@Remotable
-@Conversational
-public interface Gamma {
- void start(int param);
-
- boolean hasNext();
-
- Record next();
-
- @EndsConversation
- void stop();
-}
diff --git a/tags/java/sca/1.3.1-RC0/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallback.java b/tags/java/sca/1.3.1-RC0/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallback.java
deleted file mode 100644
index 3ce3e3ada7..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/NonConversationalCallback.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.itest.conversational;
-
-import org.osoa.sca.annotations.Remotable;
-
-
-/**
- * The callback interface used when testing conversational callbacks
- *
- * @version $Rev: 537240 $ $Date: 2007-05-11 18:35:03 +0100 (Fri, 11 May 2007) $
- */
-@Remotable
-public interface NonConversationalCallback {
-
- public void init();
-
- public void destroy();
-
- public void initializeCount(int count);
-
- public void incrementCount();
-
- public int retrieveCount();
-
- public void businessException() throws Exception;
-
- public String endConversation();
-
-}
diff --git a/tags/java/sca/1.3.1-RC0/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/AServiceImpl.java b/tags/java/sca/1.3.1-RC0/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/AServiceImpl.java
deleted file mode 100644
index 95c9c7ae6e..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/AServiceImpl.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.itest.conversational.impl;
-
-import java.lang.reflect.Proxy;
-import org.apache.tuscany.sca.core.invocation.JDKInvocationHandler;
-
-import org.apache.tuscany.sca.itest.conversational.AService;
-import org.apache.tuscany.sca.itest.conversational.BService;
-import org.apache.tuscany.sca.itest.conversational.Constants;
-import org.osoa.sca.annotations.ConversationID;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
-
-/**
- * Simple conversational Service that uses another Conversational Service
- */
-@Service(AService.class)
-@Scope("CONVERSATION")
-public class AServiceImpl implements AService {
-
- /**
- * The state
- */
- private String state = Constants.A_INITIAL_VALUE;
-
- /**
- * The reference to the other service
- */
- private BService b;
-
- /**
- * Constructor
- *
- */
- public AServiceImpl() {
- System.out.println("---> AServiceImpl constructor for " + this);
- }
-
- /**
- * Inject the reference to the other service
- * @param aB The other service.
- */
- @Reference(name="b")
- public void setB(BService aB) {
- System.out.println("---> Setting reference to B on " + this + " to " + aB);
- this.b = aB;
- }
-
- /**
- * Returns the state for this service.
- *
- * @return The state for this service
- */
- public String getState() {
- return state;
- }
-
- /**
- * Returns the state for the other service that this service is using
- *
- * @return The state for the other service that this service is using
- */
- public String getStateOnB() {
- return b.getState();
- }
-
- /**
- * Sets the state for this service.
- *
- * @param aState The state for this service
- */
- public void setState(String aState) {
- this.state = aState;
- }
-
- /**
- * Sets the state for the other service that this service is using
- *
- * @param aState The state for the other service that this service is using
- */
- public void setStateOnB(String aState) {
- b.setState(aState);
- }
-
- /**
- * Sets the conversation ID for this service
- * @param id The Conversation ID
- */
- @ConversationID
- public void setConversationID(String id) {
- System.out.println("Conversation ID for " + this + " is set to " + id);
- }
-}
diff --git a/tags/java/sca/1.3.1-RC0/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/AlphaImpl.java b/tags/java/sca/1.3.1-RC0/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/AlphaImpl.java
deleted file mode 100644
index a5f37f7a52..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/AlphaImpl.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.itest.conversational.impl;
-
-import org.apache.tuscany.sca.itest.Record;
-import org.apache.tuscany.sca.itest.TestResult;
-import org.apache.tuscany.sca.itest.conversational.Alpha;
-import org.apache.tuscany.sca.itest.conversational.Beta;
-import org.apache.tuscany.sca.itest.conversational.Gamma;
-import org.osoa.sca.CallableReference;
-import org.osoa.sca.ComponentContext;
-import org.osoa.sca.annotations.Context;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
-
-/**
- * @version $Rev$ $Date$
- */
-
-@Service(Alpha.class)
-@Scope("COMPOSITE")
-public class AlphaImpl implements Alpha {
- @Reference
- public Beta beta;
-
- @Context
- protected ComponentContext componentContext;
-
- public void run(int param) {
- CallableReference gammaRef = null;
- boolean testPassed = true;
- try {
- gammaRef = beta.getRef(param);
- while (gammaRef.getService().hasNext()) {
- Record record = gammaRef.getService().next();
- if (!record.conversationId.equals(gammaRef.getConversation().getConversationID())) {
- // Record returned is not from this conversation.
- testPassed = false;
- }
- }
- } catch (Exception ex) {
- testPassed = false;
- ex.printStackTrace();
- } finally {
- TestResult.updateCompleted();
- if (gammaRef != null) {
- TestResult.results.put(gammaRef.getConversation()
- .getConversationID(), testPassed);
- gammaRef.getService().stop();
- }
- }
- }
-}
diff --git a/tags/java/sca/1.3.1-RC0/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/BServiceImpl.java b/tags/java/sca/1.3.1-RC0/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/BServiceImpl.java
deleted file mode 100644
index c1e27641ef..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/BServiceImpl.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.itest.conversational.impl;
-
-
-import org.apache.tuscany.sca.itest.conversational.BService;
-import org.apache.tuscany.sca.itest.conversational.Constants;
-import org.osoa.sca.annotations.ConversationID;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
-
-/**
- * Simple conversational Service
- */
-@Service(BService.class)
-@Scope("CONVERSATION")
-public class BServiceImpl implements BService {
-
- /**
- * The state for this service
- */
- private String state = Constants.B_INITIAL_VALUE;
-
- /**
- * Constructor
- */
- public BServiceImpl() {
- System.out.println("---> BServiceImpl constructor for " + this);
- }
-
- /**
- * Returns the state for this service.
- *
- * @return The state for this service
- */
- public String getState() {
- return state;
- }
-
- /**
- * Sets the state for this service.
- *
- * @param aState The state for this service
- */
- public void setState(String aState) {
- this.state = aState;
- }
-
- /**
- * Sets the conversation ID for this service
- * @param id The Conversation ID
- */
- @ConversationID
- public void setConversationID(String id) {
- System.out.println("Conversation ID for " + this + " is set to " + id);
- }
-}
diff --git a/tags/java/sca/1.3.1-RC0/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/BetaImpl.java b/tags/java/sca/1.3.1-RC0/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/BetaImpl.java
deleted file mode 100644
index 900b8f743f..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/BetaImpl.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.itest.conversational.impl;
-
-import org.apache.tuscany.sca.itest.conversational.Beta;
-import org.apache.tuscany.sca.itest.conversational.Gamma;
-import org.osoa.sca.CallableReference;
-import org.osoa.sca.ComponentContext;
-import org.osoa.sca.ServiceReference;
-import org.osoa.sca.annotations.Context;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
-
-/**
- * @version $Rev$ $Date$
- */
-
-@Service(Beta.class)
-@Scope("COMPOSITE")
-public class BetaImpl implements Beta {
- @Context
- protected ComponentContext componentContext;
-
- @Reference
- public Gamma gamma;
-
- public CallableReference getRef(int param) {
- ServiceReference gammaRef = componentContext
- .getServiceReference(Gamma.class, "gamma");
- Gamma g = gammaRef.getService();
- g.start(param);
- return gammaRef;
- }
-}
diff --git a/tags/java/sca/1.3.1-RC0/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/CServiceImpl.java b/tags/java/sca/1.3.1-RC0/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/CServiceImpl.java
deleted file mode 100644
index b21f956bd9..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/CServiceImpl.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.itest.conversational.impl;
-
-import org.apache.tuscany.sca.itest.conversational.CService;
-import org.apache.tuscany.sca.itest.conversational.DService;
-import org.osoa.sca.ServiceReference;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
-
-/**
- * Simple conversational Service that uses another Conversational Service
- */
-@Service(CService.class)
-@Scope("CONVERSATION")
-public class CServiceImpl implements CService {
-
- private ServiceReference dServiceRef;
-
- @Reference(name = "d")
- public void setD(ServiceReference servRef) {
- this.dServiceRef = servRef;
- }
-
- public String getState() {
- return dServiceRef.getService().getState();
- }
-
- public void setState(String aState) {
- dServiceRef.getService().setState(aState);
- }
-
-
- /*
- * When the coversationId is set manually the client may access the
- * conversation id that will be used by the reference using
- * ServiceReference.getConversationId()
- */
- public Object getConversationID() {
- return dServiceRef.getConversationID();
- }
-
- /*
- * Whether the conversation ID is chosen by the client or is generated by
- * the system, the client may access the conversation ID by calling
- * Conversation.getConversationID().
- */
- public Object getConversationObjectConversationId() {
- // TODO Auto-generated method stub
- if (dServiceRef.getConversation() != null){
- return dServiceRef.getConversation().getConversationID();
- } else {
- return null;
- }
- }
-
- public void endConversation() {
- dServiceRef.getConversation().end();
- }
-
- public void endConversationViaAnnotatedMethod() {
- dServiceRef.getService().endConversationViaAnnotatedMethod();
- }
-
- public void setConversationID(String theID) {
- dServiceRef.setConversationID(theID);
- }
-}
diff --git a/tags/java/sca/1.3.1-RC0/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationAgeComponentImpl.java b/tags/java/sca/1.3.1-RC0/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationAgeComponentImpl.java
deleted file mode 100644
index 9deef312ac..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationAgeComponentImpl.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * 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.
- */
-
-package org.apache.tuscany.sca.itest.conversational.impl;
-
-import org.apache.tuscany.sca.itest.conversational.ConversationalService;
-import org.osoa.sca.annotations.ConversationAttributes;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
-
-@Service(ConversationalService.class)
-@Scope("CONVERSATION")
-@ConversationAttributes(maxAge="1 seconds")
-public class ConversationAgeComponentImpl implements ConversationalService {
-
- private int count;
-
- public void businessException() throws Exception {
- }
-
- public void businessExceptionCallback() throws Exception {
- }
-
- public void destroy() {
- }
-
- public String endConversation() {
- return null;
- }
-
- public String endConversationCallback() {
- return null;
- }
-
- public void incrementCount() {
- }
-
- public void incrementCountCallback() {
- }
-
- public void init() {
- }
-
- public void initializeCount(int count) {
- this.count = count;
- }
-
- public void initializeCountCallback(int count) {
- }
-
- public int retrieveCount() {
- return count;
- }
-
- public int retrieveCountCallback() {
- return 0;
- }
-
-}
diff --git a/tags/java/sca/1.3.1-RC0/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationIdComponentImpl.java b/tags/java/sca/1.3.1-RC0/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationIdComponentImpl.java
deleted file mode 100644
index cffa76186a..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationIdComponentImpl.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * 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.
- */
-
-package org.apache.tuscany.sca.itest.conversational.impl;
-
-import org.apache.tuscany.sca.itest.conversational.ConversationIdService;
-import org.osoa.sca.annotations.ConversationID;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
-
-@Service(ConversationIdService.class)
-@Scope("CONVERSATION")
-public class ConversationIdComponentImpl implements ConversationIdService {
-
- @ConversationID
- public String cid;
-
- private String setterCid;
-
- public String getCIDField() {
- return cid;
- }
- public String getCIDSetter() {
- return setterCid;
- }
-
-
- @ConversationID
- public void setCID(String cid) {
- this.setterCid = cid;
- }
-}
diff --git a/tags/java/sca/1.3.1-RC0/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationMaxIdleComponentImpl.java b/tags/java/sca/1.3.1-RC0/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationMaxIdleComponentImpl.java
deleted file mode 100644
index 1272c7ab7f..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationMaxIdleComponentImpl.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * 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.
- */
-
-package org.apache.tuscany.sca.itest.conversational.impl;
-
-import org.apache.tuscany.sca.itest.conversational.ConversationalService;
-import org.osoa.sca.annotations.ConversationAttributes;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
-
-@Service(ConversationalService.class)
-@Scope("CONVERSATION")
-@ConversationAttributes(maxIdleTime="1 seconds")
-public class ConversationMaxIdleComponentImpl implements ConversationalService {
-
- private int count;
-
- public void businessException() throws Exception {
- }
-
- public void businessExceptionCallback() throws Exception {
- }
-
- public void destroy() {
- }
-
- public String endConversation() {
- return null;
- }
-
- public String endConversationCallback() {
- return null;
- }
-
- public void incrementCount() {
- }
-
- public void incrementCountCallback() {
- }
-
- public void init() {
- }
-
- public void initializeCount(int count) {
- this.count = count;
- }
-
- public void initializeCountCallback(int count) {
- }
-
- public int retrieveCount() {
- return count;
- }
-
- public int retrieveCountCallback() {
- return 0;
- }
-
-}
diff --git a/tags/java/sca/1.3.1-RC0/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulImpl.java b/tags/java/sca/1.3.1-RC0/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulImpl.java
deleted file mode 100644
index 847b038881..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulImpl.java
+++ /dev/null
@@ -1,321 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.itest.conversational.impl;
-
-import org.apache.tuscany.sca.itest.conversational.ConversationalCallback;
-import org.apache.tuscany.sca.itest.conversational.ConversationalClient;
-import org.apache.tuscany.sca.itest.conversational.ConversationalReferenceClient;
-import org.apache.tuscany.sca.itest.conversational.ConversationalService;
-import org.osoa.sca.ComponentContext;
-import org.osoa.sca.ServiceReference;
-import org.osoa.sca.annotations.Context;
-import org.osoa.sca.annotations.ConversationAttributes;
-import org.osoa.sca.annotations.Destroy;
-import org.osoa.sca.annotations.Init;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
-
-/**
- * The client for the conversational itest which presents a stateful
- * callback interface
- *
- * @version $Rev: 537240 $ $Date: 2007-05-11 18:35:03 +0100 (Fri, 11 May 2007) $
- */
-
-@Service(interfaces={ConversationalClient.class})
-@Scope("CONVERSATION")
-@ConversationAttributes(maxAge="10 minutes",
- maxIdleTime="5 minutes",
- singlePrincipal=false)
-public class ConversationalClientStatefulImpl implements ConversationalClient, ConversationalCallback {
-
- @Context
- protected ComponentContext componentContext;
-
- @Reference
- protected ConversationalService conversationalService;
-
- @Reference
- protected ConversationalService conversationalService2;
-
- @Reference
- protected ConversationalReferenceClient conversationalReferenceClient;
-
- private int clientCount = 0;
- private int callbackCount = 0;
-
-
- // a static member variable that records the number of times this service is called
- public static StringBuffer calls = new StringBuffer();
-
- // From ConversationalClient
- public int runConversationFromInjectedReference(){
- calls.append("runConversationFromInjectedReference,");
- conversationalService.initializeCount(1);
- conversationalService.incrementCount();
- clientCount = conversationalService.retrieveCount();
- conversationalService.endConversation();
-
- return clientCount;
- }
- public int runConversationFromInjectedReference2(){
- calls.append("runConversationFromInjectedReference2,");
-
- conversationalService2.initializeCount(1);
- conversationalService2.incrementCount();
-
- // stick in a call to the first reference to
- // make sure the two references don't clash
- conversationalService.initializeCount(1);
-
- clientCount = conversationalService2.retrieveCount();
- conversationalService2.endConversation();
-
- // end the conversation through the first reference
- conversationalService.endConversation();
-
- return clientCount;
- }
- public int runConversationFromServiceReference(){
- calls.append("runConversationFromServiceReference,");
- ServiceReference serviceReference = componentContext.getServiceReference(ConversationalService.class,
- "conversationalService");
- ConversationalService callableReference = serviceReference.getService();
-
- callableReference.initializeCount(1);
- callableReference.incrementCount();
- clientCount = callableReference.retrieveCount();
- callableReference.endConversation();
-
- // serviceReference.getConversation().end();
-
- return clientCount;
- }
- public int runConversationWithUserDefinedConversationId(){
- calls.append("runConversationWithUserDefinedConversationId,");
- ServiceReference serviceReference = componentContext.getServiceReference(ConversationalService.class,
- "conversationalService");
- serviceReference.setConversationID("MyConversation1");
-
- ConversationalService callableReference = serviceReference.getService();
-
- callableReference.initializeCount(1);
- callableReference.incrementCount();
- clientCount = callableReference.retrieveCount();
- callableReference.endConversation();
-
- // serviceReference.getConversation().end();
-
- return clientCount;
- }
- public String runConversationCheckUserDefinedConversationId(){
- calls.append("runConversationCheckUserDefinedConversationId,");
- ServiceReference serviceReference = componentContext.getServiceReference(ConversationalService.class,
- "conversationalService");
- serviceReference.setConversationID("MyConversation2");
-
- ConversationalService callableReference = serviceReference.getService();
-
- callableReference.initializeCount(1);
- callableReference.incrementCount();
- clientCount = callableReference.retrieveCount();
-
- String clientConversationId = serviceReference.getConversationID().toString();
- String serverConversationId = callableReference.endConversation();
-
- if (clientConversationId.equals("MyConversation2") &&
- serverConversationId.equals("MyConversation2") ) {
- return clientConversationId;
- } else {
- return "client = " + clientConversationId +
- "server = " + serverConversationId;
- }
-
- }
- public int runConversationCheckingScope(){
- calls.append("runConversationCheckingScope,");
- // run a conversation
- return runConversationFromInjectedReference();
-
- // test will then use a static method to find out how many times
- // init/destroy were called
- }
- public int runConversationWithCallback(){
- calls.append("runConversationWithCallback,");
- callbackCount = 2;
- conversationalService.initializeCountCallback(1);
- conversationalService.incrementCountCallback();
- clientCount = conversationalService.retrieveCountCallback();
- conversationalService.endConversationCallback();
-
- return clientCount;
- }
- public int runConversationHavingPassedReference(){
- calls.append("runConversationHavingPassedReference,");
- ServiceReference serviceReference = componentContext.getServiceReference(ConversationalService.class,
- "conversationalService");
- ConversationalService callableReference = serviceReference.getService();
-
- callableReference.initializeCount(1);
- callableReference.incrementCount();
- conversationalReferenceClient.incrementCount(serviceReference);
- clientCount = callableReference.retrieveCount();
- callableReference.endConversation();
-
- serviceReference.getConversation().end();
-
- return clientCount;
- }
- public String runConversationBusinessException(){
- calls.append("runConversationbusinessException,");
- try {
- conversationalService.initializeCount(1);
- conversationalService.businessException();
- clientCount = conversationalService.retrieveCount();
- conversationalService.endConversation();
- } catch(Exception ex) {
- return ex.getMessage();
- }
-
- return "No Exception Returned";
- }
-
- public String runConversationBusinessExceptionCallback(){
- calls.append("runConversationbusinessExceptionCallback,");
- try {
- conversationalService.initializeCountCallback(1);
- conversationalService.businessExceptionCallback();
- clientCount = conversationalService.retrieveCountCallback();
- conversationalService.endConversationCallback();
- } catch(Exception ex) {
- return ex.getMessage();
- }
-
- return "No Exception Returned";
- }
-
- public int runConversationCallingEndedConversation(){
- calls.append("runConversationCallingEndedConversation,");
- conversationalService.initializeCount(1);
- conversationalService.endConversation();
- return conversationalService.retrieveCount();
- }
-
- public int runConversationCallingEndedConversationCallback(){
- calls.append("runConversationCallingEndedConversationCallback,");
- conversationalService.initializeCountCallback(1);
- conversationalService.endConversationCallback();
- return conversationalService.retrieveCountCallback();
- }
-
- public String runConversationCallingEndedConversationCheckConversationId(){
- calls.append("runConversationCallingEndedConversationCheckConversationId,");
- ServiceReference serviceReference = componentContext.getServiceReference(ConversationalService.class,
- "conversationalService");
- serviceReference.setConversationID("MyConversation3");
-
- ConversationalService callableReference = serviceReference.getService();
-
- callableReference.initializeCount(1);
- callableReference.incrementCount();
- clientCount = callableReference.retrieveCount();
- callableReference.endConversation();
-
- if (serviceReference.getConversation() ==null ) {
- return null;
- } else {
- return serviceReference.getConversation().getConversationID().toString();
- }
- }
-
- public String runConversationCallingEndedConversationCallbackCheckConversationId(){
- calls.append("runConversationCallingEndedConversationCallbackCheckConversationId,");
- ServiceReference serviceReference = componentContext.getServiceReference(ConversationalService.class,
- "conversationalService");
- serviceReference.setConversationID("MyConversation3");
-
- ConversationalService callableReference = serviceReference.getService();
-
- callableReference.initializeCount(1);
- callableReference.incrementCount();
- clientCount = callableReference.retrieveCount();
- callableReference.endConversationCallback();
-
- if (serviceReference.getConversation() ==null ) {
- return null;
- } else {
- return serviceReference.getConversation().getConversationID().toString();
- }
- }
-
- public int runConversationAgeTimeout(){
- calls.append("runConversationAgeTimeout,");
- // done in other testing
- return clientCount;
- }
- public int runConversationIdleTimeout(){
- calls.append("runConversationIdleTimeout,");
- // done in other testing
- return clientCount;
- }
- public int runConversationPrincipleError(){
- calls.append("runConversationPrincipleError,");
- // TODO - when policy framework is done
- return clientCount;
- }
-
-
- // From ConversationalCallback
- @Init
- public void init(){
- calls.append("init,");
- }
-
- @Destroy
- public void destroy(){
- calls.append("destroy,");
- }
-
- public void initializeCount(int count){
- calls.append("initializeCount,");
- callbackCount += count;
- }
-
- public void incrementCount(){
- calls.append("incrementCount,");
- callbackCount++;
- }
-
- public int retrieveCount(){
- calls.append("retrieveCount,");
- return callbackCount;
- }
-
- public void businessException() throws Exception {
- throw new Exception("Business Exception");
- }
-
- public String endConversation(){
- calls.append("endConversation,");
- callbackCount = 0;
- return null;
- }
-
-}
diff --git a/tags/java/sca/1.3.1-RC0/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulNonConversationalCallbackImpl.java b/tags/java/sca/1.3.1-RC0/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulNonConversationalCallbackImpl.java
deleted file mode 100644
index b77e4c0194..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatefulNonConversationalCallbackImpl.java
+++ /dev/null
@@ -1,310 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.itest.conversational.impl;
-
-import org.apache.tuscany.sca.itest.conversational.ConversationalClient;
-import org.apache.tuscany.sca.itest.conversational.ConversationalReferenceClient;
-import org.apache.tuscany.sca.itest.conversational.ConversationalService;
-import org.apache.tuscany.sca.itest.conversational.NonConversationalCallback;
-import org.osoa.sca.ComponentContext;
-import org.osoa.sca.ServiceReference;
-import org.osoa.sca.annotations.Context;
-import org.osoa.sca.annotations.ConversationAttributes;
-import org.osoa.sca.annotations.Destroy;
-import org.osoa.sca.annotations.Init;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
-
-/**
- * The client for the conversational itest which presents a stateful
- * callback interface
- *
- * @version $Rev: 537240 $ $Date: 2007-05-11 18:35:03 +0100 (Fri, 11 May 2007) $
- */
-
-@Service(interfaces={ConversationalClient.class})
-@Scope("CONVERSATION")
-@ConversationAttributes(maxAge="10 minutes",
- maxIdleTime="5 minutes",
- singlePrincipal=false)
-public class ConversationalClientStatefulNonConversationalCallbackImpl implements ConversationalClient, NonConversationalCallback {
-
- @Context
- protected ComponentContext componentContext;
-
- @Reference
- protected ConversationalService conversationalService;
-
- @Reference
- protected ConversationalService conversationalService2;
-
- @Reference
- protected ConversationalReferenceClient conversationalReferenceClient;
-
- private int clientCount = 0;
- private int callbackCount = 0;
-
-
- // a static member variable that records the number of times this service is called
- public static StringBuffer calls = new StringBuffer();
-
- // From ConversationalClient
- public int runConversationFromInjectedReference(){
- calls.append("runConversationFromInjectedReference,");
- conversationalService.initializeCount(1);
- conversationalService.incrementCount();
- clientCount = conversationalService.retrieveCount();
- conversationalService.endConversation();
-
- return clientCount;
- }
- public int runConversationFromInjectedReference2(){
- calls.append("runConversationFromInjectedReference2,");
-
- conversationalService2.initializeCount(1);
- conversationalService2.incrementCount();
-
- // stick in a call to the first reference to
- // make sure the two references don't clash
- conversationalService.initializeCount(1);
-
- clientCount = conversationalService2.retrieveCount();
- conversationalService2.endConversation();
-
- // end the conversation through the first reference
- conversationalService.endConversation();
-
- return clientCount;
- }
- public int runConversationFromServiceReference(){
- calls.append("runConversationFromServiceReference,");
- ServiceReference serviceReference = componentContext.getServiceReference(ConversationalService.class,
- "conversationalService");
- ConversationalService callableReference = serviceReference.getService();
-
- callableReference.initializeCount(1);
- callableReference.incrementCount();
- clientCount = callableReference.retrieveCount();
- callableReference.endConversation();
-
- // serviceReference.getConversation().end();
-
- return clientCount;
- }
- public int runConversationWithUserDefinedConversationId(){
- calls.append("runConversationWithUserDefinedConversationId,");
- ServiceReference serviceReference = componentContext.getServiceReference(ConversationalService.class,
- "conversationalService");
- serviceReference.setConversationID("MyConversation1");
-
- ConversationalService callableReference = serviceReference.getService();
-
- callableReference.initializeCount(1);
- callableReference.incrementCount();
- clientCount = callableReference.retrieveCount();
- callableReference.endConversation();
-
- // serviceReference.getConversation().end();
-
- return clientCount;
- }
- public String runConversationCheckUserDefinedConversationId(){
- calls.append("runConversationCheckUserDefinedConversationId,");
- ServiceReference serviceReference = componentContext.getServiceReference(ConversationalService.class,
- "conversationalService");
- serviceReference.setConversationID("MyConversation2");
-
- ConversationalService callableReference = serviceReference.getService();
-
- callableReference.initializeCount(1);
- callableReference.incrementCount();
- clientCount = callableReference.retrieveCount();
- return callableReference.endConversation();
-
- }
- public int runConversationCheckingScope(){
- calls.append("runConversationCheckingScope,");
- // run a conversation
- return runConversationFromInjectedReference();
-
- // test will then use a static method to find out how many times
- // init/destroy were called
- }
- public int runConversationWithCallback(){
- calls.append("runConversationWithCallback,");
- callbackCount = 2;
- conversationalService.initializeCountCallback(1);
- conversationalService.incrementCountCallback();
- clientCount = conversationalService.retrieveCountCallback();
- conversationalService.endConversationCallback();
-
- return clientCount;
- }
- public int runConversationHavingPassedReference(){
- calls.append("runConversationHavingPassedReference,");
- ServiceReference serviceReference = componentContext.getServiceReference(ConversationalService.class,
- "conversationalService");
- ConversationalService callableReference = serviceReference.getService();
-
- callableReference.initializeCount(1);
- callableReference.incrementCount();
- conversationalReferenceClient.incrementCount(serviceReference);
- clientCount = callableReference.retrieveCount();
- callableReference.endConversation();
-
- // serviceReference.getConversation().end();
-
- return clientCount;
- }
- public String runConversationBusinessException(){
- calls.append("runConversationbusinessException,");
- try {
- conversationalService.initializeCount(1);
- conversationalService.businessException();
- clientCount = conversationalService.retrieveCount();
- conversationalService.endConversation();
- } catch(Exception ex) {
- return ex.getMessage();
- }
-
- return "No Exception Returned";
- }
-
- public String runConversationBusinessExceptionCallback(){
- calls.append("runConversationbusinessExceptionCallback,");
- try {
- conversationalService.initializeCountCallback(1);
- conversationalService.businessExceptionCallback();
- clientCount = conversationalService.retrieveCountCallback();
- conversationalService.endConversationCallback();
- } catch(Exception ex) {
- return ex.getMessage();
- }
-
- return "No Exception Returned";
- }
-
- public String runConversationCallingEndedConversationCheckConversationId(){
- calls.append("runConversationCallingEndedConversationCheckConversationId,");
- ServiceReference serviceReference = componentContext.getServiceReference(ConversationalService.class,
- "conversationalService");
- serviceReference.setConversationID("MyConversation3");
-
- ConversationalService callableReference = serviceReference.getService();
-
- callableReference.initializeCount(1);
- callableReference.incrementCount();
- clientCount = callableReference.retrieveCount();
- callableReference.endConversation();
-
- if (serviceReference.getConversation() ==null ) {
- return null;
- } else {
- return serviceReference.getConversation().getConversationID().toString();
- }
- }
-
- public String runConversationCallingEndedConversationCallbackCheckConversationId(){
- calls.append("runConversationCallingEndedConversationCallbackCheckConversationId,");
- ServiceReference serviceReference = componentContext.getServiceReference(ConversationalService.class,
- "conversationalService");
- serviceReference.setConversationID("MyConversation3");
-
- ConversationalService callableReference = serviceReference.getService();
-
- callableReference.initializeCount(1);
- callableReference.incrementCount();
- clientCount = callableReference.retrieveCount();
- callableReference.endConversationCallback();
-
- if (serviceReference.getConversation() ==null ) {
- return null;
- } else {
- return serviceReference.getConversation().getConversationID().toString();
- }
- }
-
- public int runConversationCallingEndedConversation(){
- calls.append("runConversationCallingEndedConversation,");
- conversationalService.initializeCount(1);
- conversationalService.endConversation();
- return conversationalService.retrieveCount();
- }
-
- public int runConversationCallingEndedConversationCallback(){
- calls.append("runConversationCallingEndedConversationCallback,");
- conversationalService.initializeCountCallback(1);
- conversationalService.endConversationCallback();
- return conversationalService.retrieveCountCallback();
- }
-
- public int runConversationAgeTimeout(){
- calls.append("runConversationAgeTimeout,");
- // done in other testing
- return clientCount;
- }
- public int runConversationIdleTimeout(){
- calls.append("runConversationIdleTimeout,");
- // done in other testing
- return clientCount;
- }
- public int runConversationPrincipleError(){
- calls.append("runConversationPrincipleError,");
- // TODO - when policy framework is done
- return clientCount;
- }
-
-
- // From ConversationalCallback
- @Init
- public void init(){
- calls.append("init,");
- }
-
- @Destroy
- public void destroy(){
- calls.append("destroy,");
- }
-
- public void initializeCount(int count){
- calls.append("initializeCount,");
- callbackCount += count;
- }
-
- public void incrementCount(){
- calls.append("incrementCount,");
- callbackCount++;
- }
-
- public int retrieveCount(){
- calls.append("retrieveCount,");
- return callbackCount;
- }
-
- public void businessException() throws Exception {
- throw new Exception("Business Exception");
- }
-
- public String endConversation(){
- calls.append("endConversation,");
- return null;
- }
-
-}
diff --git a/tags/java/sca/1.3.1-RC0/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatelessImpl.java b/tags/java/sca/1.3.1-RC0/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatelessImpl.java
deleted file mode 100644
index 5b3906fc2c..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalClientStatelessImpl.java
+++ /dev/null
@@ -1,317 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.itest.conversational.impl;
-
-import org.apache.tuscany.sca.itest.conversational.ConversationalCallback;
-import org.apache.tuscany.sca.itest.conversational.ConversationalClient;
-import org.apache.tuscany.sca.itest.conversational.ConversationalReferenceClient;
-import org.apache.tuscany.sca.itest.conversational.ConversationalService;
-import org.osoa.sca.ComponentContext;
-import org.osoa.sca.ServiceReference;
-import org.osoa.sca.annotations.Context;
-import org.osoa.sca.annotations.Destroy;
-import org.osoa.sca.annotations.Init;
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Service;
-
-/**
- * The client for the conversational itest which presents a stateful
- * callback interface
- *
- * @version $Rev: 537240 $ $Date: 2007-05-11 18:35:03 +0100 (Fri, 11 May 2007) $
- */
-
-@Service(interfaces={ConversationalClient.class})
-public class ConversationalClientStatelessImpl implements ConversationalClient, ConversationalCallback {
-
- @Context
- protected ComponentContext componentContext;
-
- @Reference
- protected ConversationalService conversationalService;
-
- @Reference
- protected ConversationalService conversationalService2;
-
- @Reference
- protected ConversationalReferenceClient conversationalReferenceClient;
-
- private int clientCount = 0;
- private int callbackCount = 0;
-
- // a static member variable that records the number of times this service is called
- public static StringBuffer calls = new StringBuffer();
-
- // From ConversationalClient
- public int runConversationFromInjectedReference(){
- calls.append("runConversationFromInjectedReference,");
- conversationalService.initializeCount(1);
- conversationalService.incrementCount();
- clientCount = conversationalService.retrieveCount();
- conversationalService.endConversation();
-
- return clientCount;
- }
- public int runConversationFromInjectedReference2(){
- calls.append("runConversationFromInjectedReference2,");
-
- // now test the second reference
- conversationalService2.initializeCount(1);
- conversationalService2.incrementCount();
-
- // stick in a call to the first reference to
- // make sure the two references don't clash
- conversationalService.initializeCount(1);
-
- clientCount = conversationalService2.retrieveCount();
- conversationalService2.endConversation();
-
- // end the conversation through the first reference
- conversationalService.endConversation();
-
- return clientCount;
- }
- public int runConversationFromServiceReference(){
- calls.append("runConversationFromServiceReference,");
- ServiceReference serviceReference = componentContext.getServiceReference(ConversationalService.class,
- "conversationalService");
- ConversationalService callableReference = serviceReference.getService();
-
- callableReference.initializeCount(1);
- callableReference.incrementCount();
- clientCount = callableReference.retrieveCount();
- callableReference.endConversation();
-
- // serviceReference.getConversation().end();
-
- return clientCount;
- }
- public int runConversationWithUserDefinedConversationId(){
- calls.append("runConversationWithUserDefinedConversationId,");
- ServiceReference serviceReference = componentContext.getServiceReference(ConversationalService.class,
- "conversationalService");
- serviceReference.setConversationID("MyConversation1");
-
- ConversationalService callableReference = serviceReference.getService();
-
- callableReference.initializeCount(1);
- callableReference.incrementCount();
- clientCount = callableReference.retrieveCount();
- callableReference.endConversation();
-
- // serviceReference.getConversation().end();
-
- return clientCount;
- }
- public String runConversationCheckUserDefinedConversationId(){
- calls.append("runConversationCheckUserDefinedConversationId,");
- ServiceReference serviceReference = componentContext.getServiceReference(ConversationalService.class,
- "conversationalService");
- serviceReference.setConversationID("MyConversation2");
-
- ConversationalService callableReference = serviceReference.getService();
-
- callableReference.initializeCount(1);
- callableReference.incrementCount();
- clientCount = callableReference.retrieveCount();
-
- String clientConversationId = serviceReference.getConversationID().toString();
- String serverConfersationId = callableReference.endConversation();
-
- if (clientConversationId.equals("MyConversation2") &&
- serverConfersationId.equals("MyConversation2") ) {
- return clientConversationId;
- } else {
- return "client = " + clientConversationId +
- "server = " + serverConfersationId;
- }
- }
- public int runConversationCheckingScope(){
- calls.append("runConversationCheckingScope,");
- // run a conversation
- return runConversationFromInjectedReference();
-
- // test will then use a static method to find out how many times
- // init/destroy were called
- }
- public int runConversationWithCallback(){
- calls.append("runConversationWithCallback,");
- conversationalService.initializeCountCallback(1);
- conversationalService.incrementCountCallback();
- clientCount = conversationalService.retrieveCountCallback();
- conversationalService.endConversationCallback();
-
- return clientCount;
- }
-
- public int runConversationHavingPassedReference(){
- calls.append("runConversationHavingPassedReference,");
- ServiceReference serviceReference = componentContext.getServiceReference(ConversationalService.class,
- "conversationalService");
- ConversationalService callableReference = serviceReference.getService();
-
- callableReference.initializeCount(1);
- callableReference.incrementCount();
- conversationalReferenceClient.incrementCount(serviceReference);
- clientCount = callableReference.retrieveCount();
- callableReference.endConversation();
-
- serviceReference.getConversation().end();
-
- return clientCount;
- }
-
- public String runConversationBusinessException(){
- calls.append("runConversationbusinessException,");
- try {
- conversationalService.initializeCount(1);
- conversationalService.businessException();
- clientCount = conversationalService.retrieveCount();
- conversationalService.endConversation();
- } catch(Exception ex) {
- return ex.getMessage();
- }
-
- return "No Exception Returned";
- }
-
- public String runConversationBusinessExceptionCallback(){
- calls.append("runConversationbusinessExceptionCallback,");
- try {
- conversationalService.initializeCountCallback(1);
- conversationalService.businessExceptionCallback();
- clientCount = conversationalService.retrieveCountCallback();
- conversationalService.endConversationCallback();
- } catch(Exception ex) {
- return ex.getMessage();
- }
-
- return "No Exception Returned";
- }
-
- public int runConversationCallingEndedConversation(){
- calls.append("runConversationCallingEndedConversation,");
- conversationalService.initializeCount(1);
- conversationalService.endConversation();
- return conversationalService.retrieveCount();
- }
-
- public int runConversationCallingEndedConversationCallback(){
- calls.append("runConversationCallingEndedConversationCallback,");
- conversationalService.initializeCountCallback(1);
- conversationalService.endConversationCallback();
- return conversationalService.retrieveCountCallback();
- }
-
- public String runConversationCallingEndedConversationCheckConversationId(){
- calls.append("runConversationCallingEndedConversationCheckConversationId,");
- ServiceReference serviceReference = componentContext.getServiceReference(ConversationalService.class,
- "conversationalService");
- serviceReference.setConversationID("MyConversation3");
-
- ConversationalService callableReference = serviceReference.getService();
-
- callableReference.initializeCount(1);
- callableReference.incrementCount();
- clientCount = callableReference.retrieveCount();
- callableReference.endConversation();
-
- if (serviceReference.getConversation() ==null ) {
- return null;
- } else {
- return serviceReference.getConversation().getConversationID().toString();
- }
- }
-
- public String runConversationCallingEndedConversationCallbackCheckConversationId(){
- calls.append("runConversationCallingEndedConversationCallbackCheckConversationId,");
- ServiceReference serviceReference = componentContext.getServiceReference(ConversationalService.class,
- "conversationalService");
- serviceReference.setConversationID("MyConversation3");
-
- ConversationalService callableReference = serviceReference.getService();
-
- callableReference.initializeCount(1);
- callableReference.incrementCount();
- clientCount = callableReference.retrieveCount();
- callableReference.endConversationCallback();
-
- if (serviceReference.getConversation() ==null ) {
- return null;
- } else {
- return serviceReference.getConversation().getConversationID().toString();
- }
- }
-
- public int runConversationAgeTimeout(){
- calls.append("runConversationAgeTimeout,");
- // done in other testing
- return clientCount;
- }
- public int runConversationIdleTimeout(){
- calls.append("runConversationIdleTimeout,");
- // done in other testing
- return clientCount;
- }
- public int runConversationPrincipleError(){
- calls.append("runConversationPrincipleError,");
- // TODO - when policy framework is done
- return clientCount;
- }
-
-
- // From ConversationalCallback
- @Init
- public void init(){
- calls.append("init,");
-
- }
-
- @Destroy
- public void destroy(){
- calls.append("destroy,");
-
- }
-
- public void initializeCount(int count){
- calls.append("initializeCount,");
- callbackCount = 0;
- }
-
- public void incrementCount(){
- calls.append("incrementCount,");
- callbackCount++;
- }
-
- public int retrieveCount(){
- calls.append("retrieveCount,");
- return callbackCount;
- }
-
- public void businessException() throws Exception {
- throw new Exception("Business Exception");
- }
-
- public String endConversation(){
- calls.append("endConversation,");
- callbackCount = 0;
- return null;
- }
-
-}
diff --git a/tags/java/sca/1.3.1-RC0/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalReferenceClientImpl.java b/tags/java/sca/1.3.1-RC0/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalReferenceClientImpl.java
deleted file mode 100644
index 8fe7c5b6ba..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalReferenceClientImpl.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.itest.conversational.impl;
-
-import org.apache.tuscany.sca.itest.conversational.ConversationalReferenceClient;
-import org.apache.tuscany.sca.itest.conversational.ConversationalService;
-import org.osoa.sca.CallableReference;
-import org.osoa.sca.annotations.Service;
-
-/**
- * A client component that accepts a reference to an ongoing conversation
- * and takes part in that conversation
- *
- * @version $Rev: 537240 $ $Date: 2007-05-11 18:35:03 +0100 (Fri, 11 May 2007) $
- */
-
-@Service(interfaces={ConversationalReferenceClient.class})
-public class ConversationalReferenceClientImpl implements ConversationalReferenceClient{
-
- public void incrementCount(CallableReference conversationalService){
- ConversationalService callableReference = conversationalService.getService();
-
- callableReference.incrementCount();
- }
-
-
-}
diff --git a/tags/java/sca/1.3.1-RC0/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceRequestImpl.java b/tags/java/sca/1.3.1-RC0/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceRequestImpl.java
deleted file mode 100644
index 9a25f0f59a..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceRequestImpl.java
+++ /dev/null
@@ -1,123 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.itest.conversational.impl;
-
-import java.util.HashMap;
-
-import org.apache.tuscany.sca.itest.conversational.ConversationalCallback;
-import org.apache.tuscany.sca.itest.conversational.ConversationalService;
-import org.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.ConversationID;
-import org.osoa.sca.annotations.Destroy;
-import org.osoa.sca.annotations.Init;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
-
-
-/**
- * The service used when testing stateful conversations
- *
- * @version $Rev: 537240 $ $Date: 2007-05-11 18:35:03 +0100 (Fri, 11 May 2007) $
- */
-@Service(ConversationalService.class)
-@Scope("REQUEST")
-public class ConversationalServiceRequestImpl implements ConversationalService {
-
- @ConversationID
- protected String conversationId;
-
- @Callback
- protected ConversationalCallback conversationalCallback;
-
- // static area in which to hold conversational data
- private static HashMap conversationalState = new HashMap();
-
- // a static member variable that records the number of times this service is called
- public static StringBuffer calls = new StringBuffer();
-
- @Init
- public void init(){
- calls.append("init,");
- }
-
- @Destroy
- public void destroy(){
- calls.append("destroy,");
- }
-
- public void initializeCount(int count){
- calls.append("initializeCount,");
- Integer conversationalCount = new Integer(count);
- conversationalState.put(conversationId, conversationalCount);
- }
-
- public void incrementCount(){
- calls.append("incrementCount,");
- Integer conversationalCount = conversationalState.get(conversationId);
- conversationalCount++;
- conversationalState.put(conversationId, conversationalCount);
- }
-
- public int retrieveCount(){
- calls.append("retrieveCount,");
- Integer count = conversationalState.get(conversationId);
- if (count != null){
- return count.intValue();
- } else {
- return -999;
- }
- }
-
- public void businessException() throws Exception {
- throw new Exception("Business Exception");
- }
-
- public void initializeCountCallback(int count){
- calls.append("initializeCountCallback,");
- initializeCount(count);
- conversationalCallback.initializeCount(count);
- }
-
- public void incrementCountCallback(){
- calls.append("incrementCountCallback,");
- incrementCount();
- conversationalCallback.incrementCount();
- }
-
- public int retrieveCountCallback(){
- calls.append("retrieveCountCallback,");
- return conversationalCallback.retrieveCount();
- }
-
- public void businessExceptionCallback() throws Exception {
- calls.append("businessExceptionCallback,");
- conversationalCallback.businessException();
- }
-
- public String endConversation(){
- calls.append("endConversation,");
- conversationalState.remove(conversationId);
- return conversationId;
- }
-
- public String endConversationCallback(){
- calls.append("endConversationCallback,");
- return conversationalCallback.endConversation();
- }
-}
diff --git a/tags/java/sca/1.3.1-RC0/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulImpl.java b/tags/java/sca/1.3.1-RC0/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulImpl.java
deleted file mode 100644
index efcbdff06f..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulImpl.java
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.itest.conversational.impl;
-
-import org.apache.tuscany.sca.itest.conversational.ConversationalCallback;
-import org.apache.tuscany.sca.itest.conversational.ConversationalService;
-import org.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.ConversationAttributes;
-import org.osoa.sca.annotations.ConversationID;
-import org.osoa.sca.annotations.Destroy;
-import org.osoa.sca.annotations.Init;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
-
-
-/**
- * The service used when testing stateful conversations
- *
- * @version $Rev: 537240 $ $Date: 2007-05-11 18:35:03 +0100 (Fri, 11 May 2007) $
- */
-@Service(ConversationalService.class)
-@Scope("CONVERSATION")
-@ConversationAttributes(maxAge="10 minutes",
- maxIdleTime="5 minutes",
- singlePrincipal=false)
-public class ConversationalServiceStatefulImpl implements ConversationalService {
-
- @ConversationID
- protected String conversationId;
-
- @Callback
- protected ConversationalCallback conversationalCallback;
-
- // local count - accumulates during the conversation
- private int count = 0;
-
- // a static member variable that records the number of times this service is called
- public static StringBuffer calls = new StringBuffer();
-
- @Init
- public void init(){
- calls.append("init,");
- }
-
- @Destroy
- public void destroy(){
- calls.append("destroy,");
- }
-
- public void initializeCount(int count){
- calls.append("initializeCount,");
- this.count = count;
- }
-
- public void incrementCount(){
- calls.append("incrementCount,");
- count++;
- }
-
- public int retrieveCount(){
- calls.append("retrieveCount,");
- return count;
- }
-
- public void businessException() throws Exception {
- throw new Exception("Business Exception");
- }
-
- public void initializeCountCallback(int count){
- calls.append("initializeCountCallback,");
- this.count = count;
- conversationalCallback.initializeCount(count);
- }
-
- public void incrementCountCallback(){
- calls.append("incrementCountCallback,");
- count++;
- conversationalCallback.incrementCount();
- }
-
- public int retrieveCountCallback(){
- calls.append("retrieveCountCallback,");
- return conversationalCallback.retrieveCount();
- }
-
- public void businessExceptionCallback() throws Exception {
- calls.append("businessExceptionCallback,");
- conversationalCallback.businessException();
- }
-
- public String endConversation(){
- calls.append("endConversation,");
- count = 0;
- return conversationId;
- }
-
- public String endConversationCallback(){
- calls.append("endConversationCallback,");
- return conversationalCallback.endConversation();
- }
-}
diff --git a/tags/java/sca/1.3.1-RC0/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulNonConversationalCallbackImpl.java b/tags/java/sca/1.3.1-RC0/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulNonConversationalCallbackImpl.java
deleted file mode 100644
index 8454b3846b..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatefulNonConversationalCallbackImpl.java
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.itest.conversational.impl;
-
-import org.apache.tuscany.sca.itest.conversational.ConversationalServiceNonConversationalCallback;
-import org.apache.tuscany.sca.itest.conversational.NonConversationalCallback;
-import org.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.ConversationAttributes;
-import org.osoa.sca.annotations.ConversationID;
-import org.osoa.sca.annotations.Destroy;
-import org.osoa.sca.annotations.Init;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
-
-
-/**
- * The service used when testing stateful conversations
- *
- * @version $Rev: 537240 $ $Date: 2007-05-11 18:35:03 +0100 (Fri, 11 May 2007) $
- */
-@Service(ConversationalServiceNonConversationalCallback.class)
-@Scope("CONVERSATION")
-@ConversationAttributes(maxAge="10 minutes",
- maxIdleTime="5 minutes",
- singlePrincipal=false)
-public class ConversationalServiceStatefulNonConversationalCallbackImpl implements ConversationalServiceNonConversationalCallback {
-
- @ConversationID
- protected String conversationId;
-
- @Callback
- protected NonConversationalCallback nonConversationalCallback;
-
- // local count - accumulates during the conversation
- private int count = 0;
-
- // a static member variable that records the number of times this service is called
- public static StringBuffer calls = new StringBuffer();
-
- @Init
- public void init(){
- calls.append("init,");
- }
-
- @Destroy
- public void destroy(){
- calls.append("destroy,");
- }
-
- public void initializeCount(int count){
- calls.append("initializeCount,");
- this.count = count;
- }
-
- public void incrementCount(){
- calls.append("incrementCount,");
- count++;
- }
-
- public int retrieveCount(){
- calls.append("retrieveCount,");
- return count;
- }
-
- public void businessException() throws Exception {
- throw new Exception("Business Exception");
- }
-
- public void initializeCountCallback(int count){
- calls.append("initializeCountCallback,");
- this.count = count;
- nonConversationalCallback.initializeCount(count);
- }
-
- public void incrementCountCallback(){
- calls.append("incrementCountCallback,");
- count++;
- nonConversationalCallback.incrementCount();
- }
-
- public int retrieveCountCallback(){
- calls.append("retrieveCountCallback,");
- return nonConversationalCallback.retrieveCount();
- }
-
- public void businessExceptionCallback() throws Exception {
- calls.append("businessExceptionCallback,");
- nonConversationalCallback.businessException();
- }
-
- public String endConversation(){
- calls.append("endConversation,");
- count = 0;
- return conversationId;
- }
-
- public String endConversationCallback(){
- calls.append("endConversationCallback,");
- return nonConversationalCallback.endConversation();
- }
-}
diff --git a/tags/java/sca/1.3.1-RC0/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessImpl.java b/tags/java/sca/1.3.1-RC0/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessImpl.java
deleted file mode 100644
index 07186c91e1..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessImpl.java
+++ /dev/null
@@ -1,123 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.itest.conversational.impl;
-
-import java.util.HashMap;
-
-import org.apache.tuscany.sca.itest.conversational.ConversationalCallback;
-import org.apache.tuscany.sca.itest.conversational.ConversationalService;
-import org.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.ConversationID;
-import org.osoa.sca.annotations.Destroy;
-import org.osoa.sca.annotations.Init;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
-
-
-/**
- * The service used when testing stateful conversations
- *
- * @version $Rev: 537240 $ $Date: 2007-05-11 18:35:03 +0100 (Fri, 11 May 2007) $
- */
-@Service(ConversationalService.class)
-@Scope("STATELESS")
-public class ConversationalServiceStatelessImpl implements ConversationalService {
-
- @ConversationID
- protected String conversationId;
-
- @Callback
- protected ConversationalCallback conversationalCallback;
-
- // static area in which to hold conversational data
- private static HashMap conversationalState = new HashMap();
-
- // a static member variable that records the number of times this service is called
- public static StringBuffer calls = new StringBuffer();
-
- @Init
- public void init(){
- calls.append("init,");
- }
-
- @Destroy
- public void destroy(){
- calls.append("destroy,");
- }
-
- public void initializeCount(int count){
- calls.append("initializeCount,");
- Integer conversationalCount = new Integer(count);
- conversationalState.put(conversationId, conversationalCount);
- }
-
- public void incrementCount(){
- calls.append("incrementCount,");
- Integer conversationalCount = conversationalState.get(conversationId);
- conversationalCount++;
- conversationalState.put(conversationId, conversationalCount);
- }
-
- public int retrieveCount(){
- calls.append("retrieveCount,");
- Integer count = conversationalState.get(conversationId);
- if (count != null){
- return count.intValue();
- } else {
- return -999;
- }
- }
-
- public void businessException() throws Exception {
- throw new Exception("Business Exception");
- }
-
- public void initializeCountCallback(int count){
- calls.append("initializeCountCallback,");
- initializeCount(count);
- conversationalCallback.initializeCount(count);
- }
-
- public void incrementCountCallback(){
- calls.append("incrementCountCallback,");
- incrementCount();
- conversationalCallback.incrementCount();
- }
-
- public int retrieveCountCallback(){
- calls.append("retrieveCountCallback,");
- return conversationalCallback.retrieveCount();
- }
-
- public void businessExceptionCallback() throws Exception {
- calls.append("businessExceptionCallback,");
- conversationalCallback.businessException();
- }
-
- public String endConversation(){
- calls.append("endConversation,");
- conversationalState.remove(conversationId);
- return conversationId;
- }
-
- public String endConversationCallback(){
- calls.append("endConversationCallback,");
- return conversationalCallback.endConversation();
- }
-}
diff --git a/tags/java/sca/1.3.1-RC0/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessScopeImpl.java b/tags/java/sca/1.3.1-RC0/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessScopeImpl.java
deleted file mode 100644
index 344aa99dff..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/ConversationalServiceStatelessScopeImpl.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * 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.
- */
-
-package org.apache.tuscany.sca.itest.conversational.impl;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.tuscany.sca.itest.conversational.ConversationalService;
-import org.osoa.sca.annotations.ConversationID;
-import org.osoa.sca.annotations.Service;
-
-@Service(ConversationalService.class)
-public class ConversationalServiceStatelessScopeImpl implements ConversationalService {
-
- @ConversationID
- protected String cid;
-
- static Map state = new HashMap();
-
- public void destroy() {
- // TODO Auto-generated method stub
-
- }
-
- public String endConversation() {
- state.remove(cid);
- return cid;
- }
-
- public String endConversationCallback() {
- // TODO Auto-generated method stub
- return null;
-
- }
-
- public void incrementCount() {
- state.put(cid, Integer.valueOf(state.get(cid)+1));
- }
-
- public void businessException() throws Exception {
- throw new Exception("Business Exception");
- }
-
- public void incrementCountCallback() {
- // TODO Auto-generated method stub
-
- }
-
- public void init() {
- // TODO Auto-generated method stub
-
- }
-
- public void initializeCount(int count) {
- state.put(cid, Integer.valueOf(count));
- }
-
- public void initializeCountCallback(int count) {
- // TODO Auto-generated method stub
-
- }
-
- public void businessExceptionCallback() throws Exception {
- throw new Exception("Business Exception");
- }
-
- public int retrieveCount() {
- return state.get(cid);
- }
-
- public int retrieveCountCallback() {
- // TODO Auto-generated method stub
- return 0;
- }
-
-}
diff --git a/tags/java/sca/1.3.1-RC0/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/DServiceImpl.java b/tags/java/sca/1.3.1-RC0/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/DServiceImpl.java
deleted file mode 100644
index 8d79bb75e8..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/DServiceImpl.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.itest.conversational.impl;
-
-
-import org.apache.tuscany.sca.itest.conversational.Constants;
-import org.apache.tuscany.sca.itest.conversational.DService;
-import org.osoa.sca.annotations.ConversationID;
-import org.osoa.sca.annotations.EndsConversation;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
-
-/**
- * Simple conversational Service
- */
-@Service(DService.class)
-@Scope("CONVERSATION")
-public class DServiceImpl implements DService {
-
- /**
- * The state for this service
- */
- private String state = "Initial state value";
-
- /**
- * Returns the state for this service.
- *
- * @return The state for this service
- */
- public String getState() {
- return state;
- }
-
- /**
- * Sets the state for this service.
- *
- * @param aState The state for this service
- */
- public void setState(String aState) {
- this.state = aState;
- }
-
- /**
- * Sets the conversation ID for this service
- * @param id The Conversation ID
- */
- @ConversationID
- public void setConversationID(String id) {
- System.out.println ("Setting conversation ID at service = " + id );
- }
-
- public void endConversationViaAnnotatedMethod() {
- System.out.println ("Annotated Ends Conversation");
- }
-}
diff --git a/tags/java/sca/1.3.1-RC0/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/GammaImpl.java b/tags/java/sca/1.3.1-RC0/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/GammaImpl.java
deleted file mode 100644
index d1b769216b..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/conversations/src/main/java/org/apache/tuscany/sca/itest/conversational/impl/GammaImpl.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.itest.conversational.impl;
-
-import java.util.ArrayList;
-
-import org.apache.tuscany.sca.itest.Record;
-import org.apache.tuscany.sca.itest.conversational.Gamma;
-import org.osoa.sca.annotations.ConversationID;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
-
-/**
- * @version $Rev$ $Date$
- */
-
-@Service(Gamma.class)
-@Scope("CONVERSATION")
-public class GammaImpl implements Gamma {
- @ConversationID
- public String conversationId;
-
- private ArrayList list;
-
- public void start(int param) {
- list = new ArrayList();
- fillList(param, conversationId);
- }
-
- public boolean hasNext() {
- return !list.isEmpty();
- }
-
- public Record next() {
- return list.remove(0);
- }
-
- public void stop() {
- list = null;
- }
-
- private void fillList(int param, String cid) {
- for (int i = 0; i < param; i++) {
- Record record = new Record();
- record.id = "id_" + i;
- record.conversationId = cid;
- list.add(record);
- }
- }
-}
diff --git a/tags/java/sca/1.3.1-RC0/itest/conversations/src/main/resources/ConversationAge.composite b/tags/java/sca/1.3.1-RC0/itest/conversations/src/main/resources/ConversationAge.composite
deleted file mode 100644
index abd1c35ced..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/conversations/src/main/resources/ConversationAge.composite
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/conversations/src/main/resources/ConversationUniqueId.composite b/tags/java/sca/1.3.1-RC0/itest/conversations/src/main/resources/ConversationUniqueId.composite
deleted file mode 100644
index 831449a079..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/conversations/src/main/resources/ConversationUniqueId.composite
+++ /dev/null
@@ -1,53 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/conversations/src/main/resources/conversationId.composite b/tags/java/sca/1.3.1-RC0/itest/conversations/src/main/resources/conversationId.composite
deleted file mode 100644
index e61eb08194..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/conversations/src/main/resources/conversationId.composite
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
-
-
-
-
-
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/conversations/src/main/resources/conversationLifetime.composite b/tags/java/sca/1.3.1-RC0/itest/conversations/src/main/resources/conversationLifetime.composite
deleted file mode 100644
index 3b79dc43d9..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/conversations/src/main/resources/conversationLifetime.composite
+++ /dev/null
@@ -1,33 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/conversations/src/main/resources/conversational.composite b/tags/java/sca/1.3.1-RC0/itest/conversations/src/main/resources/conversational.composite
deleted file mode 100644
index 4da3ce74d5..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/conversations/src/main/resources/conversational.composite
+++ /dev/null
@@ -1,99 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationIdTestCase.java b/tags/java/sca/1.3.1-RC0/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationIdTestCase.java
deleted file mode 100644
index 3e750bdd1e..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationIdTestCase.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * 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.
- */
-
-package org.apache.tuscany.sca.itest.conversational;
-
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-
-public class ConversationIdTestCase {
-
- private SCADomain domain;
-
- @Before
- public void setUp() throws Exception {
- domain = SCADomain.newInstance("conversationId.composite");
-
- }
-
- @After
- public void tearDown() throws Exception {
- if (domain != null) {
- domain.close();
- }
- }
-
- @Test
- public void testConversationId() {
- ConversationIdService service =
- domain.getService(ConversationIdService.class, "ConversationIdComponent");
- Assert.assertNotNull(service.getCIDField());
- Assert.assertNotNull(service.getCIDSetter());
- }
-
-}
diff --git a/tags/java/sca/1.3.1-RC0/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationLifetimeTestCase.java b/tags/java/sca/1.3.1-RC0/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationLifetimeTestCase.java
deleted file mode 100644
index 326a833a42..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationLifetimeTestCase.java
+++ /dev/null
@@ -1,203 +0,0 @@
-/*
- * 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.
- */
-
-package org.apache.tuscany.sca.itest.conversational;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-
-public class ConversationLifetimeTestCase {
-
- private SCADomain domain;
-
- @Before
- public void setUp() throws Exception {
- domain = SCADomain.newInstance("conversationLifetime.composite");
- }
-
- @After
- public void tearDown() throws Exception {
- if (domain != null) {
- domain.close();
- }
- }
-
- /**
- * Following a clarification re. the wording of the Java Common Annotations and APIs 1.00 Specification
- * (see TUSCANY-2055) the following is accepted to be the intended operation
- *
- * Whether the conversation ID is chosen by the user or is generated by the system, the client
- * may access the conversation ID by calling getConversationID() on the current conversation object.
- *
- * ServiceReference.getConversationID() - Returns the id supplied by the user that will be associated with
- * future conversations initiated through this reference, or null if no ID has been set by the user.
- *
- * ServiceReference.setConversationID(Object conversationId) - Set an ID, supplied by the user, to associate with any future conversation
- * started through this reference. If the value supplied is null then the id will be generated
- * by the implementation. Throws an IllegalStateException if a conversation is currently
- * associated with this reference.
- *
- */
-
- /**
- * Verify that ServiceReference.getConversationID() returns null before a conversation
- * ID has been set manually.
- */
- @Test
- public void getConversationID() {
- CService service = domain.getService(CService.class, "ConversationalCComponent");
- service.getState();
- Assert.assertNull(service.getConversationID());
- }
-
- /**
- * Verify that ServiceReference.getConversationID() returns any value previous set through the
- * setConversationID() API.
- */
- @Test
- public void getConversationID2() {
- String userProvidedID = "A conversation ID";
- CService service = domain.getService(CService.class, "ConversationalCComponent");
- service.setConversationID(userProvidedID);
- service.getState();
- Assert.assertEquals(service.getConversationID(), userProvidedID);
- }
-
- /**
- * Whether the conversation ID is chosen by the user or is generated by the system, the client
- * may access the conversation ID by calling getConversationID() on the current conversation object.
- * Here test the manually set conversationID
- */
- @Test
- public void getConversationID3() {
- String userProvidedID = "A conversation ID";
- CService service = domain.getService(CService.class, "ConversationalCComponent");
- service.setConversationID(userProvidedID);
- service.getState();
- Assert.assertEquals(service.getConversationObjectConversationId(), userProvidedID);
- }
-
- /**
- * Whether the conversation ID is chosen by the user or is generated by the system, the client
- * may access the conversation ID by calling getConversationID() on the current conversation object.
- * Here test the auto generated conversationId
- */
- @Test
- public void getConversationID4() {
- CService service = domain.getService(CService.class, "ConversationalCComponent");
- service.getState();
- Assert.assertNotNull(service.getConversationObjectConversationId());
- }
-
- /**
- * Java Common Annotations and APIs 1.00 Specification line 494-495 Verify:
- * If a method is invoked on a service reference after an
- * "@EndsConversation" method has been called then a new conversation will
- * automatically be started.
- */
- @Test
- public void implicitStartNewConversationAfterEnd() {
- CService service = domain.getService(CService.class, "ConversationalCComponent");
- service.getState();
- Object firstID = service.getConversationObjectConversationId();
- service.endConversationViaAnnotatedMethod();
- service.getState();
- Assert.assertNotSame(firstID, service.getConversationObjectConversationId());
- }
-
- /**
- * Java Common Annotations and APIs 1.00 Specification line 495-495 Verify: If a
- * method is invoked on a service reference after an "@EndsConversation"
- * method has been called then a new conversation will automatically be
- * started. Note: Uses Conversation.end() rather than "@EndsConversation"
- */
- @Test
- public void implicitStartNewConversationAfterEnd2() {
- CService service = domain.getService(CService.class, "ConversationalCComponent");
- service.getState();
- Object firstID = service.getConversationObjectConversationId();
- service.endConversation();
- service.getState();
- Assert.assertNotSame(firstID, service.getConversationObjectConversationId());
- }
-
- /**
- * Java Common Annotations and APIs 1.00 Specification line 495-497 Verify:
- * If ServiceReference.getConversationID() is called after the
- * "@EndsConversation" method is called, but before the next conversation
- * has been started, it will return null.
- */
- @Test
- public void nullConversationIDAfterEndConversation() {
- CService service = domain.getService(CService.class, "ConversationalCComponent");
- service.getState();
- service.endConversationViaAnnotatedMethod();
- Assert.assertNull(service.getConversationObjectConversationId());
- }
-
- /**
- * Java Common Annotations and APIs 1.00 Specification line 495-497 Verify:
- * If ServiceReference.getConversationID() is called after the
- * "@EndsConversation" method is called, but before the next conversation
- * has been started, it will return null. Note: Uses explicit set of Conversation ID
- */
- @Test
- public void nullConversationIDAfterEndConversation1a() {
- CService service = domain.getService(CService.class, "ConversationalCComponent");
- service.setConversationID("User provided ID");
- service.getState();
- service.endConversationViaAnnotatedMethod();
- Assert.assertNull(service.getConversationObjectConversationId());
- }
-
- /**
- * Java Common Annotations and APIs 1.00 Specification line 495-497 Verify: If
- * ServiceReference.getConversationID() is called after the
- * "@EndsConversationmethod" is called, but before the next conversation has
- * been started, it will return null. Note: Uses Conversation.end() rather
- * than "@EndsConversation"
- */
- @Test
- public void nullConversationIDAfterEndConversation2() {
- CService service = domain.getService(CService.class, "ConversationalCComponent");
- service.getState();
- service.endConversation();
- Assert.assertNull(service.getConversationObjectConversationId());
- }
-
- /**
- * Java Common Annotations and APIs 1.00 Specification line 495-497 Verify: If
- * ServiceReference.getConversationID() is called after the
- * "@EndsConversationmethod" is called, but before the next conversation has
- * been started, it will return null. Note: Uses Conversation.end() rather
- * than "@EndsConversation". Note 2: Uses explicit set of Conversation ID
- */
- @Test
- public void nullConversationIDAfterEndConversation2a() {
- CService service = domain.getService(CService.class, "ConversationalCComponent");
- service.setConversationID("User provided ID");
- service.getState();
- service.endConversation();
- Assert.assertNull(service.getConversationObjectConversationId());
- }
-
-}
diff --git a/tags/java/sca/1.3.1-RC0/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationUniqueIdTestCase.java b/tags/java/sca/1.3.1-RC0/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationUniqueIdTestCase.java
deleted file mode 100644
index 431962221a..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationUniqueIdTestCase.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * 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.
- */
-
-package org.apache.tuscany.sca.itest.conversational;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.apache.tuscany.sca.itest.TestResult;
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-
-/**
- * @version $Rev$ $Date$
- */
-public class ConversationUniqueIdTestCase {
-
- private SCADomain domain;
-
- @Before
- public void setUp() throws Exception {
- domain = SCADomain.newInstance("ConversationUniqueId.composite");
- }
-
- @After
- public void tearDown() throws Exception {
- if (domain != null) {
- domain.close();
- }
- }
-
- @Test
- public void testConversationUniqueId() {
- Alpha alpha = domain.getService(Alpha.class, "Alpha");
- int numConversations = 3;
-
- for(int i = 0; i < numConversations; ++i) {
- alpha.run(5);
- }
-
- // Wait for the conversations to complete
- while (TestResult.getCompleted() < numConversations) {
- try {
- Thread.sleep(1000);
- } catch (InterruptedException e) {
- }
- }
-
- Assert.assertEquals(TestResult.results.size(), numConversations);
- for(Boolean value : TestResult.results.values()) {
- Assert.assertTrue(value);
- }
- }
-
-}
diff --git a/tags/java/sca/1.3.1-RC0/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalAgeTestCase.java b/tags/java/sca/1.3.1-RC0/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalAgeTestCase.java
deleted file mode 100644
index cc31c77873..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalAgeTestCase.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- * 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.
- */
-
-package org.apache.tuscany.sca.itest.conversational;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-import org.osoa.sca.ConversationEndedException;
-
-public class ConversationalAgeTestCase {
-
- private SCADomain domain;
-
- @Before
- public void setUp() throws Exception {
- System.setProperty("org.apache.tuscany.sca.core.scope.ConversationalScopeContainer.ReaperInterval", "2");
- domain = SCADomain.newInstance("ConversationAge.composite");
-
- }
-
- @After
- public void tearDown() throws Exception {
- System.clearProperty("org.apache.tuscany.sca.core.scope.ConversationalScopeContainer.ReaperInterval");
- if (domain != null) {
- domain.close();
- }
- }
-
- @Test
- public void testMaxAge() throws InterruptedException {
-
- ConversationalService conversationalService =
- domain.getService(ConversationalService.class, "ConversationAgeComponent");
-
- Assert.assertEquals(0, conversationalService.retrieveCount());
- conversationalService.initializeCount(42);
- Assert.assertEquals(42, conversationalService.retrieveCount());
- Assert.assertEquals(42, conversationalService.retrieveCount());
- Thread.sleep(500);
- try {
- Assert.assertEquals(42, conversationalService.retrieveCount());
- } catch (ConversationEndedException e) {
- Assert.fail();
- }
- }
-
- @Test
- public void testAgeExpired() throws InterruptedException {
-
- ConversationalService conversationalService =
- domain.getService(ConversationalService.class, "ConversationAgeComponent");
-
- Assert.assertEquals(0, conversationalService.retrieveCount());
- conversationalService.initializeCount(42);
- Assert.assertEquals(42, conversationalService.retrieveCount());
- Assert.assertEquals(42, conversationalService.retrieveCount());
- Thread.sleep(1100);
- try {
- Assert.assertEquals(0, conversationalService.retrieveCount());
- Assert.fail();
- } catch (ConversationEndedException e) {
- // expected
- }
- }
-
- @Test
- public void testMaxIdle() throws InterruptedException {
-
- ConversationalService conversationalService =
- domain.getService(ConversationalService.class, "ConversationIdleComponent");
-
- Assert.assertEquals(0, conversationalService.retrieveCount());
- conversationalService.initializeCount(42);
- Assert.assertEquals(42, conversationalService.retrieveCount());
- Assert.assertEquals(42, conversationalService.retrieveCount());
- Thread.sleep(1100);
- try {
- Assert.assertEquals(0, conversationalService.retrieveCount());
- } catch (ConversationEndedException e) {
- // expected
- }
- }
-
-}
diff --git a/tags/java/sca/1.3.1-RC0/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalJ2SETestCase.java b/tags/java/sca/1.3.1-RC0/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalJ2SETestCase.java
deleted file mode 100644
index 8480e04028..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalJ2SETestCase.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * 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.
- */
-
-package org.apache.tuscany.sca.itest.conversational;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-
-public class ConversationalJ2SETestCase {
-
- private SCADomain domain;
-
- @Before
- public void setUp() throws Exception {
- domain = SCADomain.newInstance("conversational.composite");
-
- }
-
- @After
- public void tearDown() throws Exception {
- if (domain != null) {
- domain.close();
- }
- }
-
- @Test
- public void testStatefulConversation() {
- ConversationalService conversationalService =
- domain.getService(ConversationalService.class, "ConversationalServiceStateful");
-
- conversationalService.initializeCount(1);
- Assert.assertEquals(1, conversationalService.retrieveCount());
- conversationalService.incrementCount();
- Assert.assertEquals(2, conversationalService.retrieveCount());
- conversationalService.endConversation();
-
- Assert.assertEquals(0, conversationalService.retrieveCount());
-
- conversationalService.initializeCount(4);
- Assert.assertEquals(4, conversationalService.retrieveCount());
- conversationalService.incrementCount();
- Assert.assertEquals(5, conversationalService.retrieveCount());
- conversationalService.endConversation();
-
- }
-
- @Test
- public void testStatelessConversation() {
- ConversationalService conversationalService =
- domain.getService(ConversationalService.class, "ConversationalServiceStateless");
-
- conversationalService.initializeCount(1);
- Assert.assertEquals(1, conversationalService.retrieveCount());
- conversationalService.incrementCount();
- Assert.assertEquals(2, conversationalService.retrieveCount());
- conversationalService.endConversation();
-
- conversationalService.initializeCount(4);
- Assert.assertEquals(4, conversationalService.retrieveCount());
- conversationalService.incrementCount();
- Assert.assertEquals(5, conversationalService.retrieveCount());
- conversationalService.endConversation();
-
- }
-}
diff --git a/tags/java/sca/1.3.1-RC0/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalTestCase.java b/tags/java/sca/1.3.1-RC0/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalTestCase.java
deleted file mode 100644
index da359bc296..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/conversations/src/test/java/org/apache/tuscany/sca/itest/conversational/ConversationalTestCase.java
+++ /dev/null
@@ -1,649 +0,0 @@
-/*
- * 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.
- */
-
-package org.apache.tuscany.sca.itest.conversational;
-
-import junit.framework.Assert;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.apache.tuscany.sca.itest.conversational.impl.ConversationalClientStatefulImpl;
-import org.apache.tuscany.sca.itest.conversational.impl.ConversationalClientStatefulNonConversationalCallbackImpl;
-import org.apache.tuscany.sca.itest.conversational.impl.ConversationalClientStatelessImpl;
-import org.apache.tuscany.sca.itest.conversational.impl.ConversationalServiceRequestImpl;
-import org.apache.tuscany.sca.itest.conversational.impl.ConversationalServiceStatefulImpl;
-import org.apache.tuscany.sca.itest.conversational.impl.ConversationalServiceStatefulNonConversationalCallbackImpl;
-import org.apache.tuscany.sca.itest.conversational.impl.ConversationalServiceStatelessImpl;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-public class ConversationalTestCase {
-
- private static SCADomain domain;
- private static ConversationalClient conversationalStatelessClientStatelessService;
- private static ConversationalClient conversationalStatelessClientStatefulService;
- private static ConversationalClient conversationalStatefulClientStatelessService;
- private static ConversationalClient conversationalStatefulClientStatefulService;
- private static ConversationalClient conversationalStatelessClientRequestService;
- private static ConversationalClient conversationalStatefulClientNonConversationalCallbackStatelessService;
-
- @BeforeClass
- public static void setUp() throws Exception {
- try {
- domain = SCADomain.newInstance("conversational.composite");
-
- conversationalStatelessClientStatelessService = domain.getService(ConversationalClient.class,
- "ConversationalStatelessClientStatelessService");
-
- conversationalStatelessClientStatefulService = domain.getService(ConversationalClient.class,
- "ConversationalStatelessClientStatefulService");
-
- conversationalStatefulClientStatelessService = domain.getService(ConversationalClient.class,
- "ConversationalStatefulClientStatelessService");
-
- conversationalStatefulClientStatefulService = domain.getService(ConversationalClient.class,
- "ConversationalStatefulClientStatefulService");
- conversationalStatelessClientRequestService = domain.getService(ConversationalClient.class,
- "ConversationalStatelessClientRequestService");
- conversationalStatefulClientNonConversationalCallbackStatelessService = domain.getService(ConversationalClient.class,
- "ConversationalStatefulClientNonConversationalCallbackStatefulService");
-
- } catch(Exception ex) {
- System.err.println(ex.toString());
- }
-
- }
-
- @AfterClass
- public static void tearDown() throws Exception {
- domain.close();
- }
-
- private void resetCallStack() {
-
- // reset the place where we record the sequence of calls passing
- // through each component instance
- ConversationalServiceStatelessImpl.calls = new StringBuffer();
- ConversationalServiceStatefulImpl.calls = new StringBuffer();
- ConversationalClientStatelessImpl.calls = new StringBuffer();
- ConversationalClientStatefulImpl.calls = new StringBuffer();
- ConversationalClientStatefulNonConversationalCallbackImpl.calls = new StringBuffer();
- ConversationalServiceStatefulNonConversationalCallbackImpl.calls = new StringBuffer();
-
- }
-
- // stateless client stateful service tests
- // =======================================
- @Test
- public void testStatelessStatefulConversationFromInjectedReference() {
- int count = conversationalStatelessClientStatefulService.runConversationFromInjectedReference();
- Assert.assertEquals(2, count);
- }
-
- @Test
- public void testStatelessStatefulConversationFromInjectedReference2() {
- int count = conversationalStatelessClientStatefulService.runConversationFromInjectedReference2();
- Assert.assertEquals(2, count);
- }
-
- @Test
- public void testStatelessStatefulConversationFromServiceReference() {
- int count = conversationalStatelessClientStatefulService.runConversationFromServiceReference();
- Assert.assertEquals(2, count);
- }
-
- @Test
- public void testStatelessStatefulConversationWithUserDefinedConversationId() {
- int count = conversationalStatelessClientStatefulService.runConversationWithUserDefinedConversationId();
- Assert.assertEquals(2, count);
- }
-
- @Test
- public void testStatelessStatefulConversationCheckUserDefinedConversationId() {
- String conversationId = conversationalStatelessClientStatefulService.runConversationCheckUserDefinedConversationId();
- Assert.assertEquals("MyConversation2", conversationId);
- }
-
- @Test
- public void testStatelessStatefulConversationCheckingScope() {
- resetCallStack();
- conversationalStatelessClientStatefulService.runConversationCheckingScope();
- Assert.assertEquals("init,initializeCount,incrementCount,retrieveCount,endConversation,destroy,",
- ConversationalServiceStatefulImpl.calls.toString());
- }
-
- @Test
- public void testStatelessStatefulConversationWithCallback() {
- resetCallStack();
- int count = conversationalStatelessClientStatefulService.runConversationWithCallback();
- Assert.assertEquals(0, count);
-
- Assert.assertEquals("init,runConversationWithCallback,init,initializeCount,destroy,init,incrementCount,destroy,init,retrieveCount,destroy,init,endConversation,destroy,destroy,",
- ConversationalClientStatelessImpl.calls.toString());
- }
-
- //@Test
- public void testStatelessStatefulConversationHavingPassedReference() {
- int count = conversationalStatelessClientStatefulService.runConversationHavingPassedReference();
- Assert.assertEquals(3, count);
- }
-
- @Test
- public void testStatelessStatefulConversationBusinessException() {
- String message = conversationalStatelessClientStatefulService.runConversationBusinessException();
- Assert.assertEquals("Business Exception", message);
- }
-
- @Test
- public void testStatelessStatefulConversationBusinessExceptionCallback() {
- String message = conversationalStatelessClientStatefulService.runConversationBusinessExceptionCallback();
- Assert.assertEquals("Business Exception", message);
- }
-
- @Test
- public void testStatelessStatefulConversationCallingEndedConversation() {
- int count = conversationalStatelessClientStatefulService.runConversationCallingEndedConversation();
- Assert.assertEquals(0, count);
- }
-
- @Test
- public void testStatelessStatefulConversationCallingEndedConversationCallback() {
- int count = conversationalStatelessClientStatefulService.runConversationCallingEndedConversationCallback();
- Assert.assertEquals(0, count);
- }
-
- @Test
- public void testStatelessStatefulConversationCallingEndedConversationCheckConversationId() {
- String id = conversationalStatelessClientStatefulService.runConversationCallingEndedConversationCheckConversationId();
- Assert.assertEquals(null, id);
- }
-
- //@Test
- public void testStatelessStatefulConversationCallingEndedConversationCallbackCheckConversationId() {
- String id = conversationalStatelessClientStatefulService.runConversationCallingEndedConversationCallbackCheckConversationId();
- Assert.assertEquals(null, id);
- }
-
- // stateless client stateless service tests
- // ========================================
- @Test
- public void testStatelessStatelessConversationFromInjectedReference() {
- int count = conversationalStatelessClientStatelessService.runConversationFromInjectedReference();
- Assert.assertEquals(2, count);
- }
-
- @Test
- public void testStatelessStatelessConversationFromInjectedReference2() {
- int count = conversationalStatelessClientStatelessService.runConversationFromInjectedReference2();
- Assert.assertEquals(2, count);
- }
-
- @Test
- public void testStatelessStatelessConversationFromServiceReference() {
- int count = conversationalStatelessClientStatelessService.runConversationFromServiceReference();
- Assert.assertEquals(2, count);
- }
-
- @Test
- public void testStatelessStatelessConversationWithUserDefinedConversationId() {
- int count = conversationalStatelessClientStatelessService.runConversationWithUserDefinedConversationId();
- Assert.assertEquals(2, count);
- }
- @Test
- public void testStatelessStatelessConversationCheckUserDefinedConversationId() {
- String conversationId = conversationalStatelessClientStatelessService.runConversationCheckUserDefinedConversationId();
- Assert.assertEquals("MyConversation2", conversationId);
- }
-
- @Test
- public void testStatelessStatelessConversationCheckingScope() {
- resetCallStack();
- conversationalStatelessClientStatelessService.runConversationCheckingScope();
- Assert.assertEquals("init,initializeCount,destroy,init,incrementCount,destroy,init,retrieveCount,destroy,init,endConversation,destroy,",
- ConversationalServiceStatelessImpl.calls.toString());
- }
-
- @Test
- public void testStatelessStatelessConversationWithCallback() {
- resetCallStack();
- int count = conversationalStatelessClientStatelessService.runConversationWithCallback();
- Assert.assertEquals(0, count);
-
- Assert.assertEquals("init,runConversationWithCallback,init,initializeCount,destroy,init,incrementCount,destroy,init,retrieveCount,destroy,init,endConversation,destroy,destroy,",
- ConversationalClientStatelessImpl.calls.toString());
- }
- //@Test
- public void testStatelessStatelessConversationHavingPassedReference() {
- int count = conversationalStatelessClientStatelessService.runConversationHavingPassedReference();
- Assert.assertEquals(3, count);
- }
-
- @Test
- public void testStatelessStatelessConversationCallingEndedConversation() {
- int count = conversationalStatelessClientStatelessService.runConversationCallingEndedConversation();
- Assert.assertEquals(-999, count);
- }
-
- @Test
- public void testStatelessStatelessConversationCallingEndedConversationCallback() {
- int count = conversationalStatelessClientStatelessService.runConversationCallingEndedConversationCallback();
- Assert.assertEquals(0, count);
- }
-
- @Test
- public void testStatelessStatelessConversationCallingEndedConversationCheckConversationId() {
- String id = conversationalStatelessClientStatelessService.runConversationCallingEndedConversationCheckConversationId();
- Assert.assertEquals(null, id);
- }
-
- //@Test
- public void testStatelessStatelessConversationCallingEndedConversationCallbackCheckConversationId() {
- String id = conversationalStatelessClientStatelessService.runConversationCallingEndedConversationCallbackCheckConversationId();
- Assert.assertEquals(null, id);
- }
-
- // stateful client stateful service tests
- // ======================================
- @Test
- public void testStatefulStatefulConversationFromInjectedReference() {
- int count = conversationalStatefulClientStatefulService.runConversationFromInjectedReference();
- Assert.assertEquals(2, count);
- }
-
- @Test
- public void testStatefulStatefulConversationFromInjectedReference2() {
- int count = conversationalStatefulClientStatefulService.runConversationFromInjectedReference2();
- Assert.assertEquals(2, count);
- }
-
- @Test
- public void testStatefulStatefulConversationFromServiceReference() {
- int count = conversationalStatefulClientStatefulService.runConversationFromServiceReference();
- Assert.assertEquals(2, count);
- }
-
- @Test
- public void testStatefulStatefulConversationWithUserDefinedConversationId() {
- int count = conversationalStatefulClientStatefulService.runConversationWithUserDefinedConversationId();
- Assert.assertEquals(2, count);
- }
-
- @Test
- public void testStatefulStatefulConversationCheckUserDefinedConversationId() {
- String conversationId = conversationalStatefulClientStatefulService.runConversationCheckUserDefinedConversationId();
- Assert.assertEquals("MyConversation2", conversationId);
- }
-
- @Test
- public void testStatefulStatefulConversationCheckingScope() {
- resetCallStack();
- conversationalStatefulClientStatefulService.runConversationCheckingScope();
- Assert.assertEquals("init,initializeCount,incrementCount,retrieveCount,endConversation,destroy,",
- ConversationalServiceStatefulImpl.calls.toString());
- }
-
- @Test
- public void testStatefulStatefulConversationWithCallback() {
- resetCallStack();
- int count = conversationalStatefulClientStatefulService.runConversationWithCallback();
- Assert.assertEquals(4, count);
-
- Assert.assertEquals("init,runConversationWithCallback,initializeCount,incrementCount,retrieveCount,endConversation,destroy,",
- ConversationalClientStatefulImpl.calls.toString());
- }
-
- //@Test
- public void testStatefulStatefulConversationHavingPassedReference() {
- int count = conversationalStatefulClientStatefulService.runConversationHavingPassedReference();
- Assert.assertEquals(3, count);
- }
-
- @Test
- public void testStatefulStatefulConversationCallingEndedConversation() {
- int count = conversationalStatefulClientStatefulService.runConversationCallingEndedConversation();
- Assert.assertEquals(0, count);
- }
-
- @Test
- public void testStatefulStatefulConversationCallingEndedConversationCallback() {
- int count = conversationalStatefulClientStatefulService.runConversationCallingEndedConversationCallback();
- Assert.assertEquals(0, count);
- }
-
- @Test
- public void testStatefulStatefulConversationCallingEndedConversationCheckConversationId() {
- String id = conversationalStatefulClientStatefulService.runConversationCallingEndedConversationCheckConversationId();
- Assert.assertEquals(null, id);
- }
-
- @Test
- public void testStatefulStatefulConversationCallingEndedConversationCallbackCheckConversationId() {
- String id = conversationalStatefulClientStatefulService.runConversationCallingEndedConversationCallbackCheckConversationId();
- Assert.assertEquals(null, id);
- }
-
- // stateful client stateless service tests
- // =======================================
- @Test
- public void testStatefulStatelessConversationFromInjectedReference() {
- int count = conversationalStatefulClientStatelessService.runConversationFromInjectedReference();
- Assert.assertEquals(2, count);
- }
-
- @Test
- public void testStatefulStatelessConversationFromInjectedReference2() {
- int count = conversationalStatefulClientStatelessService.runConversationFromInjectedReference2();
- Assert.assertEquals(2, count);
- }
-
- @Test
- public void testStatefulStatelessConversationFromServiceReference() {
- int count = conversationalStatefulClientStatelessService.runConversationFromServiceReference();
- Assert.assertEquals(2, count);
- }
-
- @Test
- public void testStatefulStatelessConversationWithUserDefinedConversationId() {
- int count = conversationalStatefulClientStatelessService.runConversationWithUserDefinedConversationId();
- Assert.assertEquals(2, count);
- }
-
- @Test
- public void testStatefulStatelessConversationCheckUserDefinedConversationId() {
- String conversationId = conversationalStatefulClientStatelessService.runConversationCheckUserDefinedConversationId();
- Assert.assertEquals("MyConversation2", conversationId);
- }
-
- @Test
- public void testStatefulStatelessConversationCheckingScope() {
- resetCallStack();
- conversationalStatefulClientStatelessService.runConversationCheckingScope();
- Assert.assertEquals("init,initializeCount,destroy,init,incrementCount,destroy,init,retrieveCount,destroy,init,endConversation,destroy,",
- ConversationalServiceStatelessImpl.calls.toString());
- }
-
- @Test
- public void testStatefulStatelessConversationWithCallback() {
- resetCallStack();
- int count = conversationalStatefulClientStatelessService.runConversationWithCallback();
- Assert.assertEquals(4, count);
-
- Assert.assertEquals("init,runConversationWithCallback,initializeCount,incrementCount,retrieveCount,endConversation,destroy,",
- ConversationalClientStatefulImpl.calls.toString());
- }
-
- //@Test
- public void testStatefulStatelessConversationHavingPassedReference() {
- int count = conversationalStatefulClientStatelessService.runConversationHavingPassedReference();
- Assert.assertEquals(3, count);
- }
-
- @Test
- public void testStatefulStatelessConversationCallingEndedConversation() {
- int count = conversationalStatefulClientStatelessService.runConversationCallingEndedConversation();
- Assert.assertEquals(-999, count);
- }
-
- @Test
- public void testStatefulStatelessConversationCallingEndedConversationCallback() {
- int count = conversationalStatefulClientStatelessService.runConversationCallingEndedConversationCallback();
- Assert.assertEquals(0, count);
- }
-
- @Test
- public void testStatefulStatelessConversationCallingEndedConversationCheckConversationId() {
- String id = conversationalStatefulClientStatelessService.runConversationCallingEndedConversationCheckConversationId();
- Assert.assertEquals(null, id);
- }
-
- @Test
- public void testStatefulStatelessConversationCallingEndedConversationCallbackCheckConversationId() {
- String id = conversationalStatefulClientStatelessService.runConversationCallingEndedConversationCallbackCheckConversationId();
- Assert.assertEquals(null, id);
- }
-
- // stateless client request scope service tests
- // ============================================
- @Test
- public void testStatelessRequestConversationFromInjectedReference() {
- int count = conversationalStatelessClientRequestService.runConversationFromInjectedReference();
- Assert.assertEquals(2, count);
- }
-
- @Test
- public void testStatelessRequestConversationFromInjectedReference2() {
- int count = conversationalStatelessClientRequestService.runConversationFromInjectedReference2();
- Assert.assertEquals(1, count);
- }
-
- @Test
- public void testStatelessRequestConversationFromServiceReference() {
- int count = conversationalStatelessClientRequestService.runConversationFromServiceReference();
- Assert.assertEquals(2, count);
- }
-
- @Test
- public void testStatelessRequestConversationWithUserDefinedConversationId() {
- int count = conversationalStatelessClientRequestService.runConversationWithUserDefinedConversationId();
- Assert.assertEquals(2, count);
- }
-
- //@Test
- public void testStatelessRequestConversationCheckUserDefinedConversationId() {
- String conversationId = conversationalStatelessClientRequestService.runConversationCheckUserDefinedConversationId();
- Assert.assertEquals("MyConversation2", conversationId);
- }
-
- @Test
- public void testStatelessRequestConversationCheckingScope() {
- resetCallStack();
- ConversationalServiceRequestImpl.calls = new StringBuffer();
- conversationalStatelessClientRequestService.runConversationCheckingScope();
- Assert.assertEquals("initializeCount,incrementCount,retrieveCount,endConversation,",
- ConversationalServiceRequestImpl.calls.toString());
- }
-
- @Test
- public void testStatelessRequestConversationWithCallback() {
- resetCallStack();
- ConversationalClientStatelessImpl.calls = new StringBuffer();
- int count = conversationalStatelessClientRequestService.runConversationWithCallback();
- Assert.assertEquals(0, count);
-
- Assert.assertEquals("init,runConversationWithCallback,init,initializeCount,destroy,init,incrementCount,destroy,init,retrieveCount,destroy,init,endConversation,destroy,destroy,",
- ConversationalClientStatelessImpl.calls.toString());
- }
-
- //@Test
- public void testStatelessRequestConversationHavingPassedReference() {
- int count = conversationalStatelessClientRequestService.runConversationHavingPassedReference();
- Assert.assertEquals(3, count);
- }
-
- @Test
- public void testStatelessRequestConversationBusinessException() {
- String message = conversationalStatelessClientRequestService.runConversationBusinessException();
- Assert.assertEquals("Business Exception", message);
- }
-
- @Test
- public void testStatelessRequestConversationBusinessExceptionCallback() {
- String message = conversationalStatelessClientRequestService.runConversationBusinessExceptionCallback();
- Assert.assertEquals("Business Exception", message);
- }
-
- @Test
- public void testStatelessRequestConversationCallingEndedConversation() {
- int count = conversationalStatelessClientRequestService.runConversationCallingEndedConversation();
- Assert.assertEquals(-999, count);
- }
-
- @Test
- public void testStatelessRequestConversationCallingEndedConversationCallback() {
- int count = conversationalStatelessClientRequestService.runConversationCallingEndedConversationCallback();
- Assert.assertEquals(0, count);
- }
-
- @Test
- public void testStatelessRequestConversationCallingEndedConversationCheckConversationId() {
- String id = conversationalStatelessClientRequestService.runConversationCallingEndedConversationCheckConversationId();
- Assert.assertEquals(null, id);
- }
-
- //@Test
- public void testStatelessRequestConversationCallingEndedConversationCallbackCheckConversationId() {
- String id = conversationalStatelessClientRequestService.runConversationCallingEndedConversationCallbackCheckConversationId();
- Assert.assertEquals(null, id);
- }
-
- // stateful client non conversational callback stateful service tests
- // ==================================================================
-
- @Test
- public void testStatefulNonConversationalCallbackStatefulConversationFromInjectedReference() {
- int count = conversationalStatefulClientNonConversationalCallbackStatelessService.runConversationFromInjectedReference();
- Assert.assertEquals(2, count);
- }
-
- @Test
- public void testStatefulNonConversationalCallbackStatefulConversationFromInjectedReference2() {
- int count = conversationalStatefulClientNonConversationalCallbackStatelessService.runConversationFromInjectedReference2();
- Assert.assertEquals(2, count);
- }
-
- @Test
- public void testStatefulNonConversationalCallbackStatefulConversationFromServiceReference() {
- int count = conversationalStatefulClientNonConversationalCallbackStatelessService.runConversationFromServiceReference();
- Assert.assertEquals(2, count);
- }
-
- @Test
- public void testStatefulNonConversationalCallbackStatefulConversationWithUserDefinedConversationId() {
- int count = conversationalStatefulClientNonConversationalCallbackStatelessService.runConversationWithUserDefinedConversationId();
- Assert.assertEquals(2, count);
- }
-
- @Test
- public void testStatefulNonConversationalCallbackStatefulConversationCheckUserDefinedConversationId() {
- String conversationId = conversationalStatefulClientNonConversationalCallbackStatelessService.runConversationCheckUserDefinedConversationId();
- Assert.assertEquals("MyConversation2", conversationId);
- }
-
- @Test
- public void testStatefulNonConversationalCallbackStatefulConversationCheckingScope() {
- resetCallStack();
- conversationalStatefulClientNonConversationalCallbackStatelessService.runConversationCheckingScope();
- Assert.assertEquals("init,initializeCount,incrementCount,retrieveCount,endConversation,destroy,",
- ConversationalServiceStatefulNonConversationalCallbackImpl.calls.toString());
- }
-
- @Test
- public void testStatefulNonConversationalCallbackStatefulConversationWithCallback() {
- resetCallStack();
- int count = conversationalStatefulClientNonConversationalCallbackStatelessService.runConversationWithCallback();
- Assert.assertEquals(0, count);
-
- Assert.assertEquals("init,runConversationWithCallback,init,initializeCount,destroy,init,incrementCount,destroy,init,retrieveCount,destroy,init,endConversation,destroy,",
- ConversationalClientStatefulNonConversationalCallbackImpl.calls.toString());
- }
-
- //@Test
- public void testStatefulNonConversationalCallbackStatefulConversationHavingPassedReference() {
- int count = conversationalStatefulClientNonConversationalCallbackStatelessService.runConversationHavingPassedReference();
- Assert.assertEquals(0, count);
- }
-
- @Test
- public void testStatefulNonConversationalCallbackStatefulConversationCallingEndedConversation() {
- int count = conversationalStatefulClientNonConversationalCallbackStatelessService.runConversationCallingEndedConversation();
- Assert.assertEquals(0, count);
- }
-
- @Test
- public void testStatefulNonConversationalCallbackStatefulConversationCallingEndedConversationCallback() {
- int count = conversationalStatefulClientNonConversationalCallbackStatelessService.runConversationCallingEndedConversationCallback();
- Assert.assertEquals(0, count);
- }
-
- @Test
- public void testStatefulNonConversationalCallbackStatefulConversationCallingEndedConversationCheckConversationId() {
- String id = conversationalStatefulClientNonConversationalCallbackStatelessService.runConversationCallingEndedConversationCheckConversationId();
- Assert.assertEquals(null, id);
- }
-
- @Test
- public void testStatefulNonConversationalCallbackStatefulConversationCallingEndedConversationCallbackCheckConversationId() {
- String id = conversationalStatefulClientNonConversationalCallbackStatelessService.runConversationCallingEndedConversationCallbackCheckConversationId();
- Assert.assertEquals("MyConversation3", id);
- }
-
- private static final String NEW_A_VALUE = "First Instance - TestCode Set state on A";
- private static final String NEW_B_VALUE = "First Instance - TestCode Set state on B";
- private static final String SECOND_NEW_A_VALUE = "Second Instance - TestCode Set state on A";
- private static final String SECOND_NEW_B_VALUE = "Second Instance - TestCode Set state on B";
-
- @Test
- public void testMultipleConversations() {
- //////////
- // Tests on first instance
- //////////
- System.out.println("========= First instance tests =========");
- AService aService = domain.getService(AService.class, "ConversationalAComponent");
-
- // Make sure initial values are correct
- Assert.assertEquals(Constants.A_INITIAL_VALUE, aService.getState());
- Assert.assertEquals(Constants.B_INITIAL_VALUE, aService.getStateOnB());
-
- // Set some new values
- aService.setState(NEW_A_VALUE);
- aService.setStateOnB(NEW_B_VALUE);
-
- // Verify the set worked
- Assert.assertEquals(NEW_A_VALUE, aService.getState());
- Assert.assertEquals(NEW_B_VALUE, aService.getStateOnB());
-
-
- //////////
- // Tests on second instance
- //////////
- System.out.println("========= Second instance tests =========");
-
- // Do another look up
- AService aService2 = domain.getService(AService.class, "ConversationalAComponent");
-
- // Make sure initial values are correct on the second instance
- Assert.assertEquals(Constants.A_INITIAL_VALUE, aService2.getState());
- Assert.assertEquals(Constants.B_INITIAL_VALUE, aService2.getStateOnB());
-
- // Set some new values on the second instance
- aService2.setState(SECOND_NEW_A_VALUE);
- aService2.setStateOnB(SECOND_NEW_B_VALUE);
-
- // Verify the set worked on the second instance
- Assert.assertEquals(SECOND_NEW_A_VALUE, aService2.getState());
- Assert.assertEquals(SECOND_NEW_B_VALUE, aService2.getStateOnB());
-
- // Verify the values have not been changed on the first instance
- Assert.assertEquals(NEW_A_VALUE, aService.getState());
- Assert.assertEquals(NEW_B_VALUE, aService.getStateOnB());
-
- System.out.println("========= Done instance tests =========");
- }
-
-}
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/pom.xml b/tags/java/sca/1.3.1-RC0/itest/databindings/common/pom.xml
deleted file mode 100644
index d4a6b9bb61..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/pom.xml
+++ /dev/null
@@ -1,126 +0,0 @@
-
-
-
-
- org.apache.tuscany.sca
- itest-databindings
- 1.3.1
-
-
- 4.0.0
-
- itest-databindings-common
- 1.3.1
- jar
- Apache Tuscany SCA Databinding Common Integration Tests
-
-
-
-
- true
-
- java.net
- java.net Maven 1.x Repository
- http://download.java.net/maven/1
- legacy
-
-
-
-
-
-
- true
-
- java.net
- java.net Maven 1.x Repository
- http://download.java.net/maven/1
- legacy
-
-
-
-
-
- org.apache.tuscany.sca
- tuscany-databinding-sdo
- ${pom.version}
- compile
-
-
- org.apache.tuscany.sdo
- tuscany-sdo-tools
- 1.1-incubating
- compile
-
-
- velocity
- velocity
- 1.4
- compile
-
-
-
-
-
-
- org.codehaus.mojo
- build-helper-maven-plugin
- 1.0
-
-
- add-test-source
- generate-sources
-
- add-test-source
-
-
-
- target/sdo-source
-
-
-
-
-
-
- org.apache.tuscany.sdo
- tuscany-sdo-plugin
- 1.1-incubating
-
-
- generate-sdo
- generate-sources
-
-
-
- ${basedir}/src/main/resources/generate/generate.xsd
-
-
- true
- true
- true
-
-
- generate
-
-
-
-
-
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/java/org/apache/tuscany/sca/itest/generate/Generate.java b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/java/org/apache/tuscany/sca/itest/generate/Generate.java
deleted file mode 100644
index adb546a1ea..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/java/org/apache/tuscany/sca/itest/generate/Generate.java
+++ /dev/null
@@ -1,181 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.itest.generate;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileWriter;
-import java.util.List;
-import java.util.Properties;
-
-import org.apache.tuscany.generate.GenerateFactory;
-import org.apache.tuscany.generate.GenerateType;
-import org.apache.tuscany.generate.InputFileType;
-import org.apache.tuscany.generate.TemplateType;
-import org.apache.tuscany.sdo.generate.XSD2JavaGenerator;
-import org.apache.tuscany.sdo.util.SDOUtil;
-import org.apache.velocity.VelocityContext;
-import org.apache.velocity.app.Velocity;
-
-import commonj.sdo.helper.HelperContext;
-import commonj.sdo.helper.XMLDocument;
-
-/**
- * Generates test files based on the information in a configuration files (generate.xml)
- * and a set of velocity templates. The process is
- *
- * for each template
- * for each xsd file
- * generate SDOs
- * include the factory into the composite
- * for each type
- * add client iface method
- * add client impl method
- * add service iface method
- * add service impl method
- * add test method
- * add wsdl type and method
- *
- * @version $Rev$ $Date$
- */
-public class Generate {
-
- /**
- * Does all the hard work of running the velocity templates against the
- * the list of types to test. Both the list of templates and the list of
- * XSD files is held in the configuration file (generate.xsd) which lives in the
- * resources/generate directory of the project being generated.
- *
- * @param projectBuildDir the path to the target dir of the project being generated.
- */
- public static void generate(String projectBuildDir) {
- System.out.println(">> Building project from dir: " + projectBuildDir);
- FileInputStream fis = null;
-
- try {
- // Load the config file into a stream
- fis = new FileInputStream(projectBuildDir + "/classes/generate/generate.xml");
-
- // Load the stream into SDO
- // We are just using SDO as a convenient way to parse the XML config file
- HelperContext scope = SDOUtil.createHelperContext();
- GenerateFactory.INSTANCE.register(scope);
- XMLDocument xmlDoc = scope.getXMLHelper().load(fis);
- GenerateType generateType = (GenerateType)xmlDoc.getRootObject();
-
- // Get the file list. This is the list of XSD that is passed into the
- // the velocity templates. Each configured file holds a list of types
- // that the velocity templates expand into appropriate methods and method calls
- List fileList = generateType.getInputFile();
-
- //Initialise velocity ready to generate the various files
- Properties p = new Properties();
- p.setProperty("file.resource.loader.path", projectBuildDir + "/classes/generate");
- Velocity.init(p);
- VelocityContext context = new VelocityContext();
- context.put("fileList", fileList);
-
- List templateList = generateType.getTemplate();
-
- // For each velocity template in the template list pass in the XSD file list
- for ( Object item: templateList){
- TemplateType template = (TemplateType)item;
- context.put("template", template);
- String tmp = template.getTemplateName();
- String filename = projectBuildDir + "/" + template.getTemplateTargetDir() + "/" + tmp.substring(0,tmp.length() - 3);
- File f = new File(filename);
- // Create folders since the package doesn't exist before the code-gen for the 1st time
- f.getParentFile().mkdirs();
- FileWriter fw = new FileWriter(f);
- System.out.println(">> Processing " + template.getTemplateName() + " to " + filename);
- Velocity.mergeTemplate(template.getTemplateName(), context, fw );
- fw.flush();
- fw.close();
- }
-
-
- } catch (Exception e) {
- System.out.println("Exception : " + e.toString());
- e.printStackTrace();
- return;
- }
- }
-
- /**
- * The SDO generator tool does all of the hard work
- *
- * @param projectBuildDir the path to the target dir of the project being generated.
- */
- public static void generateSDO(String projectBuildDir) {
- System.out.println(">> Building SDOs from dir: " + projectBuildDir);
- FileInputStream fis = null;
-
- try {
- // Load the config file into a stream
- fis = new FileInputStream(projectBuildDir + "/classes/generate/generate.xml");
-
- // Load the stream into SDO
- // We are just using SDO as a convenient way to parse the XML config file
- HelperContext scope = SDOUtil.createHelperContext();
- GenerateFactory.INSTANCE.register(scope);
- XMLDocument xmlDoc = scope.getXMLHelper().load(fis);
- GenerateType generateType = (GenerateType)xmlDoc.getRootObject();
-
- // Get the file list. This is the list of XSD that is passed into the
- // the velocity templates. Each configured file holds a list of types
- // that the velocity templates expand into appropriate methods and method calls
- List fileList = generateType.getInputFile();
-
- // for each XSD in the XSD file list generate an SDO.
- XSD2JavaGenerator generator = new XSD2JavaGenerator();
-
- for ( Object item : fileList){
- InputFileType file = (InputFileType)item;
-
- XSD2JavaGenerator.generateFromXMLSchema(projectBuildDir + "/classes/xsd/" + file.getFileName(),
- file.getNamespace(),
- projectBuildDir + "/sdo-source",
- file.getJavaPackage(),
- null, //file.getPrefix(),
- XSD2JavaGenerator.OPTION_NO_CONTAINMENT | XSD2JavaGenerator.OPTION_NO_NOTIFICATION | XSD2JavaGenerator.OPTION_NO_UNSETTABLE);
-
- }
-
- } catch (Exception e) {
- System.out.println("Exception : " + e.toString());
- e.printStackTrace();
- return;
- }
- }
-
- /**
- * The mainline
- *
- * @param args the target directory where project in which files are being generated
- */
- public static void main(String[] args) {
-
- Generate.generate(args[0]);
-
- if (args.length > 1){
- Generate.generateSDO(args[0]);
- }
- }
-
-}
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/generate/DatabindingTestCase.java.vm b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/generate/DatabindingTestCase.java.vm
deleted file mode 100644
index b2346aa973..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/generate/DatabindingTestCase.java.vm
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * 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.
- */
-
-package $template.getJavaPackage();
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import org.osoa.sca.ComponentContext;
-import org.osoa.sca.ServiceReference;
-
-import ${template.getJavaPackage()}.GreeterService;
-
-// Data types
-#foreach($file in $fileList)
-#set($typeList = $file.getType_())
-#foreach($typeInstance in $typeList)
-import $file.getJavaPackage().$typeInstance.getTypeName();
-import $file.getJavaPackage().$file.getFactory();
-#end
-#end
-
-/**
- * Automatically generated test case. Calls the greeter client for a number of
- * bindings and a number of data types.
- *
- * @version $Rev: 511417 $ $Date: 2007-02-25 03:06:42 +0000 (Sun, 25 Feb 2007) $
- */
-public class DatabindingTestCase extends TestCase {
-
- private SCADomain domain;
- private GreeterService greeterClient;
-
- /**
- * Runs before each test method
- */
- protected void setUp() throws Exception {
- domain = SCADomain.newInstance("greeter.composite");
- super.setUp();
- }
-
- /**
- * Runs after each test method
- */
- protected void tearDown() {
- domain.close();
- }
-
- /**
- * Finds the SCA component that relates to the protocol being tested. This test
- * always connects locally to the client component but the client component will
- * connect to the back end component using the appropriate protocol
- *
- * @param ext the protcol required
- */
- private void setUpClient(String ext) throws Exception {
- greeterClient = domain.getService(GreeterService.class, ext + "GreeterServiceClient");
- }
-
- /**
- * Invokes the SDO Greet service using web service bindings with SDO payload
- */
- public void testWSGreet() throws Exception {
- setUpClient("WS");
- greet();
- }
-
- /**
- * Invokes the SDO Greet service using default bindings with SDO payload
- */
- public void testDefaultGreet() throws Exception {
- setUpClient("Default");
- greet();
- }
-
- /**
- * A generic method which, regarless of which client is connected, sends out a
- * series of requrests passing different data types.
- */
- public void greet() {
-#foreach($file in $fileList)
-#set($typeList = $file.getType_())
-#foreach($typeInstance in $typeList)
-
- // test $typeInstance.getTypeName()
- {
- $typeInstance.getTypeName() param = null;
- $typeInstance.getCreateTypeCode()
- $typeInstance.getTypeName() result = greeterClient.greet$typeInstance.getTypeName()(param);
- $typeInstance.getResultComparison()
- }
-#end
-#end
- }
-
-}
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/generate/Greeter.wsdl.vm b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/generate/Greeter.wsdl.vm
deleted file mode 100644
index 88616cc997..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/generate/Greeter.wsdl.vm
+++ /dev/null
@@ -1,103 +0,0 @@
-
-
-
-
-
-
-
-#foreach($file in $fileList)
-
-#end
-
-#foreach($file in $fileList)
-#set($typeList = $file.getType_())
-#foreach($typeInstance in $typeList)
-
-
-
-
-
-
-
-#end
-#end
-
-
-#foreach($file in $fileList)
-#set($typeList = $file.getType_())
-#foreach($typeInstance in $typeList)
-
-
-
-
-
-
-
-#end
-#end
-
-
-#foreach($file in $fileList)
-#set($typeList = $file.getType_())
-#foreach($typeInstance in $typeList)
-
-
-
-
-#end
-#end
-
-
-
-
-#foreach($file in $fileList)
-#set($typeList = $file.getType_())
-#foreach($typeInstance in $typeList)
-
-
-
-
-
-
-
-
-
-#end
-#end
-
-
-
-
-
-
-
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/generate/GreeterService.java.vm b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/generate/GreeterService.java.vm
deleted file mode 100644
index 77a12e92ec..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/generate/GreeterService.java.vm
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * 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.
- */
-
-package $template.getJavaPackage();
-
-#foreach($file in $fileList)
-#set($typeList = $file.getType_())
-#foreach($typeInstance in $typeList)
-import $file.getJavaPackage().$typeInstance.getTypeName();
-#end
-#end
-
-import org.osoa.sca.annotations.Remotable;
-
-/**
- * The automatically generated interface to the service that reflects data objects
- * that are sent to it
- *
- * @version $Rev: 511417 $ $Date: 2007-02-25 03:06:42 +0000 (Sun, 25 Feb 2007) $
- */
-@Remotable
-public interface GreeterService {
-
-#foreach($file in $fileList)
-#set($typeList = $file.getType_())
-#foreach($typeInstance in $typeList)
- /**
- * Take the provided data object, change it slightly and return it
- *
- * @param param the data object to be changed and returned
- * @return the change data object
- */
- $typeInstance.getTypeName() greet$typeInstance.getTypeName()($typeInstance.getTypeName() param);
-#end
-#end
-
-}
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/generate/GreeterServiceClient.java.vm b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/generate/GreeterServiceClient.java.vm
deleted file mode 100644
index ee73db6152..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/generate/GreeterServiceClient.java.vm
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * 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.
- */
-
-package $template.getJavaPackage();
-
-#foreach($file in $fileList)
-#set($typeList = $file.getType_())
-#foreach($typeInstance in $typeList)
-import $file.getJavaPackage().$typeInstance.getTypeName();
-#end
-#end
-
-import org.osoa.sca.annotations.AllowsPassByReference;
-
-/**
- * GreeterServiceClient
- */
-@AllowsPassByReference
-public interface GreeterServiceClient {
-#foreach($file in $fileList)
-#set($typeList = $file.getType_())
-#foreach($typeInstance in $typeList)
- $typeInstance.getTypeName() greet$typeInstance.getTypeName()($typeInstance.getTypeName() param);
-#end
-#end
-}
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/generate/GreeterServiceClientImpl.java.vm b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/generate/GreeterServiceClientImpl.java.vm
deleted file mode 100644
index aab564dc1e..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/generate/GreeterServiceClientImpl.java.vm
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * 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.
- */
-
-package $template.getJavaPackage();
-
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Service;
-
-#foreach($file in $fileList)
-#set($typeList = $file.getType_())
-#foreach($typeInstance in $typeList)
-import $file.getJavaPackage().$typeInstance.getTypeName();
-#end
-#end
-
-/**
- * The automatically generated service that simply forwards data objects on to
- * the GreeterService and passes back the responses
- *
- * @version $Rev: 508831 $ $Date: 2007-02-18 00:12:31 +0000 (Sun, 18 Feb 2007) $
- */
-@Service(GreeterService.class)
-public class GreeterServiceClientImpl implements GreeterService {
-
- /**
- * the reference the the GreeterService that will
- * change each data object slightly and return it
- */
- private GreeterService service;
-
- @Reference
- public void setGreeterService(GreeterService service) {
- this.service = service;
- }
-#foreach($file in $fileList)
-#set($typeList = $file.getType_())
-#foreach($typeInstance in $typeList)
-
- /*
- * (non-Javadoc)
- *
- * @see org.apache.tuscany.sca.itest.sdodatabinding.GreeterService#greet$typeInstance.getTypeName()($typeInstance.getTypeName() param)
- */
- public $typeInstance.getTypeName() greet$typeInstance.getTypeName()($typeInstance.getTypeName() param) {
- return service.greet$typeInstance.getTypeName()(param);
- }
-#end
-#end
-}
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/generate/GreeterServiceImpl.java.vm b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/generate/GreeterServiceImpl.java.vm
deleted file mode 100644
index 5507a0b747..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/generate/GreeterServiceImpl.java.vm
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * 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.
- */
-
-package $template.getJavaPackage();
-
-#foreach($file in $fileList)
-#set($typeList = $file.getType_())
-#foreach($typeInstance in $typeList)
-import $file.getJavaPackage().$typeInstance.getTypeName();
-#end
-#end
-
-import org.osoa.sca.annotations.Service;
-
-/**
- * The automatically generated service implementation that reflects data objects
- * that are sent to it
- *
- * @version $Rev: 511417 $ $Date: 2007-02-25 03:06:42 +0000 (Sun, 25 Feb 2007) $
- */
-@Service(GreeterService.class)
-public class GreeterServiceImpl implements GreeterService {
-#foreach($file in $fileList)
-#set($typeList = $file.getType_())
-#foreach($typeInstance in $typeList)
-
- /**
- * Take the provided data object, change it slightly and return it
- *
- * @param param the data object to be changed and returned
- * @return the change data object
- */
- public $typeInstance.getTypeName() greet$typeInstance.getTypeName()($typeInstance.getTypeName() param) {
- $typeInstance.getModifyTypeCode()
- return param;
- }
-#end
-#end
-}
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/generate/generate.xsd b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/generate/generate.xsd
deleted file mode 100644
index 1fabedf55f..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/generate/generate.xsd
+++ /dev/null
@@ -1,61 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/wsdl/Dummy.txt b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/wsdl/Dummy.txt
deleted file mode 100644
index 8927d725b6..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/wsdl/Dummy.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-A dummy file that causes the target/classes/wsdl dir to be created in the generated test project. This is
-required because the test generator must run in the process-resource phase, after generate.xml has been copied
-into target. The generator needs to write out target/classes/wsdl and will fail the directory isn't there. So
-this file just gets unpacked and forces the directory to be created.
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/Annotation.xml b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/Annotation.xml
deleted file mode 100644
index f1f4346e58..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/Annotation.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
- SimpleTypeWithName
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/Annotation.xsd b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/Annotation.xsd
deleted file mode 100644
index 1fae43eb09..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/Annotation.xsd
+++ /dev/null
@@ -1,38 +0,0 @@
-
-
-
-
-
- SDO 2.0.1
-
- A schema that tests the presence of annotations in schema read by SDO
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/Attribute.xml b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/Attribute.xml
deleted file mode 100644
index c20c80b658..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/Attribute.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/Attribute.xsd b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/Attribute.xsd
deleted file mode 100644
index bd3db2e030..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/Attribute.xsd
+++ /dev/null
@@ -1,39 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/AttributeReference.xml b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/AttributeReference.xml
deleted file mode 100644
index 30e4979dca..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/AttributeReference.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/AttributeReference.xsd b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/AttributeReference.xsd
deleted file mode 100644
index e7738dcff7..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/AttributeReference.xsd
+++ /dev/null
@@ -1,40 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/AttributeWithDefaultValue.xml b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/AttributeWithDefaultValue.xml
deleted file mode 100644
index 9552421e2d..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/AttributeWithDefaultValue.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/AttributeWithDefaultValue.xsd b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/AttributeWithDefaultValue.xsd
deleted file mode 100644
index c7b9655749..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/AttributeWithDefaultValue.xsd
+++ /dev/null
@@ -1,38 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/AttributeWithFixedValue.xml b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/AttributeWithFixedValue.xml
deleted file mode 100644
index 5e5e7fbd55..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/AttributeWithFixedValue.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/AttributeWithFixedValue.xsd b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/AttributeWithFixedValue.xsd
deleted file mode 100644
index 5c455c2ab5..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/AttributeWithFixedValue.xsd
+++ /dev/null
@@ -1,38 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOAliasName.xml b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOAliasName.xml
deleted file mode 100644
index 635e851632..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOAliasName.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOAliasName.xsd b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOAliasName.xsd
deleted file mode 100644
index 004dab4fbb..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOAliasName.xsd
+++ /dev/null
@@ -1,38 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/AttributeWithSDODataType.xml b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/AttributeWithSDODataType.xml
deleted file mode 100644
index 136092951b..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/AttributeWithSDODataType.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/AttributeWithSDODataType.xsd b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/AttributeWithSDODataType.xsd
deleted file mode 100644
index 796f08e1cf..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/AttributeWithSDODataType.xsd
+++ /dev/null
@@ -1,38 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOName.xml b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOName.xml
deleted file mode 100644
index 927b94885c..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOName.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOName.xsd b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOName.xsd
deleted file mode 100644
index 93f83cd0a1..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOName.xsd
+++ /dev/null
@@ -1,38 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertySDOOppositePropertyType.xml b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertySDOOppositePropertyType.xml
deleted file mode 100644
index ea7db70595..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertySDOOppositePropertyType.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertySDOOppositePropertyType.xsd b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertySDOOppositePropertyType.xsd
deleted file mode 100644
index c64323e7e1..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertySDOOppositePropertyType.xsd
+++ /dev/null
@@ -1,38 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertyType.xml b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertyType.xml
deleted file mode 100644
index 85c7d85fd4..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertyType.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertyType.xsd b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertyType.xsd
deleted file mode 100644
index 543f276c50..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertyType.xsd
+++ /dev/null
@@ -1,38 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOString.xml b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOString.xml
deleted file mode 100644
index fcd281539b..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOString.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOString.xsd b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOString.xsd
deleted file mode 100644
index 1610c2b861..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOString.xsd
+++ /dev/null
@@ -1,38 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInAnySimpleType.xml b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInAnySimpleType.xml
deleted file mode 100644
index 36a0760a61..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInAnySimpleType.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
- anySimpleType
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInAnySimpleType.xsd b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInAnySimpleType.xsd
deleted file mode 100644
index 999b72bb35..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInAnySimpleType.xsd
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInAnyType.xml b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInAnyType.xml
deleted file mode 100644
index 5849165fe0..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInAnyType.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInAnyType.xsd b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInAnyType.xsd
deleted file mode 100644
index 71dad561ca..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInAnyType.xsd
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInAnyURI.xml b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInAnyURI.xml
deleted file mode 100644
index 8acf9376d7..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInAnyURI.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
- http://tempuri.org
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInAnyURI.xsd b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInAnyURI.xsd
deleted file mode 100644
index a49987c352..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInAnyURI.xsd
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInBase64Binary.xml b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInBase64Binary.xml
deleted file mode 100644
index a35b6e174a..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInBase64Binary.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
- ABCDEF
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInBase64Binary.xsd b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInBase64Binary.xsd
deleted file mode 100644
index e1995890f9..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInBase64Binary.xsd
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInBoolean.xml b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInBoolean.xml
deleted file mode 100644
index 91cfce51b8..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInBoolean.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
-
- true
- false
- 1
- 0
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInBoolean.xsd b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInBoolean.xsd
deleted file mode 100644
index a2f86ba8c5..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInBoolean.xsd
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInByte.xml b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInByte.xml
deleted file mode 100644
index 907474cd1b..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInByte.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
- 127
- -127
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInByte.xsd b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInByte.xsd
deleted file mode 100644
index a2f6bcfa77..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInByte.xsd
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInDate.xml b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInDate.xml
deleted file mode 100644
index c5820e1a2e..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInDate.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
- 2001-01-01
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInDate.xsd b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInDate.xsd
deleted file mode 100644
index f4d596bfe3..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInDate.xsd
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInDateTime.xml b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInDateTime.xml
deleted file mode 100644
index 0debe2fec5..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInDateTime.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
- 2001-12-31T12:00:00
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInDateTime.xsd b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInDateTime.xsd
deleted file mode 100644
index b5bcfdcfd4..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInDateTime.xsd
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInDecimal.xml b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInDecimal.xml
deleted file mode 100644
index 7f001254cc..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInDecimal.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
- -1.23456789
- 1.23456789
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInDecimal.xsd b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInDecimal.xsd
deleted file mode 100644
index 8d4d106f59..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInDecimal.xsd
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInDouble.xml b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInDouble.xml
deleted file mode 100644
index f875b9f94d..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInDouble.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
- 0.0
- 12.3E-4
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInDouble.xsd b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInDouble.xsd
deleted file mode 100644
index 4c8a39b06c..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInDouble.xsd
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInDuration.xml b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInDuration.xml
deleted file mode 100644
index 7d343d6dda..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInDuration.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
- P1D
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInDuration.xsd b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInDuration.xsd
deleted file mode 100644
index bb12bc04a9..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInDuration.xsd
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInFloat.xml b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInFloat.xml
deleted file mode 100644
index 7a81f3b0dd..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInFloat.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
- 0.0
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInFloat.xsd b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInFloat.xsd
deleted file mode 100644
index f0e1c21233..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInFloat.xsd
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInGDay.xml b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInGDay.xml
deleted file mode 100644
index d35568b3c9..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInGDay.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
- ---01
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInGDay.xsd b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInGDay.xsd
deleted file mode 100644
index 92bd9a4b66..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInGDay.xsd
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInGMonth.xml b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInGMonth.xml
deleted file mode 100644
index 52cdfa8c4e..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInGMonth.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
- --01--
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInGMonth.xsd b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInGMonth.xsd
deleted file mode 100644
index 78d001a585..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInGMonth.xsd
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInGMonthDay.xml b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInGMonthDay.xml
deleted file mode 100644
index 2609a858f7..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInGMonthDay.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
- --01-01
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInGMonthDay.xsd b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInGMonthDay.xsd
deleted file mode 100644
index 38f6c55059..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInGMonthDay.xsd
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInGYear.xml b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInGYear.xml
deleted file mode 100644
index 7868a47ca3..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInGYear.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
- 2001
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInGYear.xsd b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInGYear.xsd
deleted file mode 100644
index 0d65b124ff..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInGYear.xsd
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInGYearMonth.xml b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInGYearMonth.xml
deleted file mode 100644
index 3f5080d49f..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInGYearMonth.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
- 2001-01
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInGYearMonth.xsd b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInGYearMonth.xsd
deleted file mode 100644
index 340555dc5f..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInGYearMonth.xsd
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInHexBinary.xml b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInHexBinary.xml
deleted file mode 100644
index 0deb7af980..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInHexBinary.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
- 0F00
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInHexBinary.xsd b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInHexBinary.xsd
deleted file mode 100644
index 8059fe6da0..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInHexBinary.xsd
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInID.xml b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInID.xml
deleted file mode 100644
index 06c92ce19b..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInID.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
- idvalue0
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInID.xsd b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInID.xsd
deleted file mode 100644
index 7b1f02d1d4..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInID.xsd
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInIDREF.xml b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInIDREF.xml
deleted file mode 100644
index 9bc0cefd0f..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInIDREF.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
- idvalue0
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInIDREF.xsd b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInIDREF.xsd
deleted file mode 100644
index 0c207983bc..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInIDREF.xsd
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInIDREFS.xml b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInIDREFS.xml
deleted file mode 100644
index f91b602f99..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInIDREFS.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
- idvalue0
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInIDREFS.xsd b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInIDREFS.xsd
deleted file mode 100644
index b99bf01b73..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInIDREFS.xsd
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInInt.xml b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInInt.xml
deleted file mode 100644
index c99698e175..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInInt.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
- -2147483648
- 2147483647
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInInt.xsd b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInInt.xsd
deleted file mode 100644
index b5b9b0d1eb..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInInt.xsd
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInInteger.xml b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInInteger.xml
deleted file mode 100644
index 80d22ce057..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInInteger.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
- -2147483648
- 2147483647
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInInteger.xsd b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInInteger.xsd
deleted file mode 100644
index 4902935db5..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInInteger.xsd
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInLanguage.xml b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInLanguage.xml
deleted file mode 100644
index 664bf824b4..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInLanguage.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
- EN
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInLanguage.xsd b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInLanguage.xsd
deleted file mode 100644
index 5d3658d224..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInLanguage.xsd
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInLong.xml b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInLong.xml
deleted file mode 100644
index c5861fa92a..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInLong.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
- -9223372036854775808
- 9223372036854775807
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInLong.xsd b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInLong.xsd
deleted file mode 100644
index 0aa4710057..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInLong.xsd
+++ /dev/null
@@ -1,33 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInNCName.xml b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInNCName.xml
deleted file mode 100644
index 1f95950394..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInNCName.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
- NCName
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInNCName.xsd b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInNCName.xsd
deleted file mode 100644
index 6ee9c435db..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInNCName.xsd
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKEN.xml b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKEN.xml
deleted file mode 100644
index 0297f1aeb4..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKEN.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
- NMTOKEN
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKEN.xsd b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKEN.xsd
deleted file mode 100644
index 56d027bdbb..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKEN.xsd
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKENS.xml b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKENS.xml
deleted file mode 100644
index 81ba1069bd..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKENS.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
- NMTOKENS
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKENS.xsd b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKENS.xsd
deleted file mode 100644
index 866ab73024..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKENS.xsd
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInNOTATION.xml b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInNOTATION.xml
deleted file mode 100644
index 8bb3a08b94..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInNOTATION.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
- tns:BuiltInNotationNotation
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInNOTATION.xsd b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInNOTATION.xsd
deleted file mode 100644
index c7c62f812b..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInNOTATION.xsd
+++ /dev/null
@@ -1,39 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInName.xml b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInName.xml
deleted file mode 100644
index 8235718c5e..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInName.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
- Name
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInName.xsd b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInName.xsd
deleted file mode 100644
index 36caba2f16..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInName.xsd
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInNegativeInteger.xml b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInNegativeInteger.xml
deleted file mode 100644
index 599c428a44..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInNegativeInteger.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
- -1
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInNegativeInteger.xsd b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInNegativeInteger.xsd
deleted file mode 100644
index 389d5a99f0..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInNegativeInteger.xsd
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInNonNegativeInteger.xml b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInNonNegativeInteger.xml
deleted file mode 100644
index 919c4a20ee..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInNonNegativeInteger.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
- 0
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInNonNegativeInteger.xsd b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInNonNegativeInteger.xsd
deleted file mode 100644
index 59887078b5..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInNonNegativeInteger.xsd
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInNonPositiveInteger.xml b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInNonPositiveInteger.xml
deleted file mode 100644
index 79011f26ab..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInNonPositiveInteger.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
- -1
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInNonPositiveInteger.xsd b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInNonPositiveInteger.xsd
deleted file mode 100644
index 5de7d64d7b..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInNonPositiveInteger.xsd
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInNormalizedString.xml b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInNormalizedString.xml
deleted file mode 100644
index c40be9e18b..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInNormalizedString.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
- normalizedString
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInNormalizedString.xsd b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInNormalizedString.xsd
deleted file mode 100644
index d4a78787b8..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInNormalizedString.xsd
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInPositiveInteger.xml b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInPositiveInteger.xml
deleted file mode 100644
index c30434de66..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInPositiveInteger.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
- 1
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInPositiveInteger.xsd b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInPositiveInteger.xsd
deleted file mode 100644
index 5381590cd1..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInPositiveInteger.xsd
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInQName.xml b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInQName.xml
deleted file mode 100644
index 4cd6ea7e72..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInQName.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
- QName
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInQName.xsd b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInQName.xsd
deleted file mode 100644
index e8faf6225b..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInQName.xsd
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInShort.xml b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInShort.xml
deleted file mode 100644
index b4375467c4..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInShort.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
- -32768
- 32767
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInShort.xsd b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInShort.xsd
deleted file mode 100644
index a4f564d9b7..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInShort.xsd
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInString.xml b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInString.xml
deleted file mode 100644
index d30ab85530..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInString.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
- string
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInString.xsd b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInString.xsd
deleted file mode 100644
index 8abb34b5a5..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInString.xsd
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInTime.xml b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInTime.xml
deleted file mode 100644
index 7fd9a061ae..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInTime.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
- 12:00:00
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInTime.xsd b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInTime.xsd
deleted file mode 100644
index 1615976813..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInTime.xsd
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInToken.xml b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInToken.xml
deleted file mode 100644
index cd567ba528..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInToken.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
- token
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInToken.xsd b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInToken.xsd
deleted file mode 100644
index 0beaac571f..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInToken.xsd
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedByte.xml b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedByte.xml
deleted file mode 100644
index 025362defb..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedByte.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
- 0
- 255
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedByte.xsd b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedByte.xsd
deleted file mode 100644
index d6d951fe5d..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedByte.xsd
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedInt.xml b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedInt.xml
deleted file mode 100644
index 5736a8c121..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedInt.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
- 0
- 4294967295
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedInt.xsd b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedInt.xsd
deleted file mode 100644
index 242be1d53b..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedInt.xsd
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedLong.xml b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedLong.xml
deleted file mode 100644
index d728115a77..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedLong.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
- 0
- 18446744073709551615
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedLong.xsd b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedLong.xsd
deleted file mode 100644
index 108e3a8619..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedLong.xsd
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedShort.xml b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedShort.xml
deleted file mode 100644
index d4ffae5e17..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedShort.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
- 0
- 65535
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedShort.xsd b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedShort.xsd
deleted file mode 100644
index 5ee5e0229e..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedShort.xsd
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/ComplexTypeComplexContentRestrictingComplexType.xml b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/ComplexTypeComplexContentRestrictingComplexType.xml
deleted file mode 100644
index 3d5aed5aa8..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/ComplexTypeComplexContentRestrictingComplexType.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
-
-
- SimpleTypeWithName
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/ComplexTypeComplexContentRestrictingComplexType.xsd b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/ComplexTypeComplexContentRestrictingComplexType.xsd
deleted file mode 100644
index e7b80ab11c..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/ComplexTypeComplexContentRestrictingComplexType.xsd
+++ /dev/null
@@ -1,44 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingComplexType.xml b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingComplexType.xml
deleted file mode 100644
index 2b4fe5594e..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingComplexType.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
-
-
- SimpleTypeWithName
- SimpleTypeWithNameExtended
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingComplexType.xsd b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingComplexType.xsd
deleted file mode 100644
index fc4deb63c2..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingComplexType.xsd
+++ /dev/null
@@ -1,43 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingSimpleType.xml b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingSimpleType.xml
deleted file mode 100644
index 03570f41d9..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingSimpleType.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
- ComplexTypeExtendingSimpeTypeElement
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingSimpleType.xsd b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingSimpleType.xsd
deleted file mode 100644
index c754502645..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingSimpleType.xsd
+++ /dev/null
@@ -1,41 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/ComplexTypeSimpleContentRestrictingComplexType.xml b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/ComplexTypeSimpleContentRestrictingComplexType.xml
deleted file mode 100644
index 4603793bfc..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/ComplexTypeSimpleContentRestrictingComplexType.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
- ComplexTypeSimpleContentRestrictingComplexTypeElement
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/ComplexTypeSimpleContentRestrictingComplexType.xsd b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/ComplexTypeSimpleContentRestrictingComplexType.xsd
deleted file mode 100644
index 4bcd2f8c46..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/ComplexTypeSimpleContentRestrictingComplexType.xsd
+++ /dev/null
@@ -1,41 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithAbstract.xml b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithAbstract.xml
deleted file mode 100644
index a6861f803a..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithAbstract.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
-
-
- BaseElement
- ExtensionElement
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithAbstract.xsd b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithAbstract.xsd
deleted file mode 100644
index 8bb251cab2..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithAbstract.xsd
+++ /dev/null
@@ -1,47 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithCDATA.xml b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithCDATA.xml
deleted file mode 100644
index 467ec007ed..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithCDATA.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-
-
-
-
- Some
- ]]>
- Mixed
- SimpleType]]>WithName
- Content
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithCDATA.xsd b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithCDATA.xsd
deleted file mode 100644
index 8d00646678..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithCDATA.xsd
+++ /dev/null
@@ -1,39 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithContent.xml b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithContent.xml
deleted file mode 100644
index 7deafd798a..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithContent.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
-
-
- SimpleTypeWithName
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithContent.xsd b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithContent.xsd
deleted file mode 100644
index 72ac75fee0..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithContent.xsd
+++ /dev/null
@@ -1,37 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithMixed.xml b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithMixed.xml
deleted file mode 100644
index f6208f81b3..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithMixed.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-
-
-
-
- Some
- Mixed
- SimpleTypeWithName
- Content
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithMixed.xsd b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithMixed.xsd
deleted file mode 100644
index 1f26e13673..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithMixed.xsd
+++ /dev/null
@@ -1,39 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenAttributes.xml b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenAttributes.xml
deleted file mode 100644
index 97de7b98eb..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenAttributes.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
-
- SimpleTypeWithName
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenAttributes.xsd b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenAttributes.xsd
deleted file mode 100644
index 67716553d8..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenAttributes.xsd
+++ /dev/null
@@ -1,42 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenContent.xml b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenContent.xml
deleted file mode 100644
index 5941348921..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenContent.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
-
-
-
- Some
- Mixed
- SimpleTypeWithName
- Content
-
-
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenContent.xsd b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenContent.xsd
deleted file mode 100644
index 24d5d09054..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenContent.xsd
+++ /dev/null
@@ -1,39 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOppositeProperty.xml b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOppositeProperty.xml
deleted file mode 100644
index f684d06a4d..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOppositeProperty.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-
-
-
-
- SomeData
-
-
- idvalue2
-
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOppositeProperty.xsd b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOppositeProperty.xsd
deleted file mode 100644
index de4a8a666d..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOppositeProperty.xsd
+++ /dev/null
@@ -1,59 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOAliasName.xml b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOAliasName.xml
deleted file mode 100644
index 242908bd27..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOAliasName.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
-
-
- SimpleTypeWithName
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOAliasName.xsd b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOAliasName.xsd
deleted file mode 100644
index 4c00fbe295..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOAliasName.xsd
+++ /dev/null
@@ -1,38 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOName.xml b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOName.xml
deleted file mode 100644
index 925e8625d5..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOName.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
-
-
- SimpleTypeWithName
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOName.xsd b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOName.xsd
deleted file mode 100644
index b12bec040b..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOName.xsd
+++ /dev/null
@@ -1,38 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOSequence.xml b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOSequence.xml
deleted file mode 100644
index c73708ce46..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOSequence.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
-
-
- SimpleTypeWithName
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOSequence.xsd b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOSequence.xsd
deleted file mode 100644
index 795c3ea7d9..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOSequence.xsd
+++ /dev/null
@@ -1,40 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutContent.xml b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutContent.xml
deleted file mode 100644
index 3ebdc89ae0..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutContent.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutContent.xsd b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutContent.xsd
deleted file mode 100644
index 21546d0f67..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutContent.xsd
+++ /dev/null
@@ -1,33 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutName.xml b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutName.xml
deleted file mode 100644
index 89657e42ca..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutName.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
-
-
- SimpleTypeWithName
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutName.xsd b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutName.xsd
deleted file mode 100644
index d01b4172e4..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutName.xsd
+++ /dev/null
@@ -1,39 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/DefaultNamespace.xml b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/DefaultNamespace.xml
deleted file mode 100644
index 82fd1eedaf..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/DefaultNamespace.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
- SimpleTypeWithName
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/DefaultNamespace.xsd b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/DefaultNamespace.xsd
deleted file mode 100644
index e1dcf06194..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/DefaultNamespace.xsd
+++ /dev/null
@@ -1,32 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/ElementInAll.xml b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/ElementInAll.xml
deleted file mode 100644
index ebf03c9d5d..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/ElementInAll.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
-
-
- ElementInAllOne
- ElementInAllTwo
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/ElementInAll.xsd b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/ElementInAll.xsd
deleted file mode 100644
index 8b9ba5b4b8..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/ElementInAll.xsd
+++ /dev/null
@@ -1,40 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/ElementInChoice.xml b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/ElementInChoice.xml
deleted file mode 100644
index 26466b1b39..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/ElementInChoice.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
- Element1InChoice
- Element2InChoice
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/ElementInChoice.xsd b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/ElementInChoice.xsd
deleted file mode 100644
index ff418c56ab..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/ElementInChoice.xsd
+++ /dev/null
@@ -1,48 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/ElementOfSDOChangeSummaryType.xml b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/ElementOfSDOChangeSummaryType.xml
deleted file mode 100644
index 27bb1ce9cc..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/ElementOfSDOChangeSummaryType.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-
-
-
-
-
- ChangeSummaryText
-
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/ElementOfSDOChangeSummaryType.xsd b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/ElementOfSDOChangeSummaryType.xsd
deleted file mode 100644
index 2bf1df8c99..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/ElementOfSDOChangeSummaryType.xsd
+++ /dev/null
@@ -1,34 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithDefault.xml b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithDefault.xml
deleted file mode 100644
index 9b5561ed43..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithDefault.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
- ElementOfSimpleTypeWithDefaultDefault
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithDefault.xsd b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithDefault.xsd
deleted file mode 100644
index 0b4e7bdf45..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithDefault.xsd
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithFixed.xml b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithFixed.xml
deleted file mode 100644
index f1b7cd264c..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithFixed.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
- ElementOfSimpleTypeWithFixedFixed
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithFixed.xsd b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithFixed.xsd
deleted file mode 100644
index a2c8456257..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithFixed.xsd
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDODataType.xml b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDODataType.xml
deleted file mode 100644
index 1f60b0423f..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDODataType.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
- ElementOfSimpleTypeWithSDODataTypeElement
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDODataType.xsd b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDODataType.xsd
deleted file mode 100644
index 21e55ab8c1..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDODataType.xsd
+++ /dev/null
@@ -1,33 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOOppositePropertyType.xml b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOOppositePropertyType.xml
deleted file mode 100644
index 30762f4912..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOOppositePropertyType.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
- idvalue0
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOOppositePropertyType.xsd b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOOppositePropertyType.xsd
deleted file mode 100644
index 5bf35d0d70..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOOppositePropertyType.xsd
+++ /dev/null
@@ -1,33 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOPropertyType.xml b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOPropertyType.xml
deleted file mode 100644
index 2dd01e4090..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOPropertyType.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
- idvalue0
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOPropertyType.xsd b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOPropertyType.xsd
deleted file mode 100644
index 6920cd8dd0..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOPropertyType.xsd
+++ /dev/null
@@ -1,32 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOString.xml b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOString.xml
deleted file mode 100644
index 6a526bdc47..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOString.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
- ElementOfSimpleTypeWithSDOStringElement
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOString.xsd b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOString.xsd
deleted file mode 100644
index 1117a95eb8..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOString.xsd
+++ /dev/null
@@ -1,32 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/ElementSubstitutionGroupBase.xml b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/ElementSubstitutionGroupBase.xml
deleted file mode 100644
index ab91458bff..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/ElementSubstitutionGroupBase.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-
-
-
-
-
- ElementInSubstitutionGroupBase
-
-
-
- Some Data
-
-
-
- ElementInSubstitutionGroupBase
-
-
- ElementInSubstitutionGroupExtends
-
-
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/ElementSubstitutionGroupBase.xsd b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/ElementSubstitutionGroupBase.xsd
deleted file mode 100644
index 3e015843b5..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/ElementSubstitutionGroupBase.xsd
+++ /dev/null
@@ -1,52 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/ElementWithMaxOccurs.xml b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/ElementWithMaxOccurs.xml
deleted file mode 100644
index b6d68fd08a..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/ElementWithMaxOccurs.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
- ElementWithMaxOccursElement1
- ElementWithMaxOccursElement2
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/ElementWithMaxOccurs.xsd b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/ElementWithMaxOccurs.xsd
deleted file mode 100644
index d4453a4477..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/ElementWithMaxOccurs.xsd
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/ElementWithNillable.xml b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/ElementWithNillable.xml
deleted file mode 100644
index 6de3adc937..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/ElementWithNillable.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
- ElementWithNillableElement
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/ElementWithNillable.xsd b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/ElementWithNillable.xsd
deleted file mode 100644
index 786ab226da..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/ElementWithNillable.xsd
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/ElementWithSDOAliasName.xml b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/ElementWithSDOAliasName.xml
deleted file mode 100644
index 64093aa803..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/ElementWithSDOAliasName.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
- ElementWithSDOAliasName
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/ElementWithSDOAliasName.xsd b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/ElementWithSDOAliasName.xsd
deleted file mode 100644
index 01f4c2b1ef..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/ElementWithSDOAliasName.xsd
+++ /dev/null
@@ -1,32 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/ElementWithSDOName.xml b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/ElementWithSDOName.xml
deleted file mode 100644
index 774646f682..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/ElementWithSDOName.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
- ElementWithSDONameElement
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/ElementWithSDOName.xsd b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/ElementWithSDOName.xsd
deleted file mode 100644
index 34da37564c..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/ElementWithSDOName.xsd
+++ /dev/null
@@ -1,32 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/GlobalElementComplexType.xml b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/GlobalElementComplexType.xml
deleted file mode 100644
index a1fb3aa803..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/GlobalElementComplexType.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
- SimpleTypeWithName
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/GlobalElementComplexType.xsd b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/GlobalElementComplexType.xsd
deleted file mode 100644
index 8eb7a4fce4..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/GlobalElementComplexType.xsd
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/GlobalElementSimpleType.xml b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/GlobalElementSimpleType.xml
deleted file mode 100644
index f68eb1939d..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/GlobalElementSimpleType.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
- GlobalElementSimpleType
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/GlobalElementSimpleType.xsd b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/GlobalElementSimpleType.xsd
deleted file mode 100644
index b9f77e6658..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/GlobalElementSimpleType.xsd
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
-
-
-
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/Import.xml b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/Import.xml
deleted file mode 100644
index fd28850050..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/Import.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-
-
-
-
- SimpleTypeWithName
-
- SomeString
- SomeString
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/Import.xsd b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/Import.xsd
deleted file mode 100644
index eae93fd44a..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/Import.xsd
+++ /dev/null
@@ -1,40 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/ImportedSchema.xsd b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/ImportedSchema.xsd
deleted file mode 100644
index a7e568decf..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/ImportedSchema.xsd
+++ /dev/null
@@ -1,33 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/Include.xml b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/Include.xml
deleted file mode 100644
index d4b9e24fa6..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/Include.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
- SimpleTypeWithName
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/Include.xsd b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/Include.xsd
deleted file mode 100644
index 34ff314a19..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/Include.xsd
+++ /dev/null
@@ -1,36 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/Interop.xsd b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/Interop.xsd
deleted file mode 100644
index ae22ab2c44..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/Interop.xsd
+++ /dev/null
@@ -1,138 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/Notation.xml b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/Notation.xml
deleted file mode 100644
index b75ac6500a..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/Notation.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
-tns:Tuscany
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/Notation.xsd b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/Notation.xsd
deleted file mode 100644
index 6ad019cb81..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/Notation.xsd
+++ /dev/null
@@ -1,35 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/Person.xsd b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/Person.xsd
deleted file mode 100644
index 5f5021b15e..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/Person.xsd
+++ /dev/null
@@ -1,30 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/SDOJavaPackage.xml b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/SDOJavaPackage.xml
deleted file mode 100644
index 6c5ad88ff4..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/SDOJavaPackage.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
- SimpleTypeWithName
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/SDOJavaPackage.xsd b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/SDOJavaPackage.xsd
deleted file mode 100644
index 6b7e39b334..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/SDOJavaPackage.xsd
+++ /dev/null
@@ -1,39 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithAbstract.xml b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithAbstract.xml
deleted file mode 100644
index f9d4a24a49..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithAbstract.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
- SimpleTypeWithAbstractExtensionElement
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithAbstract.xsd b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithAbstract.xsd
deleted file mode 100644
index f649e2ba83..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithAbstract.xsd
+++ /dev/null
@@ -1,40 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithExtendedInstanceClass.xml b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithExtendedInstanceClass.xml
deleted file mode 100644
index 410df4b7e4..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithExtendedInstanceClass.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
- SimpleTypeWithExtendedInstanceClassElement
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithExtendedInstanceClass.xsd b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithExtendedInstanceClass.xsd
deleted file mode 100644
index 5d27ef5ce1..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithExtendedInstanceClass.xsd
+++ /dev/null
@@ -1,36 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithInstanceClass.xml b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithInstanceClass.xml
deleted file mode 100644
index 7b74867c03..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithInstanceClass.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
- SimpleTypeWithInstanceClassElement
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithInstanceClass.xsd b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithInstanceClass.xsd
deleted file mode 100644
index ec16a678a3..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithInstanceClass.xsd
+++ /dev/null
@@ -1,37 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithList.xml b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithList.xml
deleted file mode 100644
index 708d526f44..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithList.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
- listmember1 listmember2
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithList.xsd b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithList.xsd
deleted file mode 100644
index ed681009f9..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithList.xsd
+++ /dev/null
@@ -1,37 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithName.xml b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithName.xml
deleted file mode 100644
index e404ac86b7..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithName.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
- SimpleTypeWithNameElement
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithName.xsd b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithName.xsd
deleted file mode 100644
index af0431f048..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithName.xsd
+++ /dev/null
@@ -1,36 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithSDOName.xml b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithSDOName.xml
deleted file mode 100644
index c86a0f6bcb..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithSDOName.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
- SimpleTypeWithSDONameElement
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithSDOName.xsd b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithSDOName.xsd
deleted file mode 100644
index 89b00a36cc..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithSDOName.xsd
+++ /dev/null
@@ -1,37 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithUnion.xml b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithUnion.xml
deleted file mode 100644
index 399b0d8175..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithUnion.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
- EN
- 01:02:03
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithUnion.xsd b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithUnion.xsd
deleted file mode 100644
index ea35bec61a..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithUnion.xsd
+++ /dev/null
@@ -1,46 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithoutName.xml b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithoutName.xml
deleted file mode 100644
index bc8cf35368..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithoutName.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
-
-
- SimpleTypeWithoutName
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithoutName.xsd b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithoutName.xsd
deleted file mode 100644
index 57981e3666..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithoutName.xsd
+++ /dev/null
@@ -1,38 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/TargetNamespace.xml b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/TargetNamespace.xml
deleted file mode 100644
index da2929776e..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/TargetNamespace.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
- SimpleTypeWithName
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/TargetNamespace.xsd b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/TargetNamespace.xsd
deleted file mode 100644
index ace5427786..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/TargetNamespace.xsd
+++ /dev/null
@@ -1,34 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/datagraph.xsd b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/datagraph.xsd
deleted file mode 100644
index e6b9697a8d..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/datagraph.xsd
+++ /dev/null
@@ -1,88 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Expected type is emof:Package.
-
-
-
-
-
-
-
-
-
-
- Expected type is xsd:schema.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/sdoJava.xsd b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/sdoJava.xsd
deleted file mode 100644
index 7387568942..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/sdoJava.xsd
+++ /dev/null
@@ -1,88 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/sdoModel.xsd b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/sdoModel.xsd
deleted file mode 100644
index c5aabc9cc8..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/main/resources/xsd/sdoModel.xsd
+++ /dev/null
@@ -1,221 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/test/java/org/apache/tuscany/sca/itest/generate/GenerateTestCase.java b/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/test/java/org/apache/tuscany/sca/itest/generate/GenerateTestCase.java
deleted file mode 100644
index fa3f310d4d..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/common/src/test/java/org/apache/tuscany/sca/itest/generate/GenerateTestCase.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * 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.
- */
-
-package org.apache.tuscany.sca.itest.generate;
-
-import junit.framework.TestCase;
-
-
-/**
- *
- */
-public class GenerateTestCase extends TestCase {
-
- //private Generate generator = null;
-
- @Override
- protected void setUp() throws Exception {
- //generator = new Generate();
- }
-
- @Override
- protected void tearDown() {
- }
-
- /**
- * Invokes the Generate class to generate databinding test classes and resources.
- *
- * @throws Exception
- */
- public void testGenerate() throws Exception {
- //generator.generate();
- }
-}
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/config.png b/tags/java/sca/1.3.1-RC0/itest/databindings/config.png
deleted file mode 100644
index 7912019e9d..0000000000
Binary files a/tags/java/sca/1.3.1-RC0/itest/databindings/config.png and /dev/null differ
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/config.svg b/tags/java/sca/1.3.1-RC0/itest/databindings/config.svg
deleted file mode 100644
index aaf027e2df..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/config.svg
+++ /dev/null
@@ -1,117 +0,0 @@
-
-
-
-
-
-
-
-
-
-
- image/svg+xml
-
-
-
-
-
- <tns:Generate ...> <Template> <TemplateName>greeter.composite.vm</TemplateName> <TemplateTargetDir>classes</TemplateTargetDir> </Template> ... <InputFile> <FileName>Person.xsd</FileName> <FilePath>xsd</FilePath> <JavaPackage>org.apache.tuscany.sca.itest.databinding.types</JavaPackage> <Factory>TypesFactory</Factory> <Namespace>http://apache.org/tuscany/sca/itest/databinding/types</Namespace> <Prefix>p</Prefix> <Type> <TypeName>PersonType</TypeName> <CreateTypeCode> TypesFactory factory = TypesFactory.INSTANCE; param = factory.createPersonType(); param.setFirstName("George"); param.setLastName("Doors"); </CreateTypeCode> <ModifyTypeCode> param.setGreeting("Hello"); </ModifyTypeCode> <ResultComparison> assertNotSame("greetedPerson.getGreeting() not set", "", result.getGreeting()); </ResultComparison> </Type> </InputFile> ... </tns:Generate>
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/databinding.png b/tags/java/sca/1.3.1-RC0/itest/databindings/databinding.png
deleted file mode 100644
index 76a9c71b7d..0000000000
Binary files a/tags/java/sca/1.3.1-RC0/itest/databindings/databinding.png and /dev/null differ
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/databinding.svg b/tags/java/sca/1.3.1-RC0/itest/databindings/databinding.svg
deleted file mode 100644
index d6850ccf7d..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/databinding.svg
+++ /dev/null
@@ -1,242 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- image/svg+xml
-
-
-
-
-
-
-
- GreeterService
-
- DefaultGreeter ServiceClient
-
-
- GreeterService Component
-
- WSGreeter ServiceClient
-
-
-
-
- WS Reference WS Service
-
-
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/interop.png b/tags/java/sca/1.3.1-RC0/itest/databindings/interop.png
deleted file mode 100644
index 005e0f24ea..0000000000
Binary files a/tags/java/sca/1.3.1-RC0/itest/databindings/interop.png and /dev/null differ
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/interop.svg b/tags/java/sca/1.3.1-RC0/itest/databindings/interop.svg
deleted file mode 100644
index 03897c6d09..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/interop.svg
+++ /dev/null
@@ -1,352 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- image/svg+xml
-
-
-
-
-
-
-
- InteropGreeterService
-
- SDO DefaultGreeter ServiceClient
-
-
- SDO GreeterService Component
-
- SDO WSGreeter ServiceClient
-
-
-
- WS Reference WS Service
- JAXB DefaultGreeter ServiceClient
-
-
- JAXB WSGreeter ServiceClient
-
-
-
- WS Reference WS Service
-
-
-
-
-
-
-
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/interop/pom.xml b/tags/java/sca/1.3.1-RC0/itest/databindings/interop/pom.xml
deleted file mode 100644
index 177d5b2600..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/interop/pom.xml
+++ /dev/null
@@ -1,223 +0,0 @@
-
-
-
-
- org.apache.tuscany.sca
- itest-databindings
- 1.3.1
-
-
- 4.0.0
-
- itest-databindings-interop
- 1.3.1
- jar
- Apache Tuscany SCA DataBinding Interop Integration Tests
-
-
-
-
- true
-
- java.net
- java.net Maven 1.x Repository
- http://download.java.net/maven/1
- legacy
-
-
- java.net2
- java.net Maven 2.x Repository
- http://download.java.net/maven/2
-
-
-
-
-
-
- true
-
- java.net
- java.net Maven 1.x Repository
- http://download.java.net/maven/1
- legacy
-
-
-
-
-
- org.apache.tuscany.sca
- tuscany-binding-ws-axis2
- ${pom.version}
- compile
-
-
- org.apache.tuscany.sca
- tuscany-databinding-jaxb
- ${pom.version}
- compile
-
-
- org.apache.tuscany.sca
- tuscany-databinding-sdo
- ${pom.version}
- compile
-
-
- org.apache.tuscany.sca
- tuscany-databinding-axiom
- ${pom.version}
- compile
-
-
- javax.xml.bind
- jaxb-api
- 2.1
- compile
-
-
-
- com.sun.xml.ws
- jaxws-rt
- 2.1.3
-
-
- org.apache.tuscany.sca
- itest-databindings-common
- ${pom.version}
- compile
-
-
- org.apache.tuscany.sca
- itest-databindings-sdo
- ${pom.version}
- compile
-
-
- org.apache.tuscany.sca
- itest-databindings-jaxb
- ${pom.version}
- compile
-
-
- org.apache.tuscany.sca
- tuscany-host-embedded
- ${pom.version}
- compile
-
-
- org.apache.tuscany.sca
- tuscany-implementation-java-runtime
- ${pom.version}
- compile
-
-
- org.apache.tuscany.sca
- tuscany-interface-java-xml
- ${pom.version}
- compile
-
-
- org.apache.tuscany.sca
- tuscany-host-jetty
- 1.3.1
- test
-
-
-
-
-
-
- org.apache.maven.plugins
- maven-surefire-plugin
-
- -Djava.endorsed.dirs=target/endorsed
-
-
-
- org.apache.maven.plugins
- maven-dependency-plugin
-
-
- generate-sources
-
- unpack
-
-
-
-
- org.apache.tuscany.sca
- itest-databindings-common
- ${project.version}
- true
- ${project.build.directory}/classes
-
-
-
-
-
- copy
- generate-sources
-
- copy
-
-
-
-
- javax.xml.ws
- jaxws-api
- 2.1
- jar
-
-
- javax.xml.bind
- jaxb-api
- 2.1
- jar
-
-
- ${project.build.directory}/endorsed
- false
- true
-
-
-
-
-
- org.codehaus.mojo
- exec-maven-plugin
-
-
- generate-test-source
- process-resources
-
- java
-
-
-
-
- org.apache.tuscany.sca.itest.generate.Generate
-
- ${project.build.directory}
-
-
-
-
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/interop/src/main/resources/generate/InteropDatabindingTestCase.java.vm b/tags/java/sca/1.3.1-RC0/itest/databindings/interop/src/main/resources/generate/InteropDatabindingTestCase.java.vm
deleted file mode 100644
index 7bdfc57924..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/interop/src/main/resources/generate/InteropDatabindingTestCase.java.vm
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
- * 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.
- */
-
-package $template.getJavaPackage();
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-import ${template.getJavaPackage()}.GreeterService;
-
-// Data types
-#foreach($file in $fileList)
-#set($typeList = $file.getType_())
-#foreach($typeInstance in $typeList)
-import $file.getJavaPackage().$typeInstance.getTypeName();
-import $file.getJavaPackage().$file.getFactory();
-#end
-#end
-
-/**
- * Automatically generated test case. Calls the greeter client for a number of
- * bindings and a number of data types.
- *
- * @version $Rev: 511417 $ $Date: 2007-02-25 03:06:42 +0000 (Sun, 25 Feb 2007) $
- */
-public class InteropDatabindingTestCase extends TestCase {
-
- private static boolean initalised = false;
- private GreeterService greeterClient;
- private static SCADomain domain;
-
- /**
- * Runs before each test method
- */
- protected void setUp() throws Exception {
- if (!initalised) {
- domain = SCADomain.newInstance("interopgreeter.composite");
- super.setUp();
- initalised = true;
- }
- }
-
- /**
- * Runs after each test method
- */
- protected void tearDown() {
-
- }
-
- /**
- * Finds the SCA component that relates to the protocol being tested. This test
- * always connects locally to the client component but the client component will
- * connect to the back end component using the appropriate protocol
- *
- * @param ext the protcol required
- */
- private void setUpClient(String ext) throws Exception {
- greeterClient = domain.getService(GreeterService.class, "SDO" + ext + "GreeterServiceClient");
- }
-
- /**
- * Invokes the SDO Greet service using web service bindings with SDO payload
- */
- public void testWSGreet() throws Exception {
- setUpClient("WS");
- greet();
- }
-
- /**
- * Invokes the SDO Greet service using default bindings with SDO payload
- */
- public void testDefaultGreet() throws Exception {
- setUpClient("Default");
- greet();
- }
-
- /**
- * A generic method which, regarless of which client is connected, sends out a
- * series of requrests passing different data types.
- */
- public void greet() {
-#foreach($file in $fileList)
-#set($typeList = $file.getType_())
-#foreach($typeInstance in $typeList)
-
- // test $typeInstance.getTypeName()
- {
- $typeInstance.getTypeName() param = null;
- $typeInstance.getCreateTypeCode()
- $typeInstance.getTypeName() result = greeterClient.greet$typeInstance.getTypeName()(param);
- $typeInstance.getResultComparison()
- }
-#end
-#end
- }
-
-}
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/interop/src/main/resources/generate/JAXBGreeter.wsdl.vm b/tags/java/sca/1.3.1-RC0/itest/databindings/interop/src/main/resources/generate/JAXBGreeter.wsdl.vm
deleted file mode 100644
index 38bfccce0c..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/interop/src/main/resources/generate/JAXBGreeter.wsdl.vm
+++ /dev/null
@@ -1,103 +0,0 @@
-
-
-
-
-
-
-
-#foreach($file in $fileList)
-
-#end
-
-#foreach($file in $fileList)
-#set($typeList = $file.getType_())
-#foreach($typeInstance in $typeList)
-
-
-
-
-
-
-
-#end
-#end
-
-
-#foreach($file in $fileList)
-#set($typeList = $file.getType_())
-#foreach($typeInstance in $typeList)
-
-
-
-
-
-
-
-#end
-#end
-
-
-#foreach($file in $fileList)
-#set($typeList = $file.getType_())
-#foreach($typeInstance in $typeList)
-
-
-
-
-#end
-#end
-
-
-
-
-#foreach($file in $fileList)
-#set($typeList = $file.getType_())
-#foreach($typeInstance in $typeList)
-
-
-
-
-
-
-
-
-
-#end
-#end
-
-
-
-
-
-
-
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/interop/src/main/resources/generate/SDOGreeter.wsdl.vm b/tags/java/sca/1.3.1-RC0/itest/databindings/interop/src/main/resources/generate/SDOGreeter.wsdl.vm
deleted file mode 100644
index 6f02af4c9d..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/interop/src/main/resources/generate/SDOGreeter.wsdl.vm
+++ /dev/null
@@ -1,103 +0,0 @@
-
-
-
-
-
-
-
-#foreach($file in $fileList)
-
-#end
-
-#foreach($file in $fileList)
-#set($typeList = $file.getType_())
-#foreach($typeInstance in $typeList)
-
-
-
-
-
-
-
-#end
-#end
-
-
-#foreach($file in $fileList)
-#set($typeList = $file.getType_())
-#foreach($typeInstance in $typeList)
-
-
-
-
-
-
-
-#end
-#end
-
-
-#foreach($file in $fileList)
-#set($typeList = $file.getType_())
-#foreach($typeInstance in $typeList)
-
-
-
-
-#end
-#end
-
-
-
-
-#foreach($file in $fileList)
-#set($typeList = $file.getType_())
-#foreach($typeInstance in $typeList)
-
-
-
-
-
-
-
-
-
-#end
-#end
-
-
-
-
-
-
-
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/interop/src/main/resources/generate/generate.xml b/tags/java/sca/1.3.1-RC0/itest/databindings/interop/src/main/resources/generate/generate.xml
deleted file mode 100644
index 8453dd56b4..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/interop/src/main/resources/generate/generate.xml
+++ /dev/null
@@ -1,159 +0,0 @@
-
-
-
-
-
- InteropDatabindingTestCase.java.vm
- ../src/test/java/org/apache/tuscany/sca/itest/sdodatabinding
- org.apache.tuscany.sca.itest.sdodatabinding
-
-
- interopgreeter.composite.vm
- classes
-
-
- SDOGreeter.wsdl.vm
- classes/wsdl
-
-
- JAXBGreeter.wsdl.vm
- classes/wsdl
-
-
- Person.xsd
- xsd
- org.apache.tuscany.sca.itest.databinding.types
- TypesFactory
- http://apache.org/tuscany/sca/itest/databinding/types
- p
-
- PersonType
-
- TypesFactory factory = TypesFactory.INSTANCE;
- param = factory.createPersonType();
- param.setFirstName("George");
- param.setLastName("Doors");
-
-
- param.setGreeting("Hello");
-
-
- assertNotSame("greetedPerson.getGreeting() not set", "", result.getGreeting());
-
-
-
-
- Interop.xsd
- xsd
- org.apache.tuscany.interop
- InteropFactory
- http://www.apache.org/tuscany/interop
- i
-
-
- AttributeComplexType
-
- InteropFactory factory = InteropFactory.INSTANCE;
- org.apache.tuscany.interop.AttributeType attrib = factory.createAttributeType();
- attrib.setAttribute("SomeText");
- param = factory.createAttributeComplexType();
- param.setAttributeElement(attrib);
-
-
- param.getAttributeElement().setAttribute("SomeChangedText");;
-
-
- assertEquals("data not changed corretly", "SomeChangedText", result.getAttributeElement().getAttribute());
-
-
-
- AttributeReferenceComplexType
-
- InteropFactory factory = InteropFactory.INSTANCE;
- param = factory.createAttributeReferenceComplexType();
-
- param.setReferencedAttribute("SomeText");
-
-
- param.setReferencedAttribute("SomeChangedText");;
-
-
- assertEquals("data not changed corretly", "SomeChangedText", result.getReferencedAttribute());
-
-
-
- SimpleTypeWithAbstractComplexType
-
- InteropFactory factory = InteropFactory.INSTANCE;
- param = factory.createSimpleTypeWithAbstractComplexType();
- param.setSimpleTypeWithAbstractExtensionElement("SomeText");
-
-
- param.setSimpleTypeWithAbstractExtensionElement("SomeChangedText");;
-
-
- assertEquals("data not changed corretly", "SomeChangedText", result.getSimpleTypeWithAbstractExtensionElement());
-
-
-
- SimpleTypeWithNameComplexType
-
- InteropFactory factory = InteropFactory.INSTANCE;
- param = factory.createSimpleTypeWithNameComplexType();
- param.setSimpleTypeWithNameElement("SomeText");
-
-
- param.setSimpleTypeWithNameElement("SomeChangedText");;
-
-
- assertEquals("data not changed corretly", "SomeChangedText", result.getSimpleTypeWithNameElement());
-
-
-
- ComplexTypeWithContentType
-
- InteropFactory factory = InteropFactory.INSTANCE;
- param = factory.createComplexTypeWithContentType();
- param.setSimpleTypeWithName("SomeText");
-
-
- param.setSimpleTypeWithName("SomeChangedText");;
-
-
- assertEquals("data not changed corretly", "SomeChangedText", result.getSimpleTypeWithName());
-
-
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/interop/src/main/resources/generate/interopgreeter.composite.vm b/tags/java/sca/1.3.1-RC0/itest/databindings/interop/src/main/resources/generate/interopgreeter.composite.vm
deleted file mode 100644
index 36797fde57..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/interop/src/main/resources/generate/interopgreeter.composite.vm
+++ /dev/null
@@ -1,78 +0,0 @@
-
-
-
-
-
- #foreach( $file in $fileList )
-
- #end
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/jaxb-bottom-up/pom.xml b/tags/java/sca/1.3.1-RC0/itest/databindings/jaxb-bottom-up/pom.xml
deleted file mode 100644
index 791acd2986..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/jaxb-bottom-up/pom.xml
+++ /dev/null
@@ -1,239 +0,0 @@
-
-
-
-
- org.apache.tuscany.sca
- itest-databindings
- 1.3.1
-
-
- 4.0.0
-
- itest-databindings-jaxb-bottom-up
- 1.3.1
- jar
- Apache Tuscany SCA Databinding Integration Tests - JAXB Bottom Up
-
-
-
-
- true
-
- java.net
- java.net Maven 1.x Repository
- http://download.java.net/maven/1
- legacy
-
-
- java.net2
- java.net Maven 2.x Repository
- http://download.java.net/maven/2
-
-
-
-
-
- java.net2
- java.net Maven 2.x Repository
- http://download.java.net/maven/2
-
-
-
-
-
- org.apache.tuscany.sca
- tuscany-binding-ws-axis2
- ${pom.version}
- runtime
-
-
- org.apache.tuscany.sca
- tuscany-databinding-jaxb
- ${pom.version}
- runtime
-
-
- org.apache.tuscany.sca
- tuscany-databinding-sdo
- ${pom.version}
- compile
-
-
- org.apache.tuscany.sca
- tuscany-databinding-axiom
- ${pom.version}
- compile
-
-
- org.apache.tuscany.sca
- itest-databindings-common
- ${pom.version}
- compile
-
-
- org.apache.tuscany.sca
- tuscany-host-embedded
- ${pom.version}
- compile
-
-
- org.apache.tuscany.sca
- tuscany-implementation-java-runtime
- ${pom.version}
- compile
-
-
- org.apache.tuscany.sca
- tuscany-interface-java-xml
- ${pom.version}
- compile
-
-
- org.apache.tuscany.sca
- tuscany-host-jetty
- 1.3.1
- runtime
-
-
- javax.xml.bind
- jaxb-api
- 2.1
- compile
-
-
-
- com.sun.xml.ws
- jaxws-rt
- 2.1.3
-
-
-
- commons-collections
- commons-collections
- 3.1
-
-
- log4j
- log4j
- 1.2.12
- provided
-
-
-
-
-
-
-
- org.apache.maven.plugins
- maven-surefire-plugin
-
- -Djava.endorsed.dirs=target/endorsed
-
-
-
- org.apache.maven.plugins
- maven-dependency-plugin
-
-
- copy
- generate-sources
-
- copy
-
-
-
-
- javax.xml.ws
- jaxws-api
- 2.1
- jar
-
-
- javax.xml.bind
- jaxb-api
- 2.1
- jar
-
-
- ${project.build.directory}/endorsed
- false
- true
-
-
-
-
-
-
-
-
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean1.java b/tags/java/sca/1.3.1-RC0/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean1.java
deleted file mode 100644
index 7529c2b841..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean1.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.itest.databindings.jaxb;
-
-/**
- * @version $Rev$ $Date$
- */
-public class Bean1 {
- private T item;
-
- public Bean1() {
- }
-
- public Bean1(T item) {
- this.item = item;
- }
-
- public void setItem(T item) {
- this.item = item;
- }
-
- public T getItem() {
- return item;
- }
-
- public boolean equals(Object that) {
- if(that == null) {
- return false;
- }
- if(that.getClass() != this.getClass()) {
- return false;
- }
-
- Bean1> that1 = (Bean1>)that;
- if(this == that1) {
- return true;
- } else if(this.item != null) {
- return this.item.equals(that1.item);
- } else {
- return that1.item == null;
- }
- }
-
- public String toString() {
- return this.getClass().getSimpleName()+"[item = "+item+"]";
- }
-}
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean10.java b/tags/java/sca/1.3.1-RC0/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean10.java
deleted file mode 100644
index 4a4419a42b..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean10.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.itest.databindings.jaxb;
-
-/**
- * @version $Rev$ $Date$
- */
-public class Bean10 extends Bean1 {
-}
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean11.java b/tags/java/sca/1.3.1-RC0/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean11.java
deleted file mode 100644
index 65f019ec48..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean11.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.itest.databindings.jaxb;
-
-/**
- * @version $Rev$ $Date$
- */
-public class Bean11 extends Bean1 {
-}
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean2.java b/tags/java/sca/1.3.1-RC0/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean2.java
deleted file mode 100644
index 844e28863a..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean2.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.itest.databindings.jaxb;
-
-/**
- * @version $Rev$ $Date$
- */
-public class Bean2 {
- private String name;
-
- public void setName(String name) {
- this.name = name;
- }
-
- public String getName() {
- return name;
- }
-
- public boolean equals(Object that) {
- if(that == null) {
- return false;
- }
-
- if(this.getClass() != that.getClass()) {
- return false;
- }
-
- if(this == that) {
- return true;
- } else if(this.name != null) {
- return this.name.equals(((Bean2)that).name);
- } else {
- return ((Bean2)that).name == null;
- }
- }
-
- public String toString() {
- return this.getClass().getSimpleName()+"[name = "+name+"]";
- }
-}
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean3.java b/tags/java/sca/1.3.1-RC0/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean3.java
deleted file mode 100644
index 4e0bd38b2b..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean3.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.itest.databindings.jaxb;
-
-/**
- * @version $Rev$ $Date$
- */
-public class Bean3 extends Bean2 {
- private String address;
-
- public void setAddress(String address) {
- this.address = address;
- }
-
- public String getAddress() {
- return address;
- }
-
- public boolean equals(Object that) {
- if(that == null) {
- return false;
- }
-
- if(this.getClass() != that.getClass()) {
- return false;
- }
-
- if(this == that) {
- return true;
- } else if(this.address != null) {
- return this.address.equals(((Bean3)that).address) && super.equals(that);
- } else {
- return ((Bean3)that).address == null && super.equals(that);
- }
- }
-
- public String toString() {
- return this.getClass().getSimpleName()+"[name = "+super.getName()+", address = "+address+"]";
- }
-}
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean31.java b/tags/java/sca/1.3.1-RC0/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean31.java
deleted file mode 100644
index 40aff31297..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean31.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.itest.databindings.jaxb;
-
-/**
- * @version $Rev$ $Date$
- */
-public class Bean31 extends Bean2 {
- private String address;
-
- public void setAddress(String address) {
- this.address = address;
- }
-
- public String getAddress() {
- return address;
- }
-
- public boolean equals(Object that) {
- if(that == null) {
- return false;
- }
-
- if(this.getClass() != that.getClass()) {
- return false;
- }
-
- if(this == that) {
- return true;
- } else if(this.address != null) {
- return this.address.equals(((Bean31)that).address) && super.equals(that);
- } else {
- return ((Bean31)that).address == null && super.equals(that);
- }
- }
-
- public String toString() {
- return this.getClass().getSimpleName()+"[name = "+super.getName()+", address = "+address+"]";
- }
-}
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsLocalService.java b/tags/java/sca/1.3.1-RC0/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsLocalService.java
deleted file mode 100644
index ca012b967d..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsLocalService.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.itest.databindings.jaxb;
-
-/**
- * The interface for GenericsLocalService.
- *
- * @version $Rev$ $Date$
- */
-public interface GenericsLocalService {
- Bean1 getTypeExplicit(Bean1 arg);
-
- Bean1 getTypeUnbound(T[] anArray);
-
- Bean1 getTypeExtends(T[] anArray);
-
- > Bean1 getRecursiveTypeBound(T[] anArray);
-
- Bean1> getWildcardUnbound(Bean1> arg);
-
- Bean1 super Bean3> getWildcardSuper(Bean1 super Bean3> arg);
-
- Bean1 extends Bean2> getWildcardExtends(Bean1 extends Bean2> arg);
-
- Bean2 getPolymorphic(Bean2 arg);
-}
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsService.java b/tags/java/sca/1.3.1-RC0/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsService.java
deleted file mode 100644
index 12ed7d0ec7..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsService.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.itest.databindings.jaxb;
-
-import org.osoa.sca.annotations.Remotable;
-
-/**
- * The interface for GenericsService.
- *
- * @version $Rev$ $Date$
- */
-@Remotable
-public interface GenericsService extends GenericsLocalService{
-}
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsServiceClient.java b/tags/java/sca/1.3.1-RC0/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsServiceClient.java
deleted file mode 100644
index 3bae554dc7..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsServiceClient.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * 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.
- */
-
-package org.apache.tuscany.sca.itest.databindings.jaxb;
-
-/**
- * The interface for GenericsServiceClient.
- *
- * @version $Rev$ $Date$
- */
-public interface GenericsServiceClient {
- Bean1 getTypeExplicitForward(Bean1 arg);
-
- Bean1 getTypeUnboundForward(T[] anArray);
-
- Bean1 getTypeExtendsForward(T[] anArray);
-
- > Bean1 getRecursiveTypeBoundForward(T[] anArray);
-
- Bean1> getWildcardUnboundForward(Bean1> arg);
-
- Bean1 super Bean3> getWildcardSuperForward(Bean1 super Bean3> arg);
-
- Bean1 extends Bean2> getWildcardExtendsForward(Bean1 extends Bean2> arg);
-
- Bean2 getPolymorphicForward(Bean2 arg);
-}
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloLocalServiceSimple.java b/tags/java/sca/1.3.1-RC0/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloLocalServiceSimple.java
deleted file mode 100644
index 074ec85fce..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloLocalServiceSimple.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.itest.databindings.jaxb;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * The interface for HelloLocalServiceSimple.
- */
-public interface HelloLocalServiceSimple {
- String getGreetings(String name);
- String[] getGreetingsArray(String[] names);
- /**
- * Add the RequestWrapper/ResponseWrapper annotations to support Collections. These annotations are used
- * by the remotable interface that extends this interface.
- * @param names
- * @return
- */
- List getGreetingsList(List names);
-
- /**
- * Add the RequestWrapper/ResponseWrapper annotations to support Collections. These annotations are used
- * by the remotable interface that extends this interface.
- * @param names
- * @return
- */
- // @RequestWrapper(className="org.apache.tuscany.sca.itest.databindings.jaxb.impl.jaxws.GetGreetingsList")
- // @ResponseWrapper(className="org.apache.tuscany.sca.itest.databindings.jaxb.impl.jaxws.GetGreetingsListResponse")
- ArrayList getGreetingsArrayList(ArrayList names);
-
- // @WebMethod(exclude=true)
- Map getGreetingsMap(Map namesMap);
-
- // @WebMethod(exclude=true)
- HashMap getGreetingsHashMap(HashMap namesMap);
-
- String getGreetingsVarArgs(String... names);
-}
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloServiceSimple.java b/tags/java/sca/1.3.1-RC0/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloServiceSimple.java
deleted file mode 100644
index 34ac9024f6..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloServiceSimple.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * 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.
- */
-package org.apache.tuscany.sca.itest.databindings.jaxb;
-
-import org.osoa.sca.annotations.Remotable;
-
-/**
- * The interface for HelloServiceSimple.
- */
-@Remotable
-public interface HelloServiceSimple extends HelloLocalServiceSimple {
- // Add any methods to the local interface.
-}
diff --git a/tags/java/sca/1.3.1-RC0/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloServiceSimpleClient.java b/tags/java/sca/1.3.1-RC0/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloServiceSimpleClient.java
deleted file mode 100644
index 23ed57dec9..0000000000
--- a/tags/java/sca/1.3.1-RC0/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloServiceSimpleClient.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * 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.
- */
-
-package org.apache.tuscany.sca.itest.databindings.jaxb;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * The interface for HelloServiceSimpleClient.
- */
-public interface HelloServiceSimpleClient {
- String getGreetingsForward(String name);
- String[] getGreetingsArrayForward(String[] names);
- List getGreetingsListForward(List names);
- ArrayList