Remove SCA prefix from Defintions model

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

2 files changed, 61 insertions, 25 deletions

diff --git a/branches/sca-equinox/modules/definitions-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/SCADefinitionsDocumentProcessor.java b/branches/sca-equinox/modules/definitions-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/DefinitionsDocumentProcessor.java
index f396a601fc..6c3dca7bab 100644
--- a/branches/sca-equinox/modules/definitions-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/SCADefinitionsDocumentProcessor.java
+++ b/branches/sca-equinox/modules/definitions-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/DefinitionsDocumentProcessor.java
@@ -27,6 +27,8 @@ import java.net.URLConnection;
 import java.security.AccessController;
 import java.security.PrivilegedActionException;
 import java.security.PrivilegedExceptionAction;
+import java.util.HashMap;
+import java.util.Map;
 
 import javax.xml.namespace.QName;
 import javax.xml.stream.XMLInputFactory;
@@ -40,19 +42,22 @@ import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;
 import org.apache.tuscany.sca.contribution.processor.URLArtifactProcessor;
 import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
 import org.apache.tuscany.sca.core.FactoryExtensionPoint;
+import org.apache.tuscany.sca.definitions.Definitions;
 import org.apache.tuscany.sca.definitions.DefinitionsFactory;
-import org.apache.tuscany.sca.definitions.SCADefinitions;
-import org.apache.tuscany.sca.definitions.util.SCADefinitionsUtil;
+import org.apache.tuscany.sca.definitions.util.DefinitionsUtil;
 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.PolicySet;
 
 /**
  * A SCA Definitions Document processor.
  *
  * @version $Rev$ $Date$
  */
