Remove constrainingType as it is now not part of the OASIS SCA specs

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

11 files changed, 1 insertions, 588 deletions

diff --git a/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/BaseAssemblyProcessor.java b/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/BaseAssemblyProcessor.java
index fea61f1ea0..4d04813011 100644
--- a/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/BaseAssemblyProcessor.java
+++ b/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/BaseAssemblyProcessor.java
@@ -65,9 +65,7 @@ import org.apache.tuscany.sca.assembly.Base;
 import org.apache.tuscany.sca.assembly.Binding;
 import org.apache.tuscany.sca.assembly.Component;
 import org.apache.tuscany.sca.assembly.ComponentService;
-import org.apache.tuscany.sca.assembly.ComponentType;
 import org.apache.tuscany.sca.assembly.Composite;
-import org.apache.tuscany.sca.assembly.ConstrainingType;
 import org.apache.tuscany.sca.assembly.Contract;
 import org.apache.tuscany.sca.assembly.Extensible;
 import org.apache.tuscany.sca.assembly.Implementation;
@@ -288,22 +286,6 @@ abstract class BaseAssemblyProcessor extends BaseStAXArtifactProcessor {
         return null;
     }
 
-    /**
-     * Returns the value of a constrainingType attribute.
-     * @param reader
-     * @return
-     */
-    protected ConstrainingType readConstrainingType(XMLStreamReader reader) {
-        QName constrainingTypeName = getQName(reader, Constants.CONSTRAINING_TYPE);
-        if (constrainingTypeName != null) {
-            ConstrainingType constrainingType = assemblyFactory.createConstrainingType();
-            constrainingType.setName(constrainingTypeName);
-            constrainingType.setUnresolved(true);
-            return constrainingType;
-        } else {
-            return null;
-        }
-    }
 
     /**
      * Reads an abstract property element.
@@ -425,88 +407,6 @@ abstract class BaseAssemblyProcessor extends BaseStAXArtifactProcessor {
     }
 
     /**
-     * Returns a constrainingType attribute.
-     * @param componentType
-     * @return
-     */
-    protected XAttr writeConstrainingType(ComponentType componentType) {
-        ConstrainingType constrainingType = componentType.getConstrainingType();
-        if (constrainingType != null)
-            return new XAttr(Constants.CONSTRAINING_TYPE, constrainingType.getName());
-        else
-            return null;
-    }
-
-    /*
-    protected List<Extension> readPropertyValue(XMLStreamReader reader) throws XMLStreamException,
-        ContributionReadException {
-        List<Extension> values = new ArrayList<Extension>();
-        QName name = reader.getName(); // Should be sca:property
-
-        // SCA 1.1 supports the @value for simple types
-        String valueAttr = getString(reader, VALUE);
-        if (valueAttr != null) {
-            Extension ext = assemblyFactory.createExtension();
-            ext.setValue(valueAttr);
-            ext.setQName(VALUE_QNAME);
-            ext.setAttribute(true);
-            values.add(ext);
-        }
-
-        boolean isTextForProperty = true;
-        StringBuffer text = new StringBuffer();
-
-        int event = reader.getEventType();
-        while (true) {
-            switch (event) {
-                case START_ELEMENT:
-                    name = reader.getName();
-                    if (PROPERTY_QNAME.equals(name)) {
-                        isTextForProperty = true;
-                        break;
-                    }
-                    isTextForProperty = false;
-                    // Read <value>
-                    if (VALUE_QNAME.equals(name)) {
-                        Object value = extensionProcessor.read(reader);
-                        // Assume the value is the XMLStreamReader for the content
-                        Extension ext = assemblyFactory.createExtension();
-                        ext.setValue(value);
-                        ext.setQName(name);
-                        values.add(ext);
-                    } else {
-                        // Global elements
-                        // FIXME: do we want to check if the element mataches property.element
-                        Object value = extensionProcessor.read(reader);
-                        Extension ext = assemblyFactory.createExtension();
-                        ext.setValue(value);
-                        ext.setQName(name);
-                        values.add(ext);
-                    }
-                    break;
-                case XMLStreamConstants.CHARACTERS:
-                case XMLStreamConstants.CDATA:
-                    if (isTextForProperty) {
-                        text.append(reader.getText());
-                    }
-                    break;
-                case END_ELEMENT:
-                    name = reader.getName();
-                    if (PROPERTY_QNAME.equals(name)) {
-                        return values;
-                    }
-                    break;
-            }
-            if (reader.hasNext()) {
-                event = reader.next();
-            } else {
-                return values;
-            }
-        }
-    }
-    */
-    
-    /**
      * Read a property value into a DOM document.
      * @param element
      * @param type
diff --git a/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeProcessor.java b/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeProcessor.java
index 404574ca02..a878054d99 100644
--- a/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeProcessor.java
+++ b/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ComponentTypeProcessor.java
@@ -108,7 +108,6 @@ public class ComponentTypeProcessor extends BaseAssemblyProcessor implements StA
     
                             // Read a <componentType>
                             componentType = assemblyFactory.createComponentType();
-                            componentType.setConstrainingType(readConstrainingType(reader));
     
                         } else if (Constants.SERVICE_QNAME.equals(name)) {
     
@@ -239,8 +238,7 @@ public class ComponentTypeProcessor extends BaseAssemblyProcessor implements StA
     public void write(ComponentType componentType, XMLStreamWriter writer, ProcessorContext context) throws ContributionWriteException, XMLStreamException {
         
         // Write <componentType> element
-        writeStartDocument(writer, COMPONENT_TYPE,
-               writeConstrainingType(componentType));
+        writeStartDocument(writer, COMPONENT_TYPE);
 
         // Write <service> elements
         for (Service service : componentType.getServices()) {
diff --git a/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeProcessor.java b/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeProcessor.java
index ddcf2d4463..026e0426af 100644
--- a/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeProcessor.java
+++ b/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/CompositeProcessor.java
@@ -77,7 +77,6 @@ import org.apache.tuscany.sca.assembly.ComponentService;
 import org.apache.tuscany.sca.assembly.Composite;
 import org.apache.tuscany.sca.assembly.CompositeReference;
 import org.apache.tuscany.sca.assembly.CompositeService;
-import org.apache.tuscany.sca.assembly.ConstrainingType;
 import org.apache.tuscany.sca.assembly.Contract;
 import org.apache.tuscany.sca.assembly.Implementation;
 import org.apache.tuscany.sca.assembly.Property;
@@ -195,7 +194,6 @@ public class CompositeProcessor extends BaseAssemblyProcessor implements StAXArt
                             this.readExtendedAttributes(reader, name, composite, extensionAttributeProcessor, context);
 
                             composite.setLocal(getBoolean(reader, LOCAL));
-                            composite.setConstrainingType(readConstrainingType(reader));
                             policyProcessor.readPolicies(composite, reader);
 
                         } else if (INCLUDE_QNAME.equals(name)) {
@@ -416,7 +414,6 @@ public class CompositeProcessor extends BaseAssemblyProcessor implements StAXArt
                             //handle extension attributes
                             this.readExtendedAttributes(reader, name, component, extensionAttributeProcessor, context);
 
-                            component.setConstrainingType(readConstrainingType(reader));
                             composite.getComponents().add(component);
                             policyProcessor.readPolicies(component, reader);
 
@@ -600,7 +597,6 @@ public class CompositeProcessor extends BaseAssemblyProcessor implements StAXArt
         // Write <composite> element
         writeStartDocument(writer,
                            COMPOSITE,
-                           writeConstrainingType(composite),
                            new XAttr(TARGET_NAMESPACE, composite.getName().getNamespaceURI()),
                            new XAttr(NAME, composite.getName().getLocalPart()),
                            new XAttr(LOCAL, composite.isLocal() ? Boolean.TRUE : null),
@@ -947,13 +943,6 @@ public class CompositeProcessor extends BaseAssemblyProcessor implements StAXArt
         try {
             monitor.pushContext("Composite: " + composite.getName());
 
-            // Resolve constraining type
-            ConstrainingType constrainingType = composite.getConstrainingType();
-            if (constrainingType != null) {
-                constrainingType = resolver.resolveModel(ConstrainingType.class, constrainingType, context);
-                composite.setConstrainingType(constrainingType);
-            }
-
             // Resolve includes in the composite
             for (int i = 0, n = composite.getIncludes().size(); i < n; i++) {
                 Composite include = composite.getIncludes().get(i);
@@ -990,11 +979,6 @@ public class CompositeProcessor extends BaseAssemblyProcessor implements StAXArt
 
             // Resolve component implementations, services and references
             for (Component component : composite.getComponents()) {
-                constrainingType = component.getConstrainingType();
-                if (constrainingType != null) {
-                    constrainingType = resolver.resolveModel(ConstrainingType.class, constrainingType, context);
-                    component.setConstrainingType(constrainingType);
-                }
 
                 //resolve component services and references
                 resolveContracts(component, component.getServices(), resolver, context);
diff --git a/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/Constants.java b/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/Constants.java
index ce8b461a27..3f8031ebb2 100644
--- a/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/Constants.java
+++ b/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/Constants.java
@@ -42,9 +42,6 @@ public interface Constants {
     String PROPERTY = "property";
     QName PROPERTY_QNAME = new QName(SCA11_NS, PROPERTY);
     
-    String CONSTRAINING_TYPE = "constrainingType";
-    QName CONSTRAINING_TYPE_QNAME = new QName(SCA11_NS, CONSTRAINING_TYPE);
-    
     String COMPOSITE = "composite";
     QName COMPOSITE_QNAME = new QName(SCA11_NS, COMPOSITE);
     
diff --git a/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeDocumentProcessor.java b/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeDocumentProcessor.java
deleted file mode 100644
index a1543401f1..0000000000
--- a/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeDocumentProcessor.java
+++ /dev/null
@@ -1,106 +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.assembly.xml;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URI;
-import java.net.URL;
-
-import javax.xml.stream.XMLInputFactory;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamReader;
-
-import org.apache.tuscany.sca.assembly.ConstrainingType;
-import org.apache.tuscany.sca.common.java.io.IOHelper;
-import org.apache.tuscany.sca.contribution.processor.ContributionReadException;
-import org.apache.tuscany.sca.contribution.processor.ContributionResolveException;
-import org.apache.tuscany.sca.contribution.processor.ProcessorContext;
-import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;
-import org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor;
-import org.apache.tuscany.sca.contribution.processor.ValidatingXMLInputFactory;
-import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
-import org.apache.tuscany.sca.core.FactoryExtensionPoint;
-
-/**
- * A contrainingType content handler.
- * 
- * @version $Rev$ $Date$
- */
-public class ConstrainingTypeDocumentProcessor extends BaseAssemblyProcessor implements URLArtifactProcessor<ConstrainingType> {
-    private XMLInputFactory inputFactory;
-
-    /**
-     * Constructs a new constrainingType processor.
-     * @param modelFactories
-     * @param staxProcessor
-     */
-    public ConstrainingTypeDocumentProcessor(FactoryExtensionPoint modelFactories,
-                                             StAXArtifactProcessor staxProcessor) {
-        super(modelFactories, staxProcessor);
-        this.inputFactory = modelFactories.getFactory(ValidatingXMLInputFactory.class);
-    }
-    
-    public ConstrainingType read(URL contributionURL, URI uri, URL url, ProcessorContext context) throws ContributionReadException {
-        InputStream urlStream = null;
-        try {
-            
-            // Create a stream reader
-            urlStream = IOHelper.openStream(url);
-            XMLStreamReader reader = inputFactory.createXMLStreamReader(url.toString(), urlStream);
-            reader.nextTag();
-            
-            // Read the constrainingType model 
-            ConstrainingType constrainingType = (ConstrainingType)extensionProcessor.read(reader, context);
-           
-            return constrainingType;
-            
-        } catch (XMLStreamException e) {
-        	ContributionReadException ce = new ContributionReadException(e);
-        	error(context.getMonitor(), "ContributionReadException", inputFactory, ce);
-            throw ce;
-        } catch (IOException e) {
-        	ContributionReadException ce = new ContributionReadException(e);
-        	error(context.getMonitor(), "ContributionReadException", inputFactory, ce);
-            throw ce;
-        } finally {
-            try {
-                if (urlStream != null) {
-                    urlStream.close();
-                    urlStream = null;
-                }
-            } catch (IOException ioe) {
-                //ignore
-            }
-        }
-    }
-    
-    public void resolve(ConstrainingType constrainingType, ModelResolver resolver, ProcessorContext context) throws ContributionResolveException {
-        extensionProcessor.resolve(constrainingType, resolver, context);
-    }
-    
-    public String getArtifactType() {
-        return ".constrainingType";
-    }
-    
-    public Class<ConstrainingType> getModelType() {
-        return ConstrainingType.class;
-    }
-}
diff --git a/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeModelResolver.java b/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeModelResolver.java
deleted file mode 100644
index 413a90766c..0000000000
--- a/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeModelResolver.java
+++ /dev/null
@@ -1,84 +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.assembly.xml;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.xml.namespace.QName;
-
-import org.apache.tuscany.sca.assembly.ConstrainingType;
-import org.apache.tuscany.sca.contribution.Contribution;
-import org.apache.tuscany.sca.contribution.Import;
-import org.apache.tuscany.sca.contribution.namespace.NamespaceImport;
-import org.apache.tuscany.sca.contribution.processor.ProcessorContext;
-import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
-import org.apache.tuscany.sca.core.FactoryExtensionPoint;
-
-/**
- * A Model Resolver for ConstrainingType models.
- *
- * @version $Rev$ $Date$
- */
-public class ConstrainingTypeModelResolver implements ModelResolver {
-
-    private Contribution contribution;
-    private Map<QName, ConstrainingType> map = new HashMap<QName, ConstrainingType>();
-    
-    public ConstrainingTypeModelResolver(Contribution contribution, FactoryExtensionPoint modelFactories) {
-        this.contribution = contribution;
-    }
-
-    public void addModel(Object resolved, ProcessorContext context) {
-        ConstrainingType composite = (ConstrainingType)resolved;
-        map.put(composite.getName(), composite);
-    }
-    
-    public Object removeModel(Object resolved, ProcessorContext context) {
-        return map.remove(((ConstrainingType)resolved).getName());
-    }
-    
-    public <T> T resolveModel(Class<T> modelClass, T unresolved, ProcessorContext context) {
-        
-        // Lookup a definition for the given namespace
-        QName qname = ((ConstrainingType)unresolved).getName();
-        ConstrainingType resolved = (ConstrainingType) map.get(qname);
-        if (resolved != null) {
-            return modelClass.cast(resolved);
-        }
-        
-        // No definition found, delegate the resolution to the imports
-        for (Import import_ : this.contribution.getImports()) {
-            if (import_ instanceof NamespaceImport) {
-                NamespaceImport namespaceImport = (NamespaceImport)import_;
-                if (namespaceImport.getNamespace().equals(qname.getNamespaceURI())) {
-                    
-                    // Delegate the resolution to the import resolver
-                    resolved = namespaceImport.getModelResolver().resolveModel(ConstrainingType.class, (ConstrainingType)unresolved, context);
-                    if (!resolved.isUnresolved()) {
-                        return modelClass.cast(resolved);
-                    }
-                }
-            }
-        }
-        return (T)unresolved;
-    }
-    
-}
diff --git a/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeProcessor.java b/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeProcessor.java
deleted file mode 100644
index e3e3409b55..0000000000
--- a/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ConstrainingTypeProcessor.java
+++ /dev/null
@@ -1,272 +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.assembly.xml;
-
-import static javax.xml.stream.XMLStreamConstants.END_ELEMENT;
-import static javax.xml.stream.XMLStreamConstants.START_ELEMENT;
-import static org.apache.tuscany.sca.assembly.xml.Constants.CONSTRAINING_TYPE;
-import static org.apache.tuscany.sca.assembly.xml.Constants.CONSTRAINING_TYPE_QNAME;
-import static org.apache.tuscany.sca.assembly.xml.Constants.ELEMENT;
-import static org.apache.tuscany.sca.assembly.xml.Constants.MANY;
-import static org.apache.tuscany.sca.assembly.xml.Constants.MUST_SUPPLY;
-import static org.apache.tuscany.sca.assembly.xml.Constants.NAME;
-import static org.apache.tuscany.sca.assembly.xml.Constants.OPERATION_QNAME;
-import static org.apache.tuscany.sca.assembly.xml.Constants.PROPERTY;
-import static org.apache.tuscany.sca.assembly.xml.Constants.PROPERTY_QNAME;
-import static org.apache.tuscany.sca.assembly.xml.Constants.REFERENCE;
-import static org.apache.tuscany.sca.assembly.xml.Constants.REFERENCE_QNAME;
-import static org.apache.tuscany.sca.assembly.xml.Constants.SERVICE;
-import static org.apache.tuscany.sca.assembly.xml.Constants.SERVICE_QNAME;
-import static org.apache.tuscany.sca.assembly.xml.Constants.TARGET_NAMESPACE;
-import static org.apache.tuscany.sca.assembly.xml.Constants.TYPE;
-
-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.AbstractContract;
-import org.apache.tuscany.sca.assembly.AbstractProperty;
-import org.apache.tuscany.sca.assembly.AbstractReference;
-import org.apache.tuscany.sca.assembly.AbstractService;
-import org.apache.tuscany.sca.assembly.ConstrainingType;
-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;
-import org.apache.tuscany.sca.interfacedef.InterfaceContract;
-import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.interfacedef.impl.OperationImpl;
-import org.w3c.dom.Document;
-
-/**
- * A constrainingType processor.
- * 
- * @version $Rev$ $Date$
- */
-public class ConstrainingTypeProcessor extends BaseAssemblyProcessor implements StAXArtifactProcessor<ConstrainingType> {
-
-    /**
-     * Constructs a new constrainingType processor.
-     * 
-     * @param modelFactories
-     * @param extensionProcessor
-     */
-    public ConstrainingTypeProcessor(FactoryExtensionPoint modelFactories,
-                                     StAXArtifactProcessor extensionProcessor) {
-        super(modelFactories, extensionProcessor);
-    }
-    
-    public ConstrainingType read(XMLStreamReader reader, ProcessorContext context) throws ContributionReadException {
-        ConstrainingType constrainingType = null;
-        AbstractService abstractService = null;
-        AbstractReference abstractReference = null;
-        AbstractProperty abstractProperty = null;
-        AbstractContract abstractContract = null;
-        QName name = null;
-        
-        try {
-            // Read the constrainingType document
-            while (reader.hasNext()) {
-                int event = reader.getEventType();
-                switch (event) {
-    
-                    case START_ELEMENT:
-                        name = reader.getName();
-                        
-                        // Read a <constrainingType>
-                        if (Constants.CONSTRAINING_TYPE_QNAME.equals(name)) {
-                            constrainingType = assemblyFactory.createConstrainingType();
-                            constrainingType.setName(new QName(getString(reader, TARGET_NAMESPACE), getString(reader, NAME)));
-                            policyProcessor.readPolicies(constrainingType, reader);
-    
-                        } else if (Constants.SERVICE_QNAME.equals(name)) {
-                            
-                            // Read a <service>
-                            abstractService = assemblyFactory.createAbstractService();
-                            abstractContract = abstractService;
-                            abstractService.setName(getString(reader, Constants.NAME));
-                            constrainingType.getServices().add(abstractService);
-                            policyProcessor.readPolicies(abstractService, reader);
-    
-                        } else if (Constants.REFERENCE_QNAME.equals(name)) {
-                            
-                            // Read a <reference>
-                            abstractReference = assemblyFactory.createAbstractReference();
-                            abstractContract = abstractReference;
-                            abstractReference.setName(getString(reader, Constants.NAME));
-                            readMultiplicity(abstractReference, reader);
-                            constrainingType.getReferences().add(abstractReference);
-                            policyProcessor.readPolicies(abstractReference, reader);
-    
-                        } else if (Constants.PROPERTY_QNAME.equals(name)) {
-                            
-                            // Read a <property>
-                            abstractProperty = assemblyFactory.createAbstractProperty();
-                            readAbstractProperty(abstractProperty, reader, context);
-                            
-                            // Read the property value
-                            Document value = readPropertyValue(abstractProperty.getXSDElement(), abstractProperty.getXSDType(), abstractProperty.isMany(), reader, context);
-                            abstractProperty.setValue(value);
-                            
-                            constrainingType.getProperties().add(abstractProperty);
-                            policyProcessor.readPolicies(abstractProperty, reader);
-                            
-                        } else if (OPERATION_QNAME.equals(name)) {
-    
-                            // Read an <operation>
-                            Operation operation = new OperationImpl();
-                            operation.setName(getString(reader, NAME));
-                            operation.setUnresolved(true);
-                            policyProcessor.readPolicies(abstractContract, operation, reader);
-                            
-                        } else {
-    
-                            // Read an extension element
-                            Object extension = extensionProcessor.read(reader, context);
-                            if (extension instanceof InterfaceContract) {
-                                
-                                // <service><interface> and <reference><interface>
-                                abstractContract.setInterfaceContract((InterfaceContract)extension);
-                            } else {
-    
-                                // Add the extension element to the current element
-                                if (abstractContract != null) {
-                                    abstractContract.getExtensions().add(extension);
-                                } else {
-                                    constrainingType.getExtensions().add(extension);
-                                }
-                                
-                            }
-                        }
-                        break;
-    
-                    case END_ELEMENT:
-                        name = reader.getName();
-    
-                        // Clear current state when reading reaching end element
-                        if (SERVICE_QNAME.equals(name)) {
-                            abstractService = null;
-                            abstractContract = null;
-                        } else if (REFERENCE_QNAME.equals(name)) {
-                            abstractReference = null;
-                            abstractContract = null;
-                        } else if (PROPERTY_QNAME.equals(name)) {
-                            abstractProperty = null;
-                        }
-                        break;
-                }
-                if (reader.hasNext()) {
-                    reader.next();
-                }
-            }
-        }
-        catch (XMLStreamException e) {
-            ContributionReadException ex = new ContributionReadException(e);
-            error(context.getMonitor(), "XMLStreamException", reader, ex);
-        }
-        
-        return constrainingType;
-    }
-    
-    public void write(ConstrainingType constrainingType, XMLStreamWriter writer, ProcessorContext context) throws ContributionWriteException, XMLStreamException {
-
-        // Write <constrainingType> element
-        writeStartDocument(writer, CONSTRAINING_TYPE,
-           new XAttr(TARGET_NAMESPACE, constrainingType.getName().getNamespaceURI()),
-           new XAttr(NAME, constrainingType.getName().getLocalPart()),
-           policyProcessor.writePolicies(constrainingType));
-
-        // Write <service> elements 
-        for (AbstractService service : constrainingType.getServices()) {
-            writeStart(writer, SERVICE, new XAttr(NAME, service.getName()),
-                       policyProcessor.writePolicies(service));
-            
-            extensionProcessor.write(service.getInterfaceContract(), writer, context);
-
-            for (Object extension: service.getExtensions()) {
-                extensionProcessor.write(extension, writer, context);
-            }
-            
-            writeEnd(writer);
-        }
-
-        // Write <reference> elements
-        for (AbstractReference reference : constrainingType.getReferences()) {
-            writeStart(writer, REFERENCE, new XAttr(NAME, reference.getName()),
-                       writeMultiplicity(reference),
-                       policyProcessor.writePolicies(reference));
-            
-            extensionProcessor.write(reference.getInterfaceContract(), writer, context);
-
-            for (Object extension: reference.getExtensions()) {
-                extensionProcessor.write(extension, writer, context);
-            }
-            
-            writeEnd(writer);
-        }
-
-        // Write <property> elements
-        for (AbstractProperty abstractProperty : constrainingType.getProperties()) {
-            writeStart(writer,
-                       PROPERTY,
-                       new XAttr(NAME, abstractProperty.getName()),
-                       new XAttr(MUST_SUPPLY, abstractProperty.isMustSupply()),
-                       new XAttr(MANY, abstractProperty.isMany()),
-                       new XAttr(TYPE, abstractProperty.getXSDType()),
-                       new XAttr(ELEMENT, abstractProperty.getXSDElement()),
-                       policyProcessor.writePolicies(abstractProperty));
-
-            // Write property value
-            writePropertyValue(abstractProperty.getValue(), abstractProperty.getXSDElement(), abstractProperty.getXSDType(), writer);
-
-            // Write extensions
-            for (Object extension : abstractProperty.getExtensions()) {
-                extensionProcessor.write(extension, writer, context);
-            }
-
-            writeEnd(writer);
-        }
-
-        // Write extension elements
-        for (Object extension: constrainingType.getExtensions()) {
-            extensionProcessor.write(extension, writer, context);
-        }
-        
-        writeEndDocument(writer);
-    }
-    
-    public void resolve(ConstrainingType constrainingType, ModelResolver resolver, ProcessorContext context) throws ContributionResolveException {
-        // Resolve component type services and references
-        resolveAbstractContracts(constrainingType.getServices(), resolver, context);
-        resolveAbstractContracts(constrainingType.getReferences(), resolver, context);
-    }
-    
-    public QName getArtifactType() {
-        return CONSTRAINING_TYPE_QNAME;
-    }
-    
-    public Class<ConstrainingType> getModelType() {
-        return ConstrainingType.class;
-    }
-}
diff --git a/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/DefaultBeanModelProcessor.java b/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/DefaultBeanModelProcessor.java
index 06ca9635f8..198ddfbfeb 100644
--- a/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/DefaultBeanModelProcessor.java
+++ b/java/sca/modules/assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/DefaultBeanModelProcessor.java
@@ -217,7 +217,6 @@ public class DefaultBeanModelProcessor<T> extends BaseAssemblyProcessor implemen
                         implementation.getServices().addAll(componentType.getServices());
                         implementation.getReferences().addAll(componentType.getReferences());
                         implementation.getProperties().addAll(componentType.getProperties());
