Official Tuscany 2.0.1 Release

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

21 files changed, 0 insertions, 1238 deletions

diff --git a/sca-java-2.x/tags/2.0.1-RC1/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/rest/RESTBinding.java b/sca-java-2.x/tags/2.0.1-RC1/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/rest/RESTBinding.java
deleted file mode 100644
index 6a5764edae..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/rest/RESTBinding.java
+++ /dev/null
@@ -1,64 +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.rest;
-
-import java.util.List;
-
-import javax.xml.namespace.QName;
-
-import org.apache.tuscany.sca.assembly.Binding;
-import org.apache.tuscany.sca.common.http.HTTPHeader;
-import org.apache.tuscany.sca.common.http.cors.CORS;
-
-/**
- * REST binding model.
- * 
- * @version $Rev$ $Date$
- */
-public interface RESTBinding extends Binding, CORS {
-    QName TYPE = new QName(SCA11_TUSCANY_NS, "binding.rest");
-    
-    public List<HTTPHeader> getHttpHeaders();
-
-    /**
-     * Retrieve read timeout configuration for the REST binding
-     * @return
-     */
-    public int getReadTimeout();
-    
-    /**
-     * Configure read timeout for the REST binding
-     * @param timeout
-     */
-    public void setReadTimeout(int timeout);
-    
-    /**
-     * Flag to enable CORS support on the REST binding
-     * @return
-     */
-    public boolean isCORS();
-    
-    /**
-     * Enable/Disable CORS support for the REST binding
-     * @param isCors
-     * @return
-     */
-    public void setCORS(boolean isCors);
-}
diff --git a/sca-java-2.x/tags/2.0.1-RC1/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/rest/RESTBindingFactory.java b/sca-java-2.x/tags/2.0.1-RC1/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/rest/RESTBindingFactory.java
deleted file mode 100644
index 38d68d532a..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/rest/RESTBindingFactory.java
+++ /dev/null
@@ -1,36 +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.rest;
-
-
-/**
- * Factory for the REST binding model.
- *
- * @version $Rev$ $Date$
- */
-public interface RESTBindingFactory {
-
-    /**
-     * Creates a new REST binding.
-     * @return a new REST binding
-     */
-    RESTBinding createRESTBinding();
-
-}
diff --git a/sca-java-2.x/tags/2.0.1-RC1/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/rest/impl/RESTBindingFactoryImpl.java b/sca-java-2.x/tags/2.0.1-RC1/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/rest/impl/RESTBindingFactoryImpl.java
deleted file mode 100644
index 00d5584190..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/rest/impl/RESTBindingFactoryImpl.java
+++ /dev/null
@@ -1,36 +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.rest.impl;
-
-import org.apache.tuscany.sca.binding.rest.RESTBinding;
-import org.apache.tuscany.sca.binding.rest.RESTBindingFactory;
-
-/**
- * Factory for the REST binding model.
- *
- * @version $Rev$ $Date$
- */
-public class RESTBindingFactoryImpl implements RESTBindingFactory {
-
-    public RESTBinding createRESTBinding() {
-        return new RESTBindingImpl();
-    }
-
-}
diff --git a/sca-java-2.x/tags/2.0.1-RC1/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/rest/impl/RESTBindingImpl.java b/sca-java-2.x/tags/2.0.1-RC1/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/rest/impl/RESTBindingImpl.java
deleted file mode 100644
index 29b66b2aa8..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/rest/impl/RESTBindingImpl.java
+++ /dev/null
@@ -1,141 +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.rest.impl;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.xml.namespace.QName;
-
-import org.apache.tuscany.sca.assembly.OperationSelector;
-import org.apache.tuscany.sca.assembly.WireFormat;
-import org.apache.tuscany.sca.binding.rest.RESTBinding;
-import org.apache.tuscany.sca.common.http.HTTPHeader;
-import org.apache.tuscany.sca.common.http.cors.CORSConfiguration;
-
-
-/**
- * Implementation of the HTTP binding model.
- *
- * @version $Rev$ $Date$
- */
-class RESTBindingImpl implements RESTBinding {
-
-    private String name;
-    private String uri;
-
-    private int readTimeout = 60000;
-    
-    private boolean isCORS = false;
-    private CORSConfiguration corsConfig;
-    
-    private List<HTTPHeader> httpHeaders = new ArrayList<HTTPHeader>();
-
-    private WireFormat requestWireFormat;
-    private WireFormat responseWireFormat;
-    private OperationSelector operationSelector;
-
-    public QName getType() {
-        return TYPE;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getURI() {
-        return uri;
-    }
-
-    public void setURI(String uri) {
-        this.uri = uri;
-    }
-
-    public int getReadTimeout() {
-        return readTimeout;
-    }
-
-    public void setReadTimeout(int readTimeout) {
-        this.readTimeout = readTimeout;
-    }
-    
-    public boolean isCORS() {
-        return isCORS;
-    }
-
-    public void setCORS(boolean isCORS) {
-        this.isCORS = isCORS;
-    }
-    
-    public CORSConfiguration getCORSConfiguration() {
-        return corsConfig;
-    }
-
-    public void setCORSConfiguration(CORSConfiguration corsConfig) {
-        this.corsConfig = corsConfig;
-    }
-
-    public List<HTTPHeader> getHttpHeaders() {
-        return this.httpHeaders;
-    }
-
-    public boolean isUnresolved() {
-        return false;
-    }
-
-    public void setUnresolved(boolean unresolved) {
-        // The sample binding is always resolved
-    }
-
-    // Wireformat and Operation selection
-
-    public WireFormat getRequestWireFormat() {
-        return requestWireFormat;
-    }
-
-    public void setRequestWireFormat(WireFormat wireFormat) {
-        this.requestWireFormat = wireFormat;
-    }
-
-    public WireFormat getResponseWireFormat() {
-        return responseWireFormat;
-    }
-
-    public void setResponseWireFormat(WireFormat wireFormat) {
-        this.responseWireFormat = wireFormat;
-    }
-
-    public OperationSelector getOperationSelector() {
-        return operationSelector;
-    }
-
-    public void setOperationSelector(OperationSelector operationSelector) {
-        this.operationSelector = operationSelector;
-    }
-
-    @Override
-    public Object clone() throws CloneNotSupportedException {
-        return super.clone();
-    }
-}
diff --git a/sca-java-2.x/tags/2.0.1-RC1/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/rest/operationselector/jaxrs/JAXRSOperationSelector.java b/sca-java-2.x/tags/2.0.1-RC1/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/rest/operationselector/jaxrs/JAXRSOperationSelector.java
deleted file mode 100644
index aea3dce7ae..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/rest/operationselector/jaxrs/JAXRSOperationSelector.java
+++ /dev/null
@@ -1,43 +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.rest.operationselector.jaxrs;
-
-import javax.xml.namespace.QName;
-
-import org.apache.tuscany.sca.assembly.OperationSelector;
-import org.apache.tuscany.sca.assembly.xml.Constants;
-
-/**
- * JAX_RS Operation Selector model
- * 
- * @version $Rev$ $Date$
- */
-public interface JAXRSOperationSelector extends OperationSelector {
-    /**
-     *  QName representing the REST JAX_RS Operation Selector extension
-     */
-    public static final QName REST_OPERATION_SELECTOR_JAXRS_QNAME = new QName(Constants.SCA11_TUSCANY_NS, "operationSelector.jaxrs");
-
-    /**
-     * Return the QName identifying the operation selector 
-     * @return the QName identifying the operation selector
-     */
-    QName getSchemaName();
-}
diff --git a/sca-java-2.x/tags/2.0.1-RC1/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/rest/operationselector/jaxrs/JAXRSOperationSelectorFactory.java b/sca-java-2.x/tags/2.0.1-RC1/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/rest/operationselector/jaxrs/JAXRSOperationSelectorFactory.java
deleted file mode 100644
index bdd3eca740..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/rest/operationselector/jaxrs/JAXRSOperationSelectorFactory.java
+++ /dev/null
@@ -1,35 +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.rest.operationselector.jaxrs;
-
-
-/**
- * JAX-RS Operation Selector model factory
- * 
- * @version $Rev$ $Date$
- */
-public interface JAXRSOperationSelectorFactory {
-
-    /**
-     * Create a new JAX-RS Operation Selector
-     * @return
-     */
-    JAXRSOperationSelector createJAXRSOperationSelector();
-}
diff --git a/sca-java-2.x/tags/2.0.1-RC1/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/rest/operationselector/jaxrs/impl/JAXRSOperationSelectorFactoryImpl.java b/sca-java-2.x/tags/2.0.1-RC1/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/rest/operationselector/jaxrs/impl/JAXRSOperationSelectorFactoryImpl.java
deleted file mode 100644
index c47087e660..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/rest/operationselector/jaxrs/impl/JAXRSOperationSelectorFactoryImpl.java
+++ /dev/null
@@ -1,36 +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.rest.operationselector.jaxrs.impl;
-
-import org.apache.tuscany.sca.binding.rest.operationselector.jaxrs.JAXRSOperationSelector;
-import org.apache.tuscany.sca.binding.rest.operationselector.jaxrs.JAXRSOperationSelectorFactory;
-
-/**
- * JAX-RS Operation Selector model factory implementation
- * 
- * @version $Rev$ $Date$
- */
-public class JAXRSOperationSelectorFactoryImpl implements JAXRSOperationSelectorFactory {
-
-    public JAXRSOperationSelector createJAXRSOperationSelector() {
-        return new JAXRSOperationSelectorImpl();
-    }
-
-}
diff --git a/sca-java-2.x/tags/2.0.1-RC1/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/rest/operationselector/jaxrs/impl/JAXRSOperationSelectorImpl.java b/sca-java-2.x/tags/2.0.1-RC1/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/rest/operationselector/jaxrs/impl/JAXRSOperationSelectorImpl.java
deleted file mode 100644
index ef214c3642..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/rest/operationselector/jaxrs/impl/JAXRSOperationSelectorImpl.java
+++ /dev/null
@@ -1,45 +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.rest.operationselector.jaxrs.impl;
-
-import javax.xml.namespace.QName;
-
-import org.apache.tuscany.sca.binding.rest.operationselector.jaxrs.JAXRSOperationSelector;
-
-
-/**
- * JAX-RS Operation Selector model implementation
- * 
- * @version $Rev$ $Date$
- */
-public class JAXRSOperationSelectorImpl implements JAXRSOperationSelector {
-
-    public QName getSchemaName() {
-        return JAXRSOperationSelector.REST_OPERATION_SELECTOR_JAXRS_QNAME;
-    }
-
-    public boolean isUnresolved() {
-        return false;
-    }
-
-    public void setUnresolved(boolean unresolved) {
-        
-    }
-}
diff --git a/sca-java-2.x/tags/2.0.1-RC1/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/rest/operationselector/rpc/RPCOperationSelector.java b/sca-java-2.x/tags/2.0.1-RC1/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/rest/operationselector/rpc/RPCOperationSelector.java
deleted file mode 100644
index 7730a1e75e..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/rest/operationselector/rpc/RPCOperationSelector.java
+++ /dev/null
@@ -1,43 +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.rest.operationselector.rpc;
-
-import javax.xml.namespace.QName;
-
-import org.apache.tuscany.sca.assembly.OperationSelector;
-import org.apache.tuscany.sca.assembly.xml.Constants;
-
-/**
- * RPC Operation Selector model
- * 
- * @version $Rev$ $Date$
- */
-public interface RPCOperationSelector extends OperationSelector {
-    /**
-     *  QName representing the RPC Operation Selector extension
-     */
-    public static final QName REST_OPERATION_SELECTOR_RPC_QNAME = new QName(Constants.SCA11_TUSCANY_NS, "operationSelector.rpc");
-
-    /**
-     * Return the QName identifying the operation selector 
-     * @return the QName identifying the operation selector
-     */
-    QName getSchemaName();
-}
diff --git a/sca-java-2.x/tags/2.0.1-RC1/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/rest/operationselector/rpc/RPCOperationSelectorFactory.java b/sca-java-2.x/tags/2.0.1-RC1/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/rest/operationselector/rpc/RPCOperationSelectorFactory.java
deleted file mode 100644
index 27a56c374d..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/rest/operationselector/rpc/RPCOperationSelectorFactory.java
+++ /dev/null
@@ -1,35 +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.rest.operationselector.rpc;
-
-
-/**
- * RPC Operation Selector model factory
- * 
- * @version $Rev$ $Date$
- */
-public interface RPCOperationSelectorFactory {
-
-    /**
-     * Create a new RPC Operation Selector
-     * @return
-     */
-    RPCOperationSelector createRPCOperationSelector();
-}
diff --git a/sca-java-2.x/tags/2.0.1-RC1/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/rest/operationselector/rpc/impl/RPCOperationSelectorFactoryImpl.java b/sca-java-2.x/tags/2.0.1-RC1/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/rest/operationselector/rpc/impl/RPCOperationSelectorFactoryImpl.java
deleted file mode 100644
index 9e67f35bc0..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/rest/operationselector/rpc/impl/RPCOperationSelectorFactoryImpl.java
+++ /dev/null
@@ -1,36 +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.rest.operationselector.rpc.impl;
-
-import org.apache.tuscany.sca.binding.rest.operationselector.rpc.RPCOperationSelector;
-import org.apache.tuscany.sca.binding.rest.operationselector.rpc.RPCOperationSelectorFactory;
-
-/**
- * RPC Operation Selector model factory implementation
- * 
- * @version $Rev$ $Date$
- */
-public class RPCOperationSelectorFactoryImpl implements RPCOperationSelectorFactory {
-
-    public RPCOperationSelector createRPCOperationSelector() {
-        return new RPCOperationSelectorImpl();
-    }
-
-}
diff --git a/sca-java-2.x/tags/2.0.1-RC1/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/rest/operationselector/rpc/impl/RPCOperationSelectorImpl.java b/sca-java-2.x/tags/2.0.1-RC1/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/rest/operationselector/rpc/impl/RPCOperationSelectorImpl.java
deleted file mode 100644
index bca8218f8d..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/rest/operationselector/rpc/impl/RPCOperationSelectorImpl.java
+++ /dev/null
@@ -1,45 +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.rest.operationselector.rpc.impl;
-
-import javax.xml.namespace.QName;
-
-import org.apache.tuscany.sca.binding.rest.operationselector.rpc.RPCOperationSelector;
-
-
-/**
- * RPC Operation Selector model implementation
- * 
- * @version $Rev$ $Date$
- */
-public class RPCOperationSelectorImpl implements RPCOperationSelector {
-
-    public QName getSchemaName() {
-        return RPCOperationSelector.REST_OPERATION_SELECTOR_RPC_QNAME;
-    }
-
-    public boolean isUnresolved() {
-        return false;
-    }
-
-    public void setUnresolved(boolean unresolved) {
-        
-    }
-}
diff --git a/sca-java-2.x/tags/2.0.1-RC1/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/rest/wireformat/json/JSONWireFormat.java b/sca-java-2.x/tags/2.0.1-RC1/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/rest/wireformat/json/JSONWireFormat.java
deleted file mode 100644
index d9136da58e..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/rest/wireformat/json/JSONWireFormat.java
+++ /dev/null
@@ -1,43 +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.rest.wireformat.json;
-
-import javax.xml.namespace.QName;
-
-import org.apache.tuscany.sca.assembly.WireFormat;
-
-/**
- * JSON Wireformat model for REST Binding
- * 
- * @version $Rev$ $Date$
- */
-public interface JSONWireFormat extends WireFormat {
-
-    /**
-     *  QName representing the JSON Wireformat for REST Binding 
-     */
-    public static final QName REST_WIREFORMAT_JSON_QNAME = new QName(SCA11_TUSCANY_NS, "wireFormat.json");
-    
-    /**
-     * Return the QName identifying the wire format 
-     * @return the QName identifying the wire format
-     */
-    QName getSchemaName();
-}
diff --git a/sca-java-2.x/tags/2.0.1-RC1/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/rest/wireformat/json/JSONWireFormatFactory.java b/sca-java-2.x/tags/2.0.1-RC1/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/rest/wireformat/json/JSONWireFormatFactory.java
deleted file mode 100644
index f297320b39..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/rest/wireformat/json/JSONWireFormatFactory.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 org.apache.tuscany.sca.binding.rest.wireformat.json;
-
-/**
- * JSON Wireformat factory for REST Binding
- * 
- * @version $Rev$ $Date$
- */
-public interface JSONWireFormatFactory {
-
-    /**
-     * Create a new JSON wireformat for REST Binding
-     * @return the new JSON wire format
-     */
-    JSONWireFormat createRESTWireFormatJSON();
-}
diff --git a/sca-java-2.x/tags/2.0.1-RC1/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/rest/wireformat/json/impl/JSONWireFormatFactoryImpl.java b/sca-java-2.x/tags/2.0.1-RC1/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/rest/wireformat/json/impl/JSONWireFormatFactoryImpl.java
deleted file mode 100644
index 0ddeb8e557..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/rest/wireformat/json/impl/JSONWireFormatFactoryImpl.java
+++ /dev/null
@@ -1,36 +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.rest.wireformat.json.impl;
-
-import org.apache.tuscany.sca.binding.rest.wireformat.json.JSONWireFormat;
-import org.apache.tuscany.sca.binding.rest.wireformat.json.JSONWireFormatFactory;
-
-/**
- * JSON Wireformat factory implementation for REST Binding
- * 
- * @version $Rev$ $Date$
- */
-public class JSONWireFormatFactoryImpl implements JSONWireFormatFactory {
-
-    public JSONWireFormat createRESTWireFormatJSON() {
-        return new JSONWireFormatImpl();
-    }
-
-}
diff --git a/sca-java-2.x/tags/2.0.1-RC1/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/rest/wireformat/json/impl/JSONWireFormatImpl.java b/sca-java-2.x/tags/2.0.1-RC1/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/rest/wireformat/json/impl/JSONWireFormatImpl.java
deleted file mode 100644
index 0588477e79..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/rest/wireformat/json/impl/JSONWireFormatImpl.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.rest.wireformat.json.impl;
-
-import javax.xml.namespace.QName;
-
-import org.apache.tuscany.sca.binding.rest.wireformat.json.JSONWireFormat;
-
-/**
- * JSON Wireformat implementation for REST Binding
- *
- * @version $Rev$ $Date$
- */
-public class JSONWireFormatImpl implements JSONWireFormat {
-
-    public QName getSchemaName() {
-        return JSONWireFormat.REST_WIREFORMAT_JSON_QNAME;
-    }
-
-    public boolean isUnresolved() {
-        return false;
-    }
-
-    public void setUnresolved(boolean unresolved) {
-        // no op
-    }
-
-    public String toString() {
-        return "application/json";
-    }
-}
diff --git a/sca-java-2.x/tags/2.0.1-RC1/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/rest/wireformat/xml/XMLWireFormat.java b/sca-java-2.x/tags/2.0.1-RC1/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/rest/wireformat/xml/XMLWireFormat.java
deleted file mode 100644
index 7eff067cdc..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/rest/wireformat/xml/XMLWireFormat.java
+++ /dev/null
@@ -1,43 +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.rest.wireformat.xml;
-
-import javax.xml.namespace.QName;
-
-import org.apache.tuscany.sca.assembly.WireFormat;
-
-/**
- * XML Wireformat model for REST Binding
- * 
- * @version $Rev$ $Date$
- */
-public interface XMLWireFormat extends WireFormat {
-
-    /**
-     *  QName representing the XML Wireformat for REST Binding 
-     */
-    public static final QName REST_WIREFORMAT_XML_QNAME = new QName(SCA11_TUSCANY_NS, "wireFormat.xml");
-    
-    /**
-     * Return the QName identifying the wire format 
-     * @return the QName identifying the wire format
-     */
-    QName getSchemaName();
-}
diff --git a/sca-java-2.x/tags/2.0.1-RC1/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/rest/wireformat/xml/XMLWireFormatFactory.java b/sca-java-2.x/tags/2.0.1-RC1/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/rest/wireformat/xml/XMLWireFormatFactory.java
deleted file mode 100644
index 82d9ad6132..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/rest/wireformat/xml/XMLWireFormatFactory.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 org.apache.tuscany.sca.binding.rest.wireformat.xml;
-
-/**
- * XML Wireformat factory for REST Binding
- * 
- * @version $Rev$ $Date$
- */
-public interface XMLWireFormatFactory {
-
-    /**
-     * Create a new XML wireformat for REST Binding
-     * @return the new XML wire format
-     */
-    XMLWireFormat createRESTWireFormatXML();
-}
diff --git a/sca-java-2.x/tags/2.0.1-RC1/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/rest/wireformat/xml/impl/XMLWireFormatFactoryImpl.java b/sca-java-2.x/tags/2.0.1-RC1/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/rest/wireformat/xml/impl/XMLWireFormatFactoryImpl.java
deleted file mode 100644
index b6fd3d6aed..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/rest/wireformat/xml/impl/XMLWireFormatFactoryImpl.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-
-package org.apache.tuscany.sca.binding.rest.wireformat.xml.impl;
-
-import org.apache.tuscany.sca.binding.rest.wireformat.xml.XMLWireFormat;
-
-import org.apache.tuscany.sca.binding.rest.wireformat.xml.XMLWireFormatFactory;
-
-/**
- * XML Wireformat factory implementation for REST Binding
- * 
- * @version $Rev$ $Date$
- */
-public class XMLWireFormatFactoryImpl implements XMLWireFormatFactory {
-
-    public XMLWireFormat createRESTWireFormatXML() {
-        return new XMLWireFormatImpl();
-    }
-
-}
diff --git a/sca-java-2.x/tags/2.0.1-RC1/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/rest/wireformat/xml/impl/XMLWireFormatImpl.java b/sca-java-2.x/tags/2.0.1-RC1/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/rest/wireformat/xml/impl/XMLWireFormatImpl.java
deleted file mode 100644
index c4199081c9..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/rest/wireformat/xml/impl/XMLWireFormatImpl.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.rest.wireformat.xml.impl;
-
-import javax.xml.namespace.QName;
-
-import org.apache.tuscany.sca.binding.rest.wireformat.xml.XMLWireFormat;
-
-/**
- * XML Wireformat implementation for REST Binding
- *
- * @version $Rev$ $Date$
- */
-public class XMLWireFormatImpl implements XMLWireFormat {
-
-    public QName getSchemaName() {
-        return XMLWireFormat.REST_WIREFORMAT_XML_QNAME;
-    }
-
-    public boolean isUnresolved() {
-        return false;
-    }
-
-    public void setUnresolved(boolean unresolved) {
-        // no op
-    }
-
-    public String toString() {
-        return "application/xml";
-    }
-}
diff --git a/sca-java-2.x/tags/2.0.1-RC1/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/rest/xml/RESTBindingProcessor.java b/sca-java-2.x/tags/2.0.1-RC1/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/rest/xml/RESTBindingProcessor.java
deleted file mode 100644
index 0e8b352a2a..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/modules/binding-rest/src/main/java/org/apache/tuscany/sca/binding/rest/xml/RESTBindingProcessor.java
+++ /dev/null
@@ -1,320 +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.rest.xml;
-
-import static javax.xml.stream.XMLStreamConstants.END_ELEMENT;
-import static javax.xml.stream.XMLStreamConstants.START_ELEMENT;
-
-import javax.xml.namespace.QName;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamReader;
-import javax.xml.stream.XMLStreamWriter;
-
-import org.apache.tuscany.sca.assembly.Base;
-import org.apache.tuscany.sca.assembly.OperationSelector;
-import org.apache.tuscany.sca.assembly.WireFormat;
-import org.apache.tuscany.sca.binding.rest.RESTBinding;
-import org.apache.tuscany.sca.binding.rest.RESTBindingFactory;
-import org.apache.tuscany.sca.binding.rest.operationselector.jaxrs.JAXRSOperationSelector;
-import org.apache.tuscany.sca.binding.rest.operationselector.jaxrs.JAXRSOperationSelectorFactory;
-import org.apache.tuscany.sca.binding.rest.operationselector.rpc.RPCOperationSelector;
-import org.apache.tuscany.sca.binding.rest.operationselector.rpc.RPCOperationSelectorFactory;
-import org.apache.tuscany.sca.binding.rest.wireformat.json.JSONWireFormat;
-import org.apache.tuscany.sca.binding.rest.wireformat.json.JSONWireFormatFactory;
-import org.apache.tuscany.sca.binding.rest.wireformat.xml.XMLWireFormat;
-import org.apache.tuscany.sca.binding.rest.wireformat.xml.XMLWireFormatFactory;
-import org.apache.tuscany.sca.common.http.HTTPHeader;
-import org.apache.tuscany.sca.common.http.cors.CORSConfiguration;
-import org.apache.tuscany.sca.contribution.processor.BaseStAXArtifactProcessor;
-import org.apache.tuscany.sca.contribution.processor.ContributionReadException;
-import org.apache.tuscany.sca.contribution.processor.ContributionResolveException;
-import org.apache.tuscany.sca.contribution.processor.ContributionWriteException;
-import org.apache.tuscany.sca.contribution.processor.ProcessorContext;
-import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;
-import org.apache.tuscany.sca.contribution.processor.StAXAttributeProcessor;
-import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.core.FactoryExtensionPoint;
-
-/**
- * REST Binding Artifact Processor
- *
- * @version $Rev$ $Date$
- */
-public class RESTBindingProcessor extends BaseStAXArtifactProcessor implements StAXArtifactProcessor<RESTBinding> {
-    private static final QName HEADERS_QNAME = new QName(Base.SCA11_TUSCANY_NS, "http-headers");
-    private static final QName HEADER_QNAME = new QName(Base.SCA11_TUSCANY_NS, "header");
-    private static final QName RESPONSE_QNAME = new QName(Base.SCA11_TUSCANY_NS, "response");
-
-    private static final QName WIRE_FORMAT_JSON = new QName(Base.SCA11_TUSCANY_NS, "wireFormat.json");
-    private static final QName WIRE_FORMAT_XML = new QName(Base.SCA11_TUSCANY_NS, "wireFormat.xml");
-    
-    private static final QName OPERATION_SELCTOR_RPC = new QName(Base.SCA11_TUSCANY_NS, "operationSelector.rpc");
-    private static final QName OPERATION_SELCTOR_JAXRS = new QName(Base.SCA11_TUSCANY_NS, "operationSelector.jaxrs");
-    
-    private static final String NAME = "name";
-    private static final String VALUE = "value";
-    private static final String URI = "uri";
-    private static final String READ_TIMEOUT = "readTimeout";
-    private static final String CORS ="isCORS";
-
-    private RESTBindingFactory restBindingFactory;
-    private JSONWireFormatFactory jsonWireFormatFactory;
-    private XMLWireFormatFactory xmlWireFormatFactory;
-    private JAXRSOperationSelectorFactory jaxrsOperationSelectorFactory;
-    private RPCOperationSelectorFactory rpcOperationSelectorFactory;
-    
-    private StAXArtifactProcessor<Object> extensionProcessor;
-
-    public RESTBindingProcessor(ExtensionPointRegistry extensionPoints,
-                                StAXArtifactProcessor<Object> extensionProcessor,
-                                StAXAttributeProcessor<Object> extensionAttributeProcessor) {
-        FactoryExtensionPoint modelFactories = extensionPoints.getExtensionPoint(FactoryExtensionPoint.class);
-        this.restBindingFactory = modelFactories.getFactory(RESTBindingFactory.class);
-        this.jsonWireFormatFactory = modelFactories.getFactory(JSONWireFormatFactory.class);
-        this.xmlWireFormatFactory = modelFactories.getFactory(XMLWireFormatFactory.class);
-        this.jaxrsOperationSelectorFactory = modelFactories.getFactory(JAXRSOperationSelectorFactory.class);
-        this.rpcOperationSelectorFactory = modelFactories.getFactory(RPCOperationSelectorFactory.class);
-        
-        this.extensionProcessor = (StAXArtifactProcessor<Object>)extensionProcessor;
-    }
-
-    public QName getArtifactType() {
-        return RESTBinding.TYPE;
-    }
-
-    public Class<RESTBinding> getModelType() {
-        return RESTBinding.class;
-    }
-
-    public RESTBinding read(XMLStreamReader reader, ProcessorContext context) throws ContributionReadException, XMLStreamException {
-        RESTBinding restBinding = restBindingFactory.createRESTBinding();
-
-        /**
-         *    <tuscany:binding.rest uri="http://localhost:8085/Customer" readTimeout="60000">
-         *          <tuscany:wireFormat.xml />
-         *          <tuscany:operationSelector.jaxrs />
-         *          <tuscany:http-headers>
-         *             <tuscany:header name="Cache-Control" value="no-cache"/>
-         *             <tuscany:header name="Expires" value="-1"/>
-         *          </tuscany:http-headers>
-         *          <tuscany:response>
-         *             <tuscany:wireFormat.json />
-         *          </tuscany:response>
-         *   </tuscany:binding.rest>
-         *
-         */
-        while(reader.hasNext()) {
-            QName elementName = null;
-            int event = reader.getEventType();
-            switch (event) {
-                case START_ELEMENT:
-                    elementName = reader.getName();
-
-                    if(RESTBinding.TYPE.equals(elementName)) {
-
-                        // binding attributes
-                        String name = getString(reader, NAME);
-                        if(name != null) {
-                            restBinding.setName(name);
-                        }
-
-                        String uri = getURIString(reader, URI);
-                        if (uri != null) {
-                            restBinding.setURI(uri);
-                        }
-                        
-                        String readTimeout = getString(reader, READ_TIMEOUT);
-                        if (readTimeout != null) {
-                            restBinding.setReadTimeout(Integer.valueOf(readTimeout));
-                        }
-                        
-                        Boolean isCORS = getBoolean(reader, CORS);
-                        if(isCORS != null) {
-                            restBinding.setCORS(isCORS);
-                        }
-                        
-                        break;
-
-                    } else if (HEADERS_QNAME.equals(elementName)) {
-
-                        // ignore wrapper element
-                        break;
-
-                    } else if (HEADER_QNAME.equals(elementName)) {
-
-                        // header name/value pair
-                        String name = getString(reader, NAME);
-                        String value = getURIString(reader, VALUE);
-
-                        if(name != null) {
-                            restBinding.getHttpHeaders().add(new HTTPHeader(name, value));
-                        }
-                        break;
-
-                    } else if (RESPONSE_QNAME.equals(elementName)) {
-
-                     // skip response
-                        reader.next();
-                        // and position to the next start_element event
-                        while (reader.hasNext()) {
-                            int sub_event = reader.getEventType();
-                            switch (sub_event) {
-                                case START_ELEMENT:
-                                    elementName = reader.getName();
-                                    break;
-                                default: reader.next();
-                            }
-                            break;
-                        }
-
-                        // dispatch to read wire format for the response
-                        //Object extension = extensionProcessor.read(reader, context);
-                        Object extension = readWireFormatAndOperationSelectorExtensions(reader);
-                        if (extension != null) {
-                            if (extension instanceof WireFormat) {
-                                restBinding.setResponseWireFormat((WireFormat)extension);
-                            }
-                        }
-                        break;
-                    } else if(WIRE_FORMAT_JSON.equals(elementName) || WIRE_FORMAT_XML.equals(elementName)  ||
-                              OPERATION_SELCTOR_JAXRS.equals(elementName) || OPERATION_SELCTOR_RPC.equals(elementName)) {
-
-                        // Read wireFormat and/or operationSelector extension elements
-                        Object extension = readWireFormatAndOperationSelectorExtensions(reader);
-                        if (extension != null) {
-                            if (extension instanceof WireFormat) {
-                                restBinding.setRequestWireFormat((WireFormat)extension);
-                                restBinding.setResponseWireFormat((WireFormat)extension);
-                            } else if(extension instanceof OperationSelector) {
-                                restBinding.setOperationSelector((OperationSelector)extension);
-                                restBinding.setCORS(true);
-                            }
-                        }
-                        break;
-
-                        
-                    } else {
-                        // Read an extension element
-                        Object extension = extensionProcessor.read(reader, context);
-                        if (extension != null) {
-                            if (extension instanceof CORSConfiguration) {
-                                restBinding.setCORSConfiguration((CORSConfiguration)extension);
-                            }
-                        }
-                        break;
-                    }
-
-                case END_ELEMENT:
-                    elementName = reader.getName();
-
-                    if(RESTBinding.TYPE.equals(elementName)) {
-                        return restBinding;
-                    }
-                    break;
-            }
-
-
-
-            // Read the next element
-            if (reader.hasNext()) {
-                reader.next();
-            }
-        }
-
-        return restBinding;
-    }
-
-
-    public void write(RESTBinding restBinding, XMLStreamWriter writer, ProcessorContext context) throws ContributionWriteException, XMLStreamException {
-
-        writeStart(writer, RESTBinding.TYPE.getNamespaceURI(), RESTBinding.TYPE.getLocalPart());
-
-        // Write binding name
-        if (restBinding.getName() != null) {
-            writer.writeAttribute(NAME, restBinding.getName());
-        }
-
-        // Write binding URI
-        if (restBinding.getURI() != null) {
-            writer.writeAttribute(URI, restBinding.getURI());
-        }
-
-        // Write operation selectors
-        if ( restBinding.getOperationSelector() != null ) {
-            writeWireFormatAndOperationSelectorExtensions(writer, restBinding.getOperationSelector());
-        }
-
-        // Write wire formats
-        if ( restBinding.getRequestWireFormat() != null ) {
-            writeWireFormatAndOperationSelectorExtensions(writer, restBinding.getRequestWireFormat());
-        }
-
-        if ( restBinding.getResponseWireFormat() != null && restBinding.getRequestWireFormat() != restBinding.getResponseWireFormat()) {
-            writeStart(writer, RESPONSE_QNAME.getNamespaceURI(), RESPONSE_QNAME.getLocalPart());
-            if(restBinding.getResponseWireFormat() != null) {
-                writeWireFormatAndOperationSelectorExtensions(writer, restBinding.getResponseWireFormat());
-            }
-            writeEnd(writer);
-        }
-
-
-        writeEnd(writer);
-    }
-
-
-    public void resolve(RESTBinding model, ModelResolver resolver, ProcessorContext context) throws ContributionResolveException {
-        // Should not need to do anything here for now...
-
-    }
-
-    private Object readWireFormatAndOperationSelectorExtensions(XMLStreamReader reader)  throws XMLStreamException {
-        QName elementName = reader.getName();
-        
-        if(WIRE_FORMAT_JSON.equals(elementName)) {
-            return this.jsonWireFormatFactory.createRESTWireFormatJSON();
-        } else if(WIRE_FORMAT_XML.equals(elementName)) {
-            return this.xmlWireFormatFactory.createRESTWireFormatXML();
-        } else if(OPERATION_SELCTOR_JAXRS.equals(elementName)) {
-            return this.jaxrsOperationSelectorFactory.createJAXRSOperationSelector();
-        } else if(OPERATION_SELCTOR_RPC.equals(elementName)) {
-            return this.rpcOperationSelectorFactory.createRPCOperationSelector();
-        }
-        
-        return null;
-    }
-    
-    private void writeWireFormatAndOperationSelectorExtensions(XMLStreamWriter writer, Object object) throws XMLStreamException {
-        
-        if(object instanceof JSONWireFormat) {
-            writeStart(writer, WIRE_FORMAT_JSON.getNamespaceURI(), WIRE_FORMAT_JSON.getLocalPart());
-            writeEnd(writer);
-        } else if (object instanceof XMLWireFormat) {
-            writeStart(writer, WIRE_FORMAT_XML.getNamespaceURI(), WIRE_FORMAT_XML.getLocalPart());
-            writeEnd(writer);
-        } else if (object instanceof JAXRSOperationSelector) {
-            writeStart(writer, OPERATION_SELCTOR_JAXRS.getNamespaceURI(), OPERATION_SELCTOR_JAXRS.getLocalPart());
-            writeEnd(writer);
-        } else if (object instanceof RPCOperationSelector) {
-            writeStart(writer, OPERATION_SELCTOR_RPC.getNamespaceURI(), OPERATION_SELCTOR_RPC.getLocalPart());
-            writeEnd(writer);
-        }        
-    }
-}