Branch for 1.3.3

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

14 files changed, 2069 insertions, 0 deletions

diff --git a/branches/sca-java-1.3.3/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/BindingTypeProcessor.java b/branches/sca-java-1.3.3/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/BindingTypeProcessor.java
new file mode 100644
index 0000000000..d47cbd7dbe
--- /dev/null
+++ b/branches/sca-java-1.3.3/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/BindingTypeProcessor.java
@@ -0,0 +1,68 @@
+/*
+ * 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.3.3/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/ImplementationTypeProcessor.java b/branches/sca-java-1.3.3/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/ImplementationTypeProcessor.java
new file mode 100644
index 0000000000..119afa3473
--- /dev/null
+++ b/branches/sca-java-1.3.3/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/ImplementationTypeProcessor.java
@@ -0,0 +1,68 @@
+/*
+ * 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.3.3/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/IntentAttachPointTypeProcessor.java b/branches/sca-java-1.3.3/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/IntentAttachPointTypeProcessor.java
new file mode 100644
index 0000000000..ec357aea93
--- /dev/null
+++ b/branches/sca-java-1.3.3/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/IntentAttachPointTypeProcessor.java
@@ -0,0 +1,248 @@
+/*
+ * 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.3.3/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyConstants.java b/branches/sca-java-1.3.3/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyConstants.java
new file mode 100644
index 0000000000..3f1008e9a8
--- /dev/null
+++ b/branches/sca-java-1.3.3/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyConstants.java
@@ -0,0 +1,75 @@
+/*

+ * 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.3.3/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyIntentProcessor.java b/branches/sca-java-1.3.3/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyIntentProcessor.java
new file mode 100644
index 0000000000..109090ccab
--- /dev/null
+++ b/branches/sca-java-1.3.3/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyIntentProcessor.java
@@ -0,0 +1,380 @@
+/*
+ * 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);
+        // 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);
+                    if (resolvedRequiredIntent != null) {
+                        requiredIntents.add(resolvedRequiredIntent);
+                    } else {
+                    	error("RequiredIntentNotFound", resolver, requiredIntent, policyIntent);
+                        //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);
+    
+                if (resolvedQualifiableIntent != null) {
+                    policyIntent.setQualifiableIntent(resolvedQualifiableIntent);
+                } else {
+                	error("QualifiableIntentNotFound", resolver, qualifiableIntent, policyIntent);
+                    //throw new ContributionResolveException("Qualifiable Intent - " + qualifiableIntent
+                                                    //+ " not found for QualifiedIntent " + policyIntent);
+                }
+    
+            }
+        }
+    }
+    
+    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 != null) {
+                        excludedIntents.add(resolvedExcludedIntent);
+                    } else {
+                    	error("ExcludedIntentNotFound", resolver, excludedIntent, policyIntent);
+                        //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.3.3/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicySetProcessor.java b/branches/sca-java-1.3.3/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicySetProcessor.java
new file mode 100644
index 0000000000..b6f33aa677
--- /dev/null
+++ b/branches/sca-java-1.3.3/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicySetProcessor.java
@@ -0,0 +1,461 @@
+/*
+ * 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 {
+        String policySetName = reader.getAttributeValue(null, NAME);
+        
+        PolicySet policySet = policyFactory.createPolicySet();
+        policySet.setName(new QName(policySetName));
+        String appliesTo = reader.getAttributeValue(null, APPLIES_TO);
+        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();
+                        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 if ( POLICY_SET_REFERENCE_QNAME.equals(name) )  {
+                        PolicySet referredPolicySet = policyFactory.createPolicySet();
+                        referredPolicySet.setName(getQName(reader, NAME));
+                        policySet.getReferencedPolicySets().add(referredPolicySet);
+                    } /*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);
+                                qualfiedIntentName = mappedIntent.getName().getLocalPart() + 
+                                                            QUALIFIER + qualifierName;
+                                qualifiedIntent = policyFactory.createIntent();
+                                qualifiedIntent.setName(new QName(mappedIntent.getName().getNamespaceURI(),
+                                                                  qualfiedIntentName)); 
+                            } 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 ) {
+                                    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;
+       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 != null) {
+                        providedIntents.add(resolvedProvidedIntent);
+                    } else {
+                    	error("ProvidedIntentNotFound", policySet, providedIntent, policySet);
+                        //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 != null) {
+                    mappedPolicies.put(resolvedMappedIntent, entry.getValue());
+                } else {
+                	error("MappedIntentNotFound", policySet, mappedIntent, policySet);
+                    //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 != null) {
+                    referredPolicySets.add(resolvedReferredPolicySet);
+                } else {
+                	error("ReferredPolicySetNotFound", policySet, referredPolicySet, policySet);
+                    //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.3.3/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/ProfileIntentProcessor.java b/branches/sca-java-1.3.3/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/ProfileIntentProcessor.java
new file mode 100644
index 0000000000..7c205292b0
--- /dev/null
+++ b/branches/sca-java-1.3.3/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/ProfileIntentProcessor.java
@@ -0,0 +1,45 @@
+/*
+ * 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.3.3/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/QualifiedIntentProcessor.java b/branches/sca-java-1.3.3/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/QualifiedIntentProcessor.java
new file mode 100644
index 0000000000..abe80e2a54
--- /dev/null
+++ b/branches/sca-java-1.3.3/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/QualifiedIntentProcessor.java
@@ -0,0 +1,45 @@
+/*
+ * 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.3.3/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/SimpleIntentProcessor.java b/branches/sca-java-1.3.3/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/SimpleIntentProcessor.java
new file mode 100644
index 0000000000..73795349c1
--- /dev/null
+++ b/branches/sca-java-1.3.3/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/SimpleIntentProcessor.java
@@ -0,0 +1,45 @@
+/*
+ * 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;
+    }
+}
diff --git a/branches/sca-java-1.3.3/modules/policy-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/branches/sca-java-1.3.3/modules/policy-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
new file mode 100644
index 0000000000..c41a0cd01f
--- /dev/null
+++ b/branches/sca-java-1.3.3/modules/policy-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
@@ -0,0 +1,24 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+# 
+#   http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License. 
+
+# Implementation class for the artifact processor extension
+org.apache.tuscany.sca.policy.xml.BindingTypeProcessor;qname=http://www.osoa.org/xmlns/sca/1.0#bindingType,model=org.apache.tuscany.sca.policy.IntentAttachPointType
+org.apache.tuscany.sca.policy.xml.ImplementationTypeProcessor;qname=http://www.osoa.org/xmlns/sca/1.0#implementationType,model=org.apache.tuscany.sca.policy.IntentAttachPointType
+org.apache.tuscany.sca.policy.xml.SimpleIntentProcessor;qname=http://www.osoa.org/xmlns/sca/1.0#intent,model=org.apache.tuscany.sca.policy.Intent
+org.apache.tuscany.sca.policy.xml.PolicySetProcessor;qname=http://www.osoa.org/xmlns/sca/1.0#policySet,model=org.apache.tuscany.sca.policy.PolicySet
+org.apache.tuscany.sca.policy.xml.ProfileIntentProcessor;qname=http://www.osoa.org/xmlns/sca/1.0#intent,model=org.apache.tuscany.sca.policy.ProfileIntent
+org.apache.tuscany.sca.policy.xml.QualifiedIntentProcessor;qname=http://www.osoa.org/xmlns/sca/1.0#intent,model=org.apache.tuscany.sca.policy.QualifiedIntent
diff --git a/branches/sca-java-1.3.3/modules/policy-xml/src/main/resources/policy-xml-validation-messages.properties b/branches/sca-java-1.3.3/modules/policy-xml/src/main/resources/policy-xml-validation-messages.properties
new file mode 100644
index 0000000000..d8eb214c15
--- /dev/null
+++ b/branches/sca-java-1.3.3/modules/policy-xml/src/main/resources/policy-xml-validation-messages.properties
@@ -0,0 +1,36 @@
+#
+#
+#    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.
+#
+#
+ReferredPolicySetNotFound = Referred PolicySet - {0} not found for PolicySet - {1}
+MappedIntentNotFound = Mapped Intent - {0} not found for PolicySet {1}
+ProvidedIntentNotFound = Provided Intent - {0} not found for PolicySet {1}
+UnableToMapPolicies = Unable to map policies for default qualifier in IntentMap for - {0} in policy set - {1}
+IntentMapDoesNotMatch = Intent provided by IntentMap {0} does not match parent qualifier {1} in policyset - {2}
+IntentNotSpecified = Intent Map provides for Intent not specified as provided by parent PolicySet - {0}
+ContrainsAttributeMissing = Contrains attribute missing from Policy Intent Definition {0}
+RequiredIntentNotFound = Required Intent - {0} not found for ProfileIntent {1}
+QualifiableIntentNotFound = Qualifiable Intent - {0} not found for QualifiedIntent {1}
+ErrorInPolicyIntentDefinition = Error in PolicyIntent Definition - {0} {1}
+ExcludedIntentNotFound = Excluded Intent {0} not found for intent {1}
+UnrecognizedIntentAttachPointType = Unrecognized IntentAttachPointType - {0}
+RequiredAttributeMissing = Required attribute {0} missing from BindingType Definition
+AlwaysProvidedIntentNotFound = Always Provided Intent - {0} not found for ExtensionType {1}
+MayProvideIntentNotFound = May Provide Intent - {0} not found for ExtensionType {1}
+ContributionReadException = ContributionReadException occured due to: {0}
\ No newline at end of file
diff --git a/branches/sca-java-1.3.3/modules/policy-xml/src/test/java/org/apache/tuscany/sca/policy/xml/ReadDocumentTestCase.java b/branches/sca-java-1.3.3/modules/policy-xml/src/test/java/org/apache/tuscany/sca/policy/xml/ReadDocumentTestCase.java
new file mode 100644
index 0000000000..58606a5cd9
--- /dev/null
+++ b/branches/sca-java-1.3.3/modules/policy-xml/src/test/java/org/apache/tuscany/sca/policy/xml/ReadDocumentTestCase.java
@@ -0,0 +1,246 @@
+/*
+ * 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.START_ELEMENT;
+
+import java.io.InputStream;
+import java.net.URL;
+import java.util.Hashtable;
+import java.util.Map;
+
+import javax.xml.namespace.QName;
+import javax.xml.stream.XMLInputFactory;
+import javax.xml.stream.XMLStreamReader;
+
+import junit.framework.TestCase;
+
+import org.apache.tuscany.sca.contribution.processor.ExtensibleStAXArtifactProcessor;
+import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;
+import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessorExtensionPoint;
+import org.apache.tuscany.sca.contribution.resolver.DefaultModelResolver;
+import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
+import org.apache.tuscany.sca.core.DefaultExtensionPointRegistry;
+import org.apache.tuscany.sca.policy.Intent;
+import org.apache.tuscany.sca.policy.IntentAttachPointType;
+import org.apache.tuscany.sca.policy.PolicySet;
+import org.apache.tuscany.sca.policy.ProfileIntent;
+import org.apache.tuscany.sca.policy.QualifiedIntent;
+import org.apache.tuscany.sca.policy.impl.BindingTypeImpl;
+import org.apache.tuscany.sca.policy.impl.ImplementationTypeImpl;
+
+/**
+ * Test reading SCA XML assembly documents.
+ * 
+ * @version $Rev: 551296 $ $Date: 2007-06-28 01:18:35 +0530 (Thu, 28 Jun 2007) $
+ */
+public class ReadDocumentTestCase extends TestCase {
+
+    private ModelResolver resolver;
+    private StAXArtifactProcessor<Object> staxProcessor;
+    
+    
+    private static final QName elementToProcess = new QName("http://www.osoa.org/xmlns/sca/1.0", "implementationType");
+        
+    private Map<QName, Intent> intentTable = new Hashtable<QName, Intent>();
+    private Map<QName, PolicySet> policySetTable = new Hashtable<QName, PolicySet>();
+    private Map<QName, IntentAttachPointType> bindingTypesTable = new Hashtable<QName, IntentAttachPointType>();
+    private Map<QName, IntentAttachPointType> implTypesTable = new Hashtable<QName, IntentAttachPointType>();
+    private static final String scaNamespace = "http://www.osoa.org/xmlns/sca/1.0";
+    private static final String namespace = "http://test";
+    
+    private static final QName confidentiality = new QName(namespace, "confidentiality");
+    private static final QName integrity = new QName(namespace, "integrity");
+    private static final QName messageProtection = new QName(namespace, "messageProtection");
+    private static final QName confidentiality_transport = new QName(namespace, "confidentiality.transport");   
+    private static final QName confidentiality_message = new QName(namespace, "confidentiality.message");
+    private static final QName secureReliablePolicy = new QName(namespace, "SecureReliablePolicy");
+    private static final QName secureMessagingPolicies = new QName(namespace, "SecureMessagingPolicies");
+    private static final QName securityPolicy = new QName(namespace, "SecurityPolicy");
+    private static final QName basicAuthMsgProtSecurity = new QName(namespace, "BasicAuthMsgProtSecurity");
+    private static final QName wsBinding = new QName(scaNamespace, "binding.ws");
+    private static final QName javaImpl = new QName(scaNamespace, "implementation.java");
+    
+
+    @Override
+    public void setUp() throws Exception {
+        DefaultExtensionPointRegistry extensionPoints = new DefaultExtensionPointRegistry();
+        resolver = new DefaultModelResolver();
+        XMLInputFactory inputFactory = XMLInputFactory.newInstance();
+        StAXArtifactProcessorExtensionPoint staxProcessors = extensionPoints.getExtensionPoint(StAXArtifactProcessorExtensionPoint.class);
+        staxProcessor = new ExtensibleStAXArtifactProcessor(staxProcessors, inputFactory, null, null);
+        staxProcessors.addArtifactProcessor(new TestPolicyProcessor());
+               
+        URL url = getClass().getResource("test_definitions.xml");
+        InputStream urlStream = url.openStream();
+        XMLStreamReader reader = inputFactory.createXMLStreamReader(urlStream);
+        reader.next();
+        
+      //position on the right element qname to get processed
+        while(reader.hasNext()) {
+        	reader.next();
+        	int event = reader.getEventType();
+        	if(event == START_ELEMENT && reader.getName().equals(elementToProcess)) {
+        		break;
+        	}
+        }
+        while ( true ) {
+            int event = reader.getEventType();
+            switch (event) {
+                case START_ELEMENT: {
+                    Object artifact = staxProcessor.read(reader);
+                    if ( artifact instanceof PolicySet ) {
+                        PolicySet policySet = (PolicySet)artifact;
+                        policySet.setName(new QName(namespace, policySet.getName().getLocalPart()));
+                        policySetTable.put(policySet.getName(), policySet);
+                    } else if ( artifact instanceof Intent ) {
+                        Intent intent = (Intent)artifact;
+                        intent.setName(new QName(namespace, intent.getName().getLocalPart()));
+                        if ( intent instanceof QualifiedIntent ) {
+                            ((QualifiedIntent)intent).getQualifiableIntent().
+                                    setName(new QName(namespace, 
+                                                      ((QualifiedIntent)intent).getQualifiableIntent().getName().getLocalPart()));
+                        }
+                        intentTable.put(intent.getName(), intent);
+                    } else if ( artifact instanceof BindingTypeImpl ) {
+                        IntentAttachPointType bindingType = (IntentAttachPointType)artifact;
+                        bindingTypesTable.put(bindingType.getName(), bindingType);
+                    } else if ( artifact instanceof ImplementationTypeImpl ) {
+                        IntentAttachPointType implType = (IntentAttachPointType)artifact;
+                        implTypesTable.put(implType.getName(), implType);
+                    }
+                    
+                    if ( artifact != null ) {
+                        resolver.addModel(artifact);
+                    }
+                    
+                    break;
+                }
+            }
+            if ( reader.hasNext() ) {
+                reader.next();
+            } else {
+                break;
+            }
+        }
+        urlStream.close();
+    }
+
+    @Override
+    public void tearDown() throws Exception {
+    }
+
+    public void testReadSCADefinitions() throws Exception {
+        assertNotNull(intentTable.get(confidentiality));
+        assertNotNull(intentTable.get(messageProtection));
+        assertNotNull(intentTable.get(confidentiality_transport));
+        assertTrue(intentTable.get(confidentiality).getDescription().length() > 0 );
+        
+        assertNotNull(policySetTable.get(secureReliablePolicy));
+        assertTrue(policySetTable.get(secureReliablePolicy).getProvidedIntents().size() == 2);
+        assertTrue(policySetTable.get(secureReliablePolicy).getPolicies().size() == 2);
+        
+        assertNotNull(policySetTable.get(secureMessagingPolicies));
+        assertEquals(policySetTable.get(secureMessagingPolicies).getMappedPolicies().size(), 3);
+        
+        assertEquals(bindingTypesTable.size(), 1);
+        assertNotNull(bindingTypesTable.get(wsBinding));
+        assertEquals(implTypesTable.size(), 1);
+        assertNotNull(implTypesTable.get(javaImpl));
+    }
+    
+    public void testResolution() throws Exception {
+        assertTrue(intentTable.get(messageProtection) instanceof ProfileIntent);
+        ProfileIntent profileIntent = (ProfileIntent)intentTable.get(new QName(namespace, "messageProtection"));
+        assertNull(profileIntent.getRequiredIntents().get(0).getDescription());
+        
+        QName confidentiality_transport = new QName(namespace, "confidentiality.transport"); 
+        assertTrue(intentTable.get(confidentiality_transport) instanceof QualifiedIntent);
+        QualifiedIntent qualifiedIntent = (QualifiedIntent)intentTable.get(new QName(namespace, "confidentiality.transport"));
+        assertNull(qualifiedIntent.getQualifiableIntent().getDescription());
+        
+        PolicySet secureReliablePolicySet = policySetTable.get(secureReliablePolicy);
+        PolicySet secureMessagingPolicySet = policySetTable.get(secureMessagingPolicies);
+        PolicySet securityPolicySet = policySetTable.get(securityPolicy);
+        
+        assertEquals(secureReliablePolicySet.getProvidedIntents().get(1).getName(), integrity);
+        assertNull(secureReliablePolicySet.getProvidedIntents().get(1).getDescription());
+        assertTrue(secureMessagingPolicySet.isUnresolved());
+        assertEquals(securityPolicySet.getMappedPolicies().size(), 5);
+        
+        //testing to ensure that inclusion of referred policy sets has not happened
+        PolicySet basicAuthMsgProtSecurityPolicySet = policySetTable.get(basicAuthMsgProtSecurity);
+        assertTrue(basicAuthMsgProtSecurityPolicySet.getPolicies().isEmpty());
+        assertTrue(basicAuthMsgProtSecurityPolicySet.getMappedPolicies().isEmpty());
+        
+        IntentAttachPointType wsBindingType = bindingTypesTable.get(wsBinding);
+        assertNull(wsBindingType.getAlwaysProvidedIntents().get(0).getDescription());
+        assertNull(wsBindingType.getMayProvideIntents().get(0).getDescription());
+        
+        IntentAttachPointType javaImplType = implTypesTable.get(javaImpl);
+        assertNull(javaImplType.getAlwaysProvidedIntents().get(0).getDescription());
+        assertNull(javaImplType.getMayProvideIntents().get(0).getDescription());
+        
+        for ( Intent intent : intentTable.values() ) {
+            staxProcessor.resolve(intent, resolver);
+        }
+        
+        for ( PolicySet policySet : policySetTable.values() ) {
+            staxProcessor.resolve(policySet, resolver);
+        }
+        
+        for (  IntentAttachPointType bindingType : bindingTypesTable.values() ) {
+            staxProcessor.resolve(bindingType, resolver);
+        }
+        
+        for ( IntentAttachPointType implType : implTypesTable.values() ) {
+            staxProcessor.resolve(implType, resolver);
+        }
+        
+        
+        
+        //testing if policy intents have been linked have property been linked up 
+        assertNotNull(profileIntent.getRequiredIntents().get(0).getDescription());
+        assertNotNull(qualifiedIntent.getQualifiableIntent().getDescription());
+        assertEquals(secureReliablePolicySet.getProvidedIntents().get(1).getName(), integrity);
+        assertNotNull(secureReliablePolicySet.getProvidedIntents().get(1).getDescription());
+        
+        //testing if policysets have been properly linked up with intents
+        assertFalse(secureMessagingPolicySet.isUnresolved());
+        assertNotNull(secureMessagingPolicySet.getMappedPolicies().get(intentTable.get(confidentiality)));
+        assertNotNull(secureMessagingPolicySet.getMappedPolicies().get(intentTable.get(confidentiality_transport)));
+        
+        //testing if intent maps have been properly mapped to policies
+        assertFalse(securityPolicySet.isUnresolved());
+        assertNotNull(securityPolicySet.getMappedPolicies().get(intentTable.get(confidentiality)));
+        assertNotNull(securityPolicySet.getMappedPolicies().get(intentTable.get(confidentiality_message)));
+        
+        //testing for inclusion of referred policysets
+        assertFalse(basicAuthMsgProtSecurityPolicySet.getPolicies().isEmpty());
+        assertFalse(basicAuthMsgProtSecurityPolicySet.getMappedPolicies().isEmpty());
+        assertNotNull(basicAuthMsgProtSecurityPolicySet.getMappedPolicies().get(intentTable.get(confidentiality_transport)));
+        
+        assertNotNull(wsBindingType.getAlwaysProvidedIntents().get(0).getDescription());
+        assertNotNull(wsBindingType.getMayProvideIntents().get(0).getDescription());
+        
+        assertNotNull(javaImplType.getAlwaysProvidedIntents().get(0).getDescription());
+        assertNotNull(javaImplType.getMayProvideIntents().get(0).getDescription());
+    }
+}
diff --git a/branches/sca-java-1.3.3/modules/policy-xml/src/test/java/org/apache/tuscany/sca/policy/xml/TestPolicyProcessor.java b/branches/sca-java-1.3.3/modules/policy-xml/src/test/java/org/apache/tuscany/sca/policy/xml/TestPolicyProcessor.java
new file mode 100644
index 0000000000..ce5b204787
--- /dev/null
+++ b/branches/sca-java-1.3.3/modules/policy-xml/src/test/java/org/apache/tuscany/sca/policy/xml/TestPolicyProcessor.java
@@ -0,0 +1,74 @@
+/*

+ * 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 javax.xml.stream.XMLStreamException;

+import javax.xml.stream.XMLStreamReader;

+import javax.xml.stream.XMLStreamWriter;

+

+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.policy.Policy;

+

+/**

+ *

+ * @version $Rev$ $Date$

+ */

