diff options
7 files changed, 205 insertions, 4 deletions
diff --git a/sca-java-2.x/trunk/testing/itest/scabindingmapper/src/main/java/itest/scabindingmapper/MyMapper.java b/sca-java-2.x/trunk/testing/itest/scabindingmapper/src/main/java/itest/scabindingmapper/MyMapper.java index b3f4b7eae8..016f744598 100644 --- a/sca-java-2.x/trunk/testing/itest/scabindingmapper/src/main/java/itest/scabindingmapper/MyMapper.java +++ b/sca-java-2.x/trunk/testing/itest/scabindingmapper/src/main/java/itest/scabindingmapper/MyMapper.java @@ -51,7 +51,7 @@ public class MyMapper extends DefaultSCABindingMapper { @Override protected QName chooseBinding(RuntimeEndpointReference endpointReference) { - if (endpointReference.getURI().endsWith("2")) { + if (endpointReference.getBinding().getURI().contains("Service2")) { return JSONPBinding.TYPE; } else { return super.defaultMappedBinding; diff --git a/sca-java-2.x/trunk/testing/itest/scabindingmapper/src/main/java/itest/scabindingmapper/MyUnknownEndpointHandler.java b/sca-java-2.x/trunk/testing/itest/scabindingmapper/src/main/java/itest/scabindingmapper/MyUnknownEndpointHandler.java new file mode 100644 index 0000000000..1b75cf5bf5 --- /dev/null +++ b/sca-java-2.x/trunk/testing/itest/scabindingmapper/src/main/java/itest/scabindingmapper/MyUnknownEndpointHandler.java @@ -0,0 +1,47 @@ +/* + * 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 itest.scabindingmapper; + +import org.apache.tuscany.sca.assembly.Binding; +import org.apache.tuscany.sca.assembly.EndpointReference; +import org.apache.tuscany.sca.assembly.SCABinding; +import org.apache.tuscany.sca.assembly.impl.SCABindingFactoryImpl; +import org.apache.tuscany.sca.runtime.UnknownEndpointHandler; + +public class MyUnknownEndpointHandler implements UnknownEndpointHandler { + + @Override + public Binding handleUnknownEndpoint(EndpointReference endpointReference) { + + if (endpointReference.getTargetEndpoint().getURI().endsWith("Service1")) { + SCABinding b = new SCABindingFactoryImpl().createSCABinding(); + b.setURI("http://localhost:8085/Service1/Helloworld"); + return b; + + } else if (endpointReference.getTargetEndpoint().getURI().endsWith("Service2")) { + SCABinding b = new SCABindingFactoryImpl().createSCABinding(); + b.setURI("http://localhost:8085/Service2/Helloworld"); + return b; + } + + return null; + } + +} diff --git a/sca-java-2.x/trunk/testing/itest/scabindingmapper/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.UnknownEndpointHandler b/sca-java-2.x/trunk/testing/itest/scabindingmapper/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.UnknownEndpointHandler new file mode 100644 index 0000000000..11828b7b2b --- /dev/null +++ b/sca-java-2.x/trunk/testing/itest/scabindingmapper/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.UnknownEndpointHandler @@ -0,0 +1,19 @@ +# 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.
+itest.scabindingmapper.MyUnknownEndpointHandler
+
+
diff --git a/sca-java-2.x/trunk/testing/itest/scabindingmapper/src/test/java/itest/helloworld/Mapper1TestCase.java b/sca-java-2.x/trunk/testing/itest/scabindingmapper/src/test/java/itest/helloworld/Mapper1TestCase.java index 382cffa892..b6b6d406f8 100644 --- a/sca-java-2.x/trunk/testing/itest/scabindingmapper/src/test/java/itest/helloworld/Mapper1TestCase.java +++ b/sca-java-2.x/trunk/testing/itest/scabindingmapper/src/test/java/itest/helloworld/Mapper1TestCase.java @@ -25,14 +25,21 @@ import java.net.URL; import org.apache.tuscany.sca.node.Node; import org.apache.tuscany.sca.node.NodeFactory; +import org.junit.After; import org.junit.Assert; import org.junit.Test; public class Mapper1TestCase { + static { + org.apache.tuscany.sca.http.jetty.JettyServer.portDefault = 8085; + } + + Node node; + @Test public void testSCABindingFactory() throws IOException { - Node node = NodeFactory.newInstance().createNode("test.composite", new String[]{"target/test-classes"}) ; + node = NodeFactory.newInstance().createNode("test.composite", new String[]{"target/test-classes"}) ; node.start(); // test the service invocations work @@ -43,10 +50,10 @@ public class Mapper1TestCase { Assert.assertEquals("Hello Petra", helloworld.sayHello("Petra")); // verify service1 is exposed as a WS endpoint and service2 is a jsonp endpoint - URL wsService = new URL("http://localhost:8080/Service1/Helloworld?wsdl"); + URL wsService = new URL("http://localhost:8085/Service1/Helloworld?wsdl"); Assert.assertTrue(getContent(wsService).contains("definitions name=\"HelloworldService\"")); - URL jsonpService = new URL("http://localhost:8080/Client2/Helloworld/sayHello?name=Petra"); + URL jsonpService = new URL("http://localhost:8085/Client2/Helloworld/sayHello?name=Petra"); Assert.assertEquals("\"Hello Petra\"", getContent(jsonpService)); } @@ -66,5 +73,10 @@ public class Mapper1TestCase { } } } + + @After + public void shutdown() { + node.stop(); + } } diff --git a/sca-java-2.x/trunk/testing/itest/scabindingmapper/src/test/java/itest/helloworld/UnknownEndpointTestCase.java b/sca-java-2.x/trunk/testing/itest/scabindingmapper/src/test/java/itest/helloworld/UnknownEndpointTestCase.java new file mode 100644 index 0000000000..d6c56d6dc3 --- /dev/null +++ b/sca-java-2.x/trunk/testing/itest/scabindingmapper/src/test/java/itest/helloworld/UnknownEndpointTestCase.java @@ -0,0 +1,58 @@ +/* + * 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 itest.helloworld; + +import java.io.IOException; + +import org.apache.tuscany.sca.node.Node; +import org.apache.tuscany.sca.node.NodeFactory; +import org.junit.After; +import org.junit.Assert; +import org.junit.Test; + +public class UnknownEndpointTestCase { + + static { + org.apache.tuscany.sca.http.jetty.JettyServer.portDefault = 8085; + } + + Node servicesnode; + Node node; + + @Test + public void testUnknownEndpoints() throws IOException, InterruptedException { + servicesnode = NodeFactory.newInstance().createNode("services.composite", new String[]{"target/test-classes"}) ; + servicesnode.start(); + node = NodeFactory.newInstance().createNode("clients.composite", new String[]{"target/test-classes"}) ; + node.start(); + + // test the service invocations work + Helloworld helloworld = node.getService(Helloworld.class, "Client1"); + Assert.assertEquals("Hello Petra", helloworld.sayHello("Petra")); + + helloworld = node.getService(Helloworld.class, "Client2"); + Assert.assertEquals("Hello Petra", helloworld.sayHello("Petra")); + } + + @After + public void shutdown() throws InterruptedException { + node.stop(); + servicesnode.stop(); + } +} diff --git a/sca-java-2.x/trunk/testing/itest/scabindingmapper/src/test/resources/clients.composite b/sca-java-2.x/trunk/testing/itest/scabindingmapper/src/test/resources/clients.composite new file mode 100644 index 0000000000..5597ec112c --- /dev/null +++ b/sca-java-2.x/trunk/testing/itest/scabindingmapper/src/test/resources/clients.composite @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + * 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. +--> +<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" + targetNamespace="http://Scopes" + name="clients"> + + <component name="Client1"> + <implementation.java class="itest.helloworld.HelloworldClientImpl"/> + <reference name="ref" target="Service1" /> + </component> + + <component name="Client2"> + <implementation.java class="itest.helloworld.HelloworldClientImpl"/> + <reference name="ref" target="Service2" /> + </component> + +</composite> diff --git a/sca-java-2.x/trunk/testing/itest/scabindingmapper/src/test/resources/services.composite b/sca-java-2.x/trunk/testing/itest/scabindingmapper/src/test/resources/services.composite new file mode 100644 index 0000000000..bb1161c1ac --- /dev/null +++ b/sca-java-2.x/trunk/testing/itest/scabindingmapper/src/test/resources/services.composite @@ -0,0 +1,31 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + * 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. +--> +<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" + targetNamespace="http://Scopes" + name="services"> + + <component name="Service1"> + <implementation.java class="itest.helloworld.HelloworldServiceImpl"/> + </component> + + <component name="Service2"> + <implementation.java class="itest.helloworld.HelloworldServiceImpl"/> + </component> +</composite> |