-public class SCADefinitionsDocumentProcessor implements URLArtifactProcessor<SCADefinitions> {
+public class DefinitionsDocumentProcessor implements URLArtifactProcessor<Definitions> {
     private StAXArtifactProcessor<Object> extensionProcessor;
     private XMLInputFactory inputFactory;
     private DefinitionsFactory definitionsFactory;
@@ -67,7 +72,7 @@ public class SCADefinitionsDocumentProcessor implements URLArtifactProcessor<SCA
      * @param policyFactory
      * @param staxProcessor
      */
-    public SCADefinitionsDocumentProcessor(StAXArtifactProcessor<Object> staxProcessor,
+    public DefinitionsDocumentProcessor(StAXArtifactProcessor<Object> staxProcessor,
                                            XMLInputFactory inputFactory,
                                            DefinitionsFactory definitionsFactory,
                                            Monitor monitor) {
@@ -83,7 +88,7 @@ public class SCADefinitionsDocumentProcessor implements URLArtifactProcessor<SCA
      * @param modelFactories
      * @param staxProcessor
      */
-    public SCADefinitionsDocumentProcessor(FactoryExtensionPoint modelFactories,
+    public DefinitionsDocumentProcessor(FactoryExtensionPoint modelFactories,
                                            StAXArtifactProcessor<Object> staxProcessor,
                                            Monitor monitor) {
         this.extensionProcessor = (StAXArtifactProcessor<Object>)staxProcessor;
@@ -132,7 +137,7 @@ public class SCADefinitionsDocumentProcessor implements URLArtifactProcessor<SCA
         }
     }
 
-    public SCADefinitions read(URL contributionURL, final URI uri, final URL url) throws ContributionReadException {
+    public Definitions read(URL contributionURL, final URI uri, final URL url) throws ContributionReadException {
         InputStream urlStream = null;
         try {
             // Allow privileged access to open URL stream. Add FilePermission to added to security
@@ -153,7 +158,7 @@ public class SCADefinitionsDocumentProcessor implements URLArtifactProcessor<SCA
             //urlStream = createInputStream(url);
             XMLStreamReader reader = inputFactory.createXMLStreamReader(url.toString(), urlStream);
 
-            SCADefinitions definitions = definitionsFactory.createDefinitions();
+            Definitions definitions = definitionsFactory.createDefinitions();
             QName name = null;
             int event;
             while (reader.hasNext()) {
@@ -166,8 +171,8 @@ public class SCADefinitionsDocumentProcessor implements URLArtifactProcessor<SCA
                             return definitions;
                         }
                     } else {
-                        SCADefinitions aDefn = (SCADefinitions)extensionProcessor.read(reader);
-                        SCADefinitionsUtil.aggregateSCADefinitions(aDefn, definitions);
+                        Definitions aDefn = (Definitions)extensionProcessor.read(reader);
+                        DefinitionsUtil.aggregate(aDefn, definitions);
                     }
                 }
             }
@@ -193,9 +198,40 @@ public class SCADefinitionsDocumentProcessor implements URLArtifactProcessor<SCA
             }
         }
     }
+    
+    private static void stripDuplicates(Definitions scaDefns) {
+        Map<QName, Intent> definedIntents = new HashMap<QName, Intent>();
+        for (Intent intent : scaDefns.getIntents()) {
+            definedIntents.put(intent.getName(), intent);
+        }
+
+        Map<QName, PolicySet> definedPolicySets = new HashMap<QName, PolicySet>();
+        for (PolicySet policySet : scaDefns.getPolicySets()) {
+            definedPolicySets.put(policySet.getName(), policySet);
+        }
+        
+        Map<QName, IntentAttachPointType> definedBindingTypes = new HashMap<QName, IntentAttachPointType>();
+        for (IntentAttachPointType bindingType : scaDefns.getBindingTypes()) {
+            definedBindingTypes.put(bindingType.getName(), bindingType);
+        }
+        
+        Map<QName, IntentAttachPointType> definedImplTypes = new HashMap<QName, IntentAttachPointType>();
+        for (IntentAttachPointType implType : scaDefns.getImplementationTypes()) {
+            definedImplTypes.put(implType.getName(), implType);
+        }
+        
+        scaDefns.getIntents().clear();
+        scaDefns.getIntents().addAll(definedIntents.values());
+        scaDefns.getPolicySets().clear();
+        scaDefns.getPolicySets().addAll(definedPolicySets.values());
+        scaDefns.getBindingTypes().clear();
+        scaDefns.getBindingTypes().addAll(definedBindingTypes.values());
+        scaDefns.getImplementationTypes().clear();
+        scaDefns.getImplementationTypes().addAll(definedImplTypes.values());
+    }
 
-    public void resolve(SCADefinitions scaDefinitions, ModelResolver resolver) throws ContributionResolveException {
-        SCADefinitionsUtil.stripDuplicates(scaDefinitions);
+    public void resolve(Definitions scaDefinitions, ModelResolver resolver) throws ContributionResolveException {
+        stripDuplicates(scaDefinitions);
         extensionProcessor.resolve(scaDefinitions, resolver);
     }
 
@@ -203,8 +239,8 @@ public class SCADefinitionsDocumentProcessor implements URLArtifactProcessor<SCA
         return "definitions.xml";
     }
 
-    public Class<SCADefinitions> getModelType() {
-        return SCADefinitions.class;
+    public Class<Definitions> getModelType() {
+        return Definitions.class;
     }
 
 }
diff --git a/branches/sca-equinox/modules/definitions-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/SCADefinitionsProcessor.java b/branches/sca-equinox/modules/definitions-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/DefinitionsProcessor.java
index 46bcff3874..c65a9626ab 100644
--- a/branches/sca-equinox/modules/definitions-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/SCADefinitionsProcessor.java
+++ b/branches/sca-equinox/modules/definitions-xml/src/main/java/org/apache/tuscany/sca/definitions/xml/DefinitionsProcessor.java
@@ -40,7 +40,7 @@ import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;
 import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
 import org.apache.tuscany.sca.core.FactoryExtensionPoint;
 import org.apache.tuscany.sca.definitions.DefinitionsFactory;
-import org.apache.tuscany.sca.definitions.SCADefinitions;
+import org.apache.tuscany.sca.definitions.Definitions;
 import org.apache.tuscany.sca.monitor.Monitor;
 import org.apache.tuscany.sca.policy.Intent;
 import org.apache.tuscany.sca.policy.IntentAttachPointType;
@@ -53,7 +53,7 @@ import org.apache.tuscany.sca.policy.QualifiedIntent;
  *
  * @version $Rev$ $Date$
  */
-public class SCADefinitionsProcessor extends BaseStAXArtifactProcessor implements StAXArtifactProcessor<SCADefinitions> {
+public class DefinitionsProcessor extends BaseStAXArtifactProcessor implements StAXArtifactProcessor<Definitions> {
 
     private StAXArtifactProcessor<Object> extensionProcessor;
     private DefinitionsFactory definitionsFactory;
@@ -67,7 +67,7 @@ public class SCADefinitionsProcessor extends BaseStAXArtifactProcessor implement
     public static final String TARGET_NAMESPACE = "targetNamespace";
     public static final String NAME = "name";
 
-    public SCADefinitionsProcessor(FactoryExtensionPoint factoryExtensionPoint,
+    public DefinitionsProcessor(FactoryExtensionPoint factoryExtensionPoint,
                                    StAXArtifactProcessor<Object> extensionProcessor,
                                    Monitor monitor) {
         this.extensionProcessor = extensionProcessor;
@@ -75,9 +75,9 @@ public class SCADefinitionsProcessor extends BaseStAXArtifactProcessor implement
         this.definitionsFactory = factoryExtensionPoint.getFactory(DefinitionsFactory.class);
     }
 
-    public SCADefinitions read(XMLStreamReader reader) throws ContributionReadException, XMLStreamException {
+    public Definitions read(XMLStreamReader reader) throws ContributionReadException, XMLStreamException {
         QName name = null;
-        SCADefinitions definitions = null;
+        Definitions definitions = null;
         String targetNamespace = null;
 
         while (reader.hasNext()) {
@@ -105,7 +105,7 @@ public class SCADefinitionsProcessor extends BaseStAXArtifactProcessor implement
                                 // FIXME: Workaround for TUSCANY-2499
                                 intent.setUnresolved(false);
 
-                                definitions.getPolicyIntents().add(intent);
+                                definitions.getIntents().add(intent);
                             } else if (extension instanceof PolicySet) {
                                 PolicySet policySet = (PolicySet)extension;
                                 policySet.setName(new QName(targetNamespace, policySet.getName().getLocalPart()));
@@ -145,13 +145,13 @@ public class SCADefinitionsProcessor extends BaseStAXArtifactProcessor implement
         return definitions;
     }
 
-    public void write(SCADefinitions definitions, XMLStreamWriter writer) throws ContributionWriteException,
+    public void write(Definitions definitions, XMLStreamWriter writer) throws ContributionWriteException,
         XMLStreamException {
 
         writeStartDocument(writer, SCA10_NS, SCA_DEFINITIONS, new XAttr(TARGET_NAMESPACE, definitions
             .getTargetNamespace()));
 
-        for (Intent policyIntent : definitions.getPolicyIntents()) {
+        for (Intent policyIntent : definitions.getIntents()) {
             extensionProcessor.write(policyIntent, writer);
         }
 
@@ -170,7 +170,7 @@ public class SCADefinitionsProcessor extends BaseStAXArtifactProcessor implement
         writeEndDocument(writer);
     }
 
-    public void resolve(SCADefinitions scaDefns, ModelResolver resolver) throws ContributionResolveException {
+    public void resolve(Definitions scaDefns, ModelResolver resolver) throws ContributionResolveException {
         // start by adding all of the top level artifacts into the resolver as there
         // are many cross artifact references in a definitions file and we don't want
         // to be dependent on the order things appear
@@ -181,7 +181,7 @@ public class SCADefinitionsProcessor extends BaseStAXArtifactProcessor implement
         List<PolicySet> simplePolicySets = new ArrayList<PolicySet>();
         List<PolicySet> referredPolicySets = new ArrayList<PolicySet>();
 
-        for (Intent policyIntent : scaDefns.getPolicyIntents()) {
+        for (Intent policyIntent : scaDefns.getIntents()) {
             if (policyIntent instanceof ProfileIntent)
                 profileIntents.add((ProfileIntent)policyIntent);
             else if (policyIntent instanceof QualifiedIntent)
@@ -242,8 +242,8 @@ public class SCADefinitionsProcessor extends BaseStAXArtifactProcessor implement
         return SCA_DEFINITIONS_QNAME;
     }
 
-    public Class<SCADefinitions> getModelType() {
-        return SCADefinitions.class;
+    public Class<Definitions> getModelType() {
+        return Definitions.class;
     }
 
 }