+public class TestPolicyProcessor implements StAXArtifactProcessor<Policy> {

+

+    public QName getArtifactType() {

+        return new QName("http://schemas.xmlsoap.org/ws/2004/09/policy", "PolicyAttachment");

+    }

+

+    public Policy read(XMLStreamReader arg0) throws ContributionReadException, XMLStreamException {

+        return new MockPolicyImplOne();

+    }

+

+    public void write(Policy arg0, XMLStreamWriter arg1) throws ContributionWriteException,

+                                                        XMLStreamException {

+    }

+

+    public Class<Policy> getModelType() {

+        // TODO Auto-generated method stub

+        return Policy.class;

+    }

+

+    public void resolve(Policy arg0, ModelResolver arg1) throws ContributionResolveException {

+

+    }

+

+    

+    public class MockPolicyImplOne implements Policy {

+        public QName getSchemaName() {

+            return new QName("http://schemas.xmlsoap.org/ws/2004/09/policy", "PolicyAttachment");

+        }

+

+        public boolean isUnresolved() {

+            return false;

+        }

+

+        public void setUnresolved(boolean unresolved) {

+        }

+        

+    }

+}

diff --git a/branches/sca-java-1.3.3/modules/policy-xml/src/test/resources/org/apache/tuscany/sca/policy/xml/test_definitions.xml b/branches/sca-java-1.3.3/modules/policy-xml/src/test/resources/org/apache/tuscany/sca/policy/xml/test_definitions.xml
new file mode 100644
index 0000000000..e01a29863a
--- /dev/null
+++ b/branches/sca-java-1.3.3/modules/policy-xml/src/test/resources/org/apache/tuscany/sca/policy/xml/test_definitions.xml
@@ -0,0 +1,254 @@
+<?xml version="1.0" encoding="ASCII"?>

