Delete old beta3 branch as its going to be recreated from the current trunk

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

13 files changed, 0 insertions, 726 deletions

diff --git a/sca-java-2.x/branches/2.0-Beta3/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/HTTPBinding.java b/sca-java-2.x/branches/2.0-Beta3/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/HTTPBinding.java
deleted file mode 100644
index e0ab1cfff7..0000000000
--- a/sca-java-2.x/branches/2.0-Beta3/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/HTTPBinding.java
+++ /dev/null
@@ -1,33 +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;
-
-import javax.xml.namespace.QName;
-
-import org.apache.tuscany.sca.assembly.Binding;
-
-/**
- * HTTP binding model.
- * 
- * @version $Rev$ $Date$
-*/
-public interface HTTPBinding extends Binding {
-    QName TYPE = new QName(SCA11_TUSCANY_NS, "binding.http");
-}
diff --git a/sca-java-2.x/branches/2.0-Beta3/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/HTTPBindingFactory.java b/sca-java-2.x/branches/2.0-Beta3/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/HTTPBindingFactory.java
deleted file mode 100644
index 6ba6d8f934..0000000000
--- a/sca-java-2.x/branches/2.0-Beta3/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/HTTPBindingFactory.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.http;
-
-/**
- * Factory for the HTTP binding model.
- *
- * @version $Rev$ $Date$
- */
-public interface HTTPBindingFactory {
-
-    /**
-     * Creates a new HTTP binding.
-     * @return a new HTTP binding
-     */
-    HTTPBinding createHTTPBinding();
-
-}
diff --git a/sca-java-2.x/branches/2.0-Beta3/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/HTTPDefaultOperationSelector.java b/sca-java-2.x/branches/2.0-Beta3/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/HTTPDefaultOperationSelector.java
deleted file mode 100644
index a77774356f..0000000000
--- a/sca-java-2.x/branches/2.0-Beta3/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/HTTPDefaultOperationSelector.java
+++ /dev/null
@@ -1,39 +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;

-

-import javax.xml.namespace.QName;

-

-import org.apache.tuscany.sca.assembly.OperationSelector;

-import org.apache.tuscany.sca.assembly.xml.Constants;

-

-public class HTTPDefaultOperationSelector implements OperationSelector {

-    public static final QName OPERATION_SELECTOR_HTTP_DEFAULT_QNAME = new QName(Constants.SCA11_NS, "operationSelector.httpDefault");

-    

-    public QName getSchemaName() {

-        return OPERATION_SELECTOR_HTTP_DEFAULT_QNAME;

-    }

-

-    public boolean isUnresolved() {

-        return false;

-    }

-

-    public void setUnresolved(boolean unresolved) {

-    }

-}

diff --git a/sca-java-2.x/branches/2.0-Beta3/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/HTTPDefaultWireFormat.java b/sca-java-2.x/branches/2.0-Beta3/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/HTTPDefaultWireFormat.java
deleted file mode 100644
index e3ff891a32..0000000000
--- a/sca-java-2.x/branches/2.0-Beta3/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/HTTPDefaultWireFormat.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.http;

-

-import javax.xml.namespace.QName;

-

-import org.apache.tuscany.sca.assembly.WireFormat;

-import org.apache.tuscany.sca.assembly.xml.Constants;

-

-/**

- * Implementation for policies that could be injected as parameter

- * into the axis2config.

- *

- * @version $Rev: 813442 $ $Date: 2009-09-10 14:56:17 +0100 (Thu, 10 Sep 2009) $

- */

-public class HTTPDefaultWireFormat implements WireFormat {

-    public static final QName WIRE_FORMAT_HTTP_DEFAULT_QNAME = new QName(Constants.SCA11_TUSCANY_NS, "wireFormat.httpDefault");

-    

-    public QName getSchemaName() {

-        return WIRE_FORMAT_HTTP_DEFAULT_QNAME;

-    }

-

-    public boolean isUnresolved() {

-        return false;

-    }

-

-    public void setUnresolved(boolean unresolved) {

-    }

-}

