Remove old beta1 branch

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

8 files changed, 0 insertions, 1667 deletions

diff --git a/sca-java-2.x/branches/2.0-Beta1/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/WebServiceBinding.java b/sca-java-2.x/branches/2.0-Beta1/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/WebServiceBinding.java
deleted file mode 100644
index b6bcb38645..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/WebServiceBinding.java
+++ /dev/null
@@ -1,279 +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.ws;
-
-import java.util.Map;
-
-import javax.wsdl.Definition;
-import javax.wsdl.Port;
-import javax.wsdl.Service;
-import javax.xml.namespace.QName;
-
-import org.apache.tuscany.sca.assembly.Binding;
-import org.apache.tuscany.sca.interfacedef.InterfaceContract;
-import org.apache.tuscany.sca.interfacedef.wsdl.WSDLDefinition;
-import org.w3c.dom.Element;
-
-
-/**
- * Represents a WebService binding.
- *
- * @version $Rev$ $Date$
- */
-public interface WebServiceBinding extends Binding {
-    QName TYPE = new QName(SCA11_NS, "binding.ws");
-
-    /**
-     * Sets the WSDL location.
-     * @param location the WSDL location
-     */
-    void setLocation(String location);
-
-    /**
-     * Returns the WSDL location
-     * @return the WSDL location
-     */
-    String getLocation();
-
-    /**
-     * Returns the wsdli:location attribute namespace mappings
-     * @return a Map with key being namespace and value the location
-     */
-    Map<String, String> getWsdliLocations();
-
-    /**
-     * Returns the name of the WSDL service.
-     *
-     * @return the name of the WSDL service
-     */
-    QName getServiceName();
-
-    /**
-     * Sets the name of the WSDL service.
-     *
-     * @param serviceName the name of the WSDL service
-     */
-    void setServiceName(QName serviceName);
-
-    /**
-     * Returns the name of the WSDL port.
-     *
-     * @return the name of the WSDL port
-     */
-    String getPortName();
-
-    /**
-     * Sets the name of the WSDL port.
-     *
-     * @param portName the name of the WSDL port
-     */
-    void setPortName(String portName);
-
-    /**
-     * Returns the name of the WSDL binding.
-     *
-     * @return the name of the WSDL binding
-     */
-    QName getBindingName();
-
-    /**
-     * Sets the name of the WSDL binding.
-     *
-     * @param bindingName the name of the WSDL binding
-     */
-    void setBindingName(QName bindingName);
-
-    /**
-     * Returns the name of the WSDL endpoint.
-     *
-     * @return the name of the WSDL endpoint
-     */
-    String getEndpointName();
-
-    /**
-     * Sets the name of the WSDL endpoint.
-     *
-     * @param endpointName the name of the WSDL endpoint
-     */
-    void setEndpointName(String endpointName);
-
-    /**
-     * Returns the WSDL service
-     * @return the WSDL service
-     */
-    Service getService();
-
-    /**
-     * Sets the WSDL service.
-     * @param service the WSDL service
-     */
-    void setService(Service service);
-
-    /**
-     * Returns the WSDL port
-     * @return the WSDL port
-     */
-    Port getPort();
-
-    /**
-     * Sets the WSDL endpoint
-     * @param endpoint the WSDL endpoint
-     */
-    void setEndpoint(Port endpoint);
-
-    /**
-     * Returns the WSDL endpoint
-     * @return the WSDL endpoint
-     */
-    Port getEndpoint();
-
-    /**
-     * Sets the WSDL port
-     * @param port the WSDL port
-     */
-    void setPort(Port port);
-
-    /**
-     * Returns the WSDL binding.
-     * @return the WSDL binding
-     */
-    javax.wsdl.Binding getBinding();
-
-    /**
-     * Sets the WSDL binding
-     * @param binding the WSDL binding
-     */
-    void setBinding(javax.wsdl.Binding binding);
-
-    /**
-     * Returns the WSDL definition that was specified by the
-     * user either via and interface.wsdl or via a wsdlElement 
-     * on the binding. This may be empty if no WSDL was specified
-     * explicitly in which case the generated WSDL should contain
-     * a full WSDL description
-     * 
-     * @return the WSDL definition
-     */
-    WSDLDefinition getUserSpecifiedWSDLDefinition();
-
-    /**
-     * Sets the WSDL definition if one was specified by the user in the
-     * composite file either via and interface.wsdl or via a wsdlElement 
-     * on the binding
-     * 
-     * @param wsdlDefinition the WSDL definition
-     */
-    void setUserSpecifiedWSDLDefinition(WSDLDefinition wsdlDefinition);
-
-    /**
-     * Returns the WSDL namespace.
-     * @return the WSDL namespace
-     */
-    String getNamespace();
-
-    /**
-     * Sets the WSDL namespace
-     * @param namespace the WSDL namespace
-     */
-    void setNamespace(String namespace);
-
-    /**
-     * Returns true if the model element is unresolved.
-     *
-     * @return true if the model element is unresolved.
-     */
-    boolean isUnresolved();
-
-    /**
-     * Sets whether the model element is unresolved.
-     *
-     * @param unresolved whether the model element is unresolved
-     */
-    void setUnresolved(boolean unresolved);
-
-    InterfaceContract getBindingInterfaceContract();
-
-    void setBindingInterfaceContract(InterfaceContract bindingInterfaceContract);
-
-    Element getEndPointReference();
-
-    void setEndPointReference(Element element);
-
-    /**
-     * Returns the generated WSDL definitions document.
-     * @return the generated WSDL definitions document
-     */
-    Definition getGeneratedWSDLDocument();
-
-    /**
-     * Sets the generated WSDL definitions document. The WSDL is generated
-     * from the component implementation
-     * 
-     * @param definition the generated WSDL definitions document
-     */
-    void setGeneratedWSDLDocument(Definition definition);
-   
-    /**
-     * Returns string from the WSDL that represents the SOAP binding transport
-     */
-    String getBindingTransport();
-    
-    /**
-     * Returns true if the WSDL style is rpc/encoded
-     */
-    boolean isRpcEncoded();
-    
-    /**
-     * Returns true if the WSDL style is rpc/literal
-     */
-    boolean isRpcLiteral();
-    
-    /**
-     * Returns true if the WSDL style is doc/encoded 
-     */
-    boolean isDocEncoded();
-    
-    /**
-     * Returns true is the WSDL style is doc/literal
-     */
-    boolean isDocLiteralUnwrapped();
-    
-    /**
-     * Returns true if the WSDL style is doc/literal/wrapped
-     */
-    boolean isDocLiteralWrapped();
-    
-    /**
-     * Returns true if the WSDL style is doc/literal
-     * and the mapping to the interface is bare
-     */
-    boolean isDocLiteralBare(); 
-    
-    /**
-     * Returns true is the WSBinding is configured, via WSDL,
-     * to use an HTTP transport
-     */
-    boolean isHTTPTransport();
-    
-    /**
-     * Returns true is the WSBinding is configured, via WSDL,
-     * to use a JMS transport
-     */
-    boolean isJMSTransport();
-}  
diff --git a/sca-java-2.x/branches/2.0-Beta1/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/WebServiceBindingFactory.java b/sca-java-2.x/branches/2.0-Beta1/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/WebServiceBindingFactory.java
deleted file mode 100644
index 1ad38c69e4..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/WebServiceBindingFactory.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.ws;
-
-/**
- * Factory for the Web Service binding model.
- * 
- * @version $Rev$ $Date$
- */
-public interface WebServiceBindingFactory {
-
-    /**
-     * Creates a new WebService binding.
-     * 
-     * @return a new WebService binding
-     */
-    WebServiceBinding createWebServiceBinding();
-
-}
diff --git a/sca-java-2.x/branches/2.0-Beta1/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/addressing/EndPointReference.java b/sca-java-2.x/branches/2.0-Beta1/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/addressing/EndPointReference.java
deleted file mode 100644
index a13584a3c2..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/addressing/EndPointReference.java
+++ /dev/null
@@ -1,62 +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.ws.addressing;
-
-import java.net.URI;
-import java.util.List;
-
-import javax.xml.namespace.QName;
-
-/**
- * Defines a model for WS-Addressing
- * &lt;wsa:EndpointReference&gt;
- *     &lt;wsa:Address&gt;xs:anyURI&lt;/wsa:Address&gt;
- *     &lt;wsa:ReferenceProperties&gt;... &lt;/wsa:ReferenceProperties&gt; ?
- *     &lt;wsa:ReferenceParameters&gt;... &lt;/wsa:ReferenceParameters&gt; ?
- *     &lt;wsa:PortType&gt;xs:QName&lt;/wsa:PortType&gt; ?
- *     &lt;wsa:ServiceName PortName="xs:NCName"?&gt;xs:QName&lt;/wsa:ServiceName&gt; ?
- *     &lt;wsp:Policy&gt; ... &lt;/wsp:Policy&gt;*
- * &lt;/wsa:EndpointReference&gt;
- * @version $Rev$ $Date$
- */
-public interface EndPointReference {
-    URI getAddress();
-
-    void setAddress(URI address);
-
-    QName getPortType();
-
-    void setPortType(QName portType);
-
-    QName getServiceName();
-
-    void setServiceName(QName serviceName);
-
-    QName getPortName();
-
-    void setPortName(QName portName);
-
-    List<Object> getReferenceProperties();
-
-    List<Object> getReferenceParameters();
-
-    List<Object> getPolicies();
-
-}
diff --git a/sca-java-2.x/branches/2.0-Beta1/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/impl/WebServiceBindingFactoryImpl.java b/sca-java-2.x/branches/2.0-Beta1/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/impl/WebServiceBindingFactoryImpl.java
deleted file mode 100644
index 055e2012dc..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/impl/WebServiceBindingFactoryImpl.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.ws.impl;
-
-import org.apache.tuscany.sca.binding.ws.WebServiceBinding;
-import org.apache.tuscany.sca.binding.ws.WebServiceBindingFactory;
-
-/**
- * A factory for the WSDL model.
- * 
- * @version $Rev$ $Date$
- */
-public class WebServiceBindingFactoryImpl implements WebServiceBindingFactory {
-
-    public WebServiceBinding createWebServiceBinding() {
-        return new WebServiceBindingImpl();
-    }
-
-}
diff --git a/sca-java-2.x/branches/2.0-Beta1/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/impl/WebServiceBindingImpl.java b/sca-java-2.x/branches/2.0-Beta1/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/impl/WebServiceBindingImpl.java
deleted file mode 100644
index 8e3c9262a2..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/impl/WebServiceBindingImpl.java
+++ /dev/null
@@ -1,460 +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.ws.impl;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.wsdl.Binding;
-import javax.wsdl.BindingOperation;
-import javax.wsdl.Definition;
-import javax.wsdl.Message;
-import javax.wsdl.Part;
-import javax.wsdl.Port;
-import javax.wsdl.Service;
-import javax.wsdl.extensions.soap.SOAPBinding;
-import javax.wsdl.extensions.soap.SOAPBody;
-import javax.xml.namespace.QName;
-
-import org.apache.tuscany.sca.assembly.Extensible;
-import org.apache.tuscany.sca.assembly.Extension;
-import org.apache.tuscany.sca.assembly.OperationSelector;
-import org.apache.tuscany.sca.assembly.WireFormat;
-import org.apache.tuscany.sca.binding.ws.WebServiceBinding;
-import org.apache.tuscany.sca.interfacedef.Interface;
-import org.apache.tuscany.sca.interfacedef.InterfaceContract;
-import org.apache.tuscany.sca.interfacedef.wsdl.WSDLDefinition;
-import org.apache.tuscany.sca.interfacedef.wsdl.WSDLInterface;
-import org.apache.tuscany.sca.policy.ExtensionType;
-import org.apache.tuscany.sca.policy.Intent;
-import org.apache.tuscany.sca.policy.PolicySet;
-import org.apache.tuscany.sca.policy.PolicySubject;
-import org.w3c.dom.Element;
-
-/**
- * Represents a WebService binding.
- *
- * @version $Rev$ $Date$
- */
-class WebServiceBindingImpl implements WebServiceBinding, PolicySubject, Extensible {
-    private String name;
-    private String uri;
-    private boolean unresolved;
-    private List<Object> extensions = new ArrayList<Object>();
-    private List<Extension> attributeExtensions = new ArrayList<Extension>();
-    private List<Intent> requiredIntents = new ArrayList<Intent>();
-    private List<PolicySet> policySets = new ArrayList<PolicySet>();
-    private ExtensionType extensionType;
-    private String location;
-    private Binding binding;
-    private Service service;
-    private Port port;
-    private Port endpoint;
-    private QName bindingName;
-    private String portName;
-    private QName serviceName;
-    private String endpointName;
-    private InterfaceContract bindingInterfaceContract;
-    private Element endPointReference;
-    private String wsdlNamespace;
-    private WSDLDefinition userSpecifiedWSDLDefinition;
-    private Definition generatedWSDLDocument;
-    private boolean isDocumentStyle;
-    private boolean isLiteralEncoding;
-    private boolean isMessageWrapped;
-    private Map<String, String> wsdliLocations = new HashMap<String, String>();
-
-    protected WebServiceBindingImpl() {
-    }
-
-    /**
-     * Provide a meaningful representation of this Binding
-     */
-    public String toString() {
-    	return "Web Service Binding: " + name;
-    } // end method toString
-
-    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 unresolved;
-    }
-
-    public void setUnresolved(boolean unresolved) {
-        this.unresolved = unresolved;
-    }
-
-    @Override
-    public Object clone() throws CloneNotSupportedException {
-        return super.clone();
-    }
-
-    public List<Object> getExtensions() {
-        return extensions;
-    }
-
-    public List<Extension> getAttributeExtensions() {
-        return attributeExtensions;
-    }
-
-    public String getLocation() {
-        return location;
-    }
-
-    public void setLocation(String location) {
-        this.location = location;
-    }
-
-    public Binding getBinding() {
-        if (binding == null) {
-            if (getUserSpecifiedWSDLDefinition() != null && userSpecifiedWSDLDefinition.getBinding() != null) {
-                binding = userSpecifiedWSDLDefinition.getBinding();
-                determineWSDLCharacteristics();
-            }
-        }
-        return binding;
-    }
-
-    public QName getBindingName() {
-        if (isUnresolved()) {
-            return bindingName;
-        } else if (binding != null) {
-            return binding.getQName();
-        } else {
-            return null;
-        }
-    }
-
-    public String getEndpointName() {
-        if (isUnresolved()) {
-            return endpointName;
-        } else if (endpoint != null) {
-            //TODO support WSDL 2.0
-            return endpoint.getName();
-        } else {
-            return null;
-        }
-    }
-
-    public Port getEndpoint() {
-        return endpoint;
-    }
-
-    public Port getPort() {
-        return port;
-    }
-
-    public String getPortName() {
-        if (isUnresolved()) {
-            return portName;
-        } else if (port != null) {
-            return port.getName();
-        } else {
-            return null;
-        }
-    }
-
-    public Service getService() {
-        return service;
-    }
-
-    public QName getServiceName() {
-        if (isUnresolved()) {
-            return serviceName;
-        } else if (service != null) {
-            return service.getQName();
-        } else {
-            return null;
-        }
-    }
-
-    public void setBinding(Binding binding) {
-        this.binding = binding;
-        determineWSDLCharacteristics();
-    }
-
-    public void setBindingName(QName bindingName) {
-        if (!isUnresolved()) {
-            throw new IllegalStateException();
-        }
-        this.bindingName = bindingName;
-    }
-
-    public void setEndpoint(Port endpoint) {
-        this.endpoint = endpoint;
-    }
-
-    public void setEndpointName(String endpointName) {
-        if (!isUnresolved()) {
-            throw new IllegalStateException();
-        }
-        this.endpointName = endpointName;
-    }
-
-    public void setPort(Port port) {
-        this.port = port;
-    }
-
-    public void setPortName(String portName) {
-        if (!isUnresolved()) {
-            throw new IllegalStateException();
-        }
-        this.portName = portName;
-    }
-
-    public void setService(Service service) {
-        this.service = service;
-    }
-
-    public void setServiceName(QName serviceName) {
-        if (!isUnresolved()) {
-            throw new IllegalStateException();
-        }
-        this.serviceName = serviceName;
-    }
-
-    public WSDLDefinition getUserSpecifiedWSDLDefinition() {
-        if (userSpecifiedWSDLDefinition == null) {
-            Interface iface = bindingInterfaceContract.getInterface();
-            if (iface instanceof WSDLInterface) {
-                userSpecifiedWSDLDefinition = ((WSDLInterface) iface).getWsdlDefinition();
-            }
-        }
-        return userSpecifiedWSDLDefinition;
-    }
-
-    public void setUserSpecifiedWSDLDefinition(WSDLDefinition wsdlDefinition) {
-        this.userSpecifiedWSDLDefinition = wsdlDefinition;
-    }
-
-    public String getNamespace() {
-        return wsdlNamespace;
-    }
-
-    public void setNamespace(String namespace) {
-        this.wsdlNamespace = namespace;
-    }
-
-    public InterfaceContract getBindingInterfaceContract() {
-        return bindingInterfaceContract;
-    }
-
-    public void setBindingInterfaceContract(InterfaceContract bindingInterfaceContract) {
-        this.bindingInterfaceContract = bindingInterfaceContract;
-    }
-
-    public List<PolicySet> getPolicySets() {
-        return policySets;
-    }
-
-    public List<Intent> getRequiredIntents() {
-        return requiredIntents;
-    }
-
-    public ExtensionType getExtensionType() {
-        return extensionType;
-    }
-
-    public void setExtensionType(ExtensionType intentAttachPointType) {
-        this.extensionType = intentAttachPointType;
-    }
-
-    public Element getEndPointReference() {
-        return endPointReference;
-    }
-
-    public void setEndPointReference(Element epr) {
-        this.endPointReference = epr;
-    }
-
-    public Definition getGeneratedWSDLDocument() {
-        return generatedWSDLDocument;
-    }
-
-    public void setGeneratedWSDLDocument(Definition definition) {
-        this.generatedWSDLDocument = definition;
-        determineWSDLCharacteristics();
-    }
-
-    public QName getType() {
-        return TYPE;
-    }
-    
-    public WireFormat getRequestWireFormat() {
-        return null;
-    }
-    
-    public void setRequestWireFormat(WireFormat wireFormat) {  
-    }
-    
-    public WireFormat getResponseWireFormat() {
-        return null;
-    }
-    
-    public void setResponseWireFormat(WireFormat wireFormat) {
-    }
-    
-    public OperationSelector getOperationSelector() {
-        return null;
-    }
-    
-    public void setOperationSelector(OperationSelector operationSelector) {
-    }   
-    
-    /**
-     * Some items get calculated and cached as they are used at runtime
-     * to decide what message processing is required
-     */
-    protected void determineWSDLCharacteristics() {
-        setIsDocumentStyle();
-        setIsLiteralEncoding();
-        setIsMessageWrapped();
-    }
-    
-    protected void setIsDocumentStyle() {
-        
-        if (binding == null){
-            if (userSpecifiedWSDLDefinition != null && userSpecifiedWSDLDefinition.getDefinition() != null){
-                Message firstMessage = (Message)userSpecifiedWSDLDefinition.getDefinition().getMessages().values().iterator().next();
-                Part firstPart = (Part)firstMessage.getParts().values().iterator().next();
-                if (firstPart.getTypeName() != null){
-                    isDocumentStyle = false;
-                    return;
-                }
-            } 
-            
-            // default to document style
-            isDocumentStyle = true;
-            return;
-        } else {
-           for (Object ext : binding.getExtensibilityElements()){
-               if (ext instanceof SOAPBinding){
-                  if (((SOAPBinding)ext).getStyle().equals("rpc")){
-                      isDocumentStyle = false;
-                      return;
-                  } else {
-                      isDocumentStyle = true;
-                      return;
-                  }
-               }
-           }
-           isDocumentStyle = true;
-           return;
-        }
-        
-    }
-    
-    protected void setIsLiteralEncoding() {
-        
-        if (binding == null){
-            // default to literal encoding
-            isLiteralEncoding = true;
-            return;
-        } else {
-            for(Object ext : ((BindingOperation)binding.getBindingOperations().get(0)).getBindingInput().getExtensibilityElements()){
-                if (ext instanceof SOAPBody){
-                    if (((SOAPBody)ext).getUse().equals("literal")){
-                        isLiteralEncoding = true;
-                        return;
-                    } else {
-                        isLiteralEncoding = false;
-                        return;
-                    }
-                }
-            }
-            isLiteralEncoding = true;
-            return;
-        }
-    }
-    
-    protected void setIsMessageWrapped() {
-        if (getBindingInterfaceContract() != null){
-            isMessageWrapped = getBindingInterfaceContract().getInterface().getOperations().get(0).isWrapperStyle();
-        }
-    }
-   
-    public boolean isRpcEncoded() {
-        return (!isDocumentStyle) && (!isLiteralEncoding);
-    }
-    
-    public boolean isRpcLiteral() {
-        return (!isDocumentStyle) && (isLiteralEncoding);
-    }
-    
-    public boolean isDocEncoded() {
-        return (isDocumentStyle) && (!isLiteralEncoding);
-    }
-    
-    public boolean isDocLiteralUnwrapped() {
-        setIsMessageWrapped();
-        return (isDocumentStyle) && (isLiteralEncoding) && (!isMessageWrapped);
-    }
-    
-    public boolean isDocLiteralWrapped() {
-        setIsMessageWrapped();
-        return (isDocumentStyle) && (isLiteralEncoding) &&(isMessageWrapped);
-    }
-    
-    public boolean isDocLiteralBare() {
-        setIsMessageWrapped();
-        return (isDocumentStyle) && (isLiteralEncoding);
-    }   
-    
-    public boolean isHTTPTransport() {
-        return getBindingTransport().equals("http://schemas.xmlsoap.org/soap/http");
-    }
-    
-    public boolean isJMSTransport() {
-        return getBindingTransport().equals("http://schemas.xmlsoap.org/soap/jms");
-    }
-    
-    public String getBindingTransport() {
-        if (binding != null){
-            for (Object ext : binding.getExtensibilityElements()){
-                if (ext instanceof SOAPBinding){
-                    return ((SOAPBinding)ext).getTransportURI();
-                }
-            }
-        }
-        
-        // if no binding is explicitly specified by the user then default to http
-        return "http://schemas.xmlsoap.org/soap/http";
-    }
-
-    public Map<String, String> getWsdliLocations() {
-        return wsdliLocations ;
-    }
-}
diff --git a/sca-java-2.x/branches/2.0-Beta1/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/xml/EndPointReferenceHelper.java b/sca-java-2.x/branches/2.0-Beta1/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/xml/EndPointReferenceHelper.java
deleted file mode 100644
index 9051dc0af7..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/xml/EndPointReferenceHelper.java
+++ /dev/null
@@ -1,223 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-
-package org.apache.tuscany.sca.binding.ws.xml;
-
-import static javax.xml.XMLConstants.XMLNS_ATTRIBUTE_NS_URI;
-
-import javax.xml.namespace.QName;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.stream.XMLInputFactory;
-import javax.xml.stream.XMLStreamConstants;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamReader;
-import javax.xml.stream.XMLStreamWriter;
-import javax.xml.transform.dom.DOMSource;
-
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-
-/**
- * Helper methods to read and write a wsa:endpointReference
- * TODO: almost direct copy of code for Assembly properties
- *       must be able to move to a common utility
- *
- * @version $Rev$ $Date$
- */
-public class EndPointReferenceHelper {
-    
-    /**
-     * Read a wsa:endpointReference into a DOM Element
-     */
-    public static Element readEndPointReference(XMLStreamReader reader) {
-        try {
-
-            return loadElement(reader);
-
-        } catch (XMLStreamException e) {
-            throw new RuntimeException(e);
-        } catch (ParserConfigurationException e) {
-            throw new RuntimeException(e);
-        }
-    }
-    
-    /**
-     * Write a wsa:endpointReference from a DOM Element
-     */
-    public static void writeEndPointReference(Element element, XMLStreamWriter writer)  {
-        try {
-
-            saveElement(element, writer);
-
-        } catch (XMLStreamException e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-    private static Element loadElement(XMLStreamReader reader) throws XMLStreamException, ParserConfigurationException {
-        Document document = DocumentBuilderFactory.newInstance().newDocumentBuilder().newDocument();
-        Node root = document;
-        Node current = root;
-        while (true) {
-            switch (reader.getEventType()) {
-                case XMLStreamConstants.START_ELEMENT:
-                    QName name = reader.getName();
-                    Element child = createElement(document, name);
-
-                    // push the new element and make it the current one
-                    current.appendChild(child);
-                    current = child;
-
-                    int count = reader.getNamespaceCount();
-                    for (int i = 0; i < count; i++) {
-                        String prefix = reader.getNamespacePrefix(i);
-                        String ns = reader.getNamespaceURI(i);
-                        declareNamespace(child, prefix, ns);
-                    }
-
-                    if(!"".equals(name.getNamespaceURI()))
-                    declareNamespace(child, name.getPrefix(), name.getNamespaceURI());
-
-                    // add the attributes for this element
-                    count = reader.getAttributeCount();
-                    for (int i = 0; i < count; i++) {
-                        String ns = reader.getAttributeNamespace(i);
-                        String prefix = reader.getAttributePrefix(i);
-                        String qname = reader.getAttributeLocalName(i);
-                        String value = reader.getAttributeValue(i);
-                        if (prefix != null && prefix.length() != 0) {
-                            qname = prefix + ":" + qname;
-                        }
-                        child.setAttributeNS(ns, qname, value);
-                        if (ns != null) {
-                            declareNamespace(child, prefix, ns);
-                        }
-                    }
-
-                    break;
-                case XMLStreamConstants.CDATA:
-                    current.appendChild(document.createCDATASection(reader.getText()));
-                    break;
-                case XMLStreamConstants.CHARACTERS:
-                    current.appendChild(document.createTextNode(reader.getText()));
-                    break;
-                case XMLStreamConstants.END_ELEMENT:
-                    // if we are back at the root then we are done
-                    if ("EndpointReference".equals(reader.getName().getLocalPart())) {
-                        return document.getDocumentElement();
-                    }
-
-                    // pop the element off the stack
-                    current = current.getParentNode();
-            }
-            if ( reader.hasNext()) reader.next();
-        }
-    }
-
-    private static Element createElement(Document document, QName name) {
-        String prefix = name.getPrefix();
-        String qname =
-            (prefix != null && prefix.length() > 0) ? prefix + ":" + name.getLocalPart() : name.getLocalPart();
-        return document.createElementNS(name.getNamespaceURI(), qname);
-    }
-
-    private static void declareNamespace(Element element, String prefix, String ns) {
-        if (ns == null) {
-            ns = "";
-        }
-        if (prefix == null) {
-            prefix = "";
-        }
-        String qname = null;
-        if ("".equals(prefix)) {
-            qname = "xmlns";
-        } else {
-            qname = "xmlns:" + prefix;
-        }
-        Node node = element;
-        boolean declared = false;
-        while (node != null && node.getNodeType() == Node.ELEMENT_NODE) {
-            NamedNodeMap attrs = node.getAttributes();
-            if (attrs == null) {
-                break;
-            }
-            Node attr = attrs.getNamedItem(qname);
-            if (attr != null) {
-                declared = ns.equals(attr.getNodeValue());
-                break;
-            }
-            node = node.getParentNode();
-        }
-        if (!declared) {
-            org.w3c.dom.Attr attr = element.getOwnerDocument().createAttributeNS(XMLNS_ATTRIBUTE_NS_URI, qname);
-            attr.setValue(ns);
-            element.setAttributeNodeNS(attr);
-        }
-    }
-    
-    private static void saveElement(Element element, XMLStreamWriter writer) throws XMLStreamException{
-
-        XMLStreamReader reader =
-            XMLInputFactory.newInstance().createXMLStreamReader(new DOMSource(element));
-
-        while (reader.hasNext()) {
-            switch (reader.next()) {
-                case XMLStreamConstants.START_ELEMENT:
-                    QName name = reader.getName();
-                    writer.writeStartElement(name.getPrefix(), name.getLocalPart(), name.getNamespaceURI());
-
-                    int namespaces = reader.getNamespaceCount();
-                    for (int i = 0; i < namespaces; i++) {
-                        String prefix = reader.getNamespacePrefix(i);
-                        String ns = reader.getNamespaceURI(i);
-                        writer.writeNamespace(prefix, ns);
-                    }
-
-                    if (!"".equals(name.getNamespaceURI())) {
-                        writer.writeNamespace(name.getPrefix(), name.getNamespaceURI());
-                    }
-
-                    // add the attributes for this element
-                    namespaces = reader.getAttributeCount();
-                    for (int i = 0; i < namespaces; i++) {
-                        String ns = reader.getAttributeNamespace(i);
-                        String prefix = reader.getAttributePrefix(i);
-                        String qname = reader.getAttributeLocalName(i);
-                        String value = reader.getAttributeValue(i);
-
-                        writer.writeAttribute(prefix, ns, qname, value);
-                    }
-
-                    break;
-                case XMLStreamConstants.CDATA:
-                    writer.writeCData(reader.getText());
-                    break;
-                case XMLStreamConstants.CHARACTERS:
-                    writer.writeCharacters(reader.getText());
-                    break;
-                case XMLStreamConstants.END_ELEMENT:
-                    writer.writeEndElement();
-                    break;
-            }
-        }
-    }
-}
diff --git a/sca-java-2.x/branches/2.0-Beta1/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/xml/WebServiceBindingProcessor.java b/sca-java-2.x/branches/2.0-Beta1/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/xml/WebServiceBindingProcessor.java
deleted file mode 100644
index d528516160..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/xml/WebServiceBindingProcessor.java
+++ /dev/null
@@ -1,526 +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.ws.xml;
-
-import static javax.xml.stream.XMLStreamConstants.END_ELEMENT;
-import static javax.xml.stream.XMLStreamConstants.START_ELEMENT;
-import static org.apache.tuscany.sca.binding.ws.xml.WebServiceConstants.SCA11_NS;
-
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-import javax.wsdl.Binding;
-import javax.wsdl.Port;
-import javax.wsdl.PortType;
-import javax.wsdl.Service;
-import javax.wsdl.extensions.soap.SOAPAddress;
-import javax.wsdl.extensions.soap12.SOAP12Address;
-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.Callback;
-import org.apache.tuscany.sca.assembly.Reference;
-import org.apache.tuscany.sca.assembly.xml.PolicySubjectProcessor;
-import org.apache.tuscany.sca.binding.ws.WebServiceBinding;
-import org.apache.tuscany.sca.binding.ws.WebServiceBindingFactory;
-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.ExtensionPointRegistry;
-import org.apache.tuscany.sca.core.FactoryExtensionPoint;
-import org.apache.tuscany.sca.interfacedef.InvalidInterfaceException;
-import org.apache.tuscany.sca.interfacedef.wsdl.WSDLDefinition;
-import org.apache.tuscany.sca.interfacedef.wsdl.WSDLFactory;
-import org.apache.tuscany.sca.interfacedef.wsdl.WSDLInterface;
-import org.apache.tuscany.sca.interfacedef.wsdl.WSDLInterfaceContract;
-import org.apache.tuscany.sca.interfacedef.wsdl.WSDLObject;
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.monitor.Problem;
-import org.apache.tuscany.sca.monitor.Problem.Severity;
-import org.apache.tuscany.sca.policy.PolicyFactory;
-
-/**
- * This is the StAXArtifactProcessor for the Web Services Binding.
- *
- * @version $Rev$ $Date$
- */
-public class WebServiceBindingProcessor extends BaseStAXArtifactProcessor implements StAXArtifactProcessor<WebServiceBinding>, WebServiceConstants {
-
-    private ExtensionPointRegistry extensionPoints;
-    private WSDLFactory wsdlFactory;
-    private WebServiceBindingFactory wsFactory;
-    private PolicyFactory policyFactory;
-    private PolicySubjectProcessor policyProcessor;
-    //private PolicyFactory intentAttachPointTypeFactory;
-    
-    
-    public WebServiceBindingProcessor(ExtensionPointRegistry extensionPoints) {
-        this.extensionPoints = extensionPoints;
-        FactoryExtensionPoint modelFactories = extensionPoints.getExtensionPoint(FactoryExtensionPoint.class);
-        this.policyFactory = modelFactories.getFactory(PolicyFactory.class);
-        this.wsFactory = modelFactories.getFactory(WebServiceBindingFactory.class);
-        this.wsdlFactory = modelFactories.getFactory(WSDLFactory.class);
-        this.policyProcessor = new PolicySubjectProcessor(policyFactory);
-    }
-    
-    /**
-     * Report a warning.
-     * 
-     * @param problems
-     * @param message
-     * @param model
-     */
-    private void warning(Monitor monitor, String message, Object model, Object... messageParameters) {
-       if (monitor != null) {
-           Problem problem = monitor.createProblem(this.getClass().getName(), "binding-wsxml-validation-messages", Severity.WARNING, model, message, (Object[])messageParameters);
-           monitor.problem(problem);
-       }
-    }
-         
-    /**
-     * Report a error.
-     * 
-     * @param problems
-     * @param message
-     * @param model
-     */
-    private void error(Monitor monitor, String message, Object model, Object... messageParameters) {
-        if (monitor != null) {
-            Problem problem = monitor.createProblem(this.getClass().getName(), "binding-wsxml-validation-messages", Severity.ERROR, model, message, (Object[])messageParameters);
-            monitor.problem(problem);
-        }        
-    }
-
-    public WebServiceBinding read(XMLStreamReader reader, ProcessorContext context) throws ContributionReadException, XMLStreamException {
-        Monitor monitor = context.getMonitor();
-        // Read a <binding.ws>
-        WebServiceBinding wsBinding = wsFactory.createWebServiceBinding();
-        /*ExtensionType bindingType = intentAttachPointTypeFactory.createBindingType();
-        bindingType.setName(getArtifactType());
-        bindingType.setUnresolved(true);
-        ((PolicySubject)wsBinding).setType(bindingType);*/
-        wsBinding.setUnresolved(true);
-
-        // Read policies
-        policyProcessor.readPolicies(wsBinding, reader);
-
-        // Read the binding name
-        String name = reader.getAttributeValue(null, NAME);
-        if (name != null) {
-            wsBinding.setName(name);
-        }
-        
-        // a collection of endpoint specifications so that we can test that 
-        // only one is present
-        List<String> endpointSpecifications = new ArrayList<String>();
-
-        // Read URI
-        String uri = getURIString(reader, URI);
-        if (uri != null) {
-            wsBinding.setURI(uri);
-            
-            // BWS20001
-            if (context.getParentModel() instanceof Reference){
-                try {
-                    URI tmpURI = new URI(uri);
-                    
-                    if (!tmpURI.isAbsolute()){
-                        error(monitor, "URINotAbsolute", reader, uri);
-                    }
-                } catch (URISyntaxException ex){
-                    error(monitor, "InvalidURISyntax", reader, ex.getMessage());
-                }
-                endpointSpecifications.add("uri");
-            }
-            
-            // BWS20020
-            if ((context.getParentModel() instanceof Callback) &&
-                (((Callback)context.getParentModel()).getParentContract() instanceof org.apache.tuscany.sca.assembly.Service)){
-                error(monitor, "URIFoundForServiceCallback", reader, uri);
-            }
-        }
-
-        // Read a qname in the form:
-        // namespace#wsdl.???(name)
-        Boolean wsdlElementIsBinding = null;
-        String wsdlElement = getURIString(reader, WSDL_ELEMENT);
-        if (wsdlElement != null) {
-            int index = wsdlElement.indexOf('#');
-            if (index == -1) {
-            	error(monitor, "InvalidWsdlElementAttr", reader, wsdlElement);
-                //throw new ContributionReadException("Invalid WebService binding wsdlElement attribute: " + wsdlElement);
-            	return wsBinding;
-            }
-            String namespace = wsdlElement.substring(0, index);
-            wsBinding.setNamespace(namespace);
-            String localName = wsdlElement.substring(index + 1);
-            if (localName.startsWith("wsdl.service")) {
-
-                // BWS20003
-                if (context.getParentModel() instanceof org.apache.tuscany.sca.assembly.Service){
-                    error(monitor, "WSDLServiceOnService", reader, wsdlElement);
-                }
-                
-                // Read a wsdl.service
-                localName = localName.substring("wsdl.service(".length(), localName.length() - 1);
-                wsBinding.setServiceName(new QName(namespace, localName));
-                
-                endpointSpecifications.add("#wsdl.service");
-
-            } else if (localName.startsWith("wsdl.port")) {
-
-                // Read a wsdl.port
-                localName = localName.substring("wsdl.port(".length(), localName.length() - 1);
-                int s = localName.indexOf('/');
-                if (s == -1) {
-                	error(monitor, "InvalidWsdlElementAttr", reader, wsdlElement);
-                    //throw new ContributionReadException("Invalid WebService binding wsdlElement attribute: " + wsdlElement);
-                } else {
-                    wsBinding.setServiceName(new QName(namespace, localName.substring(0, s)));
-                    wsBinding.setPortName(localName.substring(s + 1));
-                }
-                
-                endpointSpecifications.add("#wsdl.port");
-            } else if (localName.startsWith("wsdl.endpoint")) {
-
-                // Read a wsdl.endpoint
-                localName = localName.substring("wsdl.endpoint(".length(), localName.length() - 1);
-                int s = localName.indexOf('/');
-                if (s == -1) {
-                	error(monitor, "InvalidWsdlElementAttr", reader, wsdlElement);
-                    //throw new ContributionReadException("Invalid WebService binding wsdlElement attribute: " + wsdlElement);
-                } else {
-                    wsBinding.setServiceName(new QName(namespace, localName.substring(0, s)));
-                    wsBinding.setEndpointName(localName.substring(s + 1));
-                }
-                
-            } else if (localName.startsWith("wsdl.binding")) {
-
-                // Read a wsdl.binding
-                localName = localName.substring("wsdl.binding(".length(), localName.length() - 1);
-                wsBinding.setBindingName(new QName(namespace, localName));
-
-                wsdlElementIsBinding = true;
-
-            } else {
-            	error(monitor, "InvalidWsdlElementAttr", reader, wsdlElement);
-                //throw new ContributionReadException("Invalid WebService binding wsdlElement attribute: " + wsdlElement);
-            }
-        }
-
-        // Read wsdlLocation
-        String wsdliLocation = reader.getAttributeValue(WSDLI_NS, WSDL_LOCATION);
-        if (wsdliLocation != null) {
-            if (wsdlElement == null) {
-                error(monitor, "WsdliLocationMissingWsdlElement", reader);
-            }
-            String[] iris = wsdliLocation.split(" ");
-            if (iris.length % 2 != 0) {
-                error(monitor, "WsdliLocationNotIRIPairs", reader);
-            }
-            for (int i=0; i<iris.length-1; i=i+2) {
-                wsBinding.getWsdliLocations().put(iris[i], iris[i+1]);
-            }
-        }
-
-        // Skip to end element
-        while (reader.hasNext()) {
-            int event = reader.next();
-            switch (event) {
-                case START_ELEMENT: {
-                    if (END_POINT_REFERENCE.equals(reader.getName().getLocalPart())) {
-                        if (wsdlElement != null && (wsdlElementIsBinding == null || !wsdlElementIsBinding)) {
-                        	error(monitor, "MustUseWsdlBinding", reader, wsdlElement);
-                            throw new ContributionReadException(wsdlElement + " must use wsdl.binding when using wsa:EndpointReference");
-                        }
-                        
-                        wsBinding.setEndPointReference(EndPointReferenceHelper.readEndPointReference(reader));
-                        endpointSpecifications.add("wsa:EndpointReference");
-                    } 
-                }
-                    break;
-
-            }
-
-            if (event == END_ELEMENT && BINDING_WS_QNAME.equals(reader.getName())) {
-                break;
-            }
-        }
-        
-        if (endpointSpecifications.size() > 1){
-            error(monitor, "MultipleEndpointsSpecified", reader, endpointSpecifications.toString() );
-        }
-        
-        return wsBinding;
-    }
-
-    protected void processEndPointReference(XMLStreamReader reader, WebServiceBinding wsBinding) {
-    }
-
-    public void write(WebServiceBinding wsBinding, XMLStreamWriter writer, ProcessorContext context) throws ContributionWriteException,
-        XMLStreamException {
-
-        // Write a <binding.ws>
-        writer.writeStartElement(SCA11_NS, BINDING_WS);
-        policyProcessor.writePolicyAttributes(wsBinding, writer);
-
-        // Write binding name
-        if (wsBinding.getName() != null) {
-            writer.writeAttribute(NAME, wsBinding.getName());
-        }
-
-        // Write binding URI
-        if (wsBinding.getURI() != null) {
-            writer.writeAttribute(URI, wsBinding.getURI());
-        }
-
-        // Write wsdlElement attribute
-        if (wsBinding.getPortName() != null) {
-
-            // Write namespace#wsdl.port(service/port)
-            String wsdlElement =
-                wsBinding.getServiceName().getNamespaceURI() + "#wsdl.port("
-                    + wsBinding.getServiceName().getLocalPart()
-                    + "/"
-                    + wsBinding.getPortName()
-                    + ")";
-            writer.writeAttribute(WSDL_ELEMENT, wsdlElement);
-
-        } else if (wsBinding.getEndpointName() != null) {
-
-            // Write namespace#wsdl.endpoint(service/endpoint)
-            String wsdlElement =
-                wsBinding.getServiceName().getNamespaceURI() + "#wsdl.endpoint("
-                    + wsBinding.getServiceName().getLocalPart()
-                    + "/"
-                    + wsBinding.getEndpointName()
-                    + ")";
-            writer.writeAttribute(WSDL_ELEMENT, wsdlElement);
-
-        } else if (wsBinding.getBindingName() != null) {
-
-            // Write namespace#wsdl.binding(binding)
-            String wsdlElement =
-                wsBinding.getBindingName().getNamespaceURI() + "#wsdl.binding("
-                    + wsBinding.getBindingName().getLocalPart()
-                    + ")";
-            writer.writeAttribute(WSDL_ELEMENT, wsdlElement);
-
-        } else if (wsBinding.getServiceName() != null) {
-
-            // Write namespace#wsdl.service(service)
-            String wsdlElement =
-                wsBinding.getServiceName().getNamespaceURI() + "#wsdl.service("
-                    + wsBinding.getServiceName().getLocalPart()
-                    + ")";
-            writer.writeAttribute(WSDL_ELEMENT, wsdlElement);
-        }
-
-        // Write wsdli:location
-        if (wsBinding.getWsdliLocations().size() > 0) {
-            StringBuilder wsdliLocation = new StringBuilder();
-            Map<String, String> wl = wsBinding.getWsdliLocations();
-            for (String ns : wl.keySet()) {
-                if (wsdliLocation.length() > 0) {
-                    wsdliLocation.append(' ');
-                }
-                wsdliLocation.append(ns); 
-                wsdliLocation.append(' '); 
-                wsdliLocation.append(wl.get(ns)); 
-            }
-            writer.writeAttribute(WSDLI_NS, WSDL_LOCATION, wsdliLocation.toString());
-        }
-
-        if (wsBinding.getEndPointReference() != null) {
-            EndPointReferenceHelper.writeEndPointReference(wsBinding.getEndPointReference(), writer);
-        }
-
-        writer.writeEndElement();
-    }
-
-    public void resolve(WebServiceBinding model, ModelResolver resolver, ProcessorContext context) throws ContributionResolveException {
-        
-    	if (model == null || !model.isUnresolved())
-    		return;
-    	Monitor monitor = context.getMonitor();	
-    	WSDLDefinition wsdlDefinition = wsdlFactory.createWSDLDefinition();
-        wsdlDefinition.setUnresolved(true);
-        wsdlDefinition.setNamespace(model.getNamespace());
-        wsdlDefinition.setNameOfBindingToResolve(model.getBindingName());
-        wsdlDefinition.setNameOfServiceToResolve(model.getServiceName());
-        wsdlDefinition.getWsdliLocations().putAll(model.getWsdliLocations());
-        WSDLDefinition resolved = resolver.resolveModel(WSDLDefinition.class, wsdlDefinition, context);
-
-        if (!resolved.isUnresolved()) {
-            wsdlDefinition.setDefinition(resolved.getDefinition());
-            wsdlDefinition.setLocation(resolved.getLocation());
-            wsdlDefinition.setURI(resolved.getURI());
-            wsdlDefinition.getImportedDefinitions().addAll(resolved.getImportedDefinitions());
-            wsdlDefinition.getXmlSchemas().addAll(resolved.getXmlSchemas());
-            wsdlDefinition.setUnresolved(false);
-            model.setUserSpecifiedWSDLDefinition(wsdlDefinition);
-            if (model.getBindingName() != null) {
-                WSDLObject<Binding> binding = wsdlDefinition.getWSDLObject(Binding.class, model.getBindingName());
-                if (binding != null) {
-                    wsdlDefinition.setDefinition(binding.getDefinition());
-                    model.setBinding(binding.getElement());
-                } else {
-                	error(monitor, "WsdlBindingDoesNotMatch", wsdlDefinition, model.getBindingName());
-                }
-            }
-            if (model.getServiceName() != null) {
-                WSDLObject<Service> service = wsdlDefinition.getWSDLObject(Service.class, model.getServiceName());
-                if (service != null) {
-                    wsdlDefinition.setDefinition(service.getDefinition());
-                    model.setService(service.getElement());
-                    
-                    Port port = null;
-                    if (model.getPortName() != null) {
-                        port = service.getElement().getPort(model.getPortName());
-                    } else {
-                        // BWS20006 - no port specified so pick the first one
-                        port = (Port)service.getElement().getPorts().values().iterator().next();
-                    }
-                    
-                    if (port != null) {
-                        model.setPort(port);
-                        model.setBinding(port.getBinding());
-                        
-                        // if no URI specified set it from the WSDL port location
-                        if (model.getURI() == null){
-                            model.setURI(getPortAddress(port));
-                        }
-                    } else {
-                        error(monitor, "WsdlPortTypeDoesNotMatch", wsdlDefinition, model.getPortName());
-                    }
-                } else {
-                	error(monitor, "WsdlServiceDoesNotMatch", wsdlDefinition, model.getServiceName());
-                }
-            }
-
-            PortType portType = getPortType(model);
-            if (portType != null) {
-                WSDLInterfaceContract interfaceContract = wsdlFactory.createWSDLInterfaceContract();
-                WSDLInterface wsdlInterface = null;
-                try {
-                    wsdlInterface = wsdlFactory.createWSDLInterface(portType, wsdlDefinition, resolver, context.getMonitor());
-                } catch (InvalidInterfaceException e) {
-                	warning(monitor, "InvalidInterfaceException", wsdlFactory, model.getName(), e.getMessage()); 
-                }
-                interfaceContract.setInterface(wsdlInterface);
-                interfaceContract.setCallbackInterface(wsdlInterface.getCallbackInterface());
-                model.setBindingInterfaceContract(interfaceContract);
-            }
-            
-            validateWSDL(context, model);
-        } else {
-            if (model.getBindingName() != null){
-                error(monitor, "WsdlBindingDoesNotMatch", model, model.getBindingName());
-            }
-            
-            if (model.getServiceName() != null){
-                error(monitor, "WsdlServiceDoesNotMatch", model, model.getServiceName());
-            }
-        }
-        
-        policyProcessor.resolvePolicies(model, resolver, context);
-    }
-
-    private void validateWSDL(ProcessorContext context, WebServiceBinding model) {
-        WSDLDefinition wsdlDefinition = model.getUserSpecifiedWSDLDefinition();
-        
-        Port port = model.getPort();
-        
-        if (port != null){
-            validateWSDLPort(context, model, port);
-        } 
-        
-        Binding binding = model.getBinding();
-        
-        if (binding != null){
-            validateWSDLBinding(context, model, binding);
-        } 
-    }
-    
-    private void validateWSDLPort(ProcessorContext context, WebServiceBinding model, Port port){
-        
-        validateWSDLBinding(context, model, port.getBinding());
-        
-    }
-    
-    private void validateWSDLBinding(ProcessorContext context, WebServiceBinding model, Binding binding){
-        // BWS20005 & BWS20010 
-        // Check that the WSDL binding is of a supported type
-        if (!model.isHTTPTransport() && !model.isJMSTransport()){
-            error(context.getMonitor(), 
-                  "InvalidWSDLBindingTransport", 
-                  model, 
-                  model.getBindingTransport());
-        }
-    }
-    
-    private PortType getPortType(WebServiceBinding model) {
-        PortType portType = null;
-        if (model.getPort() != null) {
-            portType = model.getPort().getBinding().getPortType();
-        } else if (model.getEndpoint() != null) {
-            portType = model.getPort().getBinding().getPortType();
-        } else if (model.getBinding() != null) {
-            portType = model.getBinding().getPortType();
-        } else if (model.getService() != null) {
-            // FIXME: How to find the compatible port?
-            Map ports = model.getService().getPorts();
-            if (!ports.isEmpty()) {
-                Port port = (Port)ports.values().iterator().next();
-                portType = port.getBinding().getPortType();
-            }
-        }
-        return portType;
-    }
-    
-    public static String getPortAddress(Port port) {
-        Object ext = port.getExtensibilityElements().get(0);
-        if (ext instanceof SOAPAddress) {
-            return ((SOAPAddress)ext).getLocationURI();
-        }
-        if (ext instanceof SOAP12Address) {
-            return ((SOAP12Address)ext).getLocationURI();
-        }
-        return null;
-    }    
-
-    public QName getArtifactType() {
-        return WebServiceConstants.BINDING_WS_QNAME;
-    }
-
-    public Class<WebServiceBinding> getModelType() {
-        return WebServiceBinding.class;
-    }
-
-}
diff --git a/sca-java-2.x/branches/2.0-Beta1/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/xml/WebServiceConstants.java b/sca-java-2.x/branches/2.0-Beta1/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/xml/WebServiceConstants.java
deleted file mode 100644
index a7126a67ee..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/modules/binding-ws/src/main/java/org/apache/tuscany/sca/binding/ws/xml/WebServiceConstants.java
+++ /dev/null
@@ -1,47 +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.ws.xml;
-
-import javax.xml.namespace.QName;
-
-/**
- * Constants for the Web Services Binding.
- *
- * @version $Rev$ $Date$
- */
-public interface WebServiceConstants {
-	String SCA11_NS = "http://docs.oasis-open.org/ns/opencsa/sca/200912";
-	
-    String BINDING_WS = "binding.ws";
-    QName BINDING_WS_QNAME = new QName(SCA11_NS, BINDING_WS);
-    
-    String WSDL_ELEMENT = "wsdlElement";
-    QName WSDL_ELEMENT_QNAME = new QName(SCA11_NS, WSDL_ELEMENT);
-    
-    String WSDL_LOCATION = "wsdlLocation";
-    String WSDLI_NS = "http://www.w3.org/ns/wsdl-instance";
-    
-    QName WSDL_LOCATION_QNAME = new QName(WSDLI_NS, WSDL_LOCATION); 
-    
-    String NAME = "name"; 
-    String URI = "uri"; 
-    String END_POINT_REFERENCE = "EndpointReference";
-    
-
-}