From 3d3b8834b93b98cc7d7534e693e937179067eb58 Mon Sep 17 00:00:00 2001 From: antelder Date: Sat, 16 May 2009 08:44:44 +0000 Subject: Delete previous 1.5 branch thats now old and unused and will be replaced with the current 1.x trunk git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@775435 13f79535-47bb-0310-9956-ffa450edef68 --- .../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 ----------------- 5 files changed, 204 deletions(-) delete mode 100644 branches/sca-java-1.5/itest/callback-composite-scope/src/main/java/org/apache/tuscany/sca/test/Helloworld.java delete mode 100644 branches/sca-java-1.5/itest/callback-composite-scope/src/main/java/org/apache/tuscany/sca/test/HelloworldCallback.java delete mode 100644 branches/sca-java-1.5/itest/callback-composite-scope/src/main/java/org/apache/tuscany/sca/test/HelloworldDelegate.java delete mode 100644 branches/sca-java-1.5/itest/callback-composite-scope/src/main/java/org/apache/tuscany/sca/test/HelloworldDelegateImpl.java delete mode 100644 branches/sca-java-1.5/itest/callback-composite-scope/src/main/java/org/apache/tuscany/sca/test/HelloworldImpl.java (limited to 'branches/sca-java-1.5/itest/callback-composite-scope/src/main/java/org') diff --git a/branches/sca-java-1.5/itest/callback-composite-scope/src/main/java/org/apache/tuscany/sca/test/Helloworld.java b/branches/sca-java-1.5/itest/callback-composite-scope/src/main/java/org/apache/tuscany/sca/test/Helloworld.java deleted file mode 100644 index a5320a6492..0000000000 --- a/branches/sca-java-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/branches/sca-java-1.5/itest/callback-composite-scope/src/main/java/org/apache/tuscany/sca/test/HelloworldCallback.java b/branches/sca-java-1.5/itest/callback-composite-scope/src/main/java/org/apache/tuscany/sca/test/HelloworldCallback.java deleted file mode 100644 index c37c2f57a2..0000000000 --- a/branches/sca-java-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/branches/sca-java-1.5/itest/callback-composite-scope/src/main/java/org/apache/tuscany/sca/test/HelloworldDelegate.java b/branches/sca-java-1.5/itest/callback-composite-scope/src/main/java/org/apache/tuscany/sca/test/HelloworldDelegate.java deleted file mode 100644 index 0d56e440cd..0000000000 --- a/branches/sca-java-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/branches/sca-java-1.5/itest/callback-composite-scope/src/main/java/org/apache/tuscany/sca/test/HelloworldDelegateImpl.java b/branches/sca-java-1.5/itest/callback-composite-scope/src/main/java/org/apache/tuscany/sca/test/HelloworldDelegateImpl.java deleted file mode 100644 index aa7217eb2a..0000000000 --- a/branches/sca-java-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/branches/sca-java-1.5/itest/callback-composite-scope/src/main/java/org/apache/tuscany/sca/test/HelloworldImpl.java b/branches/sca-java-1.5/itest/callback-composite-scope/src/main/java/org/apache/tuscany/sca/test/HelloworldImpl.java deleted file mode 100644 index 8107bcf42b..0000000000 --- a/branches/sca-java-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; - } -} -- cgit v1.2.3