From 6580d98a517c053f8f646d2040ac4974165574c8 Mon Sep 17 00:00:00 2001 From: antelder Date: Thu, 10 Feb 2011 08:35:14 +0000 Subject: Delete very old beta2 release branch git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1069271 13f79535-47bb-0310-9956-ffa450edef68 --- .../main/java/itest/scabindingmapper/MyMapper.java | 70 ------------------ .../scabindingmapper/MyUnknownEndpointHandler.java | 47 ------------- ...scany.sca.binding.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, 491 deletions(-) delete mode 100644 sca-java-2.x/branches/2.0-Beta2/testing/itest/scabindingmapper/src/main/java/itest/scabindingmapper/MyMapper.java delete mode 100644 sca-java-2.x/branches/2.0-Beta2/testing/itest/scabindingmapper/src/main/java/itest/scabindingmapper/MyUnknownEndpointHandler.java delete mode 100644 sca-java-2.x/branches/2.0-Beta2/testing/itest/scabindingmapper/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.sca.provider.SCABindingMapper delete mode 100644 sca-java-2.x/branches/2.0-Beta2/testing/itest/scabindingmapper/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.UnknownEndpointHandler delete mode 100644 sca-java-2.x/branches/2.0-Beta2/testing/itest/scabindingmapper/src/test/java/itest/helloworld/Helloworld.java delete mode 100644 sca-java-2.x/branches/2.0-Beta2/testing/itest/scabindingmapper/src/test/java/itest/helloworld/HelloworldClientImpl.java delete mode 100644 sca-java-2.x/branches/2.0-Beta2/testing/itest/scabindingmapper/src/test/java/itest/helloworld/HelloworldServiceImpl.java delete mode 100644 sca-java-2.x/branches/2.0-Beta2/testing/itest/scabindingmapper/src/test/java/itest/helloworld/Mapper1TestCase.java delete mode 100644 sca-java-2.x/branches/2.0-Beta2/testing/itest/scabindingmapper/src/test/java/itest/helloworld/UnknownEndpointTestCase.java delete mode 100644 sca-java-2.x/branches/2.0-Beta2/testing/itest/scabindingmapper/src/test/resources/clients.composite delete mode 100644 sca-java-2.x/branches/2.0-Beta2/testing/itest/scabindingmapper/src/test/resources/services.composite delete mode 100644 sca-java-2.x/branches/2.0-Beta2/testing/itest/scabindingmapper/src/test/resources/test.composite (limited to 'sca-java-2.x/branches/2.0-Beta2/testing/itest/scabindingmapper/src') diff --git a/sca-java-2.x/branches/2.0-Beta2/testing/itest/scabindingmapper/src/main/java/itest/scabindingmapper/MyMapper.java b/sca-java-2.x/branches/2.0-Beta2/testing/itest/scabindingmapper/src/main/java/itest/scabindingmapper/MyMapper.java deleted file mode 100644 index 016f744598..0000000000 --- a/sca-java-2.x/branches/2.0-Beta2/testing/itest/scabindingmapper/src/main/java/itest/scabindingmapper/MyMapper.java +++ /dev/null @@ -1,70 +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 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); - } - - @Override - protected QName chooseBinding(RuntimeEndpoint endpoint) { - if (endpoint.getComponent().getName().endsWith("2")) { - return JSONPBinding.TYPE; - } else { - return super.defaultMappedBinding; - } - } - - @Override - protected QName chooseBinding(RuntimeEndpointReference endpointReference) { - if (endpointReference.getBinding().getURI().contains("Service2")) { - return JSONPBinding.TYPE; - } else { - return super.defaultMappedBinding; - } - } - - /* - * Probably others don't need to override this is they have a remotable endpoint registry, this itest - * doesn't so just fiddle the test - */ - @Override - protected boolean isDistributed() { - return true; - } - -} diff --git a/sca-java-2.x/branches/2.0-Beta2/testing/itest/scabindingmapper/src/main/java/itest/scabindingmapper/MyUnknownEndpointHandler.java b/sca-java-2.x/branches/2.0-Beta2/testing/itest/scabindingmapper/src/main/java/itest/scabindingmapper/MyUnknownEndpointHandler.java deleted file mode 100644 index 1b75cf5bf5..0000000000 --- a/sca-java-2.x/branches/2.0-Beta2/testing/itest/scabindingmapper/src/main/java/itest/scabindingmapper/MyUnknownEndpointHandler.java +++ /dev/null @@ -1,47 +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 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/branches/2.0-Beta2/testing/itest/scabindingmapper/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.sca.provider.SCABindingMapper b/sca-java-2.x/branches/2.0-Beta2/testing/itest/scabindingmapper/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.sca.provider.SCABindingMapper deleted file mode 100644 index ef32d42058..0000000000 --- a/sca-java-2.x/branches/2.0-Beta2/testing/itest/scabindingmapper/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.sca.provider.SCABindingMapper +++ /dev/null @@ -1,18 +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. -itest.scabindingmapper.MyMapper,ranking=4321 - diff --git a/sca-java-2.x/branches/2.0-Beta2/testing/itest/scabindingmapper/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.UnknownEndpointHandler b/sca-java-2.x/branches/2.0-Beta2/testing/itest/scabindingmapper/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.UnknownEndpointHandler deleted file mode 100644 index 11828b7b2b..0000000000 --- a/sca-java-2.x/branches/2.0-Beta2/testing/itest/scabindingmapper/src/main/resources/META-INF/services/org.apache.tuscany.sca.runtime.UnknownEndpointHandler +++ /dev/null @@ -1,19 +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. -itest.scabindingmapper.MyUnknownEndpointHandler - - diff --git a/sca-java-2.x/branches/2.0-Beta2/testing/itest/scabindingmapper/src/test/java/itest/helloworld/Helloworld.java b/sca-java-2.x/branches/2.0-Beta2/testing/itest/scabindingmapper/src/test/java/itest/helloworld/Helloworld.java deleted file mode 100644 index 244d077f0b..0000000000 --- a/sca-java-2.x/branches/2.0-Beta2/testing/itest/scabindingmapper/src/test/java/itest/helloworld/Helloworld.java +++ /dev/null @@ -1,28 +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 itest.helloworld; - -import org.oasisopen.sca.annotation.Remotable; - -@Remotable -public interface Helloworld { - - String sayHello(String name); -} diff --git a/sca-java-2.x/branches/2.0-Beta2/testing/itest/scabindingmapper/src/test/java/itest/helloworld/HelloworldClientImpl.java b/sca-java-2.x/branches/2.0-Beta2/testing/itest/scabindingmapper/src/test/java/itest/helloworld/HelloworldClientImpl.java deleted file mode 100644 index 8d69e1d31b..0000000000 --- a/sca-java-2.x/branches/2.0-Beta2/testing/itest/scabindingmapper/src/test/java/itest/helloworld/HelloworldClientImpl.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 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/branches/2.0-Beta2/testing/itest/scabindingmapper/src/test/java/itest/helloworld/HelloworldServiceImpl.java b/sca-java-2.x/branches/2.0-Beta2/testing/itest/scabindingmapper/src/test/java/itest/helloworld/HelloworldServiceImpl.java deleted file mode 100644 index 12e194f6dc..0000000000 --- a/sca-java-2.x/branches/2.0-Beta2/testing/itest/scabindingmapper/src/test/java/itest/helloworld/HelloworldServiceImpl.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 itest.helloworld; - -public class HelloworldServiceImpl implements Helloworld { - - @Override - public String sayHello(String name) { - return "Hello " + name; - } - -} diff --git a/sca-java-2.x/branches/2.0-Beta2/testing/itest/scabindingmapper/src/test/java/itest/helloworld/Mapper1TestCase.java b/sca-java-2.x/branches/2.0-Beta2/testing/itest/scabindingmapper/src/test/java/itest/helloworld/Mapper1TestCase.java deleted file mode 100644 index b6b6d406f8..0000000000 --- a/sca-java-2.x/branches/2.0-Beta2/testing/itest/scabindingmapper/src/test/java/itest/helloworld/Mapper1TestCase.java +++ /dev/null @@ -1,82 +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 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/branches/2.0-Beta2/testing/itest/scabindingmapper/src/test/java/itest/helloworld/UnknownEndpointTestCase.java b/sca-java-2.x/branches/2.0-Beta2/testing/itest/scabindingmapper/src/test/java/itest/helloworld/UnknownEndpointTestCase.java deleted file mode 100644 index f35a71b30e..0000000000 --- a/sca-java-2.x/branches/2.0-Beta2/testing/itest/scabindingmapper/src/test/java/itest/helloworld/UnknownEndpointTestCase.java +++ /dev/null @@ -1,58 +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 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/branches/2.0-Beta2/testing/itest/scabindingmapper/src/test/resources/clients.composite b/sca-java-2.x/branches/2.0-Beta2/testing/itest/scabindingmapper/src/test/resources/clients.composite deleted file mode 100644 index 5597ec112c..0000000000 --- a/sca-java-2.x/branches/2.0-Beta2/testing/itest/scabindingmapper/src/test/resources/clients.composite +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/sca-java-2.x/branches/2.0-Beta2/testing/itest/scabindingmapper/src/test/resources/services.composite b/sca-java-2.x/branches/2.0-Beta2/testing/itest/scabindingmapper/src/test/resources/services.composite deleted file mode 100644 index bb1161c1ac..0000000000 --- a/sca-java-2.x/branches/2.0-Beta2/testing/itest/scabindingmapper/src/test/resources/services.composite +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - diff --git a/sca-java-2.x/branches/2.0-Beta2/testing/itest/scabindingmapper/src/test/resources/test.composite b/sca-java-2.x/branches/2.0-Beta2/testing/itest/scabindingmapper/src/test/resources/test.composite deleted file mode 100644 index d29c636f77..0000000000 --- a/sca-java-2.x/branches/2.0-Beta2/testing/itest/scabindingmapper/src/test/resources/test.composite +++ /dev/null @@ -1,41 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - -- cgit v1.2.3