Moving 1.x branches

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

36 files changed, 2528 insertions, 0 deletions

diff --git a/sca-java-1.x/branches/sca-java-1.2/modules/policy/src/main/java/org/apache/tuscany/sca/policy/DefaultIntentAttachPointTypeFactory.java b/sca-java-1.x/branches/sca-java-1.2/modules/policy/src/main/java/org/apache/tuscany/sca/policy/DefaultIntentAttachPointTypeFactory.java
new file mode 100644
index 0000000000..e64abccedc
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.2/modules/policy/src/main/java/org/apache/tuscany/sca/policy/DefaultIntentAttachPointTypeFactory.java
@@ -0,0 +1,27 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+ */
+package org.apache.tuscany.sca.policy;
+
+import org.apache.tuscany.sca.policy.impl.IntentAttachPointTypeFactoryImpl;
+
+/**
+ * Default implementation for IntentAttachPointTypeFactory
+ */
+public class DefaultIntentAttachPointTypeFactory extends IntentAttachPointTypeFactoryImpl implements IntentAttachPointTypeFactory{
+}
diff --git a/sca-java-1.x/branches/sca-java-1.2/modules/policy/src/main/java/org/apache/tuscany/sca/policy/DefaultPolicyFactory.java b/sca-java-1.x/branches/sca-java-1.2/modules/policy/src/main/java/org/apache/tuscany/sca/policy/DefaultPolicyFactory.java
new file mode 100644
index 0000000000..2da41675a1
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.2/modules/policy/src/main/java/org/apache/tuscany/sca/policy/DefaultPolicyFactory.java
@@ -0,0 +1,30 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+ */
+package org.apache.tuscany.sca.policy;
+
+import org.apache.tuscany.sca.policy.impl.PolicyFactoryImpl;
+
+/**
+ * A factory for the policy model.
+ * 
+ * @version $Rev$ $Date$
+ */
+public class DefaultPolicyFactory extends PolicyFactoryImpl implements PolicyFactory {
+
+}
diff --git a/sca-java-1.x/branches/sca-java-1.2/modules/policy/src/main/java/org/apache/tuscany/sca/policy/Intent.java b/sca-java-1.x/branches/sca-java-1.2/modules/policy/src/main/java/org/apache/tuscany/sca/policy/Intent.java
new file mode 100644
index 0000000000..a9b9ac4884
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.2/modules/policy/src/main/java/org/apache/tuscany/sca/policy/Intent.java
@@ -0,0 +1,107 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+ */
+package org.apache.tuscany.sca.policy;
+
+import java.util.List;
+
+import javax.xml.namespace.QName;
+
+/**
+ * Represents a policy intent. See the Policy Framework specification for a
+ * description of this element.
+ */
+public interface Intent {
+
+    /**
+     * Returns the intent name.
+     * 
+     * @return the intent name
+     */
+    QName getName();
+
+    /**
+     * Sets the intent name
+     * 
+     * @param name the intent name
+     */
+    void setName(QName name);
+
+    /**
+     * Get the intent domain (the root intent name before any qualifiers)
+     * @return the domain
+     */
+    String getDomain();
+
+    /**
+     * Get the intent qualifiers
+     * @return the domain
+     */
+    String[] getQualifiedNames();
+
+    /**
+     * Returns the list of operations that this intent applies to.
+     * 
+     * @return
+     */
+    //List<Operation> getOperations();
+
+    /**
+     * Returns the list of SCA constructs that this intent is meant to
+     * configure.
+     * 
+     * @return the list of SCA constructs that this intent is meant to configure
+     */
+    List<QName> getConstrains();
+
+    /**
+     * Returns the list of children qualified intents.
+     * 
+     * @return the list of children qualified intents.
+     */
+    List<Intent> getQualifiedIntents();
+
+    /**
+     * Returns the intent description.
+     * 
+     * @return the intent description
+     */
+    String getDescription();
+
+    /**
+     * Sets the intent description.
+     * 
+     * @param description the intent description
+     */
+    void setDescription(String description);
+
+    /**
+     * Returns true if the model element is unresolved.
+     * 
+     * @return true if the model element is unresolved.
+     */
+    boolean isUnresolved();
+
+    /**
+     * Sets whether the model element is unresolved.
+     * 
+     * @param unresolved whether the model element is unresolved
+     */
+    void setUnresolved(boolean unresolved);
+
+}
diff --git a/sca-java-1.x/branches/sca-java-1.2/modules/policy/src/main/java/org/apache/tuscany/sca/policy/IntentAttachPoint.java b/sca-java-1.x/branches/sca-java-1.2/modules/policy/src/main/java/org/apache/tuscany/sca/policy/IntentAttachPoint.java
new file mode 100644
index 0000000000..8a8342ed04
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.2/modules/policy/src/main/java/org/apache/tuscany/sca/policy/IntentAttachPoint.java
@@ -0,0 +1,50 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+ */
+package org.apache.tuscany.sca.policy;
+
+import java.util.List;
+
+/**
+ * Base interface for all assembly model objects that can be have policy intents
+ * attached to them.
+ */
+public interface IntentAttachPoint {
+
+    /**
+     * Returns a list of policy intents. See the Policy Framework specification
+     * for a description of this attribute.
+     * 
+     * @return a list of policy intents.
+     */
+    List<Intent> getRequiredIntents();
+    
+   
+    /**
+     * Returns the type of the attach point such as a BindingType or an ImplementationType and so on
+     * @return
+     */
+    IntentAttachPointType getType();
+    
+    /**
+     * 
+     * Sets the type of the attach point such as a BindingType or an ImplementationType and so on
+     * @param type
+     */
+    void setType(IntentAttachPointType type);
+}
diff --git a/sca-java-1.x/branches/sca-java-1.2/modules/policy/src/main/java/org/apache/tuscany/sca/policy/IntentAttachPointType.java b/sca-java-1.x/branches/sca-java-1.2/modules/policy/src/main/java/org/apache/tuscany/sca/policy/IntentAttachPointType.java
new file mode 100644
index 0000000000..ad8aa4845e
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.2/modules/policy/src/main/java/org/apache/tuscany/sca/policy/IntentAttachPointType.java
@@ -0,0 +1,69 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+ */
+package org.apache.tuscany.sca.policy;
+
+import java.util.List;
+
+import javax.xml.namespace.QName;
+
+/**
+ * Base interface for representing the model type of assembly model objects that can be have policy intents
+ * attached to them.
+ */
+public interface IntentAttachPointType {
+
+    /**
+     * Returns the name of the extension type defined by this instance e.g. implementation.java, binding.ws
+     * @return the extension type QName
+     */
+    QName getName();
+    
+    /**
+     * Sets the name of the extension type
+     * @param the name of the extension type
+     */
+    void setName(QName type);
+    
+    /**
+     * Returns the list of names of policy intents that will always be provided by this Extension Type
+     * @ruturn list of Policy Intent names
+     */
+    List<Intent> getAlwaysProvidedIntents();
+    
+    /**
+     * Returns the list of names of policy intents that may be provided by this Extension Type thro
+     * appropriate configuration
+     * @ruturn list of Policy Intent names
+     */
+    List<Intent> getMayProvideIntents();
+    
+    /**
+     * Returns true if the model element is unresolved.
+     * 
+     * @return true if the model element is unresolved.
+     */
+    boolean isUnresolved();
+
+    /**
+     * Sets whether the model element is unresolved.
+     * 
+     * @param unresolved whether the model element is unresolved
+     */
+    void setUnresolved(boolean unresolved);
+}
diff --git a/sca-java-1.x/branches/sca-java-1.2/modules/policy/src/main/java/org/apache/tuscany/sca/policy/IntentAttachPointTypeFactory.java b/sca-java-1.x/branches/sca-java-1.2/modules/policy/src/main/java/org/apache/tuscany/sca/policy/IntentAttachPointTypeFactory.java
new file mode 100644
index 0000000000..c0dc78e742
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.2/modules/policy/src/main/java/org/apache/tuscany/sca/policy/IntentAttachPointTypeFactory.java
@@ -0,0 +1,42 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+ */
+package org.apache.tuscany.sca.policy;
+
+/**
+ * Factory interface for creating extension types meta data
+ * 
+ */
+public interface IntentAttachPointTypeFactory {
+
+    /**
+     * Creates an ImplementationTypeImpl instance to hold metadata related to
+     * a particular implementation extension in the SCA Domain
+     * 
+     * @return an instance of IntentAttachPointType
+     */
+    IntentAttachPointType createImplementationType();
+    
+    /**
+     * Creates an BindingTypeImpl instance to hold metadata related to
+     * a particular binding extension in the SCA Domain
+     * 
+     * @return an instance of IntentAttachPointType
+     */
+    IntentAttachPointType createBindingType();
+}
diff --git a/sca-java-1.x/branches/sca-java-1.2/modules/policy/src/main/java/org/apache/tuscany/sca/policy/IntentMap.java b/sca-java-1.x/branches/sca-java-1.2/modules/policy/src/main/java/org/apache/tuscany/sca/policy/IntentMap.java
new file mode 100644
index 0000000000..9dd0be314b
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.2/modules/policy/src/main/java/org/apache/tuscany/sca/policy/IntentMap.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.policy;
+
+import java.util.List;
+
+/**
+ * Represents a policy intent map. See the Policy Framework specification for a
+ * description of this element.
+ */
+public interface IntentMap {
+
+    /**
+     * Returns the intent realized by this intent map.
+     * 
+     * @return the intent realized by this intent map
+     */
+    Intent getProvidedIntent();
+
+    /**
+     * Sets the intent realized by this intent map.
+     * 
+     * @param providedIntent the intent realized by this intent map
+     */
+    void setProvidedIntent(Intent providedIntent);
+
+    /**
+     * Returns the default qualified intent map.
+     * 
+     * @return the default qualified intent map
+     */
+    IntentMap getDefaultQualifiedIntentMap();
+
+    /**
+     * Sets the default qualified intent map.
+     * 
+     * @param defaultQualifiedIntentMap the default qualified intent map
+     */
+    void setDefaultQualifiedIntentMap(IntentMap defaultQualifiedIntentMap);
+
+    /**
+     * Returns the list of children qualified intent maps.
+     * 
+     * @return
+     */
+    List<IntentMap> getQualifiedIntentMaps();
+
+    /**
+     * Returns the list of concrete policies, either WS-Policy policy
+     * attachments, policy references, or policies expressed in another policy
+     * language.
+     * 
+     * @return the list of concrete policies
+     */
+    List<Object> getPolicies();
+
+    /**
+     * Returns true if the model element is unresolved.
+     * 
+     * @return true if the model element is unresolved.
+     */
+    boolean isUnresolved();
+
+    /**
+     * Sets whether the model element is unresolved.
+     * 
+     * @param unresolved whether the model element is unresolved
+     */
+    void setUnresolved(boolean unresolved);
+
+}
diff --git a/sca-java-1.x/branches/sca-java-1.2/modules/policy/src/main/java/org/apache/tuscany/sca/policy/Policy.java b/sca-java-1.x/branches/sca-java-1.2/modules/policy/src/main/java/org/apache/tuscany/sca/policy/Policy.java
new file mode 100644
index 0000000000..3d34f24e45
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.2/modules/policy/src/main/java/org/apache/tuscany/sca/policy/Policy.java
@@ -0,0 +1,32 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+ */
+package org.apache.tuscany.sca.policy;
+
+import javax.xml.namespace.QName;
+
+/**
+ * Interface that will abstract various types of policy specifications
+ * and attachments for example WS-Policy
+ *
+ */
+public interface Policy {
+    QName getSchemaName();
+    void setUnresolved(boolean unresolved);
+    boolean isUnresolved();
+}
diff --git a/sca-java-1.x/branches/sca-java-1.2/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicyContext.java b/sca-java-1.x/branches/sca-java-1.2/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicyContext.java
new file mode 100644
index 0000000000..c7c5192a61
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.2/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicyContext.java
@@ -0,0 +1,36 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+ */
+
+package org.apache.tuscany.sca.policy;
+
+import java.util.List;
+
+/**
+ * A context container for policies.  
+ */
+public interface PolicyContext {
+    List<Intent> getIntents(Object key);
+    List<PolicySet> getPolicySets(Object key);
+    void addIntents(Object key, List<Intent> intents);
+    void addPolicySets(Object key, List<PolicySet> policySets);
+    void addIntent(Object key, Intent intent);
+    void addPolicySet(Object key, PolicySet policySet);
+    void clearIntents(Object key);
+    void clearPolicySets(Object key);
+}
diff --git a/sca-java-1.x/branches/sca-java-1.2/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicyFactory.java b/sca-java-1.x/branches/sca-java-1.2/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicyFactory.java
new file mode 100644
index 0000000000..c0f2087ca6
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.2/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicyFactory.java
@@ -0,0 +1,67 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+ */
+package org.apache.tuscany.sca.policy;
+
+/**
+ * A factory for the policy model.
+ */
+public interface PolicyFactory {
+
+    /**
+     * Create a new intent.
+     * 
+     * @return a new intent
+     */
+    Intent createIntent();
+
+    /**
+     * Create a new policy set.
+     * 
+     * @return a new policy set
+     */
+    PolicySet createPolicySet();
+
+    /**
+     * Create a new intent map.
+     * 
+     * @return a new intent map
+     */
+    IntentMap createIntentMap();
+
+    /**
+     * create a new Profile Intent
+     * 
+     * @return a ProfileIntent instance
+     */
+    ProfileIntent createProfileIntent();
+    
+    /**
+     * create a new QualifiedIntent
+     * 
+     * @return a QualifiedIntent instance
+     */
+    QualifiedIntent createQualifiedIntent();
+    
+    /**
+     * create a new PolicySetReference
+     * 
+     * @return a PolicySetReference instance
+     */
+    PolicySetReference createPolicySetReference();
+}
diff --git a/sca-java-1.x/branches/sca-java-1.2/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicySet.java b/sca-java-1.x/branches/sca-java-1.2/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicySet.java
new file mode 100644
index 0000000000..37d9553378
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.2/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicySet.java
@@ -0,0 +1,153 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+ */
+package org.apache.tuscany.sca.policy;
+
+import java.util.List;
+import java.util.Map;
+
+import javax.xml.namespace.QName;
+import javax.xml.xpath.XPathExpression;
+
+/**
+ * Represents a policy set. See the Policy Framework specification for a
+ * description of this element.
+ */
+public interface PolicySet {
+
+    /**
+     * Returns the intent name.
+     * 
+     * @return the intent name
+     */
+    QName getName();
+
+    /**
+     * Sets the intent name
+     * 
+     * @param name the intent name
+     */
+    void setName(QName name);
+
+    /**
+     * Returns the list of operations that this policy set applies to.
+     * 
+     * @return
+     */
+    //List<Operation> getOperations();
+    /**
+     * Returns the list of
+     * 
+     * @return
+     */
+    List<PolicySet> getReferencedPolicySets();
+
+    /**
+     * Returns the list of provided intents
+     * 
+     * @return
+     */
+    List<Intent> getProvidedIntents();
+
+    /**
+     * Returns the list of concrete policies, either WS-Policy policy
+     * attachments, policy references, or policies expressed in another policy
+     * language.
+     * 
+     * @return the list of concrete policies
+     */
+    List<Object> getPolicies();
+
+    /**
+     * Returns true if the model element is unresolved.
+     * 
+     * @return true if the model element is unresolved.
+     */
+    boolean isUnresolved();
+
+    /**
+     * Sets whether the model element is unresolved.
+     * 
+     * @param unresolved whether the model element is unresolved
+     */
+    void setUnresolved(boolean unresolved);
+
+    /**
+     * Returns the xpath expression that is to be used to evaluate
+     * if this PolicySet applies to specific attachment point
+     * 
+     * @return the xpath expression
+     */
+    String getAppliesTo();
+
+    /**
+     * Sets the xpath expression that is to be used to evaluate
+     * if this PolicySet applies to specific attachment point
+     * 
+     */
+    void setAppliesTo(String xpath);
+
+    /**
+     * Returns the policies / policy attachments provided thro intent maps
+     * 
+     * @return
+     */
+    Map<Intent, List<Object>> getMappedPolicies();
+
+    /**
+     * Gets the xpath expression that is to be used to evaluate
+     * the SCA Artifacts that this policyset will always apply to
+     * immaterial of an intent declared on the SCA Artifact
+     * 
+     * @return the xpath expression
+     */
+    String getAlwaysAppliesTo();
+
+    /**
+     * Sets the xpath expression that is to be used to evaluate
+     * the SCA Artifacts that this policyset will always apply to
+     * immaterial of an intent declared on the SCA Artifact
+     * 
+     */
+    void setAlwaysAppliesTo(String xpath);
+
+    /**
+     * Get the XPath expression for the appliesTo attribute
+     * @return the XPath expression for the appliesTo attribute
+     */
+    XPathExpression getAppliesToXPathExpression();
+
+    /**
+     * Set the XPath expression for the appliesTo attribute
+     * @param xpathExpression the XPath expression for the appliesTo attribute
+     */
+    void setAppliesToXPathExpression(XPathExpression xpathExpression);
+
+    /**
+     * Get the XPath expression for the alwaysAppliesTo attribute
+     * @return the XPath expression for the alwaysAppliesTo attribute
+     */
+    XPathExpression getAlwaysAppliesToXPathExpression();
+
+    /**
+     * Set the XPath expression for the alwaysAppliesTo attribute
+     * @param xpathExpression the XPath expression for the alwaysAppliesTo attribute
+     */
+    void setAlwaysAppliesToXPathExpression(XPathExpression xpathExpression);
+
+}
diff --git a/sca-java-1.x/branches/sca-java-1.2/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicySetAttachPoint.java b/sca-java-1.x/branches/sca-java-1.2/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicySetAttachPoint.java
new file mode 100644
index 0000000000..8d8657da95
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.2/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicySetAttachPoint.java
@@ -0,0 +1,46 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+ */
+package org.apache.tuscany.sca.policy;
+
+import java.util.List;
+
+/**
+ * Base interface for all assembly model objects that can have policy sets
+ * attached to them.
+ */
+public interface PolicySetAttachPoint extends IntentAttachPoint {
+
+    /**
+     * Returns a list of policy sets. See the Policy Framework specification for
+     * a description of this attribute.
+     * 
+     * @return a list of policy sets.
+     */
+    List<PolicySet> getPolicySets();
+    
+    
+    /**
+     * Returns a list of policy sets defined in the domain, that are applicable to this
+     * PolicySetAttachPoint. An applicable PolicySet is one that include this PolicySetAttachPoint
+     * as part of its 'appliesTo' xpath attribute.
+     * 
+     * @return a list of policy sets applicable to this PolicySetAttachPoint
+     */
+    List<PolicySet> getApplicablePolicySets();
+}
diff --git a/sca-java-1.x/branches/sca-java-1.2/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicySetReference.java b/sca-java-1.x/branches/sca-java-1.2/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicySetReference.java
new file mode 100644
index 0000000000..f2d3f25b66
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.2/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicySetReference.java
@@ -0,0 +1,42 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+ */
+package org.apache.tuscany.sca.policy;
+
+import javax.xml.namespace.QName;
+
+/**
+ * Interface that abstracts a PolicySet Reference
+ *
+ */
+public interface PolicySetReference {
+    
+    /**
+     * Returns the name of the policyset being referred to
+     * 
+     * @return the qname of the referred policyset
+     */
+    QName getReferredPolicySetName();
+    
+    /**
+     * @param refPolicySetName the name of the policyset being referrred to
+     * 
+     */
+    void setReferredPolicySetName(QName refPolicySetName);
+
+}
diff --git a/sca-java-1.x/branches/sca-java-1.2/modules/policy/src/main/java/org/apache/tuscany/sca/policy/ProfileIntent.java b/sca-java-1.x/branches/sca-java-1.2/modules/policy/src/main/java/org/apache/tuscany/sca/policy/ProfileIntent.java
new file mode 100644
index 0000000000..95604be25a
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.2/modules/policy/src/main/java/org/apache/tuscany/sca/policy/ProfileIntent.java
@@ -0,0 +1,35 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+ */
+package org.apache.tuscany.sca.policy;
+
+import java.util.List;
+
+/**
+ * Interface that abstracts a profile intent
+ *
+ */
+public interface ProfileIntent extends Intent {
+    /**
+     * Returns the list of required intents.
+     * 
+     * @return the list of required intents
+     */
+    List<Intent> getRequiredIntents();
+
+}
diff --git a/sca-java-1.x/branches/sca-java-1.2/modules/policy/src/main/java/org/apache/tuscany/sca/policy/QualifiedIntent.java b/sca-java-1.x/branches/sca-java-1.2/modules/policy/src/main/java/org/apache/tuscany/sca/policy/QualifiedIntent.java
new file mode 100644
index 0000000000..2aba59b37f
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.2/modules/policy/src/main/java/org/apache/tuscany/sca/policy/QualifiedIntent.java
@@ -0,0 +1,40 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+ */
+package org.apache.tuscany.sca.policy;
+
+/**
+ * Abstracts a qualified policy intent
+ *
+ */
+public interface QualifiedIntent extends Intent {
+
+    /**
+     * Returns the intent qualified by this intent
+     * 
+     * @return
+     */
+    Intent getQualifiableIntent();
+    
+    /**
+     * sets the qualifiable intent for this Qualified intent instance
+     * 
+     * @param qualifiableIntent
+     */
+    void setQualifiableIntent(Intent qualifiableIntent);
+}
diff --git a/sca-java-1.x/branches/sca-java-1.2/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/BindingTypeImpl.java b/sca-java-1.x/branches/sca-java-1.2/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/BindingTypeImpl.java
new file mode 100644
index 0000000000..fea1c0bf1c
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.2/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/BindingTypeImpl.java
@@ -0,0 +1,89 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+ */
+package org.apache.tuscany.sca.policy.impl;
+
+import java.util.ArrayList;
+import java.util.List;
+
+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;
+
+/**
+ * Concrete implementation for a BindingType
+ * 
+ */
+public class BindingTypeImpl implements IntentAttachPointType {
+
+    private List<Intent> alwaysProvides = new ArrayList<Intent>();
+    private List<Intent> mayProvides = new ArrayList<Intent>();
+    private QName typeName;
+    private boolean unResolved = true;
+    
+    public List<Intent> getAlwaysProvidedIntents() {
+        return alwaysProvides;
+    }
+
+    public List<Intent> getMayProvideIntents() {
+        return mayProvides;
+    }
+
+    public QName getName() {
+        return typeName;
+    }
+
+    public void setName(QName type) {
+        this.typeName = type;
+    }
+    
+    public boolean isUnresolved() {
+        return unResolved;
+    }
+
+    public void setUnresolved(boolean unresolved) {
+        this.unResolved = unresolved;
+    }
+    
+    @Override
+    public int hashCode() {
+        return String.valueOf(getName()).hashCode();
+    }
+    
+    @Override
+    public boolean equals(Object obj) {
+        if (obj == this) {
+            return true;
+        } else if (obj instanceof BindingTypeImpl ) {
+            if (getName() != null) {
+                return getName().equals(((BindingTypeImpl)obj).getName());
+            } else {
+                return ((BindingTypeImpl)obj).getName() == null;
+            }
+        } else {
+            return false;
+        }
+    }
+    
+    @Override
+    public String toString() {
+        return getName().toString();
+    }
+}
diff --git a/sca-java-1.x/branches/sca-java-1.2/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/ImplementationTypeImpl.java b/sca-java-1.x/branches/sca-java-1.2/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/ImplementationTypeImpl.java
new file mode 100644
index 0000000000..ee63086e14
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.2/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/ImplementationTypeImpl.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.policy.impl;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.xml.namespace.QName;
+
+import org.apache.tuscany.sca.policy.Intent;
+import org.apache.tuscany.sca.policy.IntentAttachPointType;
+
+/**
+ * Concrete implementation for a Implementation Type
+ * 
+ */
+public class ImplementationTypeImpl implements IntentAttachPointType {
+    private List<Intent> alwaysProvides = new ArrayList<Intent>();
+    private List<Intent> mayProvides = new ArrayList<Intent>();
+    private QName typeName;
+    private boolean unResolved = true;
+    
+    public List<Intent> getAlwaysProvidedIntents() {
+        return alwaysProvides;
+    }
+
+    public List<Intent> getMayProvideIntents() {
+        return mayProvides;
+    }
+
+    public QName getName() {
+        return typeName;
+    }
+
+    public void setName(QName type) {
+        this.typeName = type;
+    }
+    
+    public boolean isUnresolved() {
+        return unResolved;
+    }
+
+    public void setUnresolved(boolean unresolved) {
+        this.unResolved = unresolved;
+    }
+    
+    @Override
+    public int hashCode() {
+        return String.valueOf(getName()).hashCode();
+    }
+    
+    @Override
+    public boolean equals(Object obj) {
+        if (obj == this) {
+            return true;
+        } else if (obj instanceof ImplementationTypeImpl ) {
+            if (getName() != null) {
+                return getName().equals(((ImplementationTypeImpl)obj).getName());
+            } else {
+                return ((ImplementationTypeImpl)obj).getName() == null;
+            }
+        } else {
+            return false;
+        }
+    }
+    
+    @Override
+    public String toString() {
+        return getName().toString();
+    }
+}
diff --git a/sca-java-1.x/branches/sca-java-1.2/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/IntentAttachPointTypeFactoryImpl.java b/sca-java-1.x/branches/sca-java-1.2/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/IntentAttachPointTypeFactoryImpl.java
new file mode 100644
index 0000000000..4a86174a00
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.2/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/IntentAttachPointTypeFactoryImpl.java
@@ -0,0 +1,37 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+ */
+package org.apache.tuscany.sca.policy.impl;
+
+import org.apache.tuscany.sca.policy.IntentAttachPointType;
+import org.apache.tuscany.sca.policy.IntentAttachPointTypeFactory;
+
+/**
+ * Default implementation for IntentAttachPointTypeFactory
+ */
+public class IntentAttachPointTypeFactoryImpl implements IntentAttachPointTypeFactory {
+
+    public IntentAttachPointType createBindingType() {
+        return new BindingTypeImpl();
+    }
+
+    public IntentAttachPointType createImplementationType() {
+        return new ImplementationTypeImpl();
+    }
+
+}
diff --git a/sca-java-1.x/branches/sca-java-1.2/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/IntentImpl.java b/sca-java-1.x/branches/sca-java-1.2/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/IntentImpl.java
new file mode 100644
index 0000000000..757e4bcfc7
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.2/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/IntentImpl.java
@@ -0,0 +1,146 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+ */
+package org.apache.tuscany.sca.policy.impl;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.xml.namespace.QName;
+
+import org.apache.tuscany.sca.policy.Intent;
+
+/**
+ * Represents a policy intent.
+ * 
+ * @version $Rev$ $Date$
+ */
+public class IntentImpl implements Intent {
+
+    private static final String QUALIFIED_SEPARATOR = ".";
+    private static final String DOMAIN_SEPARATOR = ".";
+    private QName name;
+    //private List<Operation> operations = new ArrayList<Operation>();
+    private List<QName> constrains = new ArrayList<QName>();
+    private String description;
+    private List<Intent> qualifiedIntents = new ArrayList<Intent>();;
+    // private List<Intent> requiredIntents = new ArrayList<Intent>();;
+    private boolean unresolved = true;
+    private String domain;
+    private String[] qualifiedNames;
+
+    protected IntentImpl() {
+    }
+
+    public QName getName() {
+        return name;
+    }
+
+    public void setName(QName name) {
+        this.name = name;
+        String iname = name.getLocalPart();
+        int domainIdx = iname.indexOf(DOMAIN_SEPARATOR);
+        if (domainIdx > -1) {
+            domain = iname.substring(0, domainIdx);
+            String qualifNamesStr = iname.substring(domainIdx + 1);
+            String pattern = "\\" + QUALIFIED_SEPARATOR;
+            qualifiedNames = qualifNamesStr.split(pattern);
+        } else
+            domain = iname;
+    }
+
+    public String getDomain() {
+        return domain;
+    }
+
+    public String[] getQualifiedNames() {
+        String[] results = new String[qualifiedNames.length];
+        System.arraycopy(qualifiedNames, 0, results, 0, qualifiedNames.length);
+        return results;
+    }
+
+    /*public List<Operation> getOperations() {
+        return operations;
+    }*/
+
+    public List<QName> getConstrains() {
+        return constrains;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    public List<Intent> getQualifiedIntents() {
+        return qualifiedIntents;
+    }
+
+    public boolean isUnresolved() {
+        return unresolved;
+    }
+
+    public void setUnresolved(boolean unresolved) {
+        this.unresolved = unresolved;
+    }
+
+    /**
+     * @see java.lang.Object#hashCode()
+     */
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int result = 1;
+        QName intentName = getName();
+        result = prime * result + ((intentName == null) ? 0 : intentName.hashCode());
+        return result;
+    }
+
+    /**
+     * @see java.lang.Object#equals(java.lang.Object)
+     */
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj) {
+            return true;
+        }
+        if (obj == null) {
+            return false;
+        }
+        if (!(obj instanceof IntentImpl)) {
+            return false;
+        }
+        final IntentImpl other = (IntentImpl)obj;
+        if (getName() == null) {
+            if (other.getName() != null) {
+                return false;
+            }
+        } else if (!getName().equals(other.getName())) {
+            return false;
+        }
+        return true;
+    }
+
+    @Override
+    public String toString() {
+        return String.valueOf(getName());
+    }
+}
diff --git a/sca-java-1.x/branches/sca-java-1.2/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/IntentMapImpl.java b/sca-java-1.x/branches/sca-java-1.2/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/IntentMapImpl.java
new file mode 100644
index 0000000000..aab03281ba
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.2/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/IntentMapImpl.java
@@ -0,0 +1,73 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+ */
+package org.apache.tuscany.sca.policy.impl;
+
+import java.util.List;
+
+import org.apache.tuscany.sca.policy.Intent;
+import org.apache.tuscany.sca.policy.IntentMap;
+
+/**
+ * Represents an intent map.
+ * 
+ * @version $Rev$ $Date$
+ */
+public class IntentMapImpl implements IntentMap {
+
+    private boolean unresolved;
+    private IntentMap defaultQualifiedIntentMap;
+    private List<Object> policies;
+    private Intent providedIntent;
+    private List<IntentMap> qualifiedIntentMaps;
+    
+    protected IntentMapImpl() {
+    }
+
+    public IntentMap getDefaultQualifiedIntentMap() {
+        return defaultQualifiedIntentMap;
+    }
+
+    public List<Object> getPolicies() {
+        return policies;
+    }
+
+    public Intent getProvidedIntent() {
+        return providedIntent;
+    }
+
+    public List<IntentMap> getQualifiedIntentMaps() {
+        return qualifiedIntentMaps;
+    }
+
+    public void setDefaultQualifiedIntentMap(IntentMap defaultQualifiedIntentMap) {
+        this.defaultQualifiedIntentMap = defaultQualifiedIntentMap;
+    }
+
+    public void setProvidedIntent(Intent providedIntent) {
+        this.providedIntent = providedIntent;
+    }
+
+    public boolean isUnresolved() {
+        return unresolved;
+    }
+
+    public void setUnresolved(boolean unresolved) {
+        this.unresolved = unresolved;
+    }
+}
diff --git a/sca-java-1.x/branches/sca-java-1.2/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicyContextImpl.java b/sca-java-1.x/branches/sca-java-1.2/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicyContextImpl.java
new file mode 100644
index 0000000000..467ad16e2c
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.2/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicyContextImpl.java
@@ -0,0 +1,92 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+ */
+
+package org.apache.tuscany.sca.policy.impl;
+
+import java.util.ArrayList;
+import java.util.Hashtable;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.tuscany.sca.policy.Intent;
+import org.apache.tuscany.sca.policy.PolicyContext;
+import org.apache.tuscany.sca.policy.PolicySet;
+
+/**
+ * 
+ */
+public class PolicyContextImpl implements PolicyContext {
+    private Map<Object, List<Intent>> intents = new Hashtable<Object , List<Intent>>();
+    private Map<Object, List<PolicySet>> policySets = new Hashtable<Object, List<PolicySet>>();
+    
+    public void addIntent(Object key, Intent intent) {
+        if ( intents.get(key) == null ) {
+            intents.put(key, new ArrayList<Intent>());
+        }
+        intents.get(key).add(intent);
+    }
+
+    public void addIntents(Object key, List<Intent> intents) {
+        if ( this.intents.get(key) == null ) {
+            this.intents.put(key, new ArrayList<Intent>());
+        }
+        this.intents.get(key).addAll(intents);
+    }
+
+    public void addPolicySet(Object key, PolicySet policySet) {
+        if ( policySets.get(key) == null ) {
+            policySets.put(key, new ArrayList<PolicySet>());
+        }
+        policySets.get(key).add(policySet);
+    }
+
+    public void addPolicySets(Object key, List<PolicySet> policySets) {
+        if ( this.policySets.get(key) == null ) {
+            this.policySets.put(key, new ArrayList<PolicySet>());
+        }
+        this.policySets.get(key).addAll(policySets);
+    }
+
+    public List<Intent> getIntents(Object key) {
+        if ( intents.get(key) == null ) {
+            intents.put(key, new ArrayList<Intent>());
+        }
+        return intents.get(key);
+    }
+
+    public List<PolicySet> getPolicySets(Object key) {
+        if ( policySets.get(key) == null ) {
+            policySets.put(key, new ArrayList<PolicySet>());
+        }
+        return policySets.get(key);
+    }
+
+    public void clearIntents(Object key) {
+        if ( intents.get(key) != null ) {
+            intents.clear();
+        }
+    }
+
+    public void clearPolicySets(Object key) {
+        if ( policySets.get(key) != null ) {
+            policySets.clear();
+        }
+    }
+
+}
diff --git a/sca-java-1.x/branches/sca-java-1.2/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicyFactoryImpl.java b/sca-java-1.x/branches/sca-java-1.2/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicyFactoryImpl.java
new file mode 100644
index 0000000000..1db29b835e
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.2/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicyFactoryImpl.java
@@ -0,0 +1,60 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+ */
+package org.apache.tuscany.sca.policy.impl;
+
+import org.apache.tuscany.sca.policy.Intent;
+import org.apache.tuscany.sca.policy.IntentMap;
+import org.apache.tuscany.sca.policy.PolicyFactory;
+import org.apache.tuscany.sca.policy.PolicySet;
+import org.apache.tuscany.sca.policy.PolicySetReference;
+import org.apache.tuscany.sca.policy.ProfileIntent;
+import org.apache.tuscany.sca.policy.QualifiedIntent;
+
+/**
+ * A factory for the policy model.
+ * 
+ * @version $Rev$ $Date$
+ */
+public abstract class PolicyFactoryImpl implements PolicyFactory {
+
+    public Intent createIntent() {
+        return new IntentImpl();
+    }
+
+    public PolicySetReference createPolicySetReference() {
+        return new PolicySetReferenceImpl();
+    }
+
+    public PolicySet createPolicySet() {
+        return new PolicySetImpl();
+    }
+
+    public IntentMap createIntentMap() {
+        return new IntentMapImpl();
+    }
+
+    public ProfileIntent createProfileIntent() {
+        return new ProfileIntentImpl();
+    }
+
+    public QualifiedIntent createQualifiedIntent() {
+        return new QualifiedIntentImpl();
+    }
+
+}
diff --git a/sca-java-1.x/branches/sca-java-1.2/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicySetImpl.java b/sca-java-1.x/branches/sca-java-1.2/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicySetImpl.java
new file mode 100644
index 0000000000..4bd9d5b7c7
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.2/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicySetImpl.java
@@ -0,0 +1,149 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+ */
+package org.apache.tuscany.sca.policy.impl;
+
+import java.util.ArrayList;
+import java.util.Hashtable;
+import java.util.List;
+import java.util.Map;
+
+import javax.xml.namespace.QName;
+import javax.xml.xpath.XPathExpression;
+
+import org.apache.tuscany.sca.policy.Intent;
+import org.apache.tuscany.sca.policy.PolicySet;
+
+/**
+ * Represents a policy set.
+ * 
+ * @version $Rev$ $Date$
+ */
+public class PolicySetImpl implements PolicySet {
+
+    private QName name;
+    //private List<Operation> operations = new ArrayList<Operation>();
+    //private List<QName> appliesTo;
+    private String appliesTo;
+    private List<Intent> providedIntents = new ArrayList<Intent>();
+    private List<PolicySet> referencedPolicySets = new ArrayList<PolicySet>();
+    private List<Object> policies = new ArrayList<Object>();
+    Map<Intent, List<Object>>  mappedPolicies = new Hashtable<Intent, List<Object>>();
+    private boolean unresolved = true;
+    private String alwaysAppliesTo;
+    
+    private XPathExpression appliesToXPathExpression;
+    private XPathExpression alwaysAppliesToXPathExpression;
+    
+    public String getAlwaysAppliesTo() {
+        return alwaysAppliesTo;
+    }
+
+    public void setAlwaysAppliesTo(String alwaysAppliesTo) {
+        this.alwaysAppliesTo = alwaysAppliesTo;
+    }
+
+    protected PolicySetImpl() {
+    }
+
+    public QName getName() {
+        return name;
+    }
+
+    public void setName(QName name) {
+        this.name = name;
+    }
+
+    /*public List<Operation> getOperations() {
+        return operations;
+    }*/
+
+    public String getAppliesTo() {
+        return appliesTo;
+    }
+
+    public void setAppliesTo(String appliesTo) {
+        this.appliesTo = appliesTo;
+    }
+
+    public List<Intent> getProvidedIntents() {
+        return providedIntents;
+    }
+
+    public List<PolicySet> getReferencedPolicySets() {
+        return referencedPolicySets;
+    }
+
+    public List<Object> getPolicies() {
+        return policies;
+    }
+
+    public boolean isUnresolved() {
+        return unresolved;
+    }
+
+    public void setUnresolved(boolean unresolved) {
+        this.unresolved = unresolved;
+    }
+
+    public Map<Intent, List<Object>> getMappedPolicies() {
+        return mappedPolicies;
+    }
+    
+    @Override
+    public int hashCode() {
+        return String.valueOf(getName()).hashCode();
+    }
+    
+    @Override
+    public boolean equals(Object obj) {
+        if (obj == this) {
+            return true;
+        } else if (obj instanceof PolicySet) {
+            if (getName() != null) {
+                return getName().equals(((PolicySet)obj).getName());
+            } else {
+                return ((PolicySet)obj).getName() == null;
+            }
+        } else {
+            return false;
+        }
+    }
+    
+    @Override
+    public String toString() {
+        return getName().toString();
+    }
+
+    public XPathExpression getAppliesToXPathExpression() {
+        return appliesToXPathExpression;
+    }
+
+    public void setAppliesToXPathExpression(XPathExpression appliesToXPathExpression) {
+        this.appliesToXPathExpression = appliesToXPathExpression;
+    }
+
+    public XPathExpression getAlwaysAppliesToXPathExpression() {
+        return alwaysAppliesToXPathExpression;
+    }
+
+    public void setAlwaysAppliesToXPathExpression(XPathExpression alwaysAppliesToXPathExpression) {
+        this.alwaysAppliesToXPathExpression = alwaysAppliesToXPathExpression;
+    }
+
+}
diff --git a/sca-java-1.x/branches/sca-java-1.2/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicySetReferenceImpl.java b/sca-java-1.x/branches/sca-java-1.2/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicySetReferenceImpl.java
new file mode 100644
index 0000000000..8dce444879
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.2/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicySetReferenceImpl.java
@@ -0,0 +1,47 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+ */
+package org.apache.tuscany.sca.policy.impl;
+
+import javax.xml.namespace.QName;
+
+import org.apache.tuscany.sca.policy.PolicySetReference;
+
+/**
+ * Concrete implementatoin for a PolicySetReference
+ *
+ */
+public class PolicySetReferenceImpl implements PolicySetReference {
+
+    private QName referredPolicySetName = null;
+    
+    /* 
+     * @see org.apache.tuscany.sca.policy.PolicySetReference#getReferredPolicySetName()
+     */
+    public QName getReferredPolicySetName() {
+        return referredPolicySetName;
+    }
+
+    /* 
+     * @see org.apache.tuscany.sca.policy.PolicySetReference#setReferredPolicySetName(javax.xml.namespace.QName)
+     */
+    public void setReferredPolicySetName(QName refPolicySetName) {
+        referredPolicySetName = refPolicySetName;
+    }
+
+}
diff --git a/sca-java-1.x/branches/sca-java-1.2/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/ProfileIntentImpl.java b/sca-java-1.x/branches/sca-java-1.2/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/ProfileIntentImpl.java
new file mode 100644
index 0000000000..014cd725d8
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.2/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/ProfileIntentImpl.java
@@ -0,0 +1,38 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+ */
+package org.apache.tuscany.sca.policy.impl;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.tuscany.sca.policy.Intent;
+import org.apache.tuscany.sca.policy.ProfileIntent;
+
+/**
+ * Concrete implementation for Profile Intent
+ *
+ */
+public class ProfileIntentImpl extends IntentImpl implements ProfileIntent {
+    private List<Intent> requiredIntents = new ArrayList<Intent>();
+    
+    public List<Intent> getRequiredIntents() {
+        return requiredIntents;
+    }
+
+}
diff --git a/sca-java-1.x/branches/sca-java-1.2/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/QualifiedIntentImpl.java b/sca-java-1.x/branches/sca-java-1.2/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/QualifiedIntentImpl.java
new file mode 100644
index 0000000000..321cfee621
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.2/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/QualifiedIntentImpl.java
@@ -0,0 +1,49 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+ */
+package org.apache.tuscany.sca.policy.impl;
+
+import java.util.List;
+
+import javax.xml.namespace.QName;
+
+import org.apache.tuscany.sca.policy.Intent;
+import org.apache.tuscany.sca.policy.QualifiedIntent;
+
+/**
+ * Models a concrete implementation of a Qualified Intent
+ *
+ */
+public class QualifiedIntentImpl extends IntentImpl implements QualifiedIntent {
+    private Intent qualifiableIntent = null;
+    
+    public Intent getQualifiableIntent() {
+        return qualifiableIntent;
+    }
+
+    public void setQualifiableIntent(Intent qualifiableIntent) {
+        this.qualifiableIntent = qualifiableIntent;
+    }
+    
+    @Override
+    public List<QName> getConstrains() {
+        return getQualifiableIntent().getConstrains();
+    }
+    
+    
+}
diff --git a/sca-java-1.x/branches/sca-java-1.2/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyComputationUtils.java b/sca-java-1.x/branches/sca-java-1.2/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyComputationUtils.java
new file mode 100644
index 0000000000..0160a6f3b0
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.2/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyComputationUtils.java
@@ -0,0 +1,286 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+ */
+
+package org.apache.tuscany.sca.policy.util;
+
+import static javax.xml.XMLConstants.XMLNS_ATTRIBUTE_NS_URI;
+
+import java.io.StringWriter;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
+
+import javax.xml.namespace.NamespaceContext;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.transform.Result;
+import javax.xml.transform.Source;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerConfigurationException;
+import javax.xml.transform.TransformerException;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.dom.DOMSource;
+import javax.xml.transform.stream.StreamResult;
+import javax.xml.xpath.XPath;
+import javax.xml.xpath.XPathConstants;
+import javax.xml.xpath.XPathExpression;
+import javax.xml.xpath.XPathExpressionException;
+import javax.xml.xpath.XPathFactory;
+
+import org.apache.tuscany.sca.policy.Intent;
+import org.apache.tuscany.sca.policy.PolicySet;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+
+/**
+ * Utility methods used during computation of PolicyIntents and PolicySets sets
+ */
+public class PolicyComputationUtils {
+    private static String POLICYSET_PREFIX = "tp_";
+    private static String APPLICABLE_POLICYSET_ATTR_NS = "http://tuscany.apache.org/xmlns/sca/1.0"; 
+    private static String APPLICABLE_POLICYSET_ATTR = "applicablePolicySets"; 
+    private static String POLICY_SETS_ATTR = "policySets"; 
+    private static String APPLICABLE_POLICYSET_ATTR_PREFIX = "tuscany";
+    private static String SCA10_NS = "http://www.osoa.org/xmlns/sca/1.0";
+    
+    public static void addInheritedIntents(List<Intent> sourceList, List<Intent> targetList) {
+        if (sourceList != null) {
+            targetList.addAll(sourceList);
+        }
+    }
+
+    public static void addInheritedPolicySets(List<PolicySet> sourceList,
+                                              List<PolicySet> targetList,
+                                              boolean checkOverrides) {
+        // check overrides is true when policysets are to be copied from
+        // componentType to component level
+        if (checkOverrides) {
+            // aggregate all the provided intents present in the target
+            List<Intent> targetProvidedIntents = new ArrayList<Intent>();
+            for (PolicySet policySet : targetList) {
+                targetProvidedIntents.addAll(policySet.getProvidedIntents());
+            }
+
+            // for every policy set in the source check if it provides one of
+            // the intents that is
+            // already provided by the policysets in the destination and do not
+            // copy them.
+            for (PolicySet policySet : sourceList) {
+                for (Intent sourceProvidedIntent : policySet.getProvidedIntents()) {
+                    if (!targetProvidedIntents.contains(sourceProvidedIntent)) {
+                        targetList.add(policySet);
+                    }
+                }
+            }
+        } else {
+            targetList.addAll(sourceList);
+        }
+    }
+
+    private static byte[] addApplicablePolicySets(Document doc, Collection<PolicySet> policySets)
+        throws XPathExpressionException, TransformerConfigurationException, TransformerException {
+        
+        int prefixCount = 1;
+
+        for (PolicySet policySet : policySets) {
+            if (policySet.getAppliesTo() != null) {
+                addApplicablePolicySets(policySet, doc, prefixCount);
+            }
+
+            if (policySet.getAlwaysAppliesTo() != null) {
+                addAlwaysApplicablePolicySets(policySet, doc, prefixCount);
+            }
+        }
+
+        StringWriter sw = new StringWriter();
+        Source domSource = new DOMSource(doc);
+        Result finalResult = new StreamResult(sw);
+        Transformer transformer = TransformerFactory.newInstance().newTransformer();
+        // transformer.setOutputProperty("omit-xml-declaration", "yes");
+        transformer.transform(domSource, finalResult);
+        return sw.toString().getBytes();
+    }
+
+    private static void addAlwaysApplicablePolicySets(PolicySet policySet,
+                                                      Document doc,
+                                                      int prefixCount) throws XPathExpressionException {
+        XPathExpression expression = policySet.getAlwaysAppliesToXPathExpression();
+        NodeList result = (NodeList)expression.evaluate(doc, XPathConstants.NODESET);
+
+        if (result != null) {
+            for (int counter = 0; counter < result.getLength(); ++counter) {
+                Node aResultNode = result.item(counter);
+
+                String alwaysApplicablePolicySets = null;
+                String policySetPrefix = POLICYSET_PREFIX + prefixCount++;
+                String policySetsAttrPrefix = "sca";
+
+                policySetPrefix =
+                    declareNamespace((Element)aResultNode, policySetPrefix, policySet.getName()
+                        .getNamespaceURI());
+                policySetsAttrPrefix =
+                    declareNamespace((Element)aResultNode, policySetsAttrPrefix, SCA10_NS);
+                if (aResultNode.getAttributes().getNamedItem(POLICY_SETS_ATTR) != null) {
+                    alwaysApplicablePolicySets =
+                        aResultNode.getAttributes().getNamedItem(POLICY_SETS_ATTR).getNodeValue();
+                }
+
+                if (alwaysApplicablePolicySets != null && alwaysApplicablePolicySets.length() > 0) {
+                    alwaysApplicablePolicySets =
+                        alwaysApplicablePolicySets + " "
+                            + policySetPrefix
+                            + ":"
+                            + policySet.getName().getLocalPart();
+                } else {
+                    alwaysApplicablePolicySets =
+                        policySetPrefix + ":" + policySet.getName().getLocalPart();
+                }
+
+                ((Element)aResultNode).setAttribute(POLICY_SETS_ATTR, alwaysApplicablePolicySets);
+            }
+        }
+    }
+
+    private static void addApplicablePolicySets(PolicySet policySet,
+                                         Document doc,
+                                         int prefixCount) throws XPathExpressionException {
+        XPathExpression expression = policySet.getAppliesToXPathExpression();
+        NodeList result = (NodeList)expression.evaluate(doc, XPathConstants.NODESET);
+
+        if (result != null) {
+            for (int counter = 0; counter < result.getLength(); ++counter) {
+                Node aResultNode = result.item(counter);
+
+                String applicablePolicySets = null;
+                String policySetPrefix = POLICYSET_PREFIX + prefixCount++;
+                String appPolicyAttrPrefix = APPLICABLE_POLICYSET_ATTR_PREFIX;
+
+                policySetPrefix =
+                    declareNamespace((Element)aResultNode, policySetPrefix, policySet.getName()
+                        .getNamespaceURI());
+                appPolicyAttrPrefix =
+                    declareNamespace((Element)aResultNode,
+                                     appPolicyAttrPrefix,
+                                     APPLICABLE_POLICYSET_ATTR_NS);
+                if (aResultNode.getAttributes().getNamedItemNS(APPLICABLE_POLICYSET_ATTR_NS,
+                                                               APPLICABLE_POLICYSET_ATTR) != null) {
+                    applicablePolicySets =
+                        aResultNode.getAttributes().getNamedItemNS(APPLICABLE_POLICYSET_ATTR_NS,
+                                                                   APPLICABLE_POLICYSET_ATTR)
+                            .getNodeValue();
+                }
+
+                if (applicablePolicySets != null && applicablePolicySets.length() > 0) {
+                    applicablePolicySets =
+                        applicablePolicySets + " "
+                            + policySetPrefix
+                            + ":"
+                            + policySet.getName().getLocalPart();
+                } else {
+                    applicablePolicySets =
+                        policySetPrefix + ":" + policySet.getName().getLocalPart();
+                }
+
+                ((Element)aResultNode).setAttributeNS(APPLICABLE_POLICYSET_ATTR_NS,
+                                                      appPolicyAttrPrefix + ":"
+                                                          + APPLICABLE_POLICYSET_ATTR,
+                                                      applicablePolicySets);
+            }
+        }
+    }
+
+    public static byte[] addApplicablePolicySets(URL artifactUrl, Collection<PolicySet> domainPolicySets) throws Exception {
+        DocumentBuilderFactory dbFac = DocumentBuilderFactory.newInstance();
+        dbFac.setNamespaceAware(true);
+        DocumentBuilder db = dbFac.newDocumentBuilder();
+        Document doc = db.parse(artifactUrl.toURI().toString());
+        return addApplicablePolicySets(doc, domainPolicySets);
+    }
+    
+    private static class DOMNamespaceContext implements NamespaceContext {
+        private Node node;
+
+        /**
+         * @param node
+         */
+        public DOMNamespaceContext(Node node) {
+            super();
+            this.node = node;
+        }
+
+        public String getNamespaceURI(String prefix) {
+            return node.lookupNamespaceURI(prefix);
+        }
+
+        public String getPrefix(String namespaceURI) {
+            return node.lookupPrefix(namespaceURI);
+        }
+
+        public Iterator<?> getPrefixes(String namespaceURI) {
+            return null;
+        }
+
+    }
+    
+    private static String declareNamespace(Element element, String prefix, String ns) {
+        if (ns == null) {
+            ns = "";
+        }
+        if (prefix == null) {
+            prefix = "";
+        }
+        String qname = null;
+        if ("".equals(prefix)) {
+            qname = "xmlns";
+        } else {
+            qname = "xmlns:" + prefix;
+        }
+        Node node = element;
+        boolean declared = false;
+        while (node != null && node.getNodeType() == Node.ELEMENT_NODE) {
+            if ( node.lookupPrefix(ns) != null ) {
+                prefix = node.lookupPrefix(ns);
+                declared = true;
+                break;
+            } else {
+                /*NamedNodeMap attrs = node.getAttributes();
+                if (attrs == null) {
+                    break;
+                }
+                Node attr = attrs.getNamedItem(qname);
+                if (attr != null) {
+                    declared = ns.equals(attr.getNodeValue());
+                    break;
+                }*/
+                node = node.getParentNode();
+            }
+        }
+        if (!declared) {
+            org.w3c.dom.Attr attr = element.getOwnerDocument().createAttributeNS(XMLNS_ATTRIBUTE_NS_URI, qname);
+            attr.setValue(ns);
+            element.setAttributeNodeNS(attr);
+        }
+        return prefix;
+    }
+
+}
diff --git a/sca-java-1.x/branches/sca-java-1.2/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyHandler.java b/sca-java-1.x/branches/sca-java-1.2/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyHandler.java
new file mode 100644
index 0000000000..c5d1c8d44a
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.2/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyHandler.java
@@ -0,0 +1,37 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+ */
+
+package org.apache.tuscany.sca.policy.util;
+
+import org.apache.tuscany.sca.policy.PolicySet;
+
+/**
+ * @deprecated This interface is replaced by PolicyProviderFactory/PolicyProvider SPIs
+ * Handler interface for handling policies defined in policysets
+ * 
+ */
+@Deprecated
+public interface PolicyHandler {
+    PolicySet getApplicablePolicySet();
+    void setApplicablePolicySet(PolicySet policySet);
+    void setUp(Object... context);
+    void cleanUp(Object... context);
+    void beforeInvoke(Object... context);
+    void afterInvoke(Object... context);
+}
diff --git a/sca-java-1.x/branches/sca-java-1.2/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyHandlerDefinitionsLoader.java b/sca-java-1.x/branches/sca-java-1.2/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyHandlerDefinitionsLoader.java
new file mode 100644
index 0000000000..cc61805671
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.2/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyHandlerDefinitionsLoader.java
@@ -0,0 +1,90 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+ */
+
+package org.apache.tuscany.sca.policy.util;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Hashtable;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import javax.xml.namespace.QName;
+
+import org.apache.tuscany.sca.extensibility.ServiceDeclaration;
+import org.apache.tuscany.sca.extensibility.ServiceDiscovery;
+
+/**
+ * Utility class for loading policy handler definitons from META-INF/services directories
+ */
+public class PolicyHandlerDefinitionsLoader {
+    
+    public static Map<ClassLoader, List<PolicyHandlerTuple>> loadPolicyHandlerClassnames()  {
+        // Get the processor service declarations
+        Set<ServiceDeclaration> sds;
+        try {
+            sds = ServiceDiscovery.getInstance().getServiceDeclarations(PolicyHandler.class);
+        } catch (IOException e) {
+            throw new IllegalStateException(e);
+        }
+        
+        Map<ClassLoader, List<PolicyHandlerTuple>> handlerTuples = new Hashtable<ClassLoader, List<PolicyHandlerTuple>>();
+        for (ServiceDeclaration sd : sds) {
+            ClassLoader cl = sd.getClassLoader();
+            
+            List<PolicyHandlerTuple> handlerTupleList = handlerTuples.get(cl);
+            if ( handlerTupleList == null ) {
+                handlerTupleList = new ArrayList<PolicyHandlerTuple>();
+                handlerTuples.put(cl, handlerTupleList);
+            }
+            Map<String, String> attributes = sd.getAttributes();
+            String intentName = attributes.get("intent");
+            QName intentQName = getQName(intentName);
+            String policyModelClassName = attributes.get("model");
+            String appliesTo = attributes.get("appliesTo");
+            if ( appliesTo != null && !appliesTo.startsWith("/") ) {
+                appliesTo = "//" + appliesTo;
+            }
+            handlerTupleList.add(new PolicyHandlerTuple(sd.getClassName(), intentQName, policyModelClassName, appliesTo));
+        }
+
+        return handlerTuples;
+    }
+    
+    private static QName getQName(String qname) { 
+        if (qname == null) {
+            return null;
+        }
+        qname = qname.trim();
+        if (qname.startsWith("{")) {
+            int h = qname.indexOf('}');
+            if (h != -1) {
+                return new QName(qname.substring(1, h), qname.substring(h + 1));
+            }
+        } else {
+            int h = qname.indexOf('#');
+            if (h != -1) {
+                return new QName(qname.substring(0, h), qname.substring(h + 1));
+            }
+        }
+        throw new IllegalArgumentException("Invalid qname: " + qname);
+    }
+
+}
diff --git a/sca-java-1.x/branches/sca-java-1.2/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyHandlerTuple.java b/sca-java-1.x/branches/sca-java-1.2/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyHandlerTuple.java
new file mode 100644
index 0000000000..60d43ec92e
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.2/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyHandlerTuple.java
@@ -0,0 +1,74 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+ */
+
+package org.apache.tuscany.sca.policy.util;
+
+import javax.xml.namespace.QName;
+
+/**
+ * PolicyHanlder tuples stored in policy handler services files
+ */
+public class PolicyHandlerTuple {
+    private String policyHandlerClassName;
+    private QName providedIntentName;
+    private String policyModelClassName;
+    private String appliesTo;
+    
+    public String getAppliesTo() {
+        return appliesTo;
+    }
+
+    public void setAppliesTo(String appliesTo) {
+        this.appliesTo = appliesTo;
+    }
+
+    public PolicyHandlerTuple(String handlerClassName,
+                              QName providedIntentName,
+                              String policyModelClassName,
+                              String appliesTo) {
+        this.policyHandlerClassName = handlerClassName;
+        this.providedIntentName = providedIntentName;
+        this.policyModelClassName = policyModelClassName;
+        this.appliesTo = appliesTo;
+    }
+    
+    public String getPolicyHandlerClassName() {
+        return policyHandlerClassName;
+    }
+    public void setPolicyHandlerClassName(String policyHandlerClassName) {
+        this.policyHandlerClassName = policyHandlerClassName;
+    }
+    public String getPolicyModelClassName() {
+        return policyModelClassName;
+    }
+    public void setPolicyModelClassName(String policyModelClassName) {
+        this.policyModelClassName = policyModelClassName;
+    }
+    public QName getProvidedIntentName() {
+        return providedIntentName;
+    }
+    public void setProvidedIntentName(QName providedIntentName) {
+        this.providedIntentName = providedIntentName;
+    }
+    
+    public String toString() {
+        return policyHandlerClassName + ", " + providedIntentName + ", " + policyModelClassName + ", " + appliesTo;
+    }
+    
+}
diff --git a/sca-java-1.x/branches/sca-java-1.2/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyHandlerUtils.java b/sca-java-1.x/branches/sca-java-1.2/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyHandlerUtils.java
new file mode 100644
index 0000000000..e9782c4927
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.2/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyHandlerUtils.java
@@ -0,0 +1,73 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+ */
+
+package org.apache.tuscany.sca.policy.util;
+
+import java.util.List;
+import java.util.Map;
+
+import org.apache.tuscany.sca.policy.Intent;
+import org.apache.tuscany.sca.policy.PolicySet;
+
+/**
+ * Utitlity methods to deal with PolicyHandlers
+ */
+public class PolicyHandlerUtils {
+    public static PolicyHandler findPolicyHandler(PolicySet policySet, 
+                                                 Map<ClassLoader, List<PolicyHandlerTuple>> policyHandlerClassNames) 
+                                throws IllegalAccessException, ClassNotFoundException, InstantiationException {
+        
+        PolicyHandler handler = null;
+        
+        for (ClassLoader classLoader : policyHandlerClassNames.keySet()) {
+            for ( PolicyHandlerTuple handlerTuple : policyHandlerClassNames.get(classLoader) ) {
+                //System.out.println(handlerTuple);
+                for ( Intent intent : policySet.getProvidedIntents() ) {
+                    if ( intent.getName().equals(handlerTuple.getProvidedIntentName())) {
+                        for ( Object policy : policySet.getPolicies() ) {
+                            if ( policy.getClass().getName().equals(handlerTuple.getPolicyModelClassName())) {
+                                if ( handlerTuple.getAppliesTo() != null  ) {
+                                    if ( handlerTuple.getAppliesTo().equals(policySet.getAppliesTo() )) {
+                                        handler = 
+                                            (PolicyHandler)Class.forName(handlerTuple.getPolicyHandlerClassName(), 
+                                                                         true, 
+                                                                         classLoader).newInstance();
+                                            handler.setApplicablePolicySet(policySet);
+                                            return handler;
+                                    }
+                                } else {
+                                    handler = 
+                                        (PolicyHandler)Class.forName(handlerTuple.getPolicyHandlerClassName(), 
+                                                                     true, 
+                                                                     classLoader).newInstance();
+                                        handler.setApplicablePolicySet(policySet);
+                                        return handler;
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        
+        return handler;
+    } 
+   
+
+}
diff --git a/sca-java-1.x/branches/sca-java-1.2/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyValidationException.java b/sca-java-1.x/branches/sca-java-1.2/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyValidationException.java
new file mode 100644
index 0000000000..35c1d3637a
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.2/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyValidationException.java
@@ -0,0 +1,36 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+ */
+
+package org.apache.tuscany.sca.policy.util;
+
+/**
+ * Exception to be throw for invalid policy intents / policysets
+ */
+public class PolicyValidationException extends Exception {
+    private static final long serialVersionUID = 506979037642587755L;
+    
+    public PolicyValidationException(String message) {
+        super(message);
+    }
+    
+    public PolicyValidationException(Throwable e) {
+        super(e);
+    }
+    
+}
diff --git a/sca-java-1.x/branches/sca-java-1.2/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyValidationUtils.java b/sca-java-1.x/branches/sca-java-1.2/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyValidationUtils.java
new file mode 100644
index 0000000000..d98ba8394e
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.2/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyValidationUtils.java
@@ -0,0 +1,111 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+ */
+
+package org.apache.tuscany.sca.policy.util;
+
+import java.util.List;
+
+import javax.xml.namespace.QName;
+
+import org.apache.tuscany.sca.policy.Intent;
+import org.apache.tuscany.sca.policy.IntentAttachPoint;
+import org.apache.tuscany.sca.policy.IntentAttachPointType;
+import org.apache.tuscany.sca.policy.PolicySet;
+import org.apache.tuscany.sca.policy.PolicySetAttachPoint;
+
+/**
+ * @version $Rev$ $Date$
+ */
+public class PolicyValidationUtils {
+
+    public static boolean isConstrained(QName constrained, IntentAttachPointType attachPointType) {
+        return (attachPointType != null && attachPointType.getName().getNamespaceURI()
+            .equals(constrained.getNamespaceURI()) && attachPointType.getName().getLocalPart()
+            .startsWith(constrained.getLocalPart()));
+    }
+
+    public static void validateIntents(IntentAttachPoint attachPoint,
+                                       IntentAttachPointType attachPointType)
+        throws PolicyValidationException {
+        boolean found = false;
+        if (attachPointType != null) {
+            // validate intents specified against the parent (binding /
+            // implementation)
+            found = false;
+            for (Intent intent : attachPoint.getRequiredIntents()) {
+                if (!intent.isUnresolved()) {
+                    for (QName constrained : intent.getConstrains()) {
+                        if (isConstrained(constrained, attachPointType)) {
+                            found = true;
+                            break;
+                        }
+                    }
+
+                    if (!found) {
+                        throw new PolicyValidationException("Policy Intent '" + intent.getName()
+                            + "' does not constrain extension type  "
+                            + attachPointType.getName());
+                    }
+                } else {
+                    throw new PolicyValidationException("Policy Intent '" + intent.getName()
+                        + "' is not defined in this domain  ");
+                }
+            }
+        }
+    }
+
+    public static void validatePolicySets(PolicySetAttachPoint policySetAttachPoint)
+        throws PolicyValidationException {
+        validatePolicySets(policySetAttachPoint, 
+                           policySetAttachPoint.getType(),
+                           policySetAttachPoint.getApplicablePolicySets());
+    }
+    
+    public static void validatePolicySets(PolicySetAttachPoint policySetAttachPoint,
+                                          IntentAttachPointType attachPointType)
+        throws PolicyValidationException {
+        validatePolicySets(policySetAttachPoint,
+                           attachPointType,
+                           policySetAttachPoint.getApplicablePolicySets());
+    }
+
+    public static void validatePolicySets(PolicySetAttachPoint policySetAttachPoint,
+                                          IntentAttachPointType attachPointType,
+                                          List<PolicySet> applicablePolicySets)
+        throws PolicyValidationException {
+        // Since the applicablePolicySets in a policySetAttachPoint will already
+        // have the list of policysets that might ever be applicable to this attachPoint,
+        // just check if the defined policysets feature in the list of applicable
+        // policysets
+        for (PolicySet definedPolicySet : policySetAttachPoint.getPolicySets()) {
+            if (!definedPolicySet.isUnresolved()) {
+                if (!applicablePolicySets.contains(definedPolicySet)) {
+                    throw new PolicyValidationException("Policy Set '" + definedPolicySet
+                        .getName()
+                        + "' does not apply to extension type  "
+                        + attachPointType.getName());
+                }
+            } else {
+                throw new PolicyValidationException("Policy Set '" + definedPolicySet.getName()
+                    + "' is not defined in this domain  ");
+
+            }
+        }
+    }
+}
diff --git a/sca-java-1.x/branches/sca-java-1.2/modules/policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.IntentAttachPointTypeFactory b/sca-java-1.x/branches/sca-java-1.2/modules/policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.IntentAttachPointTypeFactory
new file mode 100644
index 0000000000..a0e56c1822
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.2/modules/policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.IntentAttachPointTypeFactory
@@ -0,0 +1,18 @@
+# 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. 
+
+org.apache.tuscany.sca.policy.DefaultIntentAttachPointTypeFactory
\ No newline at end of file
diff --git a/sca-java-1.x/branches/sca-java-1.2/modules/policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.PolicyFactory b/sca-java-1.x/branches/sca-java-1.2/modules/policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.PolicyFactory
new file mode 100644
index 0000000000..846b3b24a4
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.2/modules/policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.PolicyFactory
@@ -0,0 +1,18 @@
+# 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. 
+
+org.apache.tuscany.sca.policy.DefaultPolicyFactory
\ No newline at end of file
diff --git a/sca-java-1.x/branches/sca-java-1.2/modules/policy/src/test/java/org/apache/tuscany/sca/policy/PolicyFactoryTestCase.java b/sca-java-1.x/branches/sca-java-1.2/modules/policy/src/test/java/org/apache/tuscany/sca/policy/PolicyFactoryTestCase.java
new file mode 100644
index 0000000000..d7f87b1c5d
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-1.2/modules/policy/src/test/java/org/apache/tuscany/sca/policy/PolicyFactoryTestCase.java
@@ -0,0 +1,55 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.tuscany.sca.policy;
+
+import javax.xml.namespace.QName;
+
+import junit.framework.TestCase;
+
+/**
+ * Test building of policy model instances using the policy factory.
+ * 
+ * @version $Rev$ $Date$
+ */
+public class PolicyFactoryTestCase extends TestCase {
+
+    PolicyFactory factory;
+
+    @Override
+    public void setUp() throws Exception {
+        factory = new DefaultPolicyFactory();
+    }
+
+    @Override
+    public void tearDown() throws Exception {
+        factory = null;
+    }
+
+    public void testCreateIntent() {
+        Intent intent = factory.createIntent();
+        intent.setName(new QName("http://test", "reliability"));
+        assertEquals(intent.getName(), new QName("http://test", "reliability"));
+    }
+
+    public void testCreatePolicySet() {
+        PolicySet policySet = factory.createPolicySet();
+        policySet.setName(new QName("http://test", "reliability"));
+        assertEquals(policySet.getName(), new QName("http://test", "reliability"));
+    }
+}