summaryrefslogtreecommitdiffstats
path: root/branches/sca-java-1.5/itest/policy
diff options
context:
space:
mode:
authorlresende <lresende@13f79535-47bb-0310-9956-ffa450edef68>2009-11-11 23:08:37 +0000
committerlresende <lresende@13f79535-47bb-0310-9956-ffa450edef68>2009-11-11 23:08:37 +0000
commit4ef0430519e276c2bdecea75f7a0f42f49f0cf30 (patch)
tree19dd40a9336c52160da6671d2fb3d428725733d4 /branches/sca-java-1.5/itest/policy
parent725006d4c47e63986ac042ade23a4d193298b1fe (diff)
Moving 1.x branches
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@835132 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to '')
-rw-r--r--sca-java-1.x/branches/sca-java-1.5/itest/policy-security-basicauth/pom.xml (renamed from branches/sca-java-1.5/itest/policy-security-basicauth/pom.xml)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.5/itest/policy-security-basicauth/src/main/java/helloworld/HelloWorldClientImpl.java (renamed from branches/sca-java-1.5/itest/policy-security-basicauth/src/main/java/helloworld/HelloWorldClientImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.5/itest/policy-security-basicauth/src/main/java/helloworld/HelloWorldService.java (renamed from branches/sca-java-1.5/itest/policy-security-basicauth/src/main/java/helloworld/HelloWorldService.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.5/itest/policy-security-basicauth/src/main/java/helloworld/HelloWorldServiceImpl.java (renamed from branches/sca-java-1.5/itest/policy-security-basicauth/src/main/java/helloworld/HelloWorldServiceImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.5/itest/policy-security-basicauth/src/main/resources/definitions.xml (renamed from branches/sca-java-1.5/itest/policy-security-basicauth/src/main/resources/definitions.xml)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.5/itest/policy-security-basicauth/src/main/resources/helloworld.composite (renamed from branches/sca-java-1.5/itest/policy-security-basicauth/src/main/resources/helloworld.composite)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.5/itest/policy-security-basicauth/src/test/java/org/apache/tuscany/sca/itest/BasicAuthTestCase.java (renamed from branches/sca-java-1.5/itest/policy-security-basicauth/src/test/java/org/apache/tuscany/sca/itest/BasicAuthTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.5/itest/policy-security-jsr250/pom.xml (renamed from branches/sca-java-1.5/itest/policy-security-jsr250/pom.xml)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.5/itest/policy-security-jsr250/src/main/java/helloworld/HelloWorldImpl.java (renamed from branches/sca-java-1.5/itest/policy-security-jsr250/src/main/java/helloworld/HelloWorldImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.5/itest/policy-security-jsr250/src/main/java/helloworld/HelloWorldService.java (renamed from branches/sca-java-1.5/itest/policy-security-jsr250/src/main/java/helloworld/HelloWorldService.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.5/itest/policy-security-jsr250/src/main/resources/definitions.xml (renamed from branches/sca-java-1.5/itest/policy-security-jsr250/src/main/resources/definitions.xml)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.5/itest/policy-security-jsr250/src/main/resources/helloworld.composite (renamed from branches/sca-java-1.5/itest/policy-security-jsr250/src/main/resources/helloworld.composite)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.5/itest/policy-security-jsr250/src/test/java/org/apache/tuscany/sca/itest/PolicySecurityJSR250TestCase.java (renamed from branches/sca-java-1.5/itest/policy-security-jsr250/src/test/java/org/apache/tuscany/sca/itest/PolicySecurityJSR250TestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.5/itest/policy-security-token/pom.xml (renamed from branches/sca-java-1.5/itest/policy-security-token/pom.xml)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.5/itest/policy-security-token/src/main/java/helloworld/HelloWorldClientImpl.java (renamed from branches/sca-java-1.5/itest/policy-security-token/src/main/java/helloworld/HelloWorldClientImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.5/itest/policy-security-token/src/main/java/helloworld/HelloWorldService.java (renamed from branches/sca-java-1.5/itest/policy-security-token/src/main/java/helloworld/HelloWorldService.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.5/itest/policy-security-token/src/main/java/helloworld/HelloWorldServiceImpl.java (renamed from branches/sca-java-1.5/itest/policy-security-token/src/main/java/helloworld/HelloWorldServiceImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.5/itest/policy-security-token/src/main/resources/definitions.xml (renamed from branches/sca-java-1.5/itest/policy-security-token/src/main/resources/definitions.xml)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.5/itest/policy-security-token/src/main/resources/helloworld.composite (renamed from branches/sca-java-1.5/itest/policy-security-token/src/main/resources/helloworld.composite)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.5/itest/policy-security-token/src/main/resources/jndi.properties (renamed from branches/sca-java-1.5/itest/policy-security-token/src/main/resources/jndi.properties)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.5/itest/policy-security-token/src/test/java/org/apache/tuscany/sca/itest/TokenAuthTestCase.java (renamed from branches/sca-java-1.5/itest/policy-security-token/src/test/java/org/apache/tuscany/sca/itest/TokenAuthTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.5/itest/policy-security/pom.xml (renamed from branches/sca-java-1.5/itest/policy-security/pom.xml)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.5/itest/policy-security/src/main/java/helloworld/HelloWorldImpl.java (renamed from branches/sca-java-1.5/itest/policy-security/src/main/java/helloworld/HelloWorldImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.5/itest/policy-security/src/main/java/helloworld/HelloWorldService.java (renamed from branches/sca-java-1.5/itest/policy-security/src/main/java/helloworld/HelloWorldService.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.5/itest/policy-security/src/main/resources/definitions.xml (renamed from branches/sca-java-1.5/itest/policy-security/src/main/resources/definitions.xml)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.5/itest/policy-security/src/main/resources/helloworld.composite (renamed from branches/sca-java-1.5/itest/policy-security/src/main/resources/helloworld.composite)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.5/itest/policy-security/src/test/java/org/apache/tuscany/sca/itest/PolicyIdentityTestCase.java (renamed from branches/sca-java-1.5/itest/policy-security/src/test/java/org/apache/tuscany/sca/itest/PolicyIdentityTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.5/itest/policy/pom.xml (renamed from branches/sca-java-1.5/itest/policy/pom.xml)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.5/itest/policy/src/main/java/calculator/AddService.java (renamed from branches/sca-java-1.5/itest/policy/src/main/java/calculator/AddService.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.5/itest/policy/src/main/java/calculator/AddServiceImpl.java (renamed from branches/sca-java-1.5/itest/policy/src/main/java/calculator/AddServiceImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.5/itest/policy/src/main/java/calculator/CalculatorClient.java (renamed from branches/sca-java-1.5/itest/policy/src/main/java/calculator/CalculatorClient.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.5/itest/policy/src/main/java/calculator/CalculatorService.java (renamed from branches/sca-java-1.5/itest/policy/src/main/java/calculator/CalculatorService.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.5/itest/policy/src/main/java/calculator/CalculatorServiceImpl.java (renamed from branches/sca-java-1.5/itest/policy/src/main/java/calculator/CalculatorServiceImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.5/itest/policy/src/main/java/calculator/DivideService.java (renamed from branches/sca-java-1.5/itest/policy/src/main/java/calculator/DivideService.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.5/itest/policy/src/main/java/calculator/DivideServiceImpl.java (renamed from branches/sca-java-1.5/itest/policy/src/main/java/calculator/DivideServiceImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.5/itest/policy/src/main/java/calculator/MultiplyService.java (renamed from branches/sca-java-1.5/itest/policy/src/main/java/calculator/MultiplyService.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.5/itest/policy/src/main/java/calculator/MultiplyServiceImpl.java (renamed from branches/sca-java-1.5/itest/policy/src/main/java/calculator/MultiplyServiceImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.5/itest/policy/src/main/java/calculator/PolicyQNames.java (renamed from branches/sca-java-1.5/itest/policy/src/main/java/calculator/PolicyQNames.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.5/itest/policy/src/main/java/calculator/SubtractService.java (renamed from branches/sca-java-1.5/itest/policy/src/main/java/calculator/SubtractService.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.5/itest/policy/src/main/java/calculator/SubtractServiceImpl.java (renamed from branches/sca-java-1.5/itest/policy/src/main/java/calculator/SubtractServiceImpl.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.5/itest/policy/src/main/java/calculator/policy/TestImplPolicyHandler.java (renamed from branches/sca-java-1.5/itest/policy/src/main/java/calculator/policy/TestImplPolicyHandler.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.5/itest/policy/src/main/java/calculator/policy/TestRefPolicyHandler.java (renamed from branches/sca-java-1.5/itest/policy/src/main/java/calculator/policy/TestRefPolicyHandler.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.5/itest/policy/src/main/java/calculator/policy/TestSvcPolicyHandler.java (renamed from branches/sca-java-1.5/itest/policy/src/main/java/calculator/policy/TestSvcPolicyHandler.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.5/itest/policy/src/main/resources/Calculator.composite (renamed from branches/sca-java-1.5/itest/policy/src/main/resources/Calculator.composite)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.5/itest/policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor (renamed from branches/sca-java-1.5/itest/policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.5/itest/policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler (renamed from branches/sca-java-1.5/itest/policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.5/itest/policy/src/main/resources/definitions.xml (renamed from branches/sca-java-1.5/itest/policy/src/main/resources/definitions.xml)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.5/itest/policy/src/test/java/org/apache/tuscany/sca/itest/PoliciedCalculatorTestCase.java (renamed from branches/sca-java-1.5/itest/policy/src/test/java/org/apache/tuscany/sca/itest/PoliciedCalculatorTestCase.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.5/itest/policy/src/test/java/org/apache/tuscany/sca/itest/Policy.java (renamed from branches/sca-java-1.5/itest/policy/src/test/java/org/apache/tuscany/sca/itest/Policy.java)0
-rw-r--r--sca-java-1.x/branches/sca-java-1.5/itest/policy/src/test/java/org/apache/tuscany/sca/itest/TestPolicyProcessor.java (renamed from branches/sca-java-1.5/itest/policy/src/test/java/org/apache/tuscany/sca/itest/TestPolicyProcessor.java)0
50 files changed, 0 insertions, 0 deletions
diff --git a/branches/sca-java-1.5/itest/policy-security-basicauth/pom.xml b/sca-java-1.x/branches/sca-java-1.5/itest/policy-security-basicauth/pom.xml
index f379f78e30..f379f78e30 100644
--- a/branches/sca-java-1.5/itest/policy-security-basicauth/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.5/itest/policy-security-basicauth/pom.xml
diff --git a/branches/sca-java-1.5/itest/policy-security-basicauth/src/main/java/helloworld/HelloWorldClientImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/policy-security-basicauth/src/main/java/helloworld/HelloWorldClientImpl.java
index 7345af7f7c..7345af7f7c 100644
--- a/branches/sca-java-1.5/itest/policy-security-basicauth/src/main/java/helloworld/HelloWorldClientImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.5/itest/policy-security-basicauth/src/main/java/helloworld/HelloWorldClientImpl.java
diff --git a/branches/sca-java-1.5/itest/policy-security-basicauth/src/main/java/helloworld/HelloWorldService.java b/sca-java-1.x/branches/sca-java-1.5/itest/policy-security-basicauth/src/main/java/helloworld/HelloWorldService.java
index 268d90e910..268d90e910 100644
--- a/branches/sca-java-1.5/itest/policy-security-basicauth/src/main/java/helloworld/HelloWorldService.java
+++ b/sca-java-1.x/branches/sca-java-1.5/itest/policy-security-basicauth/src/main/java/helloworld/HelloWorldService.java
diff --git a/branches/sca-java-1.5/itest/policy-security-basicauth/src/main/java/helloworld/HelloWorldServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/policy-security-basicauth/src/main/java/helloworld/HelloWorldServiceImpl.java
index 6372570d1f..6372570d1f 100644
--- a/branches/sca-java-1.5/itest/policy-security-basicauth/src/main/java/helloworld/HelloWorldServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.5/itest/policy-security-basicauth/src/main/java/helloworld/HelloWorldServiceImpl.java
diff --git a/branches/sca-java-1.5/itest/policy-security-basicauth/src/main/resources/definitions.xml b/sca-java-1.x/branches/sca-java-1.5/itest/policy-security-basicauth/src/main/resources/definitions.xml
index dbdf0cd263..dbdf0cd263 100644
--- a/branches/sca-java-1.5/itest/policy-security-basicauth/src/main/resources/definitions.xml
+++ b/sca-java-1.x/branches/sca-java-1.5/itest/policy-security-basicauth/src/main/resources/definitions.xml
diff --git a/branches/sca-java-1.5/itest/policy-security-basicauth/src/main/resources/helloworld.composite b/sca-java-1.x/branches/sca-java-1.5/itest/policy-security-basicauth/src/main/resources/helloworld.composite
index f883629180..f883629180 100644
--- a/branches/sca-java-1.5/itest/policy-security-basicauth/src/main/resources/helloworld.composite
+++ b/sca-java-1.x/branches/sca-java-1.5/itest/policy-security-basicauth/src/main/resources/helloworld.composite
diff --git a/branches/sca-java-1.5/itest/policy-security-basicauth/src/test/java/org/apache/tuscany/sca/itest/BasicAuthTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/policy-security-basicauth/src/test/java/org/apache/tuscany/sca/itest/BasicAuthTestCase.java
index b6e0444d2d..b6e0444d2d 100644
--- a/branches/sca-java-1.5/itest/policy-security-basicauth/src/test/java/org/apache/tuscany/sca/itest/BasicAuthTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.5/itest/policy-security-basicauth/src/test/java/org/apache/tuscany/sca/itest/BasicAuthTestCase.java
diff --git a/branches/sca-java-1.5/itest/policy-security-jsr250/pom.xml b/sca-java-1.x/branches/sca-java-1.5/itest/policy-security-jsr250/pom.xml
index 9b3d2840b1..9b3d2840b1 100644
--- a/branches/sca-java-1.5/itest/policy-security-jsr250/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.5/itest/policy-security-jsr250/pom.xml
diff --git a/branches/sca-java-1.5/itest/policy-security-jsr250/src/main/java/helloworld/HelloWorldImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/policy-security-jsr250/src/main/java/helloworld/HelloWorldImpl.java
index 3569410e7d..3569410e7d 100644
--- a/branches/sca-java-1.5/itest/policy-security-jsr250/src/main/java/helloworld/HelloWorldImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.5/itest/policy-security-jsr250/src/main/java/helloworld/HelloWorldImpl.java
diff --git a/branches/sca-java-1.5/itest/policy-security-jsr250/src/main/java/helloworld/HelloWorldService.java b/sca-java-1.x/branches/sca-java-1.5/itest/policy-security-jsr250/src/main/java/helloworld/HelloWorldService.java
index 3e752144a0..3e752144a0 100644
--- a/branches/sca-java-1.5/itest/policy-security-jsr250/src/main/java/helloworld/HelloWorldService.java
+++ b/sca-java-1.x/branches/sca-java-1.5/itest/policy-security-jsr250/src/main/java/helloworld/HelloWorldService.java
diff --git a/branches/sca-java-1.5/itest/policy-security-jsr250/src/main/resources/definitions.xml b/sca-java-1.x/branches/sca-java-1.5/itest/policy-security-jsr250/src/main/resources/definitions.xml
index 64b8a95d18..64b8a95d18 100644
--- a/branches/sca-java-1.5/itest/policy-security-jsr250/src/main/resources/definitions.xml
+++ b/sca-java-1.x/branches/sca-java-1.5/itest/policy-security-jsr250/src/main/resources/definitions.xml
diff --git a/branches/sca-java-1.5/itest/policy-security-jsr250/src/main/resources/helloworld.composite b/sca-java-1.x/branches/sca-java-1.5/itest/policy-security-jsr250/src/main/resources/helloworld.composite
index 456ca450f1..456ca450f1 100644
--- a/branches/sca-java-1.5/itest/policy-security-jsr250/src/main/resources/helloworld.composite
+++ b/sca-java-1.x/branches/sca-java-1.5/itest/policy-security-jsr250/src/main/resources/helloworld.composite
diff --git a/branches/sca-java-1.5/itest/policy-security-jsr250/src/test/java/org/apache/tuscany/sca/itest/PolicySecurityJSR250TestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/policy-security-jsr250/src/test/java/org/apache/tuscany/sca/itest/PolicySecurityJSR250TestCase.java
index da5f6409ba..da5f6409ba 100644
--- a/branches/sca-java-1.5/itest/policy-security-jsr250/src/test/java/org/apache/tuscany/sca/itest/PolicySecurityJSR250TestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.5/itest/policy-security-jsr250/src/test/java/org/apache/tuscany/sca/itest/PolicySecurityJSR250TestCase.java
diff --git a/branches/sca-java-1.5/itest/policy-security-token/pom.xml b/sca-java-1.x/branches/sca-java-1.5/itest/policy-security-token/pom.xml
index 40fc1b03d8..40fc1b03d8 100644
--- a/branches/sca-java-1.5/itest/policy-security-token/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.5/itest/policy-security-token/pom.xml
diff --git a/branches/sca-java-1.5/itest/policy-security-token/src/main/java/helloworld/HelloWorldClientImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/policy-security-token/src/main/java/helloworld/HelloWorldClientImpl.java
index 769be60538..769be60538 100644
--- a/branches/sca-java-1.5/itest/policy-security-token/src/main/java/helloworld/HelloWorldClientImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.5/itest/policy-security-token/src/main/java/helloworld/HelloWorldClientImpl.java
diff --git a/branches/sca-java-1.5/itest/policy-security-token/src/main/java/helloworld/HelloWorldService.java b/sca-java-1.x/branches/sca-java-1.5/itest/policy-security-token/src/main/java/helloworld/HelloWorldService.java
index 268d90e910..268d90e910 100644
--- a/branches/sca-java-1.5/itest/policy-security-token/src/main/java/helloworld/HelloWorldService.java
+++ b/sca-java-1.x/branches/sca-java-1.5/itest/policy-security-token/src/main/java/helloworld/HelloWorldService.java
diff --git a/branches/sca-java-1.5/itest/policy-security-token/src/main/java/helloworld/HelloWorldServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/policy-security-token/src/main/java/helloworld/HelloWorldServiceImpl.java
index 60c07f6f73..60c07f6f73 100644
--- a/branches/sca-java-1.5/itest/policy-security-token/src/main/java/helloworld/HelloWorldServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.5/itest/policy-security-token/src/main/java/helloworld/HelloWorldServiceImpl.java
diff --git a/branches/sca-java-1.5/itest/policy-security-token/src/main/resources/definitions.xml b/sca-java-1.x/branches/sca-java-1.5/itest/policy-security-token/src/main/resources/definitions.xml
index f7bb9bc374..f7bb9bc374 100644
--- a/branches/sca-java-1.5/itest/policy-security-token/src/main/resources/definitions.xml
+++ b/sca-java-1.x/branches/sca-java-1.5/itest/policy-security-token/src/main/resources/definitions.xml
diff --git a/branches/sca-java-1.5/itest/policy-security-token/src/main/resources/helloworld.composite b/sca-java-1.x/branches/sca-java-1.5/itest/policy-security-token/src/main/resources/helloworld.composite
index 1db89fd502..1db89fd502 100644
--- a/branches/sca-java-1.5/itest/policy-security-token/src/main/resources/helloworld.composite
+++ b/sca-java-1.x/branches/sca-java-1.5/itest/policy-security-token/src/main/resources/helloworld.composite
diff --git a/branches/sca-java-1.5/itest/policy-security-token/src/main/resources/jndi.properties b/sca-java-1.x/branches/sca-java-1.5/itest/policy-security-token/src/main/resources/jndi.properties
index 9abdff215d..9abdff215d 100644
--- a/branches/sca-java-1.5/itest/policy-security-token/src/main/resources/jndi.properties
+++ b/sca-java-1.x/branches/sca-java-1.5/itest/policy-security-token/src/main/resources/jndi.properties
diff --git a/branches/sca-java-1.5/itest/policy-security-token/src/test/java/org/apache/tuscany/sca/itest/TokenAuthTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/policy-security-token/src/test/java/org/apache/tuscany/sca/itest/TokenAuthTestCase.java
index b0ae00b639..b0ae00b639 100644
--- a/branches/sca-java-1.5/itest/policy-security-token/src/test/java/org/apache/tuscany/sca/itest/TokenAuthTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.5/itest/policy-security-token/src/test/java/org/apache/tuscany/sca/itest/TokenAuthTestCase.java
diff --git a/branches/sca-java-1.5/itest/policy-security/pom.xml b/sca-java-1.x/branches/sca-java-1.5/itest/policy-security/pom.xml
index 8a22cb1efb..8a22cb1efb 100644
--- a/branches/sca-java-1.5/itest/policy-security/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.5/itest/policy-security/pom.xml
diff --git a/branches/sca-java-1.5/itest/policy-security/src/main/java/helloworld/HelloWorldImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/policy-security/src/main/java/helloworld/HelloWorldImpl.java
index 0de3c70303..0de3c70303 100644
--- a/branches/sca-java-1.5/itest/policy-security/src/main/java/helloworld/HelloWorldImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.5/itest/policy-security/src/main/java/helloworld/HelloWorldImpl.java
diff --git a/branches/sca-java-1.5/itest/policy-security/src/main/java/helloworld/HelloWorldService.java b/sca-java-1.x/branches/sca-java-1.5/itest/policy-security/src/main/java/helloworld/HelloWorldService.java
index 268d90e910..268d90e910 100644
--- a/branches/sca-java-1.5/itest/policy-security/src/main/java/helloworld/HelloWorldService.java
+++ b/sca-java-1.x/branches/sca-java-1.5/itest/policy-security/src/main/java/helloworld/HelloWorldService.java
diff --git a/branches/sca-java-1.5/itest/policy-security/src/main/resources/definitions.xml b/sca-java-1.x/branches/sca-java-1.5/itest/policy-security/src/main/resources/definitions.xml
index c8118a0caf..c8118a0caf 100644
--- a/branches/sca-java-1.5/itest/policy-security/src/main/resources/definitions.xml
+++ b/sca-java-1.x/branches/sca-java-1.5/itest/policy-security/src/main/resources/definitions.xml
diff --git a/branches/sca-java-1.5/itest/policy-security/src/main/resources/helloworld.composite b/sca-java-1.x/branches/sca-java-1.5/itest/policy-security/src/main/resources/helloworld.composite
index 9e0f289f87..9e0f289f87 100644
--- a/branches/sca-java-1.5/itest/policy-security/src/main/resources/helloworld.composite
+++ b/sca-java-1.x/branches/sca-java-1.5/itest/policy-security/src/main/resources/helloworld.composite
diff --git a/branches/sca-java-1.5/itest/policy-security/src/test/java/org/apache/tuscany/sca/itest/PolicyIdentityTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/policy-security/src/test/java/org/apache/tuscany/sca/itest/PolicyIdentityTestCase.java
index 9dad17741e..9dad17741e 100644
--- a/branches/sca-java-1.5/itest/policy-security/src/test/java/org/apache/tuscany/sca/itest/PolicyIdentityTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.5/itest/policy-security/src/test/java/org/apache/tuscany/sca/itest/PolicyIdentityTestCase.java
diff --git a/branches/sca-java-1.5/itest/policy/pom.xml b/sca-java-1.x/branches/sca-java-1.5/itest/policy/pom.xml
index 53b0a1f7c9..53b0a1f7c9 100644
--- a/branches/sca-java-1.5/itest/policy/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.5/itest/policy/pom.xml
diff --git a/branches/sca-java-1.5/itest/policy/src/main/java/calculator/AddService.java b/sca-java-1.x/branches/sca-java-1.5/itest/policy/src/main/java/calculator/AddService.java
index 3e56bf3fad..3e56bf3fad 100644
--- a/branches/sca-java-1.5/itest/policy/src/main/java/calculator/AddService.java
+++ b/sca-java-1.x/branches/sca-java-1.5/itest/policy/src/main/java/calculator/AddService.java
diff --git a/branches/sca-java-1.5/itest/policy/src/main/java/calculator/AddServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/policy/src/main/java/calculator/AddServiceImpl.java
index 7ca8fb04b5..7ca8fb04b5 100644
--- a/branches/sca-java-1.5/itest/policy/src/main/java/calculator/AddServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.5/itest/policy/src/main/java/calculator/AddServiceImpl.java
diff --git a/branches/sca-java-1.5/itest/policy/src/main/java/calculator/CalculatorClient.java b/sca-java-1.x/branches/sca-java-1.5/itest/policy/src/main/java/calculator/CalculatorClient.java
index 9abc488523..9abc488523 100644
--- a/branches/sca-java-1.5/itest/policy/src/main/java/calculator/CalculatorClient.java
+++ b/sca-java-1.x/branches/sca-java-1.5/itest/policy/src/main/java/calculator/CalculatorClient.java
diff --git a/branches/sca-java-1.5/itest/policy/src/main/java/calculator/CalculatorService.java b/sca-java-1.x/branches/sca-java-1.5/itest/policy/src/main/java/calculator/CalculatorService.java
index a1880698ea..a1880698ea 100644
--- a/branches/sca-java-1.5/itest/policy/src/main/java/calculator/CalculatorService.java
+++ b/sca-java-1.x/branches/sca-java-1.5/itest/policy/src/main/java/calculator/CalculatorService.java
diff --git a/branches/sca-java-1.5/itest/policy/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/policy/src/main/java/calculator/CalculatorServiceImpl.java
index 28ce0ec78a..28ce0ec78a 100644
--- a/branches/sca-java-1.5/itest/policy/src/main/java/calculator/CalculatorServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.5/itest/policy/src/main/java/calculator/CalculatorServiceImpl.java
diff --git a/branches/sca-java-1.5/itest/policy/src/main/java/calculator/DivideService.java b/sca-java-1.x/branches/sca-java-1.5/itest/policy/src/main/java/calculator/DivideService.java
index f72b05cece..f72b05cece 100644
--- a/branches/sca-java-1.5/itest/policy/src/main/java/calculator/DivideService.java
+++ b/sca-java-1.x/branches/sca-java-1.5/itest/policy/src/main/java/calculator/DivideService.java
diff --git a/branches/sca-java-1.5/itest/policy/src/main/java/calculator/DivideServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/policy/src/main/java/calculator/DivideServiceImpl.java
index 1323edf55a..1323edf55a 100644
--- a/branches/sca-java-1.5/itest/policy/src/main/java/calculator/DivideServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.5/itest/policy/src/main/java/calculator/DivideServiceImpl.java
diff --git a/branches/sca-java-1.5/itest/policy/src/main/java/calculator/MultiplyService.java b/sca-java-1.x/branches/sca-java-1.5/itest/policy/src/main/java/calculator/MultiplyService.java
index 5290605938..5290605938 100644
--- a/branches/sca-java-1.5/itest/policy/src/main/java/calculator/MultiplyService.java
+++ b/sca-java-1.x/branches/sca-java-1.5/itest/policy/src/main/java/calculator/MultiplyService.java
diff --git a/branches/sca-java-1.5/itest/policy/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/policy/src/main/java/calculator/MultiplyServiceImpl.java
index 91b803bc9e..91b803bc9e 100644
--- a/branches/sca-java-1.5/itest/policy/src/main/java/calculator/MultiplyServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.5/itest/policy/src/main/java/calculator/MultiplyServiceImpl.java
diff --git a/branches/sca-java-1.5/itest/policy/src/main/java/calculator/PolicyQNames.java b/sca-java-1.x/branches/sca-java-1.5/itest/policy/src/main/java/calculator/PolicyQNames.java
index 3e1bc45842..3e1bc45842 100644
--- a/branches/sca-java-1.5/itest/policy/src/main/java/calculator/PolicyQNames.java
+++ b/sca-java-1.x/branches/sca-java-1.5/itest/policy/src/main/java/calculator/PolicyQNames.java
diff --git a/branches/sca-java-1.5/itest/policy/src/main/java/calculator/SubtractService.java b/sca-java-1.x/branches/sca-java-1.5/itest/policy/src/main/java/calculator/SubtractService.java
index bf0d1882b6..bf0d1882b6 100644
--- a/branches/sca-java-1.5/itest/policy/src/main/java/calculator/SubtractService.java
+++ b/sca-java-1.x/branches/sca-java-1.5/itest/policy/src/main/java/calculator/SubtractService.java
diff --git a/branches/sca-java-1.5/itest/policy/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5/itest/policy/src/main/java/calculator/SubtractServiceImpl.java
index 58cc4a3547..58cc4a3547 100644
--- a/branches/sca-java-1.5/itest/policy/src/main/java/calculator/SubtractServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.5/itest/policy/src/main/java/calculator/SubtractServiceImpl.java
diff --git a/branches/sca-java-1.5/itest/policy/src/main/java/calculator/policy/TestImplPolicyHandler.java b/sca-java-1.x/branches/sca-java-1.5/itest/policy/src/main/java/calculator/policy/TestImplPolicyHandler.java
index 4b04a4d0b8..4b04a4d0b8 100644
--- a/branches/sca-java-1.5/itest/policy/src/main/java/calculator/policy/TestImplPolicyHandler.java
+++ b/sca-java-1.x/branches/sca-java-1.5/itest/policy/src/main/java/calculator/policy/TestImplPolicyHandler.java
diff --git a/branches/sca-java-1.5/itest/policy/src/main/java/calculator/policy/TestRefPolicyHandler.java b/sca-java-1.x/branches/sca-java-1.5/itest/policy/src/main/java/calculator/policy/TestRefPolicyHandler.java
index 3dcadd724e..3dcadd724e 100644
--- a/branches/sca-java-1.5/itest/policy/src/main/java/calculator/policy/TestRefPolicyHandler.java
+++ b/sca-java-1.x/branches/sca-java-1.5/itest/policy/src/main/java/calculator/policy/TestRefPolicyHandler.java
diff --git a/branches/sca-java-1.5/itest/policy/src/main/java/calculator/policy/TestSvcPolicyHandler.java b/sca-java-1.x/branches/sca-java-1.5/itest/policy/src/main/java/calculator/policy/TestSvcPolicyHandler.java
index 3d314a9d14..3d314a9d14 100644
--- a/branches/sca-java-1.5/itest/policy/src/main/java/calculator/policy/TestSvcPolicyHandler.java
+++ b/sca-java-1.x/branches/sca-java-1.5/itest/policy/src/main/java/calculator/policy/TestSvcPolicyHandler.java
diff --git a/branches/sca-java-1.5/itest/policy/src/main/resources/Calculator.composite b/sca-java-1.x/branches/sca-java-1.5/itest/policy/src/main/resources/Calculator.composite
index aed7684099..aed7684099 100644
--- a/branches/sca-java-1.5/itest/policy/src/main/resources/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.5/itest/policy/src/main/resources/Calculator.composite
diff --git a/branches/sca-java-1.5/itest/policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor b/sca-java-1.x/branches/sca-java-1.5/itest/policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
index a20489035b..a20489035b 100644
--- a/branches/sca-java-1.5/itest/policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
+++ b/sca-java-1.x/branches/sca-java-1.5/itest/policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor
diff --git a/branches/sca-java-1.5/itest/policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler b/sca-java-1.x/branches/sca-java-1.5/itest/policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler
index d9f144b3ff..d9f144b3ff 100644
--- a/branches/sca-java-1.5/itest/policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler
+++ b/sca-java-1.x/branches/sca-java-1.5/itest/policy/src/main/resources/META-INF/services/org.apache.tuscany.sca.policy.util.PolicyHandler
diff --git a/branches/sca-java-1.5/itest/policy/src/main/resources/definitions.xml b/sca-java-1.x/branches/sca-java-1.5/itest/policy/src/main/resources/definitions.xml
index 0009d712f3..0009d712f3 100644
--- a/branches/sca-java-1.5/itest/policy/src/main/resources/definitions.xml
+++ b/sca-java-1.x/branches/sca-java-1.5/itest/policy/src/main/resources/definitions.xml
diff --git a/branches/sca-java-1.5/itest/policy/src/test/java/org/apache/tuscany/sca/itest/PoliciedCalculatorTestCase.java b/sca-java-1.x/branches/sca-java-1.5/itest/policy/src/test/java/org/apache/tuscany/sca/itest/PoliciedCalculatorTestCase.java
index 885e8314ef..885e8314ef 100644
--- a/branches/sca-java-1.5/itest/policy/src/test/java/org/apache/tuscany/sca/itest/PoliciedCalculatorTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.5/itest/policy/src/test/java/org/apache/tuscany/sca/itest/PoliciedCalculatorTestCase.java
diff --git a/branches/sca-java-1.5/itest/policy/src/test/java/org/apache/tuscany/sca/itest/Policy.java b/sca-java-1.x/branches/sca-java-1.5/itest/policy/src/test/java/org/apache/tuscany/sca/itest/Policy.java
index ba17755b88..ba17755b88 100644
--- a/branches/sca-java-1.5/itest/policy/src/test/java/org/apache/tuscany/sca/itest/Policy.java
+++ b/sca-java-1.x/branches/sca-java-1.5/itest/policy/src/test/java/org/apache/tuscany/sca/itest/Policy.java
diff --git a/branches/sca-java-1.5/itest/policy/src/test/java/org/apache/tuscany/sca/itest/TestPolicyProcessor.java b/sca-java-1.x/branches/sca-java-1.5/itest/policy/src/test/java/org/apache/tuscany/sca/itest/TestPolicyProcessor.java
index ff47988bce..ff47988bce 100644
--- a/branches/sca-java-1.5/itest/policy/src/test/java/org/apache/tuscany/sca/itest/TestPolicyProcessor.java
+++ b/sca-java-1.x/branches/sca-java-1.5/itest/policy/src/test/java/org/apache/tuscany/sca/itest/TestPolicyProcessor.java