summaryrefslogtreecommitdiffstats
path: root/sca-java-2.x/trunk
diff options
context:
space:
mode:
Diffstat (limited to 'sca-java-2.x/trunk')
-rw-r--r--sca-java-2.x/trunk/itest/callback-basic-ws/pom.xml79
-rw-r--r--sca-java-2.x/trunk/itest/callback-basic-ws/src/main/java/org/apache/tuscany/sca/test/CallBackBasicCallBack.java33
-rw-r--r--sca-java-2.x/trunk/itest/callback-basic-ws/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClient.java28
-rw-r--r--sca-java-2.x/trunk/itest/callback-basic-ws/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClientImpl.java131
-rw-r--r--sca-java-2.x/trunk/itest/callback-basic-ws/src/main/java/org/apache/tuscany/sca/test/CallBackBasicService.java37
-rw-r--r--sca-java-2.x/trunk/itest/callback-basic-ws/src/main/java/org/apache/tuscany/sca/test/CallBackBasicServiceImpl.java56
-rw-r--r--sca-java-2.x/trunk/itest/callback-basic-ws/src/main/resources/CallBackBasicTest.composite75
-rw-r--r--sca-java-2.x/trunk/itest/callback-basic-ws/src/main/resources/META-INF/sca-contribution.xml23
-rw-r--r--sca-java-2.x/trunk/itest/callback-basic-ws/src/test/java/org/apache/tuscany/sca/test/CallBackBasicTestCase.java66
-rw-r--r--sca-java-2.x/trunk/itest/pom.xml1
10 files changed, 0 insertions, 529 deletions
diff --git a/sca-java-2.x/trunk/itest/callback-basic-ws/pom.xml b/sca-java-2.x/trunk/itest/callback-basic-ws/pom.xml
deleted file mode 100644
index 3321a05a85..0000000000
--- a/sca-java-2.x/trunk/itest/callback-basic-ws/pom.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<project>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-itest</artifactId>
- <version>2.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
- <artifactId>itest-callback-basic-ws</artifactId>
- <name>Apache Tuscany SCA iTest Callback Basic WebServices</name>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-node-api</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-node-impl</artifactId>
- <version>2.0-SNAPSHOT</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-implementation-java-runtime</artifactId>
- <version>2.0-SNAPSHOT</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>
- <version>2.0-SNAPSHOT</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-http</artifactId>
- <version>2.0-SNAPSHOT</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-jetty</artifactId>
- <version>2.0-SNAPSHOT</version>
- <scope>test</scope>
- </dependency>
-
- </dependencies>
-
- <properties>
- <was.ant.script>${basedir}/../build-was-integration.xml</was.ant.script>
- <was.python.script>${basedir}/../wasAdmin.py</was.python.script>
- </properties>
-</project>
diff --git a/sca-java-2.x/trunk/itest/callback-basic-ws/src/main/java/org/apache/tuscany/sca/test/CallBackBasicCallBack.java b/sca-java-2.x/trunk/itest/callback-basic-ws/src/main/java/org/apache/tuscany/sca/test/CallBackBasicCallBack.java
deleted file mode 100644
index 291a72b9d6..0000000000
--- a/sca-java-2.x/trunk/itest/callback-basic-ws/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.oasisopen.sca.annotation.Remotable;
-
-@Remotable
-/**
- *
- */
-public interface CallBackBasicCallBack {
-
- void callBackMessage(String aString);
-
- void callBackIncrement(String aString);
-
-}
diff --git a/sca-java-2.x/trunk/itest/callback-basic-ws/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClient.java b/sca-java-2.x/trunk/itest/callback-basic-ws/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClient.java
deleted file mode 100644
index 19f366c423..0000000000
--- a/sca-java-2.x/trunk/itest/callback-basic-ws/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.oasisopen.sca.annotation.Remotable;
-
-@Remotable
-public interface CallBackBasicClient {
-
- void run();
-
-}
diff --git a/sca-java-2.x/trunk/itest/callback-basic-ws/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClientImpl.java b/sca-java-2.x/trunk/itest/callback-basic-ws/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClientImpl.java
deleted file mode 100644
index f98a70e5cc..0000000000
--- a/sca-java-2.x/trunk/itest/callback-basic-ws/src/main/java/org/apache/tuscany/sca/test/CallBackBasicClientImpl.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 org.apache.tuscany.sca.test;
-
-import org.junit.Assert;
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.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.
- callBackCount = 0;
-
- // 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();
- }
-
- 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);
- }
-
- 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());
- }
-
- 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/sca-java-2.x/trunk/itest/callback-basic-ws/src/main/java/org/apache/tuscany/sca/test/CallBackBasicService.java b/sca-java-2.x/trunk/itest/callback-basic-ws/src/main/java/org/apache/tuscany/sca/test/CallBackBasicService.java
deleted file mode 100644
index 5396879e83..0000000000
--- a/sca-java-2.x/trunk/itest/callback-basic-ws/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.oasisopen.sca.annotation.Callback;
-import org.oasisopen.sca.annotation.Remotable;
-
-@Remotable
-@Callback(CallBackBasicCallBack.class)
-/**
- *
- */
-public interface CallBackBasicService {
-
- void knockKnock(String aString);
-
- void noCallBack(String aString);
-
- void multiCallBack(String aString);
-
-}
diff --git a/sca-java-2.x/trunk/itest/callback-basic-ws/src/main/java/org/apache/tuscany/sca/test/CallBackBasicServiceImpl.java b/sca-java-2.x/trunk/itest/callback-basic-ws/src/main/java/org/apache/tuscany/sca/test/CallBackBasicServiceImpl.java
deleted file mode 100644
index 07010f61e1..0000000000
--- a/sca-java-2.x/trunk/itest/callback-basic-ws/src/main/java/org/apache/tuscany/sca/test/CallBackBasicServiceImpl.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 org.oasisopen.sca.annotation.Callback;
-import org.oasisopen.sca.annotation.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");
-
- }
-
- 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");
-
- }
-
- public void noCallBack(String aString) {
-
- System.out.println("CallBackBasicServiceImpl message received: " + aString);
- // System.out.println("CallBackBasicServiceImpl No response desired");
-
- }
-}
diff --git a/sca-java-2.x/trunk/itest/callback-basic-ws/src/main/resources/CallBackBasicTest.composite b/sca-java-2.x/trunk/itest/callback-basic-ws/src/main/resources/CallBackBasicTest.composite
deleted file mode 100644
index 5441e2e580..0000000000
--- a/sca-java-2.x/trunk/itest/callback-basic-ws/src/main/resources/CallBackBasicTest.composite
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
- targetNamespace="http://callback"
- name="CallBackBasicTest">
-
- <!-- 1 - target specified forward binding implied callback binding-->
- <component name="CallBackBasicClient1">
- <implementation.java class="org.apache.tuscany.sca.test.CallBackBasicClientImpl"/>
- <reference name="aCallBackService" target="CallBackBasicService1"/>
- </component>
-
- <component name="CallBackBasicService1">
- <implementation.java class="org.apache.tuscany.sca.test.CallBackBasicServiceImpl"/>
- <service name="CallBackBasicService">
- <binding.ws uri="http://localhost:8085/CallBackBasicService1"/>
- </service>
- </component>
-
- <!-- 2 - target specified forward binding and fully specified callback binding -->
- <component name="CallBackBasicClient2">
- <implementation.java class="org.apache.tuscany.sca.test.CallBackBasicClientImpl"/>
- <reference name="aCallBackService" target="CallBackBasicService2">
- <callback>
- <binding.ws uri="http://localhost:8084/CallBackBasicClient2"/>
- </callback>
- </reference>
- </component>
-
- <component name="CallBackBasicService2">
- <implementation.java class="org.apache.tuscany.sca.test.CallBackBasicServiceImpl"/>
- <service name="CallBackBasicService">
- <binding.ws uri="http://localhost:8085/CallBackTargetService2"/>
- <callback>
- <binding.ws uri="http://localhost:8084/CallBackBasicClient2"/>
- </callback>
- </service>
- </component>
-
- <!-- 3 - fully specified forward binding implied callback binding-->
- <component name="CallBackBasicClient3">
- <implementation.java class="org.apache.tuscany.sca.test.CallBackBasicClientImpl"/>
- <reference name="aCallBackService">
- <binding.ws uri="http://localhost:8085/CallBackBasicService3"/>
- </reference>
- </component>
-
- <component name="CallBackBasicService3">
- <implementation.java class="org.apache.tuscany.sca.test.CallBackBasicServiceImpl"/>
- <service name="CallBackBasicService">
- <binding.ws uri="http://localhost:8085/CallBackBasicService3"/>
- </service>
- </component>
-
- <!-- 4 - part specified callback binding -->
- <!-- TODO -->
-
-</composite>
diff --git a/sca-java-2.x/trunk/itest/callback-basic-ws/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/itest/callback-basic-ws/src/main/resources/META-INF/sca-contribution.xml
deleted file mode 100644
index d36d7478e2..0000000000
--- a/sca-java-2.x/trunk/itest/callback-basic-ws/src/main/resources/META-INF/sca-contribution.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
- xmlns:t="http://callback">
- <deployable composite="t:CallBackBasicTest" />
-</contribution> \ No newline at end of file
diff --git a/sca-java-2.x/trunk/itest/callback-basic-ws/src/test/java/org/apache/tuscany/sca/test/CallBackBasicTestCase.java b/sca-java-2.x/trunk/itest/callback-basic-ws/src/test/java/org/apache/tuscany/sca/test/CallBackBasicTestCase.java
deleted file mode 100644
index 3161c2ccaa..0000000000
--- a/sca-java-2.x/trunk/itest/callback-basic-ws/src/test/java/org/apache/tuscany/sca/test/CallBackBasicTestCase.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 org.apache.tuscany.sca.node.Contribution;
-import org.apache.tuscany.sca.node.ContributionLocationHelper;
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.NodeFactory;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Ignore;
-import org.junit.Test;
-
-public class CallBackBasicTestCase {
-
- private static Node node;
-
- @BeforeClass
- public static void setUp() throws Exception {
- String location = ContributionLocationHelper.getContributionLocation("CallBackBasicTest.composite");
- node = NodeFactory.newInstance().createNode("CallBackBasicTest.composite", new Contribution("c1", location));
- node.start();
- }
-
- @Test
- //@Ignore("TUSCANY-3593")
- public void testCallBackBasic1() {
- CallBackBasicClient aCallBackClient = node.getService(CallBackBasicClient.class, "CallBackBasicClient1");
- aCallBackClient.run();
- }
-
- @Test
- public void testCallBackBasic2() {
- CallBackBasicClient aCallBackClient = node.getService(CallBackBasicClient.class, "CallBackBasicClient2");
- aCallBackClient.run();
- }
-
- @Test
- public void testCallBackBasic3() {
- CallBackBasicClient aCallBackClient = node.getService(CallBackBasicClient.class, "CallBackBasicClient3");
- aCallBackClient.run();
- }
-
- @AfterClass
- public static void tearDown() throws Exception {
- node.stop();
- }
-
-}
diff --git a/sca-java-2.x/trunk/itest/pom.xml b/sca-java-2.x/trunk/itest/pom.xml
index 694cc5e447..cc9d227767 100644
--- a/sca-java-2.x/trunk/itest/pom.xml
+++ b/sca-java-2.x/trunk/itest/pom.xml
@@ -43,7 +43,6 @@
<module>bpel</module>
<module>callback-api</module>
<module>callback-basic</module>
- <module>callback-basic-ws</module>
<module>callback-complex-type</module>
<module>callback-multiple-wires</module>
<module>callback-separatethread</module>