+<!--

+ * 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.    

+-->

+<definitions xmlns="http://www.osoa.org/xmlns/sca/1.0"

+ 			targetNamespace="http://test"

+ 			xmlns:test="http://test"

+ 			xmlns:sca="http://www.osoa.org/xmlns/sca/1.0">

+

+<!-- Extension Types Metadata -->

+<implementationType type="sca:implementation.java" alwaysProvides="test:logging"

+					mayProvide="test:tracing"/>

+<bindingType type="sca:binding.ws" alwaysProvides="test:confidentiality"

+					mayProvide="test:integrity"/>	

+					

+<!-- Intents and Policysets to assume targetnamespace -->									

+<intent name="TestIntentOne" 

+ 			 constrains="sca:binding"

+ 			 >

+ 			 <description>

+ 			 	Test Intent

+ 			 </description>

+ </intent>

+ 

+  <intent name="TestIntentTwo" 

+ 			 constrains="sca:binding"

+ 			 requires="TestIntentOne">

+ 			 <description>

+ 			 	Protect messages from unauthorized reading or modification

+ 			 </description>

+ </intent>

+ 

+ <policySet name="TestPolicySetOne"

+ 	provides="test:TestIntentOne"

+ 	appliesTo="sca:binding.ws"

+ 	xmlns="http://www.osoa.org/xmlns/sca/1.0"

