Moving 1.x branches

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@835694 13f79535-47bb-0310-9956-ffa450edef68

8 files changed, 0 insertions, 729 deletions

diff --git a/branches/sca-java-1.5.2/modules/binding-http-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/http/operationselector/jsonrpc/provider/JSONRPCOperationSelectorInterceptor.java b/branches/sca-java-1.5.2/modules/binding-http-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/http/operationselector/jsonrpc/provider/JSONRPCOperationSelectorInterceptor.java
deleted file mode 100644
index 37c76d88d3..0000000000
--- a/branches/sca-java-1.5.2/modules/binding-http-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/http/operationselector/jsonrpc/provider/JSONRPCOperationSelectorInterceptor.java
+++ /dev/null
@@ -1,129 +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.http.operationselector.jsonrpc.provider;
-
-import java.io.CharArrayWriter;
-import java.util.List;
-
-import org.apache.tuscany.sca.binding.http.HTTPBinding;
-import org.apache.tuscany.sca.binding.http.HTTPBindingContext;
-import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.invocation.Interceptor;
-import org.apache.tuscany.sca.invocation.Invoker;
-import org.apache.tuscany.sca.invocation.Message;
-import org.apache.tuscany.sca.invocation.MessageFactory;
-import org.apache.tuscany.sca.runtime.RuntimeWire;
-import org.json.JSONObject;
-
-import com.metaparadigm.jsonrpc.JSONRPCResult;
-
-/**
- * JSON-RPC Operation Selector Interceptor
- * 
- * @version $Rev$ $Date$
- */
-public class JSONRPCOperationSelectorInterceptor implements Interceptor {
-    private Invoker next;
-    
-    private RuntimeWire runtimeWire;
-    private HTTPBinding binding;
-    
-    private MessageFactory messageFactory;
-    
-    public JSONRPCOperationSelectorInterceptor(HTTPBinding binding, RuntimeWire runtimeWire, MessageFactory messageFactory) {
-        this.binding = binding;
-        this.runtimeWire = runtimeWire;
-        this.messageFactory = messageFactory;
-    }
-
-    public Invoker getNext() {
-        return this.next;
-    }
-
-    public void setNext(Invoker next) {
-        this.next = next;
-    }
-
-    public Message invoke(Message msg) {
-        
-        HTTPBindingContext bindingContext = msg.getBindingContext();
-        if ("smd".equals(bindingContext.getHttpRequest().getQueryString())) {
-            return getNext().invoke(msg);
-        }
-        
-        JSONObject jsonReq = null;
-        String method = null;
-        try {
-            Object[] args = msg.getBody();
-            CharArrayWriter data = (CharArrayWriter) args[0];
-            jsonReq = new JSONObject(data.toString());
-            method = jsonReq.getString("method");
-        } catch (Exception e) {
-            Throwable exception = new RuntimeException("Unable to parse request", e);
-        }
-        
-        Operation jsonOperation = findOperation(method);
-        msg.setOperation(jsonOperation);
-        msg.setBody(jsonReq);
-        
-        return getNext().invoke(msg);
-    }
-    
-    /**
-     * Find the operation from the component service contract
-     * @param componentService
-     * @param method
-     * @return
-     */
-    private Operation findOperation(String method) {
-        if (method.contains(".")) {
-            method = method.substring(method.lastIndexOf(".") + 1);
-        }
-
-        List<Operation> operations = runtimeWire.getTarget().getInterfaceContract().getInterface().getOperations(); 
-
-        Operation result = null;
-        for (Operation o : operations) {
-            if (o.getName().equalsIgnoreCase(method)) {
-                result = o;
-                break;
-            }
-        }
-
-        return result;
-    }
-    
-
-
-    /**
-     * Create a Fault Message with a JSON representation of the current exception
-     * @param throwable
-     * @return
-     */
-    private Message createJSONFaultMessage(Throwable throwable) {
-        Message jsonFaultMessage = messageFactory.createMessage();
-        
-        JSONRPCResult jsonFault = new JSONRPCResult(JSONRPCResult.CODE_REMOTE_EXCEPTION, null, throwable);
-        jsonFaultMessage.setBody(jsonFault);
-        
-        return jsonFaultMessage;
-    }
-
-}
diff --git a/branches/sca-java-1.5.2/modules/binding-http-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/http/operationselector/jsonrpc/provider/JSONRPCOperationSelectorProviderFactory.java b/branches/sca-java-1.5.2/modules/binding-http-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/http/operationselector/jsonrpc/provider/JSONRPCOperationSelectorProviderFactory.java
deleted file mode 100644
index 42ee2808c4..0000000000
--- a/branches/sca-java-1.5.2/modules/binding-http-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/http/operationselector/jsonrpc/provider/JSONRPCOperationSelectorProviderFactory.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-
-package org.apache.tuscany.sca.binding.http.operationselector.jsonrpc.provider;
-
-import org.apache.tuscany.sca.assembly.Binding;
-import org.apache.tuscany.sca.binding.http.operationselector.jsonrpc.JSONRPCOperationSelector;
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.provider.OperationSelectorProvider;
-import org.apache.tuscany.sca.provider.OperationSelectorProviderFactory;
-import org.apache.tuscany.sca.runtime.RuntimeComponent;
-import org.apache.tuscany.sca.runtime.RuntimeComponentReference;
-import org.apache.tuscany.sca.runtime.RuntimeComponentService;
-
-/**
- * JSON-RPC Operation Selector Provider Factory
- * 
- * @version $Rev$ $Date$
- */
-public class JSONRPCOperationSelectorProviderFactory implements OperationSelectorProviderFactory<JSONRPCOperationSelector> {
-    private ExtensionPointRegistry extensionPoints;
-
-    public JSONRPCOperationSelectorProviderFactory(ExtensionPointRegistry extensionPoints) {
-        this.extensionPoints = extensionPoints;
-    }
-
-    public OperationSelectorProvider createReferenceOperationSelectorProvider(RuntimeComponent component,
-                                                                              RuntimeComponentReference reference,
-                                                                              Binding binding) {
-        return null;
-    }
-
-    public OperationSelectorProvider createServiceOperationSelectorProvider(RuntimeComponent component,
-                                                                            RuntimeComponentService service,
-                                                                            Binding binding) {
-        return new JSONRPCOperationSelectorServiceProvider(extensionPoints, component, service, binding);
-    }
-
-    public Class<JSONRPCOperationSelector> getModelType() {
-        return JSONRPCOperationSelector.class;
-    }
-}
diff --git a/branches/sca-java-1.5.2/modules/binding-http-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/http/operationselector/jsonrpc/provider/JSONRPCOperationSelectorServiceProvider.java b/branches/sca-java-1.5.2/modules/binding-http-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/http/operationselector/jsonrpc/provider/JSONRPCOperationSelectorServiceProvider.java
deleted file mode 100644
index c24537f03f..0000000000
--- a/branches/sca-java-1.5.2/modules/binding-http-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/http/operationselector/jsonrpc/provider/JSONRPCOperationSelectorServiceProvider.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.http.operationselector.jsonrpc.provider;
-
-import org.apache.tuscany.sca.assembly.Binding;
-import org.apache.tuscany.sca.assembly.BindingRRB;
-import org.apache.tuscany.sca.assembly.OperationSelector;
-import org.apache.tuscany.sca.binding.http.HTTPBinding;
-import org.apache.tuscany.sca.binding.http.operationselector.jsonrpc.JSONRPCOperationSelector;
-import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.invocation.Interceptor;
-import org.apache.tuscany.sca.invocation.MessageFactory;
-import org.apache.tuscany.sca.invocation.Phase;
-import org.apache.tuscany.sca.provider.OperationSelectorProvider;
-import org.apache.tuscany.sca.runtime.RuntimeComponent;
-import org.apache.tuscany.sca.runtime.RuntimeComponentService;
-
-/**
- * JSON-RPC Operation Selector Service Provider
- * 
- * @version $Rev$ $Date$
- */
-public class JSONRPCOperationSelectorServiceProvider implements OperationSelectorProvider {
-    private MessageFactory messageFactory;
-    
-    private RuntimeComponent component;
-    private RuntimeComponentService service;
-    private Binding binding;
-
-    public JSONRPCOperationSelectorServiceProvider(ExtensionPointRegistry extensionPoints,
-                                                   RuntimeComponent component, 
-                                                   RuntimeComponentService service, 
-                                                   Binding binding) {
-        ModelFactoryExtensionPoint modelFactories = extensionPoints.getExtensionPoint(ModelFactoryExtensionPoint.class);
-        messageFactory = modelFactories.getFactory(MessageFactory.class);
- 
-        this.component = component;
-        this.service = service;
-        this.binding = binding;
-    }
-    
-    public Interceptor createInterceptor() {
-        if(binding instanceof BindingRRB) {
-            BindingRRB rrbBinding = (BindingRRB) binding;
-            OperationSelector operationSelector = rrbBinding.getOperationSelector();
-            if(operationSelector != null && operationSelector instanceof JSONRPCOperationSelector) {
-                return new JSONRPCOperationSelectorInterceptor((HTTPBinding) binding, service.getRuntimeWire(binding), messageFactory);
-            }
-        }
-        
-        return null;
-    }
-
-    public String getPhase() {
-        return Phase.SERVICE_BINDING_OPERATION_SELECTOR;
-    }
-
-}
diff --git a/branches/sca-java-1.5.2/modules/binding-http-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/provider/JSONRPCWireFormatInterceptor.java b/branches/sca-java-1.5.2/modules/binding-http-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/provider/JSONRPCWireFormatInterceptor.java
deleted file mode 100644
index b314f69fcb..0000000000
--- a/branches/sca-java-1.5.2/modules/binding-http-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/provider/JSONRPCWireFormatInterceptor.java
+++ /dev/null
@@ -1,172 +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.http.wireformat.jsonrpc.provider;
-
-import org.apache.tuscany.sca.binding.http.HTTPBinding;
-import org.apache.tuscany.sca.binding.http.HTTPBindingContext;
-import org.apache.tuscany.sca.interfacedef.InterfaceContract;
-import org.apache.tuscany.sca.interfacedef.java.JavaInterface;
-import org.apache.tuscany.sca.invocation.Interceptor;
-import org.apache.tuscany.sca.invocation.Invoker;
-import org.apache.tuscany.sca.invocation.Message;
-import org.apache.tuscany.sca.invocation.MessageFactory;
-import org.apache.tuscany.sca.runtime.RuntimeWire;
-import org.json.JSONArray;
-import org.json.JSONObject;
-import org.osoa.sca.ServiceRuntimeException;
-
-import com.metaparadigm.jsonrpc.JSONRPCResult;
-
-/**
- * JSON-RPC Wire Format Interceptor
- * 
- * @version $Rev$ $Date$
- */
-public class JSONRPCWireFormatInterceptor implements Interceptor {
-    private Invoker next;
-    
-    private RuntimeWire runtimeWire;
-    private HTTPBinding binding;
-    
-    private InterfaceContract serviceContract;
-    
-    private MessageFactory messageFactory;
-    
-    public JSONRPCWireFormatInterceptor(HTTPBinding binding, RuntimeWire runtimeWire, InterfaceContract serviceContract, MessageFactory messageFactory) {
-        this.binding = binding;
-        this.runtimeWire = runtimeWire;
-        
-        this.serviceContract = serviceContract;
-        
-        this.messageFactory = messageFactory;
-    }
-
-    public Invoker getNext() {
-        return next;
-    }
-
-    public void setNext(Invoker next) {
-        this.next = next;
-        
-    }
-
-    public Message invoke(Message msg) {
-        HTTPBindingContext bindingContext = msg.getBindingContext();
-        Message returnMessage = null;
-        
-        if ("smd".equals(bindingContext.getHttpRequest().getQueryString())) {
-            returnMessage = handleSMDInvocation(msg);
-        } else {
-            returnMessage = handleJSONRPCInvocation(msg);
-        }
-        
-        return returnMessage;
-        
-    }
-    
-    /**
-     * Handle regular JSON-RPC Invocation
-     * @param msg
-     * @return
-     */
-    private Message handleJSONRPCInvocation (Message msg) {
-        JSONObject jsonReq = (JSONObject) msg.getBody();
-        String method = null;
-        Object[] args = null;
-        Object id = null;
-        try {
-            // Extract the method
-            method = jsonReq.getString("method");
-            if ((method != null) && (method.indexOf('.') < 0)) {
-                jsonReq.putOpt("method", "Service" + "." + method);
-            }
-            
-            // Extract the arguments
-            JSONArray array = jsonReq.getJSONArray("params");
-            args = new Object[array.length()];
-            for (int i = 0; i < args.length; i++) {
-                args[i] = array.get(i);
-            }
-            id = jsonReq.get("id");
-
-        } catch (Exception e) {
-            throw new RuntimeException("Unable to find json method name", e);
-        }
-        
-        Message responseMessage = null;
-        try {
-            msg.setBody(args);
-            responseMessage = runtimeWire.getInvocationChain(msg.getOperation()).getHeadInvoker().invoke(msg);
-        } catch (RuntimeException re) {
-            Throwable exception = new RuntimeException("Error invoking service :" + re.getMessage(), re);
-            return createJSONFaultMessage(re);
-        }
-
-        Object result = null;
-        if (!responseMessage.isFault()) {
-            //successful execution of the invocation
-            try {
-                result = responseMessage.getBody();
-                JSONObject jsonResponse = new JSONObject();
-                jsonResponse.put("result", result);
-                jsonResponse.putOpt("id", id);
-                //get response to send to client
-                responseMessage.setBody(jsonResponse);
-                return responseMessage;
-            } catch (Exception e) {
-                throw new ServiceRuntimeException("Unable to create JSON response", e);
-            }
-        } else {
-            //exception thrown while executing the invocation
-            Throwable exception = (Throwable)responseMessage.getBody();
-            return createJSONFaultMessage(exception);
-        }
-    }
-    
-    /**
-     * handles requests for the SMD descriptor for a service
-     */
-    private Message handleSMDInvocation(Message msg) {
-        HTTPBindingContext bindingContext = msg.getBindingContext();
-        
-        String serviceUrl = bindingContext.getHttpRequest().getRequestURL().toString();
-        JavaInterface interfaze = (JavaInterface) serviceContract.getInterface();
-        String smd = JavaToSmd.interfaceToSmd(interfaze.getJavaClass(), serviceUrl);
-        
-        Message smdResponseMessage = messageFactory.createMessage();
-        smdResponseMessage.setBody(smd);
-        
-        return smdResponseMessage;
-    }
-
-    /**
-     * Create a Fault Message with a JSON representation of the current exception
-     * @param throwable
-     * @return
-     */
-    private Message createJSONFaultMessage(Throwable throwable) {
-        Message jsonFaultMessage = messageFactory.createMessage();
-        
-        JSONRPCResult jsonFault = new JSONRPCResult(JSONRPCResult.CODE_REMOTE_EXCEPTION, null, throwable);
-        jsonFaultMessage.setBody(jsonFault);
-        
-        return jsonFaultMessage;
-    }
-}
diff --git a/branches/sca-java-1.5.2/modules/binding-http-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/provider/JSONRPCWireFormatProviderFactory.java b/branches/sca-java-1.5.2/modules/binding-http-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/provider/JSONRPCWireFormatProviderFactory.java
deleted file mode 100644
index c5f91e2b15..0000000000
--- a/branches/sca-java-1.5.2/modules/binding-http-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/provider/JSONRPCWireFormatProviderFactory.java
+++ /dev/null
@@ -1,59 +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.http.wireformat.jsonrpc.provider;
-
-import org.apache.tuscany.sca.assembly.Binding;
-import org.apache.tuscany.sca.binding.http.wireformat.jsonrpc.JSONRPCWireFormat;
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.provider.WireFormatProvider;
-import org.apache.tuscany.sca.provider.WireFormatProviderFactory;
-import org.apache.tuscany.sca.runtime.RuntimeComponent;
-import org.apache.tuscany.sca.runtime.RuntimeComponentReference;
-import org.apache.tuscany.sca.runtime.RuntimeComponentService;
-
-/**
- * JSON-RPC Wire Format Provider Factory
- * 
- * @version $Rev$ $Date$
- */
-public class JSONRPCWireFormatProviderFactory implements WireFormatProviderFactory <JSONRPCWireFormat> {
-    private ExtensionPointRegistry extensionPoints;
-
-    public JSONRPCWireFormatProviderFactory(ExtensionPointRegistry extensionPoints) {
-        this.extensionPoints = extensionPoints;
-    }
-
-    public WireFormatProvider createReferenceWireFormatProvider(RuntimeComponent component,
-                                                                RuntimeComponentReference reference,
-                                                                Binding binding) {
-        return new JSONRPCWireFormatReferenceProvider(extensionPoints, component, reference, binding);
-    }
-
-    public WireFormatProvider createServiceWireFormatProvider(RuntimeComponent component,
-                                                              RuntimeComponentService service,
-                                                              Binding binding) {
-        return new JSONRPCWireFormatServiceProvider(extensionPoints, component, service, binding);
-    }
-
-    public Class<JSONRPCWireFormat> getModelType() {
-        return JSONRPCWireFormat.class;
-    }
-
-}
diff --git a/branches/sca-java-1.5.2/modules/binding-http-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/provider/JSONRPCWireFormatReferenceProvider.java b/branches/sca-java-1.5.2/modules/binding-http-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/provider/JSONRPCWireFormatReferenceProvider.java
deleted file mode 100644
index 932072095a..0000000000
--- a/branches/sca-java-1.5.2/modules/binding-http-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/provider/JSONRPCWireFormatReferenceProvider.java
+++ /dev/null
@@ -1,57 +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.http.wireformat.jsonrpc.provider;
-
-import org.apache.tuscany.sca.assembly.Binding;
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.interfacedef.InterfaceContract;
-import org.apache.tuscany.sca.invocation.Interceptor;
-import org.apache.tuscany.sca.invocation.Phase;
-import org.apache.tuscany.sca.provider.WireFormatProvider;
-import org.apache.tuscany.sca.runtime.RuntimeComponent;
-import org.apache.tuscany.sca.runtime.RuntimeComponentReference;
-
-/**
- * JSON-RPC Wire Format Reference Provider
- * 
- * @version $Rev$ $Date$
- */
-public class JSONRPCWireFormatReferenceProvider implements WireFormatProvider {
-
-    public JSONRPCWireFormatReferenceProvider (ExtensionPointRegistry extensionPoints,
-                                               RuntimeComponent component,
-                                               RuntimeComponentReference reference,
-                                               Binding binding) {
-
-    }
-    
-    public InterfaceContract configureWireFormatInterfaceContract(InterfaceContract interfaceContract) {
-        return null;
-    }
-
-    public Interceptor createInterceptor() {
-        return null;
-    }
-
-    public String getPhase() {
-        return Phase.REFERENCE_BINDING_WIREFORMAT;
-    }
-
-}
diff --git a/branches/sca-java-1.5.2/modules/binding-http-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/provider/JSONRPCWireFormatServiceProvider.java b/branches/sca-java-1.5.2/modules/binding-http-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/provider/JSONRPCWireFormatServiceProvider.java
deleted file mode 100644
index 1454fbdff2..0000000000
--- a/branches/sca-java-1.5.2/modules/binding-http-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/provider/JSONRPCWireFormatServiceProvider.java
+++ /dev/null
@@ -1,122 +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.http.wireformat.jsonrpc.provider;
-
-import java.util.List;
-
-import org.apache.tuscany.sca.assembly.Binding;
-import org.apache.tuscany.sca.assembly.BindingRRB;
-import org.apache.tuscany.sca.assembly.WireFormat;
-import org.apache.tuscany.sca.binding.http.HTTPBinding;
-import org.apache.tuscany.sca.binding.http.wireformat.jsonrpc.JSONRPCWireFormat;
-import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.databinding.javabeans.SimpleJavaDataBinding;
-import org.apache.tuscany.sca.databinding.json.JSONDataBinding;
-import org.apache.tuscany.sca.interfacedef.DataType;
-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.invocation.Interceptor;
-import org.apache.tuscany.sca.invocation.MessageFactory;
-import org.apache.tuscany.sca.invocation.Phase;
-import org.apache.tuscany.sca.provider.WireFormatProvider;
-import org.apache.tuscany.sca.runtime.RuntimeComponent;
-import org.apache.tuscany.sca.runtime.RuntimeComponentService;
-
-/**
- * JSON-RPC Wire Format Service Provider
- * 
- * @version $Rev$ $Date$
- */
-public class JSONRPCWireFormatServiceProvider implements WireFormatProvider {
-    private MessageFactory messageFactory;
-    
-    private RuntimeComponent component;
-    private RuntimeComponentService service;
-    private InterfaceContract serviceContract;
-    private Binding binding;
-
-    public JSONRPCWireFormatServiceProvider(ExtensionPointRegistry extensionPoints,
-                                            RuntimeComponent component, 
-                                            RuntimeComponentService service, 
-                                            Binding binding) {
-        
-
-        ModelFactoryExtensionPoint modelFactories = extensionPoints.getExtensionPoint(ModelFactoryExtensionPoint.class);
-        messageFactory = modelFactories.getFactory(MessageFactory.class);
-        
-        this.component = component;
-        this.service = service;
-        this.serviceContract = service.getInterfaceContract();
-        this.binding = binding;
-    }
-    
-    public InterfaceContract configureWireFormatInterfaceContract(InterfaceContract interfaceContract) {
-        this.serviceContract = interfaceContract;
-        
-        setDataBinding(serviceContract.getInterface());
-        
-        // Set default databinding to json
-        serviceContract.getInterface().resetDataBinding(JSONDataBinding.NAME);
-        
-        return interfaceContract;
-    }
-
-    public Interceptor createInterceptor() {
-        if(binding instanceof BindingRRB) {
-            BindingRRB rrbBinding = (BindingRRB) binding;
-            WireFormat wireFormat = rrbBinding.getRequestWireFormat();
-            if(wireFormat != null && wireFormat instanceof JSONRPCWireFormat) {
-                return new JSONRPCWireFormatInterceptor((HTTPBinding) binding, service.getRuntimeWire(binding), serviceContract, messageFactory);
-            }
-        }
-        
-        return null;
-    }
-
-    public String getPhase() {
-        return Phase.SERVICE_BINDING_WIREFORMAT;
-    }
-    
-
-    private void setDataBinding(Interface interfaze) {
-        List<Operation> operations = interfaze.getOperations();
-        for (Operation operation : operations) {
-            operation.setDataBinding(JSONDataBinding.NAME);
-            DataType<List<DataType>> inputType = operation.getInputType();
-            if (inputType != null) {
-                List<DataType> logical = inputType.getLogical();
-                for (DataType inArg : logical) {
-                    if (!SimpleJavaDataBinding.NAME.equals(inArg.getDataBinding())) {
-                        inArg.setDataBinding(JSONDataBinding.NAME);
-                    } 
-                }
-            }
-            DataType outputType = operation.getOutputType();
-            if (outputType != null) {
-                if (!SimpleJavaDataBinding.NAME.equals(outputType.getDataBinding())) {
-                    outputType.setDataBinding(JSONDataBinding.NAME);
-                }
-            }
-        }
-    }
-
-}
diff --git a/branches/sca-java-1.5.2/modules/binding-http-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/provider/JavaToSmd.java b/branches/sca-java-1.5.2/modules/binding-http-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/provider/JavaToSmd.java
deleted file mode 100644
index c67060f7b6..0000000000
--- a/branches/sca-java-1.5.2/modules/binding-http-jsonrpc-runtime/src/main/java/org/apache/tuscany/sca/binding/http/wireformat/jsonrpc/provider/JavaToSmd.java
+++ /dev/null
@@ -1,56 +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.http.wireformat.jsonrpc.provider;
-
-import java.lang.reflect.Method;
-
-/**
- * Utility class to create a Simple Method Description (SMD) descriptor
- * from a Java class. See http://dojo.jot.com/SMD.
- * 
- * TODO: Change to work from the Tuscany Interface instead of a Java class
- * 
- * @version $Rev$ $Date$
- */
-class JavaToSmd {
-    
-    static String interfaceToSmd(Class<?> klazz, String serviceUrl) {
-        String name = klazz.getSimpleName();
-        Method[] methods = klazz.getMethods();
-        
-        StringBuffer smdSb = new StringBuffer();
-        smdSb.append("{\"SMDVersion\":\".1\",\"objectName\":\"" + name + "\",\"serviceType\":\"JSON-RPC\",\"serviceURL\":\""+ serviceUrl + "\",\"methods\":[");
-        for (int i = 0; i < methods.length; i++) {
-            if (i != 0) smdSb.append(",");
-            Class<?>[] params = methods[i].getParameterTypes();            
-            smdSb.append("{\"name\":\""+methods[i].getName() + "\",\"parameters\":[");
-            for (int j = 0; j < params.length; j++) {
-                if (j != 0) smdSb.append(",");
-                // right now Dojo doesn't look at the type value, so we'll default it to STRING
-                // also, since we can't introspect the method parameter names we'll just create an incrementing parameter name
-                smdSb.append("{\"name\":\"param" + j + "\",\"type\":\"STRING\"}");  
-            }
-            smdSb.append("]}");
-        }
-        smdSb.append("]}");
-        
-        return smdSb.toString();        
-    }
-
-}