From 42f6010685593eb05e63b57c13f3dfc444059540 Mon Sep 17 00:00:00 2001 From: antelder Date: Thu, 12 Nov 2009 08:34:50 +0000 Subject: Delete RC tag git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@835300 13f79535-47bb-0310-9956-ffa450edef68 --- .../jsonp/runtime/JSONPBindingProviderFactory.java | 58 -------- .../sca/binding/jsonp/runtime/JSONPInvoker.java | 165 --------------------- .../runtime/JSONPReferenceBindingProvider.java | 53 ------- .../jsonp/runtime/JSONPServiceBindingProvider.java | 71 --------- .../sca/binding/jsonp/runtime/JSONPServlet.java | 162 -------------------- ...che.tuscany.sca.provider.BindingProviderFactory | 20 --- .../src/test/java/helloworld/HelloWorldClient.java | 37 ----- .../src/test/java/helloworld/HelloWorldImpl.java | 32 ---- .../test/java/helloworld/HelloWorldService.java | 30 ---- .../src/test/java/test/BindingTestCase.java | 83 ----------- .../src/test/resources/helloworld.composite | 39 ----- .../src/test/resources/jquery.html | 51 ------- 12 files changed, 801 deletions(-) delete mode 100644 sca-java-2.x/tags/2.0-M4-RC1/modules/binding-jsonp-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonp/runtime/JSONPBindingProviderFactory.java delete mode 100644 sca-java-2.x/tags/2.0-M4-RC1/modules/binding-jsonp-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonp/runtime/JSONPInvoker.java delete mode 100644 sca-java-2.x/tags/2.0-M4-RC1/modules/binding-jsonp-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonp/runtime/JSONPReferenceBindingProvider.java delete mode 100644 sca-java-2.x/tags/2.0-M4-RC1/modules/binding-jsonp-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonp/runtime/JSONPServiceBindingProvider.java delete mode 100644 sca-java-2.x/tags/2.0-M4-RC1/modules/binding-jsonp-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonp/runtime/JSONPServlet.java delete mode 100644 sca-java-2.x/tags/2.0-M4-RC1/modules/binding-jsonp-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory delete mode 100644 sca-java-2.x/tags/2.0-M4-RC1/modules/binding-jsonp-runtime/src/test/java/helloworld/HelloWorldClient.java delete mode 100644 sca-java-2.x/tags/2.0-M4-RC1/modules/binding-jsonp-runtime/src/test/java/helloworld/HelloWorldImpl.java delete mode 100644 sca-java-2.x/tags/2.0-M4-RC1/modules/binding-jsonp-runtime/src/test/java/helloworld/HelloWorldService.java delete mode 100644 sca-java-2.x/tags/2.0-M4-RC1/modules/binding-jsonp-runtime/src/test/java/test/BindingTestCase.java delete mode 100644 sca-java-2.x/tags/2.0-M4-RC1/modules/binding-jsonp-runtime/src/test/resources/helloworld.composite delete mode 100644 sca-java-2.x/tags/2.0-M4-RC1/modules/binding-jsonp-runtime/src/test/resources/jquery.html (limited to 'sca-java-2.x/tags/2.0-M4-RC1/modules/binding-jsonp-runtime/src') diff --git a/sca-java-2.x/tags/2.0-M4-RC1/modules/binding-jsonp-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonp/runtime/JSONPBindingProviderFactory.java b/sca-java-2.x/tags/2.0-M4-RC1/modules/binding-jsonp-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonp/runtime/JSONPBindingProviderFactory.java deleted file mode 100644 index 90daedb647..0000000000 --- a/sca-java-2.x/tags/2.0-M4-RC1/modules/binding-jsonp-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonp/runtime/JSONPBindingProviderFactory.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 org.apache.tuscany.sca.binding.jsonp.runtime; - -import java.util.List; - -import org.apache.tuscany.sca.assembly.Endpoint; -import org.apache.tuscany.sca.assembly.EndpointReference; -import org.apache.tuscany.sca.binding.jsonp.JSONPBinding; -import org.apache.tuscany.sca.core.ExtensionPointRegistry; -import org.apache.tuscany.sca.host.http.ServletHost; -import org.apache.tuscany.sca.host.http.ServletHostExtensionPoint; -import org.apache.tuscany.sca.provider.BindingProviderFactory; -import org.apache.tuscany.sca.provider.ReferenceBindingProvider; -import org.apache.tuscany.sca.provider.ServiceBindingProvider; - -public class JSONPBindingProviderFactory implements BindingProviderFactory { - - private ServletHost servletHost; - - public JSONPBindingProviderFactory(ExtensionPointRegistry extensionPoints) { - ServletHostExtensionPoint servletHosts = extensionPoints.getExtensionPoint(ServletHostExtensionPoint.class); - List hosts = servletHosts.getServletHosts(); - if (!hosts.isEmpty()) { - this.servletHost = hosts.get(0); - } - } - - public Class getModelType() { - return JSONPBinding.class; - } - - public ReferenceBindingProvider createReferenceBindingProvider(EndpointReference endpoint) { - return new JSONPReferenceBindingProvider(endpoint); - } - - public ServiceBindingProvider createServiceBindingProvider(Endpoint endpoint) { - return new JSONPServiceBindingProvider(endpoint, servletHost); - } - -} diff --git a/sca-java-2.x/tags/2.0-M4-RC1/modules/binding-jsonp-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonp/runtime/JSONPInvoker.java b/sca-java-2.x/tags/2.0-M4-RC1/modules/binding-jsonp-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonp/runtime/JSONPInvoker.java deleted file mode 100644 index 851f4b53c9..0000000000 --- a/sca-java-2.x/tags/2.0-M4-RC1/modules/binding-jsonp-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonp/runtime/JSONPInvoker.java +++ /dev/null @@ -1,165 +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 org.apache.tuscany.sca.binding.jsonp.runtime; - -import java.io.BufferedReader; -import java.io.ByteArrayOutputStream; -import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; - -import org.apache.commons.codec.EncoderException; -import org.apache.commons.codec.net.URLCodec; -import org.apache.http.HttpEntity; -import org.apache.http.HttpResponse; -import org.apache.http.client.HttpClient; -import org.apache.http.client.methods.HttpGet; -import org.apache.http.impl.client.DefaultHttpClient; -import org.apache.tuscany.sca.assembly.EndpointReference; -import org.apache.tuscany.sca.interfacedef.Operation; -import org.apache.tuscany.sca.invocation.DataExchangeSemantics; -import org.apache.tuscany.sca.invocation.Invoker; -import org.apache.tuscany.sca.invocation.Message; -import org.codehaus.jackson.JsonGenerationException; -import org.codehaus.jackson.JsonParseException; -import org.codehaus.jackson.map.JsonMappingException; -import org.codehaus.jackson.map.ObjectMapper; - -public class JSONPInvoker implements Invoker, DataExchangeSemantics { - - protected Operation operation; - protected EndpointReference endpoint; - - protected ObjectMapper mapper; // TODO: share mapper btw invoker and servlet or move to databinding - - public JSONPInvoker(Operation operation, EndpointReference endpoint) { - this.operation = operation; - this.endpoint = endpoint; - this.mapper = new ObjectMapper(); - } - - public Message invoke(Message msg) { - try { - - return doInvoke(msg); - - } catch (Exception e) { - throw new RuntimeException(e); - } - } - - public Message doInvoke(Message msg) throws JsonGenerationException, JsonMappingException, IOException, EncoderException { - String uri = endpoint.getBinding().getURI() + "/" + operation.getName(); - String[] jsonArgs = objectsToJSON((Object[])msg.getBody()); - - String responseJSON = invokeHTTPRequest(uri, jsonArgs); - - Object response = jsonToObjects(responseJSON)[0]; - msg.setBody(response); - - return msg; - } - - protected String invokeHTTPRequest(String url, String[] jsonArgs) throws IOException, EncoderException { - - HttpClient httpclient = new DefaultHttpClient(); - - - URLCodec uc = new URLCodec(); - for (int i=0 ; i types = operation.getInputType().getLogical(); - int typesIndex = 0; - - String jsonRequest = ""; - for (String name : getOrderedParameterNames(servletRequest)) { - if (!name.startsWith("_") && !"callback".equals(name)) { - if (jsonRequest.length() > 1) { - jsonRequest += ", "; - } - - // automatically quote string parammeters so clients work in the usual javascript way - if (typesIndex < types.size() && String.class.equals(types.get(typesIndex).getGenericType())) { - String x = servletRequest.getParameter(name); - // TODO: do this more properly - if (!x.startsWith("\"")) { - jsonRequest += "\"" + x + "\""; - } else { - jsonRequest += x; - } - } else { - jsonRequest += servletRequest.getParameter(name); - } - - } - } - - return "[" + jsonRequest + "]"; - } - - /** - * Get the request parameter names in the correct order. - * The request args need to be in the correct order to invoke the service so work out the - * order from the order in the query string. Eg, the url: - * http://localhost:8085/HelloWorldService/sayHello2?first=petra&last=arnold&callback=foo" - * should invoke: - * sayHello2("petra", "arnold") - * so the parameter names should be ordered: "first", "last" - */ - protected SortedSet getOrderedParameterNames(ServletRequest servletRequest) { - final String queryString = ((HttpServletRequest)servletRequest).getQueryString(); - - SortedSet sortedNames = new TreeSet(new Comparator(){ - public int compare(String o1, String o2) { - int i = queryString.indexOf(o1); - int j = queryString.indexOf(o2); - return i - j; - }}); - - Set parameterNames = servletRequest.getParameterMap().keySet(); - for (String name : parameterNames) { - sortedNames.add(name); - } - - return sortedNames; - } - - /** - * Turn the response object into JSON - */ - protected String getJSONResponse(ServletRequest servletRequest, Object response) throws IOException, JsonParseException { - ByteArrayOutputStream os = new ByteArrayOutputStream(); - mapper.writeValue(os , response); - String jsonResponse = os.toString(); - - String callback = servletRequest.getParameter("callback"); - if (callback != null && callback.length() > 1) { - jsonResponse = callback + "(" + jsonResponse + ");"; - } - - return jsonResponse; - } - - /** - * Turn the request JSON into objects - */ - protected Object[] jsonToObjects(String jsonRequest) throws IOException, JsonParseException, JsonMappingException { - Class c = new Object[0].getClass(); - Object[] args = (Object[])mapper.readValue(jsonRequest, c); - return args; - } - - /** - * Send the request down the wire to invoke the service - */ - protected Object invokeService(Object[] args) { - try { - return wire.invoke(operation, args); - } catch (InvocationTargetException e) { - throw new RuntimeException(e); - } - } -} \ No newline at end of file diff --git a/sca-java-2.x/tags/2.0-M4-RC1/modules/binding-jsonp-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory b/sca-java-2.x/tags/2.0-M4-RC1/modules/binding-jsonp-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory deleted file mode 100644 index f5d9de2a77..0000000000 --- a/sca-java-2.x/tags/2.0-M4-RC1/modules/binding-jsonp-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory +++ /dev/null @@ -1,20 +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. - -# Implementation class for the binding extension -org.apache.tuscany.sca.binding.jsonp.runtime.JSONPBindingProviderFactory;model=org.apache.tuscany.sca.binding.jsonp.JSONPBinding - diff --git a/sca-java-2.x/tags/2.0-M4-RC1/modules/binding-jsonp-runtime/src/test/java/helloworld/HelloWorldClient.java b/sca-java-2.x/tags/2.0-M4-RC1/modules/binding-jsonp-runtime/src/test/java/helloworld/HelloWorldClient.java deleted file mode 100644 index 5ee1f167ea..0000000000 --- a/sca-java-2.x/tags/2.0-M4-RC1/modules/binding-jsonp-runtime/src/test/java/helloworld/HelloWorldClient.java +++ /dev/null @@ -1,37 +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 helloworld; - -import org.oasisopen.sca.annotation.Reference; - -public class HelloWorldClient implements HelloWorldService { - - @Reference - public HelloWorldService ref; - - public String sayHello(String name) { - return ref.sayHello(name); - } - - public String sayHello2(String firstName, String lastName) { - return ref.sayHello2(firstName, lastName); - } - -} diff --git a/sca-java-2.x/tags/2.0-M4-RC1/modules/binding-jsonp-runtime/src/test/java/helloworld/HelloWorldImpl.java b/sca-java-2.x/tags/2.0-M4-RC1/modules/binding-jsonp-runtime/src/test/java/helloworld/HelloWorldImpl.java deleted file mode 100644 index 99f2958d0d..0000000000 --- a/sca-java-2.x/tags/2.0-M4-RC1/modules/binding-jsonp-runtime/src/test/java/helloworld/HelloWorldImpl.java +++ /dev/null @@ -1,32 +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 helloworld; - - -public class HelloWorldImpl implements HelloWorldService { - - public String sayHello(String name) { - return "Hello " + name; - } - - public String sayHello2(String firstName, String lastName) { - return "Hello " + firstName + " " + lastName; - } - -} diff --git a/sca-java-2.x/tags/2.0-M4-RC1/modules/binding-jsonp-runtime/src/test/java/helloworld/HelloWorldService.java b/sca-java-2.x/tags/2.0-M4-RC1/modules/binding-jsonp-runtime/src/test/java/helloworld/HelloWorldService.java deleted file mode 100644 index b252eddbed..0000000000 --- a/sca-java-2.x/tags/2.0-M4-RC1/modules/binding-jsonp-runtime/src/test/java/helloworld/HelloWorldService.java +++ /dev/null @@ -1,30 +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 helloworld; - -import org.oasisopen.sca.annotation.Remotable; - -@Remotable -public interface HelloWorldService { - - String sayHello(String name); - - String sayHello2(String firstName, String lastName); - -} diff --git a/sca-java-2.x/tags/2.0-M4-RC1/modules/binding-jsonp-runtime/src/test/java/test/BindingTestCase.java b/sca-java-2.x/tags/2.0-M4-RC1/modules/binding-jsonp-runtime/src/test/java/test/BindingTestCase.java deleted file mode 100644 index efec56bbe3..0000000000 --- a/sca-java-2.x/tags/2.0-M4-RC1/modules/binding-jsonp-runtime/src/test/java/test/BindingTestCase.java +++ /dev/null @@ -1,83 +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 test; - -import helloworld.HelloWorldService; - -import java.io.BufferedReader; -import java.io.IOException; -import java.io.InputStreamReader; -import java.net.MalformedURLException; -import java.net.URL; - -import junit.framework.Assert; - -import org.apache.tuscany.sca.http.jetty.JettyServer; -import org.apache.tuscany.sca.node.Node; -import org.apache.tuscany.sca.node.NodeFactory; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Test; - -public class BindingTestCase { - - private static Node node; - - @Test - public void testService() throws MalformedURLException, IOException { - URL url = new URL("http://localhost:8085/HelloWorldComponent/HelloWorldService/sayHello?name=petra&callback=foo"); - BufferedReader br = new BufferedReader(new InputStreamReader(url.openStream())); - String response = br.readLine(); - Assert.assertEquals("foo(\"Hello petra\");", response); - - } - - @Test - public void testTwoArgs() throws MalformedURLException, IOException { - URL url = new URL("http://localhost:8085/HelloWorldComponent/HelloWorldService/sayHello2?first=petra&last=arnold&callback=foo"); - BufferedReader br = new BufferedReader(new InputStreamReader(url.openStream())); - String response = br.readLine(); - Assert.assertEquals("foo(\"Hello petra arnold\");", response); - - } - - @Test - public void testReference() throws MalformedURLException, IOException { - - HelloWorldService client = node.getService(HelloWorldService.class, "HelloWorldClient"); - - Assert.assertEquals("Hello beate", client.sayHello("beate")); - Assert.assertEquals("Hello beate arnold", client.sayHello2("beate", "arnold")); - - } - - @BeforeClass - public static void init() throws Exception { - JettyServer.portDefault = 8085; - node = NodeFactory.newInstance().createNode("helloworld.composite").start(); - } - - @AfterClass - public static void destroy() throws Exception { - if (node != null) { - node.stop(); - } - } - -} diff --git a/sca-java-2.x/tags/2.0-M4-RC1/modules/binding-jsonp-runtime/src/test/resources/helloworld.composite b/sca-java-2.x/tags/2.0-M4-RC1/modules/binding-jsonp-runtime/src/test/resources/helloworld.composite deleted file mode 100644 index d058e4869f..0000000000 --- a/sca-java-2.x/tags/2.0-M4-RC1/modules/binding-jsonp-runtime/src/test/resources/helloworld.composite +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - - - - - - - - - - - - - diff --git a/sca-java-2.x/tags/2.0-M4-RC1/modules/binding-jsonp-runtime/src/test/resources/jquery.html b/sca-java-2.x/tags/2.0-M4-RC1/modules/binding-jsonp-runtime/src/test/resources/jquery.html deleted file mode 100644 index a61cee3155..0000000000 --- a/sca-java-2.x/tags/2.0-M4-RC1/modules/binding-jsonp-runtime/src/test/resources/jquery.html +++ /dev/null @@ -1,51 +0,0 @@ - - - - Tuscany JQuery Client HelloWorld Sample - - - - - - - -

Tuscany JSONP HelloWorld Sample

- - This example uses the JQuery getJSON to make JSONP requests to the SCA service 'HelloWorldService' - -

Enter Name:     - - - -

- - - -- cgit v1.2.3