Delete previous 1.5 branch thats now old and unused and will be replaced with the current 1.x trunk

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

9 files changed, 0 insertions, 1498 deletions

diff --git a/branches/sca-java-1.5/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/BindingTypeProcessor.java b/branches/sca-java-1.5/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/BindingTypeProcessor.java
deleted file mode 100644
index d47cbd7dbe..0000000000
--- a/branches/sca-java-1.5/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/BindingTypeProcessor.java
+++ /dev/null
@@ -1,68 +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.policy.xml;
-
-import javax.xml.namespace.QName;
-
-import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
-import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;
-import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
-import org.apache.tuscany.sca.contribution.service.ContributionResolveException;
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.policy.IntentAttachPointType;
-import org.apache.tuscany.sca.policy.IntentAttachPointTypeFactory;
-import org.apache.tuscany.sca.policy.PolicyFactory;
-import org.apache.tuscany.sca.policy.impl.BindingTypeImpl;
-
-
-/**
- * Processor for handling XML models of BindingType meta data definitions
- *
- * @version $Rev$ $Date$
- */
-public class BindingTypeProcessor extends IntentAttachPointTypeProcessor {
-
-    public BindingTypeProcessor(PolicyFactory policyFactory, IntentAttachPointTypeFactory intentAttachPointTypeFactory, 
-    		                    StAXArtifactProcessor<Object> extensionProcessor, Monitor monitor) {
-        super(policyFactory, intentAttachPointTypeFactory, extensionProcessor, monitor);
-    }
-
-    public BindingTypeProcessor(ModelFactoryExtensionPoint modelFactories, 
-    		                    StAXArtifactProcessor<Object> extensionProcessor,
-    		                    Monitor monitor) {
-        super(modelFactories.getFactory(PolicyFactory.class),
-              modelFactories.getFactory(IntentAttachPointTypeFactory.class), extensionProcessor, monitor);
-    }
-
-    public QName getArtifactType() {
-        return BINDING_TYPE_QNAME;
-    }
-    
-    @Override
-    protected IntentAttachPointType resolveExtensionType(IntentAttachPointType extnType, ModelResolver resolver) throws ContributionResolveException {
-        if ( extnType instanceof BindingTypeImpl ) {
-            BindingTypeImpl bindingType = (BindingTypeImpl)extnType;
-            return resolver.resolveModel(BindingTypeImpl.class, bindingType);
-        } else {
-            return extnType;
-        }
-        
-    }
-}
diff --git a/branches/sca-java-1.5/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/ImplementationTypeProcessor.java b/branches/sca-java-1.5/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/ImplementationTypeProcessor.java
deleted file mode 100644
index 119afa3473..0000000000
--- a/branches/sca-java-1.5/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/ImplementationTypeProcessor.java
+++ /dev/null
@@ -1,68 +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.policy.xml;
-
-import javax.xml.namespace.QName;
-
-import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
-import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;
-import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
-import org.apache.tuscany.sca.contribution.service.ContributionResolveException;
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.policy.IntentAttachPointType;
-import org.apache.tuscany.sca.policy.IntentAttachPointTypeFactory;
-import org.apache.tuscany.sca.policy.PolicyFactory;
-import org.apache.tuscany.sca.policy.impl.ImplementationTypeImpl;
-
-
-/**
- * Processor for handling XML models of ImplementationType meta data definitions
- *
- * @version $Rev$ $Date$
- */
-public class ImplementationTypeProcessor extends IntentAttachPointTypeProcessor {
-	
-    public ImplementationTypeProcessor(PolicyFactory policyFactory, IntentAttachPointTypeFactory intentAttachPointTypeFactory, 
-    		                           StAXArtifactProcessor<Object> extensionProcessor, Monitor monitor) {
-        super(policyFactory, intentAttachPointTypeFactory, extensionProcessor, monitor);
-    }
-
-    public ImplementationTypeProcessor(ModelFactoryExtensionPoint modelFactories, 
-    								   StAXArtifactProcessor<Object> extensionProcessor,
-    								   Monitor monitor) {
-        super(modelFactories.getFactory(PolicyFactory.class),
-              modelFactories.getFactory(IntentAttachPointTypeFactory.class), extensionProcessor, monitor);
-    }
-
-    public QName getArtifactType() {
-        return IMPLEMENTATION_TYPE_QNAME;
-    }
-    
-    @Override
-    protected IntentAttachPointType resolveExtensionType(IntentAttachPointType extnType, ModelResolver resolver) throws ContributionResolveException {
-        if ( extnType instanceof ImplementationTypeImpl ) {
-            ImplementationTypeImpl implType = (ImplementationTypeImpl)extnType;
-            return resolver.resolveModel(ImplementationTypeImpl.class, implType);
-        } else {
-            return extnType;
-        }
-        
-    }
-}
diff --git a/branches/sca-java-1.5/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/IntentAttachPointTypeProcessor.java b/branches/sca-java-1.5/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/IntentAttachPointTypeProcessor.java
deleted file mode 100644
index ec357aea93..0000000000
--- a/branches/sca-java-1.5/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/IntentAttachPointTypeProcessor.java
+++ /dev/null
@@ -1,248 +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.policy.xml;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.StringTokenizer;
-
-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.builder.impl.ProblemImpl;
-import org.apache.tuscany.sca.contribution.processor.BaseStAXArtifactProcessor;
-import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;
-import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
-import org.apache.tuscany.sca.contribution.service.ContributionReadException;
-import org.apache.tuscany.sca.contribution.service.ContributionResolveException;
-import org.apache.tuscany.sca.contribution.service.ContributionWriteException;
-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.Intent;
-import org.apache.tuscany.sca.policy.IntentAttachPointType;
-import org.apache.tuscany.sca.policy.IntentAttachPointTypeFactory;
-import org.apache.tuscany.sca.policy.PolicyFactory;
-import org.apache.tuscany.sca.policy.impl.BindingTypeImpl;
-import org.apache.tuscany.sca.policy.impl.ImplementationTypeImpl;
-
-
-/**
- * Processor for handling XML models of ExtensionType meta data definitions
- *
- * @version $Rev$ $Date$
- */
-abstract class IntentAttachPointTypeProcessor extends BaseStAXArtifactProcessor implements StAXArtifactProcessor<IntentAttachPointType>, PolicyConstants {
-
-    private IntentAttachPointTypeFactory attachPointTypeFactory;
-    private PolicyFactory policyFactory;
-    private Monitor monitor;
-    
-    protected abstract IntentAttachPointType resolveExtensionType(IntentAttachPointType extnType, ModelResolver resolver) throws ContributionResolveException;
-
-    public IntentAttachPointTypeProcessor(PolicyFactory policyFactory, 
-    		                              IntentAttachPointTypeFactory attachPointTypeFactory, 
-    		                              StAXArtifactProcessor<Object> extensionProcessor,
-    		                              Monitor monitor) {
-        this.policyFactory = policyFactory;
-        this.attachPointTypeFactory = attachPointTypeFactory;
-        this.monitor = monitor;
-    }
-    
-    /**
-     * Report a error.
-     * 
-     * @param problems
-     * @param message
-     * @param model
-     */
-    private void error(String message, Object model, Object... messageParameters) {
-    	 if (monitor != null) {
-    		 Problem problem = new ProblemImpl(this.getClass().getName(), "policy-xml-validation-messages", Severity.ERROR, model, message, (Object[])messageParameters);
-    	     monitor.problem(problem);
-    	 }        
-    }
-    
-    public IntentAttachPointType read(XMLStreamReader reader) throws ContributionReadException, XMLStreamException {
-        QName type = getQName(reader, TYPE);
-        
-        if ( type != null ) {
-            if ( type.getLocalPart().startsWith(BINDING) ) {
-                IntentAttachPointType bindingType = attachPointTypeFactory.createBindingType();
-                bindingType.setName(type);
-                bindingType.setUnresolved(true);
-                
-                readAlwaysProvidedIntents(bindingType, reader);
-                readMayProvideIntents(bindingType, reader);
-                return bindingType; 
-            } else if ( type.getLocalPart().startsWith(IMPLEMENTATION) ) {
-                IntentAttachPointType implType = attachPointTypeFactory.createImplementationType();
-                implType.setName(type);
-                implType.setUnresolved(true);
-                
-                readAlwaysProvidedIntents(implType, reader);
-                readMayProvideIntents(implType, reader);
-                return implType;
-            } else {
-            	error("UnrecognizedIntentAttachPointType", reader, type);
-                //throw new ContributionReadException("Unrecognized IntentAttachPointType - " + type);
-            }
-        } else {
-        	error("RequiredAttributeMissing", reader, TYPE);
-            //throw new ContributionReadException("Required attribute '" + TYPE + 
-                                                //"' missing from BindingType Definition");
-        }        
-        return null;
-    }
-
-    private void readAlwaysProvidedIntents(IntentAttachPointType extnType, XMLStreamReader reader) {
-        String value = reader.getAttributeValue(null, ALWAYS_PROVIDES);
-        if (value != null) {
-            List<Intent> alwaysProvided = extnType.getAlwaysProvidedIntents();
-            for (StringTokenizer tokens = new StringTokenizer(value); tokens.hasMoreTokens();) {
-                QName qname = getQNameValue(reader, tokens.nextToken());
-                Intent intent = policyFactory.createIntent();
-                intent.setName(qname);
-                alwaysProvided.add(intent);
-            }
-        }
-    }
-    
-    private void readMayProvideIntents(IntentAttachPointType extnType, XMLStreamReader reader) {
-        String value = reader.getAttributeValue(null, MAY_PROVIDE);
-        if (value != null) {
-            List<Intent> mayProvide = extnType.getMayProvideIntents();
-            for (StringTokenizer tokens = new StringTokenizer(value); tokens.hasMoreTokens();) {
-                QName qname = getQNameValue(reader, tokens.nextToken());
-                Intent intent = policyFactory.createIntent();
-                intent.setName(qname);
-                mayProvide.add(intent);
-            }
-        }
-    }
-  
-    public void write(IntentAttachPointType extnType, XMLStreamWriter writer) throws ContributionWriteException, XMLStreamException {
-
-        // Write an <sca:bindingType or sca:implementationType>
-        if ( extnType instanceof BindingTypeImpl ) {
-            writer.writeStartElement(SCA10_NS, BINDING_TYPE);
-        } else if ( extnType instanceof ImplementationTypeImpl ) {
-            writer.writeStartElement(SCA10_NS, IMPLEMENTATION_TYPE);
-        }
-        
-        writeAlwaysProvidesIntentsAttribute(extnType, writer);
-        writeMayProvideIntentsAttribute(extnType, writer);
-        
-        writer.writeEndElement();
-    }
-    
-    private void writeMayProvideIntentsAttribute(IntentAttachPointType extnType, XMLStreamWriter writer) throws XMLStreamException {
-        StringBuffer sb  = new StringBuffer();
-        for ( Intent intent : extnType.getMayProvideIntents() ) {
-            writer.writeNamespace(intent.getName().getPrefix(), intent.getName().getNamespaceURI());
-            sb.append(intent.getName().getPrefix() + COLON + intent.getName().getLocalPart());
-            sb.append(WHITE_SPACE);
-        }
-        
-        if ( sb.length() > 0 ) {
-            writer.writeAttribute(MAY_PROVIDE, sb.toString());
-        }
-    }
-    
-    private void writeAlwaysProvidesIntentsAttribute(IntentAttachPointType extnType, XMLStreamWriter writer) throws XMLStreamException {
-        StringBuffer sb  = new StringBuffer();
-        for ( Intent intent : extnType.getAlwaysProvidedIntents() ) {
-            writer.writeNamespace(intent.getName().getPrefix(), intent.getName().getNamespaceURI());
-            sb.append(intent.getName().getPrefix() + COLON + intent.getName().getLocalPart());
-            sb.append(WHITE_SPACE);
-        }
-        
-        if ( sb.length() > 0 ) {
-            writer.writeAttribute(ALWAYS_PROVIDES, sb.toString());
-            
-        }
-    }
-    
-    public void resolve(IntentAttachPointType extnType, ModelResolver resolver) throws ContributionResolveException {
-        
-    	if (extnType != null && extnType.isUnresolved()) {
-    	    resolveAlwaysProvidedIntents(extnType, resolver);
-            resolveMayProvideIntents(extnType, resolver);
-            extnType.setUnresolved(false);
-            //resolveExtensionType(extnType, resolver);
-        }
-    }
-
-    private void resolveAlwaysProvidedIntents(IntentAttachPointType extensionType,
-                                              ModelResolver resolver) throws ContributionResolveException {
-        if (extensionType != null) {
-            // resolve all provided intents
-            List<Intent> alwaysProvided = new ArrayList<Intent>();
-            for (Intent providedIntent : extensionType.getAlwaysProvidedIntents()) {
-                if (providedIntent.isUnresolved()) {
-                    providedIntent = resolver.resolveModel(Intent.class, providedIntent);
-                    if (!providedIntent.isUnresolved()) {
-                        alwaysProvided.add(providedIntent);
-                    } else {
-                    	error("AlwaysProvidedIntentNotFound", resolver, providedIntent, extensionType);
-                        //throw new ContributionResolveException("Always Provided Intent - " + providedIntent
-                                                                     //+ " not found for ExtensionType "
-                                                                     //+ extensionType);
-                    }
-                } else {
-                    alwaysProvided.add(providedIntent);
-                }
-            }
-            extensionType.getAlwaysProvidedIntents().clear();
-            extensionType.getAlwaysProvidedIntents().addAll(alwaysProvided);
-        }
-    }
-    
-    private void resolveMayProvideIntents(IntentAttachPointType extensionType,
-                                            ModelResolver resolver) throws ContributionResolveException {
-        if (extensionType != null) {
-            // resolve all provided intents
-            List<Intent> mayProvide = new ArrayList<Intent>();
-            for (Intent providedIntent : extensionType.getMayProvideIntents()) {
-                if (providedIntent.isUnresolved()) {
-                    providedIntent = resolver.resolveModel(Intent.class, providedIntent);
-                    if (!providedIntent.isUnresolved()) {
-                        mayProvide.add(providedIntent);
-                    } else {
-                    	error("MayProvideIntentNotFound", resolver, providedIntent, extensionType);
-                        //throw new ContributionResolveException("May Provide Intent - " + providedIntent
-                                                                     //+ " not found for ExtensionType "
-                                                                     //+ extensionType);
-                    }
-                } else {
-                    mayProvide.add(providedIntent);
-                }
-            }
-            extensionType.getMayProvideIntents().clear();
-            extensionType.getMayProvideIntents().addAll(mayProvide);
-        }
-    }
-    
-    public Class<IntentAttachPointType> getModelType() {
-        return IntentAttachPointType.class;
-    }
-}
diff --git a/branches/sca-java-1.5/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyConstants.java b/branches/sca-java-1.5/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyConstants.java
deleted file mode 100644
index 3f1008e9a8..0000000000
--- a/branches/sca-java-1.5/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyConstants.java
+++ /dev/null
@@ -1,75 +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.policy.xml;

