From 5e520b1b65c79cd828057cb628b9367acb266880 Mon Sep 17 00:00:00 2001 From: lresende Date: Wed, 11 Nov 2009 23:05:59 +0000 Subject: Moving 1.x branches git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@835117 13f79535-47bb-0310-9956-ffa450edef68 --- branches/sca-android/itest/recursive-ws/pom.xml | 87 ---------------------- .../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 | 35 --------- .../main/java/recursive/ComposerClientImpl.java | 38 ---------- .../src/main/java/recursive/ComposerImpl.java | 34 --------- .../src/main/java/recursive/ComposerServer.java | 35 --------- .../src/main/resources/Client.composite | 28 ------- .../src/main/resources/Inner.composite | 26 ------- .../src/main/resources/Outer.composite | 31 -------- .../bindingoverride/InnerComposite.composite | 36 --------- .../bindingoverride/OuterComposite.composite | 40 ---------- .../policy/PolicyInnerComposite.composite | 37 --------- .../policy/PolicyOuterComposite.composite | 41 ---------- .../src/main/resources/policy/definitions.xml | 39 ---------- .../bindingoverride/BindingOverrideTestCase.java | 57 -------------- .../src/test/java/policy/PolicyTestCase.java | 74 ------------------ .../java/recursive/ComposerClientTestCase.java | 68 ----------------- .../test/java/recursive/ComposerTestServer.java | 55 -------------- 21 files changed, 875 deletions(-) delete mode 100644 branches/sca-android/itest/recursive-ws/pom.xml delete mode 100644 branches/sca-android/itest/recursive-ws/src/main/java/policy/Target.java delete mode 100644 branches/sca-android/itest/recursive-ws/src/main/java/policy/TargetClientImpl.java delete mode 100644 branches/sca-android/itest/recursive-ws/src/main/java/policy/TargetServiceImpl.java delete mode 100644 branches/sca-android/itest/recursive-ws/src/main/java/recursive/Composer.java delete mode 100644 branches/sca-android/itest/recursive-ws/src/main/java/recursive/ComposerClient.java delete mode 100644 branches/sca-android/itest/recursive-ws/src/main/java/recursive/ComposerClientImpl.java delete mode 100644 branches/sca-android/itest/recursive-ws/src/main/java/recursive/ComposerImpl.java delete mode 100644 branches/sca-android/itest/recursive-ws/src/main/java/recursive/ComposerServer.java delete mode 100644 branches/sca-android/itest/recursive-ws/src/main/resources/Client.composite delete mode 100644 branches/sca-android/itest/recursive-ws/src/main/resources/Inner.composite delete mode 100644 branches/sca-android/itest/recursive-ws/src/main/resources/Outer.composite delete mode 100644 branches/sca-android/itest/recursive-ws/src/main/resources/bindingoverride/InnerComposite.composite delete mode 100644 branches/sca-android/itest/recursive-ws/src/main/resources/bindingoverride/OuterComposite.composite delete mode 100644 branches/sca-android/itest/recursive-ws/src/main/resources/policy/PolicyInnerComposite.composite delete mode 100644 branches/sca-android/itest/recursive-ws/src/main/resources/policy/PolicyOuterComposite.composite delete mode 100644 branches/sca-android/itest/recursive-ws/src/main/resources/policy/definitions.xml delete mode 100644 branches/sca-android/itest/recursive-ws/src/test/java/bindingoverride/BindingOverrideTestCase.java delete mode 100644 branches/sca-android/itest/recursive-ws/src/test/java/policy/PolicyTestCase.java delete mode 100644 branches/sca-android/itest/recursive-ws/src/test/java/recursive/ComposerClientTestCase.java delete mode 100644 branches/sca-android/itest/recursive-ws/src/test/java/recursive/ComposerTestServer.java (limited to 'branches/sca-android/itest/recursive-ws') diff --git a/branches/sca-android/itest/recursive-ws/pom.xml b/branches/sca-android/itest/recursive-ws/pom.xml deleted file mode 100644 index 5ed11a4c7a..0000000000 --- a/branches/sca-android/itest/recursive-ws/pom.xml +++ /dev/null @@ -1,87 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-itest - 1.4-SNAPSHOT - ../pom.xml - - itest-recursive-ws - Apache Tuscany SCA Recursive WS Integration Tests - - - - org.apache.tuscany.sca - tuscany-host-embedded - 1.4-SNAPSHOT - - - - org.apache.tuscany.sca - tuscany-implementation-java-runtime - 1.4-SNAPSHOT - runtime - - - - org.apache.tuscany.sca - tuscany-interface-wsdl - 1.4-SNAPSHOT - runtime - - - - org.apache.tuscany.sca - tuscany-binding-ws-axis2 - 1.4-SNAPSHOT - runtime - - - - org.apache.tuscany.sca - tuscany-databinding-axiom - 1.4-SNAPSHOT - runtime - - - - - - - - - default - - true - - - - org.apache.tuscany.sca - tuscany-host-jetty - 1.4-SNAPSHOT - runtime - - - - - - diff --git a/branches/sca-android/itest/recursive-ws/src/main/java/policy/Target.java b/branches/sca-android/itest/recursive-ws/src/main/java/policy/Target.java deleted file mode 100644 index c77fcea868..0000000000 --- a/branches/sca-android/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.osoa.sca.annotations.Remotable; - -@Remotable -public interface Target { - String hello(String arg); -} diff --git a/branches/sca-android/itest/recursive-ws/src/main/java/policy/TargetClientImpl.java b/branches/sca-android/itest/recursive-ws/src/main/java/policy/TargetClientImpl.java deleted file mode 100644 index 87e412829e..0000000000 --- a/branches/sca-android/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.osoa.sca.annotations.Reference; -import org.osoa.sca.annotations.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/branches/sca-android/itest/recursive-ws/src/main/java/policy/TargetServiceImpl.java b/branches/sca-android/itest/recursive-ws/src/main/java/policy/TargetServiceImpl.java deleted file mode 100644 index e565055252..0000000000 --- a/branches/sca-android/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.osoa.sca.annotations.Service; - -@Service(Target.class) -public class TargetServiceImpl implements Target { - - public String hello(String arg) { - return "Target: Hello " + arg + "!"; - } -} diff --git a/branches/sca-android/itest/recursive-ws/src/main/java/recursive/Composer.java b/branches/sca-android/itest/recursive-ws/src/main/java/recursive/Composer.java deleted file mode 100644 index e53f99d9c3..0000000000 --- a/branches/sca-android/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.osoa.sca.annotations.Remotable; - -@Remotable -public interface Composer { - public String Compose(String s); -} \ No newline at end of file diff --git a/branches/sca-android/itest/recursive-ws/src/main/java/recursive/ComposerClient.java b/branches/sca-android/itest/recursive-ws/src/main/java/recursive/ComposerClient.java deleted file mode 100644 index 7956d153cb..0000000000 --- a/branches/sca-android/itest/recursive-ws/src/main/java/recursive/ComposerClient.java +++ /dev/null @@ -1,35 +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.apache.tuscany.sca.host.embedded.SCADomain; - -/** - * For testing purpose - */ -public class ComposerClient { - - public final static void main(String[] args) throws Exception { - SCADomain scaDomain = SCADomain.newInstance("Client.composite"); - Composer composer = scaDomain.getService(Composer.class, "ClientComponent/Composer"); - System.out.println(composer.Compose("ABC")); - scaDomain.close(); - } - -} diff --git a/branches/sca-android/itest/recursive-ws/src/main/java/recursive/ComposerClientImpl.java b/branches/sca-android/itest/recursive-ws/src/main/java/recursive/ComposerClientImpl.java deleted file mode 100644 index 3d75b7b165..0000000000 --- a/branches/sca-android/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.osoa.sca.annotations.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/branches/sca-android/itest/recursive-ws/src/main/java/recursive/ComposerImpl.java b/branches/sca-android/itest/recursive-ws/src/main/java/recursive/ComposerImpl.java deleted file mode 100644 index 8b77484922..0000000000 --- a/branches/sca-android/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/branches/sca-android/itest/recursive-ws/src/main/java/recursive/ComposerServer.java b/branches/sca-android/itest/recursive-ws/src/main/java/recursive/ComposerServer.java deleted file mode 100644 index 5035d1cbd9..0000000000 --- a/branches/sca-android/itest/recursive-ws/src/main/java/recursive/ComposerServer.java +++ /dev/null @@ -1,35 +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.apache.tuscany.sca.host.embedded.SCADomain; - -/** - * For testing purpose - */ -public class ComposerServer { - - public final static void main(String[] args) throws Exception { - SCADomain scaDomain = SCADomain.newInstance("Outer.composite"); - System.out.println("Press Enter to exit..."); - System.in.read(); - scaDomain.close(); - } - -} diff --git a/branches/sca-android/itest/recursive-ws/src/main/resources/Client.composite b/branches/sca-android/itest/recursive-ws/src/main/resources/Client.composite deleted file mode 100644 index 56d7c01377..0000000000 --- a/branches/sca-android/itest/recursive-ws/src/main/resources/Client.composite +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - - - diff --git a/branches/sca-android/itest/recursive-ws/src/main/resources/Inner.composite b/branches/sca-android/itest/recursive-ws/src/main/resources/Inner.composite deleted file mode 100644 index b054ae0944..0000000000 --- a/branches/sca-android/itest/recursive-ws/src/main/resources/Inner.composite +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - diff --git a/branches/sca-android/itest/recursive-ws/src/main/resources/Outer.composite b/branches/sca-android/itest/recursive-ws/src/main/resources/Outer.composite deleted file mode 100644 index 3c3f327b28..0000000000 --- a/branches/sca-android/itest/recursive-ws/src/main/resources/Outer.composite +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - - diff --git a/branches/sca-android/itest/recursive-ws/src/main/resources/bindingoverride/InnerComposite.composite b/branches/sca-android/itest/recursive-ws/src/main/resources/bindingoverride/InnerComposite.composite deleted file mode 100644 index b5c180919c..0000000000 --- a/branches/sca-android/itest/recursive-ws/src/main/resources/bindingoverride/InnerComposite.composite +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/branches/sca-android/itest/recursive-ws/src/main/resources/bindingoverride/OuterComposite.composite b/branches/sca-android/itest/recursive-ws/src/main/resources/bindingoverride/OuterComposite.composite deleted file mode 100644 index 891cac0b79..0000000000 --- a/branches/sca-android/itest/recursive-ws/src/main/resources/bindingoverride/OuterComposite.composite +++ /dev/null @@ -1,40 +0,0 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/branches/sca-android/itest/recursive-ws/src/main/resources/policy/PolicyInnerComposite.composite b/branches/sca-android/itest/recursive-ws/src/main/resources/policy/PolicyInnerComposite.composite deleted file mode 100644 index 4b398743eb..0000000000 --- a/branches/sca-android/itest/recursive-ws/src/main/resources/policy/PolicyInnerComposite.composite +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/branches/sca-android/itest/recursive-ws/src/main/resources/policy/PolicyOuterComposite.composite b/branches/sca-android/itest/recursive-ws/src/main/resources/policy/PolicyOuterComposite.composite deleted file mode 100644 index b50bc29a1f..0000000000 --- a/branches/sca-android/itest/recursive-ws/src/main/resources/policy/PolicyOuterComposite.composite +++ /dev/null @@ -1,41 +0,0 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/branches/sca-android/itest/recursive-ws/src/main/resources/policy/definitions.xml b/branches/sca-android/itest/recursive-ws/src/main/resources/policy/definitions.xml deleted file mode 100644 index 3ae202f4aa..0000000000 --- a/branches/sca-android/itest/recursive-ws/src/main/resources/policy/definitions.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - Test Intent One - - - - - - - - \ No newline at end of file diff --git a/branches/sca-android/itest/recursive-ws/src/test/java/bindingoverride/BindingOverrideTestCase.java b/branches/sca-android/itest/recursive-ws/src/test/java/bindingoverride/BindingOverrideTestCase.java deleted file mode 100644 index c6e46564f0..0000000000 --- a/branches/sca-android/itest/recursive-ws/src/test/java/bindingoverride/BindingOverrideTestCase.java +++ /dev/null @@ -1,57 +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 bindingoverride; - -import junit.framework.Assert; - - -import org.apache.tuscany.sca.host.embedded.SCADomain; -import org.junit.After; -import org.junit.Before; -import org.junit.Ignore; -import org.junit.Test; - -import policy.Target; - -public class BindingOverrideTestCase{ - - private SCADomain domain; - private Target targetClient; - - @Before - public void setUp() throws Exception { - try { - domain = SCADomain.newInstance("bindingoverride/OuterComposite.composite"); - targetClient = domain.getService(Target.class, "OuterClientComponent"); - } catch(Exception ex) { - System.out.println(ex.toString()); - } - } - - @After - public void tearDown() throws Exception { - domain.close(); - } - - @Test - //@Ignore("TUSCANY-2352") - public void test() throws Exception { - Assert.assertEquals("Target: Hello Target: Hello Fred!!", targetClient.hello("Fred")); - } -} diff --git a/branches/sca-android/itest/recursive-ws/src/test/java/policy/PolicyTestCase.java b/branches/sca-android/itest/recursive-ws/src/test/java/policy/PolicyTestCase.java deleted file mode 100644 index 3e71246da2..0000000000 --- a/branches/sca-android/itest/recursive-ws/src/test/java/policy/PolicyTestCase.java +++ /dev/null @@ -1,74 +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 junit.framework.Assert; - -import org.apache.tuscany.sca.assembly.Component; -import org.apache.tuscany.sca.assembly.impl.CompositeImpl; -import org.apache.tuscany.sca.host.embedded.SCADomain; -import org.apache.tuscany.sca.host.embedded.impl.DefaultSCADomain; -import org.apache.tuscany.sca.policy.PolicySetAttachPoint; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; -import org.osoa.sca.annotations.EndsConversation; - -public class PolicyTestCase{ - - private SCADomain domain; - private Target targetClient; - - @Before - public void setUp() throws Exception { - try { - domain = SCADomain.newInstance("policy/PolicyOuterComposite.composite"); - targetClient = domain.getService(Target.class, "TargetClientComponent"); - } catch(Exception ex) { - System.out.println(ex.toString()); - } - } - - @After - public void tearDown() throws Exception { - domain.close(); - } - - @Test - public void test() throws Exception { - //Check that the binding policy sets do flow down to the component but not down to the - //component inside implementation.composite - Component outerComponent = ((DefaultSCADomain)domain).getComponent("OuterTargetServiceComponent"); - - // The outer component service bindings should have policy sets attached - Assert.assertEquals(1, ((PolicySetAttachPoint)outerComponent.getServices().get(0).getBindings().get(0)).getPolicySets().size()); - - Component component =((CompositeImpl)outerComponent.getImplementation()).getComponents().get(0); - - // The original inner component service binding should not have policy sets attached - Assert.assertEquals(0, ((PolicySetAttachPoint)component.getServices().get(0).getBindings().get(0)).getPolicySets().size()); - - // The promoted inner component service binding should have policy sets attached - Assert.assertEquals(1, ((PolicySetAttachPoint)component.getServices().get(1).getBindings().get(0)).getPolicySets().size()); - - String result = targetClient.hello("Fred"); - - System.out.println(result); - } -} diff --git a/branches/sca-android/itest/recursive-ws/src/test/java/recursive/ComposerClientTestCase.java b/branches/sca-android/itest/recursive-ws/src/test/java/recursive/ComposerClientTestCase.java deleted file mode 100644 index 6638d65551..0000000000 --- a/branches/sca-android/itest/recursive-ws/src/test/java/recursive/ComposerClientTestCase.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 recursive; - -import junit.framework.Assert; - -import org.apache.tuscany.sca.host.embedded.SCADomain; -import org.apache.tuscany.sca.host.embedded.SCATestCaseRunner; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; - -import recursive.Composer; - -/** - * Test case for helloworld web service client - */ -public class ComposerClientTestCase { - - private Composer composer; - private SCADomain scaDomain; - - private SCATestCaseRunner server; - - @Before - public void startClient() throws Exception { - try { - scaDomain = SCADomain.newInstance("Client.composite"); - composer = scaDomain.getService(Composer.class, "ClientComponent/Composer"); - - server = new SCATestCaseRunner(ComposerTestServer.class); - server.before(); - - } catch (Throwable e) { - e.printStackTrace(); - } - } - - @Test - public void testWSClient() throws Exception { - String msg = composer.Compose("ABC"); - Assert.assertEquals("Composed: ABC", msg); - } - - @After - public void stopClient() throws Exception { - server.after(); - scaDomain.close(); - } - -} diff --git a/branches/sca-android/itest/recursive-ws/src/test/java/recursive/ComposerTestServer.java b/branches/sca-android/itest/recursive-ws/src/test/java/recursive/ComposerTestServer.java deleted file mode 100644 index 214379bcea..0000000000 --- a/branches/sca-android/itest/recursive-ws/src/test/java/recursive/ComposerTestServer.java +++ /dev/null @@ -1,55 +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.IOException; -import java.net.Socket; - -import org.apache.tuscany.sca.host.embedded.SCADomain; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; - -/** - * Starts up the SCA runtime which starts listening for service requests - */ -public class ComposerTestServer { - - private SCADomain scaDomain; - - @Before - public void startServer() throws Exception { - try { - scaDomain = SCADomain.newInstance("Outer.composite"); - } catch (Exception e) { - e.printStackTrace(); - } - } - - @Test - public void testPing() throws IOException { - new Socket("127.0.0.1", 8085); - } - - @After - public void stopServer() throws Exception { - scaDomain.close(); - } - -} -- cgit v1.2.3