From 04dcd09976ecc5aa2948993b9a9a2d90d239ee44 Mon Sep 17 00:00:00 2001 From: antelder Date: Thu, 28 Jul 2011 10:58:07 +0000 Subject: Delete old beta3 branch as its going to be recreated from the current trunk git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1151789 13f79535-47bb-0310-9956-ffa450edef68 --- .../recursive-ws/src/main/java/policy/Target.java | 26 ------------- .../src/main/java/policy/TargetClientImpl.java | 33 ----------------- .../src/main/java/policy/TargetServiceImpl.java | 29 --------------- .../src/main/java/recursive/Composer.java | 26 ------------- .../src/main/java/recursive/ComposerClient.java | 43 ---------------------- .../main/java/recursive/ComposerClientImpl.java | 38 ------------------- .../src/main/java/recursive/ComposerImpl.java | 34 ----------------- .../src/main/java/recursive/ComposerServer.java | 42 --------------------- .../src/main/resources/Client.composite | 29 --------------- .../src/main/resources/Inner.composite | 27 -------------- .../src/main/resources/Outer.composite | 32 ---------------- .../bindingoverride/InnerComposite.composite | 36 ------------------ .../bindingoverride/OuterComposite.composite | 38 ------------------- .../policy/PolicyInnerComposite.composite | 37 ------------------- .../policy/PolicyOuterComposite.composite | 39 -------------------- .../src/main/resources/policy/definitions.xml | 39 -------------------- 16 files changed, 548 deletions(-) delete mode 100644 sca-java-2.x/branches/2.0-Beta3/testing/itest/recursive-ws/src/main/java/policy/Target.java delete mode 100644 sca-java-2.x/branches/2.0-Beta3/testing/itest/recursive-ws/src/main/java/policy/TargetClientImpl.java delete mode 100644 sca-java-2.x/branches/2.0-Beta3/testing/itest/recursive-ws/src/main/java/policy/TargetServiceImpl.java delete mode 100644 sca-java-2.x/branches/2.0-Beta3/testing/itest/recursive-ws/src/main/java/recursive/Composer.java delete mode 100644 sca-java-2.x/branches/2.0-Beta3/testing/itest/recursive-ws/src/main/java/recursive/ComposerClient.java delete mode 100644 sca-java-2.x/branches/2.0-Beta3/testing/itest/recursive-ws/src/main/java/recursive/ComposerClientImpl.java delete mode 100644 sca-java-2.x/branches/2.0-Beta3/testing/itest/recursive-ws/src/main/java/recursive/ComposerImpl.java delete mode 100644 sca-java-2.x/branches/2.0-Beta3/testing/itest/recursive-ws/src/main/java/recursive/ComposerServer.java delete mode 100644 sca-java-2.x/branches/2.0-Beta3/testing/itest/recursive-ws/src/main/resources/Client.composite delete mode 100644 sca-java-2.x/branches/2.0-Beta3/testing/itest/recursive-ws/src/main/resources/Inner.composite delete mode 100644 sca-java-2.x/branches/2.0-Beta3/testing/itest/recursive-ws/src/main/resources/Outer.composite delete mode 100644 sca-java-2.x/branches/2.0-Beta3/testing/itest/recursive-ws/src/main/resources/bindingoverride/InnerComposite.composite delete mode 100644 sca-java-2.x/branches/2.0-Beta3/testing/itest/recursive-ws/src/main/resources/bindingoverride/OuterComposite.composite delete mode 100644 sca-java-2.x/branches/2.0-Beta3/testing/itest/recursive-ws/src/main/resources/policy/PolicyInnerComposite.composite delete mode 100644 sca-java-2.x/branches/2.0-Beta3/testing/itest/recursive-ws/src/main/resources/policy/PolicyOuterComposite.composite delete mode 100644 sca-java-2.x/branches/2.0-Beta3/testing/itest/recursive-ws/src/main/resources/policy/definitions.xml (limited to 'sca-java-2.x/branches/2.0-Beta3/testing/itest/recursive-ws/src/main') diff --git a/sca-java-2.x/branches/2.0-Beta3/testing/itest/recursive-ws/src/main/java/policy/Target.java b/sca-java-2.x/branches/2.0-Beta3/testing/itest/recursive-ws/src/main/java/policy/Target.java deleted file mode 100644 index 2366f6542a..0000000000 --- a/sca-java-2.x/branches/2.0-Beta3/testing/itest/recursive-ws/src/main/java/policy/Target.java +++ /dev/null @@ -1,26 +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 policy; - -import org.oasisopen.sca.annotation.Remotable; - -@Remotable -public interface Target { - String hello(String arg); -} diff --git a/sca-java-2.x/branches/2.0-Beta3/testing/itest/recursive-ws/src/main/java/policy/TargetClientImpl.java b/sca-java-2.x/branches/2.0-Beta3/testing/itest/recursive-ws/src/main/java/policy/TargetClientImpl.java deleted file mode 100644 index b2d59e925c..0000000000 --- a/sca-java-2.x/branches/2.0-Beta3/testing/itest/recursive-ws/src/main/java/policy/TargetClientImpl.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 policy; - -import org.oasisopen.sca.annotation.Reference; -import org.oasisopen.sca.annotation.Service; - -@Service(Target.class) -public class TargetClientImpl implements Target { - - @Reference - protected Target targetService; - - public String hello(String arg) { - return "Target: Hello " + targetService.hello(arg) + "!"; - } -} diff --git a/sca-java-2.x/branches/2.0-Beta3/testing/itest/recursive-ws/src/main/java/policy/TargetServiceImpl.java b/sca-java-2.x/branches/2.0-Beta3/testing/itest/recursive-ws/src/main/java/policy/TargetServiceImpl.java deleted file mode 100644 index 6f52dfb26e..0000000000 --- a/sca-java-2.x/branches/2.0-Beta3/testing/itest/recursive-ws/src/main/java/policy/TargetServiceImpl.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 policy; - -import org.oasisopen.sca.annotation.Service; - -@Service(Target.class) -public class TargetServiceImpl implements Target { - - public String hello(String arg) { - return "Target: Hello " + arg + "!"; - } -} diff --git a/sca-java-2.x/branches/2.0-Beta3/testing/itest/recursive-ws/src/main/java/recursive/Composer.java b/sca-java-2.x/branches/2.0-Beta3/testing/itest/recursive-ws/src/main/java/recursive/Composer.java deleted file mode 100644 index 18486115ae..0000000000 --- a/sca-java-2.x/branches/2.0-Beta3/testing/itest/recursive-ws/src/main/java/recursive/Composer.java +++ /dev/null @@ -1,26 +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 recursive; - -import org.oasisopen.sca.annotation.Remotable; - -@Remotable -public interface Composer { - public String Compose(String s); -} \ No newline at end of file diff --git a/sca-java-2.x/branches/2.0-Beta3/testing/itest/recursive-ws/src/main/java/recursive/ComposerClient.java b/sca-java-2.x/branches/2.0-Beta3/testing/itest/recursive-ws/src/main/java/recursive/ComposerClient.java deleted file mode 100644 index 13c306d9b1..0000000000 --- a/sca-java-2.x/branches/2.0-Beta3/testing/itest/recursive-ws/src/main/java/recursive/ComposerClient.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 recursive; - -import java.io.File; - -import org.apache.tuscany.sca.node.Client; -import org.apache.tuscany.sca.node.Node; -import org.apache.tuscany.sca.node.NodeFactory; -import org.apache.tuscany.sca.node.Contribution; - -/** - * For testing purpose - */ -public class ComposerClient { - - public final static void main(String[] args) throws Exception { - NodeFactory factory = NodeFactory.newInstance(); - Node node = factory.createNode(new File("src/main/resources/Client.composite").toURI().toURL().toString(), - new Contribution("TestContribution", new File("src/main/resources/").toURI().toURL().toString())); - node.start(); - Composer composer = ((Client)node).getService(Composer.class, "ClientComponent/Composer"); - System.out.println(composer.Compose("ABC")); - node.stop(); - } - -} diff --git a/sca-java-2.x/branches/2.0-Beta3/testing/itest/recursive-ws/src/main/java/recursive/ComposerClientImpl.java b/sca-java-2.x/branches/2.0-Beta3/testing/itest/recursive-ws/src/main/java/recursive/ComposerClientImpl.java deleted file mode 100644 index 3c432bc26a..0000000000 --- a/sca-java-2.x/branches/2.0-Beta3/testing/itest/recursive-ws/src/main/java/recursive/ComposerClientImpl.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 recursive; - -import org.oasisopen.sca.annotation.Reference; - -/** - * @version $Rev$ $Date$ - */ -public class ComposerClientImpl implements Composer { - @Reference - protected Composer composerWS; - - /** - * @see recursive.Composer#Compose(java.lang.String) - */ - public String Compose(String s) { - return composerWS.Compose(s); - } - -} diff --git a/sca-java-2.x/branches/2.0-Beta3/testing/itest/recursive-ws/src/main/java/recursive/ComposerImpl.java b/sca-java-2.x/branches/2.0-Beta3/testing/itest/recursive-ws/src/main/java/recursive/ComposerImpl.java deleted file mode 100644 index 8b77484922..0000000000 --- a/sca-java-2.x/branches/2.0-Beta3/testing/itest/recursive-ws/src/main/java/recursive/ComposerImpl.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 recursive; - -/** - * Composer Component Implementation - * - */ - -public class ComposerImpl implements Composer { - - public String Compose(String s) { - System.out.println("Composing " + s + "..."); - return "Composed: " + s; - - } - -} diff --git a/sca-java-2.x/branches/2.0-Beta3/testing/itest/recursive-ws/src/main/java/recursive/ComposerServer.java b/sca-java-2.x/branches/2.0-Beta3/testing/itest/recursive-ws/src/main/java/recursive/ComposerServer.java deleted file mode 100644 index a123160d85..0000000000 --- a/sca-java-2.x/branches/2.0-Beta3/testing/itest/recursive-ws/src/main/java/recursive/ComposerServer.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 recursive; - -import java.io.File; - -import org.apache.tuscany.sca.node.Node; -import org.apache.tuscany.sca.node.NodeFactory; -import org.apache.tuscany.sca.node.Contribution; - -/** - * For testing purpose - */ -public class ComposerServer { - - public final static void main(String[] args) throws Exception { - NodeFactory factory = NodeFactory.newInstance(); - Node node = factory.createNode(new File("src/main/resources/Outer.composite").toURI().toURL().toString(), - new Contribution("TestContribution", new File("src/main/resources/").toURI().toURL().toString())); - node.start(); - System.out.println("Press Enter to exit..."); - System.in.read(); - node.stop(); - } - -} diff --git a/sca-java-2.x/branches/2.0-Beta3/testing/itest/recursive-ws/src/main/resources/Client.composite b/sca-java-2.x/branches/2.0-Beta3/testing/itest/recursive-ws/src/main/resources/Client.composite deleted file mode 100644 index 50cbaa5086..0000000000 --- a/sca-java-2.x/branches/2.0-Beta3/testing/itest/recursive-ws/src/main/resources/Client.composite +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - - diff --git a/sca-java-2.x/branches/2.0-Beta3/testing/itest/recursive-ws/src/main/resources/Inner.composite b/sca-java-2.x/branches/2.0-Beta3/testing/itest/recursive-ws/src/main/resources/Inner.composite deleted file mode 100644 index df7130ba99..0000000000 --- a/sca-java-2.x/branches/2.0-Beta3/testing/itest/recursive-ws/src/main/resources/Inner.composite +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - diff --git a/sca-java-2.x/branches/2.0-Beta3/testing/itest/recursive-ws/src/main/resources/Outer.composite b/sca-java-2.x/branches/2.0-Beta3/testing/itest/recursive-ws/src/main/resources/Outer.composite deleted file mode 100644 index 1c7d49f1c0..0000000000 --- a/sca-java-2.x/branches/2.0-Beta3/testing/itest/recursive-ws/src/main/resources/Outer.composite +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - - - - - diff --git a/sca-java-2.x/branches/2.0-Beta3/testing/itest/recursive-ws/src/main/resources/bindingoverride/InnerComposite.composite b/sca-java-2.x/branches/2.0-Beta3/testing/itest/recursive-ws/src/main/resources/bindingoverride/InnerComposite.composite deleted file mode 100644 index cb6e0cc358..0000000000 --- a/sca-java-2.x/branches/2.0-Beta3/testing/itest/recursive-ws/src/main/resources/bindingoverride/InnerComposite.composite +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/sca-java-2.x/branches/2.0-Beta3/testing/itest/recursive-ws/src/main/resources/bindingoverride/OuterComposite.composite b/sca-java-2.x/branches/2.0-Beta3/testing/itest/recursive-ws/src/main/resources/bindingoverride/OuterComposite.composite deleted file mode 100644 index 3f76efb11b..0000000000 --- a/sca-java-2.x/branches/2.0-Beta3/testing/itest/recursive-ws/src/main/resources/bindingoverride/OuterComposite.composite +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/sca-java-2.x/branches/2.0-Beta3/testing/itest/recursive-ws/src/main/resources/policy/PolicyInnerComposite.composite b/sca-java-2.x/branches/2.0-Beta3/testing/itest/recursive-ws/src/main/resources/policy/PolicyInnerComposite.composite deleted file mode 100644 index 3e78eb4533..0000000000 --- a/sca-java-2.x/branches/2.0-Beta3/testing/itest/recursive-ws/src/main/resources/policy/PolicyInnerComposite.composite +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/sca-java-2.x/branches/2.0-Beta3/testing/itest/recursive-ws/src/main/resources/policy/PolicyOuterComposite.composite b/sca-java-2.x/branches/2.0-Beta3/testing/itest/recursive-ws/src/main/resources/policy/PolicyOuterComposite.composite deleted file mode 100644 index 6e686a579f..0000000000 --- a/sca-java-2.x/branches/2.0-Beta3/testing/itest/recursive-ws/src/main/resources/policy/PolicyOuterComposite.composite +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/sca-java-2.x/branches/2.0-Beta3/testing/itest/recursive-ws/src/main/resources/policy/definitions.xml b/sca-java-2.x/branches/2.0-Beta3/testing/itest/recursive-ws/src/main/resources/policy/definitions.xml deleted file mode 100644 index 923e1ad5f6..0000000000 --- a/sca-java-2.x/branches/2.0-Beta3/testing/itest/recursive-ws/src/main/resources/policy/definitions.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - Test Intent One - - - - - - - - \ No newline at end of file -- cgit v1.2.3