-                        implementation.setConstrainingType(componentType.getConstrainingType());
 
                         if (implementation instanceof PolicySubject &&
                                 componentType instanceof PolicySubject ) {
diff --git a/java/sca/modules/assembly-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/java/sca/modules/assembly-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 34226922a3..5330206cd0 100644
--- a/java/sca/modules/assembly-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/java/sca/modules/assembly-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
@@ -17,7 +17,6 @@
 

 # Implementation class for the artifact processor extension

 org.apache.tuscany.sca.assembly.xml.ComponentTypeProcessor;qname=http://docs.oasis-open.org/ns/opencsa/sca/200903#componentType,model=org.apache.tuscany.sca.assembly.ComponentType

-org.apache.tuscany.sca.assembly.xml.ConstrainingTypeProcessor;qname=http://docs.oasis-open.org/ns/opencsa/sca/200903#constrainingType,model=org.apache.tuscany.sca.assembly.ConstrainingType

 org.apache.tuscany.sca.assembly.xml.CompositeProcessor;qname=http://docs.oasis-open.org/ns/opencsa/sca/200903#composite,model=org.apache.tuscany.sca.assembly.Composite

 org.apache.tuscany.sca.assembly.xml.SCABindingProcessor;qname=http://docs.oasis-open.org/ns/opencsa/sca/200903#binding.sca,model=org.apache.tuscany.sca.assembly.SCABinding

 org.apache.tuscany.sca.assembly.xml.EndpointProcessor;qname=http://tuscany.apache.org/xmlns/sca/1.1#binding.rmi#endpoint,model=org.apache.tuscany.sca.assembly.Endpoint

diff --git a/java/sca/modules/assembly-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor b/java/sca/modules/assembly-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor
index 7aea528fd6..358969d621 100644
--- a/java/sca/modules/assembly-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor
+++ b/java/sca/modules/assembly-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor
@@ -17,6 +17,5 @@
 
 # Implementation class for the artifact processor extension
 org.apache.tuscany.sca.assembly.xml.ComponentTypeDocumentProcessor;type=.componentType,model=org.apache.tuscany.sca.assembly.ComponentType
-org.apache.tuscany.sca.assembly.xml.ConstrainingTypeDocumentProcessor;type=.constrainingType,model=org.apache.tuscany.sca.assembly.ConstrainingType
 org.apache.tuscany.sca.assembly.xml.CompositeDocumentProcessor;type=.composite,model=org.apache.tuscany.sca.assembly.Composite
 org.apache.tuscany.sca.definitions.xml.DefinitionsDocumentProcessor;type=/META-INF/definitions.xml,model=org.apache.tuscany.sca.definitions.Definitions
diff --git a/java/sca/modules/assembly-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver b/java/sca/modules/assembly-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
index 9be95191d4..00862d32de 100644
--- a/java/sca/modules/assembly-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
+++ b/java/sca/modules/assembly-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
@@ -16,6 +16,5 @@
 # under the License. 

 

 org.apache.tuscany.sca.assembly.xml.CompositeModelResolver;model=org.apache.tuscany.sca.assembly.Composite

-org.apache.tuscany.sca.assembly.xml.ConstrainingTypeModelResolver;model=org.apache.tuscany.sca.assembly.ConstrainingType

 org.apache.tuscany.sca.assembly.xml.ComponentTypeModelResolver;model=org.apache.tuscany.sca.assembly.ComponentType

 org.apache.tuscany.sca.contribution.resolver.DefaultModelResolver;model=org.apache.tuscany.sca.policy.Intent