-

-import javax.xml.namespace.QName;

-

-/**

- * constants related to policy framework

- *

- * @version $Rev$ $Date$

- */

-public interface PolicyConstants {

-    String WHITE_SPACE = " ";

-    String COLON = ":";

-    String SCA10_NS = "http://www.osoa.org/xmlns/sca/1.0";

-    String TUSCANY_NS = "http://tuscany.apache.org/xmlns/sca/1.0";

-    String INTENT = "intent";

-    String POLICY_SET = "policySet";

-    String POLICY_SET_REFERENCE = "policySetReference";

-    String INTENT_MAP = "intentMap";

-    String NAME = "name";

-    String TARGET_NAMESPACE = "targetNamespace";

-    String SCA_DEFINITIONS = "definitions";

-    String CONSTRAINS = "constrains";

-    String DESCRIPTION = "description";

-    String PROVIDES = "provides";

-    String APPLIES_TO = "appliesTo";

-    String ALWAYS_APPLIES_TO = "alwaysAppliesTo";

-    String QUALIFIER = ".";

-    String INTENT_MAP_QUALIFIER = "qualifier";

-    String REQUIRES = "requires";

-    String EXCLUDES = "excludes";

-    String DEFAULT = "default";

-       

-    String ALWAYS_PROVIDES = "alwaysProvides";

-    String MAY_PROVIDE = "mayProvide";

-    String TYPE = "type";

-    String IMPLEMENTATION_TYPE = "implementationType";

-    String BINDING_TYPE = "bindingType";

-    QName IMPLEMENTATION_TYPE_QNAME = new QName(SCA10_NS, IMPLEMENTATION_TYPE);

-    QName BINDING_TYPE_QNAME = new QName(SCA10_NS, BINDING_TYPE);

-    String BINDING = "binding";

-    String IMPLEMENTATION = "implementation";

-    

-    QName POLICY_INTENT_QNAME = new QName(SCA10_NS, INTENT);

-    QName POLICY_SET_QNAME = new QName(SCA10_NS, POLICY_SET);

-    QName POLICY_INTENT_MAP_QNAME = new QName(SCA10_NS, INTENT_MAP); 

-    QName SCA_DEFINITIONS_QNAME = new QName(SCA10_NS, SCA_DEFINITIONS);

-    QName DESCRIPTION_QNAME = new QName(SCA10_NS, DESCRIPTION);

-    QName POLICY_INTENT_MAP_QUALIFIER_QNAME = new QName(SCA10_NS, INTENT_MAP_QUALIFIER);

-    QName POLICY_SET_REFERENCE_QNAME = new QName(SCA10_NS, POLICY_SET_REFERENCE);

-    

-    String QUALIFIED_INTENT_CONSTRAINS_ERROR = " - Qualified Intents must not specify 'constrains' attribute";

-    

-    

-    

-    

-    

-}

