From 7abf5a347d0f5dc9a54cd6c443daafae9f4976fc Mon Sep 17 00:00:00 2001 From: antelder Date: Fri, 30 Oct 2009 12:18:56 +0000 Subject: Re-tag 2.0-M4 RC1 release git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@831279 13f79535-47bb-0310-9956-ffa450edef68 --- .../modules/binding-jsonp-runtime/LICENSE | 205 +++++++++++++++++++++ .../binding-jsonp-runtime/META-INF/MANIFEST.MF | 33 ++++ .../modules/binding-jsonp-runtime/NOTICE | 6 + .../modules/binding-jsonp-runtime/pom.xml | 97 ++++++++++ .../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 +++++ 16 files changed, 1142 insertions(+) create mode 100644 tags/java/sca/2.0-M4-RC1/modules/binding-jsonp-runtime/LICENSE create mode 100644 tags/java/sca/2.0-M4-RC1/modules/binding-jsonp-runtime/META-INF/MANIFEST.MF create mode 100644 tags/java/sca/2.0-M4-RC1/modules/binding-jsonp-runtime/NOTICE create mode 100644 tags/java/sca/2.0-M4-RC1/modules/binding-jsonp-runtime/pom.xml create mode 100644 tags/java/sca/2.0-M4-RC1/modules/binding-jsonp-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonp/runtime/JSONPBindingProviderFactory.java create mode 100644 tags/java/sca/2.0-M4-RC1/modules/binding-jsonp-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonp/runtime/JSONPInvoker.java create mode 100644 tags/java/sca/2.0-M4-RC1/modules/binding-jsonp-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonp/runtime/JSONPReferenceBindingProvider.java create mode 100644 tags/java/sca/2.0-M4-RC1/modules/binding-jsonp-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonp/runtime/JSONPServiceBindingProvider.java create mode 100644 tags/java/sca/2.0-M4-RC1/modules/binding-jsonp-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonp/runtime/JSONPServlet.java create mode 100644 tags/java/sca/2.0-M4-RC1/modules/binding-jsonp-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory create mode 100644 tags/java/sca/2.0-M4-RC1/modules/binding-jsonp-runtime/src/test/java/helloworld/HelloWorldClient.java create mode 100644 tags/java/sca/2.0-M4-RC1/modules/binding-jsonp-runtime/src/test/java/helloworld/HelloWorldImpl.java create mode 100644 tags/java/sca/2.0-M4-RC1/modules/binding-jsonp-runtime/src/test/java/helloworld/HelloWorldService.java create mode 100644 tags/java/sca/2.0-M4-RC1/modules/binding-jsonp-runtime/src/test/java/test/BindingTestCase.java create mode 100644 tags/java/sca/2.0-M4-RC1/modules/binding-jsonp-runtime/src/test/resources/helloworld.composite create mode 100644 tags/java/sca/2.0-M4-RC1/modules/binding-jsonp-runtime/src/test/resources/jquery.html (limited to 'tags/java/sca/2.0-M4-RC1/modules/binding-jsonp-runtime') diff --git a/tags/java/sca/2.0-M4-RC1/modules/binding-jsonp-runtime/LICENSE b/tags/java/sca/2.0-M4-RC1/modules/binding-jsonp-runtime/LICENSE new file mode 100644 index 0000000000..6e529a25c4 --- /dev/null +++ b/tags/java/sca/2.0-M4-RC1/modules/binding-jsonp-runtime/LICENSE @@ -0,0 +1,205 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed 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. + + + diff --git a/tags/java/sca/2.0-M4-RC1/modules/binding-jsonp-runtime/META-INF/MANIFEST.MF b/tags/java/sca/2.0-M4-RC1/modules/binding-jsonp-runtime/META-INF/MANIFEST.MF new file mode 100644 index 0000000000..2d32b8cf27 --- /dev/null +++ b/tags/java/sca/2.0-M4-RC1/modules/binding-jsonp-runtime/META-INF/MANIFEST.MF @@ -0,0 +1,33 @@ +Manifest-Version: 1.0 +Tool: Bnd-0.0.255 +Bundle-Name: Apache Tuscany SCA JSONP Binding Model +Created-By: 1.6.0_07 (Sun Microsystems Inc.) +Bundle-Vendor: The Apache Software Foundation +Bundle-Version: 2.0.0 +Bnd-LastModified: 1225397320062 +Bundle-ManifestVersion: 2 +Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt +Bundle-Description: Apache Tuscany SCA JSONP Binding Model +Import-Package: javax.servlet;version="2.5.0", + javax.servlet.http;version="2.5.0", + org.apache.commons.codec, + org.apache.commons.codec.net, + org.apache.http;version="4.0.1", + org.apache.http.client;version="4.0.0", + org.apache.http.client.methods;version="4.0.0", + org.apache.http.client.utils;version="4.0.0", + org.apache.http.conn;version="4.0.0", + org.apache.http.impl.client;version="4.0.0", + org.apache.tuscany.sca.assembly;version="2.0.0", + org.apache.tuscany.sca.binding.jsonp;version="2.0.0", + org.apache.tuscany.sca.core;version="2.0.0", + org.apache.tuscany.sca.host.http;version="2.0.0", + org.apache.tuscany.sca.interfacedef;version="2.0.0", + org.apache.tuscany.sca.invocation;version="2.0.0", + org.apache.tuscany.sca.provider;version="2.0.0", + org.apache.tuscany.sca.runtime;version="2.0.0", + org.codehaus.jackson, + org.codehaus.jackson.map +Bundle-SymbolicName: org.apache.tuscany.sca.binding.jsonp.runtime +Bundle-DocURL: http://www.apache.org/ +Bundle-RequiredExecutionEnvironment: J2SE-1.5,JavaSE-1.6 diff --git a/tags/java/sca/2.0-M4-RC1/modules/binding-jsonp-runtime/NOTICE b/tags/java/sca/2.0-M4-RC1/modules/binding-jsonp-runtime/NOTICE new file mode 100644 index 0000000000..51042eab05 --- /dev/null +++ b/tags/java/sca/2.0-M4-RC1/modules/binding-jsonp-runtime/NOTICE @@ -0,0 +1,6 @@ +${pom.name} +Copyright (c) 2005 - 2009 The Apache Software Foundation + +This product includes software developed by +The Apache Software Foundation (http://www.apache.org/). + diff --git a/tags/java/sca/2.0-M4-RC1/modules/binding-jsonp-runtime/pom.xml b/tags/java/sca/2.0-M4-RC1/modules/binding-jsonp-runtime/pom.xml new file mode 100644 index 0000000000..24d4499eaa --- /dev/null +++ b/tags/java/sca/2.0-M4-RC1/modules/binding-jsonp-runtime/pom.xml @@ -0,0 +1,97 @@ + + + + 4.0.0 + + org.apache.tuscany.sca + tuscany-modules + 2.0-M4 + ../pom.xml + + tuscany-binding-jsonp-runtime + Apache Tuscany SCA JSONP Binding Runtime + + + + + org.apache.tuscany.sca + tuscany-binding-jsonp + 2.0-M4 + + + + org.apache.tuscany.sca + tuscany-host-http + 2.0-M4 + + + org.codehaus.jackson + jackson-core-asl + 1.2.1 + + + org.codehaus.jackson + jackson-mapper-asl + 1.2.1 + + + + org.apache.httpcomponents + httpclient + 4.0 + + + + javax.servlet + servlet-api + 2.5 + provided + + + + org.apache.tuscany.sca + tuscany-host-jetty + 2.0-M4 + test + + + + org.apache.tuscany.sca + tuscany-node-impl + 2.0-M4 + test + + + + org.apache.tuscany.sca + tuscany-implementation-java-runtime + 2.0-M4 + test + + + + org.apache.tuscany.sca + tuscany-sca-api + 2.0-M4 + test + + + + diff --git a/tags/java/sca/2.0-M4-RC1/modules/binding-jsonp-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonp/runtime/JSONPBindingProviderFactory.java b/tags/java/sca/2.0-M4-RC1/modules/binding-jsonp-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonp/runtime/JSONPBindingProviderFactory.java new file mode 100644 index 0000000000..90daedb647 --- /dev/null +++ b/tags/java/sca/2.0-M4-RC1/modules/binding-jsonp-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonp/runtime/JSONPBindingProviderFactory.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 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/tags/java/sca/2.0-M4-RC1/modules/binding-jsonp-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonp/runtime/JSONPInvoker.java b/tags/java/sca/2.0-M4-RC1/modules/binding-jsonp-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonp/runtime/JSONPInvoker.java new file mode 100644 index 0000000000..851f4b53c9 --- /dev/null +++ b/tags/java/sca/2.0-M4-RC1/modules/binding-jsonp-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonp/runtime/JSONPInvoker.java @@ -0,0 +1,165 @@ +/* + * 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/tags/java/sca/2.0-M4-RC1/modules/binding-jsonp-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory b/tags/java/sca/2.0-M4-RC1/modules/binding-jsonp-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory new file mode 100644 index 0000000000..f5d9de2a77 --- /dev/null +++ b/tags/java/sca/2.0-M4-RC1/modules/binding-jsonp-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory @@ -0,0 +1,20 @@ +# 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/tags/java/sca/2.0-M4-RC1/modules/binding-jsonp-runtime/src/test/java/helloworld/HelloWorldClient.java b/tags/java/sca/2.0-M4-RC1/modules/binding-jsonp-runtime/src/test/java/helloworld/HelloWorldClient.java new file mode 100644 index 0000000000..5ee1f167ea --- /dev/null +++ b/tags/java/sca/2.0-M4-RC1/modules/binding-jsonp-runtime/src/test/java/helloworld/HelloWorldClient.java @@ -0,0 +1,37 @@ +/* + * 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/tags/java/sca/2.0-M4-RC1/modules/binding-jsonp-runtime/src/test/java/helloworld/HelloWorldImpl.java b/tags/java/sca/2.0-M4-RC1/modules/binding-jsonp-runtime/src/test/java/helloworld/HelloWorldImpl.java new file mode 100644 index 0000000000..99f2958d0d --- /dev/null +++ b/tags/java/sca/2.0-M4-RC1/modules/binding-jsonp-runtime/src/test/java/helloworld/HelloWorldImpl.java @@ -0,0 +1,32 @@ +/* + * 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/tags/java/sca/2.0-M4-RC1/modules/binding-jsonp-runtime/src/test/java/helloworld/HelloWorldService.java b/tags/java/sca/2.0-M4-RC1/modules/binding-jsonp-runtime/src/test/java/helloworld/HelloWorldService.java new file mode 100644 index 0000000000..b252eddbed --- /dev/null +++ b/tags/java/sca/2.0-M4-RC1/modules/binding-jsonp-runtime/src/test/java/helloworld/HelloWorldService.java @@ -0,0 +1,30 @@ +/* + * 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/tags/java/sca/2.0-M4-RC1/modules/binding-jsonp-runtime/src/test/java/test/BindingTestCase.java b/tags/java/sca/2.0-M4-RC1/modules/binding-jsonp-runtime/src/test/java/test/BindingTestCase.java new file mode 100644 index 0000000000..efec56bbe3 --- /dev/null +++ b/tags/java/sca/2.0-M4-RC1/modules/binding-jsonp-runtime/src/test/java/test/BindingTestCase.java @@ -0,0 +1,83 @@ +/* + * 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/tags/java/sca/2.0-M4-RC1/modules/binding-jsonp-runtime/src/test/resources/helloworld.composite b/tags/java/sca/2.0-M4-RC1/modules/binding-jsonp-runtime/src/test/resources/helloworld.composite new file mode 100644 index 0000000000..d058e4869f --- /dev/null +++ b/tags/java/sca/2.0-M4-RC1/modules/binding-jsonp-runtime/src/test/resources/helloworld.composite @@ -0,0 +1,39 @@ + + + + + + + + + + + + + + + + + + + diff --git a/tags/java/sca/2.0-M4-RC1/modules/binding-jsonp-runtime/src/test/resources/jquery.html b/tags/java/sca/2.0-M4-RC1/modules/binding-jsonp-runtime/src/test/resources/jquery.html new file mode 100644 index 0000000000..a61cee3155 --- /dev/null +++ b/tags/java/sca/2.0-M4-RC1/modules/binding-jsonp-runtime/src/test/resources/jquery.html @@ -0,0 +1,51 @@ + + + + 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