From 725006d4c47e63986ac042ade23a4d193298b1fe Mon Sep 17 00:00:00 2001 From: lresende Date: Wed, 11 Nov 2009 23:08:29 +0000 Subject: Moving 1.x branches git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@835131 13f79535-47bb-0310-9956-ffa450edef68 --- .../java/callback/client/CallbackCallback.java | 33 ---- .../main/java/callback/client/CallbackClient.java | 31 ---- .../callback/client/JavaCallbackClientImpl.java | 141 ---------------- .../callback/client/OSGiCallbackClientImpl.java | 181 --------------------- .../java/callback/service/CallbackService.java | 39 ----- .../callback/service/JavaCallbackServiceImpl.java | 68 -------- .../callback/service/OSGiCallbackServiceImpl.java | 95 ----------- 7 files changed, 588 deletions(-) delete mode 100644 branches/sca-java-1.4/itest/osgi-implementation/src/main/java/callback/client/CallbackCallback.java delete mode 100644 branches/sca-java-1.4/itest/osgi-implementation/src/main/java/callback/client/CallbackClient.java delete mode 100644 branches/sca-java-1.4/itest/osgi-implementation/src/main/java/callback/client/JavaCallbackClientImpl.java delete mode 100644 branches/sca-java-1.4/itest/osgi-implementation/src/main/java/callback/client/OSGiCallbackClientImpl.java delete mode 100644 branches/sca-java-1.4/itest/osgi-implementation/src/main/java/callback/service/CallbackService.java delete mode 100644 branches/sca-java-1.4/itest/osgi-implementation/src/main/java/callback/service/JavaCallbackServiceImpl.java delete mode 100644 branches/sca-java-1.4/itest/osgi-implementation/src/main/java/callback/service/OSGiCallbackServiceImpl.java (limited to 'branches/sca-java-1.4/itest/osgi-implementation/src/main/java/callback') diff --git a/branches/sca-java-1.4/itest/osgi-implementation/src/main/java/callback/client/CallbackCallback.java b/branches/sca-java-1.4/itest/osgi-implementation/src/main/java/callback/client/CallbackCallback.java deleted file mode 100644 index cfecd989fe..0000000000 --- a/branches/sca-java-1.4/itest/osgi-implementation/src/main/java/callback/client/CallbackCallback.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 callback.client; - -import org.osoa.sca.annotations.Remotable; - -@Remotable -/* - * Callback interface - */ -public interface CallbackCallback { - - public void callbackMessage(String aString); - - public void callbackIncrement(String aString); - -} diff --git a/branches/sca-java-1.4/itest/osgi-implementation/src/main/java/callback/client/CallbackClient.java b/branches/sca-java-1.4/itest/osgi-implementation/src/main/java/callback/client/CallbackClient.java deleted file mode 100644 index 43bc26f2f5..0000000000 --- a/branches/sca-java-1.4/itest/osgi-implementation/src/main/java/callback/client/CallbackClient.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 callback.client; - -import org.osoa.sca.annotations.Remotable; - -@Remotable -/** - * Callback test client interface - */ -public interface CallbackClient { - - public void run(); - -} diff --git a/branches/sca-java-1.4/itest/osgi-implementation/src/main/java/callback/client/JavaCallbackClientImpl.java b/branches/sca-java-1.4/itest/osgi-implementation/src/main/java/callback/client/JavaCallbackClientImpl.java deleted file mode 100644 index f78878ef47..0000000000 --- a/branches/sca-java-1.4/itest/osgi-implementation/src/main/java/callback/client/JavaCallbackClientImpl.java +++ /dev/null @@ -1,141 +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 callback.client; - -import junit.framework.Assert; - -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Service; - -import callback.service.CallbackService; - -@Service(CallbackClient.class) -/** - * Callback test client implementation - */ -public class JavaCallbackClientImpl implements CallbackClient, CallbackCallback { - - @Reference - protected CallbackService callbackService; - - 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() { - callbackService.knockKnock("Knock Knock"); - int count = 0; - - // - // If we cant 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("CallbackITest - test1a", "Who's There", this.getReturnMessage()); - - } - - private void test1b() { - callbackService.noCallback("No Reply Desired"); - Assert.assertEquals("CallbackITest - test1b", 1, 1); - - return; - } - - private void test1c() { - callbackService.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("CallbackITest - 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/branches/sca-java-1.4/itest/osgi-implementation/src/main/java/callback/client/OSGiCallbackClientImpl.java b/branches/sca-java-1.4/itest/osgi-implementation/src/main/java/callback/client/OSGiCallbackClientImpl.java deleted file mode 100644 index 1c65ca573b..0000000000 --- a/branches/sca-java-1.4/itest/osgi-implementation/src/main/java/callback/client/OSGiCallbackClientImpl.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 callback.client; - -import java.util.Hashtable; - - -import org.osgi.framework.BundleActivator; -import org.osgi.framework.BundleContext; -import org.osgi.framework.ServiceReference; - -import callback.service.CallbackService; - -/** - * OSGi Callback test client implementation - */ -public class OSGiCallbackClientImpl implements - CallbackClient, CallbackCallback, BundleActivator { - - protected CallbackService callbackService; - - private static String returnMessage = null; - private static int callbackCount = 0; - private static Object monitor = new Object(); - - private BundleContext bundleContext; - - 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() { - callbackService.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(); - } - } - } - - if (!"Who's There".equals(this.getReturnMessage())) { - throw new RuntimeException("CallbackITest - test1a"); - } - - } - - private void test1b() { - callbackService.noCallback("No Reply Desired"); - - return; - } - - private void test1c() { - callbackService.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(); - } - } - } - - if (this.getCallbackCount() != 3) - throw new RuntimeException("CallbackITest - test1c"); - 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(); - } - } - - - public void start(BundleContext bc) throws Exception { - - System.out.println("Started OSGiCallbackClientImpl bundle "); - - this.bundleContext = bc; - - Hashtable serviceProps = new Hashtable(); - serviceProps.put("component.service.name", "CallbackClient/CallbackClient"); - - serviceProps.put("component.name", "CallbackClient"); - bundleContext.registerService("callback.client.CallbackClient", this, serviceProps); - - Hashtable callbackProps = new Hashtable(); - callbackProps.put("component.service.name", "CallbackClient/callbackService"); - callbackProps.put("component.name", "CallbackClient"); - - bundleContext.registerService("callback.client.CallbackCallback", this, callbackProps); - - ServiceReference ref= bundleContext.getServiceReference("callback.service.CallbackService"); - - if (ref != null) - callbackService = (callback.service.CallbackService)bundleContext.getService(ref); - - - - - } - - public void stop(BundleContext bc) { - } - - -} diff --git a/branches/sca-java-1.4/itest/osgi-implementation/src/main/java/callback/service/CallbackService.java b/branches/sca-java-1.4/itest/osgi-implementation/src/main/java/callback/service/CallbackService.java deleted file mode 100644 index 5383e1e268..0000000000 --- a/branches/sca-java-1.4/itest/osgi-implementation/src/main/java/callback/service/CallbackService.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 callback.service; - -import org.osoa.sca.annotations.Callback; -import org.osoa.sca.annotations.Remotable; - -import callback.client.CallbackCallback; - -@Remotable -@Callback(CallbackCallback.class) -/* - * Callback service interface - */ -public interface CallbackService { - - public void knockKnock(String aString); - - public void noCallback(String aString); - - public void multiCallback(String aString); - -} diff --git a/branches/sca-java-1.4/itest/osgi-implementation/src/main/java/callback/service/JavaCallbackServiceImpl.java b/branches/sca-java-1.4/itest/osgi-implementation/src/main/java/callback/service/JavaCallbackServiceImpl.java deleted file mode 100644 index b2af2fa68d..0000000000 --- a/branches/sca-java-1.4/itest/osgi-implementation/src/main/java/callback/service/JavaCallbackServiceImpl.java +++ /dev/null @@ -1,68 +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 callback.service; - -import org.osoa.sca.annotations.Callback; -import org.osoa.sca.annotations.Service; - -import callback.client.CallbackCallback; - -@Service(CallbackService.class) -/* - * Callback service implementation - */ -public class JavaCallbackServiceImpl implements CallbackService { - - private CallbackCallback callback; - - @Callback - protected void setCallback(CallbackCallback callback) { - this.callback = callback; - } - - public void knockKnock(String aString) { - - System.out.println("CallbackServiceImpl message received: " + aString); - callback.callbackMessage("Who's There"); - System.out.println("CallbackServiceImpl response sent"); - return; - - } - - public void multiCallback(String aString) { - - System.out.println("CallbackServiceImpl message received: " + aString); - callback.callbackIncrement("Who's There 1"); - System.out.println("CallbackServiceImpl response sent"); - callback.callbackIncrement("Who's There 2"); - System.out.println("CallbackServiceImpl response sent"); - callback.callbackIncrement("Who's There 3"); - System.out.println("CallbackServiceImpl response sent"); - return; - - } - - public void noCallback(String aString) { - - System.out.println("CallbackServiceImpl message received: " + aString); - // System.out.println("CallbackServiceImpl No response desired"); - return; - - } -} diff --git a/branches/sca-java-1.4/itest/osgi-implementation/src/main/java/callback/service/OSGiCallbackServiceImpl.java b/branches/sca-java-1.4/itest/osgi-implementation/src/main/java/callback/service/OSGiCallbackServiceImpl.java deleted file mode 100644 index c05a3f52a8..0000000000 --- a/branches/sca-java-1.4/itest/osgi-implementation/src/main/java/callback/service/OSGiCallbackServiceImpl.java +++ /dev/null @@ -1,95 +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 callback.service; - -import java.util.Hashtable; - -import org.osgi.framework.BundleActivator; -import org.osgi.framework.BundleContext; -import org.osgi.framework.ServiceReference; -import org.osoa.sca.annotations.Callback; - -import callback.client.CallbackCallback; - -/* - * OSGi Callback service implementation - */ -public class OSGiCallbackServiceImpl implements CallbackService, BundleActivator { - - @Callback - protected CallbackCallback callback; - - - private BundleContext bundleContext; - - public void knockKnock(String aString) { - - System.out.println("CallbackServiceImpl message received: " + aString); - callback.callbackMessage("Who's There"); - System.out.println("CallbackServiceImpl response sent"); - return; - - } - - public void multiCallback(String aString) { - - System.out.println("CallbackServiceImpl message received: " + aString); - callback.callbackIncrement("Who's There 1"); - System.out.println("CallbackServiceImpl response sent"); - callback.callbackIncrement("Who's There 2"); - System.out.println("CallbackServiceImpl response sent"); - callback.callbackIncrement("Who's There 3"); - System.out.println("CallbackServiceImpl response sent"); - return; - - } - - public void noCallback(String aString) { - - System.out.println("CallbackServiceImpl message received: " + aString); - // System.out.println("CallbackServiceImpl No response desired"); - return; - - } - - - public void start(BundleContext bc) throws Exception { - - System.out.println("Started OSGiCallbackServiceImpl bundle "); - - this.bundleContext = bc; - - Hashtable serviceProps = new Hashtable(); - serviceProps.put("component.service.name", "CallbackService/CallbackService"); - bundleContext.registerService("callback.service.CallbackService", this, serviceProps); - - - ServiceReference ref= bundleContext.getServiceReference("callback.client.CallbackCallback"); - - if (ref != null) - callback = (CallbackCallback)bundleContext.getService(ref); - - } - - public void stop(BundleContext bc) { - } - - - -} -- cgit v1.2.3