Moving 1.x branches

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

105 files changed, 0 insertions, 0 deletions

diff --git a/branches/sca-java-1.1/modules/policy-logging/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.1/modules/policy-logging/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.1/modules/policy-logging/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.1/modules/policy-logging/DISCLAIMER
diff --git a/branches/sca-java-1.1/modules/policy-logging/LICENSE b/sca-java-1.x/branches/sca-java-1.1/modules/policy-logging/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/branches/sca-java-1.1/modules/policy-logging/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.1/modules/policy-logging/LICENSE
diff --git a/branches/sca-java-1.1/modules/policy-logging/NOTICE b/sca-java-1.x/branches/sca-java-1.1/modules/policy-logging/NOTICE
index 1325efd8bf..1325efd8bf 100644
--- a/branches/sca-java-1.1/modules/policy-logging/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.1/modules/policy-logging/NOTICE
diff --git a/branches/sca-java-1.1/modules/policy-logging/pom.xml b/sca-java-1.x/branches/sca-java-1.1/modules/policy-logging/pom.xml
index 019b7b7b59..019b7b7b59 100644
--- a/branches/sca-java-1.1/modules/policy-logging/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.1/modules/policy-logging/pom.xml
diff --git a/branches/sca-java-1.1/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicy.java b/sca-java-1.x/branches/sca-java-1.1/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicy.java
index 3e3540cdae..3e3540cdae 100644
--- a/branches/sca-java-1.1/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicy.java
+++ b/sca-java-1.x/branches/sca-java-1.1/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicy.java
diff --git a/branches/sca-java-1.1/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicyHandler.java b/sca-java-1.x/branches/sca-java-1.1/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicyHandler.java
index 9b3685d6d9..9b3685d6d9 100644
--- a/branches/sca-java-1.1/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicyHandler.java
+++ b/sca-java-1.x/branches/sca-java-1.1/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicyHandler.java
diff --git a/branches/sca-java-1.1/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicyProcessor.java b/sca-java-1.x/branches/sca-java-1.1/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicyProcessor.java
index 2ffdeb340f..2ffdeb340f 100644
--- a/branches/sca-java-1.1/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicyProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.1/modules/policy-logging/src/main/java/org/apache/tuscany/sca/policy/logging/jdk/JDKLoggingPolicyProcessor.java
diff --git a/branches/sca-java-1.1/modules/policy-logging/src/main/resources/META-INF/services/definitions.xml b/sca-java-1.x/branches/sca-java-1.1/modules/policy-logging/src/main/resources/META-INF/services/definitions.xml
index 14e97c808c..14e97c808c 100644
--- a/branches/sca-java-1.1/modules/policy-logging/src/main/resources/META-INF/services/definitions.xml
+++ b/sca-java-1.x/branches/sca-java-1.1/modules/policy-logging/src/main/resources/META-INF/services/definitions.xml
diff --git a/branches/sca-java-1.1/modules/policy-logging/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-1.x/branches/sca-java-1.1/modules/policy-logging/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index f56f96e4b9..f56f96e4b9 100644
--- a/branches/sca-java-1.1/modules/policy-logging/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-1.x/branches/sca-java-1.1/modules/policy-logging/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-java-1.1/modules/policy-logging/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler b/sca-java-1.x/branches/sca-java-1.1/modules/policy-logging/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler
index d7644a0d1c..d7644a0d1c 100644
--- a/branches/sca-java-1.1/modules/policy-logging/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler
+++ b/sca-java-1.x/branches/sca-java-1.1/modules/policy-logging/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler
diff --git a/branches/sca-java-1.1/modules/policy-logging/src/test/java/org/apache/tuscany/sca/policy/logging/jdk/PolicyReadTestCase.java b/sca-java-1.x/branches/sca-java-1.1/modules/policy-logging/src/test/java/org/apache/tuscany/sca/policy/logging/jdk/PolicyReadTestCase.java
index d409d1da1b..d409d1da1b 100644
--- a/branches/sca-java-1.1/modules/policy-logging/src/test/java/org/apache/tuscany/sca/policy/logging/jdk/PolicyReadTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.1/modules/policy-logging/src/test/java/org/apache/tuscany/sca/policy/logging/jdk/PolicyReadTestCase.java
diff --git a/branches/sca-java-1.1/modules/policy-logging/src/test/resources/org/apache/tuscany/sca/policy/logging/jdk/mock_policies.xml b/sca-java-1.x/branches/sca-java-1.1/modules/policy-logging/src/test/resources/org/apache/tuscany/sca/policy/logging/jdk/mock_policies.xml
index fabb554236..fabb554236 100644
--- a/branches/sca-java-1.1/modules/policy-logging/src/test/resources/org/apache/tuscany/sca/policy/logging/jdk/mock_policies.xml
+++ b/sca-java-1.x/branches/sca-java-1.1/modules/policy-logging/src/test/resources/org/apache/tuscany/sca/policy/logging/jdk/mock_policies.xml
diff --git a/branches/sca-java-1.1/modules/policy-security/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.1/modules/policy-security/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.1/modules/policy-security/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.1/modules/policy-security/DISCLAIMER
diff --git a/branches/sca-java-1.1/modules/policy-security/LICENSE b/sca-java-1.x/branches/sca-java-1.1/modules/policy-security/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/branches/sca-java-1.1/modules/policy-security/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.1/modules/policy-security/LICENSE
diff --git a/branches/sca-java-1.1/modules/policy-security/NOTICE b/sca-java-1.x/branches/sca-java-1.1/modules/policy-security/NOTICE
index 1325efd8bf..1325efd8bf 100644
--- a/branches/sca-java-1.1/modules/policy-security/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.1/modules/policy-security/NOTICE
diff --git a/branches/sca-java-1.1/modules/policy-security/pom.xml b/sca-java-1.x/branches/sca-java-1.1/modules/policy-security/pom.xml
index bb059f7a82..bb059f7a82 100644
--- a/branches/sca-java-1.1/modules/policy-security/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.1/modules/policy-security/pom.xml
diff --git a/branches/sca-java-1.1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicy.java b/sca-java-1.x/branches/sca-java-1.1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicy.java
index 24c104b044..24c104b044 100644
--- a/branches/sca-java-1.1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicy.java
+++ b/sca-java-1.x/branches/sca-java-1.1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicy.java
diff --git a/branches/sca-java-1.1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicyHandler.java b/sca-java-1.x/branches/sca-java-1.1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicyHandler.java
index 87eab1309f..87eab1309f 100644
--- a/branches/sca-java-1.1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicyHandler.java
+++ b/sca-java-1.x/branches/sca-java-1.1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicyHandler.java
diff --git a/branches/sca-java-1.1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicyProcessor.java b/sca-java-1.x/branches/sca-java-1.1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicyProcessor.java
index 4a3c029750..4a3c029750 100644
--- a/branches/sca-java-1.1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicyProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/jaas/JaasAuthenticationPolicyProcessor.java
diff --git a/branches/sca-java-1.1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/ws/Axis2ConfigParamPolicy.java b/sca-java-1.x/branches/sca-java-1.1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/ws/Axis2ConfigParamPolicy.java
index cf7e78353e..cf7e78353e 100644
--- a/branches/sca-java-1.1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/ws/Axis2ConfigParamPolicy.java
+++ b/sca-java-1.x/branches/sca-java-1.1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/ws/Axis2ConfigParamPolicy.java
diff --git a/branches/sca-java-1.1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/ws/Axis2ConfigParamPolicyProcessor.java b/sca-java-1.x/branches/sca-java-1.1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/ws/Axis2ConfigParamPolicyProcessor.java
index c3506f6d4f..c3506f6d4f 100644
--- a/branches/sca-java-1.1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/ws/Axis2ConfigParamPolicyProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.1/modules/policy-security/src/main/java/org/apache/tuscany/sca/policy/security/ws/Axis2ConfigParamPolicyProcessor.java
diff --git a/branches/sca-java-1.1/modules/policy-security/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-1.x/branches/sca-java-1.1/modules/policy-security/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 29728879ec..29728879ec 100644
--- a/branches/sca-java-1.1/modules/policy-security/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-1.x/branches/sca-java-1.1/modules/policy-security/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-java-1.1/modules/policy-security/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler b/sca-java-1.x/branches/sca-java-1.1/modules/policy-security/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler
index 540f6371fc..540f6371fc 100644
--- a/branches/sca-java-1.1/modules/policy-security/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler
+++ b/sca-java-1.x/branches/sca-java-1.1/modules/policy-security/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler
diff --git a/branches/sca-java-1.1/modules/policy-security/src/main/resources/policy_definitions.xml b/sca-java-1.x/branches/sca-java-1.1/modules/policy-security/src/main/resources/policy_definitions.xml
index 8f7016b1d2..8f7016b1d2 100644
--- a/branches/sca-java-1.1/modules/policy-security/src/main/resources/policy_definitions.xml
+++ b/sca-java-1.x/branches/sca-java-1.1/modules/policy-security/src/main/resources/policy_definitions.xml
diff --git a/branches/sca-java-1.1/modules/policy-security/src/test/java/org/apache/tuscany/sca/policy/security/ws/PolicyReadTestCase.java b/sca-java-1.x/branches/sca-java-1.1/modules/policy-security/src/test/java/org/apache/tuscany/sca/policy/security/ws/PolicyReadTestCase.java
index 185eb07b3e..185eb07b3e 100644
--- a/branches/sca-java-1.1/modules/policy-security/src/test/java/org/apache/tuscany/sca/policy/security/ws/PolicyReadTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.1/modules/policy-security/src/test/java/org/apache/tuscany/sca/policy/security/ws/PolicyReadTestCase.java
diff --git a/branches/sca-java-1.1/modules/policy-security/src/test/resources/org/apache/tuscany/sca/policy/security/ws/mock_policies.xml b/sca-java-1.x/branches/sca-java-1.1/modules/policy-security/src/test/resources/org/apache/tuscany/sca/policy/security/ws/mock_policies.xml
index 8fc1a7b669..8fc1a7b669 100644
--- a/branches/sca-java-1.1/modules/policy-security/src/test/resources/org/apache/tuscany/sca/policy/security/ws/mock_policies.xml
+++ b/sca-java-1.x/branches/sca-java-1.1/modules/policy-security/src/test/resources/org/apache/tuscany/sca/policy/security/ws/mock_policies.xml
diff --git a/branches/sca-java-1.1/modules/policy-transaction/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.1/modules/policy-transaction/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.1/modules/policy-transaction/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.1/modules/policy-transaction/DISCLAIMER
diff --git a/branches/sca-java-1.1/modules/policy-transaction/LICENSE b/sca-java-1.x/branches/sca-java-1.1/modules/policy-transaction/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/branches/sca-java-1.1/modules/policy-transaction/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.1/modules/policy-transaction/LICENSE
diff --git a/branches/sca-java-1.1/modules/policy-transaction/NOTICE b/sca-java-1.x/branches/sca-java-1.1/modules/policy-transaction/NOTICE
index 1325efd8bf..1325efd8bf 100644
--- a/branches/sca-java-1.1/modules/policy-transaction/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.1/modules/policy-transaction/NOTICE
diff --git a/branches/sca-java-1.1/modules/policy-transaction/pom.xml b/sca-java-1.x/branches/sca-java-1.1/modules/policy-transaction/pom.xml
index 805076a9d6..805076a9d6 100644
--- a/branches/sca-java-1.1/modules/policy-transaction/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.1/modules/policy-transaction/pom.xml
diff --git a/branches/sca-java-1.1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/IncompatibleIntentException.java b/sca-java-1.x/branches/sca-java-1.1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/IncompatibleIntentException.java
index 8a242924ee..8a242924ee 100644
--- a/branches/sca-java-1.1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/IncompatibleIntentException.java
+++ b/sca-java-1.x/branches/sca-java-1.1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/IncompatibleIntentException.java
diff --git a/branches/sca-java-1.1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionIntent.java b/sca-java-1.x/branches/sca-java-1.1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionIntent.java
index ab142bfc1c..ab142bfc1c 100644
--- a/branches/sca-java-1.1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionIntent.java
+++ b/sca-java-1.x/branches/sca-java-1.1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionIntent.java
diff --git a/branches/sca-java-1.1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionInterceptor.java b/sca-java-1.x/branches/sca-java-1.1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionInterceptor.java
index 0de98592cb..0de98592cb 100644
--- a/branches/sca-java-1.1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionInterceptor.java
+++ b/sca-java-1.x/branches/sca-java-1.1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionInterceptor.java
diff --git a/branches/sca-java-1.1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionManagerHelper.java b/sca-java-1.x/branches/sca-java-1.1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionManagerHelper.java
index defe12967e..defe12967e 100644
--- a/branches/sca-java-1.1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionManagerHelper.java
+++ b/sca-java-1.x/branches/sca-java-1.1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionManagerHelper.java
diff --git a/branches/sca-java-1.1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionManagerWrapper.java b/sca-java-1.x/branches/sca-java-1.1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionManagerWrapper.java
index 31beab4fca..31beab4fca 100644
--- a/branches/sca-java-1.1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionManagerWrapper.java
+++ b/sca-java-1.x/branches/sca-java-1.1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionManagerWrapper.java
diff --git a/branches/sca-java-1.1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionModuleActivator.java b/sca-java-1.x/branches/sca-java-1.1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionModuleActivator.java
index d51b986d65..d51b986d65 100644
--- a/branches/sca-java-1.1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionModuleActivator.java
+++ b/sca-java-1.x/branches/sca-java-1.1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionModuleActivator.java
diff --git a/branches/sca-java-1.1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicy.java b/sca-java-1.x/branches/sca-java-1.1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicy.java
index bd27f27e1a..bd27f27e1a 100644
--- a/branches/sca-java-1.1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicy.java
+++ b/sca-java-1.x/branches/sca-java-1.1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicy.java
diff --git a/branches/sca-java-1.1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicyHandler.java b/sca-java-1.x/branches/sca-java-1.1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicyHandler.java
index cee92fe243..cee92fe243 100644
--- a/branches/sca-java-1.1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicyHandler.java
+++ b/sca-java-1.x/branches/sca-java-1.1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicyHandler.java
diff --git a/branches/sca-java-1.1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicyImpl.java b/sca-java-1.x/branches/sca-java-1.1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicyImpl.java
index f934fbbdb9..f934fbbdb9 100644
--- a/branches/sca-java-1.1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicyImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicyImpl.java
diff --git a/branches/sca-java-1.1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicyProcessor.java b/sca-java-1.x/branches/sca-java-1.1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicyProcessor.java
index 27cfbea2b2..27cfbea2b2 100644
--- a/branches/sca-java-1.1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicyProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionPolicyProcessor.java
diff --git a/branches/sca-java-1.1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionRuntimeWireProcessor.java b/sca-java-1.x/branches/sca-java-1.1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionRuntimeWireProcessor.java
index 5991535261..5991535261 100644
--- a/branches/sca-java-1.1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionRuntimeWireProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionRuntimeWireProcessor.java
diff --git a/branches/sca-java-1.1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionalAction.java b/sca-java-1.x/branches/sca-java-1.1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionalAction.java
index 5a7ae5c4cc..5a7ae5c4cc 100644
--- a/branches/sca-java-1.1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionalAction.java
+++ b/sca-java-1.x/branches/sca-java-1.1/modules/policy-transaction/src/main/java/org/apache/tuscany/sca/policy/transaction/TransactionalAction.java
diff --git a/branches/sca-java-1.1/modules/policy-transaction/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-1.x/branches/sca-java-1.1/modules/policy-transaction/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 1d034e23a2..1d034e23a2 100644
--- a/branches/sca-java-1.1/modules/policy-transaction/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-1.x/branches/sca-java-1.1/modules/policy-transaction/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-java-1.1/modules/policy-transaction/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator b/sca-java-1.x/branches/sca-java-1.1/modules/policy-transaction/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
index 9a35d62cad..9a35d62cad 100644
--- a/branches/sca-java-1.1/modules/policy-transaction/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
+++ b/sca-java-1.x/branches/sca-java-1.1/modules/policy-transaction/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
diff --git a/branches/sca-java-1.1/modules/policy-transaction/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler b/sca-java-1.x/branches/sca-java-1.1/modules/policy-transaction/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler
index 229955468d..229955468d 100644
--- a/branches/sca-java-1.1/modules/policy-transaction/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler
+++ b/sca-java-1.x/branches/sca-java-1.1/modules/policy-transaction/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler
diff --git a/branches/sca-java-1.1/modules/policy-transaction/src/main/resources/log4j.properties b/sca-java-1.x/branches/sca-java-1.1/modules/policy-transaction/src/main/resources/log4j.properties
index 698ee41d7e..698ee41d7e 100644
--- a/branches/sca-java-1.1/modules/policy-transaction/src/main/resources/log4j.properties
+++ b/sca-java-1.x/branches/sca-java-1.1/modules/policy-transaction/src/main/resources/log4j.properties
diff --git a/branches/sca-java-1.1/modules/policy-transaction/src/main/resources/policy_definitions.xml b/sca-java-1.x/branches/sca-java-1.1/modules/policy-transaction/src/main/resources/policy_definitions.xml
index b1599c0633..b1599c0633 100644
--- a/branches/sca-java-1.1/modules/policy-transaction/src/main/resources/policy_definitions.xml
+++ b/sca-java-1.x/branches/sca-java-1.1/modules/policy-transaction/src/main/resources/policy_definitions.xml
diff --git a/branches/sca-java-1.1/modules/policy-transaction/src/test/java/org/apache/tuscany/sca/policy/transaction/PolicyReadTestCase.java b/sca-java-1.x/branches/sca-java-1.1/modules/policy-transaction/src/test/java/org/apache/tuscany/sca/policy/transaction/PolicyReadTestCase.java
index 079d3a2790..079d3a2790 100644
--- a/branches/sca-java-1.1/modules/policy-transaction/src/test/java/org/apache/tuscany/sca/policy/transaction/PolicyReadTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.1/modules/policy-transaction/src/test/java/org/apache/tuscany/sca/policy/transaction/PolicyReadTestCase.java
diff --git a/branches/sca-java-1.1/modules/policy-transaction/src/test/java/org/apache/tuscany/sca/policy/transaction/TransactionManagerHelperTestCase.java b/sca-java-1.x/branches/sca-java-1.1/modules/policy-transaction/src/test/java/org/apache/tuscany/sca/policy/transaction/TransactionManagerHelperTestCase.java
index 544e0f68c0..544e0f68c0 100644
--- a/branches/sca-java-1.1/modules/policy-transaction/src/test/java/org/apache/tuscany/sca/policy/transaction/TransactionManagerHelperTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.1/modules/policy-transaction/src/test/java/org/apache/tuscany/sca/policy/transaction/TransactionManagerHelperTestCase.java
diff --git a/branches/sca-java-1.1/modules/policy-xml/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.1/modules/policy-xml/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.1/modules/policy-xml/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.1/modules/policy-xml/DISCLAIMER
diff --git a/branches/sca-java-1.1/modules/policy-xml/LICENSE b/sca-java-1.x/branches/sca-java-1.1/modules/policy-xml/LICENSE
index 6e529a25c4..6e529a25c4 100644
--- a/branches/sca-java-1.1/modules/policy-xml/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.1/modules/policy-xml/LICENSE
diff --git a/branches/sca-java-1.1/modules/policy-xml/NOTICE b/sca-java-1.x/branches/sca-java-1.1/modules/policy-xml/NOTICE
index 1325efd8bf..1325efd8bf 100644
--- a/branches/sca-java-1.1/modules/policy-xml/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.1/modules/policy-xml/NOTICE
diff --git a/branches/sca-java-1.1/modules/policy-xml/pom.xml b/sca-java-1.x/branches/sca-java-1.1/modules/policy-xml/pom.xml
index 7f1002a743..7f1002a743 100644
--- a/branches/sca-java-1.1/modules/policy-xml/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.1/modules/policy-xml/pom.xml
diff --git a/branches/sca-java-1.1/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/BindingTypeProcessor.java b/sca-java-1.x/branches/sca-java-1.1/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/BindingTypeProcessor.java
index 25f6229532..25f6229532 100644
--- a/branches/sca-java-1.1/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/BindingTypeProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.1/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/BindingTypeProcessor.java
diff --git a/branches/sca-java-1.1/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/ImplementationTypeProcessor.java b/sca-java-1.x/branches/sca-java-1.1/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/ImplementationTypeProcessor.java
index 4caa842b0d..4caa842b0d 100644
--- a/branches/sca-java-1.1/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/ImplementationTypeProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.1/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/ImplementationTypeProcessor.java
diff --git a/branches/sca-java-1.1/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/IntentAttachPointTypeProcessor.java b/sca-java-1.x/branches/sca-java-1.1/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/IntentAttachPointTypeProcessor.java
index fcd1211624..fcd1211624 100644
--- a/branches/sca-java-1.1/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/IntentAttachPointTypeProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.1/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/IntentAttachPointTypeProcessor.java
diff --git a/branches/sca-java-1.1/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyConstants.java b/sca-java-1.x/branches/sca-java-1.1/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyConstants.java
index 2d221e7adf..2d221e7adf 100644
--- a/branches/sca-java-1.1/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyConstants.java
+++ b/sca-java-1.x/branches/sca-java-1.1/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyConstants.java
diff --git a/branches/sca-java-1.1/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyIntentProcessor.java b/sca-java-1.x/branches/sca-java-1.1/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyIntentProcessor.java
index d66e6dbe86..d66e6dbe86 100644
--- a/branches/sca-java-1.1/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyIntentProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.1/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyIntentProcessor.java
diff --git a/branches/sca-java-1.1/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicySetProcessor.java b/sca-java-1.x/branches/sca-java-1.1/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicySetProcessor.java
index 8d01881a52..8d01881a52 100644
--- a/branches/sca-java-1.1/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicySetProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.1/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicySetProcessor.java
diff --git a/branches/sca-java-1.1/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/ProfileIntentProcessor.java b/sca-java-1.x/branches/sca-java-1.1/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/ProfileIntentProcessor.java
index fb242c50cf..fb242c50cf 100644
--- a/branches/sca-java-1.1/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/ProfileIntentProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.1/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/ProfileIntentProcessor.java
diff --git a/branches/sca-java-1.1/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/QualifiedIntentProcessor.java b/sca-java-1.x/branches/sca-java-1.1/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/QualifiedIntentProcessor.java
index 1232f93f05..1232f93f05 100644
--- a/branches/sca-java-1.1/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/QualifiedIntentProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.1/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/QualifiedIntentProcessor.java
diff --git a/branches/sca-java-1.1/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/SimpleIntentProcessor.java b/sca-java-1.x/branches/sca-java-1.1/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/SimpleIntentProcessor.java
index 9011529559..9011529559 100644
--- a/branches/sca-java-1.1/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/SimpleIntentProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.1/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/SimpleIntentProcessor.java
diff --git a/branches/sca-java-1.1/modules/policy-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-1.x/branches/sca-java-1.1/modules/policy-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index 0741e3eb76..0741e3eb76 100644
--- a/branches/sca-java-1.1/modules/policy-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-1.x/branches/sca-java-1.1/modules/policy-xml/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-java-1.1/modules/policy-xml/src/test/java/org/apache/tuscany/sca/policy/xml/MockPolicyProcessor.java b/sca-java-1.x/branches/sca-java-1.1/modules/policy-xml/src/test/java/org/apache/tuscany/sca/policy/xml/MockPolicyProcessor.java
index 116f9b7ae9..116f9b7ae9 100644
--- a/branches/sca-java-1.1/modules/policy-xml/src/test/java/org/apache/tuscany/sca/policy/xml/MockPolicyProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.1/modules/policy-xml/src/test/java/org/apache/tuscany/sca/policy/xml/MockPolicyProcessor.java
diff --git a/branches/sca-java-1.1/modules/policy-xml/src/test/java/org/apache/tuscany/sca/policy/xml/ReadDocumentTestCase.java b/sca-java-1.x/branches/sca-java-1.1/modules/policy-xml/src/test/java/org/apache/tuscany/sca/policy/xml/ReadDocumentTestCase.java
index 9d22b1e6eb..9d22b1e6eb 100644
--- a/branches/sca-java-1.1/modules/policy-xml/src/test/java/org/apache/tuscany/sca/policy/xml/ReadDocumentTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.1/modules/policy-xml/src/test/java/org/apache/tuscany/sca/policy/xml/ReadDocumentTestCase.java
diff --git a/branches/sca-java-1.1/modules/policy-xml/src/test/java/org/apache/tuscany/sca/policy/xml/TestModelResolver.java b/sca-java-1.x/branches/sca-java-1.1/modules/policy-xml/src/test/java/org/apache/tuscany/sca/policy/xml/TestModelResolver.java
index ce999539bb..ce999539bb 100644
--- a/branches/sca-java-1.1/modules/policy-xml/src/test/java/org/apache/tuscany/sca/policy/xml/TestModelResolver.java
+++ b/sca-java-1.x/branches/sca-java-1.1/modules/policy-xml/src/test/java/org/apache/tuscany/sca/policy/xml/TestModelResolver.java
diff --git a/branches/sca-java-1.1/modules/policy-xml/src/test/resources/org/apache/tuscany/sca/policy/xml/test_definitions.xml b/sca-java-1.x/branches/sca-java-1.1/modules/policy-xml/src/test/resources/org/apache/tuscany/sca/policy/xml/test_definitions.xml
index f7bfe89808..f7bfe89808 100644
--- a/branches/sca-java-1.1/modules/policy-xml/src/test/resources/org/apache/tuscany/sca/policy/xml/test_definitions.xml
+++ b/sca-java-1.x/branches/sca-java-1.1/modules/policy-xml/src/test/resources/org/apache/tuscany/sca/policy/xml/test_definitions.xml
diff --git a/branches/sca-java-1.1/modules/policy/DISCLAIMER b/sca-java-1.x/branches/sca-java-1.1/modules/policy/DISCLAIMER
index d68a410903..d68a410903 100644
--- a/branches/sca-java-1.1/modules/policy/DISCLAIMER
+++ b/sca-java-1.x/branches/sca-java-1.1/modules/policy/DISCLAIMER
diff --git a/branches/sca-java-1.1/modules/policy/LICENSE b/sca-java-1.x/branches/sca-java-1.1/modules/policy/LICENSE
index 8aa906c321..8aa906c321 100644
--- a/branches/sca-java-1.1/modules/policy/LICENSE
+++ b/sca-java-1.x/branches/sca-java-1.1/modules/policy/LICENSE
diff --git a/branches/sca-java-1.1/modules/policy/NOTICE b/sca-java-1.x/branches/sca-java-1.1/modules/policy/NOTICE
index fdfa0e9faa..fdfa0e9faa 100644
--- a/branches/sca-java-1.1/modules/policy/NOTICE
+++ b/sca-java-1.x/branches/sca-java-1.1/modules/policy/NOTICE
diff --git a/branches/sca-java-1.1/modules/policy/pom.xml b/sca-java-1.x/branches/sca-java-1.1/modules/policy/pom.xml
index ee0bf7d4c9..ee0bf7d4c9 100644
--- a/branches/sca-java-1.1/modules/policy/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.1/modules/policy/pom.xml
diff --git a/branches/sca-java-1.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/DefaultIntentAttachPointTypeFactory.java b/sca-java-1.x/branches/sca-java-1.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/DefaultIntentAttachPointTypeFactory.java
index ffe8906143..ffe8906143 100644
--- a/branches/sca-java-1.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/DefaultIntentAttachPointTypeFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/DefaultIntentAttachPointTypeFactory.java
diff --git a/branches/sca-java-1.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/DefaultPolicyFactory.java b/sca-java-1.x/branches/sca-java-1.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/DefaultPolicyFactory.java
index 2da41675a1..2da41675a1 100644
--- a/branches/sca-java-1.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/DefaultPolicyFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/DefaultPolicyFactory.java
diff --git a/branches/sca-java-1.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/Intent.java b/sca-java-1.x/branches/sca-java-1.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/Intent.java
index a9b9ac4884..a9b9ac4884 100644
--- a/branches/sca-java-1.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/Intent.java
+++ b/sca-java-1.x/branches/sca-java-1.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/Intent.java
diff --git a/branches/sca-java-1.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/IntentAttachPoint.java b/sca-java-1.x/branches/sca-java-1.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/IntentAttachPoint.java
index 8a8342ed04..8a8342ed04 100644
--- a/branches/sca-java-1.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/IntentAttachPoint.java
+++ b/sca-java-1.x/branches/sca-java-1.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/IntentAttachPoint.java
diff --git a/branches/sca-java-1.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/IntentAttachPointType.java b/sca-java-1.x/branches/sca-java-1.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/IntentAttachPointType.java
index 64aeb52678..64aeb52678 100644
--- a/branches/sca-java-1.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/IntentAttachPointType.java
+++ b/sca-java-1.x/branches/sca-java-1.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/IntentAttachPointType.java
diff --git a/branches/sca-java-1.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/IntentAttachPointTypeFactory.java b/sca-java-1.x/branches/sca-java-1.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/IntentAttachPointTypeFactory.java
index 9bd51d4745..9bd51d4745 100644
--- a/branches/sca-java-1.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/IntentAttachPointTypeFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/IntentAttachPointTypeFactory.java
diff --git a/branches/sca-java-1.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/IntentMap.java b/sca-java-1.x/branches/sca-java-1.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/IntentMap.java
index 9dd0be314b..9dd0be314b 100644
--- a/branches/sca-java-1.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/IntentMap.java
+++ b/sca-java-1.x/branches/sca-java-1.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/IntentMap.java
diff --git a/branches/sca-java-1.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/Policy.java b/sca-java-1.x/branches/sca-java-1.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/Policy.java
index ec4bded7da..ec4bded7da 100644
--- a/branches/sca-java-1.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/Policy.java
+++ b/sca-java-1.x/branches/sca-java-1.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/Policy.java
diff --git a/branches/sca-java-1.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicyContext.java b/sca-java-1.x/branches/sca-java-1.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicyContext.java
index 5a9ee7e170..5a9ee7e170 100644
--- a/branches/sca-java-1.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicyContext.java
+++ b/sca-java-1.x/branches/sca-java-1.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicyContext.java
diff --git a/branches/sca-java-1.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicyFactory.java b/sca-java-1.x/branches/sca-java-1.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicyFactory.java
index c0f2087ca6..c0f2087ca6 100644
--- a/branches/sca-java-1.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicyFactory.java
+++ b/sca-java-1.x/branches/sca-java-1.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicyFactory.java
diff --git a/branches/sca-java-1.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicySet.java b/sca-java-1.x/branches/sca-java-1.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicySet.java
index 33323ed98e..33323ed98e 100644
--- a/branches/sca-java-1.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicySet.java
+++ b/sca-java-1.x/branches/sca-java-1.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicySet.java
diff --git a/branches/sca-java-1.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicySetAttachPoint.java b/sca-java-1.x/branches/sca-java-1.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicySetAttachPoint.java
index bcd509389a..bcd509389a 100644
--- a/branches/sca-java-1.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicySetAttachPoint.java
+++ b/sca-java-1.x/branches/sca-java-1.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicySetAttachPoint.java
diff --git a/branches/sca-java-1.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicySetReference.java b/sca-java-1.x/branches/sca-java-1.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicySetReference.java
index e1f14a3215..e1f14a3215 100644
--- a/branches/sca-java-1.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicySetReference.java
+++ b/sca-java-1.x/branches/sca-java-1.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/PolicySetReference.java
diff --git a/branches/sca-java-1.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/ProfileIntent.java b/sca-java-1.x/branches/sca-java-1.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/ProfileIntent.java
index ff9fe89c62..ff9fe89c62 100644
--- a/branches/sca-java-1.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/ProfileIntent.java
+++ b/sca-java-1.x/branches/sca-java-1.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/ProfileIntent.java
diff --git a/branches/sca-java-1.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/QualifiedIntent.java b/sca-java-1.x/branches/sca-java-1.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/QualifiedIntent.java
index 6c859283c6..6c859283c6 100644
--- a/branches/sca-java-1.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/QualifiedIntent.java
+++ b/sca-java-1.x/branches/sca-java-1.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/QualifiedIntent.java
diff --git a/branches/sca-java-1.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/BindingTypeImpl.java b/sca-java-1.x/branches/sca-java-1.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/BindingTypeImpl.java
index 76e17e83f2..76e17e83f2 100644
--- a/branches/sca-java-1.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/BindingTypeImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/BindingTypeImpl.java
diff --git a/branches/sca-java-1.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/ImplementationTypeImpl.java b/sca-java-1.x/branches/sca-java-1.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/ImplementationTypeImpl.java
index c4c5c0afce..c4c5c0afce 100644
--- a/branches/sca-java-1.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/ImplementationTypeImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/ImplementationTypeImpl.java
diff --git a/branches/sca-java-1.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/IntentAttachPointTypeFactoryImpl.java b/sca-java-1.x/branches/sca-java-1.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/IntentAttachPointTypeFactoryImpl.java
index 99f8b6e4aa..99f8b6e4aa 100644
--- a/branches/sca-java-1.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/IntentAttachPointTypeFactoryImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/IntentAttachPointTypeFactoryImpl.java
diff --git a/branches/sca-java-1.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/IntentImpl.java b/sca-java-1.x/branches/sca-java-1.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/IntentImpl.java
index 757e4bcfc7..757e4bcfc7 100644
--- a/branches/sca-java-1.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/IntentImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/IntentImpl.java
diff --git a/branches/sca-java-1.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/IntentMapImpl.java b/sca-java-1.x/branches/sca-java-1.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/IntentMapImpl.java
index aab03281ba..aab03281ba 100644
--- a/branches/sca-java-1.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/IntentMapImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/IntentMapImpl.java
diff --git a/branches/sca-java-1.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicyContextImpl.java b/sca-java-1.x/branches/sca-java-1.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicyContextImpl.java
index f8755df23c..f8755df23c 100644
--- a/branches/sca-java-1.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicyContextImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicyContextImpl.java
diff --git a/branches/sca-java-1.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicyFactoryImpl.java b/sca-java-1.x/branches/sca-java-1.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicyFactoryImpl.java
index 1db29b835e..1db29b835e 100644
--- a/branches/sca-java-1.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicyFactoryImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicyFactoryImpl.java
diff --git a/branches/sca-java-1.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicySetImpl.java b/sca-java-1.x/branches/sca-java-1.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicySetImpl.java
index 011c2cd117..011c2cd117 100644
--- a/branches/sca-java-1.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicySetImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicySetImpl.java
diff --git a/branches/sca-java-1.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicySetReferenceImpl.java b/sca-java-1.x/branches/sca-java-1.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicySetReferenceImpl.java
index 33887a784b..33887a784b 100644
--- a/branches/sca-java-1.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicySetReferenceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicySetReferenceImpl.java
diff --git a/branches/sca-java-1.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/ProfileIntentImpl.java b/sca-java-1.x/branches/sca-java-1.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/ProfileIntentImpl.java
index cdab3bcda2..cdab3bcda2 100644
--- a/branches/sca-java-1.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/ProfileIntentImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/ProfileIntentImpl.java
diff --git a/branches/sca-java-1.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/QualifiedIntentImpl.java b/sca-java-1.x/branches/sca-java-1.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/QualifiedIntentImpl.java
index e418e399ca..e418e399ca 100644
--- a/branches/sca-java-1.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/QualifiedIntentImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/QualifiedIntentImpl.java
diff --git a/branches/sca-java-1.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyHandler.java b/sca-java-1.x/branches/sca-java-1.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyHandler.java
index 9bb7f1244c..9bb7f1244c 100644
--- a/branches/sca-java-1.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyHandler.java
+++ b/sca-java-1.x/branches/sca-java-1.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyHandler.java
diff --git a/branches/sca-java-1.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyHandlerTuple.java b/sca-java-1.x/branches/sca-java-1.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyHandlerTuple.java
index 2ae32e3962..2ae32e3962 100644
--- a/branches/sca-java-1.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyHandlerTuple.java
+++ b/sca-java-1.x/branches/sca-java-1.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyHandlerTuple.java
diff --git a/branches/sca-java-1.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyValidationException.java b/sca-java-1.x/branches/sca-java-1.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyValidationException.java
index 43dd3fbe76..43dd3fbe76 100644
--- a/branches/sca-java-1.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyValidationException.java
+++ b/sca-java-1.x/branches/sca-java-1.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyValidationException.java
diff --git a/branches/sca-java-1.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyValidationUtils.java b/sca-java-1.x/branches/sca-java-1.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyValidationUtils.java
index eca9d19711..eca9d19711 100644
--- a/branches/sca-java-1.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyValidationUtils.java
+++ b/sca-java-1.x/branches/sca-java-1.1/modules/policy/src/main/java/org/apache/tuscany/sca/policy/util/PolicyValidationUtils.java
diff --git a/branches/sca-java-1.1/modules/policy/src/main/resources/META-INF/services/definitions.xml b/sca-java-1.x/branches/sca-java-1.1/modules/policy/src/main/resources/META-INF/services/definitions.xml
index 87d296e674..87d296e674 100644
--- a/branches/sca-java-1.1/modules/policy/src/main/resources/META-INF/services/definitions.xml
+++ b/sca-java-1.x/branches/sca-java-1.1/modules/policy/src/main/resources/META-INF/services/definitions.xml
diff --git a/branches/sca-java-1.1/modules/policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.IntentAttachPointTypeFactory b/sca-java-1.x/branches/sca-java-1.1/modules/policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.IntentAttachPointTypeFactory
index a0e56c1822..a0e56c1822 100644
--- a/branches/sca-java-1.1/modules/policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.IntentAttachPointTypeFactory
+++ b/sca-java-1.x/branches/sca-java-1.1/modules/policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.IntentAttachPointTypeFactory
diff --git a/branches/sca-java-1.1/modules/policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.PolicyFactory b/sca-java-1.x/branches/sca-java-1.1/modules/policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.PolicyFactory
index 846b3b24a4..846b3b24a4 100644
--- a/branches/sca-java-1.1/modules/policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.PolicyFactory
+++ b/sca-java-1.x/branches/sca-java-1.1/modules/policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.PolicyFactory
diff --git a/branches/sca-java-1.1/modules/policy/src/test/java/org/apache/tuscany/sca/policy/PolicyFactoryTestCase.java b/sca-java-1.x/branches/sca-java-1.1/modules/policy/src/test/java/org/apache/tuscany/sca/policy/PolicyFactoryTestCase.java
index d7f87b1c5d..d7f87b1c5d 100644
--- a/branches/sca-java-1.1/modules/policy/src/test/java/org/apache/tuscany/sca/policy/PolicyFactoryTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.1/modules/policy/src/test/java/org/apache/tuscany/sca/policy/PolicyFactoryTestCase.java