tuscany-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rf...@apache.org
Subject svn commit: r746356 [7/8] - in /tuscany/java/sca/modules: assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ assembly-xml/src/test/resources/org/apache/tuscany/sca/assembly/xm...
Date Fri, 20 Feb 2009 20:10:44 GMT
Copied: tuscany/java/sca/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/IntentProcessor.java (from r745561, tuscany/java/sca/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyIntentProcessor.java)
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/IntentProcessor.java?p2=tuscany/java/sca/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/IntentProcessor.java&p1=tuscany/java/sca/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyIntentProcessor.java&r1=745561&r2=746356&rev=746356&view=diff
==============================================================================
--- tuscany/java/sca/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyIntentProcessor.java (original)
+++ tuscany/java/sca/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/IntentProcessor.java Fri Feb 20 20:10:37 2009
@@ -23,6 +23,8 @@
 import static javax.xml.stream.XMLStreamConstants.START_ELEMENT;
 
 import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashSet;
 import java.util.List;
 import java.util.StringTokenizer;
 
@@ -41,28 +43,28 @@
 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.ExtensionType;
 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;
+import org.apache.tuscany.sca.policy.Intent.Type;
 
 /**
  * Processor for handling XML models of PolicyIntent definitions
  *
  * @version $Rev$ $Date$
  */
-abstract class PolicyIntentProcessor<T extends Intent> extends BaseStAXArtifactProcessor implements
-    StAXArtifactProcessor<T>, PolicyConstants {
+public class IntentProcessor extends BaseStAXArtifactProcessor implements StAXArtifactProcessor<Intent>,
+    PolicyConstants {
 
     private PolicyFactory policyFactory;
     private Monitor monitor;
 
-    public PolicyIntentProcessor(FactoryExtensionPoint modelFactories, Monitor monitor) {
+    public IntentProcessor(FactoryExtensionPoint modelFactories, Monitor monitor) {
         this.policyFactory = modelFactories.getFactory(PolicyFactory.class);
         this.monitor = monitor;
     }
 
-    public PolicyIntentProcessor(PolicyFactory policyFactory, Monitor monitor) {
+    public IntentProcessor(PolicyFactory policyFactory, Monitor monitor) {
         this.policyFactory = policyFactory;
         this.monitor = monitor;
     }
@@ -82,44 +84,50 @@
                                       Severity.ERROR,
                                       model,
                                       message,
-                                      (Object[])messageParameters);
+                                      messageParameters);
             monitor.problem(problem);
         }
     }
 
