28 files changed, 0 insertions, 1818 deletions
diff --git a/sca-java-2.x/branches/2.0-Beta2/modules/binding-jsonp-runtime/LICENSE b/sca-java-2.x/branches/2.0-Beta2/modules/binding-jsonp-runtime/LICENSE
deleted file mode 100644
index 6e529a25c4..0000000000
--- a/sca-java-2.x/branches/2.0-Beta2/modules/binding-jsonp-runtime/LICENSE
+++ /dev/null
@@ -1,205 +0,0 @@
-
-                                 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/sca-java-2.x/branches/2.0-Beta2/modules/binding-jsonp-runtime/META-INF/MANIFEST.MF b/sca-java-2.x/branches/2.0-Beta2/modules/binding-jsonp-runtime/META-INF/MANIFEST.MF
deleted file mode 100644
index 9c5633ae1b..0000000000
--- a/sca-java-2.x/branches/2.0-Beta2/modules/binding-jsonp-runtime/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,31 +0,0 @@
-Manifest-Version: 1.0
-SCA-Version: 1.1
-Bundle-Name: Apache Tuscany SCA JSONP Binding Model
-Bundle-Vendor: The Apache Software Foundation
-Bundle-Version: 2.0.0
-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/sca-java-2.x/branches/2.0-Beta2/modules/binding-jsonp-runtime/NOTICE b/sca-java-2.x/branches/2.0-Beta2/modules/binding-jsonp-runtime/NOTICE
deleted file mode 100644
index 9ddba06a32..0000000000
--- a/sca-java-2.x/branches/2.0-Beta2/modules/binding-jsonp-runtime/NOTICE
+++ /dev/null
@@ -1,6 +0,0 @@
-${pom.name}
-Copyright (c) 2005 - 2010 The Apache Software Foundation
-
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
-
diff --git a/sca-java-2.x/branches/2.0-Beta2/modules/binding-jsonp-runtime/pom.xml b/sca-java-2.x/branches/2.0-Beta2/modules/binding-jsonp-runtime/pom.xml
deleted file mode 100644
index 17416d9b01..0000000000
--- a/sca-java-2.x/branches/2.0-Beta2/modules/binding-jsonp-runtime/pom.xml
+++ /dev/null
@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * 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.
--->
-<project>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-modules</artifactId>
-        <version>2.0-Beta2-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>tuscany-binding-jsonp-runtime</artifactId>
-    <name>Apache Tuscany SCA JSONP Binding Runtime</name>
-
-    <dependencies>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-jsonp</artifactId>
-            <version>2.0-Beta2-SNAPSHOT</version>
-        </dependency>
-
-        <!-- dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-http-runtime</artifactId>
-            <version>2.0-Beta2-SNAPSHOT</version>
-        </dependency-->   
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-http</artifactId>
-            <version>2.0-Beta2-SNAPSHOT</version>
-        </dependency>   
-                
-        <dependency>
-            <groupId>org.codehaus.jackson</groupId>
-            <artifactId>jackson-core-asl</artifactId>
-            <version>1.6.2</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.codehaus.jackson</groupId>
-            <artifactId>jackson-mapper-asl</artifactId>
-            <version>1.6.2</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.httpcomponents</groupId>
-            <artifactId>httpclient</artifactId>
-            <version>4.0</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-databinding-json</artifactId>
-            <version>2.0-Beta2-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>         
-
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
-            <version>2.5</version>
-            <scope>provided</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-jetty</artifactId>
-            <version>2.0-Beta2-SNAPSHOT</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0-Beta2-SNAPSHOT</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0-Beta2-SNAPSHOT</version>
-            <scope>test</scope>
-        </dependency>    
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-sca-api</artifactId>
-            <version>2.0-Beta2-SNAPSHOT</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
-</project>
diff --git a/sca-java-2.x/branches/2.0-Beta2/modules/binding-jsonp-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonp/runtime/JSONPBindingProviderFactory.java b/sca-java-2.x/branches/2.0-Beta2/modules/binding-jsonp-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonp/runtime/JSONPBindingProviderFactory.java
deleted file mode 100644
index 1f2ed09c07..0000000000
--- a/sca-java-2.x/branches/2.0-Beta2/modules/binding-jsonp-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonp/runtime/JSONPBindingProviderFactory.java
+++ /dev/null
@@ -1,52 +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 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<JSONPBinding> {
-
-    private ServletHost servletHost;
-
-    public JSONPBindingProviderFactory(ExtensionPointRegistry extensionPoints) {
-        this.servletHost = ServletHostHelper.getServletHost(extensionPoints);
-    }
-
-    public Class<JSONPBinding> 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/branches/2.0-Beta2/modules/binding-jsonp-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonp/runtime/JSONPInvoker.java b/sca-java-2.x/branches/2.0-Beta2/modules/binding-jsonp-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonp/runtime/JSONPInvoker.java
deleted file mode 100644
index 6b0bfec213..0000000000
--- a/sca-java-2.x/branches/2.0-Beta2/modules/binding-jsonp-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonp/runtime/JSONPInvoker.java
+++ /dev/null
@@ -1,174 +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.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.getBinding().getURI() + "/" + 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<jsonArgs.length; i++) {
-             if (i == 0) {
-                 url += '?';
-             } else {
-                 url += '&';
-             }
-             url += "arg" + i + "=";
-             url += uc.encode(jsonArgs[i]);
-         }
-
-         HttpGet httpget = new HttpGet(url); 
-
-         HttpResponse response = httpclient.execute(httpget);
-         
-         StringBuffer responseJSON = new StringBuffer(); 
-
-         HttpEntity entity = response.getEntity();
-         
-         // If the response does not enclose an entity, there is no need
-         // to worry about connection release
-         if (entity != null) {
-             InputStream instream = entity.getContent();
-             try {
-                 
-                 BufferedReader reader = new BufferedReader(new InputStreamReader(instream));
-                 String s = null;
-                 while ((s = reader.readLine()) != null) {
-                     responseJSON.append(s);
-                 }
-                 
-             } catch (IOException ex) {
-         
-                 // In case of an IOException the connection will be released
-                 // back to the connection manager automatically
-                 throw ex;
-                 
-             } catch (RuntimeException ex) {
-         
-                 // In case of an unexpected exception you may want to abort
-                 // the HTTP request in order to shut down the underlying 
-                 // connection and release it back to the connection manager.
-                 httpget.abort();
-                 throw ex;
-                 
-             } finally {
-         
-                 // Closing the input stream will trigger connection release
-                 instream.close();
-                 
-             }
-             
-             // When HttpClient instance is no longer needed, 
-             // shut down the connection manager to ensure
-             // immediate deallocation of all system resources
-             httpclient.getConnectionManager().shutdown();        
-         }
-         
-         return responseJSON.toString();
-    }
-
-/* Not required now JSON conversion is delegated to databinding   
-    protected String[] objectsToJSON(Object[] msgArgs) throws JsonGenerationException, JsonMappingException, IOException {
-        String[] jsonArgs = new String[msgArgs.length];
-        for (int i=0; i<msgArgs.length; i++) {
-            ByteArrayOutputStream os = new ByteArrayOutputStream();
-            mapper.writeValue(os , msgArgs[i]);
-            jsonArgs[i] = os.toString();
-        }
-        return jsonArgs;
-    }
-*/
-    
-    protected String[] objectsToJSONStrings(Object[] msgArgs) throws JsonGenerationException, JsonMappingException, IOException {
-        String[] jsonArgs = new String[msgArgs.length];
-        for (int i=0; i<msgArgs.length; i++) {
-            jsonArgs[i] = msgArgs[i].toString();
-        }
-        return jsonArgs;
-    }    
-
-/* Not required now JSON conversion is delegated to databinding    
-    protected Object[] jsonToObjects(String jsonRequest) throws JsonParseException, JsonMappingException, IOException {
-        Class<?> c = new Object[0].getClass();
-        Object[] args = (Object[])mapper.readValue("[" + jsonRequest +"]", c);
-        return args;
-    }
-*/
-    
-}
diff --git a/sca-java-2.x/branches/2.0-Beta2/modules/binding-jsonp-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonp/runtime/JSONPReferenceBindingProvider.java b/sca-java-2.x/branches/2.0-Beta2/modules/binding-jsonp-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonp/runtime/JSONPReferenceBindingProvider.java
deleted file mode 100644
index eda70e275e..0000000000
--- a/sca-java-2.x/branches/2.0-Beta2/modules/binding-jsonp-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonp/runtime/JSONPReferenceBindingProvider.java
+++ /dev/null
@@ -1,61 +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 org.apache.tuscany.sca.assembly.EndpointReference;
-import org.apache.tuscany.sca.interfacedef.InterfaceContract;
-import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.invocation.Invoker;
-import org.apache.tuscany.sca.provider.ReferenceBindingProvider;
-
-public class JSONPReferenceBindingProvider implements ReferenceBindingProvider {
-
-    private EndpointReference endpoint;
-    private InterfaceContract contract;
-
-    public JSONPReferenceBindingProvider(EndpointReference endpoint) {
-        this.endpoint = endpoint;
-        
-        try {
-            contract = (InterfaceContract)endpoint.getComponentReferenceInterfaceContract().clone();
-        } catch (Exception ex){
-            // we know this supports clone
-        }
-        contract.getInterface().resetDataBinding("JSON");
-    }
-    public Invoker createInvoker(Operation operation) {
-        return new JSONPInvoker(operation, endpoint);
-    }
-
-    public void start() {
-    }
-
-    public void stop() {
-    }
-
-    public InterfaceContract getBindingInterfaceContract() {
-        return contract;
-    }
-
-    public boolean supportsOneWayInvocation() {
-        return false;
-    }
-
-}
diff --git a/sca-java-2.x/branches/2.0-Beta2/modules/binding-jsonp-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonp/runtime/JSONPServiceBindingProvider.java b/sca-java-2.x/branches/2.0-Beta2/modules/binding-jsonp-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonp/runtime/JSONPServiceBindingProvider.java
deleted file mode 100644
index 991aeb3a21..0000000000
--- a/sca-java-2.x/branches/2.0-Beta2/modules/binding-jsonp-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonp/runtime/JSONPServiceBindingProvider.java
+++ /dev/null
@@ -1,76 +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 org.apache.tuscany.sca.assembly.ComponentService;
-import org.apache.tuscany.sca.host.http.ServletHost;
-import org.apache.tuscany.sca.interfacedef.Interface;
-import org.apache.tuscany.sca.interfacedef.InterfaceContract;
-import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.provider.ServiceBindingProvider;
-import org.apache.tuscany.sca.runtime.RuntimeEndpoint;
-
-public class JSONPServiceBindingProvider implements ServiceBindingProvider {
-
-    private RuntimeEndpoint endpoint;
-    private ServletHost servletHost;
-    private InterfaceContract contract;
-
-    public JSONPServiceBindingProvider(RuntimeEndpoint endpoint, ServletHost servletHost) {
-        this.endpoint = endpoint;
-        this.servletHost = servletHost;
-        
-        try {
-            contract = (InterfaceContract)endpoint.getComponentServiceInterfaceContract().clone();
-        } catch (Exception ex){
-            // we know this supports clone
-        }
-        contract.getInterface().resetDataBinding("JSON");
-    }
-
-    public void start() {
-        ComponentService service = endpoint.getService();
-        Interface serviceInterface = service.getInterfaceContract().getInterface();
-        for (Operation op : serviceInterface.getOperations()) {
-            JSONPServlet servlet = new JSONPServlet(endpoint, op);
-            String path = endpoint.getBinding().getURI() + "/" + op.getName();
-            servletHost.addServletMapping(path, servlet);
-        }
-    }
-
-    public void stop() {
-        ComponentService service = endpoint.getService();
-        Interface serviceInterface = service.getInterfaceContract().getInterface();
-        for (Operation op : serviceInterface.getOperations()) {
-            String path = endpoint.getBinding().getURI() + "/" + op.getName();
-            servletHost.removeServletMapping(path);
-        }
-    }
-
-    // TODO: Why are these two still on the ServiceBindingProvider interface?
-    public InterfaceContract getBindingInterfaceContract() {
-        return contract;
-    }
-
-    public boolean supportsOneWayInvocation() {
-        return false;
-    }
-
-}
diff --git a/sca-java-2.x/branches/2.0-Beta2/modules/binding-jsonp-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonp/runtime/JSONPServlet.java b/sca-java-2.x/branches/2.0-Beta2/modules/binding-jsonp-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonp/runtime/JSONPServlet.java
deleted file mode 100644
index 320481ab20..0000000000
--- a/sca-java-2.x/branches/2.0-Beta2/modules/binding-jsonp-runtime/src/main/java/org/apache/tuscany/sca/binding/jsonp/runtime/JSONPServlet.java
+++ /dev/null
@@ -1,223 +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.ByteArrayOutputStream;
-import java.io.IOException;
-import java.lang.reflect.InvocationTargetException;
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.List;
-import java.util.Set;
-import java.util.SortedSet;
-import java.util.TreeSet;
-
-import javax.servlet.GenericServlet;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
-
-import org.apache.tuscany.sca.interfacedef.DataType;
-import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.runtime.RuntimeEndpoint;
-import org.codehaus.jackson.JsonParseException;
-import org.codehaus.jackson.map.JsonMappingException;
-import org.codehaus.jackson.map.ObjectMapper;
-
-public class JSONPServlet extends GenericServlet {
-    private static final long serialVersionUID = 1L;
-
-    protected transient RuntimeEndpoint wire;
-    protected transient Operation operation;
-    protected transient ObjectMapper mapper;
-    
-    public JSONPServlet(RuntimeEndpoint wire, Operation operation) {
-        this.wire = wire;
-        this.operation = operation;
-        this.mapper = new ObjectMapper();
-    }
-
-    @Override
-    public void service(ServletRequest servletRequest, ServletResponse servletResponse) throws ServletException, IOException {
-        //String jsonRequest = getJSONRequest(servletRequest);
-        //Object[] args = jsonToObjects(jsonRequest);
-        Object[] args = getJSONRequestStringArray(servletRequest);
-        Object response = invokeService(args);        
-        //String jsonResponse = getJSONResponse(servletRequest, response);
-        String jsonResponse = getJSONResponseAsString(servletRequest, response);
-        servletResponse.getOutputStream().println(jsonResponse);
-    }
-
-    /**
-     * Turn the request into JSON 
-     */
-/* Not required now JSON conversion is delegated to databinding       
-    protected String getJSONRequest(ServletRequest servletRequest) throws IOException, JsonParseException, JsonMappingException {
-        
-        List<DataType> 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<DataType> types = operation.getInputType().getLogical();
-        int typesIndex = 0;
-        
-        List<String> jsonRequestArray = new ArrayList<String>();
-        
-        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<String> getOrderedParameterNames(ServletRequest servletRequest) {
-        final String queryString = ((HttpServletRequest)servletRequest).getQueryString();
-
-        SortedSet<String> sortedNames = new TreeSet<String>(new Comparator<String>(){
-            public int compare(String o1, String o2) {
-                int i = queryString.indexOf(o1);
-                int j = queryString.indexOf(o2);
-                return i - j;
-            }});
-
-        Set<String> 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/branches/2.0-Beta2/modules/binding-jsonp-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory b/sca-java-2.x/branches/2.0-Beta2/modules/binding-jsonp-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
deleted file mode 100644
index da84f1ac6d..0000000000
--- a/sca-java-2.x/branches/2.0-Beta2/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,ranking=200
-
diff --git a/sca-java-2.x/branches/2.0-Beta2/modules/binding-jsonp-runtime/src/test/java/helloworld/BeanA.java b/sca-java-2.x/branches/2.0-Beta2/modules/binding-jsonp-runtime/src/test/java/helloworld/BeanA.java
deleted file mode 100644
index c8fd365da5..0000000000
--- a/sca-java-2.x/branches/2.0-Beta2/modules/binding-jsonp-runtime/src/test/java/helloworld/BeanA.java
+++ /dev/null
@@ -1,60 +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 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/branches/2.0-Beta2/modules/binding-jsonp-runtime/src/test/java/helloworld/HelloWorldClient.java b/sca-java-2.x/branches/2.0-Beta2/modules/binding-jsonp-runtime/src/test/java/helloworld/HelloWorldClient.java
deleted file mode 100644
index f4a2023b17..0000000000
--- a/sca-java-2.x/branches/2.0-Beta2/modules/binding-jsonp-runtime/src/test/java/helloworld/HelloWorldClient.java
+++ /dev/null
@@ -1,44 +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);
-    }
-
-    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/branches/2.0-Beta2/modules/binding-jsonp-runtime/src/test/java/helloworld/HelloWorldImpl.java b/sca-java-2.x/branches/2.0-Beta2/modules/binding-jsonp-runtime/src/test/java/helloworld/HelloWorldImpl.java
deleted file mode 100644
index f73b185ead..0000000000
--- a/sca-java-2.x/branches/2.0-Beta2/modules/binding-jsonp-runtime/src/test/java/helloworld/HelloWorldImpl.java
+++ /dev/null
@@ -1,41 +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;
-    }
-    
-    public BeanA sayHello3(BeanA bean) {
-        bean.setS("XYZ");
-        return bean;
-    }
-
-    public int sayHello4(boolean flag) {
-        return 0;
-    }
-    
-}
diff --git a/sca-java-2.x/branches/2.0-Beta2/modules/binding-jsonp-runtime/src/test/java/helloworld/HelloWorldService.java b/sca-java-2.x/branches/2.0-Beta2/modules/binding-jsonp-runtime/src/test/java/helloworld/HelloWorldService.java
deleted file mode 100644
index 790fdd7467..0000000000
--- a/sca-java-2.x/branches/2.0-Beta2/modules/binding-jsonp-runtime/src/test/java/helloworld/HelloWorldService.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 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/branches/2.0-Beta2/modules/binding-jsonp-runtime/src/test/java/test/BindingTestCase.java b/sca-java-2.x/branches/2.0-Beta2/modules/binding-jsonp-runtime/src/test/java/test/BindingTestCase.java
deleted file mode 100644
index 0259fdf39d..0000000000
--- a/sca-java-2.x/branches/2.0-Beta2/modules/binding-jsonp-runtime/src/test/java/test/BindingTestCase.java
+++ /dev/null
@@ -1,115 +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.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/branches/2.0-Beta2/modules/binding-jsonp-runtime/src/test/resources/jquery.html b/sca-java-2.x/branches/2.0-Beta2/modules/binding-jsonp-runtime/src/test/resources/jquery.html
deleted file mode 100644
index a61cee3155..0000000000
--- a/sca-java-2.x/branches/2.0-Beta2/modules/binding-jsonp-runtime/src/test/resources/jquery.html
+++ /dev/null
@@ -1,51 +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.    
- -->
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" 
-                    "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-    <title>Tuscany JQuery Client HelloWorld Sample</TITLE>
-    
-    <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.3.2/jquery.min.js"></script>
-    <script language="JavaScript">
-
-       function getGreeting() {
-          var name = document.getElementById("name").value;
-          $.getJSON('http://localhost:8081/HelloWorldService/sayHello?name=' + name + '&callback=?', handleResponse);
-       }
-       function handleResponse(data) {
-          document.getElementById('greeting').innerHTML=data;
-       }
-  
-    </script>
-    
-  </head>
-
-  <body>
-    <h2>Tuscany JSONP HelloWorld Sample</h2>
-
-    This example uses the JQuery getJSON to make JSONP requests to the SCA service 'HelloWorldService'
-
-    <p>Enter Name: &nbsp;&nbsp;&nbsp;
-    <input type="text" id="name" size="30"/>               
-    <input type="button" value="Submit" onclick="getGreeting()" />
-
-    </p><div id='greeting'></div>
-
-  </body>
-</html>
diff --git a/sca-java-2.x/branches/2.0-Beta2/modules/binding-jsonp-runtime/src/test/resources/jsonp/helloworld.composite b/sca-java-2.x/branches/2.0-Beta2/modules/binding-jsonp-runtime/src/test/resources/jsonp/helloworld.composite
deleted file mode 100644
index c1061147a8..0000000000
--- a/sca-java-2.x/branches/2.0-Beta2/modules/binding-jsonp-runtime/src/test/resources/jsonp/helloworld.composite
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * 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.    
- -->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
-	       xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1"
-           targetNamespace="http://itest"
-           name="HelloWorldComposite">
-           
-    <component name="HelloWorldComponent">
-        <implementation.java class="helloworld.HelloWorldImpl"/>
-        <service name="HelloWorldService" >
-            <binding.sca name="sca"/>
-            <tuscany:binding.jsonp name="HelloWorldService"/>
-        </service>
-    </component>   
-  
-    <component name="HelloWorldClient">
-        <implementation.java class="helloworld.HelloWorldClient"/>
-        <reference name="ref" >
-            <binding.sca name="sca"/>
-            <tuscany:binding.jsonp name="HelloWorldService" uri="http://localhost:8085/HelloWorldComponent/HelloWorldService"/>
-        </reference>
-    </component>   
-
-</composite>
diff --git a/sca-java-2.x/branches/2.0-Beta2/modules/binding-jsonp/LICENSE b/sca-java-2.x/branches/2.0-Beta2/modules/binding-jsonp/LICENSE
deleted file mode 100644
index 6e529a25c4..0000000000
--- a/sca-java-2.x/branches/2.0-Beta2/modules/binding-jsonp/LICENSE
+++ /dev/null
@@ -1,205 +0,0 @@
-
-                                 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/sca-java-2.x/branches/2.0-Beta2/modules/binding-jsonp/META-INF/MANIFEST.MF b/sca-java-2.x/branches/2.0-Beta2/modules/binding-jsonp/META-INF/MANIFEST.MF
deleted file mode 100644
index 4fdd920cb9..0000000000
--- a/sca-java-2.x/branches/2.0-Beta2/modules/binding-jsonp/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,20 +0,0 @@
-Manifest-Version: 1.0
-Export-Package: org.apache.tuscany.sca.binding.jsonp;version="2.0.0";uses:="org.apache.tuscany.sca.assembly,javax.xml.namespace"
-Private-Package: org.apache.tuscany.sca.binding.jsonp.impl;version="2.0.0"
-SCA-Version: 1.1
-Bundle-Name: Apache Tuscany SCA JSONP Binding Model
-Bundle-Vendor: The Apache Software Foundation
-Bundle-Version: 2.0.0
-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.xml.namespace,
- org.apache.tuscany.sca.assembly;version="2.0.0",
- org.apache.tuscany.sca.assembly.xml;version="2.0.0",
- org.apache.tuscany.sca.binding.http;version="2.0.0",
- org.apache.tuscany.sca.binding.http.impl;version="2.0.0",
- org.apache.tuscany.sca.binding.jsonp;version="2.0.0"
-Bundle-SymbolicName: org.apache.tuscany.sca.binding.jsonp
-Bundle-DocURL: http://www.apache.org/
-Bundle-RequiredExecutionEnvironment: J2SE-1.5,JavaSE-1.6
-
diff --git a/sca-java-2.x/branches/2.0-Beta2/modules/binding-jsonp/NOTICE b/sca-java-2.x/branches/2.0-Beta2/modules/binding-jsonp/NOTICE
deleted file mode 100644
index 9ddba06a32..0000000000
--- a/sca-java-2.x/branches/2.0-Beta2/modules/binding-jsonp/NOTICE
+++ /dev/null
@@ -1,6 +0,0 @@
-${pom.name}
-Copyright (c) 2005 - 2010 The Apache Software Foundation
-
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
-
diff --git a/sca-java-2.x/branches/2.0-Beta2/modules/binding-jsonp/pom.xml b/sca-java-2.x/branches/2.0-Beta2/modules/binding-jsonp/pom.xml
deleted file mode 100644
index 71916669e8..0000000000
--- a/sca-java-2.x/branches/2.0-Beta2/modules/binding-jsonp/pom.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * 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.
--->
-<project>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-modules</artifactId>
-        <version>2.0-Beta2-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>tuscany-binding-jsonp</artifactId>
-    <name>Apache Tuscany SCA JSONP Binding Model</name>
-
-    <dependencies>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-http</artifactId>
-            <version>2.0-Beta2-SNAPSHOT</version>
-        </dependency>
-
-    </dependencies>
-
-</project>
diff --git a/sca-java-2.x/branches/2.0-Beta2/modules/binding-jsonp/src/main/java/org/apache/tuscany/sca/binding/jsonp/JSONPBinding.java b/sca-java-2.x/branches/2.0-Beta2/modules/binding-jsonp/src/main/java/org/apache/tuscany/sca/binding/jsonp/JSONPBinding.java
deleted file mode 100644
index 3b57ca199e..0000000000
--- a/sca-java-2.x/branches/2.0-Beta2/modules/binding-jsonp/src/main/java/org/apache/tuscany/sca/binding/jsonp/JSONPBinding.java
+++ /dev/null
@@ -1,48 +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;
-
-import javax.xml.namespace.QName;
-
-import org.apache.tuscany.sca.binding.http.HTTPDefaultOperationSelector;
-import org.apache.tuscany.sca.binding.http.HTTPDefaultWireFormat;
-import org.apache.tuscany.sca.binding.http.impl.HTTPBindingImpl;
-
-/**
- * JSONP Binding model
- */
-public class JSONPBinding extends HTTPBindingImpl {
-
-    QName TYPE = new QName(SCA11_TUSCANY_NS, "binding.jsonp");
-
-    public JSONPBinding() {
-        super();
-
-        // configure the HTTP binding for JSONP (which for the moment is the default wireFormat)
-        setOperationSelector(new HTTPDefaultOperationSelector());
-        setRequestWireFormat(new HTTPDefaultWireFormat());
-        setResponseWireFormat(new HTTPDefaultWireFormat());
-    }
-
-    @Override
-    public QName getType() {
-        return TYPE;
-    }
-}
diff --git a/sca-java-2.x/branches/2.0-Beta2/modules/binding-jsonp/src/main/java/org/apache/tuscany/sca/binding/jsonp/JSONPBindingFactory.java b/sca-java-2.x/branches/2.0-Beta2/modules/binding-jsonp/src/main/java/org/apache/tuscany/sca/binding/jsonp/JSONPBindingFactory.java
deleted file mode 100644
index c94a66deed..0000000000
--- a/sca-java-2.x/branches/2.0-Beta2/modules/binding-jsonp/src/main/java/org/apache/tuscany/sca/binding/jsonp/JSONPBindingFactory.java
+++ /dev/null
@@ -1,31 +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;
-
-
-/**
- * Factory to create JSONPBinding instances
- */
-public class JSONPBindingFactory {
-
-    public JSONPBinding createJSONPBinding() {
-        return new JSONPBinding();
-    }
-}
diff --git a/sca-java-2.x/branches/2.0-Beta2/modules/binding-jsonp/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.jsonp.JSONPBindingFactory b/sca-java-2.x/branches/2.0-Beta2/modules/binding-jsonp/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.jsonp.JSONPBindingFactory
deleted file mode 100644
index 57908b31d5..0000000000
--- a/sca-java-2.x/branches/2.0-Beta2/modules/binding-jsonp/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.jsonp.JSONPBindingFactory
+++ /dev/null
@@ -1,21 +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 model factory
-org.apache.tuscany.sca.binding.jsonp.JSONPBindingFactory
-
-
diff --git a/sca-java-2.x/branches/2.0-Beta2/modules/binding-jsonp/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-2.x/branches/2.0-Beta2/modules/binding-jsonp/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
deleted file mode 100644
index f962b70f04..0000000000
--- a/sca-java-2.x/branches/2.0-Beta2/modules/binding-jsonp/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ /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 artifact processor extension
-org.apache.tuscany.sca.assembly.xml.DefaultBeanModelProcessor;qname=http://tuscany.apache.org/xmlns/sca/1.1#binding.jsonp,model=org.apache.tuscany.sca.binding.jsonp.JSONPBinding,factory=org.apache.tuscany.sca.binding.jsonp.JSONPBindingFactory
-
diff --git a/sca-java-2.x/branches/2.0-Beta2/modules/binding-jsonp/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema b/sca-java-2.x/branches/2.0-Beta2/modules/binding-jsonp/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema
deleted file mode 100644
index f6c99dfaba..0000000000
--- a/sca-java-2.x/branches/2.0-Beta2/modules/binding-jsonp/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.ValidationSchema
+++ /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. 
-#
-binding-jsonp.xsd
-
diff --git a/sca-java-2.x/branches/2.0-Beta2/modules/binding-jsonp/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory b/sca-java-2.x/branches/2.0-Beta2/modules/binding-jsonp/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.BindingProviderFactory
deleted file mode 100644
index c45809a716..0000000000
--- a/sca-java-2.x/branches/2.0-Beta2/modules/binding-jsonp/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.http.provider.HTTPBindingProviderFactory;model=org.apache.tuscany.sca.binding.jsonp.JSONPBinding
-
diff --git a/sca-java-2.x/branches/2.0-Beta2/modules/binding-jsonp/src/main/resources/binding-jsonp.xsd b/sca-java-2.x/branches/2.0-Beta2/modules/binding-jsonp/src/main/resources/binding-jsonp.xsd
deleted file mode 100644
index e533ecd168..0000000000
--- a/sca-java-2.x/branches/2.0-Beta2/modules/binding-jsonp/src/main/resources/binding-jsonp.xsd
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * 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.    
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-    targetNamespace="http://tuscany.apache.org/xmlns/sca/1.1" 
-    xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912"
-    xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1" 
-    elementFormDefault="qualified">
-
-    <import namespace="http://docs.oasis-open.org/ns/opencsa/sca/200912" />
-
-    <element name="binding.jsonp" type="t:JSONPBinding" substitutionGroup="sca:binding"/>
-    
-    <complexType name="JSONPBinding">
-        <complexContent>
-            <extension base="sca:Binding">
-                <!-- sequence>
-                    <any namespace="##targetNamespace" processContents="lax" minOccurs="0"
-                         maxOccurs="unbounded"/>
-                </sequence -->
-                <!-- anyAttribute namespace="##other" processContents="lax"/-->
-            </extension>
-        </complexContent>
-    </complexType>
-</schema>