From 132aa8a77685ec92bc90c03f987650d275a7b639 Mon Sep 17 00:00:00 2001 From: lresende Date: Mon, 30 Sep 2013 06:59:11 +0000 Subject: 2.0.1 RC1 release tag git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1527464 13f79535-47bb-0310-9956-ffa450edef68 --- .../jsonp/runtime/JSONPBindingProviderFactory.java | 52 +++++ .../sca/binding/jsonp/runtime/JSONPInvoker.java | 174 ++++++++++++++++ .../runtime/JSONPReferenceBindingProvider.java | 61 ++++++ .../jsonp/runtime/JSONPServiceBindingProvider.java | 79 ++++++++ .../sca/binding/jsonp/runtime/JSONPServlet.java | 223 +++++++++++++++++++++ ...che.tuscany.sca.provider.BindingProviderFactory | 20 ++ .../src/test/java/helloworld/BeanA.java | 60 ++++++ .../src/test/java/helloworld/HelloWorldClient.java | 44 ++++ .../src/test/java/helloworld/HelloWorldImpl.java | 41 ++++ .../test/java/helloworld/HelloWorldService.java | 34 ++++ .../src/test/java/test/BindingTestCase.java | 115 +++++++++++ .../src/test/resources/jquery.html | 51 +++++ .../src/test/resources/jsonp/helloworld.composite | 41 ++++ 13 files changed, 995 insertions(+) create mode 100644 sca-java-2.x/tags/2.0.1-RC1/modules/binding-jsonp-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonp/runtime/JSONPBindingProviderFactory.java create mode 100644 sca-java-2.x/tags/2.0.1-RC1/modules/binding-jsonp-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonp/runtime/JSONPInvoker.java create mode 100644 sca-java-2.x/tags/2.0.1-RC1/modules/binding-jsonp-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonp/runtime/JSONPReferenceBindingProvider.java create mode 100644 sca-java-2.x/tags/2.0.1-RC1/modules/binding-jsonp-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonp/runtime/JSONPServiceBindingProvider.java create mode 100644 sca-java-2.x/tags/2.0.1-RC1/modules/binding-jsonp-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonp/runtime/JSONPServlet.java create mode 100644 sca-java-2.x/tags/2.0.1-RC1/modules/binding-jsonp-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory create mode 100644 sca-java-2.x/tags/2.0.1-RC1/modules/binding-jsonp-runtime/src/test/java/helloworld/BeanA.java create mode 100644 sca-java-2.x/tags/2.0.1-RC1/modules/binding-jsonp-runtime/src/test/java/helloworld/HelloWorldClient.java create mode 100644 sca-java-2.x/tags/2.0.1-RC1/modules/binding-jsonp-runtime/src/test/java/helloworld/HelloWorldImpl.java create mode 100644 sca-java-2.x/tags/2.0.1-RC1/modules/binding-jsonp-runtime/src/test/java/helloworld/HelloWorldService.java create mode 100644 sca-java-2.x/tags/2.0.1-RC1/modules/binding-jsonp-runtime/src/test/java/test/BindingTestCase.java create mode 100644 sca-java-2.x/tags/2.0.1-RC1/modules/binding-jsonp-runtime/src/test/resources/jquery.html create mode 100644 sca-java-2.x/tags/2.0.1-RC1/modules/binding-jsonp-runtime/src/test/resources/jsonp/helloworld.composite (limited to 'sca-java-2.x/tags/2.0.1-RC1/modules/binding-jsonp-runtime/src') diff --git a/sca-java-2.x/tags/2.0.1-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.1-RC1/modules/binding-jsonp-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonp/runtime/JSONPBindingProviderFactory.java new file mode 100644 index 0000000000..1f2ed09c07 --- /dev/null +++ b/sca-java-2.x/tags/2.0.1-RC1/modules/binding-jsonp-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonp/runtime/JSONPBindingProviderFactory.java @@ -0,0 +1,52 @@ +/* + * 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 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.ServletHostHelper; +import org.apache.tuscany.sca.provider.BindingProviderFactory; +import org.apache.tuscany.sca.provider.ReferenceBindingProvider; +import org.apache.tuscany.sca.provider.ServiceBindingProvider; +import org.apache.tuscany.sca.runtime.RuntimeEndpoint; +import org.apache.tuscany.sca.runtime.RuntimeEndpointReference; + +public class JSONPBindingProviderFactory implements BindingProviderFactory { + + private ServletHost servletHost; + + public JSONPBindingProviderFactory(ExtensionPointRegistry extensionPoints) { + this.servletHost = ServletHostHelper.getServletHost(extensionPoints); + } + + public Class getModelType() { + return JSONPBinding.class; + } + + public ReferenceBindingProvider createReferenceBindingProvider(RuntimeEndpointReference endpoint) { + return new JSONPReferenceBindingProvider(endpoint); + } + + public ServiceBindingProvider createServiceBindingProvider(RuntimeEndpoint endpoint) { + return new JSONPServiceBindingProvider(endpoint, servletHost); + } + +} diff --git a/sca-java-2.x/tags/2.0.1-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.1-RC1/modules/binding-jsonp-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonp/runtime/JSONPInvoker.java new file mode 100644 index 0000000000..bda4ccf217 --- /dev/null +++ b/sca-java-2.x/tags/2.0.1-RC1/modules/binding-jsonp-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonp/runtime/JSONPInvoker.java @@ -0,0 +1,174 @@ +/* + * 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.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 { + + 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.getDeployedURI() + "/" + operation.getName(); + //String[] jsonArgs = objectsToJSON((Object[])msg.getBody()); + String[] jsonArgs = objectsToJSONStrings((Object[])msg.getBody()); + + String responseJSON = invokeHTTPRequest(uri, jsonArgs); + + //Object response = jsonToObjects(responseJSON)[0]; + msg.setBody(responseJSON); + + 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 + "]"; + } +*/ + + /** + * Turn the request into a string array of JSON structures. The Databinding + * layer will then convert each of the individual parameters into the appropriate + * types for the implementation interface + * + */ + protected Object[] getJSONRequestStringArray(ServletRequest servletRequest) throws IOException, JsonParseException, JsonMappingException { + + List types = operation.getInputType().getLogical(); + int typesIndex = 0; + + List jsonRequestArray = new ArrayList(); + + for (String name : getOrderedParameterNames(servletRequest)) { + String jsonRequest = ""; + if (!name.startsWith("_") && !"callback".equals(name)) { + + // automatically quote string parameters 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); + } + jsonRequestArray.add(jsonRequest); + } + } + + return jsonRequestArray.toArray(); + } + + /** + * 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 + */ +/* Not required now JSON conversion is delegated to databinding + 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; + } +*/ + + /** + * The databinding layer will have converterted the return type into a JSON string so simply + * add wrap it for return. + */ + protected String getJSONResponseAsString(ServletRequest servletRequest, Object response) throws IOException, JsonParseException { + String jsonResponse = response.toString(); + + String callback = servletRequest.getParameter("callback"); + if (callback != null && callback.length() > 1) { + jsonResponse = callback + "(" + jsonResponse + ");"; + } + + return jsonResponse; + } + + /** + * Turn the request JSON into objects + */ +/* Not required now JSON conversion is delegated to databinding + 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.1-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.1-RC1/modules/binding-jsonp-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory new file mode 100644 index 0000000000..da84f1ac6d --- /dev/null +++ b/sca-java-2.x/tags/2.0.1-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,ranking=200 + diff --git a/sca-java-2.x/tags/2.0.1-RC1/modules/binding-jsonp-runtime/src/test/java/helloworld/BeanA.java b/sca-java-2.x/tags/2.0.1-RC1/modules/binding-jsonp-runtime/src/test/java/helloworld/BeanA.java new file mode 100644 index 0000000000..c8fd365da5 --- /dev/null +++ b/sca-java-2.x/tags/2.0.1-RC1/modules/binding-jsonp-runtime/src/test/java/helloworld/BeanA.java @@ -0,0 +1,60 @@ +/* + * 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 BeanA { + + protected Boolean b; + protected String s; + protected int x; + protected Integer y; + + public Boolean getB() { + return b; + } + + public void setB(Boolean b) { + this.b = b; + } + + public String getS() { + return s; + } + + public void setS(String s) { + this.s = s; + } + + public int getX() { + return x; + } + + public void setX(int x) { + this.x = x; + } + + public Integer getY() { + return y; + } + + public void setY(Integer y) { + this.y = y; + } +} diff --git a/sca-java-2.x/tags/2.0.1-RC1/modules/binding-jsonp-runtime/src/test/java/helloworld/HelloWorldClient.java b/sca-java-2.x/tags/2.0.1-RC1/modules/binding-jsonp-runtime/src/test/java/helloworld/HelloWorldClient.java new file mode 100644 index 0000000000..f4a2023b17 --- /dev/null +++ b/sca-java-2.x/tags/2.0.1-RC1/modules/binding-jsonp-runtime/src/test/java/helloworld/HelloWorldClient.java @@ -0,0 +1,44 @@ +/* + * 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); + } + + public BeanA sayHello3(BeanA bean) { + return ref.sayHello3(bean); + } + + public int sayHello4(boolean flag) { + return ref.sayHello4(flag); + } +} diff --git a/sca-java-2.x/tags/2.0.1-RC1/modules/binding-jsonp-runtime/src/test/java/helloworld/HelloWorldImpl.java b/sca-java-2.x/tags/2.0.1-RC1/modules/binding-jsonp-runtime/src/test/java/helloworld/HelloWorldImpl.java new file mode 100644 index 0000000000..f73b185ead --- /dev/null +++ b/sca-java-2.x/tags/2.0.1-RC1/modules/binding-jsonp-runtime/src/test/java/helloworld/HelloWorldImpl.java @@ -0,0 +1,41 @@ +/* + * 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; + } + + public BeanA sayHello3(BeanA bean) { + bean.setS("XYZ"); + return bean; + } + + public int sayHello4(boolean flag) { + return 0; + } + +} diff --git a/sca-java-2.x/tags/2.0.1-RC1/modules/binding-jsonp-runtime/src/test/java/helloworld/HelloWorldService.java b/sca-java-2.x/tags/2.0.1-RC1/modules/binding-jsonp-runtime/src/test/java/helloworld/HelloWorldService.java new file mode 100644 index 0000000000..790fdd7467 --- /dev/null +++ b/sca-java-2.x/tags/2.0.1-RC1/modules/binding-jsonp-runtime/src/test/java/helloworld/HelloWorldService.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 helloworld; + +import org.oasisopen.sca.annotation.Remotable; + +@Remotable +public interface HelloWorldService { + + String sayHello(String name); + + String sayHello2(String firstName, String lastName); + + BeanA sayHello3(BeanA bean); + + int sayHello4(boolean flag); + +} diff --git a/sca-java-2.x/tags/2.0.1-RC1/modules/binding-jsonp-runtime/src/test/java/test/BindingTestCase.java b/sca-java-2.x/tags/2.0.1-RC1/modules/binding-jsonp-runtime/src/test/java/test/BindingTestCase.java new file mode 100644 index 0000000000..0259fdf39d --- /dev/null +++ b/sca-java-2.x/tags/2.0.1-RC1/modules/binding-jsonp-runtime/src/test/java/test/BindingTestCase.java @@ -0,0 +1,115 @@ +/* + * 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.BeanA; +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.Ignore; +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/HelloWorldService/sca"); + + Assert.assertEquals("Hello beate", client.sayHello("beate")); + Assert.assertEquals("Hello beate arnold", client.sayHello2("beate", "arnold")); + Assert.assertEquals(0, client.sayHello4(true)); + } + + @Test + public void testComplexParams() throws MalformedURLException, IOException { + + HelloWorldService client = node.getService(HelloWorldService.class, "HelloWorldClient/HelloWorldService/sca"); + + BeanA bean = new BeanA(); + bean.setB(true); + bean.setS("Fred"); + bean.setX(2); + bean.setX(5); + + Assert.assertEquals("XYZ", client.sayHello3(bean).getS()); + } + + /* + * Uncomment to keep the server running so you can ping it manually from a browser + * try: + * http://localhost:8085/HelloWorldComponent/HelloWorldService/sayHello3?bean={%22b%22:%22true%22,%22s%22:%22a%20string%22,%22x%22:%2227%22,%22y%22:%2213%22}&callback=submitSucess + */ + @Test + @Ignore + public void waitForInput(){ + System.out.println("Press a key"); + try { + System.in.read(); + } catch (Exception ex){ + // do nothing + } + } + + @BeforeClass + public static void init() throws Exception { + JettyServer.portDefault = 8085; + node = NodeFactory.newInstance().createNode("jsonp/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.1-RC1/modules/binding-jsonp-runtime/src/test/resources/jquery.html b/sca-java-2.x/tags/2.0.1-RC1/modules/binding-jsonp-runtime/src/test/resources/jquery.html new file mode 100644 index 0000000000..a61cee3155 --- /dev/null +++ b/sca-java-2.x/tags/2.0.1-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:     + + + +

+ + + diff --git a/sca-java-2.x/tags/2.0.1-RC1/modules/binding-jsonp-runtime/src/test/resources/jsonp/helloworld.composite b/sca-java-2.x/tags/2.0.1-RC1/modules/binding-jsonp-runtime/src/test/resources/jsonp/helloworld.composite new file mode 100644 index 0000000000..c1061147a8 --- /dev/null +++ b/sca-java-2.x/tags/2.0.1-RC1/modules/binding-jsonp-runtime/src/test/resources/jsonp/helloworld.composite @@ -0,0 +1,41 @@ + + + + + + + + + + + + + + + + + + + + + -- cgit v1.2.3