-    public T read(XMLStreamReader reader) throws ContributionReadException, XMLStreamException {
-        Intent policyIntent = null;
-        String policyIntentName = reader.getAttributeValue(null, NAME);
-        if (policyIntentName == null) {
+    private void warn(String message, Object model, Object... messageParameters) {
+        if (monitor != null) {
+            Problem problem =
+                monitor.createProblem(this.getClass().getName(),
+                                      "policy-xml-validation-messages",
+                                      Severity.WARNING,
+                                      model,
+                                      message,
+                                      messageParameters);
+            monitor.problem(problem);
+        }
+    }
+
+    public Intent read(XMLStreamReader reader) throws ContributionReadException, XMLStreamException {
+        Intent intent = null;
+        String intentLocalName = reader.getAttributeValue(null, NAME);
+        if (intentLocalName == null) {
             error("IntentNameMissing", reader);
-            return (T)policyIntent;
+            return null;
         }
 
-        // Read an <sca:intent>
-        if (reader.getAttributeValue(null, REQUIRES) != null) {
-            policyIntent = policyFactory.createProfileIntent();
-        } else if (policyIntentName != null && policyIntentName.indexOf(QUALIFIER) != -1) {
-            policyIntent = policyFactory.createQualifiedIntent();
+        String intentType = reader.getAttributeValue(null, INTENT_TYPE);
+        if (intentType == null) {
+            intentType = Intent.Type.interaction.name();
+        }
 
-            int qualifierIndex = policyIntentName.lastIndexOf(QUALIFIER);
-            Intent qualifiableIntent = policyFactory.createIntent();
-            qualifiableIntent.setUnresolved(true);
-            qualifiableIntent.setName(new QName(policyIntentName.substring(0, qualifierIndex)));
+        intent = policyFactory.createIntent();
 
-            ((QualifiedIntent)policyIntent).setQualifiableIntent(qualifiableIntent);
-        } else {
-            policyIntent = policyFactory.createIntent();
-        }
-        policyIntent.setName(new QName(policyIntentName));
+        // [rfeng] the target namespace is not available, set the local part for now
+        // This will be changed in the definitions processor
+        intent.setName(new QName(intentLocalName));
+        intent.setType(Type.valueOf(intentType));
 
-        if (policyIntent instanceof ProfileIntent) {
-            readRequiredIntents((ProfileIntent)policyIntent, reader);
-        } else {
-            readExcludedIntents(policyIntent, reader);
-        }
+        readRequiredIntents(intent, reader);
+        readExcludedIntents(intent, reader);
 
-        readConstrainedArtifacts(policyIntent, reader);
+        readConstrainedTypes(intent, reader);
 
+        Intent current = intent;
         int event = reader.getEventType();
         QName name = null;
         while (reader.hasNext()) {
@@ -128,7 +136,28 @@
                 case START_ELEMENT: {
                     name = reader.getName();
                     if (DESCRIPTION_QNAME.equals(name)) {
-                        policyIntent.setDescription(reader.getElementText());
+                        current.setDescription(reader.getElementText());
+                    } else if (INTENT_QUALIFIER_QNAME.equals(name)) {
+                        String qualifierName = reader.getAttributeValue(null, NAME);
+                        String defaultQ = reader.getAttributeValue(null, DEFAULT);
+                        boolean isDefault = defaultQ == null ? false : Boolean.parseBoolean(defaultQ);
+                        String qualifiedIntentName = intentLocalName + QUALIFIER + qualifierName;
+                        Intent qualified = policyFactory.createIntent();
+                        qualified.setType(intent.getType());
+                        qualified.setName(new QName(qualifiedIntentName));
+                        if (isDefault) {
+                            intent.setDefaultQualifiedIntent(qualified);
+                        }
+                        intent.getQualifiedIntents().add(qualified);
+                        qualified.setParent(intent);
+                        current = qualified;
+                    }
+                    break;
+                }
+                case END_ELEMENT: {
+                    name = reader.getName();
+                    if (INTENT_QUALIFIER_QNAME.equals(name)) {
+                        current = intent;
                     }
                     break;
                 }
@@ -142,252 +171,182 @@
                 reader.next();
             }
         }
-        return (T)policyIntent;
+        return intent;
     }
 
-    public void write(T policyIntent, XMLStreamWriter writer) throws ContributionWriteException, XMLStreamException {
+    public void write(Intent intent, 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());
+        writer.writeStartElement(PolicyConstants.SCA11_NS, INTENT);
+        writer.writeNamespace(intent.getName().getPrefix(), intent.getName().getNamespaceURI());
+        writer.writeAttribute(PolicyConstants.NAME, intent.getName().getPrefix() + COLON
+            + intent.getName().getLocalPart());
+        if (intent.getRequiredIntents() != null && intent.getRequiredIntents().size() > 0) {
+            StringBuffer sb = new StringBuffer();
+            for (Intent requiredIntents : intent.getRequiredIntents()) {
+                sb.append(requiredIntents.getName());
+                sb.append(" ");
             }
-        } 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());
+            writer.writeAttribute(PolicyConstants.REQUIRES, sb.toString());
+        }
+
+        if (intent.getExcludedIntents() != null && intent.getExcludedIntents().size() > 0) {
+            StringBuffer sb = new StringBuffer();
+            for (Intent excludedIntents : intent.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 (intent.getConstrainedTypes() != null && intent.getConstrainedTypes().size() > 0) {
+            StringBuffer sb = new StringBuffer();
+            for (ExtensionType contrainedArtifact : intent.getConstrainedTypes()) {
+                sb.append(contrainedArtifact.getType().getPrefix());
+                sb.append(':').append(contrainedArtifact.getType().getLocalPart());
+                sb.append(" ");
             }
+            writer.writeAttribute(CONSTRAINS, sb.toString());
         }
 
-        if (policyIntent.getDescription() != null && policyIntent.getDescription().length() > 0) {
-            writer.writeStartElement(PolicyConstants.SCA10_NS, DESCRIPTION);
-            writer.writeCData(policyIntent.getDescription());
+        if (intent.getDescription() != null && intent.getDescription().length() > 0) {
+            writer.writeStartElement(PolicyConstants.SCA11_NS, DESCRIPTION);
+            writer.writeCData(intent.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 resolveContrainedTypes(Intent intent, ModelResolver resolver) throws ContributionResolveException {
+        Collection<ExtensionType> resolvedTypes = new HashSet<ExtensionType>();
+        for (ExtensionType extensionType : intent.getConstrainedTypes()) {
+            if (ExtensionType.BINDING_BASE.equals(extensionType.getType()) || ExtensionType.IMPLEMENTATION_BASE
+                .equals(extensionType.getType())) {
+                // HACK: Mark sca:binding and sca:implementation as resolved
+                extensionType.setUnresolved(false);
+                resolvedTypes.add(extensionType);
+            } else {
+                ExtensionType resolved = resolver.resolveModel(ExtensionType.class, extensionType);
+                if (!resolved.isUnresolved() || resolved != extensionType) {
+                    resolvedTypes.add(resolved);
+                } else {
+                    warn("ConstrainedTypeNotFound", intent, extensionType, intent);
+                }
+            }
+        }
+        intent.getConstrainedTypes().clear();
+        intent.getConstrainedTypes().addAll(resolvedTypes);
     }
 
-    private void resolveProfileIntent(ProfileIntent policyIntent, ModelResolver resolver)
-        throws ContributionResolveException {
+    private void resolveProfileIntent(Intent intent, 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) {
+        if (intent != null && !intent.getRequiredIntents().isEmpty()) {
             // 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);
+            for (Intent required : intent.getRequiredIntents()) {
+                if (required.isUnresolved()) {
+                    Intent resolved = resolver.resolveModel(Intent.class, required);
                     // At this point, when the required intent is not resolved, it does not mean 
                     // its undeclared, chances are that their dependency are not resolved yet. 
                     // Lets try to resolve them first.
-                    if (resolvedRequiredIntent.isUnresolved()) {
-                        if (resolvedRequiredIntent instanceof ProfileIntent) {
-                            if ((((ProfileIntent)resolvedRequiredIntent).getRequiredIntents()).contains(policyIntent)) {
-                                error("CyclicReferenceFound", resolver, requiredIntent, policyIntent);
-                                return;
-                            }
-                            resolveDependent(resolvedRequiredIntent, resolver);
+                    if (resolved.isUnresolved()) {
+                        if (((resolved).getRequiredIntents()).contains(intent)) {
+                            error("CyclicReferenceFound", resolver, required, intent);
+                            return;
                         }
                     }
 
-                    if (!resolvedRequiredIntent.isUnresolved()) {
-                        requiredIntents.add(resolvedRequiredIntent);
+                    if (!resolved.isUnresolved() || resolved != required) {
+                        requiredIntents.add(resolved);
                     } else {
-                        error("RequiredIntentNotFound", resolver, requiredIntent, policyIntent);
+                        error("RequiredIntentNotFound", resolver, required, intent);
                         return;
                         //throw new ContributionResolveException("Required Intent - " + requiredIntent
-                        //+ " not found for ProfileIntent " + policyIntent);
+                        //+ " not found for Intent " + policyIntent);
                     }
                 } else {
-                    requiredIntents.add(requiredIntent);
+                    requiredIntents.add(required);
                 }
             }
-            policyIntent.getRequiredIntents().clear();
-            policyIntent.getRequiredIntents().addAll(requiredIntents);
+            intent.getRequiredIntents().clear();
+            intent.getRequiredIntents().addAll(requiredIntents);
         }
     }
 
-    private void resolveQualifiedIntent(QualifiedIntent policyIntent, ModelResolver resolver)
-        throws ContributionResolveException {
-        if (policyIntent != null) {
+    private void resolveQualifiedIntent(Intent qualifed, ModelResolver resolver) throws ContributionResolveException {
+        if (qualifed != null) {
             //resolve the qualifiable intent
-            Intent qualifiableIntent = policyIntent.getQualifiableIntent();
-            if (qualifiableIntent.isUnresolved()) {
-                Intent resolvedQualifiableIntent = resolver.resolveModel(Intent.class, qualifiableIntent);
+            Intent parent = qualifed.getParent();
+            if (parent == null) {
+                return;
+            }
+            if (parent.isUnresolved()) {
+                Intent resolved = resolver.resolveModel(Intent.class, parent);
                 // At this point, when the qualifiable intent is not resolved, it does not mean 
                 // its undeclared, chances are that their dependency are not resolved yet. 
                 // Lets try to resolve them first.
-                if (resolvedQualifiableIntent.isUnresolved()) {
-                    if (resolvedQualifiableIntent instanceof QualifiedIntent) {
-                        resolveDependent(resolvedQualifiableIntent, resolver);
-                    }
-                }
 
-                if (!resolvedQualifiableIntent.isUnresolved()) {
-                    policyIntent.setQualifiableIntent(resolvedQualifiableIntent);
+                if (!resolved.isUnresolved() || resolved != qualifed) {
+                    qualifed.setParent(resolved);
                 } else {
-                    error("QualifiableIntentNotFound", resolver, qualifiableIntent, policyIntent);
+                    error("QualifiableIntentNotFound", resolver, parent, qualifed);
                     //throw new ContributionResolveException("Qualifiable Intent - " + qualifiableIntent
-                    //+ " not found for QualifiedIntent " + policyIntent);
+                    //+ " not found for Intent " + policyIntent);
                 }
             }
         }
     }
 
-    public void resolveDependent(Intent policyIntent, ModelResolver resolver) throws ContributionResolveException {
-        if (policyIntent instanceof ProfileIntent)
-            resolveProfileIntent((ProfileIntent)policyIntent, resolver);
-
-        if (policyIntent instanceof QualifiedIntent)
-            resolveQualifiedIntent((QualifiedIntent)policyIntent, resolver);
-
-        resolveContrainedArtifacts(policyIntent, resolver);
-    }
-
-    public void resolve(T policyIntent, ModelResolver resolver) throws ContributionResolveException {
-        if (policyIntent instanceof ProfileIntent) {
-            resolveProfileIntent((ProfileIntent)policyIntent, resolver);
-        } else {
-            resolveExcludedIntents(policyIntent, resolver);
-        }
-
-        if (policyIntent instanceof QualifiedIntent) {
-            resolveQualifiedIntent((QualifiedIntent)policyIntent, resolver);
-        }
-
-        resolveContrainedArtifacts(policyIntent, resolver);
-
-        /* This is too late in the processing
-        if ( !policyIntent.isUnresolved() ) {
-            resolver.addModel(policyIntent);
-        }
-        */
+    public void resolve(Intent intent, ModelResolver resolver) throws ContributionResolveException {
+        resolveProfileIntent(intent, resolver);
+        resolveExcludedIntents(intent, resolver);
+        resolveQualifiedIntent(intent, resolver);
+        resolveContrainedTypes(intent, resolver);
+        intent.setUnresolved(false);
     }
 
     public QName getArtifactType() {
         return POLICY_INTENT_QNAME;
     }
 
-    private void readConstrainedArtifacts(Intent policyIntent, XMLStreamReader reader) throws ContributionReadException {
+    private void readConstrainedTypes(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);
-                }
+        if (value != null) {
+            List<ExtensionType> constrainedTypes = policyIntent.getConstrainedTypes();
+            for (StringTokenizer tokens = new StringTokenizer(value); tokens.hasMoreTokens();) {
+                QName qname = getQNameValue(reader, tokens.nextToken());
+                ExtensionType extensionType = policyFactory.createExtensionType();
+                extensionType.setType(qname);
+                constrainedTypes.add(extensionType);
             }
         }
     }
 
-    private void readRequiredIntents(ProfileIntent policyIntent, XMLStreamReader reader) {
+    private void readRequiredIntents(Intent intent, XMLStreamReader reader) {
         String value = reader.getAttributeValue(null, REQUIRES);
         if (value != null) {
-            List<Intent> requiredIntents = policyIntent.getRequiredIntents();
+            List<Intent> requiredIntents = intent.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);
+                Intent required = policyFactory.createIntent();
+                required.setName(qname);
+                required.setUnresolved(true);
+                requiredIntents.add(required);
             }
         }
     }
 
-    private void readExcludedIntents(Intent policyIntent, XMLStreamReader reader) {
-        String value = reader.getAttributeValue(null, "excludes");
+    private void readExcludedIntents(Intent intent, XMLStreamReader reader) {
+        String value = reader.getAttributeValue(null, EXCLUDES);
         if (value != null) {
-            List<Intent> excludedIntents = policyIntent.getExcludedIntents();
+            List<Intent> excludedIntents = intent.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);
+                Intent excluded = policyFactory.createIntent();
+                excluded.setName(qname);
+                excluded.setUnresolved(true);
+                excludedIntents.add(excluded);
             }
         }
     }
@@ -417,4 +376,8 @@
         }
     }
 
+    public Class<Intent> getModelType() {
+        return Intent.class;
+    }
+
 }

Modified: tuscany/java/sca/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyConstants.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyConstants.java?rev=746356&r1=746355&r2=746356&view=diff
==============================================================================
--- tuscany/java/sca/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyConstants.java (original)
+++ tuscany/java/sca/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyConstants.java Fri Feb 20 20:10:37 2009
@@ -28,7 +28,7 @@
 public interface PolicyConstants {
     String WHITE_SPACE = " ";
     String COLON = ":";
-    String SCA10_NS = "http://www.osoa.org/xmlns/sca/1.0";
+    String SCA11_NS = "http://docs.oasis-open.org/ns/opencsa/sca/200712";
     String TUSCANY_NS = "http://tuscany.apache.org/xmlns/sca/1.0";
     String INTENT = "intent";
     String POLICY_SET = "policySet";
@@ -41,8 +41,10 @@
     String DESCRIPTION = "description";
     String PROVIDES = "provides";
     String APPLIES_TO = "appliesTo";
+    String ATTACH_TO = "attachTo";
     String ALWAYS_APPLIES_TO = "alwaysAppliesTo";
     String QUALIFIER = ".";
+    String INTENT_QUALIFIER = "qualifier";
     String INTENT_MAP_QUALIFIER = "qualifier";
     String REQUIRES = "requires";
     String EXCLUDES = "excludes";
@@ -50,21 +52,22 @@
 
     String ALWAYS_PROVIDES = "alwaysProvides";
     String MAY_PROVIDE = "mayProvide";
-    String TYPE = "type";
+    String INTENT_TYPE = "intentType";
     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);
+    QName IMPLEMENTATION_TYPE_QNAME = new QName(SCA11_NS, IMPLEMENTATION_TYPE);
+    QName BINDING_TYPE_QNAME = new QName(SCA11_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);
+    QName POLICY_INTENT_QNAME = new QName(SCA11_NS, INTENT);
+    QName POLICY_SET_QNAME = new QName(SCA11_NS, POLICY_SET);
+    QName POLICY_INTENT_MAP_QNAME = new QName(SCA11_NS, INTENT_MAP);
+    QName SCA_DEFINITIONS_QNAME = new QName(SCA11_NS, SCA_DEFINITIONS);
+    QName DESCRIPTION_QNAME = new QName(SCA11_NS, DESCRIPTION);
+    QName POLICY_INTENT_MAP_QUALIFIER_QNAME = new QName(SCA11_NS, INTENT_MAP_QUALIFIER);
+    QName POLICY_SET_REFERENCE_QNAME = new QName(SCA11_NS, POLICY_SET_REFERENCE);
+    QName INTENT_QUALIFIER_QNAME = new QName(SCA11_NS, INTENT_QUALIFIER);
 
     String QUALIFIED_INTENT_CONSTRAINS_ERROR = " - Qualified Intents must not specify 'constrains' attribute";
 

Modified: tuscany/java/sca/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicySetProcessor.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicySetProcessor.java?rev=746356&r1=746355&r2=746356&view=diff
==============================================================================
--- tuscany/java/sca/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicySetProcessor.java (original)
+++ tuscany/java/sca/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicySetProcessor.java Fri Feb 20 20:10:37 2009
@@ -23,9 +23,7 @@
 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;
@@ -47,8 +45,11 @@
 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.IntentMap;
+import org.apache.tuscany.sca.policy.PolicyExpression;
 import org.apache.tuscany.sca.policy.PolicyFactory;
 import org.apache.tuscany.sca.policy.PolicySet;
+import org.apache.tuscany.sca.policy.Qualifier;
 
 /**
  * Processor for handling XML models of PolicySet definitions
@@ -134,7 +135,6 @@
 
         policySet = policyFactory.createPolicySet();
         policySet.setName(new QName(policySetName));
-        String alwaysAppliesTo = reader.getAttributeValue(TUSCANY_NS, ALWAYS_APPLIES_TO);
 
         //TODO: with 1.0 version of specs the applies to xpath is given related to the immediate
         //parent whereas the runtime evaluates the xpath aginst the composite element.  What the runtime
@@ -144,12 +144,7 @@
             appliesTo = "//" + appliesTo;
         }
 
-        if (alwaysAppliesTo != null && !alwaysAppliesTo.startsWith("/")) {
-            alwaysAppliesTo = "//" + alwaysAppliesTo;
-        }
-
         policySet.setAppliesTo(appliesTo);
-        policySet.setAlwaysAppliesTo(alwaysAppliesTo);
 
         XPath path = xpathFactory.newXPath();
         path.setNamespaceContext(reader.getNamespaceContext());
@@ -157,9 +152,6 @@
             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);
@@ -200,13 +192,16 @@
                             error("PolicySetReferenceNameMissing", reader, policySetName);
                         }
                     } /*else if ( WS_POLICY_QNAME.equals(name) )  {
-                                           OMElement policyElement = loadElement(reader);
-                                           org.apache.neethi.Policy wsPolicy = PolicyEngine.getPolicy(policyElement);
-                                           policySet.getPolicies().add(wsPolicy);
-                                       } */else {
+                                                                                                                                                                                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);
+                            PolicyExpression exp = policyFactory.createPolicyExpression();
+                            exp.setName(name);
+                            exp.setPolicy(extension);
+                            policySet.getPolicies().add(exp);
                         }
                     }
                     break;
@@ -229,16 +224,20 @@
     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);
+
+            IntentMap intentMap = policyFactory.createIntentMap();
+            QName intentName = getQName(reader, INTENT_MAP);
+            intentMap.setProvidedIntent(mappedIntent);
+
+            policySet.getIntentMaps().add(intentMap);
 
             String qualifierName = null;
             String qualfiedIntentName = null;
             Intent qualifiedIntent = null;
 
+            Qualifier qualifier = null;
+
             int event = reader.getEventType();
             try {
                 reader.next();
@@ -255,6 +254,10 @@
                                     qualifiedIntent = policyFactory.createIntent();
                                     qualifiedIntent.setName(new QName(mappedIntent.getName().getNamespaceURI(),
                                                                       qualfiedIntentName));
+                                    qualifier = policyFactory.createQualifier();
+                                    qualifier.setIntent(qualifiedIntent);
+                                    intentMap.getQualifiers().add(qualifier);
+
                                 } else {
                                     error("QualifierNameMissing", reader, policySet.getName());
                                 }
@@ -272,55 +275,13 @@
                                     //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 {
+                            } else {
                                 Object extension = extensionProcessor.read(reader);
-                                if (extension != null && qualifiedIntent != null) {
-                                    List<Object> policyList = mappedPolicies.get(qualifiedIntent);
-                                    if (policyList == null) {
-                                        policyList = new ArrayList<Object>();
-                                        mappedPolicies.put(qualifiedIntent, policyList);
-
-                                        if (qualifierName.equals(defaultQualifier)) {
-                                            mappedPolicies.put(mappedIntent, policyList);
-                                        }
-                                    }
-                                    policyList.add(extension);
-                                }
-                            }
-                            break;
-                        }
-                        case END_ELEMENT: {
-                            if (POLICY_INTENT_MAP_QNAME.equals(reader.getName())) {
-                                if (defaultQualifier != null) {
-                                    String qualifiedIntentName =
-                                        mappedIntent.getName().getLocalPart() + QUALIFIER + defaultQualifier;
-                                    Intent defaultQualifiedIntent = policyFactory.createIntent();
-                                    defaultQualifiedIntent.setName(new QName(mappedIntent.getName().getNamespaceURI(),
-                                                                             qualifiedIntentName));
-                                    List<Object> policyList = mappedPolicies.get(defaultQualifiedIntent);
-                                    if (policyList != null) {
-                                        mappedPolicies.put(mappedIntent, policyList);
-                                    } else {
-                                        error("UnableToMapPolicies", mappedPolicies, mappedIntent, policySet);
-                                        //throw new ContributionReadException("Unable to map policies for default qualifier in IntentMap for - " +
-                                        //mappedIntent + " in policy set - " + policySet);
-                                    }
-                                    defaultQualifier = null;
+                                if (extension != null && qualifier != null) {
+                                    PolicyExpression exp = policyFactory.createPolicyExpression();
+                                    exp.setName(name);
+                                    exp.setPolicy(extension);
+                                    qualifier.getPolicies().add(exp);
                                 }
                             }
                             break;
@@ -346,11 +307,11 @@
         XMLStreamException {
 
         // Write an <sca:policySet>
-        writer.writeStartElement(SCA10_NS, POLICY_SET);
+        writer.writeStartElement(SCA11_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());
+        writer.writeAttribute(ATTACH_TO, policySet.getAttachTo());
 
         writeProvidedIntents(policySet, writer);
 
@@ -371,16 +332,28 @@
     }
 
     private void writeProvidedIntents(PolicySet policySet, XMLStreamWriter writer) throws XMLStreamException {
-        if (policySet.getProvidedIntents() != null && policySet.getProvidedIntents().size() > 0) {
+        if (!policySet.getProvidedIntents().isEmpty()) {
             StringBuffer sb = new StringBuffer();
             for (Intent providedIntents : policySet.getProvidedIntents()) {
-                sb.append(providedIntents.getName());
+                sb.append(getQualifiedName(providedIntents.getName(), writer));
                 sb.append(" ");
             }
+            // Remove the last space
+            sb.deleteCharAt(sb.length() - 1);
             writer.writeAttribute(PolicyConstants.PROVIDES, sb.toString());
         }
     }
 
+    private String getQualifiedName(QName name, XMLStreamWriter writer) throws XMLStreamException {
+        String local = name.getLocalPart();
+        String prefix = writer.getPrefix(name.getNamespaceURI());
+        if (prefix != null && prefix.length() > 0) {
+            return prefix + ':' + local;
+        } else {
+            return local;
+        }
+    }
+
     private void resolvePolicies(PolicySet policySet, ModelResolver resolver) throws ContributionResolveException {
         boolean unresolved = false;
         if (policySet != null) {
@@ -409,9 +382,9 @@
             List<Intent> providedIntents = new ArrayList<Intent>();
             for (Intent providedIntent : policySet.getProvidedIntents()) {
                 if (providedIntent.isUnresolved()) {
-                    Intent resolvedProvidedIntent = resolver.resolveModel(Intent.class, providedIntent);
-                    if (!resolvedProvidedIntent.isUnresolved()) {
-                        providedIntents.add(resolvedProvidedIntent);
+                    Intent resolved = resolver.resolveModel(Intent.class, providedIntent);
+                    if (!resolved.isUnresolved() || resolved != providedIntent) {
+                        providedIntents.add(resolved);
                     } else {
                         error("ProvidedIntentNotFound", policySet, providedIntent, policySet);
                         return;
@@ -429,26 +402,38 @@
 
     private void resolveIntentsInMappedPolicies(PolicySet policySet, ModelResolver resolver)
         throws ContributionResolveException {
-        Map<Intent, List<Object>> mappedPolicies = new Hashtable<Intent, List<Object>>();
-        for (Map.Entry<Intent, List<Object>> entry : policySet.getMappedPolicies().entrySet()) {
-            Intent mappedIntent = entry.getKey();
-            if (mappedIntent.isUnresolved()) {
-                Intent resolvedMappedIntent = resolver.resolveModel(Intent.class, mappedIntent);
-                if (!resolvedMappedIntent.isUnresolved()) {
-                    mappedPolicies.put(resolvedMappedIntent, entry.getValue());
+        for (IntentMap intentMap : policySet.getIntentMaps()) {
+            Intent intent = intentMap.getProvidedIntent();
+            if (intent.isUnresolved()) {
+                Intent resolved = resolver.resolveModel(Intent.class, intent);
+                if (!resolved.isUnresolved() || resolved != intent) {
+                    intentMap.setProvidedIntent(resolved);
                 } else {
-                    error("MappedIntentNotFound", policySet, mappedIntent, policySet);
+                    error("MappedIntentNotFound", policySet, intent, policySet);
                     return;
                     //throw new ContributionResolveException("Mapped Intent - " + mappedIntent
                     //+ " not found for PolicySet " + policySet);    
                 }
-            } else {
-                mappedPolicies.put(mappedIntent, entry.getValue());
+            }
+            for (Qualifier qualifier : intentMap.getQualifiers()) {
+                intent = qualifier.getIntent();
+                if (intent.isUnresolved()) {
+                    Intent resolved = resolver.resolveModel(Intent.class, intent);
+                    if (!resolved.isUnresolved() || resolved != intent) {
+                        qualifier.setIntent(resolved);
+                    } else {
+                        error("MappedIntentNotFound", policySet, intent, policySet);
+                        return;
+                        //throw new ContributionResolveException("Mapped Intent - " + mappedIntent
+                        //+ " not found for PolicySet " + policySet);    
+                    }
+                }
+                for (PolicyExpression exp : qualifier.getPolicies()) {
+                    // FIXME: How to resolve the policies?
+                }
             }
         }
 
-        policySet.getMappedPolicies().clear();
-        policySet.getMappedPolicies().putAll(mappedPolicies);
     }
 
     private void resolveReferredPolicySets(PolicySet policySet, ModelResolver resolver)
@@ -457,9 +442,9 @@
         List<PolicySet> referredPolicySets = new ArrayList<PolicySet>();
         for (PolicySet referredPolicySet : policySet.getReferencedPolicySets()) {
             if (referredPolicySet.isUnresolved()) {
-                PolicySet resolvedReferredPolicySet = resolver.resolveModel(PolicySet.class, referredPolicySet);
-                if (!resolvedReferredPolicySet.isUnresolved()) {
-                    referredPolicySets.add(resolvedReferredPolicySet);
+                PolicySet resolved = resolver.resolveModel(PolicySet.class, referredPolicySet);
+                if (!resolved.isUnresolved() || resolved != referredPolicySet) {
+                    referredPolicySets.add(resolved);
                 } else {
                     error("ReferredPolicySetNotFound", policySet, referredPolicySet, policySet);
                     return;
@@ -479,7 +464,7 @@
             includeReferredPolicySets(referredPolicySet, furtherReferredPolicySet);
         }
         policySet.getPolicies().addAll(referredPolicySet.getPolicies());
-        policySet.getMappedPolicies().putAll(referredPolicySet.getMappedPolicies());
+        policySet.getIntentMaps().addAll(referredPolicySet.getIntentMaps());
     }
 
     public void resolve(PolicySet policySet, ModelResolver resolver) throws ContributionResolveException {
@@ -499,5 +484,7 @@
                  resolver.addModel(policySet);
             }*/
         }
+
+        policySet.setUnresolved(false);
     }
 }

Modified: tuscany/java/sca/modules/policy-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/policy-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor?rev=746356&r1=746355&r2=746356&view=diff
==============================================================================
--- tuscany/java/sca/modules/policy-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor (original)
+++ tuscany/java/sca/modules/policy-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor Fri Feb 20 20:10:37 2009
@@ -16,9 +16,7 @@
 # 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
+org.apache.tuscany.sca.policy.xml.BindingTypeProcessor;qname=http://docs.oasis-open.org/ns/opencsa/sca/200712#bindingType,model=org.apache.tuscany.sca.policy.BindingType
+org.apache.tuscany.sca.policy.xml.ImplementationTypeProcessor;qname=http://docs.oasis-open.org/ns/opencsa/sca/200712#implementationType,model=org.apache.tuscany.sca.policy.ImplementationType
+org.apache.tuscany.sca.policy.xml.IntentProcessor;qname=http://docs.oasis-open.org/ns/opencsa/sca/200712#intent,model=org.apache.tuscany.sca.policy.Intent
+org.apache.tuscany.sca.policy.xml.PolicySetProcessor;qname=http://docs.oasis-open.org/ns/opencsa/sca/200712#policySet,model=org.apache.tuscany.sca.policy.PolicySet

Modified: tuscany/java/sca/modules/policy-xml/src/main/resources/policy-xml-validation-messages.properties
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/policy-xml/src/main/resources/policy-xml-validation-messages.properties?rev=746356&r1=746355&r2=746356&view=diff
==============================================================================
--- tuscany/java/sca/modules/policy-xml/src/main/resources/policy-xml-validation-messages.properties (original)
+++ tuscany/java/sca/modules/policy-xml/src/main/resources/policy-xml-validation-messages.properties Fri Feb 20 20:10:37 2009
@@ -30,7 +30,7 @@
 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
+RequiredAttributeMissing = Required attribute {0} missing from extension type definition
 AlwaysProvidedIntentNotFound = Always Provided Intent - {0} not found for ExtensionType {1}
 MayProvideIntentNotFound = May Provide Intent - {0} not found for ExtensionType {1}
 ContributionReadException = ContributionReadException occurred due to: {0}
@@ -41,4 +41,5 @@
 PolicySetAppliesToMissing = Required attribute "appliesTo" missing for PolicySet Definition
 IntentMapProvidesMissing = Required attribute "provides" missing for IntentMap in PolicySet : {0}
 QualifierNameMissing = Required attribute "name" missing for qualifier definition in PolicySet : {0}
+ConstrainedTypeNotFound = Unable to find the extension type {0} constrained by intent: {1}
 

Modified: tuscany/java/sca/modules/policy-xml/src/test/java/org/apache/tuscany/sca/policy/xml/ReadDocumentTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/policy-xml/src/test/java/org/apache/tuscany/sca/policy/xml/ReadDocumentTestCase.java?rev=746356&r1=746355&r2=746356&view=diff
==============================================================================
--- tuscany/java/sca/modules/policy-xml/src/test/java/org/apache/tuscany/sca/policy/xml/ReadDocumentTestCase.java (original)
+++ tuscany/java/sca/modules/policy-xml/src/test/java/org/apache/tuscany/sca/policy/xml/ReadDocumentTestCase.java Fri Feb 20 20:10:37 2009
@@ -47,12 +47,13 @@
 import org.apache.tuscany.sca.monitor.DefaultMonitorFactory;
 import org.apache.tuscany.sca.monitor.Monitor;
 import org.apache.tuscany.sca.monitor.MonitorFactory;
+import org.apache.tuscany.sca.policy.BindingType;
+import org.apache.tuscany.sca.policy.ExtensionType;
+import org.apache.tuscany.sca.policy.ImplementationType;
 import org.apache.tuscany.sca.policy.Intent;
-import org.apache.tuscany.sca.policy.IntentAttachPointType;
+import org.apache.tuscany.sca.policy.IntentMap;
 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.Qualifier;
 import org.apache.tuscany.sca.policy.impl.ImplementationTypeImpl;
 import org.junit.Before;
 import org.junit.Test;
@@ -68,13 +69,14 @@
     private StAXArtifactProcessor<Object> staxProcessor;
     private Monitor monitor;
 
-    private static final QName elementToProcess = new QName("http://www.osoa.org/xmlns/sca/1.0", "implementationType");
+    private static final QName elementToProcess =
+        new QName("http://docs.oasis-open.org/ns/opencsa/sca/200712", "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 Map<QName, BindingType> bindingTypesTable = new Hashtable<QName, BindingType>();
+    private Map<QName, ImplementationType> implTypesTable = new Hashtable<QName, ImplementationType>();
+    private static final String scaNamespace = "http://docs.oasis-open.org/ns/opencsa/sca/200712";
     private static final String namespace = "http://test";
 
     private static final QName confidentiality = new QName(namespace, "confidentiality");
@@ -131,18 +133,18 @@
                     } 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);
+                        for (Intent i : intent.getQualifiedIntents()) {
+                            i.setName(new QName(namespace, i.getName().getLocalPart()));
+                            intentTable.put(i.getName(), i);
+                            resolver.addModel(i);
+                        }
+                    } else if (artifact instanceof BindingType) {
+                        BindingType bindingType = (BindingType)artifact;
+                        bindingTypesTable.put(bindingType.getType(), bindingType);
                     } else if (artifact instanceof ImplementationTypeImpl) {
-                        IntentAttachPointType implType = (IntentAttachPointType)artifact;
-                        implTypesTable.put(implType.getName(), implType);
+                        ImplementationType implType = (ImplementationType)artifact;
+                        implTypesTable.put(implType.getType(), implType);
                     }
 
                     if (artifact != null) {
@@ -173,25 +175,35 @@
         assertTrue(policySetTable.get(secureReliablePolicy).getPolicies().size() == 2);
 
         assertNotNull(policySetTable.get(secureMessagingPolicies));
-        assertEquals(policySetTable.get(secureMessagingPolicies).getMappedPolicies().size(), 3);
+        assertEquals(2, policySetTable.get(secureMessagingPolicies).getIntentMaps().get(0).getQualifiers().get(0).getPolicies().size());
 
         assertEquals(bindingTypesTable.size(), 1);
         assertNotNull(bindingTypesTable.get(wsBinding));
         assertEquals(implTypesTable.size(), 1);
         assertNotNull(implTypesTable.get(javaImpl));
     }
+    
+    private int getNumberOfQualifiedPolicies(PolicySet policySet) {
+        int count = 0;
+        for(IntentMap intentMap: policySet.getIntentMaps()) {
+            for(Qualifier q: intentMap.getQualifiers()) {
+                count += q.getPolicies().size();
+            }
+        }
+        return count;
+    }
 
     @Test
     public void testResolution() throws Exception {
-        assertTrue(intentTable.get(messageProtection) instanceof ProfileIntent);
-        ProfileIntent profileIntent = (ProfileIntent)intentTable.get(new QName(namespace, "messageProtection"));
+        assertTrue(!intentTable.get(messageProtection).getRequiredIntents().isEmpty());
+        Intent 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());
+        assertTrue(intentTable.get(confidentiality_transport) instanceof Intent);
+        Intent qualifiedIntent = (Intent)intentTable.get(new QName(namespace, "confidentiality.transport"));
+        assertNull(qualifiedIntent.getDescription());
+        assertNotNull(qualifiedIntent.getParent().getDescription());
 
         PolicySet secureReliablePolicySet = policySetTable.get(secureReliablePolicy);
         PolicySet secureMessagingPolicySet = policySetTable.get(secureMessagingPolicies);
@@ -200,42 +212,26 @@
         assertEquals(secureReliablePolicySet.getProvidedIntents().get(1).getName(), integrity);
         assertNull(secureReliablePolicySet.getProvidedIntents().get(1).getDescription());
         assertTrue(secureMessagingPolicySet.isUnresolved());
-        assertEquals(securityPolicySet.getMappedPolicies().size(), 5);
+        assertEquals(2, getNumberOfQualifiedPolicies(securityPolicySet));
 
         //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());
+        assertTrue(basicAuthMsgProtSecurityPolicySet.getIntentMaps().isEmpty());
 
-        IntentAttachPointType wsBindingType = bindingTypesTable.get(wsBinding);
+        ExtensionType wsBindingType = bindingTypesTable.get(wsBinding);
         assertNull(wsBindingType.getAlwaysProvidedIntents().get(0).getDescription());
-        assertNull(wsBindingType.getMayProvideIntents().get(0).getDescription());
+        assertNull(wsBindingType.getMayProvidedIntents().get(0).getDescription());
 
-        IntentAttachPointType javaImplType = implTypesTable.get(javaImpl);
+        ExtensionType javaImplType = implTypesTable.get(javaImpl);
         assertNull(javaImplType.getAlwaysProvidedIntents().get(0).getDescription());
-        assertNull(javaImplType.getMayProvideIntents().get(0).getDescription());
-
-        List<Intent> simpleIntents = new ArrayList<Intent>();
-        List<ProfileIntent> profileIntents = new ArrayList<ProfileIntent>();
-        List<QualifiedIntent> qualifiedIntents = new ArrayList<QualifiedIntent>();
-
-        for (Intent intent : intentTable.values()) {
-            if (intent instanceof ProfileIntent)
-                profileIntents.add((ProfileIntent)intent);
-            else if (intent instanceof QualifiedIntent)
-                qualifiedIntents.add((QualifiedIntent)intent);
-            else
-                simpleIntents.add(intent);
-        }
-
-        for (Intent intent : simpleIntents)
-            staxProcessor.resolve(intent, resolver);
+        assertNull(javaImplType.getMayProvidedIntents().get(0).getDescription());
 
-        for (ProfileIntent intent : profileIntents)
-            staxProcessor.resolve(intent, resolver);
+        List<Intent> intents = new ArrayList<Intent>(intentTable.values());
 
-        for (QualifiedIntent intent : qualifiedIntents)
+        for (Intent intent : intents) {
             staxProcessor.resolve(intent, resolver);
+        }
 
         for (PolicySet policySet : policySetTable.values()) {
             if (policySet.getReferencedPolicySets().isEmpty())
@@ -247,40 +243,53 @@
                 staxProcessor.resolve(policySet, resolver);
         }
 
-        for (IntentAttachPointType bindingType : bindingTypesTable.values()) {
+        for (ExtensionType bindingType : bindingTypesTable.values()) {
             staxProcessor.resolve(bindingType, resolver);
         }
 
-        for (IntentAttachPointType implType : implTypesTable.values()) {
+        for (ExtensionType 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());
+        assertNotNull(qualifiedIntent.getParent().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)));
+        assertTrue(isRealizedBy(secureMessagingPolicySet, intentTable.get(confidentiality)));
+        assertTrue(isRealizedBy(secureMessagingPolicySet, 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)));
+        assertTrue(isRealizedBy(securityPolicySet, intentTable.get(confidentiality)));
+        assertTrue(isRealizedBy(securityPolicySet, 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)));
+        assertFalse(basicAuthMsgProtSecurityPolicySet.getIntentMaps().isEmpty());
+        assertTrue(isRealizedBy(basicAuthMsgProtSecurityPolicySet, intentTable.get(confidentiality_transport)));
 
         assertNotNull(wsBindingType.getAlwaysProvidedIntents().get(0).getDescription());
-        assertNotNull(wsBindingType.getMayProvideIntents().get(0).getDescription());
+        assertNotNull(wsBindingType.getMayProvidedIntents().get(0).getDescription());
 
         assertNotNull(javaImplType.getAlwaysProvidedIntents().get(0).getDescription());
-        assertNotNull(javaImplType.getMayProvideIntents().get(0).getDescription());
+        assertNotNull(javaImplType.getMayProvidedIntents().get(0).getDescription());
+    }
+
+    private boolean isRealizedBy(PolicySet policySet, Intent intent) {
+        if (intent.getName().getLocalPart().indexOf('.') == -1) {
+            return policySet.getProvidedIntents().contains(intent);
+        }
+        for (IntentMap map : policySet.getIntentMaps()) {
+            for (Qualifier q : map.getQualifiers()) {
+                if (q.getIntent().equals(intent)) {
+                    return true;
+                }
+            }
+        }
+        return false;
     }
 }

Modified: tuscany/java/sca/modules/policy-xml/src/test/java/org/apache/tuscany/sca/policy/xml/TestPolicyProcessor.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/policy-xml/src/test/java/org/apache/tuscany/sca/policy/xml/TestPolicyProcessor.java?rev=746356&r1=746355&r2=746356&view=diff
==============================================================================
--- tuscany/java/sca/modules/policy-xml/src/test/java/org/apache/tuscany/sca/policy/xml/TestPolicyProcessor.java (original)
+++ tuscany/java/sca/modules/policy-xml/src/test/java/org/apache/tuscany/sca/policy/xml/TestPolicyProcessor.java Fri Feb 20 20:10:37 2009
@@ -28,36 +28,46 @@
 import org.apache.tuscany.sca.contribution.processor.ContributionWriteException;
 import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;
 import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
-import org.apache.tuscany.sca.policy.Policy;
+import org.apache.tuscany.sca.policy.PolicyExpression;
 
 /**
  *
  * @version $Rev$ $Date$
  */
-public class TestPolicyProcessor implements StAXArtifactProcessor<Policy> {
+public class TestPolicyProcessor implements StAXArtifactProcessor<PolicyExpression> {
 
     public QName getArtifactType() {
         return new QName("http://schemas.xmlsoap.org/ws/2004/09/policy", "PolicyAttachment");
     }
 
-    public Policy read(XMLStreamReader arg0) throws ContributionReadException, XMLStreamException {
+    public PolicyExpression read(XMLStreamReader arg0) throws ContributionReadException, XMLStreamException {
         return new MockPolicyImplOne();
     }
 
-    public void write(Policy arg0, XMLStreamWriter arg1) throws ContributionWriteException, XMLStreamException {
+    public void write(PolicyExpression arg0, XMLStreamWriter arg1) throws ContributionWriteException, XMLStreamException {
     }
 
-    public Class<Policy> getModelType() {
+    public Class<PolicyExpression> getModelType() {
         // TODO Auto-generated method stub
-        return Policy.class;
+        return PolicyExpression.class;
     }
 
-    public void resolve(Policy arg0, ModelResolver arg1) throws ContributionResolveException {
+    public void resolve(PolicyExpression arg0, ModelResolver arg1) throws ContributionResolveException {
 
     }
 
-    public class MockPolicyImplOne implements Policy {
-        public QName getSchemaName() {
+    public class MockPolicyImplOne implements PolicyExpression {
+        public <T> T getPolicy() {
+            return null;
+        }
+
+        public void setName(QName name) {
+        }
+
+        public <T> void setPolicy(T policy) {
+        }
+
+        public QName getName() {
             return new QName("http://schemas.xmlsoap.org/ws/2004/09/policy", "PolicyAttachment");
         }
 

Modified: tuscany/java/sca/modules/policy-xml/src/test/resources/org/apache/tuscany/sca/policy/xml/test_definitions.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/policy-xml/src/test/resources/org/apache/tuscany/sca/policy/xml/test_definitions.xml?rev=746356&r1=746355&r2=746356&view=diff
==============================================================================
--- tuscany/java/sca/modules/policy-xml/src/test/resources/org/apache/tuscany/sca/policy/xml/test_definitions.xml (original)
+++ tuscany/java/sca/modules/policy-xml/src/test/resources/org/apache/tuscany/sca/policy/xml/test_definitions.xml Fri Feb 20 20:10:37 2009
@@ -17,239 +17,187 @@
  * 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="test: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"
-	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="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
+<definitions xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200712" targetNamespace="http://test"
+    xmlns:test="http://test" xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200712">
+
+    <!-- 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="test:TestIntentOne">
+        <description>
+            Protect messages from unauthorized reading or modification
+             </description>
+    </intent>
+
+    <policySet name="TestPolicySetOne" provides="test:TestIntentOne" appliesTo="sca:binding.ws"
+        xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200712" 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>
+
+    <!-- POLICY SETS -->
+    <policySet name="SecureReliablePolicy" provides="test:confidentiality.transport test:integrity" appliesTo="sca:binding.ws"
+        xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200712" 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://docs.oasis-open.org/ns/opencsa/sca/200712" 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" appliesTo="binding.ws"
+        xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200712" xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
+        <intentMap provides="test:confidentiality" default="message">
+            <qualifier name="message">
+                <wsp:PolicyAttachment>
+                <!-- policy attachment for body encryption -->
+                </wsp:PolicyAttachment>
+            </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://docs.oasis-open.org/ns/opencsa/sca/200712">
+        <policySetReference name="test:AuthenticationPolicies" />
+        <policySetReference name="test:ConfidentialityPolicies" />
+    </policySet>
+
+    <policySet name="AuthenticationPolicies" provides="test:authentication" appliesTo="binding.ws"
+        xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200712" xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
+        <wsp:PolicyAttachment>
+            <!-- policy expression and policy subject for "basic
         authentication" -->
-    </wsp:PolicyAttachment>
-</policySet>
+        </wsp:PolicyAttachment>
+    </policySet>
 
-<policySet name="ConfidentialityPolicies"
- 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"
+    <policySet name="ConfidentialityPolicies" provides="test:confidentiality" appliesTo="binding.ws"
+        xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200712" 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>
- 
+                </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://docs.oasis-open.org/ns/opencsa/sca/200712" 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>
+        <qualifier name="transport" />
+        <qualifier name="message" default="true" />
+    </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

Added: tuscany/java/sca/modules/policy/src/main/java/org/apache/tuscany/sca/policy/BindingType.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/policy/src/main/java/org/apache/tuscany/sca/policy/BindingType.java?rev=746356&view=auto
==============================================================================
--- tuscany/java/sca/modules/policy/src/main/java/org/apache/tuscany/sca/policy/BindingType.java (added)
+++ tuscany/java/sca/modules/policy/src/main/java/org/apache/tuscany/sca/policy/BindingType.java Fri Feb 20 20:10:37 2009
@@ -0,0 +1,27 @@
+/*
+ * 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;
+
+
+/**
+ * Definition of binding type which extends from sca:binding
+ */
+public interface BindingType extends ExtensionType {
+}

Propchange: tuscany/java/sca/modules/policy/src/main/java/org/apache/tuscany/sca/policy/BindingType.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: tuscany/java/sca/modules/policy/src/main/java/org/apache/tuscany/sca/policy/BindingType.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date



Mime
View raw message