diff options
author | antelder <antelder@13f79535-47bb-0310-9956-ffa450edef68> | 2011-07-28 10:58:07 +0000 |
---|---|---|
committer | antelder <antelder@13f79535-47bb-0310-9956-ffa450edef68> | 2011-07-28 10:58:07 +0000 |
commit | 04dcd09976ecc5aa2948993b9a9a2d90d239ee44 (patch) | |
tree | f3d3148a4c4ae6d56185cbd55333aaf119532d26 /sca-java-2.x/branches/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/definitions | |
parent | 19aadc9a267456fe8b84a9a4d3afca74ba9ef969 (diff) |
Delete old beta3 branch as its going to be recreated from the current trunk
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1151789 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to '')
8 files changed, 0 insertions, 728 deletions
diff --git a/sca-java-2.x/branches/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/definitions/DefaultDefinitionsFactory.java b/sca-java-2.x/branches/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/definitions/DefaultDefinitionsFactory.java deleted file mode 100644 index 156fd0af75..0000000000 --- a/sca-java-2.x/branches/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/definitions/DefaultDefinitionsFactory.java +++ /dev/null @@ -1,32 +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; - -import org.apache.tuscany.sca.definitions.impl.DefinitionsImpl; - -/** - * Default Implementation of DefinitionsFactory - */ -public class DefaultDefinitionsFactory implements DefinitionsFactory { - - public Definitions createDefinitions() { - return new DefinitionsImpl(); - } - -} diff --git a/sca-java-2.x/branches/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/definitions/Definitions.java b/sca-java-2.x/branches/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/definitions/Definitions.java deleted file mode 100644 index 9ae5e6f26f..0000000000 --- a/sca-java-2.x/branches/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/definitions/Definitions.java +++ /dev/null @@ -1,92 +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; - -import java.util.List; - -import org.apache.tuscany.sca.assembly.Binding; -import org.apache.tuscany.sca.policy.BindingType; -import org.apache.tuscany.sca.policy.ImplementationType; -import org.apache.tuscany.sca.policy.Intent; -import org.apache.tuscany.sca.policy.PolicySet; - -import org.apache.tuscany.sca.policy.ExternalAttachment; - - -/** - * Represents SCA Definitions. - * - * @version $Rev$ $Date$ - */ -public interface Definitions { - /** - * 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<Intent> getIntents(); - - /** - * Returns a list of domain wide PolicySets - * - * @return a list of domain wide PolicySets - */ - List<PolicySet> getPolicySets(); - - /** - * Returns a list of domain wide Binding Types - * - * @return a list of domain wide Binding Types - */ - List<BindingType> getBindingTypes(); - - - /** - * Returns a list of domain wide Implementation Types - * - * @return a list of domain wide Implementation Types - */ - List<ImplementationType> getImplementationTypes(); - - /** - * Returns a list of domain wide binding definition objects - * - * @return a list of domain wide binding definition objects - */ - List<Binding> getBindings(); - - /** - * Returns a list of external attachments - * @return - */ - List<ExternalAttachment> getExternalAttachments(); -} diff --git a/sca-java-2.x/branches/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/definitions/DefinitionsBuilder.java b/sca-java-2.x/branches/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/definitions/DefinitionsBuilder.java deleted file mode 100644 index 5c68c6cbff..0000000000 --- a/sca-java-2.x/branches/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/definitions/DefinitionsBuilder.java +++ /dev/null @@ -1,34 +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; - - -/** - * Interface to abstract building of SCA Definitions for a Domain - * - * @version $Rev$ $Date$ - */ -public interface DefinitionsBuilder { - /** - * Builds the SCA definitions - * - * @param scaDefns - */ - void build(Definitions scaDefns) throws DefinitionsBuilderException; -} diff --git a/sca-java-2.x/branches/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/definitions/DefinitionsBuilderException.java b/sca-java-2.x/branches/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/definitions/DefinitionsBuilderException.java deleted file mode 100644 index f45be80888..0000000000 --- a/sca-java-2.x/branches/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/definitions/DefinitionsBuilderException.java +++ /dev/null @@ -1,43 +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; - -/** - * Builder Exception - * - * @version $Rev$ $Date$ - */ -public class DefinitionsBuilderException extends Exception { - private static final long serialVersionUID = 2513219325230252783L; - - public DefinitionsBuilderException() { - } - - public DefinitionsBuilderException(String message) { - super(message); - } - - public DefinitionsBuilderException(Throwable cause) { - super(cause); - } - - public DefinitionsBuilderException(String message, Throwable cause) { - super(message, cause); - } -} diff --git a/sca-java-2.x/branches/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/definitions/DefinitionsFactory.java b/sca-java-2.x/branches/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/definitions/DefinitionsFactory.java deleted file mode 100644 index 616616ae7a..0000000000 --- a/sca-java-2.x/branches/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/definitions/DefinitionsFactory.java +++ /dev/null @@ -1,31 +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; - -/** - * Factory interface to create SCA definitions model - * - */ -public interface DefinitionsFactory { - /** - * Create an instance of SCA definitions - * @return a new instance of SCA definitions - */ - Definitions createDefinitions(); -} diff --git a/sca-java-2.x/branches/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/definitions/impl/DefinitionsBuilderImpl.java b/sca-java-2.x/branches/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/definitions/impl/DefinitionsBuilderImpl.java deleted file mode 100644 index d87d45b27a..0000000000 --- a/sca-java-2.x/branches/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/definitions/impl/DefinitionsBuilderImpl.java +++ /dev/null @@ -1,307 +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.impl; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import javax.xml.namespace.QName; - -import org.apache.tuscany.sca.definitions.Definitions; -import org.apache.tuscany.sca.definitions.DefinitionsBuilder; -import org.apache.tuscany.sca.definitions.DefinitionsBuilderException; -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.IntentMap; -import org.apache.tuscany.sca.policy.PolicySet; -import org.apache.tuscany.sca.policy.Qualifier; - -/** - * Provides a concrete implementation for a SCADefinitionsBuilder - * - * @version $Rev$ $Date$ - */ -public class DefinitionsBuilderImpl implements DefinitionsBuilder { - - public void build(Definitions scaDefns) throws DefinitionsBuilderException { - 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, BindingType> definedBindingTypes = new HashMap<QName, BindingType>(); - for (BindingType bindingType : scaDefns.getBindingTypes()) { - definedBindingTypes.put(bindingType.getType(), bindingType); - } - - Map<QName, ImplementationType> definedImplTypes = new HashMap<QName, ImplementationType>(); - for (ImplementationType implType : scaDefns.getImplementationTypes()) { - definedImplTypes.put(implType.getType(), implType); - } - - //filling up the maps removes all duplicate entries... so fill this unique lists - //into the scaDefns. - scaDefns.getIntents().clear(); - scaDefns.getPolicySets().clear(); - scaDefns.getBindingTypes().clear(); - scaDefns.getImplementationTypes().clear(); - - scaDefns.getIntents().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(Definitions scaDefns, - Map<QName, BindingType> definedBindingTypes, - Map<QName, Intent> definedIntents) throws DefinitionsBuilderException { - for (BindingType bindingType : scaDefns.getBindingTypes()) { - buildAlwaysProvidedIntents(bindingType, definedIntents); - buildMayProvideIntents(bindingType, definedIntents); - } - - } - - private void buildImplementationTypes(Definitions scaDefns, - Map<QName, ImplementationType> definedImplTypes, - Map<QName, Intent> definedIntents) throws DefinitionsBuilderException { - for (ImplementationType implType : scaDefns.getImplementationTypes()) { - buildAlwaysProvidedIntents(implType, definedIntents); - buildMayProvideIntents(implType, definedIntents); - } - } - - private void buildPolicyIntents(Definitions scaDefns, Map<QName, Intent> definedIntents) - throws DefinitionsBuilderException { - for (Intent policyIntent : scaDefns.getIntents()) { - if (!policyIntent.getRequiredIntents().isEmpty()) { - buildProfileIntent(policyIntent, definedIntents); - } - - if (!policyIntent.getQualifiedIntents().isEmpty()) { - buildQualifiedIntent(policyIntent, definedIntents); - } - } - } - - private void buildPolicySets(Definitions scaDefns, - Map<QName, PolicySet> definedPolicySets, - Map<QName, Intent> definedIntents) throws DefinitionsBuilderException { - - 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(Intent policyIntent, Map<QName, Intent> definedIntents) - 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 - List<Intent> requiredIntents = new ArrayList<Intent>(); - for (Intent requiredIntent : policyIntent.getRequiredIntents()) { - if (requiredIntent.isUnresolved()) { - Intent resolvedRequiredIntent = definedIntents.get(requiredIntent.getName()); - if (resolvedRequiredIntent != null) { - requiredIntents.add(resolvedRequiredIntent); - } else { - throw new DefinitionsBuilderException("Required Intent - " + requiredIntent - + " not found for ProfileIntent " - + policyIntent); - - } - } else { - requiredIntents.add(requiredIntent); - } - } - policyIntent.getRequiredIntents().clear(); - policyIntent.getRequiredIntents().addAll(requiredIntents); - } - } - - private void buildQualifiedIntent(Intent policyIntent, Map<QName, Intent> definedIntents) - throws DefinitionsBuilderException { - /* - 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 DefinitionsBuilderException("Qualifiable Intent - " + qualifiableIntent - + " not found for QualifiedIntent " - + policyIntent); - } - - } - } - */ - } - - private void buildAlwaysProvidedIntents(ExtensionType extensionType, Map<QName, Intent> definedIntents) - throws DefinitionsBuilderException { - if (extensionType != null) { - // resolve all provided intents - List<Intent> alwaysProvided = new ArrayList<Intent>(); - for (Intent providedIntent : extensionType.getAlwaysProvidedIntents()) { - if (providedIntent.isUnresolved()) { - Intent resolvedProvidedIntent = definedIntents.get(providedIntent.getName()); - if (resolvedProvidedIntent != null) { - alwaysProvided.add(resolvedProvidedIntent); - } else { - throw new DefinitionsBuilderException("Always Provided Intent - " + providedIntent - + " not found for ExtensionType " - + extensionType); - - } - } else { - alwaysProvided.add(providedIntent); - } - } - extensionType.getAlwaysProvidedIntents().clear(); - extensionType.getAlwaysProvidedIntents().addAll(alwaysProvided); - } - } - - private void buildMayProvideIntents(ExtensionType extensionType, Map<QName, Intent> definedIntents) - throws DefinitionsBuilderException { - if (extensionType != null) { - // resolve all provided intents - List<Intent> mayProvide = new ArrayList<Intent>(); - for (Intent providedIntent : extensionType.getMayProvidedIntents()) { - if (providedIntent.isUnresolved()) { - Intent resolvedProvidedIntent = definedIntents.get(providedIntent.getName()); - if (resolvedProvidedIntent != null) { - mayProvide.add(resolvedProvidedIntent); - } else { - throw new DefinitionsBuilderException("May Provide Intent - " + providedIntent - + " not found for ExtensionType " - + extensionType); - - } - } else { - mayProvide.add(providedIntent); - } - } - extensionType.getMayProvidedIntents().clear(); - extensionType.getMayProvidedIntents().addAll(mayProvide); - } - } - - private void buildProvidedIntents(PolicySet policySet, Map<QName, Intent> definedIntents) - throws DefinitionsBuilderException { - if (policySet != null) { - //resolve all provided intents - List<Intent> providedIntents = new ArrayList<Intent>(); - for (Intent providedIntent : policySet.getProvidedIntents()) { - if (providedIntent.isUnresolved()) { - Intent resolvedProvidedIntent = definedIntents.get(providedIntent.getName()); - if (resolvedProvidedIntent != null) { - providedIntents.add(resolvedProvidedIntent); - } else { - throw new DefinitionsBuilderException("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<QName, Intent> definedIntents) - throws DefinitionsBuilderException { - for (IntentMap intentMap : policySet.getIntentMaps()) { - for (Qualifier qualifier : intentMap.getQualifiers()) { - Intent mappedIntent = qualifier.getIntent(); - if (mappedIntent.isUnresolved()) { - Intent resolvedMappedIntent = definedIntents.get(mappedIntent.getName()); - - if (resolvedMappedIntent != null) { - qualifier.setIntent(resolvedMappedIntent); - } else { - throw new DefinitionsBuilderException("Mapped Intent - " + mappedIntent - + " not found for PolicySet " - + policySet); - - } - } - } - } - } - - private void buildReferredPolicySets(PolicySet policySet, Map<QName, PolicySet> definedPolicySets) - throws DefinitionsBuilderException { - - List<PolicySet> referredPolicySets = new ArrayList<PolicySet>(); - for (PolicySet referredPolicySet : policySet.getReferencedPolicySets()) { - if (referredPolicySet.isUnresolved()) { - PolicySet resolvedReferredPolicySet = definedPolicySets.get(referredPolicySet.getName()); - if (resolvedReferredPolicySet != null) { - referredPolicySets.add(resolvedReferredPolicySet); - } else { - throw new DefinitionsBuilderException("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.getIntentMaps().addAll(referredPolicySet.getIntentMaps()); - } -} diff --git a/sca-java-2.x/branches/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/definitions/impl/DefinitionsImpl.java b/sca-java-2.x/branches/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/definitions/impl/DefinitionsImpl.java deleted file mode 100644 index e58261cda2..0000000000 --- a/sca-java-2.x/branches/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/definitions/impl/DefinitionsImpl.java +++ /dev/null @@ -1,79 +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.impl; - -import java.util.List; -import java.util.concurrent.CopyOnWriteArrayList; - -import org.apache.tuscany.sca.assembly.Binding; -import org.apache.tuscany.sca.definitions.Definitions; -import org.apache.tuscany.sca.policy.BindingType; -import org.apache.tuscany.sca.policy.ExternalAttachment; -import org.apache.tuscany.sca.policy.ImplementationType; -import org.apache.tuscany.sca.policy.Intent; -import org.apache.tuscany.sca.policy.PolicySet; - -/** - * Provides a concrete implementation for SCADefinitions - * - * @version $Rev$ $Date$ - */ -public class DefinitionsImpl implements Definitions { - private String targetNamespace = null; - private List<Intent> intents = new CopyOnWriteArrayList<Intent>(); - private List<PolicySet> policySets = new CopyOnWriteArrayList<PolicySet>(); - private List<BindingType> bindingTypes = new CopyOnWriteArrayList<BindingType>(); - private List<ImplementationType> implementationTypes = new CopyOnWriteArrayList<ImplementationType>(); - private List<Binding> bindings = new CopyOnWriteArrayList<Binding>(); - private List<ExternalAttachment> externalAttachments = new CopyOnWriteArrayList<ExternalAttachment>(); - - - public List<BindingType> getBindingTypes() { - return bindingTypes; - } - - public List<ImplementationType> getImplementationTypes() { - return implementationTypes; - } - - public List<Intent> getIntents() { - return intents; - } - - public List<PolicySet> getPolicySets() { - return policySets; - } - - public String getTargetNamespace() { - return targetNamespace; - } - - public void setTargetNamespace(String ns) { - this.targetNamespace = ns; - } - - public List<Binding> getBindings() { - return bindings; - } - - public List<ExternalAttachment> getExternalAttachments() { - return externalAttachments ; - } -} diff --git a/sca-java-2.x/branches/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/definitions/util/DefinitionsUtil.java b/sca-java-2.x/branches/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/definitions/util/DefinitionsUtil.java deleted file mode 100644 index 452c3bf883..0000000000 --- a/sca-java-2.x/branches/2.0-Beta3/modules/assembly/src/main/java/org/apache/tuscany/sca/definitions/util/DefinitionsUtil.java +++ /dev/null @@ -1,110 +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 static org.apache.tuscany.sca.assembly.builder.Messages.DEFINITIONS_VALIDATION; - -import java.util.HashSet; - -import org.apache.tuscany.sca.definitions.Definitions; -import org.apache.tuscany.sca.monitor.Monitor; -import org.apache.tuscany.sca.policy.BindingType; -import org.apache.tuscany.sca.policy.ImplementationType; -import org.apache.tuscany.sca.policy.Intent; -import org.apache.tuscany.sca.policy.PolicySet; - -/** - * Some utility functions to deal with SCADefinitions - * - * @version $Rev$ $Date$ - */ -public class DefinitionsUtil { - - /** - * Add the source set of definitions into the target set of definitions checking that - * definitions artifacts are unique in the process - * - * @param source the input definitions collection - * @param target the definition collection into which source will aggregated - */ - public static void aggregate(Definitions source, Definitions target, Monitor monitor) { - - HashSet<Intent> intents = new HashSet<Intent>(target.getIntents()); - for(Intent intent : source.getIntents()){ - if (intents.contains(intent)){ - Monitor.error(monitor, - target, - DEFINITIONS_VALIDATION, - "DuplicateIntent", - intent.getName().toString()); - } else { - target.getIntents().add(intent); - intents.add(intent); - } - } - - HashSet<PolicySet> policySets = new HashSet<PolicySet>(target.getPolicySets()); - for(PolicySet policySet : source.getPolicySets()){ - if (policySets.contains(policySet)){ - Monitor.error(monitor, - target, - DEFINITIONS_VALIDATION, - "DuplicatePolicySet", - policySet.getName().toString()); - } else { - target.getPolicySets().add(policySet); - policySets.add(policySet); - } - } - - HashSet<BindingType> bindingTypes = new HashSet<BindingType>(target.getBindingTypes()); - for(BindingType bindingType : source.getBindingTypes()){ - if (bindingTypes.contains(bindingType)){ - Monitor.error(monitor, - target, - DEFINITIONS_VALIDATION, - "DuplicateBindingType", - bindingType.getType().toString()); - } else { - target.getBindingTypes().add(bindingType); - bindingTypes.add(bindingType); - } - } - - HashSet<ImplementationType> implementationTypes = new HashSet<ImplementationType>(target.getImplementationTypes()); - for(ImplementationType implementationType : source.getImplementationTypes()){ - if (implementationTypes.contains(implementationType)){ - Monitor.error(monitor, - target, - DEFINITIONS_VALIDATION, - "DuplicateImplementationType", - implementationType.getType().toString()); - } else { - target.getImplementationTypes().add(implementationType); - implementationTypes.add(implementationType); - } - } - - target.getBindings().addAll(source.getBindings()); - - target.getExternalAttachments().addAll(source.getExternalAttachments()); - } - -} |