+ 	xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">

+ 		<wsp:PolicyAttachment>

+ 			<!-- policy expression and policy subject for

+				 "basic authentication" -->

+		</wsp:PolicyAttachment>

+     	<wsp:PolicyAttachment>

+		 	<!-- policy expression and policy subject for

+		 		"reliability" -->

+		</wsp:PolicyAttachment>

+ </policySet>

+ 

+ 

+ <!-- qualified intents -->

+ <intent name="confidentiality.transport" />

+ <intent name="confidentiality.message" />

+ <intent name="confidentiality.message.whole" />

+ <intent name="confidentiality.message.body" /> 

+ 

+ <!-- POLICY SETS -->

+  <policySet name="SecureReliablePolicy"

+ 	provides="test:confidentiality.transport test:integrity"

+ 	appliesTo="sca:binding.ws"

+ 	xmlns="http://www.osoa.org/xmlns/sca/1.0"

+ 	xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">

+ 		<wsp:PolicyAttachment>

+ 			<!-- policy expression and policy subject for

+				 "basic authentication" -->

+		</wsp:PolicyAttachment>

+     	<wsp:PolicyAttachment>

+		 	<!-- policy expression and policy subject for

+		 		"reliability" -->

+		</wsp:PolicyAttachment>

+ </policySet>

