Remove SCA prefix from Defintions model

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

9 files changed, 87 insertions, 133 deletions

diff --git a/branches/sca-equinox/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/DefaultDefinitionsFactory.java b/branches/sca-equinox/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/DefaultDefinitionsFactory.java
index 8b1df067ba..156fd0af75 100644
--- a/branches/sca-equinox/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/DefaultDefinitionsFactory.java
+++ b/branches/sca-equinox/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/DefaultDefinitionsFactory.java
@@ -18,15 +18,15 @@
  */
 package org.apache.tuscany.sca.definitions;
 
-import org.apache.tuscany.sca.definitions.impl.SCADefinitionsImpl;
+import org.apache.tuscany.sca.definitions.impl.DefinitionsImpl;
 
 /**
  * Default Implementation of DefinitionsFactory
  */
 public class DefaultDefinitionsFactory implements DefinitionsFactory {
 
-    public SCADefinitions createDefinitions() {
-        return new SCADefinitionsImpl();
+    public Definitions createDefinitions() {
+        return new DefinitionsImpl();
     }
 
 }
diff --git a/branches/sca-equinox/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/SCADefinitions.java b/branches/sca-equinox/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/Definitions.java
index 2039b9ecc9..d3373215a2 100644
--- a/branches/sca-equinox/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/SCADefinitions.java
+++ b/branches/sca-equinox/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/Definitions.java
@@ -30,7 +30,7 @@ import org.apache.tuscany.sca.policy.PolicySet;
  *

  * @version $Rev$ $Date$

  */

-public interface SCADefinitions {

+public interface Definitions {

     /**

      * Returns the target namespace for this SCA Definition

      * @return the target namespace

@@ -49,7 +49,7 @@ public interface SCADefinitions {
      * 

      * @return a list of domain wide Policy Intents 

      */

-    List<Intent> getPolicyIntents();

+    List<Intent> getIntents();

     

     /**

      * Returns a list of domain wide PolicySets

diff --git a/branches/sca-equinox/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/SCADefinitionsBuilder.java b/branches/sca-equinox/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/DefinitionsBuilder.java
index a41d7a6717..59cfa1e205 100644
--- a/branches/sca-equinox/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/SCADefinitionsBuilder.java
+++ b/branches/sca-equinox/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/DefinitionsBuilder.java
@@ -24,11 +24,11 @@ package org.apache.tuscany.sca.definitions;
  *

  * @version $Rev$ $Date$

  */

-public interface SCADefinitionsBuilder {

+public interface DefinitionsBuilder {

     /**

      * Builds the SCA definitions 

      * 

      * @param scaDefns

      */

-    void build(SCADefinitions scaDefns) throws SCADefinitionsBuilderException;

+    void build(Definitions scaDefns) throws DefinitionsBuilderException;

 }

diff --git a/branches/sca-equinox/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/SCADefinitionsBuilderException.java b/branches/sca-equinox/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/DefinitionsBuilderException.java
index 85b9ad7f7d..e3a11d29aa 100644
--- a/branches/sca-equinox/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/SCADefinitionsBuilderException.java
+++ b/branches/sca-equinox/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/DefinitionsBuilderException.java
@@ -23,21 +23,21 @@ package org.apache.tuscany.sca.definitions;
  *

  * @version $Rev$ $Date$

  */

-public class SCADefinitionsBuilderException extends Exception {

+public class DefinitionsBuilderException extends Exception {

     private static final long serialVersionUID = 2513219325230252783L;

 

-    public SCADefinitionsBuilderException() {

+    public DefinitionsBuilderException() {

     }

 

-    public SCADefinitionsBuilderException(String message) {

+    public DefinitionsBuilderException(String message) {

         super(message);

     }

 

-    public SCADefinitionsBuilderException(Throwable cause) {

+    public DefinitionsBuilderException(Throwable cause) {

         super(cause);

     }

 

-    public SCADefinitionsBuilderException(String message, Throwable cause) {

+    public DefinitionsBuilderException(String message, Throwable cause) {

         super(message, cause);

     }

 }

diff --git a/branches/sca-equinox/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/SCADefinitionsBuilderImpl.java b/branches/sca-equinox/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/DefinitionsBuilderImpl.java
index 8b9ff3e1a9..08a01c020a 100644
--- a/branches/sca-equinox/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/SCADefinitionsBuilderImpl.java
+++ b/branches/sca-equinox/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/DefinitionsBuilderImpl.java
@@ -37,11 +37,11 @@ import org.apache.tuscany.sca.policy.QualifiedIntent;
  *

  * @version $Rev$ $Date$

  */

-public class SCADefinitionsBuilderImpl implements SCADefinitionsBuilder {

+public class DefinitionsBuilderImpl implements DefinitionsBuilder {

 

-    public void build(SCADefinitions scaDefns) throws SCADefinitionsBuilderException {

+    public void build(Definitions scaDefns) throws DefinitionsBuilderException {

         Map<QName, Intent> definedIntents = new HashMap<QName, Intent>();

-        for (Intent intent : scaDefns.getPolicyIntents()) {

+        for (Intent intent : scaDefns.getIntents()) {

             definedIntents.put(intent.getName(), intent);

         }

 

@@ -62,12 +62,12 @@ public class SCADefinitionsBuilderImpl implements SCADefinitionsBuilder {
         

         //filling up the maps removes all duplicate entries... so fill this unique lists

         //into the scaDefns.

-        scaDefns.getPolicyIntents().clear();

+        scaDefns.getIntents().clear();

         scaDefns.getPolicySets().clear();

         scaDefns.getBindingTypes().clear();

         scaDefns.getImplementationTypes().clear();

         

-        scaDefns.getPolicyIntents().addAll(definedIntents.values());

+        scaDefns.getIntents().addAll(definedIntents.values());

         scaDefns.getPolicySets().addAll(definedPolicySets.values());

         scaDefns.getBindingTypes().addAll(definedBindingTypes.values());

         scaDefns.getImplementationTypes().addAll(definedImplTypes.values());

@@ -78,9 +78,9 @@ public class SCADefinitionsBuilderImpl implements SCADefinitionsBuilder {
         buildImplementationTypes(scaDefns, definedImplTypes, definedIntents);

     }

     

-    private void buildBindingTypes(SCADefinitions scaDefns, 

+    private void buildBindingTypes(Definitions scaDefns, 

                                    Map<QName, IntentAttachPointType> definedBindingTypes, 

-                                   Map<QName, Intent> definedIntents) throws SCADefinitionsBuilderException {

+                                   Map<QName, Intent> definedIntents) throws DefinitionsBuilderException {

         for (IntentAttachPointType bindingType : scaDefns.getBindingTypes()) {

             buildAlwaysProvidedIntents(bindingType, definedIntents);

             buildMayProvideIntents(bindingType, definedIntents);

@@ -88,9 +88,9 @@ public class SCADefinitionsBuilderImpl implements SCADefinitionsBuilder {
 

     }

     

-    private void buildImplementationTypes(SCADefinitions scaDefns, 

+    private void buildImplementationTypes(Definitions scaDefns, 

                                    Map<QName, IntentAttachPointType> definedImplTypes, 

-                                   Map<QName, Intent> definedIntents) throws SCADefinitionsBuilderException {

+                                   Map<QName, Intent> definedIntents) throws DefinitionsBuilderException {

         for (IntentAttachPointType implType : scaDefns.getImplementationTypes()) {

             buildAlwaysProvidedIntents(implType, definedIntents);

             buildMayProvideIntents(implType, definedIntents);

@@ -98,9 +98,9 @@ public class SCADefinitionsBuilderImpl implements SCADefinitionsBuilder {
     }

     

 

-    private void buildPolicyIntents(SCADefinitions scaDefns, Map<QName, Intent> definedIntents)

-        throws SCADefinitionsBuilderException {

-        for (Intent policyIntent : scaDefns.getPolicyIntents()) {

+    private void buildPolicyIntents(Definitions scaDefns, Map<QName, Intent> definedIntents)

+        throws DefinitionsBuilderException {

+        for (Intent policyIntent : scaDefns.getIntents()) {

             if (policyIntent instanceof ProfileIntent) {

                 buildProfileIntent((ProfileIntent)policyIntent, definedIntents);

             }

@@ -111,9 +111,9 @@ public class SCADefinitionsBuilderImpl implements SCADefinitionsBuilder {
         }

     }

 

-    private void buildPolicySets(SCADefinitions scaDefns,

+    private void buildPolicySets(Definitions scaDefns,

                                  Map<QName, PolicySet> definedPolicySets,

-                                 Map<QName, Intent> definedIntents) throws SCADefinitionsBuilderException {

+                                 Map<QName, Intent> definedIntents) throws DefinitionsBuilderException {

 

         for (PolicySet policySet : scaDefns.getPolicySets()) {

             buildProvidedIntents(policySet, definedIntents);

@@ -129,7 +129,7 @@ public class SCADefinitionsBuilderImpl implements SCADefinitionsBuilder {
     }

     

     private void buildProfileIntent(ProfileIntent policyIntent, Map<QName, Intent> definedIntents)

-        throws SCADefinitionsBuilderException {

+        throws DefinitionsBuilderException {

         //FIXME: Need to check for cyclic references first i.e an A requiring B and then B requiring A... 

         if (policyIntent != null) {

             //resolve all required intents

@@ -140,7 +140,7 @@ public class SCADefinitionsBuilderImpl implements SCADefinitionsBuilder {
                     if (resolvedRequiredIntent != null) {

                         requiredIntents.add(resolvedRequiredIntent);

                     } else {

-                        throw new SCADefinitionsBuilderException("Required Intent - " + requiredIntent

+                        throw new DefinitionsBuilderException("Required Intent - " + requiredIntent

                             + " not found for ProfileIntent "

                             + policyIntent);

 

@@ -155,7 +155,7 @@ public class SCADefinitionsBuilderImpl implements SCADefinitionsBuilder {
     }

 

     private void buildQualifiedIntent(QualifiedIntent policyIntent, Map<QName, Intent> definedIntents)

-        throws SCADefinitionsBuilderException {

+        throws DefinitionsBuilderException {

         if (policyIntent != null) {

             //resolve the qualifiable intent

             Intent qualifiableIntent = policyIntent.getQualifiableIntent();

@@ -165,7 +165,7 @@ public class SCADefinitionsBuilderImpl implements SCADefinitionsBuilder {
                 if (resolvedQualifiableIntent != null) {

                     policyIntent.setQualifiableIntent(resolvedQualifiableIntent);

                 } else {

-                    throw new SCADefinitionsBuilderException("Qualifiable Intent - " + qualifiableIntent

+                    throw new DefinitionsBuilderException("Qualifiable Intent - " + qualifiableIntent

                         + " not found for QualifiedIntent "

                         + policyIntent);

                 }

@@ -176,7 +176,7 @@ public class SCADefinitionsBuilderImpl implements SCADefinitionsBuilder {
     

     

     private void buildAlwaysProvidedIntents(IntentAttachPointType extensionType,

-                                            Map<QName, Intent> definedIntents) throws SCADefinitionsBuilderException {

+                                            Map<QName, Intent> definedIntents) throws DefinitionsBuilderException {

         if (extensionType != null) {

             // resolve all provided intents

             List<Intent> alwaysProvided = new ArrayList<Intent>();

@@ -186,7 +186,7 @@ public class SCADefinitionsBuilderImpl implements SCADefinitionsBuilder {
                     if (resolvedProvidedIntent != null) {

                         alwaysProvided.add(resolvedProvidedIntent);

                     } else {

-                        throw new SCADefinitionsBuilderException(

+                        throw new DefinitionsBuilderException(

                                                                  "Always Provided Intent - " + providedIntent

                                                                      + " not found for ExtensionType "

                                                                      + extensionType);

@@ -202,7 +202,7 @@ public class SCADefinitionsBuilderImpl implements SCADefinitionsBuilder {
     }

     

     private void buildMayProvideIntents(IntentAttachPointType extensionType,

-                                            Map<QName, Intent> definedIntents) throws SCADefinitionsBuilderException {

+                                            Map<QName, Intent> definedIntents) throws DefinitionsBuilderException {

         if (extensionType != null) {

             // resolve all provided intents

             List<Intent> mayProvide = new ArrayList<Intent>();

@@ -212,7 +212,7 @@ public class SCADefinitionsBuilderImpl implements SCADefinitionsBuilder {
                     if (resolvedProvidedIntent != null) {

                         mayProvide.add(resolvedProvidedIntent);

                     } else {

-                        throw new SCADefinitionsBuilderException(

+                        throw new DefinitionsBuilderException(

                                                                  "May Provide Intent - " + providedIntent

                                                                      + " not found for ExtensionType "

                                                                      + extensionType);

@@ -228,7 +228,7 @@ public class SCADefinitionsBuilderImpl implements SCADefinitionsBuilder {
     }

 

     private void buildProvidedIntents(PolicySet policySet, Map<QName, Intent> definedIntents)

-        throws SCADefinitionsBuilderException {

+        throws DefinitionsBuilderException {

         if (policySet != null) {

             //resolve all provided intents

             List<Intent> providedIntents = new ArrayList<Intent>();

@@ -238,7 +238,7 @@ public class SCADefinitionsBuilderImpl implements SCADefinitionsBuilder {
                     if (resolvedProvidedIntent != null) {

                         providedIntents.add(resolvedProvidedIntent);

                     } else {

-                        throw new SCADefinitionsBuilderException("Provided Intent - " + providedIntent

+                        throw new DefinitionsBuilderException("Provided Intent - " + providedIntent

                             + " not found for PolicySet "

                             + policySet);

 

@@ -253,7 +253,7 @@ public class SCADefinitionsBuilderImpl implements SCADefinitionsBuilder {
     }

 

     private void buildIntentsInMappedPolicies(PolicySet policySet, Map<QName, Intent> definedIntents)

-        throws SCADefinitionsBuilderException {

+        throws DefinitionsBuilderException {

         Map<Intent, List<Object>> mappedPolicies = new Hashtable<Intent, List<Object>>();

         for (Map.Entry<Intent, List<Object>> entry : policySet.getMappedPolicies().entrySet()) {

             Intent mappedIntent = entry.getKey();

@@ -263,7 +263,7 @@ public class SCADefinitionsBuilderImpl implements SCADefinitionsBuilder {
                 if (resolvedMappedIntent != null) {

                     mappedPolicies.put(resolvedMappedIntent, entry.getValue());

                 } else {

-                    throw new SCADefinitionsBuilderException("Mapped Intent - " + mappedIntent

+                    throw new DefinitionsBuilderException("Mapped Intent - " + mappedIntent

                         + " not found for PolicySet "

                         + policySet);

 

@@ -278,7 +278,7 @@ public class SCADefinitionsBuilderImpl implements SCADefinitionsBuilder {
     }

 

     private void buildReferredPolicySets(PolicySet policySet, Map<QName, PolicySet> definedPolicySets)

-        throws SCADefinitionsBuilderException {

+        throws DefinitionsBuilderException {

 

         List<PolicySet> referredPolicySets = new ArrayList<PolicySet>();

         for (PolicySet referredPolicySet : policySet.getReferencedPolicySets()) {

@@ -287,7 +287,7 @@ public class SCADefinitionsBuilderImpl implements SCADefinitionsBuilder {
                 if (resolvedReferredPolicySet != null) {

                     referredPolicySets.add(resolvedReferredPolicySet);

                 } else {

-                    throw new SCADefinitionsBuilderException("Referred PolicySet - " + referredPolicySet

+                    throw new DefinitionsBuilderException("Referred PolicySet - " + referredPolicySet

                         + "not found for PolicySet - "

                         + policySet);

                 }

diff --git a/branches/sca-equinox/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/DefinitionsFactory.java b/branches/sca-equinox/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/DefinitionsFactory.java
index 8f9fa3f075..616616ae7a 100644
--- a/branches/sca-equinox/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/DefinitionsFactory.java
+++ b/branches/sca-equinox/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/DefinitionsFactory.java
@@ -27,5 +27,5 @@ public interface DefinitionsFactory {
      * Create an instance of SCA definitions
      * @return a new instance of SCA definitions
      */
-    SCADefinitions createDefinitions();
+    Definitions createDefinitions();
 }
diff --git a/branches/sca-equinox/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/impl/SCADefinitionsImpl.java b/branches/sca-equinox/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/impl/DefinitionsImpl.java
index a5178497a0..fdce0060f9 100644
--- a/branches/sca-equinox/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/impl/SCADefinitionsImpl.java
+++ b/branches/sca-equinox/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/impl/DefinitionsImpl.java
@@ -22,7 +22,7 @@ package org.apache.tuscany.sca.definitions.impl;
 import java.util.List;

 import java.util.concurrent.CopyOnWriteArrayList;

 

-import org.apache.tuscany.sca.definitions.SCADefinitions;

+import org.apache.tuscany.sca.definitions.Definitions;

 import org.apache.tuscany.sca.policy.Intent;

 import org.apache.tuscany.sca.policy.IntentAttachPointType;

 import org.apache.tuscany.sca.policy.PolicySet;

@@ -32,9 +32,9 @@ import org.apache.tuscany.sca.policy.PolicySet;
  *

  * @version $Rev$ $Date$

  */

-public class SCADefinitionsImpl implements SCADefinitions {

+public class DefinitionsImpl implements Definitions {

     private String targetNamespace = null;

-    private List<Intent> policyIntents = new CopyOnWriteArrayList<Intent>();

+    private List<Intent> intents = new CopyOnWriteArrayList<Intent>();

     private List<PolicySet> policySets = new CopyOnWriteArrayList<PolicySet>();

     private List<IntentAttachPointType> bindingTypes = new CopyOnWriteArrayList<IntentAttachPointType>();

     private List<IntentAttachPointType> implementationTypes = new CopyOnWriteArrayList<IntentAttachPointType>();

@@ -49,8 +49,8 @@ public class SCADefinitionsImpl implements SCADefinitions {
         return implementationTypes;

     }

 

-    public List<Intent> getPolicyIntents() {

-        return policyIntents;

+    public List<Intent> getIntents() {

+        return intents;

     }

 

     public List<PolicySet> getPolicySets() {

diff --git a/branches/sca-equinox/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/util/DefinitionsUtil.java b/branches/sca-equinox/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/util/DefinitionsUtil.java
new file mode 100644
index 0000000000..cd408125d2
--- /dev/null
+++ b/branches/sca-equinox/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/util/DefinitionsUtil.java
@@ -0,0 +1,41 @@
+/*

+ * 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.definitions.util;

+

+import org.apache.tuscany.sca.definitions.Definitions;

+

+/**

+ * Some utility functions to deal with SCADefinitions

+ *

+ * @version $Rev$ $Date$

+ */

+public class DefinitionsUtil {

+    

+

+    

+    public static void aggregate(Definitions source, Definitions target) {

+        target.getIntents().addAll(source.getIntents());

+        target.getPolicySets().addAll(source.getPolicySets());

+        target.getBindingTypes().addAll(source.getBindingTypes());

+        target.getImplementationTypes().addAll(source.getImplementationTypes());

+        target.getBindings().addAll(source.getBindings());

+    }

+    

+}

diff --git a/branches/sca-equinox/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/util/SCADefinitionsUtil.java b/branches/sca-equinox/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/util/SCADefinitionsUtil.java
deleted file mode 100644
index 8de6f63c05..0000000000
--- a/branches/sca-equinox/modules/definitions/src/main/java/org/apache/tuscany/sca/definitions/util/SCADefinitionsUtil.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- * 

- *   http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.    

- */

-

-package org.apache.tuscany.sca.definitions.util;

-

-import java.net.URI;

-import java.util.HashMap;

-import java.util.Map;

-

-import javax.xml.namespace.QName;

-

-import org.apache.tuscany.sca.definitions.SCADefinitions;

-import org.apache.tuscany.sca.policy.Intent;

-import org.apache.tuscany.sca.policy.IntentAttachPointType;

-import org.apache.tuscany.sca.policy.PolicySet;

-

-/**

- * Some utility functions to deal with SCADefinitions

- *

- * @version $Rev$ $Date$

- */

-public class SCADefinitionsUtil {

-    

-    public static  void stripDuplicates(SCADefinitions scaDefns) {

-        Map<QName, Intent> definedIntents = new HashMap<QName, Intent>();

-        for (Intent intent : scaDefns.getPolicyIntents()) {

-            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.getPolicyIntents().clear();

-        scaDefns.getPolicyIntents().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 static void aggregateSCADefinitions(SCADefinitions source, SCADefinitions target) {

-        target.getPolicyIntents().addAll(source.getPolicyIntents());

-        target.getPolicySets().addAll(source.getPolicySets());

-        target.getBindingTypes().addAll(source.getBindingTypes());

-        target.getImplementationTypes().addAll(source.getImplementationTypes());

-        target.getBindings().addAll(source.getBindings());

-    }

-    

-    public static boolean isSCADefnsFile(URI uri) {

-        int index = uri.toString().lastIndexOf("/");

-

-        index = (index != -1) ? index + 1 : 0;

-

-        return uri.toString().substring(index).equals("definitions.xml");

-    }

-

-}