diff --git a/branches/sca-java-1.5/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyIntentProcessor.java b/branches/sca-java-1.5/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyIntentProcessor.java
deleted file mode 100644
index 76ef8df298..0000000000
--- a/branches/sca-java-1.5/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyIntentProcessor.java
+++ /dev/null
@@ -1,417 +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.policy.xml;
-
-import static javax.xml.stream.XMLStreamConstants.END_ELEMENT;
-import static javax.xml.stream.XMLStreamConstants.START_ELEMENT;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.StringTokenizer;
-
-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.builder.impl.ProblemImpl;
-import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
-import org.apache.tuscany.sca.contribution.processor.BaseStAXArtifactProcessor;
-import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;
-import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
-import org.apache.tuscany.sca.contribution.service.ContributionReadException;
-import org.apache.tuscany.sca.contribution.service.ContributionResolveException;
-import org.apache.tuscany.sca.contribution.service.ContributionWriteException;
-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.Intent;
-import org.apache.tuscany.sca.policy.PolicyFactory;
-import org.apache.tuscany.sca.policy.ProfileIntent;
-import org.apache.tuscany.sca.policy.QualifiedIntent;
-
-/**
- * Processor for handling XML models of PolicyIntent definitions
- *
- * @version $Rev$ $Date$
- */
-abstract class PolicyIntentProcessor<T extends Intent> extends BaseStAXArtifactProcessor implements StAXArtifactProcessor<T>, PolicyConstants {
-
-    private PolicyFactory policyFactory;
-    private Monitor monitor;
-
-    public PolicyIntentProcessor(ModelFactoryExtensionPoint modelFactories, Monitor monitor) {
-        this.policyFactory = modelFactories.getFactory(PolicyFactory.class);
-        this.monitor = monitor;
-    }
-    
-    public PolicyIntentProcessor(PolicyFactory policyFactory, Monitor monitor) {
-        this.policyFactory = policyFactory;
-        this.monitor = monitor;
-    }
-    
-    /**
-     * Report a error.
-     * 
-     * @param problems
-     * @param message
-     * @param model
-     */
-    private void error(String message, Object model, Object... messageParameters) {
-    	 if (monitor != null) {
-    		 Problem problem = new ProblemImpl(this.getClass().getName(), "policy-xml-validation-messages", Severity.ERROR, model, message, (Object[])messageParameters);
-    	     monitor.problem(problem);
-    	 }        
-    }
-
-    public T read(XMLStreamReader reader) throws ContributionReadException, XMLStreamException {
-        Intent policyIntent = null;
-        String policyIntentName = reader.getAttributeValue(null, NAME);
-        if (policyIntentName == null) {
-            error("IntentNameMissing", reader);
-            return (T)policyIntent;
-        }
-        
-        // Read an <sca:intent>
-        if (reader.getAttributeValue(null, REQUIRES) != null) {
-            policyIntent = policyFactory.createProfileIntent();
-        } else if ( policyIntentName != null && policyIntentName.indexOf(QUALIFIER) != -1) {
-            policyIntent = policyFactory.createQualifiedIntent();
-            
-            int qualifierIndex = policyIntentName.lastIndexOf(QUALIFIER);
-            Intent qualifiableIntent = policyFactory.createIntent();
-            qualifiableIntent.setUnresolved(true);
-            qualifiableIntent.setName(new QName(policyIntentName.substring(0, qualifierIndex)));
-            
-            ((QualifiedIntent)policyIntent).setQualifiableIntent(qualifiableIntent);
-        } else {
-            policyIntent = policyFactory.createIntent();
-        }
-        policyIntent.setName(new QName(policyIntentName));
-        
-        if ( policyIntent instanceof ProfileIntent ) {
-            readRequiredIntents((ProfileIntent)policyIntent, reader);
-        }
-        else {
-            readExcludedIntents(policyIntent, reader);
-        }
-        
-        readConstrainedArtifacts(policyIntent, reader);
-
-        int event = reader.getEventType();
-        QName name = null;
-        while (reader.hasNext()) {
-            event = reader.getEventType();
-            switch (event) {
-                case START_ELEMENT : {
-                    name = reader.getName();
-                    if (DESCRIPTION_QNAME.equals(name)) {
-                        policyIntent.setDescription(reader.getElementText());
-                    }
-                    break;
-                }
-            }
-            if (event == END_ELEMENT && POLICY_INTENT_QNAME.equals(reader.getName())) {
-                break;
-            }
-            
-            //Read the next element
-            if (reader.hasNext()) {
-                reader.next();
-            }
-        }
-        return (T)policyIntent;
-    }
-    
-    public void write(T policyIntent, XMLStreamWriter writer) throws ContributionWriteException, XMLStreamException {
-        // Write an <sca:intent>
-        writer.writeStartElement(PolicyConstants.SCA10_NS, INTENT);
-        writer.writeNamespace(policyIntent.getName().getPrefix(), policyIntent.getName().getNamespaceURI());
-        writer.writeAttribute(PolicyConstants.NAME, 
-                              policyIntent.getName().getPrefix() + COLON + policyIntent.getName().getLocalPart());
-        if (policyIntent instanceof ProfileIntent) {
-            ProfileIntent profileIntent = (ProfileIntent)policyIntent;
-            if (profileIntent.getRequiredIntents() != null && 
-                profileIntent.getRequiredIntents().size() > 0) {
-                StringBuffer sb = new StringBuffer();
-                for (Intent requiredIntents : profileIntent.getRequiredIntents()) {
-                    sb.append(requiredIntents.getName());
-                    sb.append(" ");
-                }
-                writer.writeAttribute(PolicyConstants.REQUIRES, sb.toString());
-            }
-        }
-        else {
-            if (policyIntent.getExcludedIntents() != null && 
-                policyIntent.getExcludedIntents().size() > 0) {
-                StringBuffer sb = new StringBuffer();
-                for (Intent excludedIntents : policyIntent.getExcludedIntents()) {
-                    sb.append(excludedIntents.getName());
-                    sb.append(" ");
-                }
-                writer.writeAttribute(PolicyConstants.EXCLUDES, sb.toString());
-            }
-        }
-        
-        if (!(policyIntent instanceof QualifiedIntent) ) {
-            if (policyIntent.getConstrains() != null && 
-                policyIntent.getConstrains().size() > 0) {
-                StringBuffer sb = new StringBuffer();
-                for (QName contrainedArtifact : policyIntent.getConstrains()) {
-                    sb.append(contrainedArtifact.toString());
-                    sb.append(" ");
-                }
-                writer.writeAttribute(CONSTRAINS, sb.toString());
-            } else {
-            	error("ContrainsAttributeMissing", policyIntent, policyIntent.getName());
-                //throw new ContributionWriteException("Contrains attribute missing from " +
-                                        //"Policy Intent Definition" + policyIntent.getName());
-            }
-        }
-        
-        if ( policyIntent.getDescription() != null && policyIntent.getDescription().length() > 0) {
-            writer.writeStartElement(PolicyConstants.SCA10_NS, DESCRIPTION);
-            writer.writeCData(policyIntent.getDescription());
-            writer.writeEndElement();
-        }
-        
-        writer.writeEndElement();
-    }
-
-    //FIXME This method is never used
-//    private Intent resolveRequiredIntents(ProfileIntent policyIntent, ModelResolver resolver) throws ContributionResolveException {
-//        boolean isUnresolved = false;
-//        //FIXME: Need to check for cyclic references first i.e an A requiring B and then B requiring A... 
-//        if (policyIntent != null && policyIntent.isUnresolved()) {
-//            
-//            //resolve all required intents
-//            List<Intent> requiredIntents = new ArrayList<Intent>(); 
-//            for (Intent requiredIntent : policyIntent.getRequiredIntents()) {
-//                if ( requiredIntent.isUnresolved() ) {
-//                    //policyIntent.getRequiredIntents().remove(requiredIntent);
-//                    requiredIntent = resolver.resolveModel(Intent.class, requiredIntent);
-//                    requiredIntents.add(requiredIntent);
-//                    if (requiredIntent.isUnresolved()) {
-//                        isUnresolved = true;
-//                    }
-//                }
-//            }
-//            policyIntent.getRequiredIntents().clear();
-//            policyIntent.getRequiredIntents().addAll(requiredIntents);
-//        }
-//        policyIntent.setUnresolved(isUnresolved);
-//        
-//        return policyIntent;
-//    }
-    
-    //FIXME This method is never used
-//    private Intent resolveQualifiableIntent(QualifiedIntent policyIntent, ModelResolver resolver) throws ContributionResolveException {
-//        boolean isUnresolved = false;
-//
-//        if (policyIntent != null && policyIntent.isUnresolved()) {
-//            //resolve the qualifiable intent
-//            Intent qualifiableIntent = 
-//                resolver.resolveModel(Intent.class, policyIntent.getQualifiableIntent());
-//            policyIntent.setQualifiableIntent(qualifiableIntent);
-//            isUnresolved = qualifiableIntent.isUnresolved();
-//        }
-//        policyIntent.setUnresolved(isUnresolved);
-//        
-//        return policyIntent;
-//    }
-    
-    private void resolveContrainedArtifacts(Intent policyIntent, ModelResolver resolver) {
-        //FIXME : need to figure out this resolution. 
-        policyIntent.setUnresolved(false);
-    }
-    
-    private void resolveProfileIntent(ProfileIntent policyIntent, ModelResolver resolver)
-        throws ContributionResolveException {
-        // FIXME: Need to check for cyclic references first i.e an A requiring B
-        // and then B requiring A...
-        if (policyIntent != null) {
-            // resolve all required intents
-            List<Intent> requiredIntents = new ArrayList<Intent>();
-            for (Intent requiredIntent : policyIntent.getRequiredIntents()) {
-                if (requiredIntent.isUnresolved()) {
-                    Intent resolvedRequiredIntent = resolver.resolveModel(Intent.class, requiredIntent);
-                    // At this point, when the required intent is not resolved, it does not mean 
-                    // its undeclared, chances are that their dependency are not resolved yet. 
-                    // Lets try to resolve them first.
-                    if (resolvedRequiredIntent.isUnresolved()) {
-                        if (resolvedRequiredIntent instanceof ProfileIntent) {
-                            if ((((ProfileIntent)resolvedRequiredIntent).getRequiredIntents()).contains(policyIntent)) {
-                                error("CyclicReferenceFound", resolver, requiredIntent, policyIntent);
-                                return;
-                            }
-                            resolveDependent(resolvedRequiredIntent, resolver);
-                        }
-                    }
-                
-                    if (!resolvedRequiredIntent.isUnresolved()) {
-                        requiredIntents.add(resolvedRequiredIntent);
-                    } else {
-                    	error("RequiredIntentNotFound", resolver, requiredIntent, policyIntent);
-                    	return;
-                        //throw new ContributionResolveException("Required Intent - " + requiredIntent
-                                                    //+ " not found for ProfileIntent " + policyIntent);
-                    }
-                } else {
-                    requiredIntents.add(requiredIntent);
-                }
-            }
-            policyIntent.getRequiredIntents().clear();
-            policyIntent.getRequiredIntents().addAll(requiredIntents);
-        }
-    }
-
-    private void resolveQualifiedIntent(QualifiedIntent policyIntent, ModelResolver resolver)
-        throws ContributionResolveException {
-        if (policyIntent != null) {
-            //resolve the qualifiable intent
-            Intent qualifiableIntent = policyIntent.getQualifiableIntent();
-            if (qualifiableIntent.isUnresolved()) {
-                Intent resolvedQualifiableIntent = resolver.resolveModel(Intent.class, qualifiableIntent);
-                // At this point, when the qualifiable intent is not resolved, it does not mean 
-                // its undeclared, chances are that their dependency are not resolved yet. 
-                // Lets try to resolve them first.
-                if (resolvedQualifiableIntent.isUnresolved()) {
-                    if (resolvedQualifiableIntent instanceof QualifiedIntent) {
-                        resolveDependent(resolvedQualifiableIntent, resolver);
-                    }
-                }
-                
-                if (!resolvedQualifiableIntent.isUnresolved()) {
-                    policyIntent.setQualifiableIntent(resolvedQualifiableIntent);
-                } else {
-                	error("QualifiableIntentNotFound", resolver, qualifiableIntent, policyIntent);
-                    //throw new ContributionResolveException("Qualifiable Intent - " + qualifiableIntent
-                                                    //+ " not found for QualifiedIntent " + policyIntent);
-                }    
-            }
-        }
-    }
-    
-    public void resolveDependent(Intent policyIntent, ModelResolver resolver) throws ContributionResolveException {
-        if (policyIntent instanceof ProfileIntent)
-            resolveProfileIntent((ProfileIntent)policyIntent, resolver);
-        
-        if (policyIntent instanceof QualifiedIntent)
-            resolveQualifiedIntent((QualifiedIntent)policyIntent, resolver);
-        
-        resolveContrainedArtifacts(policyIntent, resolver);
-    }
-    
-    public void resolve(T policyIntent, ModelResolver resolver) throws ContributionResolveException {
-        if (policyIntent instanceof ProfileIntent) {
-            resolveProfileIntent((ProfileIntent)policyIntent, resolver);
-        }
-        else {
-            resolveExcludedIntents(policyIntent, resolver);
-        }
-
-        if (policyIntent instanceof QualifiedIntent) {
-            resolveQualifiedIntent((QualifiedIntent)policyIntent, resolver);
-        }
-        
-        resolveContrainedArtifacts(policyIntent, resolver);
-
-        /* This is too late in the processing
-        if ( !policyIntent.isUnresolved() ) {
-            resolver.addModel(policyIntent);
-        }
-        */
-    }
-    
-    public QName getArtifactType() {
-        return POLICY_INTENT_QNAME;
-    }
-    
-    private void readConstrainedArtifacts(Intent policyIntent, XMLStreamReader reader) throws ContributionReadException {
-        String value = reader.getAttributeValue(null, CONSTRAINS);
-        if ( policyIntent instanceof QualifiedIntent && value != null) {
-        	error("ErrorInPolicyIntentDefinition", policyIntent, policyIntent.getName(), QUALIFIED_INTENT_CONSTRAINS_ERROR);
-            //String errorMsg = "Error in PolicyIntent Definition - " + policyIntent.getName() + QUALIFIED_INTENT_CONSTRAINS_ERROR;
-            //throw new ContributionReadException(errorMsg);
-        } else {
-            if (value != null) {
-                List<QName> constrainedArtifacts = policyIntent.getConstrains();
-                for (StringTokenizer tokens = new StringTokenizer(value); tokens.hasMoreTokens();) {
-                    QName qname = getQNameValue(reader, tokens.nextToken());
-                    constrainedArtifacts.add(qname);
-                }
-            }
-        }
-    }
-    
-    private void readRequiredIntents(ProfileIntent policyIntent, XMLStreamReader reader) {
-        String value = reader.getAttributeValue(null, REQUIRES);
-        if (value != null) {
-            List<Intent> requiredIntents = policyIntent.getRequiredIntents();
-            for (StringTokenizer tokens = new StringTokenizer(value); tokens.hasMoreTokens();) {
-                QName qname = getQNameValue(reader, tokens.nextToken());
-                Intent intent = policyFactory.createIntent();
-                intent.setName(qname);
-                intent.setUnresolved(true);
-                requiredIntents.add(intent);
-            }
-        }
-    }
-
-    private void readExcludedIntents(Intent policyIntent, XMLStreamReader reader) {
-        String value = reader.getAttributeValue(null, "excludes");
-        if (value != null) {
-            List<Intent> excludedIntents = policyIntent.getExcludedIntents();
-            for (StringTokenizer tokens = new StringTokenizer(value); tokens.hasMoreTokens();) {
-                QName qname = getQNameValue(reader, tokens.nextToken());
-                Intent intent = policyFactory.createIntent();
-                intent.setName(qname);
-                intent.setUnresolved(true);
-                excludedIntents.add(intent);
-            }
-        }
-    }
-
-    private void resolveExcludedIntents(Intent policyIntent, ModelResolver resolver)
-        throws ContributionResolveException {
-        if (policyIntent != null) {
-            // resolve all excluded intents
-            List<Intent> excludedIntents = new ArrayList<Intent>();
-            for (Intent excludedIntent : policyIntent.getExcludedIntents()) {
-                if (excludedIntent.isUnresolved()) {
-                    Intent resolvedExcludedIntent = resolver.resolveModel(Intent.class, excludedIntent);                                     
-                    if (!resolvedExcludedIntent.isUnresolved()) {
-                        excludedIntents.add(resolvedExcludedIntent);
-                    } else {
-                    	error("ExcludedIntentNotFound", resolver, excludedIntent, policyIntent);
-                    	return;
-                        //throw new ContributionResolveException("Excluded Intent " + excludedIntent
-                                                         //+ " not found for intent " + policyIntent);
-                    }
-                } else {
-                    excludedIntents.add(excludedIntent);
-                }
-            }
-            policyIntent.getExcludedIntents().clear();
-            policyIntent.getExcludedIntents().addAll(excludedIntents);
-        }
-    }
-
-}
diff --git a/branches/sca-java-1.5/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicySetProcessor.java b/branches/sca-java-1.5/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicySetProcessor.java
deleted file mode 100644
index 81ca27a085..0000000000
--- a/branches/sca-java-1.5/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicySetProcessor.java
+++ /dev/null
@@ -1,487 +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.policy.xml;
-
-import static javax.xml.stream.XMLStreamConstants.END_ELEMENT;
-import static javax.xml.stream.XMLStreamConstants.START_ELEMENT;
-
-import java.util.ArrayList;
-import java.util.Hashtable;
-import java.util.List;
-import java.util.Map;
-import java.util.StringTokenizer;
-
-import javax.xml.namespace.QName;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamReader;
-import javax.xml.stream.XMLStreamWriter;
-import javax.xml.xpath.XPath;
-import javax.xml.xpath.XPathExpressionException;
-import javax.xml.xpath.XPathFactory;
-
-import org.apache.tuscany.sca.assembly.builder.impl.ProblemImpl;
-import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
-import org.apache.tuscany.sca.contribution.processor.BaseStAXArtifactProcessor;
-import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;
-import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
-import org.apache.tuscany.sca.contribution.service.ContributionReadException;
-import org.apache.tuscany.sca.contribution.service.ContributionResolveException;
-import org.apache.tuscany.sca.contribution.service.ContributionWriteException;
-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.Intent;
-import org.apache.tuscany.sca.policy.PolicyFactory;
-import org.apache.tuscany.sca.policy.PolicySet;
-
-
-/**
- * Processor for handling XML models of PolicySet definitions
- *
- * @version $Rev$ $Date$
- */
-public class PolicySetProcessor extends BaseStAXArtifactProcessor implements StAXArtifactProcessor<PolicySet>, PolicyConstants {
-
-    private PolicyFactory policyFactory;
-    private StAXArtifactProcessor<Object> extensionProcessor;
-    private XPathFactory xpathFactory = XPathFactory.newInstance();
-    private Monitor monitor;
-    
-    public PolicySetProcessor(ModelFactoryExtensionPoint modelFactories, 
-    						  StAXArtifactProcessor<Object> extensionProcessor,
-    						  Monitor monitor) {
-        this.policyFactory = modelFactories.getFactory(PolicyFactory.class);
-        this.extensionProcessor = extensionProcessor;
-        this.monitor = monitor;
-    }
-    
-    public PolicySetProcessor(PolicyFactory policyFactory, 
-    						  StAXArtifactProcessor<Object> extensionProcessor,
-    						  Monitor monitor) {
-        this.policyFactory = policyFactory;
-        this.extensionProcessor = extensionProcessor;
-        this.monitor = monitor;
-    }
-    
-    /**
-     * Report a exception.
-     * 
-     * @param problems
-     * @param message
-     * @param model
-     */
-     private void error(String message, Object model, Exception ex) {
-    	 if (monitor != null) {
-    		 Problem problem = new ProblemImpl(this.getClass().getName(), "policy-xml-validation-messages", Severity.ERROR, model, message, ex);
-    	     monitor.problem(problem);
-    	 }        
-     }
-    
-    /**
-     * Report a error.
-     * 
-     * @param problems
-     * @param message
-     * @param model
-     */
-     private void error(String message, Object model, Object... messageParameters) {
-    	 if (monitor != null) {
-    		 Problem problem = new ProblemImpl(this.getClass().getName(), "policy-xml-validation-messages", Severity.ERROR, model, message, (Object[])messageParameters);
-    	     monitor.problem(problem);
-    	 }        
-     }
-
-    public PolicySet read(XMLStreamReader reader) throws ContributionReadException, XMLStreamException {
-        PolicySet policySet = null;
-        
-        String policySetName = reader.getAttributeValue(null, NAME);
-        String appliesTo = reader.getAttributeValue(null, APPLIES_TO);
-        if (policySetName == null || appliesTo == null) {
-            if (policySetName == null)
-                error("PolicySetNameMissing", reader);
-            if (appliesTo == null)
-                error("PolicySetAppliesToMissing", reader);
-            return policySet;
-        }
-        
-        policySet = policyFactory.createPolicySet();
-        policySet.setName(new QName(policySetName));
-        String alwaysAppliesTo = reader.getAttributeValue(TUSCANY_NS, ALWAYS_APPLIES_TO);
-        
-        //TODO: with 1.0 version of specs the applies to xpath is given related to the immediate
-        //parent whereas the runtime evaluates the xpath aginst the composite element.  What the runtime
-        //is doing is what the future version of the specs could be tending towards.  When that happens
-        //this 'if' must be deleted
-        if ( appliesTo != null && !appliesTo.startsWith("/") ) {
-            appliesTo = "//" + appliesTo;
-        }
-        
-        if ( alwaysAppliesTo != null && !alwaysAppliesTo.startsWith("/") ) {
-            alwaysAppliesTo = "//" + alwaysAppliesTo;
-        }
-        
-        policySet.setAppliesTo(appliesTo);
-        policySet.setAlwaysAppliesTo(alwaysAppliesTo);
-
-        XPath path = xpathFactory.newXPath(); 
-        path.setNamespaceContext(reader.getNamespaceContext());
-        try {
-            if (appliesTo != null) {
-                policySet.setAppliesToXPathExpression(path.compile(appliesTo));
-            }
-            if (alwaysAppliesTo != null) {
-                policySet.setAlwaysAppliesToXPathExpression(path.compile(alwaysAppliesTo));
-            }
-        } catch (XPathExpressionException e) {
-        	ContributionReadException ce = new ContributionReadException(e);
-        	error("ContributionReadException", policySet, ce);
-            //throw ce;
-        }  
-        
-        readProvidedIntents(policySet, reader);
-        
-        int event = reader.getEventType();
-        QName name = null;
-        reader.next();
-        while (reader.hasNext()) {
-            event = reader.getEventType();
-            switch (event) {
-                case START_ELEMENT : {
-                    name = reader.getName();
-                    if ( POLICY_INTENT_MAP_QNAME.equals(name) ) {
-                        Intent mappedIntent = policyFactory.createIntent();
-                        String provides = reader.getAttributeValue(null, PROVIDES);
-                        if (provides != null) {
-                            mappedIntent.setName(getQName(reader, PROVIDES));
-                            if ( policySet.getProvidedIntents().contains(mappedIntent) ) {
-                                readIntentMap(reader, policySet, mappedIntent);
-                            } else {
-                                error("IntentNotSpecified", policySet, policySetName);
-                                //throw new ContributionReadException("Intent Map provides for Intent not specified as provided by parent PolicySet - " + policySetName);
-                            }
-                        } else {
-                            error("IntentMapProvidesMissing", reader, policySetName);
-                        }
-                    } else if ( POLICY_SET_REFERENCE_QNAME.equals(name) )  {
-                        PolicySet referredPolicySet = policyFactory.createPolicySet();
-                        String referencename = reader.getAttributeValue(null, NAME);
-                        if (referencename != null) {
-                            referredPolicySet.setName(getQName(reader, NAME));
-                            policySet.getReferencedPolicySets().add(referredPolicySet);
-                        } else {
-                            error("PolicySetReferenceNameMissing", reader, policySetName);
-                        }
-                    } /*else if ( WS_POLICY_QNAME.equals(name) )  {
-                        OMElement policyElement = loadElement(reader);
-                        org.apache.neethi.Policy wsPolicy = PolicyEngine.getPolicy(policyElement);
-                        policySet.getPolicies().add(wsPolicy);
-                    } */ else {
-                        Object extension = extensionProcessor.read(reader);
-                        if ( extension != null ) {
-                            policySet.getPolicies().add(extension);
-                        }
-                    }
-                    break;
-                }
-            }
-            if ( event == END_ELEMENT ) {
-                if ( POLICY_SET_QNAME.equals(reader.getName()) ) {
-                    break;
-                } 
-            }
-            
-            //Read the next element
-            if (reader.hasNext()) {
-                reader.next();
-            }
-        }
-        return policySet;
-    }
-    
-    
-    public void readIntentMap(XMLStreamReader reader, PolicySet policySet, Intent mappedIntent) throws ContributionReadException {
-        QName name = reader.getName();
-        Map<Intent, List<Object>> mappedPolicies = policySet.getMappedPolicies();
-        if ( POLICY_INTENT_MAP_QNAME.equals(name) ) {
-            //Intent mappedIntent = policyFactory.createIntent();
-            //mappedIntent.setName(getQName(reader, PROVIDES));
-            String defaultQualifier = getString(reader, DEFAULT);
-            
-            String qualifierName = null;
-            String qualfiedIntentName = null;
-            Intent qualifiedIntent = null;
-        
-            int event = reader.getEventType();
-            try {
-                reader.next();
-                while (reader.hasNext()) {
-                    event = reader.getEventType();
-                    switch (event) {
-                        case START_ELEMENT : {
-                            name = reader.getName();
-                            if ( POLICY_INTENT_MAP_QUALIFIER_QNAME.equals(name)) {
-                                qualifierName = getString(reader, NAME);                                
-                                if (qualifierName != null) {
-                                    qualfiedIntentName = mappedIntent.getName().getLocalPart() + 
-                                                                    QUALIFIER + qualifierName;
-                                    qualifiedIntent = policyFactory.createIntent();
-                                    qualifiedIntent.setName(new QName(mappedIntent.getName().getNamespaceURI(),
-                                                                        qualfiedIntentName));
-                                } else {
-                                    error("QualifierNameMissing", reader, policySet.getName());
-                                }
-                            } else if ( POLICY_INTENT_MAP_QNAME.equals(name) ) {
-                                QName providedIntent = getQName(reader, PROVIDES);
-                                if ( qualifierName.equals(providedIntent.getLocalPart()) ) {
-                                    readIntentMap(reader, policySet, qualifiedIntent);
-                                } else {
-                                	error("IntentMapDoesNotMatch", providedIntent, providedIntent, qualifierName, policySet);
-                                    //throw new ContributionReadException("Intent provided by IntentMap " + 
-                                                                    //providedIntent + " does not match parent qualifier " + qualifierName +
-                                                                    //" in policyset - " + policySet);
-                                }
-                            }/* else if ( WS_POLICY_QNAME.equals(name) )  {
-                                OMElement policyElement = loadElement(reader);
-                                Policy wsPolicy = PolicyEngine.getPolicy(policyElement);
-                                policySet.getPolicies().add(wsPolicy);
-                                
-                                List<Object> policyList = mappedPolicies.get(qualifiedIntent);
-                                if ( policyList == null ) {
-                                    policyList = new ArrayList<Object>();
-                                    mappedPolicies.put(qualifiedIntent, policyList);
-                                    
-                                    if (qualifierName.equals(defaultQualifier)) {
-                                        mappedPolicies.put(mappedIntent, policyList);
-                                    }
-                                }
-                                policyList.add((Policy)wsPolicy);
-                            }*/ else {
-                                Object extension = extensionProcessor.read(reader);
-                                if ( extension != null && qualifiedIntent != null) {
-                                    List<Object> policyList = mappedPolicies.get(qualifiedIntent);
-                                    if ( policyList == null ) {
-                                        policyList = new ArrayList<Object>();
-                                        mappedPolicies.put(qualifiedIntent, policyList);
-                                        
-                                        if (qualifierName.equals(defaultQualifier)) {
-                                            mappedPolicies.put(mappedIntent, policyList);
-                                        }
-                                    }
-                                    policyList.add(extension);
-                                }
-                            }
-                            break;
-                        }
-                        case END_ELEMENT : {
-                            if ( POLICY_INTENT_MAP_QNAME.equals(reader.getName()) ) {
-                                if ( defaultQualifier != null ) {
-                                    String qualifiedIntentName = mappedIntent.getName().getLocalPart() + QUALIFIER + defaultQualifier;
-                                    Intent defaultQualifiedIntent = policyFactory.createIntent();
-                                    defaultQualifiedIntent.setName(new QName(mappedIntent.getName().getNamespaceURI(),
-                                                                             qualifiedIntentName));
-                                    List<Object> policyList = mappedPolicies.get(defaultQualifiedIntent);
-                                    if ( policyList != null ) {
-                                        mappedPolicies.put(mappedIntent, policyList);
-                                    } else {
-                                    	error("UnableToMapPolicies", mappedPolicies, mappedIntent, policySet);
-                                        //throw new ContributionReadException("Unable to map policies for default qualifier in IntentMap for - " +
-                                                                            //mappedIntent + " in policy set - " + policySet);
-                                    }
-                                    defaultQualifier = null;
-                                }
-                            } 
-                            break;
-                        }
-                    }
-                    if ( event == END_ELEMENT && POLICY_INTENT_MAP_QNAME.equals(reader.getName()) ) {
-                        break;
-                    }
-                    //Read the next element
-                    if (reader.hasNext()) {
-                        reader.next();
-                    }
-                }
-            }  catch (XMLStreamException e) {
-            	ContributionReadException ce = new ContributionReadException(e);
-            	error("ContributionReadException", reader, ce);
-                throw ce;
-            }
-        }
-    }
-    
-    public void write(PolicySet policySet, XMLStreamWriter writer) throws ContributionWriteException, XMLStreamException {
-
-        // Write an <sca:policySet>
-        writer.writeStartElement(SCA10_NS, POLICY_SET);
-        writer.writeNamespace(policySet.getName().getPrefix(), policySet.getName().getNamespaceURI());
-        writer.writeAttribute(NAME, 
-                              policySet.getName().getPrefix() + COLON + policySet.getName().getLocalPart());
-        writer.writeAttribute(APPLIES_TO, policySet.getAppliesTo());
-        writer.writeAttribute(TUSCANY_NS, ALWAYS_APPLIES_TO, policySet.getAlwaysAppliesTo());
-        
-        writeProvidedIntents(policySet, writer);
-        
-        writer.writeEndElement();
-    }
-    
-    private void readProvidedIntents(PolicySet policySet, XMLStreamReader reader) {
-        String value = reader.getAttributeValue(null, PROVIDES);
-        if (value != null) {
-            List<Intent> providedIntents = policySet.getProvidedIntents();
-            for (StringTokenizer tokens = new StringTokenizer(value); tokens.hasMoreTokens();) {
-                QName qname = getQNameValue(reader, tokens.nextToken());
-                Intent intent = policyFactory.createIntent();
-                intent.setName(qname);
-                providedIntents.add(intent);
-            }
-        }
-    }
-    
-    private void writeProvidedIntents(PolicySet policySet, XMLStreamWriter writer) throws XMLStreamException {
-        if (policySet.getProvidedIntents() != null && 
-            policySet.getProvidedIntents().size() > 0) {
-            StringBuffer sb = new StringBuffer();
-            for (Intent providedIntents : policySet.getProvidedIntents()) {
-                sb.append(providedIntents.getName());
-                sb.append(" ");
-            }
-            writer.writeAttribute(PolicyConstants.PROVIDES, sb.toString());
-        }
-    }
-
-   private void resolvePolicies(PolicySet policySet, ModelResolver resolver) throws ContributionResolveException {
-       boolean unresolved = false;
-       if (policySet != null) {
-           for ( Object o : policySet.getPolicies() ) {
-               extensionProcessor.resolve(o, resolver);
-               /*if ( o instanceof Policy && ((Policy)o).isUnresolved() ) {
-                  unresolved = true;
-               }*/
-           }
-           policySet.setUnresolved(unresolved);
-       }
-   }
-   
-   
-    
-    public QName getArtifactType() {
-        return POLICY_SET_QNAME;
-    }
-    
-    public Class<PolicySet> getModelType() {
-        return PolicySet.class;
-    }
-    
-    private void resolveProvidedIntents(PolicySet policySet, ModelResolver resolver) throws ContributionResolveException {
-        if (policySet != null) {
-            //resolve all provided intents
-            List<Intent> providedIntents = new ArrayList<Intent>();
-            for (Intent providedIntent : policySet.getProvidedIntents()) {
-                if (providedIntent.isUnresolved()) {
-                    Intent resolvedProvidedIntent = resolver.resolveModel(Intent.class, providedIntent);
-                    if (!resolvedProvidedIntent.isUnresolved()) {
-                        providedIntents.add(resolvedProvidedIntent);
-                    } else {
-                    	error("ProvidedIntentNotFound", policySet, providedIntent, policySet);
-                    	return;
-                        //throw new ContributionResolveException("Provided Intent - " + providedIntent
-                                                           //+ " not found for PolicySet " + policySet);
-                    }
-                } else {
-                    providedIntents.add(providedIntent);
-                }
-            }
-            policySet.getProvidedIntents().clear();
-            policySet.getProvidedIntents().addAll(providedIntents);
-        }
-     }
-    
-    private void resolveIntentsInMappedPolicies(PolicySet policySet, ModelResolver resolver) throws ContributionResolveException {
-        Map<Intent, List<Object>> mappedPolicies = new Hashtable<Intent, List<Object>>();
-        for (Map.Entry<Intent, List<Object>> entry : policySet.getMappedPolicies().entrySet()) {
-            Intent mappedIntent = entry.getKey();
-            if (mappedIntent.isUnresolved()) {
-                Intent resolvedMappedIntent = resolver.resolveModel(Intent.class, mappedIntent);
-                if (!resolvedMappedIntent.isUnresolved()) {
-                    mappedPolicies.put(resolvedMappedIntent, entry.getValue());
-                } else {
-                	error("MappedIntentNotFound", policySet, mappedIntent, policySet);
-                	return;
-                    //throw new ContributionResolveException("Mapped Intent - " + mappedIntent
-                                                   //+ " not found for PolicySet " + policySet);    
-                }
-            } else {
-                mappedPolicies.put(mappedIntent, entry.getValue());
-            }
-        }
-
-        policySet.getMappedPolicies().clear();
-        policySet.getMappedPolicies().putAll(mappedPolicies);
-    }
-    
-    private void resolveReferredPolicySets(PolicySet policySet, ModelResolver resolver) throws ContributionResolveException {
-    
-        List<PolicySet> referredPolicySets = new ArrayList<PolicySet>();
-        for (PolicySet referredPolicySet : policySet.getReferencedPolicySets()) {
-            if (referredPolicySet.isUnresolved()) {
-                PolicySet resolvedReferredPolicySet = resolver.resolveModel(PolicySet.class, referredPolicySet);
-                if (!resolvedReferredPolicySet.isUnresolved()) {
-                    referredPolicySets.add(resolvedReferredPolicySet);
-                } else {
-                	error("ReferredPolicySetNotFound", policySet, referredPolicySet, policySet);
-                	return;
-                    //throw new ContributionResolveException("Referred PolicySet - " + referredPolicySet
-                                                             //+ "not found for PolicySet - " + policySet);
-                }
-            } else {
-                referredPolicySets.add(referredPolicySet);
-            }
-        }
-        policySet.getReferencedPolicySets().clear();
-        policySet.getReferencedPolicySets().addAll(referredPolicySets);
-    }
-    
-    private void includeReferredPolicySets(PolicySet policySet, PolicySet referredPolicySet) {
-        for (PolicySet furtherReferredPolicySet : referredPolicySet.getReferencedPolicySets()) {
-            includeReferredPolicySets(referredPolicySet, furtherReferredPolicySet);
-        }
-        policySet.getPolicies().addAll(referredPolicySet.getPolicies());
-        policySet.getMappedPolicies().putAll(referredPolicySet.getMappedPolicies());
-    }
-    
-    public void resolve(PolicySet policySet, ModelResolver resolver) throws ContributionResolveException {
-        resolveProvidedIntents(policySet, resolver);
-        resolveIntentsInMappedPolicies(policySet, resolver);
-        resolveReferredPolicySets(policySet, resolver);
-        
-        for (PolicySet referredPolicySet : policySet.getReferencedPolicySets()) {
-            includeReferredPolicySets(policySet, referredPolicySet);
-        }
-        
-        if ( policySet.isUnresolved() ) {
-            //resolve the policy attachments
-            resolvePolicies(policySet, resolver);
-             
-            /*if ( !policySet.isUnresolved() ) {
-                 resolver.addModel(policySet);
-            }*/
-        }
-     }   
- }
diff --git a/branches/sca-java-1.5/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/ProfileIntentProcessor.java b/branches/sca-java-1.5/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/ProfileIntentProcessor.java
deleted file mode 100644
index 7c205292b0..0000000000
--- a/branches/sca-java-1.5/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/ProfileIntentProcessor.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-
-package org.apache.tuscany.sca.policy.xml;
-
-import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.policy.PolicyFactory;
-import org.apache.tuscany.sca.policy.ProfileIntent;
-
-/**
- * Processor for handling XML models of PolicyIntent definitions that are ProfileIntents
- *
- * @version $Rev$ $Date$
- */
-public class ProfileIntentProcessor extends PolicyIntentProcessor<ProfileIntent> {
-
-    public ProfileIntentProcessor(PolicyFactory policyFactory, Monitor monitor) {
-        super(policyFactory, monitor);
-    }
-    
-    public ProfileIntentProcessor(ModelFactoryExtensionPoint modelFactories, Monitor monitor) {
-        super(modelFactories, monitor);
-    }
-
-    public Class<ProfileIntent> getModelType() {
-        return ProfileIntent.class;
-    }
-}
diff --git a/branches/sca-java-1.5/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/QualifiedIntentProcessor.java b/branches/sca-java-1.5/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/QualifiedIntentProcessor.java
deleted file mode 100644
index abe80e2a54..0000000000
--- a/branches/sca-java-1.5/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/QualifiedIntentProcessor.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-
-package org.apache.tuscany.sca.policy.xml;
-
-import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.policy.PolicyFactory;
-import org.apache.tuscany.sca.policy.QualifiedIntent;
-
-/**
- * Processor for handling XML models of PolicyIntent definitions that are QualifiedIntents
- *
- * @version $Rev$ $Date$
- */
-public class QualifiedIntentProcessor extends PolicyIntentProcessor<QualifiedIntent> {
-	
-    public QualifiedIntentProcessor(ModelFactoryExtensionPoint modelFactories, Monitor monitor) {
-        super(modelFactories, monitor);
-    }
-    
-    public QualifiedIntentProcessor(PolicyFactory policyFactory, Monitor monitor) {
-        super(policyFactory, monitor);
-    }
-
-    public Class<QualifiedIntent> getModelType() {
-        return QualifiedIntent.class;
-    }
-}
diff --git a/branches/sca-java-1.5/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/SimpleIntentProcessor.java b/branches/sca-java-1.5/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/SimpleIntentProcessor.java
deleted file mode 100644
index 73795349c1..0000000000
--- a/branches/sca-java-1.5/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/SimpleIntentProcessor.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-
-package org.apache.tuscany.sca.policy.xml;
-
-import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
-import org.apache.tuscany.sca.monitor.Monitor;
-import org.apache.tuscany.sca.policy.Intent;
-import org.apache.tuscany.sca.policy.PolicyFactory;
-
-/**
- * Processor for handling XML models of PolicyIntent definitions
- *
- * @version $Rev$ $Date$
- */
-public class SimpleIntentProcessor extends PolicyIntentProcessor<Intent> {
-
-    public SimpleIntentProcessor(PolicyFactory policyFactory, Monitor monitor) {
-        super(policyFactory, monitor);
-    }
-
-    public SimpleIntentProcessor(ModelFactoryExtensionPoint modelFactories, Monitor monitor) {
-        super(modelFactories, monitor);
-    }
-
-    public Class<Intent> getModelType() {
-        return Intent.class;
-    }
-}