+ 

+ <policySet name="SecureMessagingPolicies"

+	 provides="test:confidentiality"

+	 appliesTo="binding.ws"

+	 xmlns="http://www.osoa.org/xmlns/sca/1.0"

+ 	 xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">

+     <intentMap provides="test:confidentiality" default="transport">

+        <qualifier name="transport">

+            <wsp:PolicyAttachment>

+                <!-- policy expression and policy subject for "transport" alternative -->

+                </wsp:PolicyAttachment>

+            <wsp:PolicyAttachment>...</wsp:PolicyAttachment>

+        </qualifier>

+        <qualifier name="message">

+            <wsp:PolicyAttachment>

+                <!-- policy expression and policy subject for "message" alternative" -->

+            </wsp:PolicyAttachment>

+        </qualifier>

+    </intentMap>

+</policySet>

+

+<policySet name="SecurityPolicy" provides="test:confidentiality"

+	xmlns="http://www.osoa.org/xmlns/sca/1.0"

+	xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy" >

+    <intentMap provides="test:confidentiality" default="message">

+        <qualifier name="message">

+            <intentMap provides="message" default="whole">

+                <qualifier name="body">

+                	<wsp:PolicyAttachment>

+                		<!-- policy attachment for body encryption --> 

+               		</wsp:PolicyAttachment>