diff --git a/sca-java-2.x/branches/2.0-Beta3/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/HTTPXMLWireFormat.java b/sca-java-2.x/branches/2.0-Beta3/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/HTTPXMLWireFormat.java
deleted file mode 100644
index a616c15ee6..0000000000
--- a/sca-java-2.x/branches/2.0-Beta3/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/HTTPXMLWireFormat.java
+++ /dev/null
@@ -1,39 +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;

-

-import javax.xml.namespace.QName;

-

-import org.apache.tuscany.sca.assembly.WireFormat;

-import org.apache.tuscany.sca.assembly.xml.Constants;

-

-public class HTTPXMLWireFormat implements WireFormat {

-    public static final QName WIRE_FORMAT_HTTP_XML_QNAME = new QName(Constants.SCA11_TUSCANY_NS, "wireFormat.httpXml");

-    

-    public QName getSchemaName() {

-        return WIRE_FORMAT_HTTP_XML_QNAME;

-    }

-

-    public boolean isUnresolved() {

-        return false;

-    }

-

-    public void setUnresolved(boolean unresolved) {

-    }

-}

diff --git a/sca-java-2.x/branches/2.0-Beta3/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/impl/HTTPBindingFactoryImpl.java b/sca-java-2.x/branches/2.0-Beta3/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/impl/HTTPBindingFactoryImpl.java
deleted file mode 100644
index 678cd1a426..0000000000
--- a/sca-java-2.x/branches/2.0-Beta3/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/impl/HTTPBindingFactoryImpl.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.http.impl;
-
-import org.apache.tuscany.sca.binding.http.HTTPBinding;
-import org.apache.tuscany.sca.binding.http.HTTPBindingFactory;
-
-/**
- * Factory for the HTTP binding model.
- *
- * @version $Rev$ $Date$
- */
-public class HTTPBindingFactoryImpl implements HTTPBindingFactory {
-
-    public HTTPBinding createHTTPBinding() {
-        return new HTTPBindingImpl();
-    }
-
-}
diff --git a/sca-java-2.x/branches/2.0-Beta3/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/impl/HTTPBindingImpl.java b/sca-java-2.x/branches/2.0-Beta3/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/impl/HTTPBindingImpl.java
deleted file mode 100644
index d83d9b9fbc..0000000000
--- a/sca-java-2.x/branches/2.0-Beta3/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/impl/HTTPBindingImpl.java
+++ /dev/null
@@ -1,103 +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.impl;
-
-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.http.HTTPBinding;
-
-
-/**
- * Implementation of the HTTP binding model.
- * 
- * @version $Rev$ $Date$
- */
-public class HTTPBindingImpl implements HTTPBinding {
-
-    private String name;
-    private String uri;
-
-    private WireFormat wireFormat;
-    private OperationSelector operationSelector;    
-    
-    public HTTPBindingImpl() {
-    }
-
-    public QName getType() {
-        return TYPE;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public String getURI() {
-        return uri;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public void setURI(String uri) {
-        this.uri = uri;
-    }
-
-    public boolean isUnresolved() {
-        return false;
-    }
-
-    public void setUnresolved(boolean unresolved) {
-        // The sample binding is always resolved
-    }
-
-    // Wireformat and Operation selection
-
-    public WireFormat getRequestWireFormat() {
-        return wireFormat;
-    }
-
-    public void setRequestWireFormat(WireFormat wireFormat) {
-        this.wireFormat = wireFormat;
-    }
-
-    public WireFormat getResponseWireFormat() {
-        return wireFormat;
-    }
-
-    public void setResponseWireFormat(WireFormat wireFormat) {
-        this.wireFormat = 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/branches/2.0-Beta3/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/xml/HTTPBindingProcessor.java b/sca-java-2.x/branches/2.0-Beta3/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/xml/HTTPBindingProcessor.java
deleted file mode 100644
index bdec50bde0..0000000000
--- a/sca-java-2.x/branches/2.0-Beta3/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/xml/HTTPBindingProcessor.java
+++ /dev/null
@@ -1,142 +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.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.OperationSelector;
-import org.apache.tuscany.sca.assembly.WireFormat;
-import org.apache.tuscany.sca.binding.http.HTTPBinding;
-import org.apache.tuscany.sca.binding.http.HTTPBindingFactory;
-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;
-
-public class HTTPBindingProcessor extends BaseStAXArtifactProcessor implements StAXArtifactProcessor<HTTPBinding> {
-    private static final String NAME = "name";
-    private static final String URI = "uri";
-
-    private HTTPBindingFactory httpBindingFactory;
-    private StAXArtifactProcessor<Object> extensionProcessor;
-    private StAXAttributeProcessor<Object> extensionAttributeProcessor;
-    
-
-    public HTTPBindingProcessor(ExtensionPointRegistry extensionPoints, 
-                                StAXArtifactProcessor extensionProcessor,
-                                StAXAttributeProcessor extensionAttributeProcessor) {
-        FactoryExtensionPoint modelFactories = extensionPoints.getExtensionPoint(FactoryExtensionPoint.class);
-        this.httpBindingFactory = modelFactories.getFactory(HTTPBindingFactory.class);
-        this.extensionProcessor = (StAXArtifactProcessor<Object>)extensionProcessor;
-        this.extensionAttributeProcessor = extensionAttributeProcessor;
-    }
-
-    public QName getArtifactType() {
-        return HTTPBinding.TYPE;
-    }
-
-    public Class<HTTPBinding> getModelType() {
-        return HTTPBinding.class;
-    }
-
-    public HTTPBinding read(XMLStreamReader reader, ProcessorContext context) throws ContributionReadException, XMLStreamException {
-        HTTPBinding httpBinding = httpBindingFactory.createHTTPBinding();
-
-        while(reader.hasNext()) {
-            QName elementName = null;
-            int event = reader.getEventType();
-            switch (event) {
-                case START_ELEMENT:
-                    elementName = reader.getName();
-
-                    if (HTTPBinding.TYPE.equals(elementName)) {
-                        String name = getString(reader, NAME);
-                        if(name != null) {
-                            httpBinding.setName(name);
-                        }
-
-                        String uri = getURIString(reader, URI);
-                        if (uri != null) {
-                            httpBinding.setURI(uri);
-                        }
-                    } else {
-                        // Read an extension element
-                        Object extension = extensionProcessor.read(reader, context);
-                        if (extension != null) {
-                            if (extension instanceof WireFormat) {
-                                httpBinding.setRequestWireFormat((WireFormat)extension);
-                            } else if(extension instanceof OperationSelector) {
-                                httpBinding.setOperationSelector((OperationSelector)extension);
-                            }
-                        }
-                    }
-            }
-
-            if (event == END_ELEMENT && HTTPBinding.TYPE.equals(reader.getName())) {
-                break;
-            }
-
-            // Read the next element
-            if (reader.hasNext()) {
-                reader.next();
-            }
-        }
-
-        return httpBinding;
-    }
-
-    public void write(HTTPBinding httpBinding, XMLStreamWriter writer, ProcessorContext context) throws ContributionWriteException, XMLStreamException {
-        //writer.writeStartElement(Constants.SCA10_NS, BINDING_HTTP);
-
-        writeStart(writer, HTTPBinding.TYPE.getNamespaceURI(), HTTPBinding.TYPE.getLocalPart());
-
-        // Write binding name
-        if (httpBinding.getName() != null) {
-            writer.writeAttribute(NAME, httpBinding.getName());
-        }
-
-        // Write binding URI
-        if (httpBinding.getURI() != null) {
-            writer.writeAttribute(URI, httpBinding.getURI());
-        }
-
-        writeEnd(writer);
-        //writer.writeEndElement();
-    }
-
-
-    public void resolve(HTTPBinding model, ModelResolver resolver, ProcessorContext context) throws ContributionResolveException {
-        // Should not need to do anything here for now... 
-
-    }
-
-}
diff --git a/sca-java-2.x/branches/2.0-Beta3/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/xml/HTTPDefaultOperationSelectorProcessor.java b/sca-java-2.x/branches/2.0-Beta3/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/xml/HTTPDefaultOperationSelectorProcessor.java
deleted file mode 100644
index 1e15965cb9..0000000000
--- a/sca-java-2.x/branches/2.0-Beta3/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/xml/HTTPDefaultOperationSelectorProcessor.java
+++ /dev/null
@@ -1,70 +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.xml;

-

-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.xml.Constants;

-import org.apache.tuscany.sca.binding.http.HTTPDefaultOperationSelector;

-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.resolver.ModelResolver;

-import org.apache.tuscany.sca.core.FactoryExtensionPoint;

-

-public class HTTPDefaultOperationSelectorProcessor extends BaseStAXArtifactProcessor implements StAXArtifactProcessor<HTTPDefaultOperationSelector> {

-    

-    public HTTPDefaultOperationSelectorProcessor(FactoryExtensionPoint modelFactories) {

-    }

-

-    public QName getArtifactType() {

-        return HTTPDefaultOperationSelector.OPERATION_SELECTOR_HTTP_DEFAULT_QNAME;

-    }

-    

-    public HTTPDefaultOperationSelector read(XMLStreamReader reader, ProcessorContext context) throws ContributionReadException, XMLStreamException {

-        HTTPDefaultOperationSelector wireFormat = new HTTPDefaultOperationSelector();

-         

-        return wireFormat;

-    }

-

-    public void write(HTTPDefaultOperationSelector wireFormat, XMLStreamWriter writer, ProcessorContext context) 

-        throws ContributionWriteException, XMLStreamException {

-        writer.writeStartElement("tuscany", 

-                                 getArtifactType().getLocalPart(),

-                                 getArtifactType().getNamespaceURI());

-        writer.writeNamespace("tuscany", Constants.SCA11_TUSCANY_NS); 

-        

-        writer.writeEndElement();

-    }

-

-    public Class<HTTPDefaultOperationSelector> getModelType() {

-        return HTTPDefaultOperationSelector.class;

-    }

-

-    public void resolve(HTTPDefaultOperationSelector arg0, ModelResolver arg1, ProcessorContext context) throws ContributionResolveException {

-

-    }

-    

-}

diff --git a/sca-java-2.x/branches/2.0-Beta3/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/xml/HTTPDefaultWireFormatProcessor.java b/sca-java-2.x/branches/2.0-Beta3/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/xml/HTTPDefaultWireFormatProcessor.java
deleted file mode 100644
index b5b1827d21..0000000000
--- a/sca-java-2.x/branches/2.0-Beta3/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/xml/HTTPDefaultWireFormatProcessor.java
+++ /dev/null
@@ -1,71 +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.xml;

-

-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.xml.Constants;

-import org.apache.tuscany.sca.binding.http.HTTPDefaultWireFormat;

-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.resolver.ModelResolver;

-import org.apache.tuscany.sca.core.FactoryExtensionPoint;

-

-public class HTTPDefaultWireFormatProcessor extends BaseStAXArtifactProcessor implements StAXArtifactProcessor<HTTPDefaultWireFormat> {

-    

-    public HTTPDefaultWireFormatProcessor(FactoryExtensionPoint modelFactories) {

-    }

-

-    public QName getArtifactType() {

-        return HTTPDefaultWireFormat.WIRE_FORMAT_HTTP_DEFAULT_QNAME;

-    }

-    

-    

-    public HTTPDefaultWireFormat read(XMLStreamReader reader, ProcessorContext context) throws ContributionReadException, XMLStreamException {

-        HTTPDefaultWireFormat wireFormat = new HTTPDefaultWireFormat();

-         

-        return wireFormat;

-    }

-

-    public void write(HTTPDefaultWireFormat wireFormat, XMLStreamWriter writer, ProcessorContext context) 

-        throws ContributionWriteException, XMLStreamException {

-        writer.writeStartElement("tuscany", 

-                                 getArtifactType().getLocalPart(),

-                                 getArtifactType().getNamespaceURI());

-        writer.writeNamespace("tuscany", Constants.SCA11_TUSCANY_NS); 

-        

-        writer.writeEndElement();

-    }

-

-    public Class<HTTPDefaultWireFormat> getModelType() {

-        return HTTPDefaultWireFormat.class;

-    }

-

-    public void resolve(HTTPDefaultWireFormat arg0, ModelResolver arg1, ProcessorContext context) throws ContributionResolveException {

-

-    }

-    

-}

diff --git a/sca-java-2.x/branches/2.0-Beta3/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/xml/HTTPXMLWireFormatProcessor.java b/sca-java-2.x/branches/2.0-Beta3/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/xml/HTTPXMLWireFormatProcessor.java
deleted file mode 100644
index 86292cf724..0000000000
--- a/sca-java-2.x/branches/2.0-Beta3/modules/binding-http/src/main/java/org/apache/tuscany/sca/binding/http/xml/HTTPXMLWireFormatProcessor.java
+++ /dev/null
@@ -1,71 +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.xml;

-

-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.xml.Constants;

-import org.apache.tuscany.sca.binding.http.HTTPXMLWireFormat;

-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.resolver.ModelResolver;

-import org.apache.tuscany.sca.core.FactoryExtensionPoint;

-

-public class HTTPXMLWireFormatProcessor extends BaseStAXArtifactProcessor implements StAXArtifactProcessor<HTTPXMLWireFormat> {

-    

-    public HTTPXMLWireFormatProcessor(FactoryExtensionPoint modelFactories) {

-    }

-

-    public QName getArtifactType() {

-        return HTTPXMLWireFormat.WIRE_FORMAT_HTTP_XML_QNAME;

-    }

-    

-    

-    public HTTPXMLWireFormat read(XMLStreamReader reader, ProcessorContext context) throws ContributionReadException, XMLStreamException {

-        HTTPXMLWireFormat wireFormat = new HTTPXMLWireFormat();

-         

-        return wireFormat;

-    }

-

-    public void write(HTTPXMLWireFormat wireFormat, XMLStreamWriter writer, ProcessorContext context) 

-        throws ContributionWriteException, XMLStreamException {

-        writer.writeStartElement("tuscany", 

-                                 getArtifactType().getLocalPart(),

-                                 getArtifactType().getNamespaceURI());

-        writer.writeNamespace("tuscany", Constants.SCA11_TUSCANY_NS); 

-        

-        writer.writeEndElement();

-    }

-

-    public Class<HTTPXMLWireFormat> getModelType() {

-        return HTTPXMLWireFormat.class;

-    }

-

-    public void resolve(HTTPXMLWireFormat arg0, ModelResolver arg1, ProcessorContext context) throws ContributionResolveException {

-

-    }

-    

-}

diff --git a/sca-java-2.x/branches/2.0-Beta3/modules/binding-http/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.http.HTTPBindingFactory b/sca-java-2.x/branches/2.0-Beta3/modules/binding-http/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.http.HTTPBindingFactory
deleted file mode 100644
index 3ca68b969b..0000000000
--- a/sca-java-2.x/branches/2.0-Beta3/modules/binding-http/src/main/resources/META-INF/services/org.apache.tuscany.sca.binding.http.HTTPBindingFactory
+++ /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 model factory
-org.apache.tuscany.sca.binding.http.impl.HTTPBindingFactoryImpl
-

diff --git a/sca-java-2.x/branches/2.0-Beta3/modules/binding-http/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-2.x/branches/2.0-Beta3/modules/binding-http/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
deleted file mode 100644
index 9a26611bee..0000000000
--- a/sca-java-2.x/branches/2.0-Beta3/modules/binding-http/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ /dev/null
@@ -1,22 +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.binding.http.xml.HTTPBindingProcessor;qname=http://tuscany.apache.org/xmlns/sca/1.1#binding.http,model=org.apache.tuscany.sca.binding.http.HTTPBinding,factory=org.apache.tuscany.sca.binding.http.HTTPBindingFactory

-org.apache.tuscany.sca.binding.http.xml.HTTPDefaultWireFormatProcessor;qname=http://tuscany.apache.org/xmlns/sca/1.1#wireFormat.httpDefault,model=org.apache.tuscany.sca.binding.http.HTTPDefaultWireFormat
-org.apache.tuscany.sca.binding.http.xml.HTTPXMLWireFormatProcessor;qname=http://tuscany.apache.org/xmlns/sca/1.1#wireFormat.httpXml,model=org.apache.tuscany.sca.binding.http.HTTPXMLWireFormat
-org.apache.tuscany.sca.binding.http.xml.HTTPDefaultOperationSelectorProcessor;qname=http://tuscany.apache.org/xmlns/sca/1.1#operationSelector.httpDefault,model=org.apache.tuscany.sca.binding.http.HTTPDefaultOperationSelector