From 1fb6a28a73ca17dbb8c4b3059db590e2f9620943 Mon Sep 17 00:00:00 2001 From: antelder Date: Wed, 3 Aug 2011 09:21:41 +0000 Subject: Correct tag name git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1153404 13f79535-47bb-0310-9956-ffa450edef68 --- .../tuscany/sca/definitions/SCADefinitions.java | 82 ++++++ .../sca/definitions/SCADefinitionsBuilder.java | 34 +++ .../SCADefinitionsBuilderException.java | 43 +++ .../sca/definitions/SCADefinitionsBuilderImpl.java | 309 +++++++++++++++++++++ .../sca/definitions/impl/SCADefinitionsImpl.java | 71 +++++ .../sca/definitions/util/SCADefinitionsUtil.java | 87 ++++++ 6 files changed, 626 insertions(+) create mode 100644 sca-java-1.x/tags/1.6-TUSCANY-3909/definitions/src/main/java/org/apache/tuscany/sca/definitions/SCADefinitions.java create mode 100644 sca-java-1.x/tags/1.6-TUSCANY-3909/definitions/src/main/java/org/apache/tuscany/sca/definitions/SCADefinitionsBuilder.java create mode 100644 sca-java-1.x/tags/1.6-TUSCANY-3909/definitions/src/main/java/org/apache/tuscany/sca/definitions/SCADefinitionsBuilderException.java create mode 100644 sca-java-1.x/tags/1.6-TUSCANY-3909/definitions/src/main/java/org/apache/tuscany/sca/definitions/SCADefinitionsBuilderImpl.java create mode 100644 sca-java-1.x/tags/1.6-TUSCANY-3909/definitions/src/main/java/org/apache/tuscany/sca/definitions/impl/SCADefinitionsImpl.java create mode 100644 sca-java-1.x/tags/1.6-TUSCANY-3909/definitions/src/main/java/org/apache/tuscany/sca/definitions/util/SCADefinitionsUtil.java (limited to 'sca-java-1.x/tags/1.6-TUSCANY-3909/definitions/src/main/java/org/apache/tuscany') diff --git a/sca-java-1.x/tags/1.6-TUSCANY-3909/definitions/src/main/java/org/apache/tuscany/sca/definitions/SCADefinitions.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/definitions/src/main/java/org/apache/tuscany/sca/definitions/SCADefinitions.java new file mode 100644 index 0000000000..2039b9ecc9 --- /dev/null +++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/definitions/src/main/java/org/apache/tuscany/sca/definitions/SCADefinitions.java @@ -0,0 +1,82 @@ + /* + * 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; + +import java.util.List; + +import org.apache.tuscany.sca.policy.Intent; +import org.apache.tuscany.sca.policy.IntentAttachPointType; +import org.apache.tuscany.sca.policy.PolicySet; + + +/** + * Represents SCA Definitions. + * + * @version $Rev$ $Date$ + */ +public interface SCADefinitions { + /** + * Returns the target namespace for this SCA Definition + * @return the target namespace + */ + String getTargetNamespace(); + + /** + * Sets the target names for this SCA Definition. + * + * @param ns the target namespace for this SCA Definition + */ + void setTargetNamespace(String ns); + + /** + * Returns a list of domain wide Policy Intents + * + * @return a list of domain wide Policy Intents + */ + List getPolicyIntents(); + + /** + * Returns a list of domain wide PolicySets + * + * @return a list of domain wide PolicySets + */ + List getPolicySets(); + + /** + * Returns a list of domain wide Binding Types + * + * @return a list of domain wide Binding Types + */ + List getBindingTypes(); + + + /** + * Returns a list of domain wide Implementation Types + * + * @return a list of domain wide Implementation Types + */ + List getImplementationTypes(); + + /** + * Returns a list of domain wide binding definition objects + * + * @return a list of domain wide binding definition objects + */ + List getBindings(); +} diff --git a/sca-java-1.x/tags/1.6-TUSCANY-3909/definitions/src/main/java/org/apache/tuscany/sca/definitions/SCADefinitionsBuilder.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/definitions/src/main/java/org/apache/tuscany/sca/definitions/SCADefinitionsBuilder.java new file mode 100644 index 0000000000..a41d7a6717 --- /dev/null +++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/definitions/src/main/java/org/apache/tuscany/sca/definitions/SCADefinitionsBuilder.java @@ -0,0 +1,34 @@ +/* + * 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; + + +/** + * Interface to abstract building of SCA Definitions for a Domain + * + * @version $Rev$ $Date$ + */ +public interface SCADefinitionsBuilder { + /** + * Builds the SCA definitions + * + * @param scaDefns + */ + void build(SCADefinitions scaDefns) throws SCADefinitionsBuilderException; +} diff --git a/sca-java-1.x/tags/1.6-TUSCANY-3909/definitions/src/main/java/org/apache/tuscany/sca/definitions/SCADefinitionsBuilderException.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/definitions/src/main/java/org/apache/tuscany/sca/definitions/SCADefinitionsBuilderException.java new file mode 100644 index 0000000000..85b9ad7f7d --- /dev/null +++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/definitions/src/main/java/org/apache/tuscany/sca/definitions/SCADefinitionsBuilderException.java @@ -0,0 +1,43 @@ +/* + * 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; + +/** + * Builder Exception + * + * @version $Rev$ $Date$ + */ +public class SCADefinitionsBuilderException extends Exception { + private static final long serialVersionUID = 2513219325230252783L; + + public SCADefinitionsBuilderException() { + } + + public SCADefinitionsBuilderException(String message) { + super(message); + } + + public SCADefinitionsBuilderException(Throwable cause) { + super(cause); + } + + public SCADefinitionsBuilderException(String message, Throwable cause) { + super(message, cause); + } +} diff --git a/sca-java-1.x/tags/1.6-TUSCANY-3909/definitions/src/main/java/org/apache/tuscany/sca/definitions/SCADefinitionsBuilderImpl.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/definitions/src/main/java/org/apache/tuscany/sca/definitions/SCADefinitionsBuilderImpl.java new file mode 100644 index 0000000000..8b9ff3e1a9 --- /dev/null +++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/definitions/src/main/java/org/apache/tuscany/sca/definitions/SCADefinitionsBuilderImpl.java @@ -0,0 +1,309 @@ +/* + * 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; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.Hashtable; +import java.util.List; +import java.util.Map; + +import javax.xml.namespace.QName; + +import org.apache.tuscany.sca.policy.Intent; +import org.apache.tuscany.sca.policy.IntentAttachPointType; +import org.apache.tuscany.sca.policy.PolicySet; +import org.apache.tuscany.sca.policy.ProfileIntent; +import org.apache.tuscany.sca.policy.QualifiedIntent; + +/** + * Provides a concrete implementation for a SCADefinitionsBuilder + * + * @version $Rev$ $Date$ + */ +public class SCADefinitionsBuilderImpl implements SCADefinitionsBuilder { + + public void build(SCADefinitions scaDefns) throws SCADefinitionsBuilderException { + Map definedIntents = new HashMap(); + for (Intent intent : scaDefns.getPolicyIntents()) { + definedIntents.put(intent.getName(), intent); + } + + Map definedPolicySets = new HashMap(); + for (PolicySet policySet : scaDefns.getPolicySets()) { + definedPolicySets.put(policySet.getName(), policySet); + } + + Map definedBindingTypes = new HashMap(); + for (IntentAttachPointType bindingType : scaDefns.getBindingTypes()) { + definedBindingTypes.put(bindingType.getName(), bindingType); + } + + Map definedImplTypes = new HashMap(); + for (IntentAttachPointType implType : scaDefns.getImplementationTypes()) { + definedImplTypes.put(implType.getName(), implType); + } + + //filling up the maps removes all duplicate entries... so fill this unique lists + //into the scaDefns. + scaDefns.getPolicyIntents().clear(); + scaDefns.getPolicySets().clear(); + scaDefns.getBindingTypes().clear(); + scaDefns.getImplementationTypes().clear(); + + scaDefns.getPolicyIntents().addAll(definedIntents.values()); + scaDefns.getPolicySets().addAll(definedPolicySets.values()); + scaDefns.getBindingTypes().addAll(definedBindingTypes.values()); + scaDefns.getImplementationTypes().addAll(definedImplTypes.values()); + + buildPolicyIntents(scaDefns, definedIntents); + buildPolicySets(scaDefns, definedPolicySets, definedIntents); + buildBindingTypes(scaDefns, definedBindingTypes, definedIntents); + buildImplementationTypes(scaDefns, definedImplTypes, definedIntents); + } + + private void buildBindingTypes(SCADefinitions scaDefns, + Map definedBindingTypes, + Map definedIntents) throws SCADefinitionsBuilderException { + for (IntentAttachPointType bindingType : scaDefns.getBindingTypes()) { + buildAlwaysProvidedIntents(bindingType, definedIntents); + buildMayProvideIntents(bindingType, definedIntents); + } + + } + + private void buildImplementationTypes(SCADefinitions scaDefns, + Map definedImplTypes, + Map definedIntents) throws SCADefinitionsBuilderException { + for (IntentAttachPointType implType : scaDefns.getImplementationTypes()) { + buildAlwaysProvidedIntents(implType, definedIntents); + buildMayProvideIntents(implType, definedIntents); + } + } + + + private void buildPolicyIntents(SCADefinitions scaDefns, Map definedIntents) + throws SCADefinitionsBuilderException { + for (Intent policyIntent : scaDefns.getPolicyIntents()) { + if (policyIntent instanceof ProfileIntent) { + buildProfileIntent((ProfileIntent)policyIntent, definedIntents); + } + + if (policyIntent instanceof QualifiedIntent) { + buildQualifiedIntent((QualifiedIntent)policyIntent, definedIntents); + } + } + } + + private void buildPolicySets(SCADefinitions scaDefns, + Map definedPolicySets, + Map definedIntents) throws SCADefinitionsBuilderException { + + for (PolicySet policySet : scaDefns.getPolicySets()) { + buildProvidedIntents(policySet, definedIntents); + buildIntentsInMappedPolicies(policySet, definedIntents); + buildReferredPolicySets(policySet, definedPolicySets); + } + + for (PolicySet policySet : scaDefns.getPolicySets()) { + for (PolicySet referredPolicySet : policySet.getReferencedPolicySets()) { + includeReferredPolicySets(policySet, referredPolicySet); + } + } + } + + private void buildProfileIntent(ProfileIntent policyIntent, Map definedIntents) + throws SCADefinitionsBuilderException { + //FIXME: Need to check for cyclic references first i.e an A requiring B and then B requiring A... + if (policyIntent != null) { + //resolve all required intents + List requiredIntents = new ArrayList(); + for (Intent requiredIntent : policyIntent.getRequiredIntents()) { + if (requiredIntent.isUnresolved()) { + Intent resolvedRequiredIntent = definedIntents.get(requiredIntent.getName()); + if (resolvedRequiredIntent != null) { + requiredIntents.add(resolvedRequiredIntent); + } else { + throw new SCADefinitionsBuilderException("Required Intent - " + requiredIntent + + " not found for ProfileIntent " + + policyIntent); + + } + } else { + requiredIntents.add(requiredIntent); + } + } + policyIntent.getRequiredIntents().clear(); + policyIntent.getRequiredIntents().addAll(requiredIntents); + } + } + + private void buildQualifiedIntent(QualifiedIntent policyIntent, Map definedIntents) + throws SCADefinitionsBuilderException { + if (policyIntent != null) { + //resolve the qualifiable intent + Intent qualifiableIntent = policyIntent.getQualifiableIntent(); + if (qualifiableIntent.isUnresolved()) { + Intent resolvedQualifiableIntent = definedIntents.get(qualifiableIntent.getName()); + + if (resolvedQualifiableIntent != null) { + policyIntent.setQualifiableIntent(resolvedQualifiableIntent); + } else { + throw new SCADefinitionsBuilderException("Qualifiable Intent - " + qualifiableIntent + + " not found for QualifiedIntent " + + policyIntent); + } + + } + } + } + + + private void buildAlwaysProvidedIntents(IntentAttachPointType extensionType, + Map definedIntents) throws SCADefinitionsBuilderException { + if (extensionType != null) { + // resolve all provided intents + List alwaysProvided = new ArrayList(); + for (Intent providedIntent : extensionType.getAlwaysProvidedIntents()) { + if (providedIntent.isUnresolved()) { + Intent resolvedProvidedIntent = definedIntents.get(providedIntent.getName()); + if (resolvedProvidedIntent != null) { + alwaysProvided.add(resolvedProvidedIntent); + } else { + throw new SCADefinitionsBuilderException( + "Always Provided Intent - " + providedIntent + + " not found for ExtensionType " + + extensionType); + + } + } else { + alwaysProvided.add(providedIntent); + } + } + extensionType.getAlwaysProvidedIntents().clear(); + extensionType.getAlwaysProvidedIntents().addAll(alwaysProvided); + } + } + + private void buildMayProvideIntents(IntentAttachPointType extensionType, + Map definedIntents) throws SCADefinitionsBuilderException { + if (extensionType != null) { + // resolve all provided intents + List mayProvide = new ArrayList(); + for (Intent providedIntent : extensionType.getMayProvideIntents()) { + if (providedIntent.isUnresolved()) { + Intent resolvedProvidedIntent = definedIntents.get(providedIntent.getName()); + if (resolvedProvidedIntent != null) { + mayProvide.add(resolvedProvidedIntent); + } else { + throw new SCADefinitionsBuilderException( + "May Provide Intent - " + providedIntent + + " not found for ExtensionType " + + extensionType); + + } + } else { + mayProvide.add(providedIntent); + } + } + extensionType.getMayProvideIntents().clear(); + extensionType.getMayProvideIntents().addAll(mayProvide); + } + } + + private void buildProvidedIntents(PolicySet policySet, Map definedIntents) + throws SCADefinitionsBuilderException { + if (policySet != null) { + //resolve all provided intents + List providedIntents = new ArrayList(); + for (Intent providedIntent : policySet.getProvidedIntents()) { + if (providedIntent.isUnresolved()) { + Intent resolvedProvidedIntent = definedIntents.get(providedIntent.getName()); + if (resolvedProvidedIntent != null) { + providedIntents.add(resolvedProvidedIntent); + } else { + throw new SCADefinitionsBuilderException("Provided Intent - " + providedIntent + + " not found for PolicySet " + + policySet); + + } + } else { + providedIntents.add(providedIntent); + } + } + policySet.getProvidedIntents().clear(); + policySet.getProvidedIntents().addAll(providedIntents); + } + } + + private void buildIntentsInMappedPolicies(PolicySet policySet, Map definedIntents) + throws SCADefinitionsBuilderException { + Map> mappedPolicies = new Hashtable>(); + for (Map.Entry> entry : policySet.getMappedPolicies().entrySet()) { + Intent mappedIntent = entry.getKey(); + if (mappedIntent.isUnresolved()) { + Intent resolvedMappedIntent = definedIntents.get(mappedIntent.getName()); + + if (resolvedMappedIntent != null) { + mappedPolicies.put(resolvedMappedIntent, entry.getValue()); + } else { + throw new SCADefinitionsBuilderException("Mapped Intent - " + mappedIntent + + " not found for PolicySet " + + policySet); + + } + } else { + mappedPolicies.put(mappedIntent, entry.getValue()); + } + } + + policySet.getMappedPolicies().clear(); + policySet.getMappedPolicies().putAll(mappedPolicies); + } + + private void buildReferredPolicySets(PolicySet policySet, Map definedPolicySets) + throws SCADefinitionsBuilderException { + + List referredPolicySets = new ArrayList(); + for (PolicySet referredPolicySet : policySet.getReferencedPolicySets()) { + if (referredPolicySet.isUnresolved()) { + PolicySet resolvedReferredPolicySet = definedPolicySets.get(referredPolicySet.getName()); + if (resolvedReferredPolicySet != null) { + referredPolicySets.add(resolvedReferredPolicySet); + } else { + throw new SCADefinitionsBuilderException("Referred PolicySet - " + referredPolicySet + + "not found for PolicySet - " + + policySet); + } + } else { + referredPolicySets.add(referredPolicySet); + } + } + policySet.getReferencedPolicySets().clear(); + policySet.getReferencedPolicySets().addAll(referredPolicySets); + } + + private void includeReferredPolicySets(PolicySet policySet, PolicySet referredPolicySet) { + for (PolicySet furtherReferredPolicySet : referredPolicySet.getReferencedPolicySets()) { + includeReferredPolicySets(referredPolicySet, furtherReferredPolicySet); + } + policySet.getPolicies().addAll(referredPolicySet.getPolicies()); + policySet.getMappedPolicies().putAll(referredPolicySet.getMappedPolicies()); + } +} diff --git a/sca-java-1.x/tags/1.6-TUSCANY-3909/definitions/src/main/java/org/apache/tuscany/sca/definitions/impl/SCADefinitionsImpl.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/definitions/src/main/java/org/apache/tuscany/sca/definitions/impl/SCADefinitionsImpl.java new file mode 100644 index 0000000000..a5178497a0 --- /dev/null +++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/definitions/src/main/java/org/apache/tuscany/sca/definitions/impl/SCADefinitionsImpl.java @@ -0,0 +1,71 @@ +/* + * 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.impl; + +import java.util.List; +import java.util.concurrent.CopyOnWriteArrayList; + +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; + +/** + * Provides a concrete implementation for SCADefinitions + * + * @version $Rev$ $Date$ + */ +public class SCADefinitionsImpl implements SCADefinitions { + private String targetNamespace = null; + private List policyIntents = new CopyOnWriteArrayList(); + private List policySets = new CopyOnWriteArrayList(); + private List bindingTypes = new CopyOnWriteArrayList(); + private List implementationTypes = new CopyOnWriteArrayList(); + private List bindings = new CopyOnWriteArrayList(); + + + public List getBindingTypes() { + return bindingTypes; + } + + public List getImplementationTypes() { + return implementationTypes; + } + + public List getPolicyIntents() { + return policyIntents; + } + + public List getPolicySets() { + return policySets; + } + + public String getTargetNamespace() { + return targetNamespace; + } + + public void setTargetNamespace(String ns) { + this.targetNamespace = ns; + } + + public List getBindings() { + return bindings; + } +} diff --git a/sca-java-1.x/tags/1.6-TUSCANY-3909/definitions/src/main/java/org/apache/tuscany/sca/definitions/util/SCADefinitionsUtil.java b/sca-java-1.x/tags/1.6-TUSCANY-3909/definitions/src/main/java/org/apache/tuscany/sca/definitions/util/SCADefinitionsUtil.java new file mode 100644 index 0000000000..8de6f63c05 --- /dev/null +++ b/sca-java-1.x/tags/1.6-TUSCANY-3909/definitions/src/main/java/org/apache/tuscany/sca/definitions/util/SCADefinitionsUtil.java @@ -0,0 +1,87 @@ +/* + * 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 definedIntents = new HashMap(); + for (Intent intent : scaDefns.getPolicyIntents()) { + definedIntents.put(intent.getName(), intent); + } + + Map definedPolicySets = new HashMap(); + for (PolicySet policySet : scaDefns.getPolicySets()) { + definedPolicySets.put(policySet.getName(), policySet); + } + + Map definedBindingTypes = new HashMap(); + for (IntentAttachPointType bindingType : scaDefns.getBindingTypes()) { + definedBindingTypes.put(bindingType.getName(), bindingType); + } + + Map definedImplTypes = new HashMap(); + 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"); + } + +} -- cgit v1.2.3