+           		</qualifier>

+                <qualifier name="whole">

+                	<wsp:PolicyAttachment>

+                		<!-- policy attachment for whole message encryption --> 

+               		</wsp:PolicyAttachment>

+             	</qualifier>

+            </intentMap>

+        </qualifier>

+        <qualifier name="transport">

+        	<wsp:PolicyAttachment>

+        		<!-- policy attachment for transport encryption --> 

+       		</wsp:PolicyAttachment>

+        </qualifier>

+    </intentMap>

+</policySet>

+

+<policySet name="BasicAuthMsgProtSecurity"

+     provides="test:authentication test:confidentiality"

+     appliesTo="binding.ws"

+ 		xmlns="http://www.osoa.org/xmlns/sca/1.0">

+    <policySetReference name="test:AuthenticationPolicies"/>

+    <policySetReference name="test:ConfidentialityPolicies"/>

+</policySet>

+

+<policySet name="AuthenticationPolicies"

+	provides="test:authentication"

+	appliesTo="binding.ws"

+	xmlns="http://www.osoa.org/xmlns/sca/1.0"

+	xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">

+    <wsp:PolicyAttachment>

+        <!-- policy expression and policy subject for "basic

+        authentication" -->

+    </wsp:PolicyAttachment>

+</policySet>

