From 5963a2d3d6860fe57afc138f095bf2d2eb5a7b80 Mon Sep 17 00:00:00 2001 From: lresende Date: Mon, 7 Oct 2013 22:23:21 +0000 Subject: Official Tuscany 2.0.1 Release git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1530096 13f79535-47bb-0310-9956-ffa450edef68 --- .../main/java/itest/scabindingmapper/MyMapper.java | 72 +++++++++++++++++++ .../scabindingmapper/MyUnknownEndpointHandler.java | 47 +++++++++++++ ...rg.apache.tuscany.sca.provider.SCABindingMapper | 18 +++++ ...ache.tuscany.sca.runtime.UnknownEndpointHandler | 19 +++++ .../src/test/java/itest/helloworld/Helloworld.java | 28 ++++++++ .../itest/helloworld/HelloworldClientImpl.java | 34 +++++++++ .../itest/helloworld/HelloworldServiceImpl.java | 29 ++++++++ .../java/itest/helloworld/Mapper1TestCase.java | 82 ++++++++++++++++++++++ .../itest/helloworld/UnknownEndpointTestCase.java | 58 +++++++++++++++ .../src/test/resources/clients.composite | 34 +++++++++ .../src/test/resources/services.composite | 31 ++++++++ .../src/test/resources/test.composite | 41 +++++++++++ 12 files changed, 493 insertions(+) create mode 100644 sca-java-2.x/tags/2.0.1/testing/itest/scabindingmapper/src/main/java/itest/scabindingmapper/MyMapper.java create mode 100644 sca-java-2.x/tags/2.0.1/testing/itest/scabindingmapper/src/main/java/itest/scabindingmapper/MyUnknownEndpointHandler.java create mode 100644 sca-java-2.x/tags/2.0.1/testing/itest/scabindingmapper/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.SCABindingMapper create mode 100644 sca-java-2.x/tags/2.0.1/testing/itest/scabindingmapper/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.UnknownEndpointHandler create mode 100644 sca-java-2.x/tags/2.0.1/testing/itest/scabindingmapper/src/test/java/itest/helloworld/Helloworld.java create mode 100644 sca-java-2.x/tags/2.0.1/testing/itest/scabindingmapper/src/test/java/itest/helloworld/HelloworldClientImpl.java create mode 100644 sca-java-2.x/tags/2.0.1/testing/itest/scabindingmapper/src/test/java/itest/helloworld/HelloworldServiceImpl.java create mode 100644 sca-java-2.x/tags/2.0.1/testing/itest/scabindingmapper/src/test/java/itest/helloworld/Mapper1TestCase.java create mode 100644 sca-java-2.x/tags/2.0.1/testing/itest/scabindingmapper/src/test/java/itest/helloworld/UnknownEndpointTestCase.java create mode 100644 sca-java-2.x/tags/2.0.1/testing/itest/scabindingmapper/src/test/resources/clients.composite create mode 100644 sca-java-2.x/tags/2.0.1/testing/itest/scabindingmapper/src/test/resources/services.composite create mode 100644 sca-java-2.x/tags/2.0.1/testing/itest/scabindingmapper/src/test/resources/test.composite (limited to 'sca-java-2.x/tags/2.0.1/testing/itest/scabindingmapper/src') diff --git a/sca-java-2.x/tags/2.0.1/testing/itest/scabindingmapper/src/main/java/itest/scabindingmapper/MyMapper.java b/sca-java-2.x/tags/2.0.1/testing/itest/scabindingmapper/src/main/java/itest/scabindingmapper/MyMapper.java new file mode 100644 index 0000000000..8a8865889d --- /dev/null +++ b/sca-java-2.x/tags/2.0.1/testing/itest/scabindingmapper/src/main/java/itest/scabindingmapper/MyMapper.java @@ -0,0 +1,72 @@ +/* + * 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 java.util.Map; + +import javax.xml.namespace.QName; + +import org.apache.tuscany.sca.binding.jsonp.JSONPBinding; +import org.apache.tuscany.sca.binding.sca.provider.DefaultSCABindingMapper; +import org.apache.tuscany.sca.core.ExtensionPointRegistry; +import org.apache.tuscany.sca.runtime.RuntimeEndpoint; +import org.apache.tuscany.sca.runtime.RuntimeEndpointReference; + +/** + * A test SCABindingMapper to demonstrate changing the protocol on a per service basis. + * This uses JSONP if the service name ends with a "2" character. + * Uses a high ranking in the The meta-inf/services file to override the default mapper. + */ +public class MyMapper extends DefaultSCABindingMapper { + + public MyMapper(ExtensionPointRegistry registry, Map attributes) { + super(registry, attributes); + alwaysDistributed = true; + } + + @Override + protected QName chooseBinding(RuntimeEndpoint endpoint) { + QName bindingType = super.chooseBinding(endpoint); + + if (!bindingType.equals(super.defaultLocalBinding)) { + if (endpoint.getComponent().getName().endsWith("2")) { + bindingType = JSONPBinding.TYPE; + } else { + bindingType = super.defaultMappedBinding; + } + } + return bindingType; + } + + @Override + protected QName chooseBinding(RuntimeEndpointReference endpointReference) { + QName bindingType = super.chooseBinding(endpointReference); + + if (!bindingType.equals(super.defaultLocalBinding)) { + if (endpointReference.getBinding().getURI().contains("Service2")) { + bindingType = JSONPBinding.TYPE; + } else { + bindingType = super.defaultMappedBinding; + } + } + return bindingType; + } + +} diff --git a/sca-java-2.x/tags/2.0.1/testing/itest/scabindingmapper/src/main/java/itest/scabindingmapper/MyUnknownEndpointHandler.java b/sca-java-2.x/tags/2.0.1/testing/itest/scabindingmapper/src/main/java/itest/scabindingmapper/MyUnknownEndpointHandler.java new file mode 100644 index 0000000000..1b75cf5bf5 --- /dev/null +++ b/sca-java-2.x/tags/2.0.1/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/tags/2.0.1/testing/itest/scabindingmapper/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.SCABindingMapper b/sca-java-2.x/tags/2.0.1/testing/itest/scabindingmapper/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.SCABindingMapper new file mode 100644 index 0000000000..ef32d42058 --- /dev/null +++ b/sca-java-2.x/tags/2.0.1/testing/itest/scabindingmapper/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.SCABindingMapper @@ -0,0 +1,18 @@ +# 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.MyMapper,ranking=4321 + diff --git a/sca-java-2.x/tags/2.0.1/testing/itest/scabindingmapper/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.UnknownEndpointHandler b/sca-java-2.x/tags/2.0.1/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/tags/2.0.1/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/tags/2.0.1/testing/itest/scabindingmapper/src/test/java/itest/helloworld/Helloworld.java b/sca-java-2.x/tags/2.0.1/testing/itest/scabindingmapper/src/test/java/itest/helloworld/Helloworld.java new file mode 100644 index 0000000000..244d077f0b --- /dev/null +++ b/sca-java-2.x/tags/2.0.1/testing/itest/scabindingmapper/src/test/java/itest/helloworld/Helloworld.java @@ -0,0 +1,28 @@ +/* + * 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 org.oasisopen.sca.annotation.Remotable; + +@Remotable +public interface Helloworld { + + String sayHello(String name); +} diff --git a/sca-java-2.x/tags/2.0.1/testing/itest/scabindingmapper/src/test/java/itest/helloworld/HelloworldClientImpl.java b/sca-java-2.x/tags/2.0.1/testing/itest/scabindingmapper/src/test/java/itest/helloworld/HelloworldClientImpl.java new file mode 100644 index 0000000000..8d69e1d31b --- /dev/null +++ b/sca-java-2.x/tags/2.0.1/testing/itest/scabindingmapper/src/test/java/itest/helloworld/HelloworldClientImpl.java @@ -0,0 +1,34 @@ +/* + * 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 org.oasisopen.sca.annotation.Reference; + +public class HelloworldClientImpl implements Helloworld{ + + @Reference + public Helloworld ref; + + @Override + public String sayHello(String name) { + return ref.sayHello(name); + } + +} diff --git a/sca-java-2.x/tags/2.0.1/testing/itest/scabindingmapper/src/test/java/itest/helloworld/HelloworldServiceImpl.java b/sca-java-2.x/tags/2.0.1/testing/itest/scabindingmapper/src/test/java/itest/helloworld/HelloworldServiceImpl.java new file mode 100644 index 0000000000..12e194f6dc --- /dev/null +++ b/sca-java-2.x/tags/2.0.1/testing/itest/scabindingmapper/src/test/java/itest/helloworld/HelloworldServiceImpl.java @@ -0,0 +1,29 @@ +/* + * 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; + +public class HelloworldServiceImpl implements Helloworld { + + @Override + public String sayHello(String name) { + return "Hello " + name; + } + +} diff --git a/sca-java-2.x/tags/2.0.1/testing/itest/scabindingmapper/src/test/java/itest/helloworld/Mapper1TestCase.java b/sca-java-2.x/tags/2.0.1/testing/itest/scabindingmapper/src/test/java/itest/helloworld/Mapper1TestCase.java new file mode 100644 index 0000000000..b6b6d406f8 --- /dev/null +++ b/sca-java-2.x/tags/2.0.1/testing/itest/scabindingmapper/src/test/java/itest/helloworld/Mapper1TestCase.java @@ -0,0 +1,82 @@ +/* + * 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.BufferedReader; +import java.io.IOException; +import java.io.InputStreamReader; +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 = NodeFactory.newInstance().createNode("test.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")); + + // verify service1 is exposed as a WS endpoint and service2 is a jsonp endpoint + URL wsService = new URL("http://localhost:8085/Service1/Helloworld?wsdl"); + Assert.assertTrue(getContent(wsService).contains("definitions name=\"HelloworldService\"")); + + URL jsonpService = new URL("http://localhost:8085/Client2/Helloworld/sayHello?name=Petra"); + Assert.assertEquals("\"Hello Petra\"", getContent(jsonpService)); + } + + private String getContent(URL url) throws IOException { + BufferedReader reader = null; + try { + reader = new BufferedReader(new InputStreamReader(url.openStream())); + StringBuffer sb = new StringBuffer(); + String str; + while ((str = reader.readLine()) != null) { + sb.append(str); + } + return sb.toString(); + } finally { + if (reader != null) { + reader.close(); + } + } + } + + @After + public void shutdown() { + node.stop(); + } + +} diff --git a/sca-java-2.x/tags/2.0.1/testing/itest/scabindingmapper/src/test/java/itest/helloworld/UnknownEndpointTestCase.java b/sca-java-2.x/tags/2.0.1/testing/itest/scabindingmapper/src/test/java/itest/helloworld/UnknownEndpointTestCase.java new file mode 100644 index 0000000000..f35a71b30e --- /dev/null +++ b/sca-java-2.x/tags/2.0.1/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.getInstance().createNode("services.composite", new String[]{"target/test-classes"}) ; + servicesnode.start(); + node = NodeFactory.getInstance().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/tags/2.0.1/testing/itest/scabindingmapper/src/test/resources/clients.composite b/sca-java-2.x/tags/2.0.1/testing/itest/scabindingmapper/src/test/resources/clients.composite new file mode 100644 index 0000000000..5597ec112c --- /dev/null +++ b/sca-java-2.x/tags/2.0.1/testing/itest/scabindingmapper/src/test/resources/clients.composite @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + + diff --git a/sca-java-2.x/tags/2.0.1/testing/itest/scabindingmapper/src/test/resources/services.composite b/sca-java-2.x/tags/2.0.1/testing/itest/scabindingmapper/src/test/resources/services.composite new file mode 100644 index 0000000000..bb1161c1ac --- /dev/null +++ b/sca-java-2.x/tags/2.0.1/testing/itest/scabindingmapper/src/test/resources/services.composite @@ -0,0 +1,31 @@ + + + + + + + + + + + + diff --git a/sca-java-2.x/tags/2.0.1/testing/itest/scabindingmapper/src/test/resources/test.composite b/sca-java-2.x/tags/2.0.1/testing/itest/scabindingmapper/src/test/resources/test.composite new file mode 100644 index 0000000000..d29c636f77 --- /dev/null +++ b/sca-java-2.x/tags/2.0.1/testing/itest/scabindingmapper/src/test/resources/test.composite @@ -0,0 +1,41 @@ + + + + + + + + + + + + + + + + + + + + + + -- cgit v1.2.3