From 496a0ea8d015ff2ef0777a8a182f96fee9cd1222 Mon Sep 17 00:00:00 2001 From: antelder Date: Tue, 26 May 2009 11:59:37 +0000 Subject: Rename old RC tag git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@778667 13f79535-47bb-0310-9956-ffa450edef68 --- .../sca/1.5/itest/callback-composite-scope/pom.xml | 53 ----------------- .../org/apache/tuscany/sca/test/Helloworld.java | 34 ----------- .../tuscany/sca/test/HelloworldCallback.java | 32 ----------- .../tuscany/sca/test/HelloworldDelegate.java | 32 ----------- .../tuscany/sca/test/HelloworldDelegateImpl.java | 60 -------------------- .../apache/tuscany/sca/test/HelloworldImpl.java | 46 --------------- .../main/resources/HelloworldDelegate.composite | 42 -------------- .../main/resources/META-INF/sca-contribution.xml | 26 --------- .../apache/tuscany/sca/test/CallbackTestCase.java | 66 ---------------------- 9 files changed, 391 deletions(-) delete mode 100644 tags/java/sca/1.5/itest/callback-composite-scope/pom.xml delete mode 100644 tags/java/sca/1.5/itest/callback-composite-scope/src/main/java/org/apache/tuscany/sca/test/Helloworld.java delete mode 100644 tags/java/sca/1.5/itest/callback-composite-scope/src/main/java/org/apache/tuscany/sca/test/HelloworldCallback.java delete mode 100644 tags/java/sca/1.5/itest/callback-composite-scope/src/main/java/org/apache/tuscany/sca/test/HelloworldDelegate.java delete mode 100644 tags/java/sca/1.5/itest/callback-composite-scope/src/main/java/org/apache/tuscany/sca/test/HelloworldDelegateImpl.java delete mode 100644 tags/java/sca/1.5/itest/callback-composite-scope/src/main/java/org/apache/tuscany/sca/test/HelloworldImpl.java delete mode 100644 tags/java/sca/1.5/itest/callback-composite-scope/src/main/resources/HelloworldDelegate.composite delete mode 100644 tags/java/sca/1.5/itest/callback-composite-scope/src/main/resources/META-INF/sca-contribution.xml delete mode 100644 tags/java/sca/1.5/itest/callback-composite-scope/src/test/java/org/apache/tuscany/sca/test/CallbackTestCase.java (limited to 'tags/java/sca/1.5/itest/callback-composite-scope') diff --git a/tags/java/sca/1.5/itest/callback-composite-scope/pom.xml b/tags/java/sca/1.5/itest/callback-composite-scope/pom.xml deleted file mode 100644 index a275b1c11b..0000000000 --- a/tags/java/sca/1.5/itest/callback-composite-scope/pom.xml +++ /dev/null @@ -1,53 +0,0 @@ - - - - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-itest - 1.5 - ../pom.xml - - itest-callback-composite-scope - Apache Tuscany SCA iTest Callback COMPOSITE Scope - - - - org.apache.tuscany.sca - tuscany-host-embedded - 1.5 - - - - org.apache.tuscany.sca - tuscany-implementation-java-runtime - 1.5 - runtime - - - - - ${basedir}/../build-was-integration.xml - ${basedir}/../wasAdmin.py - - diff --git a/tags/java/sca/1.5/itest/callback-composite-scope/src/main/java/org/apache/tuscany/sca/test/Helloworld.java b/tags/java/sca/1.5/itest/callback-composite-scope/src/main/java/org/apache/tuscany/sca/test/Helloworld.java deleted file mode 100644 index a5320a6492..0000000000 --- a/tags/java/sca/1.5/itest/callback-composite-scope/src/main/java/org/apache/tuscany/sca/test/Helloworld.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; -import org.osoa.sca.annotations.Remotable; - -/** - * @version $Rev$ $Date$ - */ -@Remotable -@Callback(HelloworldCallback.class) -public interface Helloworld { - - String sayHello(String name); - -} diff --git a/tags/java/sca/1.5/itest/callback-composite-scope/src/main/java/org/apache/tuscany/sca/test/HelloworldCallback.java b/tags/java/sca/1.5/itest/callback-composite-scope/src/main/java/org/apache/tuscany/sca/test/HelloworldCallback.java deleted file mode 100644 index c37c2f57a2..0000000000 --- a/tags/java/sca/1.5/itest/callback-composite-scope/src/main/java/org/apache/tuscany/sca/test/HelloworldCallback.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; - -import org.osoa.sca.annotations.Remotable; - -/** - * @version $Rev$ $Date$ - */ -@Remotable -public interface HelloworldCallback { - - String whoIs(String name); - -} diff --git a/tags/java/sca/1.5/itest/callback-composite-scope/src/main/java/org/apache/tuscany/sca/test/HelloworldDelegate.java b/tags/java/sca/1.5/itest/callback-composite-scope/src/main/java/org/apache/tuscany/sca/test/HelloworldDelegate.java deleted file mode 100644 index 0d56e440cd..0000000000 --- a/tags/java/sca/1.5/itest/callback-composite-scope/src/main/java/org/apache/tuscany/sca/test/HelloworldDelegate.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; - -import org.osoa.sca.annotations.Remotable; - -/** - * @version $Rev$ $Date$ - */ -@Remotable -public interface HelloworldDelegate { - - String sayHello(String name); - -} diff --git a/tags/java/sca/1.5/itest/callback-composite-scope/src/main/java/org/apache/tuscany/sca/test/HelloworldDelegateImpl.java b/tags/java/sca/1.5/itest/callback-composite-scope/src/main/java/org/apache/tuscany/sca/test/HelloworldDelegateImpl.java deleted file mode 100644 index aa7217eb2a..0000000000 --- a/tags/java/sca/1.5/itest/callback-composite-scope/src/main/java/org/apache/tuscany/sca/test/HelloworldDelegateImpl.java +++ /dev/null @@ -1,60 +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.ComponentName; -import org.osoa.sca.annotations.Property; -import org.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.Scope; -import org.osoa.sca.annotations.Service; - -/** - * A HelloworldDelegate implementation. The service method invocation is delegated to a Helloworld service - * reference injected into this component. - * - * @version $Rev$ $Date$ - */ -@Scope("COMPOSITE") -@Service(interfaces = {HelloworldDelegate.class, HelloworldCallback.class}) -public class HelloworldDelegateImpl implements HelloworldDelegate, HelloworldCallback { - - @ComponentName - protected String componentName; - - @Reference - public Helloworld helloworld; - - @Property - public String salutation; - - public String sayHello(String name) { - System.out.println(componentName+": HelloworldDelegateImpl("+this+").sayHello: " + name); - return helloworld.sayHello(name); - } - - public String whoIs(String name) { - System.out.println(componentName+": HelloworldDelegateImpl("+this+").whoIs: " + name); - if(!"world".equalsIgnoreCase(name)) { - return salutation; - } else { - return ""; - } - } -} diff --git a/tags/java/sca/1.5/itest/callback-composite-scope/src/main/java/org/apache/tuscany/sca/test/HelloworldImpl.java b/tags/java/sca/1.5/itest/callback-composite-scope/src/main/java/org/apache/tuscany/sca/test/HelloworldImpl.java deleted file mode 100644 index 8107bcf42b..0000000000 --- a/tags/java/sca/1.5/itest/callback-composite-scope/src/main/java/org/apache/tuscany/sca/test/HelloworldImpl.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.test; - -import org.osoa.sca.annotations.Callback; -import org.osoa.sca.annotations.ComponentName; -import org.osoa.sca.annotations.Scope; -import org.osoa.sca.annotations.Service; - -/** - * @version $Rev$ $Date$ - */ -@Service(Helloworld.class) -@Scope("COMPOSITE") -public class HelloworldImpl implements Helloworld { - - @ComponentName - protected String componentName; - - @Callback - public HelloworldCallback helloworldCallback; - - public String sayHello(String name) { - System.out.println(componentName+": HelloworldImpl("+this+").sayHello: " + name); - String msg = "Hello " + helloworldCallback.whoIs(name) + " " + name; - System.out.println("Msg: "+msg); - return msg; - } -} diff --git a/tags/java/sca/1.5/itest/callback-composite-scope/src/main/resources/HelloworldDelegate.composite b/tags/java/sca/1.5/itest/callback-composite-scope/src/main/resources/HelloworldDelegate.composite deleted file mode 100644 index 1593c1dc23..0000000000 --- a/tags/java/sca/1.5/itest/callback-composite-scope/src/main/resources/HelloworldDelegate.composite +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - - - - - - - - - - Monsieur - - - - - - Mr. - - diff --git a/tags/java/sca/1.5/itest/callback-composite-scope/src/main/resources/META-INF/sca-contribution.xml b/tags/java/sca/1.5/itest/callback-composite-scope/src/main/resources/META-INF/sca-contribution.xml deleted file mode 100644 index 65b9ca501f..0000000000 --- a/tags/java/sca/1.5/itest/callback-composite-scope/src/main/resources/META-INF/sca-contribution.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - diff --git a/tags/java/sca/1.5/itest/callback-composite-scope/src/test/java/org/apache/tuscany/sca/test/CallbackTestCase.java b/tags/java/sca/1.5/itest/callback-composite-scope/src/test/java/org/apache/tuscany/sca/test/CallbackTestCase.java deleted file mode 100644 index bd967099dc..0000000000 --- a/tags/java/sca/1.5/itest/callback-composite-scope/src/test/java/org/apache/tuscany/sca/test/CallbackTestCase.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.host.embedded.SCADomain; -import org.junit.After; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Ignore; -import org.junit.Test; - -/** - * @version $Rev$ $Date$ - */ -public class CallbackTestCase { - - private static SCADomain domain; - private HelloworldDelegate client; - private HelloworldDelegate client2; - private HelloworldCallback callback; - private HelloworldCallback callback2; - - @Test - @Ignore("TUSCANY-2823") - public void testCallbacks() { - String name = "John"; - Assert.assertEquals("Hello "+callback.whoIs(name) + " " + name, client.sayHello(name)); - Assert.assertEquals("Hello "+callback2.whoIs(name) + " " + name, client2.sayHello(name)); - } - - @Before - public void setUp() throws Exception { - if( domain == null ) { - domain = SCADomain.newInstance("HelloworldDelegate.composite"); - } - - client = domain.getService(HelloworldDelegate.class, "HelloworldDelegateComponent/HelloworldDelegate"); - callback = domain.getService(HelloworldCallback.class, "HelloworldDelegateComponent/HelloworldCallback"); - client2 = domain.getService(HelloworldDelegate.class, "HelloworldDelegateComponent2/HelloworldDelegate"); - callback2 = domain.getService(HelloworldCallback.class, "HelloworldDelegateComponent2/HelloworldCallback"); - } - - @After - public void tearDown() throws Exception { - domain.close(); - } - - -} -- cgit v1.2.3