+

+<policySet name="ConfidentialityPolicies"

+ provides="test:confidentiality"

+ bindings="binding.ws"

+ xmlns="http://www.osoa.org/xmlns/sca/1.0"

+    xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">

+    <intentMap provides="test:confidentiality"  default="transport">

+        <qualifier name="transport">

+            <wsp:PolicyAttachment>

+                <!-- policy expression and policy subject for "transport"

+                alternative -->

+            </wsp:PolicyAttachment>

+            <wsp:PolicyAttachment>...</wsp:PolicyAttachment>

+        </qualifier>

+        <qualifier name="message">

+            <wsp:PolicyAttachment>

+                <!-- policy expression and policy subject for "message"

+                alternative" -->...

+            </wsp:PolicyAttachment>

+        </qualifier>

+    </intentMap>

+</policySet>

+

+<policySet name="SecureWSPolicy"

+ 	provides="test:confidentiality"

+ 	appliesTo="sca:binding.ws"

+ 	xmlns="http://www.osoa.org/xmlns/sca/1.0"

+ 	xmlns:sp="http://schemas.xmlsoap.org/ws/2002/12/secext"

+ 	xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">

+	<wsp:Policy>

+	    <wsp:ExactlyOne>

+	      <wsp:All>

+	        <sp:SecurityToken>

+	          <sp:TokenType>sp:X509v3</sp:TokenType>

+	        </sp:SecurityToken>

+	        <sp:UsernameToken /> 

+	        <sp:SignedParts />

+	        <sp:EncryptedParts>

+	          <sp:Body />

+	        </sp:EncryptedParts>

+	        <sp:TransportBinding>

+	          <sp:IncludeTimeStamp />

+	        </sp:TransportBinding>

+	      </wsp:All>

+	    </wsp:ExactlyOne>

+  </wsp:Policy>

+ </policySet>

+

+<!-- profile intent -->

+ <intent name="reliableMessageProtection" 

+ 			 constrains="sca:binding"

+ 			 requires="test:messageProtection">

+ 			 <description>

+ 			 	Protect messages from unauthorized reading or modification

+ 			 </description>

+ </intent>

+ 

+ <intent name="messageProtection" 

+ 			 constrains="sca:binding"

+ 			 requires="test:confidentiality test:integrity">

+ 			 <description>

+ 			 	Protect messages from unauthorized reading or modification

+ 			 </description>

+ </intent>

+

+<!-- simple intent -->

+ <intent name="confidentiality" 

+ 			 constrains="sca:binding">

+ 			 <description>

+ 			 Communitcation thro this binding must prevent

+ 			 unauthorized users from reading the messages.

+ 			 </description>

+ </intent>

+ 

+ <intent name="integrity" 

+ 			 constrains="sca:binding">

+ 			 <description>

+ 			 Communitcation thro this binding must prevent

+ 			 unauthorized modification of the messages.

+ 			 </description>

+ </intent>

+ 

+ <intent name="authentication" 

+ 			 constrains="sca:binding">

+ 			 <description>

+ 			 Communitcation thro this binding required

+ 			 Authentication.

+ 			 </description>

+ </intent>

+ 

+ <intent name="logging" 

+ 			 constrains="sca:implementation">

+ 			 <description>

+ 			 	All messages to and from this implementation must be logged

+ 			 </description>

+ </intent>

+ 

+ <intent name="tracing" 

+ 			 constrains="sca:implementation.java">

+ 			 <description>

+ 			 	Need to figure out some description for this 

+ 			 </description>

+ </intent>

+ 

+</definitions>
\ No newline at end of file