176 files changed, 0 insertions, 0 deletions

diff --git a/branches/sca-java-1.5.2/itest/validation/src/main/java/binding/ejb/account/Customer.java b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/java/binding/ejb/account/Customer.java
index acb74c38ae..acb74c38ae 100644
--- a/branches/sca-java-1.5.2/itest/validation/src/main/java/binding/ejb/account/Customer.java
+++ b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/java/binding/ejb/account/Customer.java
diff --git a/branches/sca-java-1.5.2/itest/validation/src/main/java/binding/ejb/account/CustomerImpl.java b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/java/binding/ejb/account/CustomerImpl.java
index 52ddfa9aba..52ddfa9aba 100644
--- a/branches/sca-java-1.5.2/itest/validation/src/main/java/binding/ejb/account/CustomerImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/java/binding/ejb/account/CustomerImpl.java
diff --git a/branches/sca-java-1.5.2/itest/validation/src/main/java/binding/ejb/calculator/AddService.java b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/java/binding/ejb/calculator/AddService.java
index aec8998083..aec8998083 100644
--- a/branches/sca-java-1.5.2/itest/validation/src/main/java/binding/ejb/calculator/AddService.java
+++ b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/java/binding/ejb/calculator/AddService.java
diff --git a/branches/sca-java-1.5.2/itest/validation/src/main/java/binding/ejb/calculator/AddServiceHome.java b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/java/binding/ejb/calculator/AddServiceHome.java
index 5df24b6379..5df24b6379 100644
--- a/branches/sca-java-1.5.2/itest/validation/src/main/java/binding/ejb/calculator/AddServiceHome.java
+++ b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/java/binding/ejb/calculator/AddServiceHome.java
diff --git a/branches/sca-java-1.5.2/itest/validation/src/main/java/binding/jms/HelloWorldService.java b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/java/binding/jms/HelloWorldService.java
index 33bfe1d0ea..33bfe1d0ea 100644
--- a/branches/sca-java-1.5.2/itest/validation/src/main/java/binding/jms/HelloWorldService.java
+++ b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/java/binding/jms/HelloWorldService.java
diff --git a/branches/sca-java-1.5.2/itest/validation/src/main/java/binding/jms/HelloWorldServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/java/binding/jms/HelloWorldServiceImpl.java
index a6a40b0ed1..a6a40b0ed1 100644
--- a/branches/sca-java-1.5.2/itest/validation/src/main/java/binding/jms/HelloWorldServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/java/binding/jms/HelloWorldServiceImpl.java
diff --git a/branches/sca-java-1.5.2/itest/validation/src/main/java/calculator/warning/AddService.java b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/java/calculator/warning/AddService.java
index 35ba2cbfac..35ba2cbfac 100644
--- a/branches/sca-java-1.5.2/itest/validation/src/main/java/calculator/warning/AddService.java
+++ b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/java/calculator/warning/AddService.java
diff --git a/branches/sca-java-1.5.2/itest/validation/src/main/java/calculator/warning/AddServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/java/calculator/warning/AddServiceImpl.java
index ef305370cc..ef305370cc 100644
--- a/branches/sca-java-1.5.2/itest/validation/src/main/java/calculator/warning/AddServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/java/calculator/warning/AddServiceImpl.java
diff --git a/branches/sca-java-1.5.2/itest/validation/src/main/java/calculator/warning/AddServiceImplWithServiceName.java b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/java/calculator/warning/AddServiceImplWithServiceName.java
index aacde27842..aacde27842 100644
--- a/branches/sca-java-1.5.2/itest/validation/src/main/java/calculator/warning/AddServiceImplWithServiceName.java
+++ b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/java/calculator/warning/AddServiceImplWithServiceName.java
diff --git a/branches/sca-java-1.5.2/itest/validation/src/main/java/calculator/warning/CalculatorClient.java b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/java/calculator/warning/CalculatorClient.java
index 185f17a5ca..185f17a5ca 100644
--- a/branches/sca-java-1.5.2/itest/validation/src/main/java/calculator/warning/CalculatorClient.java
+++ b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/java/calculator/warning/CalculatorClient.java
diff --git a/branches/sca-java-1.5.2/itest/validation/src/main/java/calculator/warning/CalculatorService.java b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/java/calculator/warning/CalculatorService.java
index f472d6aaf6..f472d6aaf6 100644
--- a/branches/sca-java-1.5.2/itest/validation/src/main/java/calculator/warning/CalculatorService.java
+++ b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/java/calculator/warning/CalculatorService.java
diff --git a/branches/sca-java-1.5.2/itest/validation/src/main/java/calculator/warning/CalculatorServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/java/calculator/warning/CalculatorServiceImpl.java
index 77aafe83de..77aafe83de 100644
--- a/branches/sca-java-1.5.2/itest/validation/src/main/java/calculator/warning/CalculatorServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/java/calculator/warning/CalculatorServiceImpl.java
diff --git a/branches/sca-java-1.5.2/itest/validation/src/main/java/calculator/warning/DivideService.java b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/java/calculator/warning/DivideService.java
index a93d23e61c..a93d23e61c 100644
--- a/branches/sca-java-1.5.2/itest/validation/src/main/java/calculator/warning/DivideService.java
+++ b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/java/calculator/warning/DivideService.java
diff --git a/branches/sca-java-1.5.2/itest/validation/src/main/java/calculator/warning/DivideServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/java/calculator/warning/DivideServiceImpl.java
index 080594034b..080594034b 100644
--- a/branches/sca-java-1.5.2/itest/validation/src/main/java/calculator/warning/DivideServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/java/calculator/warning/DivideServiceImpl.java
diff --git a/branches/sca-java-1.5.2/itest/validation/src/main/java/calculator/warning/MultiplyService.java b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/java/calculator/warning/MultiplyService.java
index 20d48e93d5..20d48e93d5 100644
--- a/branches/sca-java-1.5.2/itest/validation/src/main/java/calculator/warning/MultiplyService.java
+++ b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/java/calculator/warning/MultiplyService.java
diff --git a/branches/sca-java-1.5.2/itest/validation/src/main/java/calculator/warning/MultiplyServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/java/calculator/warning/MultiplyServiceImpl.java
index 96f0b55fa2..96f0b55fa2 100644
--- a/branches/sca-java-1.5.2/itest/validation/src/main/java/calculator/warning/MultiplyServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/java/calculator/warning/MultiplyServiceImpl.java
diff --git a/branches/sca-java-1.5.2/itest/validation/src/main/java/calculator/warning/PropertyService.java b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/java/calculator/warning/PropertyService.java
index 4f1ccc96f8..4f1ccc96f8 100644
--- a/branches/sca-java-1.5.2/itest/validation/src/main/java/calculator/warning/PropertyService.java
+++ b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/java/calculator/warning/PropertyService.java
diff --git a/branches/sca-java-1.5.2/itest/validation/src/main/java/calculator/warning/PropertyServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/java/calculator/warning/PropertyServiceImpl.java
index 429daf5f2d..429daf5f2d 100644
--- a/branches/sca-java-1.5.2/itest/validation/src/main/java/calculator/warning/PropertyServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/java/calculator/warning/PropertyServiceImpl.java
diff --git a/branches/sca-java-1.5.2/itest/validation/src/main/java/calculator/warning/SubtractService.java b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/java/calculator/warning/SubtractService.java
index 40e382dc74..40e382dc74 100644
--- a/branches/sca-java-1.5.2/itest/validation/src/main/java/calculator/warning/SubtractService.java
+++ b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/java/calculator/warning/SubtractService.java
diff --git a/branches/sca-java-1.5.2/itest/validation/src/main/java/calculator/warning/SubtractServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/java/calculator/warning/SubtractServiceImpl.java
index 8cdbe0813d..8cdbe0813d 100644
--- a/branches/sca-java-1.5.2/itest/validation/src/main/java/calculator/warning/SubtractServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/java/calculator/warning/SubtractServiceImpl.java
diff --git a/branches/sca-java-1.5.2/itest/validation/src/main/java/calculator/warning/SubtractServiceImplWithServiceName.java b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/java/calculator/warning/SubtractServiceImplWithServiceName.java
index d5e9fcf020..d5e9fcf020 100644
--- a/branches/sca-java-1.5.2/itest/validation/src/main/java/calculator/warning/SubtractServiceImplWithServiceName.java
+++ b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/java/calculator/warning/SubtractServiceImplWithServiceName.java
diff --git a/branches/sca-java-1.5.2/itest/validation/src/main/java/impl/java/AddService.java b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/java/impl/java/AddService.java
index 0db8ce4f5c..0db8ce4f5c 100644
--- a/branches/sca-java-1.5.2/itest/validation/src/main/java/impl/java/AddService.java
+++ b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/java/impl/java/AddService.java
diff --git a/branches/sca-java-1.5.2/itest/validation/src/main/java/impl/java/AddServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/java/impl/java/AddServiceImpl.java
index 83f2685d54..83f2685d54 100644
--- a/branches/sca-java-1.5.2/itest/validation/src/main/java/impl/java/AddServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/java/impl/java/AddServiceImpl.java
diff --git a/branches/sca-java-1.5.2/itest/validation/src/main/java/impl/java/CalculatorClient.java b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/java/impl/java/CalculatorClient.java
index e34ce3db26..e34ce3db26 100644
--- a/branches/sca-java-1.5.2/itest/validation/src/main/java/impl/java/CalculatorClient.java
+++ b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/java/impl/java/CalculatorClient.java
diff --git a/branches/sca-java-1.5.2/itest/validation/src/main/java/impl/java/CalculatorService.java b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/java/impl/java/CalculatorService.java
index 5d583fd604..5d583fd604 100644
--- a/branches/sca-java-1.5.2/itest/validation/src/main/java/impl/java/CalculatorService.java
+++ b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/java/impl/java/CalculatorService.java
diff --git a/branches/sca-java-1.5.2/itest/validation/src/main/java/impl/java/CalculatorServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/java/impl/java/CalculatorServiceImpl.java
index 0183e2a259..0183e2a259 100644
--- a/branches/sca-java-1.5.2/itest/validation/src/main/java/impl/java/CalculatorServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/java/impl/java/CalculatorServiceImpl.java
diff --git a/branches/sca-java-1.5.2/itest/validation/src/main/java/impl/java/DivideService.java b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/java/impl/java/DivideService.java
index 85ebadc9a0..85ebadc9a0 100644
--- a/branches/sca-java-1.5.2/itest/validation/src/main/java/impl/java/DivideService.java
+++ b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/java/impl/java/DivideService.java
diff --git a/branches/sca-java-1.5.2/itest/validation/src/main/java/impl/java/DivideServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/java/impl/java/DivideServiceImpl.java
index 863c298234..863c298234 100644
--- a/branches/sca-java-1.5.2/itest/validation/src/main/java/impl/java/DivideServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/java/impl/java/DivideServiceImpl.java
diff --git a/branches/sca-java-1.5.2/itest/validation/src/main/java/impl/java/MultiplyService.java b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/java/impl/java/MultiplyService.java
index e1bf7fbddc..e1bf7fbddc 100644
--- a/branches/sca-java-1.5.2/itest/validation/src/main/java/impl/java/MultiplyService.java
+++ b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/java/impl/java/MultiplyService.java
diff --git a/branches/sca-java-1.5.2/itest/validation/src/main/java/impl/java/MultiplyServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/java/impl/java/MultiplyServiceImpl.java
index 6346ea3582..6346ea3582 100644
--- a/branches/sca-java-1.5.2/itest/validation/src/main/java/impl/java/MultiplyServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/java/impl/java/MultiplyServiceImpl.java
diff --git a/branches/sca-java-1.5.2/itest/validation/src/main/java/impl/java/SubtractService.java b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/java/impl/java/SubtractService.java
index 57759bb496..57759bb496 100644
--- a/branches/sca-java-1.5.2/itest/validation/src/main/java/impl/java/SubtractService.java
+++ b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/java/impl/java/SubtractService.java
diff --git a/branches/sca-java-1.5.2/itest/validation/src/main/java/impl/java/SubtractServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/java/impl/java/SubtractServiceImpl.java
index 16e3e6a23d..16e3e6a23d 100644
--- a/branches/sca-java-1.5.2/itest/validation/src/main/java/impl/java/SubtractServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/java/impl/java/SubtractServiceImpl.java
diff --git a/branches/sca-java-1.5.2/itest/validation/src/main/java/impl/osgi/OSGiTestImpl.java b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/java/impl/osgi/OSGiTestImpl.java
index 6f9df2c034..6f9df2c034 100644
--- a/branches/sca-java-1.5.2/itest/validation/src/main/java/impl/osgi/OSGiTestImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/java/impl/osgi/OSGiTestImpl.java
diff --git a/branches/sca-java-1.5.2/itest/validation/src/main/java/impl/osgi/OSGiTestInterface.java b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/java/impl/osgi/OSGiTestInterface.java
index bafff878cd..bafff878cd 100644
--- a/branches/sca-java-1.5.2/itest/validation/src/main/java/impl/osgi/OSGiTestInterface.java
+++ b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/java/impl/osgi/OSGiTestInterface.java
diff --git a/branches/sca-java-1.5.2/itest/validation/src/main/java/impl/osgi/OSGiTestWithPropertyImpl.java b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/java/impl/osgi/OSGiTestWithPropertyImpl.java
index e44d93e6be..e44d93e6be 100644
--- a/branches/sca-java-1.5.2/itest/validation/src/main/java/impl/osgi/OSGiTestWithPropertyImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/java/impl/osgi/OSGiTestWithPropertyImpl.java
diff --git a/branches/sca-java-1.5.2/itest/validation/src/main/java/impl/spring/HelloWorld.java b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/java/impl/spring/HelloWorld.java
index ef0b491617..ef0b491617 100644
--- a/branches/sca-java-1.5.2/itest/validation/src/main/java/impl/spring/HelloWorld.java
+++ b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/java/impl/spring/HelloWorld.java
diff --git a/branches/sca-java-1.5.2/itest/validation/src/main/java/impl/spring/HelloWorldProxy.java b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/java/impl/spring/HelloWorldProxy.java
index 2e3458f0d3..2e3458f0d3 100644
--- a/branches/sca-java-1.5.2/itest/validation/src/main/java/impl/spring/HelloWorldProxy.java
+++ b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/java/impl/spring/HelloWorldProxy.java
diff --git a/branches/sca-java-1.5.2/itest/validation/src/main/java/impl/spring/TestHelloWorldBean.java b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/java/impl/spring/TestHelloWorldBean.java
index 87904f2a72..87904f2a72 100644
--- a/branches/sca-java-1.5.2/itest/validation/src/main/java/impl/spring/TestHelloWorldBean.java
+++ b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/java/impl/spring/TestHelloWorldBean.java
diff --git a/branches/sca-java-1.5.2/itest/validation/src/main/java/interfacejava/xml/CalculatorService.java b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/java/interfacejava/xml/CalculatorService.java
index fa1a621f12..fa1a621f12 100644
--- a/branches/sca-java-1.5.2/itest/validation/src/main/java/interfacejava/xml/CalculatorService.java
+++ b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/java/interfacejava/xml/CalculatorService.java
diff --git a/branches/sca-java-1.5.2/itest/validation/src/main/java/interfacejava/xml/CalculatorServiceImpl.java b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/java/interfacejava/xml/CalculatorServiceImpl.java
index ebf7a79589..ebf7a79589 100644
--- a/branches/sca-java-1.5.2/itest/validation/src/main/java/interfacejava/xml/CalculatorServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/java/interfacejava/xml/CalculatorServiceImpl.java
diff --git a/branches/sca-java-1.5.2/itest/validation/src/main/resources/ComponentReferenceTargetNotFound/Calculator.composite b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/ComponentReferenceTargetNotFound/Calculator.composite
index b2e7da05a2..b2e7da05a2 100644
--- a/branches/sca-java-1.5.2/itest/validation/src/main/resources/ComponentReferenceTargetNotFound/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/ComponentReferenceTargetNotFound/Calculator.composite
diff --git a/branches/sca-java-1.5.2/itest/validation/src/main/resources/DuplicateComponentName/Calculator.composite b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/DuplicateComponentName/Calculator.composite
index 4ba9f0724b..4ba9f0724b 100644
--- a/branches/sca-java-1.5.2/itest/validation/src/main/resources/DuplicateComponentName/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/DuplicateComponentName/Calculator.composite
diff --git a/branches/sca-java-1.5.2/itest/validation/src/main/resources/DuplicateImplementationPropertyName/Calculator.composite b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/DuplicateImplementationPropertyName/Calculator.composite
index b935dd194a..b935dd194a 100644
--- a/branches/sca-java-1.5.2/itest/validation/src/main/resources/DuplicateImplementationPropertyName/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/DuplicateImplementationPropertyName/Calculator.composite
diff --git a/branches/sca-java-1.5.2/itest/validation/src/main/resources/DuplicateImplementationPropertyName/dummyImplementation.composite b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/DuplicateImplementationPropertyName/dummyImplementation.composite
index 2b633f3139..2b633f3139 100644
--- a/branches/sca-java-1.5.2/itest/validation/src/main/resources/DuplicateImplementationPropertyName/dummyImplementation.composite
+++ b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/DuplicateImplementationPropertyName/dummyImplementation.composite
diff --git a/branches/sca-java-1.5.2/itest/validation/src/main/resources/DuplicateImplementationReferenceName/Calculator.composite b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/DuplicateImplementationReferenceName/Calculator.composite
index 940e27a1e7..940e27a1e7 100644
--- a/branches/sca-java-1.5.2/itest/validation/src/main/resources/DuplicateImplementationReferenceName/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/DuplicateImplementationReferenceName/Calculator.composite
diff --git a/branches/sca-java-1.5.2/itest/validation/src/main/resources/DuplicateImplementationReferenceName/dummyImplementation.composite b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/DuplicateImplementationReferenceName/dummyImplementation.composite
index 50d78cb2a6..50d78cb2a6 100644
--- a/branches/sca-java-1.5.2/itest/validation/src/main/resources/DuplicateImplementationReferenceName/dummyImplementation.composite
+++ b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/DuplicateImplementationReferenceName/dummyImplementation.composite
diff --git a/branches/sca-java-1.5.2/itest/validation/src/main/resources/DuplicatePropertyName/Calculator.composite b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/DuplicatePropertyName/Calculator.composite
index bd788e47b8..bd788e47b8 100644
--- a/branches/sca-java-1.5.2/itest/validation/src/main/resources/DuplicatePropertyName/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/DuplicatePropertyName/Calculator.composite
diff --git a/branches/sca-java-1.5.2/itest/validation/src/main/resources/DuplicateReferenceName/Calculator.composite b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/DuplicateReferenceName/Calculator.composite
index 7281878c0f..7281878c0f 100644
--- a/branches/sca-java-1.5.2/itest/validation/src/main/resources/DuplicateReferenceName/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/DuplicateReferenceName/Calculator.composite
diff --git a/branches/sca-java-1.5.2/itest/validation/src/main/resources/META-INF/sca/SpringHelloWorld-context.xml b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/META-INF/sca/SpringHelloWorld-context.xml
index 609ffed02d..609ffed02d 100644
--- a/branches/sca-java-1.5.2/itest/validation/src/main/resources/META-INF/sca/SpringHelloWorld-context.xml
+++ b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/META-INF/sca/SpringHelloWorld-context.xml
diff --git a/branches/sca-java-1.5.2/itest/validation/src/main/resources/MultipleBindingsForService/Calculator.composite b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/MultipleBindingsForService/Calculator.composite
index 08e18decc1..08e18decc1 100644
--- a/branches/sca-java-1.5.2/itest/validation/src/main/resources/MultipleBindingsForService/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/MultipleBindingsForService/Calculator.composite
diff --git a/branches/sca-java-1.5.2/itest/validation/src/main/resources/NoComponentImplementation/Calculator.composite b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/NoComponentImplementation/Calculator.composite
index 36e71e398b..36e71e398b 100644
--- a/branches/sca-java-1.5.2/itest/validation/src/main/resources/NoComponentImplementation/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/NoComponentImplementation/Calculator.composite
diff --git a/branches/sca-java-1.5.2/itest/validation/src/main/resources/NoCompositeNamespace/Calculator.composite b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/NoCompositeNamespace/Calculator.composite
index 9a46e09363..9a46e09363 100644
--- a/branches/sca-java-1.5.2/itest/validation/src/main/resources/NoCompositeNamespace/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/NoCompositeNamespace/Calculator.composite
diff --git a/branches/sca-java-1.5.2/itest/validation/src/main/resources/NoMatchingBinding/Calculator.composite b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/NoMatchingBinding/Calculator.composite
index 59017f0c09..59017f0c09 100644
--- a/branches/sca-java-1.5.2/itest/validation/src/main/resources/NoMatchingBinding/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/NoMatchingBinding/Calculator.composite
diff --git a/branches/sca-java-1.5.2/itest/validation/src/main/resources/PromotedReferenceNotFound/Calculator.composite b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/PromotedReferenceNotFound/Calculator.composite
index 462a95dd02..462a95dd02 100644
--- a/branches/sca-java-1.5.2/itest/validation/src/main/resources/PromotedReferenceNotFound/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/PromotedReferenceNotFound/Calculator.composite
diff --git a/branches/sca-java-1.5.2/itest/validation/src/main/resources/PromotedServiceNotFound/Calculator.composite b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/PromotedServiceNotFound/Calculator.composite
index 4b6c44bd58..4b6c44bd58 100644
--- a/branches/sca-java-1.5.2/itest/validation/src/main/resources/PromotedServiceNotFound/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/PromotedServiceNotFound/Calculator.composite
diff --git a/branches/sca-java-1.5.2/itest/validation/src/main/resources/PropertyAttribute/Calculator.composite b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/PropertyAttribute/Calculator.composite
index a397e3384c..a397e3384c 100644
--- a/branches/sca-java-1.5.2/itest/validation/src/main/resources/PropertyAttribute/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/PropertyAttribute/Calculator.composite
diff --git a/branches/sca-java-1.5.2/itest/validation/src/main/resources/PropertyAttribute/CalculatorNullMustSupply.composite b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/PropertyAttribute/CalculatorNullMustSupply.composite
index 08fab865fa..08fab865fa 100644
--- a/branches/sca-java-1.5.2/itest/validation/src/main/resources/PropertyAttribute/CalculatorNullMustSupply.composite
+++ b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/PropertyAttribute/CalculatorNullMustSupply.composite
diff --git a/branches/sca-java-1.5.2/itest/validation/src/main/resources/PropertyAttribute/CalculatorOverrideManyAttribute.composite b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/PropertyAttribute/CalculatorOverrideManyAttribute.composite
index 3a5f59b17c..3a5f59b17c 100644
--- a/branches/sca-java-1.5.2/itest/validation/src/main/resources/PropertyAttribute/CalculatorOverrideManyAttribute.composite
+++ b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/PropertyAttribute/CalculatorOverrideManyAttribute.composite
diff --git a/branches/sca-java-1.5.2/itest/validation/src/main/resources/PropertyNotFound/Calculator.composite b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/PropertyNotFound/Calculator.composite
index 8221e41430..8221e41430 100644
--- a/branches/sca-java-1.5.2/itest/validation/src/main/resources/PropertyNotFound/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/PropertyNotFound/Calculator.composite
diff --git a/branches/sca-java-1.5.2/itest/validation/src/main/resources/ReferenceIncompatibleComponentInterface/Calculator.composite b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/ReferenceIncompatibleComponentInterface/Calculator.composite
index 9c5ae7027f..9c5ae7027f 100644
--- a/branches/sca-java-1.5.2/itest/validation/src/main/resources/ReferenceIncompatibleComponentInterface/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/ReferenceIncompatibleComponentInterface/Calculator.composite
diff --git a/branches/sca-java-1.5.2/itest/validation/src/main/resources/ReferenceIncompatibleInterface/Calculator.composite b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/ReferenceIncompatibleInterface/Calculator.composite
index 3c85ed32e2..3c85ed32e2 100644
--- a/branches/sca-java-1.5.2/itest/validation/src/main/resources/ReferenceIncompatibleInterface/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/ReferenceIncompatibleInterface/Calculator.composite
diff --git a/branches/sca-java-1.5.2/itest/validation/src/main/resources/ReferenceIncompatibleMultiplicity/Calculator.composite b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/ReferenceIncompatibleMultiplicity/Calculator.composite
index 2d1a1e01f0..2d1a1e01f0 100644
--- a/branches/sca-java-1.5.2/itest/validation/src/main/resources/ReferenceIncompatibleMultiplicity/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/ReferenceIncompatibleMultiplicity/Calculator.composite
diff --git a/branches/sca-java-1.5.2/itest/validation/src/main/resources/ReferenceNotFound/Calculator.composite b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/ReferenceNotFound/Calculator.composite
index efb457ac9e..efb457ac9e 100644
--- a/branches/sca-java-1.5.2/itest/validation/src/main/resources/ReferenceNotFound/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/ReferenceNotFound/Calculator.composite
diff --git a/branches/sca-java-1.5.2/itest/validation/src/main/resources/ReferenceWithoutTargets/Calculator.composite b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/ReferenceWithoutTargets/Calculator.composite
index a5beaf4ec9..a5beaf4ec9 100644
--- a/branches/sca-java-1.5.2/itest/validation/src/main/resources/ReferenceWithoutTargets/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/ReferenceWithoutTargets/Calculator.composite
diff --git a/branches/sca-java-1.5.2/itest/validation/src/main/resources/ServiceNotFoundForComponentService/Calculator.composite b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/ServiceNotFoundForComponentService/Calculator.composite
index 06c3eeeaca..06c3eeeaca 100644
--- a/branches/sca-java-1.5.2/itest/validation/src/main/resources/ServiceNotFoundForComponentService/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/ServiceNotFoundForComponentService/Calculator.composite
diff --git a/branches/sca-java-1.5.2/itest/validation/src/main/resources/UnresolvedComponentImplementation/Calculator.composite b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/UnresolvedComponentImplementation/Calculator.composite
index 821ce570c8..821ce570c8 100644
--- a/branches/sca-java-1.5.2/itest/validation/src/main/resources/UnresolvedComponentImplementation/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/UnresolvedComponentImplementation/Calculator.composite
diff --git a/branches/sca-java-1.5.2/itest/validation/src/main/resources/XsdValidation/Calculator.composite b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/XsdValidation/Calculator.composite
index 63ccaa9957..63ccaa9957 100644
--- a/branches/sca-java-1.5.2/itest/validation/src/main/resources/XsdValidation/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/XsdValidation/Calculator.composite
diff --git a/branches/sca-java-1.5.2/itest/validation/src/main/resources/assemblyxml/ContributionReadException/Calculator.composite b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/assemblyxml/ContributionReadException/Calculator.composite
index da565081f3..da565081f3 100644
--- a/branches/sca-java-1.5.2/itest/validation/src/main/resources/assemblyxml/ContributionReadException/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/assemblyxml/ContributionReadException/Calculator.composite
diff --git a/branches/sca-java-1.5.2/itest/validation/src/main/resources/assemblyxml/PolicyImplValidationException/Calculator.composite b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/assemblyxml/PolicyImplValidationException/Calculator.composite
index 6153d40c3d..6153d40c3d 100644
--- a/branches/sca-java-1.5.2/itest/validation/src/main/resources/assemblyxml/PolicyImplValidationException/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/assemblyxml/PolicyImplValidationException/Calculator.composite
diff --git a/branches/sca-java-1.5.2/itest/validation/src/main/resources/assemblyxml/PolicyServiceValidationException/Calculator.composite b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/assemblyxml/PolicyServiceValidationException/Calculator.composite
index a3eb60bf58..a3eb60bf58 100644
--- a/branches/sca-java-1.5.2/itest/validation/src/main/resources/assemblyxml/PolicyServiceValidationException/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/assemblyxml/PolicyServiceValidationException/Calculator.composite
diff --git a/branches/sca-java-1.5.2/itest/validation/src/main/resources/assemblyxml/UnexpectedBindingElement/Calculator.composite b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/assemblyxml/UnexpectedBindingElement/Calculator.composite
index 6233d47d8d..6233d47d8d 100644
--- a/branches/sca-java-1.5.2/itest/validation/src/main/resources/assemblyxml/UnexpectedBindingElement/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/assemblyxml/UnexpectedBindingElement/Calculator.composite
diff --git a/branches/sca-java-1.5.2/itest/validation/src/main/resources/assemblyxml/UnexpectedImplementationElement/Calculator.composite b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/assemblyxml/UnexpectedImplementationElement/Calculator.composite
index 6a9af9e070..6a9af9e070 100644
--- a/branches/sca-java-1.5.2/itest/validation/src/main/resources/assemblyxml/UnexpectedImplementationElement/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/assemblyxml/UnexpectedImplementationElement/Calculator.composite
diff --git a/branches/sca-java-1.5.2/itest/validation/src/main/resources/assemblyxml/UnexpectedInterfaceElement/Calculator.composite b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/assemblyxml/UnexpectedInterfaceElement/Calculator.composite
index 49b26c78f8..49b26c78f8 100644
--- a/branches/sca-java-1.5.2/itest/validation/src/main/resources/assemblyxml/UnexpectedInterfaceElement/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/assemblyxml/UnexpectedInterfaceElement/Calculator.composite
diff --git a/branches/sca-java-1.5.2/itest/validation/src/main/resources/binding/wsxml/InvalidWsdlElementAttr/Calculator.composite b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/binding/wsxml/InvalidWsdlElementAttr/Calculator.composite
index c34a160b61..c34a160b61 100644
--- a/branches/sca-java-1.5.2/itest/validation/src/main/resources/binding/wsxml/InvalidWsdlElementAttr/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/binding/wsxml/InvalidWsdlElementAttr/Calculator.composite
diff --git a/branches/sca-java-1.5.2/itest/validation/src/main/resources/binding/wsxml/MissingImportedXSD/helloworld.wsdl b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/binding/wsxml/MissingImportedXSD/helloworld.wsdl
index ce3689afff..ce3689afff 100644
--- a/branches/sca-java-1.5.2/itest/validation/src/main/resources/binding/wsxml/MissingImportedXSD/helloworld.wsdl
+++ b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/binding/wsxml/MissingImportedXSD/helloworld.wsdl
diff --git a/branches/sca-java-1.5.2/itest/validation/src/main/resources/binding/wsxml/MissingImportedXSD/helloworldwsjms.composite b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/binding/wsxml/MissingImportedXSD/helloworldwsjms.composite
index 61a9dae367..61a9dae367 100644
--- a/branches/sca-java-1.5.2/itest/validation/src/main/resources/binding/wsxml/MissingImportedXSD/helloworldwsjms.composite
+++ b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/binding/wsxml/MissingImportedXSD/helloworldwsjms.composite
diff --git a/branches/sca-java-1.5.2/itest/validation/src/main/resources/binding/wsxml/MustUseWsdlBinding/Calculator.composite b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/binding/wsxml/MustUseWsdlBinding/Calculator.composite
index 293c4d725d..293c4d725d 100644
--- a/branches/sca-java-1.5.2/itest/validation/src/main/resources/binding/wsxml/MustUseWsdlBinding/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/binding/wsxml/MustUseWsdlBinding/Calculator.composite
diff --git a/branches/sca-java-1.5.2/itest/validation/src/main/resources/binding/wsxml/WsdlBindingDoesNotMatch/helloworld.wsdl b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/binding/wsxml/WsdlBindingDoesNotMatch/helloworld.wsdl
index 013a55b61e..013a55b61e 100644
--- a/branches/sca-java-1.5.2/itest/validation/src/main/resources/binding/wsxml/WsdlBindingDoesNotMatch/helloworld.wsdl
+++ b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/binding/wsxml/WsdlBindingDoesNotMatch/helloworld.wsdl
diff --git a/branches/sca-java-1.5.2/itest/validation/src/main/resources/binding/wsxml/WsdlBindingDoesNotMatch/helloworldwsjms.composite b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/binding/wsxml/WsdlBindingDoesNotMatch/helloworldwsjms.composite
index b7ff1e304f..b7ff1e304f 100644
--- a/branches/sca-java-1.5.2/itest/validation/src/main/resources/binding/wsxml/WsdlBindingDoesNotMatch/helloworldwsjms.composite
+++ b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/binding/wsxml/WsdlBindingDoesNotMatch/helloworldwsjms.composite
diff --git a/branches/sca-java-1.5.2/itest/validation/src/main/resources/binding/wsxml/WsdlPortTypeDoesNotMatch/helloworld.wsdl b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/binding/wsxml/WsdlPortTypeDoesNotMatch/helloworld.wsdl
index 218dbc47c4..218dbc47c4 100644
--- a/branches/sca-java-1.5.2/itest/validation/src/main/resources/binding/wsxml/WsdlPortTypeDoesNotMatch/helloworld.wsdl
+++ b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/binding/wsxml/WsdlPortTypeDoesNotMatch/helloworld.wsdl
diff --git a/branches/sca-java-1.5.2/itest/validation/src/main/resources/binding/wsxml/WsdlPortTypeDoesNotMatch/helloworldwsclient.composite b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/binding/wsxml/WsdlPortTypeDoesNotMatch/helloworldwsclient.composite
index 5975c27663..5975c27663 100644
--- a/branches/sca-java-1.5.2/itest/validation/src/main/resources/binding/wsxml/WsdlPortTypeDoesNotMatch/helloworldwsclient.composite
+++ b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/binding/wsxml/WsdlPortTypeDoesNotMatch/helloworldwsclient.composite
diff --git a/branches/sca-java-1.5.2/itest/validation/src/main/resources/binding/wsxml/WsdlServiceDoesNotMatch/helloworld.wsdl b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/binding/wsxml/WsdlServiceDoesNotMatch/helloworld.wsdl
index 013a55b61e..013a55b61e 100644
--- a/branches/sca-java-1.5.2/itest/validation/src/main/resources/binding/wsxml/WsdlServiceDoesNotMatch/helloworld.wsdl
+++ b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/binding/wsxml/WsdlServiceDoesNotMatch/helloworld.wsdl
diff --git a/branches/sca-java-1.5.2/itest/validation/src/main/resources/binding/wsxml/WsdlServiceDoesNotMatch/helloworldwsjms.composite b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/binding/wsxml/WsdlServiceDoesNotMatch/helloworldwsjms.composite
index 8cda0b007e..8cda0b007e 100644
--- a/branches/sca-java-1.5.2/itest/validation/src/main/resources/binding/wsxml/WsdlServiceDoesNotMatch/helloworldwsjms.composite
+++ b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/binding/wsxml/WsdlServiceDoesNotMatch/helloworldwsjms.composite
diff --git a/branches/sca-java-1.5.2/itest/validation/src/main/resources/bindingejb/UnknownEJBSessionType/account.composite b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/bindingejb/UnknownEJBSessionType/account.composite
index 781319d619..781319d619 100644
--- a/branches/sca-java-1.5.2/itest/validation/src/main/resources/bindingejb/UnknownEJBSessionType/account.composite
+++ b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/bindingejb/UnknownEJBSessionType/account.composite
diff --git a/branches/sca-java-1.5.2/itest/validation/src/main/resources/bindingejb/UnknownEJBVersion/account.composite b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/bindingejb/UnknownEJBVersion/account.composite
index 8a0dfac98b..8a0dfac98b 100644
--- a/branches/sca-java-1.5.2/itest/validation/src/main/resources/bindingejb/UnknownEJBVersion/account.composite
+++ b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/bindingejb/UnknownEJBVersion/account.composite
diff --git a/branches/sca-java-1.5.2/itest/validation/src/main/resources/bindingjms/DoesntProcessActivationSpec/service.composite b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/bindingjms/DoesntProcessActivationSpec/service.composite
index fcfe408582..fcfe408582 100644
--- a/branches/sca-java-1.5.2/itest/validation/src/main/resources/bindingjms/DoesntProcessActivationSpec/service.composite
+++ b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/bindingjms/DoesntProcessActivationSpec/service.composite
diff --git a/branches/sca-java-1.5.2/itest/validation/src/main/resources/bindingjms/DoesntProcessDestinationType/service.composite b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/bindingjms/DoesntProcessDestinationType/service.composite
index ede3b3fd40..ede3b3fd40 100644
--- a/branches/sca-java-1.5.2/itest/validation/src/main/resources/bindingjms/DoesntProcessDestinationType/service.composite
+++ b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/bindingjms/DoesntProcessDestinationType/service.composite
diff --git a/branches/sca-java-1.5.2/itest/validation/src/main/resources/bindingjms/DoesntProcessHeaders/service.composite b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/bindingjms/DoesntProcessHeaders/service.composite
index a8c89a0bf5..a8c89a0bf5 100644
--- a/branches/sca-java-1.5.2/itest/validation/src/main/resources/bindingjms/DoesntProcessHeaders/service.composite
+++ b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/bindingjms/DoesntProcessHeaders/service.composite
diff --git a/branches/sca-java-1.5.2/itest/validation/src/main/resources/bindingjms/DoesntProcessResourceAdapter/service.composite b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/bindingjms/DoesntProcessResourceAdapter/service.composite
index b4e56d1789..b4e56d1789 100644
--- a/branches/sca-java-1.5.2/itest/validation/src/main/resources/bindingjms/DoesntProcessResourceAdapter/service.composite
+++ b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/bindingjms/DoesntProcessResourceAdapter/service.composite
diff --git a/branches/sca-java-1.5.2/itest/validation/src/main/resources/bindingjms/DoesntProcessResponseActivationSpec/service.composite b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/bindingjms/DoesntProcessResponseActivationSpec/service.composite
index e68eb75d64..e68eb75d64 100644
--- a/branches/sca-java-1.5.2/itest/validation/src/main/resources/bindingjms/DoesntProcessResponseActivationSpec/service.composite
+++ b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/bindingjms/DoesntProcessResponseActivationSpec/service.composite
diff --git a/branches/sca-java-1.5.2/itest/validation/src/main/resources/bindingjms/DoesntProcessResponseConnectionFactory/service.composite b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/bindingjms/DoesntProcessResponseConnectionFactory/service.composite
index 00c7a3f86b..00c7a3f86b 100644
--- a/branches/sca-java-1.5.2/itest/validation/src/main/resources/bindingjms/DoesntProcessResponseConnectionFactory/service.composite
+++ b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/bindingjms/DoesntProcessResponseConnectionFactory/service.composite
diff --git a/branches/sca-java-1.5.2/itest/validation/src/main/resources/bindingjms/DoesntProcessResponseDestinationType/service.composite b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/bindingjms/DoesntProcessResponseDestinationType/service.composite
index d656d47cfd..d656d47cfd 100644
--- a/branches/sca-java-1.5.2/itest/validation/src/main/resources/bindingjms/DoesntProcessResponseDestinationType/service.composite
+++ b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/bindingjms/DoesntProcessResponseDestinationType/service.composite
diff --git a/branches/sca-java-1.5.2/itest/validation/src/main/resources/bindingjms/InvalidCorrelationScheme/service.composite b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/bindingjms/InvalidCorrelationScheme/service.composite
index ad1daacfcf..ad1daacfcf 100644
--- a/branches/sca-java-1.5.2/itest/validation/src/main/resources/bindingjms/InvalidCorrelationScheme/service.composite
+++ b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/bindingjms/InvalidCorrelationScheme/service.composite
diff --git a/branches/sca-java-1.5.2/itest/validation/src/main/resources/bindingjms/InvalidJMSDeliveryMode/service.composite b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/bindingjms/InvalidJMSDeliveryMode/service.composite
index 145aea9fbc..145aea9fbc 100644
--- a/branches/sca-java-1.5.2/itest/validation/src/main/resources/bindingjms/InvalidJMSDeliveryMode/service.composite
+++ b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/bindingjms/InvalidJMSDeliveryMode/service.composite
diff --git a/branches/sca-java-1.5.2/itest/validation/src/main/resources/bindingjms/InvalidJMSPriority/service.composite b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/bindingjms/InvalidJMSPriority/service.composite
index c52da84a0c..c52da84a0c 100644
--- a/branches/sca-java-1.5.2/itest/validation/src/main/resources/bindingjms/InvalidJMSPriority/service.composite
+++ b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/bindingjms/InvalidJMSPriority/service.composite
diff --git a/branches/sca-java-1.5.2/itest/validation/src/main/resources/bindingjms/InvalidResponseDestinationType/service.composite b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/bindingjms/InvalidResponseDestinationType/service.composite
index fb35f5d1b8..fb35f5d1b8 100644
--- a/branches/sca-java-1.5.2/itest/validation/src/main/resources/bindingjms/InvalidResponseDestinationType/service.composite
+++ b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/bindingjms/InvalidResponseDestinationType/service.composite
diff --git a/branches/sca-java-1.5.2/itest/validation/src/main/resources/bindingjms/MissingActivationSpecName/service.composite b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/bindingjms/MissingActivationSpecName/service.composite
index fcdf25455c..fcdf25455c 100644
--- a/branches/sca-java-1.5.2/itest/validation/src/main/resources/bindingjms/MissingActivationSpecName/service.composite
+++ b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/bindingjms/MissingActivationSpecName/service.composite
diff --git a/branches/sca-java-1.5.2/itest/validation/src/main/resources/bindingjms/MissingConnectionFactoryName/service.composite b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/bindingjms/MissingConnectionFactoryName/service.composite
index 14f1314a1b..14f1314a1b 100644
--- a/branches/sca-java-1.5.2/itest/validation/src/main/resources/bindingjms/MissingConnectionFactoryName/service.composite
+++ b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/bindingjms/MissingConnectionFactoryName/service.composite
diff --git a/branches/sca-java-1.5.2/itest/validation/src/main/resources/bindingjms/MissingResponseActivationSpec/service.composite b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/bindingjms/MissingResponseActivationSpec/service.composite
index 1a3cb21ac6..1a3cb21ac6 100644
--- a/branches/sca-java-1.5.2/itest/validation/src/main/resources/bindingjms/MissingResponseActivationSpec/service.composite
+++ b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/bindingjms/MissingResponseActivationSpec/service.composite
diff --git a/branches/sca-java-1.5.2/itest/validation/src/main/resources/bindingjms/MissingResponseConnectionFactory/service.composite b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/bindingjms/MissingResponseConnectionFactory/service.composite
index 80b8f9d938..80b8f9d938 100644
--- a/branches/sca-java-1.5.2/itest/validation/src/main/resources/bindingjms/MissingResponseConnectionFactory/service.composite
+++ b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/bindingjms/MissingResponseConnectionFactory/service.composite
diff --git a/branches/sca-java-1.5.2/itest/validation/src/main/resources/bindingjms/MustStartWithSchema/service.composite b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/bindingjms/MustStartWithSchema/service.composite
index 8fd1e2f554..8fd1e2f554 100644
--- a/branches/sca-java-1.5.2/itest/validation/src/main/resources/bindingjms/MustStartWithSchema/service.composite
+++ b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/bindingjms/MustStartWithSchema/service.composite
diff --git a/branches/sca-java-1.5.2/itest/validation/src/main/resources/bindingjms/UnexpectedElement/service.composite b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/bindingjms/UnexpectedElement/service.composite
index 3077c328b6..3077c328b6 100644
--- a/branches/sca-java-1.5.2/itest/validation/src/main/resources/bindingjms/UnexpectedElement/service.composite
+++ b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/bindingjms/UnexpectedElement/service.composite
diff --git a/branches/sca-java-1.5.2/itest/validation/src/main/resources/bindingjms/UnknownTokenInURI/service.composite b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/bindingjms/UnknownTokenInURI/service.composite
index e22f30152e..e22f30152e 100644
--- a/branches/sca-java-1.5.2/itest/validation/src/main/resources/bindingjms/UnknownTokenInURI/service.composite
+++ b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/bindingjms/UnknownTokenInURI/service.composite
diff --git a/branches/sca-java-1.5.2/itest/validation/src/main/resources/contribution/java/AttributePackageMissing/Calculator.composite b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/contribution/java/AttributePackageMissing/Calculator.composite
index 6ef7558d95..6ef7558d95 100644
--- a/branches/sca-java-1.5.2/itest/validation/src/main/resources/contribution/java/AttributePackageMissing/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/contribution/java/AttributePackageMissing/Calculator.composite
diff --git a/branches/sca-java-1.5.2/itest/validation/src/main/resources/contribution/namespace/AttributeNameSpaceMissing/Calculator.composite b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/contribution/namespace/AttributeNameSpaceMissing/Calculator.composite
index 77a2715373..77a2715373 100644
--- a/branches/sca-java-1.5.2/itest/validation/src/main/resources/contribution/namespace/AttributeNameSpaceMissing/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/contribution/namespace/AttributeNameSpaceMissing/Calculator.composite
diff --git a/branches/sca-java-1.5.2/itest/validation/src/main/resources/contribution/resource/AttributeURIMissing/Calculator.composite b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/contribution/resource/AttributeURIMissing/Calculator.composite
index 6e5fcf1286..6e5fcf1286 100644
--- a/branches/sca-java-1.5.2/itest/validation/src/main/resources/contribution/resource/AttributeURIMissing/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/contribution/resource/AttributeURIMissing/Calculator.composite
diff --git a/branches/sca-java-1.5.2/itest/validation/src/main/resources/contribution/resource/AttributeURIMissing/META-INF/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/contribution/resource/AttributeURIMissing/META-INF/sca-contribution.xml
index d3ce4d91c1..d3ce4d91c1 100644
--- a/branches/sca-java-1.5.2/itest/validation/src/main/resources/contribution/resource/AttributeURIMissing/META-INF/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/contribution/resource/AttributeURIMissing/META-INF/sca-contribution.xml
diff --git a/branches/sca-java-1.5.2/itest/validation/src/main/resources/contribution/xml/AttributeCompositeMissing/Calculator.composite b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/contribution/xml/AttributeCompositeMissing/Calculator.composite
index 70f91d1a7d..70f91d1a7d 100644
--- a/branches/sca-java-1.5.2/itest/validation/src/main/resources/contribution/xml/AttributeCompositeMissing/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/contribution/xml/AttributeCompositeMissing/Calculator.composite
diff --git a/branches/sca-java-1.5.2/itest/validation/src/main/resources/contribution/xml/AttributeCompositeMissing/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/contribution/xml/AttributeCompositeMissing/sca-contribution.xml
index 7f5eb546e0..7f5eb546e0 100644
--- a/branches/sca-java-1.5.2/itest/validation/src/main/resources/contribution/xml/AttributeCompositeMissing/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/contribution/xml/AttributeCompositeMissing/sca-contribution.xml
diff --git a/branches/sca-java-1.5.2/itest/validation/src/main/resources/contribution/xml/MultipleCompositeErrors/Calculator.composite b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/contribution/xml/MultipleCompositeErrors/Calculator.composite
index 70f91d1a7d..70f91d1a7d 100644
--- a/branches/sca-java-1.5.2/itest/validation/src/main/resources/contribution/xml/MultipleCompositeErrors/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/contribution/xml/MultipleCompositeErrors/Calculator.composite
diff --git a/branches/sca-java-1.5.2/itest/validation/src/main/resources/contribution/xml/MultipleCompositeErrors/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/contribution/xml/MultipleCompositeErrors/sca-contribution.xml
index c1ff61f07c..c1ff61f07c 100644
--- a/branches/sca-java-1.5.2/itest/validation/src/main/resources/contribution/xml/MultipleCompositeErrors/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/contribution/xml/MultipleCompositeErrors/sca-contribution.xml
diff --git a/branches/sca-java-1.5.2/itest/validation/src/main/resources/impl/bpel/AttributeUnrecognizedNamespace/helloworld.composite b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/impl/bpel/AttributeUnrecognizedNamespace/helloworld.composite
index 0dfe52985a..0dfe52985a 100644
--- a/branches/sca-java-1.5.2/itest/validation/src/main/resources/impl/bpel/AttributeUnrecognizedNamespace/helloworld.composite
+++ b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/impl/bpel/AttributeUnrecognizedNamespace/helloworld.composite
diff --git a/branches/sca-java-1.5.2/itest/validation/src/main/resources/impl/bpel/AttributeWithoutNamespace/helloworld.composite b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/impl/bpel/AttributeWithoutNamespace/helloworld.composite
index d3f249720d..d3f249720d 100644
--- a/branches/sca-java-1.5.2/itest/validation/src/main/resources/impl/bpel/AttributeWithoutNamespace/helloworld.composite
+++ b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/impl/bpel/AttributeWithoutNamespace/helloworld.composite
diff --git a/branches/sca-java-1.5.2/itest/validation/src/main/resources/impl/bpel/BPELProcessNotFound/helloworld.bpel b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/impl/bpel/BPELProcessNotFound/helloworld.bpel
index a8eb389704..a8eb389704 100644
--- a/branches/sca-java-1.5.2/itest/validation/src/main/resources/impl/bpel/BPELProcessNotFound/helloworld.bpel
+++ b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/impl/bpel/BPELProcessNotFound/helloworld.bpel
diff --git a/branches/sca-java-1.5.2/itest/validation/src/main/resources/impl/bpel/BPELProcessNotFound/helloworld.composite b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/impl/bpel/BPELProcessNotFound/helloworld.composite
index 575927a5de..575927a5de 100644
--- a/branches/sca-java-1.5.2/itest/validation/src/main/resources/impl/bpel/BPELProcessNotFound/helloworld.composite
+++ b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/impl/bpel/BPELProcessNotFound/helloworld.composite
diff --git a/branches/sca-java-1.5.2/itest/validation/src/main/resources/impl/bpel/BPELProcessNotFound/helloworld.wsdl b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/impl/bpel/BPELProcessNotFound/helloworld.wsdl
index 46cf381577..46cf381577 100644
--- a/branches/sca-java-1.5.2/itest/validation/src/main/resources/impl/bpel/BPELProcessNotFound/helloworld.wsdl
+++ b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/impl/bpel/BPELProcessNotFound/helloworld.wsdl
diff --git a/branches/sca-java-1.5.2/itest/validation/src/main/resources/impl/bpel/CannotResolveWSDLReference/helloworld.bpel b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/impl/bpel/CannotResolveWSDLReference/helloworld.bpel
index a8eb389704..a8eb389704 100644
--- a/branches/sca-java-1.5.2/itest/validation/src/main/resources/impl/bpel/CannotResolveWSDLReference/helloworld.bpel
+++ b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/impl/bpel/CannotResolveWSDLReference/helloworld.bpel
diff --git a/branches/sca-java-1.5.2/itest/validation/src/main/resources/impl/bpel/CannotResolveWSDLReference/helloworld.composite b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/impl/bpel/CannotResolveWSDLReference/helloworld.composite
index b4623b5c2d..b4623b5c2d 100644
--- a/branches/sca-java-1.5.2/itest/validation/src/main/resources/impl/bpel/CannotResolveWSDLReference/helloworld.composite
+++ b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/impl/bpel/CannotResolveWSDLReference/helloworld.composite
diff --git a/branches/sca-java-1.5.2/itest/validation/src/main/resources/impl/bpel/MyRolePartnerRoleNull/helloworld.bpel b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/impl/bpel/MyRolePartnerRoleNull/helloworld.bpel
index 973d1f618a..973d1f618a 100644
--- a/branches/sca-java-1.5.2/itest/validation/src/main/resources/impl/bpel/MyRolePartnerRoleNull/helloworld.bpel
+++ b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/impl/bpel/MyRolePartnerRoleNull/helloworld.bpel
diff --git a/branches/sca-java-1.5.2/itest/validation/src/main/resources/impl/bpel/MyRolePartnerRoleNull/helloworld.composite b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/impl/bpel/MyRolePartnerRoleNull/helloworld.composite
index b4623b5c2d..b4623b5c2d 100644
--- a/branches/sca-java-1.5.2/itest/validation/src/main/resources/impl/bpel/MyRolePartnerRoleNull/helloworld.composite
+++ b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/impl/bpel/MyRolePartnerRoleNull/helloworld.composite
diff --git a/branches/sca-java-1.5.2/itest/validation/src/main/resources/impl/bpel/MyRolePartnerRoleNull/helloworld.wsdl b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/impl/bpel/MyRolePartnerRoleNull/helloworld.wsdl
index 46cf381577..46cf381577 100644
--- a/branches/sca-java-1.5.2/itest/validation/src/main/resources/impl/bpel/MyRolePartnerRoleNull/helloworld.wsdl
+++ b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/impl/bpel/MyRolePartnerRoleNull/helloworld.wsdl
diff --git a/branches/sca-java-1.5.2/itest/validation/src/main/resources/impl/bpel/PartnerLinkHasBothAttr/helloworld.bpel b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/impl/bpel/PartnerLinkHasBothAttr/helloworld.bpel
index 5d2aeddc3d..5d2aeddc3d 100644
--- a/branches/sca-java-1.5.2/itest/validation/src/main/resources/impl/bpel/PartnerLinkHasBothAttr/helloworld.bpel
+++ b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/impl/bpel/PartnerLinkHasBothAttr/helloworld.bpel
diff --git a/branches/sca-java-1.5.2/itest/validation/src/main/resources/impl/bpel/PartnerLinkHasBothAttr/helloworld.composite b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/impl/bpel/PartnerLinkHasBothAttr/helloworld.composite
index b4623b5c2d..b4623b5c2d 100644
--- a/branches/sca-java-1.5.2/itest/validation/src/main/resources/impl/bpel/PartnerLinkHasBothAttr/helloworld.composite
+++ b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/impl/bpel/PartnerLinkHasBothAttr/helloworld.composite
diff --git a/branches/sca-java-1.5.2/itest/validation/src/main/resources/impl/bpel/PartnerLinkHasBothAttr/helloworld.wsdl b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/impl/bpel/PartnerLinkHasBothAttr/helloworld.wsdl
index 46cf381577..46cf381577 100644
--- a/branches/sca-java-1.5.2/itest/validation/src/main/resources/impl/bpel/PartnerLinkHasBothAttr/helloworld.wsdl
+++ b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/impl/bpel/PartnerLinkHasBothAttr/helloworld.wsdl
diff --git a/branches/sca-java-1.5.2/itest/validation/src/main/resources/impl/bpel/PartnerLinkNoMatchingType/helloworld.bpel b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/impl/bpel/PartnerLinkNoMatchingType/helloworld.bpel
index 68df3156a8..68df3156a8 100644
--- a/branches/sca-java-1.5.2/itest/validation/src/main/resources/impl/bpel/PartnerLinkNoMatchingType/helloworld.bpel
+++ b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/impl/bpel/PartnerLinkNoMatchingType/helloworld.bpel
diff --git a/branches/sca-java-1.5.2/itest/validation/src/main/resources/impl/bpel/PartnerLinkNoMatchingType/helloworld.composite b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/impl/bpel/PartnerLinkNoMatchingType/helloworld.composite
index b4623b5c2d..b4623b5c2d 100644
--- a/branches/sca-java-1.5.2/itest/validation/src/main/resources/impl/bpel/PartnerLinkNoMatchingType/helloworld.composite
+++ b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/impl/bpel/PartnerLinkNoMatchingType/helloworld.composite
diff --git a/branches/sca-java-1.5.2/itest/validation/src/main/resources/impl/bpel/PartnerLinkNoMatchingType/helloworld.wsdl b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/impl/bpel/PartnerLinkNoMatchingType/helloworld.wsdl
index 46cf381577..46cf381577 100644
--- a/branches/sca-java-1.5.2/itest/validation/src/main/resources/impl/bpel/PartnerLinkNoMatchingType/helloworld.wsdl
+++ b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/impl/bpel/PartnerLinkNoMatchingType/helloworld.wsdl
diff --git a/branches/sca-java-1.5.2/itest/validation/src/main/resources/impl/bpel/PartnerLinkTypeNoRoles/helloworld.bpel b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/impl/bpel/PartnerLinkTypeNoRoles/helloworld.bpel
index a8eb389704..a8eb389704 100644
--- a/branches/sca-java-1.5.2/itest/validation/src/main/resources/impl/bpel/PartnerLinkTypeNoRoles/helloworld.bpel
+++ b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/impl/bpel/PartnerLinkTypeNoRoles/helloworld.bpel
diff --git a/branches/sca-java-1.5.2/itest/validation/src/main/resources/impl/bpel/PartnerLinkTypeNoRoles/helloworld.composite b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/impl/bpel/PartnerLinkTypeNoRoles/helloworld.composite
index b4623b5c2d..b4623b5c2d 100644
--- a/branches/sca-java-1.5.2/itest/validation/src/main/resources/impl/bpel/PartnerLinkTypeNoRoles/helloworld.composite
+++ b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/impl/bpel/PartnerLinkTypeNoRoles/helloworld.composite
diff --git a/branches/sca-java-1.5.2/itest/validation/src/main/resources/impl/bpel/PartnerLinkTypeNoRoles/helloworld.wsdl b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/impl/bpel/PartnerLinkTypeNoRoles/helloworld.wsdl
index 695fd60887..695fd60887 100644
--- a/branches/sca-java-1.5.2/itest/validation/src/main/resources/impl/bpel/PartnerLinkTypeNoRoles/helloworld.wsdl
+++ b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/impl/bpel/PartnerLinkTypeNoRoles/helloworld.wsdl
diff --git a/branches/sca-java-1.5.2/itest/validation/src/main/resources/impl/ejb/EJBLinkAttributeMissing/ejb.composite b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/impl/ejb/EJBLinkAttributeMissing/ejb.composite
index 94ee650207..94ee650207 100644
--- a/branches/sca-java-1.5.2/itest/validation/src/main/resources/impl/ejb/EJBLinkAttributeMissing/ejb.composite
+++ b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/impl/ejb/EJBLinkAttributeMissing/ejb.composite
diff --git a/branches/sca-java-1.5.2/itest/validation/src/main/resources/impl/java/ClassNotFoundException/Calculator.composite b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/impl/java/ClassNotFoundException/Calculator.composite
index f3cf93ddaa..f3cf93ddaa 100644
--- a/branches/sca-java-1.5.2/itest/validation/src/main/resources/impl/java/ClassNotFoundException/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/impl/java/ClassNotFoundException/Calculator.composite
diff --git a/branches/sca-java-1.5.2/itest/validation/src/main/resources/impl/java/ContributionResolveException/Calculator.composite b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/impl/java/ContributionResolveException/Calculator.composite
index f9016219a5..f9016219a5 100644
--- a/branches/sca-java-1.5.2/itest/validation/src/main/resources/impl/java/ContributionResolveException/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/impl/java/ContributionResolveException/Calculator.composite
diff --git a/branches/sca-java-1.5.2/itest/validation/src/main/resources/impl/osgi/CouldNotLocateOSGiBundle/OSGiTestService.componentType b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/impl/osgi/CouldNotLocateOSGiBundle/OSGiTestService.componentType
index 634c13b3cc..634c13b3cc 100644
--- a/branches/sca-java-1.5.2/itest/validation/src/main/resources/impl/osgi/CouldNotLocateOSGiBundle/OSGiTestService.componentType
+++ b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/impl/osgi/CouldNotLocateOSGiBundle/OSGiTestService.componentType
diff --git a/branches/sca-java-1.5.2/itest/validation/src/main/resources/impl/osgi/CouldNotLocateOSGiBundle/osgitest.composite b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/impl/osgi/CouldNotLocateOSGiBundle/osgitest.composite
index 0d1861f2f5..0d1861f2f5 100644
--- a/branches/sca-java-1.5.2/itest/validation/src/main/resources/impl/osgi/CouldNotLocateOSGiBundle/osgitest.composite
+++ b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/impl/osgi/CouldNotLocateOSGiBundle/osgitest.composite
diff --git a/branches/sca-java-1.5.2/itest/validation/src/main/resources/impl/osgi/MissingComponentTypeFile/osgitest.composite b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/impl/osgi/MissingComponentTypeFile/osgitest.composite
index 9b3adc4828..9b3adc4828 100644
--- a/branches/sca-java-1.5.2/itest/validation/src/main/resources/impl/osgi/MissingComponentTypeFile/osgitest.composite
+++ b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/impl/osgi/MissingComponentTypeFile/osgitest.composite
diff --git a/branches/sca-java-1.5.2/itest/validation/src/main/resources/impl/osgi/PropertyShouldSpecifySR/OSGiTestService.componentType b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/impl/osgi/PropertyShouldSpecifySR/OSGiTestService.componentType
index 634c13b3cc..634c13b3cc 100644
--- a/branches/sca-java-1.5.2/itest/validation/src/main/resources/impl/osgi/PropertyShouldSpecifySR/OSGiTestService.componentType
+++ b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/impl/osgi/PropertyShouldSpecifySR/OSGiTestService.componentType
diff --git a/branches/sca-java-1.5.2/itest/validation/src/main/resources/impl/osgi/PropertyShouldSpecifySR/osgitest.composite b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/impl/osgi/PropertyShouldSpecifySR/osgitest.composite
index 881c24854b..881c24854b 100644
--- a/branches/sca-java-1.5.2/itest/validation/src/main/resources/impl/osgi/PropertyShouldSpecifySR/osgitest.composite
+++ b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/impl/osgi/PropertyShouldSpecifySR/osgitest.composite
diff --git a/branches/sca-java-1.5.2/itest/validation/src/main/resources/impl/resource/CouldNotResolveLocation/resource.composite b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/impl/resource/CouldNotResolveLocation/resource.composite
index 4e680f1200..4e680f1200 100644
--- a/branches/sca-java-1.5.2/itest/validation/src/main/resources/impl/resource/CouldNotResolveLocation/resource.composite
+++ b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/impl/resource/CouldNotResolveLocation/resource.composite
diff --git a/branches/sca-java-1.5.2/itest/validation/src/main/resources/impl/resource/LocationAttributeMissing/resource.composite b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/impl/resource/LocationAttributeMissing/resource.composite
index e01643ed8f..e01643ed8f 100644
--- a/branches/sca-java-1.5.2/itest/validation/src/main/resources/impl/resource/LocationAttributeMissing/resource.composite
+++ b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/impl/resource/LocationAttributeMissing/resource.composite
diff --git a/branches/sca-java-1.5.2/itest/validation/src/main/resources/impl/spring/ContributionResolveException/SpringHelloWorld.composite b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/impl/spring/ContributionResolveException/SpringHelloWorld.composite
index d776882ed0..d776882ed0 100644
--- a/branches/sca-java-1.5.2/itest/validation/src/main/resources/impl/spring/ContributionResolveException/SpringHelloWorld.composite
+++ b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/impl/spring/ContributionResolveException/SpringHelloWorld.composite
diff --git a/branches/sca-java-1.5.2/itest/validation/src/main/resources/impl/spring/LocationAttributeMissing/SpringHelloWorld.composite b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/impl/spring/LocationAttributeMissing/SpringHelloWorld.composite
index 0d1ffc97e4..0d1ffc97e4 100644
--- a/branches/sca-java-1.5.2/itest/validation/src/main/resources/impl/spring/LocationAttributeMissing/SpringHelloWorld.composite
+++ b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/impl/spring/LocationAttributeMissing/SpringHelloWorld.composite
diff --git a/branches/sca-java-1.5.2/itest/validation/src/main/resources/impl/spring/UnableToResolveComponentType/SpringHelloWorld-context.xml b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/impl/spring/UnableToResolveComponentType/SpringHelloWorld-context.xml
index e69de29bb2..e69de29bb2 100644
--- a/branches/sca-java-1.5.2/itest/validation/src/main/resources/impl/spring/UnableToResolveComponentType/SpringHelloWorld-context.xml
+++ b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/impl/spring/UnableToResolveComponentType/SpringHelloWorld-context.xml
diff --git a/branches/sca-java-1.5.2/itest/validation/src/main/resources/impl/spring/UnableToResolveComponentType/SpringHelloWorld.composite b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/impl/spring/UnableToResolveComponentType/SpringHelloWorld.composite
index 99c529d77f..99c529d77f 100644
--- a/branches/sca-java-1.5.2/itest/validation/src/main/resources/impl/spring/UnableToResolveComponentType/SpringHelloWorld.composite
+++ b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/impl/spring/UnableToResolveComponentType/SpringHelloWorld.composite
diff --git a/branches/sca-java-1.5.2/itest/validation/src/main/resources/impl/spring/UnableToResolveComponentType/TestHelloWorldBean.componentType b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/impl/spring/UnableToResolveComponentType/TestHelloWorldBean.componentType
index c75f209b6d..c75f209b6d 100644
--- a/branches/sca-java-1.5.2/itest/validation/src/main/resources/impl/spring/UnableToResolveComponentType/TestHelloWorldBean.componentType
+++ b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/impl/spring/UnableToResolveComponentType/TestHelloWorldBean.componentType
diff --git a/branches/sca-java-1.5.2/itest/validation/src/main/resources/impl/widget/CouldNotResolveLocation/widget.composite b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/impl/widget/CouldNotResolveLocation/widget.composite
index a5874707da..a5874707da 100644
--- a/branches/sca-java-1.5.2/itest/validation/src/main/resources/impl/widget/CouldNotResolveLocation/widget.composite
+++ b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/impl/widget/CouldNotResolveLocation/widget.composite
diff --git a/branches/sca-java-1.5.2/itest/validation/src/main/resources/impl/widget/LocationAttributeMissing/widget.composite b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/impl/widget/LocationAttributeMissing/widget.composite
index 393b9fe674..393b9fe674 100644
--- a/branches/sca-java-1.5.2/itest/validation/src/main/resources/impl/widget/LocationAttributeMissing/widget.composite
+++ b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/impl/widget/LocationAttributeMissing/widget.composite
diff --git a/branches/sca-java-1.5.2/itest/validation/src/main/resources/impl/xquery/CouldNotLocateFile/HelloWorld.composite b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/impl/xquery/CouldNotLocateFile/HelloWorld.composite
index 1dca444938..1dca444938 100644
--- a/branches/sca-java-1.5.2/itest/validation/src/main/resources/impl/xquery/CouldNotLocateFile/HelloWorld.composite
+++ b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/impl/xquery/CouldNotLocateFile/HelloWorld.composite
diff --git a/branches/sca-java-1.5.2/itest/validation/src/main/resources/impl/xquery/LocationAttributeMissing/HelloWorld.composite b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/impl/xquery/LocationAttributeMissing/HelloWorld.composite
index 9a60183c5c..9a60183c5c 100644
--- a/branches/sca-java-1.5.2/itest/validation/src/main/resources/impl/xquery/LocationAttributeMissing/HelloWorld.composite
+++ b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/impl/xquery/LocationAttributeMissing/HelloWorld.composite
diff --git a/branches/sca-java-1.5.2/itest/validation/src/main/resources/interfacejava/xml/ClassNotFoundException/Calculator.composite b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/interfacejava/xml/ClassNotFoundException/Calculator.composite
index 70f91d1a7d..70f91d1a7d 100644
--- a/branches/sca-java-1.5.2/itest/validation/src/main/resources/interfacejava/xml/ClassNotFoundException/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/interfacejava/xml/ClassNotFoundException/Calculator.composite
diff --git a/branches/sca-java-1.5.2/itest/validation/src/main/resources/interfacejava/xml/ClassNotFoundException/CalculatorServiceImpl.componentType b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/interfacejava/xml/ClassNotFoundException/CalculatorServiceImpl.componentType
index bc7bf3f250..bc7bf3f250 100644
--- a/branches/sca-java-1.5.2/itest/validation/src/main/resources/interfacejava/xml/ClassNotFoundException/CalculatorServiceImpl.componentType
+++ b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/interfacejava/xml/ClassNotFoundException/CalculatorServiceImpl.componentType
diff --git a/branches/sca-java-1.5.2/itest/validation/src/main/resources/interfacejava/xml/ContributionResolveException/Calculator.composite b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/interfacejava/xml/ContributionResolveException/Calculator.composite
index a1a699fc75..a1a699fc75 100644
--- a/branches/sca-java-1.5.2/itest/validation/src/main/resources/interfacejava/xml/ContributionResolveException/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/interfacejava/xml/ContributionResolveException/Calculator.composite
diff --git a/branches/sca-java-1.5.2/itest/validation/src/main/resources/interfacejava/xml/ContributionResolveException/CalculatorServiceImpl.componentType b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/interfacejava/xml/ContributionResolveException/CalculatorServiceImpl.componentType
index 7446e4f06a..7446e4f06a 100644
--- a/branches/sca-java-1.5.2/itest/validation/src/main/resources/interfacejava/xml/ContributionResolveException/CalculatorServiceImpl.componentType
+++ b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/interfacejava/xml/ContributionResolveException/CalculatorServiceImpl.componentType
diff --git a/branches/sca-java-1.5.2/itest/validation/src/main/resources/interfacewsdl/xml/InvalidWSDLInterfaceAttr/Calculator.composite b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/interfacewsdl/xml/InvalidWSDLInterfaceAttr/Calculator.composite
index 0bbb10706e..0bbb10706e 100644
--- a/branches/sca-java-1.5.2/itest/validation/src/main/resources/interfacewsdl/xml/InvalidWSDLInterfaceAttr/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/interfacewsdl/xml/InvalidWSDLInterfaceAttr/Calculator.composite
diff --git a/branches/sca-java-1.5.2/itest/validation/src/main/resources/interfacewsdl/xml/InvalidWSDLInterfaceAttr/helloworld-interface.wsdl b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/interfacewsdl/xml/InvalidWSDLInterfaceAttr/helloworld-interface.wsdl
index 9d9376ad6c..9d9376ad6c 100644
--- a/branches/sca-java-1.5.2/itest/validation/src/main/resources/interfacewsdl/xml/InvalidWSDLInterfaceAttr/helloworld-interface.wsdl
+++ b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/interfacewsdl/xml/InvalidWSDLInterfaceAttr/helloworld-interface.wsdl
diff --git a/branches/sca-java-1.5.2/itest/validation/src/main/resources/interfacewsdl/xml/InvalidWSDLInterfaceAttr/helloworld-service.wsdl b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/interfacewsdl/xml/InvalidWSDLInterfaceAttr/helloworld-service.wsdl
index 3885357625..3885357625 100644
--- a/branches/sca-java-1.5.2/itest/validation/src/main/resources/interfacewsdl/xml/InvalidWSDLInterfaceAttr/helloworld-service.wsdl
+++ b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/interfacewsdl/xml/InvalidWSDLInterfaceAttr/helloworld-service.wsdl
diff --git a/branches/sca-java-1.5.2/itest/validation/src/main/resources/interfacewsdl/xml/WsdlInterfaceDoesNotMatch/helloworld.wsdl b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/interfacewsdl/xml/WsdlInterfaceDoesNotMatch/helloworld.wsdl
index 013a55b61e..013a55b61e 100644
--- a/branches/sca-java-1.5.2/itest/validation/src/main/resources/interfacewsdl/xml/WsdlInterfaceDoesNotMatch/helloworld.wsdl
+++ b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/interfacewsdl/xml/WsdlInterfaceDoesNotMatch/helloworld.wsdl
diff --git a/branches/sca-java-1.5.2/itest/validation/src/main/resources/interfacewsdl/xml/WsdlInterfaceDoesNotMatch/helloworldwsjms.composite b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/interfacewsdl/xml/WsdlInterfaceDoesNotMatch/helloworldwsjms.composite
index d9252ba54f..d9252ba54f 100644
--- a/branches/sca-java-1.5.2/itest/validation/src/main/resources/interfacewsdl/xml/WsdlInterfaceDoesNotMatch/helloworldwsjms.composite
+++ b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/interfacewsdl/xml/WsdlInterfaceDoesNotMatch/helloworldwsjms.composite
diff --git a/branches/sca-java-1.5.2/itest/validation/src/main/resources/policy/security/ClassNotFoundException/Calculator.composite b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/policy/security/ClassNotFoundException/Calculator.composite
index 48c3c5ffc0..48c3c5ffc0 100644
--- a/branches/sca-java-1.5.2/itest/validation/src/main/resources/policy/security/ClassNotFoundException/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/policy/security/ClassNotFoundException/Calculator.composite
diff --git a/branches/sca-java-1.5.2/itest/validation/src/main/resources/policy/security/ClassNotFoundException/definitions.xml b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/policy/security/ClassNotFoundException/definitions.xml
index 53d1a581f0..53d1a581f0 100644
--- a/branches/sca-java-1.5.2/itest/validation/src/main/resources/policy/security/ClassNotFoundException/definitions.xml
+++ b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/policy/security/ClassNotFoundException/definitions.xml
diff --git a/branches/sca-java-1.5.2/itest/validation/src/main/resources/policy/security/RequiredAttributeRolesMissing/Calculator.composite b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/policy/security/RequiredAttributeRolesMissing/Calculator.composite
index 48c3c5ffc0..48c3c5ffc0 100644
--- a/branches/sca-java-1.5.2/itest/validation/src/main/resources/policy/security/RequiredAttributeRolesMissing/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/policy/security/RequiredAttributeRolesMissing/Calculator.composite
diff --git a/branches/sca-java-1.5.2/itest/validation/src/main/resources/policy/security/RequiredAttributeRolesMissing/definitions.xml b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/policy/security/RequiredAttributeRolesMissing/definitions.xml
index ac45d95ce8..ac45d95ce8 100644
--- a/branches/sca-java-1.5.2/itest/validation/src/main/resources/policy/security/RequiredAttributeRolesMissing/definitions.xml
+++ b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/policy/security/RequiredAttributeRolesMissing/definitions.xml
diff --git a/branches/sca-java-1.5.2/itest/validation/src/main/resources/policy/xml/AlwaysProvidedIntentNotFound/Calculator.composite b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/policy/xml/AlwaysProvidedIntentNotFound/Calculator.composite
index 48c3c5ffc0..48c3c5ffc0 100644
--- a/branches/sca-java-1.5.2/itest/validation/src/main/resources/policy/xml/AlwaysProvidedIntentNotFound/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/policy/xml/AlwaysProvidedIntentNotFound/Calculator.composite
diff --git a/branches/sca-java-1.5.2/itest/validation/src/main/resources/policy/xml/AlwaysProvidedIntentNotFound/definitions.xml b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/policy/xml/AlwaysProvidedIntentNotFound/definitions.xml
index 5cf6963a96..5cf6963a96 100644
--- a/branches/sca-java-1.5.2/itest/validation/src/main/resources/policy/xml/AlwaysProvidedIntentNotFound/definitions.xml
+++ b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/policy/xml/AlwaysProvidedIntentNotFound/definitions.xml
diff --git a/branches/sca-java-1.5.2/itest/validation/src/main/resources/policy/xml/ErrorInPolicyIntentDefinition/Calculator.composite b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/policy/xml/ErrorInPolicyIntentDefinition/Calculator.composite
index 48c3c5ffc0..48c3c5ffc0 100644
--- a/branches/sca-java-1.5.2/itest/validation/src/main/resources/policy/xml/ErrorInPolicyIntentDefinition/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/policy/xml/ErrorInPolicyIntentDefinition/Calculator.composite
diff --git a/branches/sca-java-1.5.2/itest/validation/src/main/resources/policy/xml/ErrorInPolicyIntentDefinition/definitions.xml b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/policy/xml/ErrorInPolicyIntentDefinition/definitions.xml
index d31c705fb5..d31c705fb5 100644
--- a/branches/sca-java-1.5.2/itest/validation/src/main/resources/policy/xml/ErrorInPolicyIntentDefinition/definitions.xml
+++ b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/policy/xml/ErrorInPolicyIntentDefinition/definitions.xml
diff --git a/branches/sca-java-1.5.2/itest/validation/src/main/resources/policy/xml/IntentNotSpecified/Calculator.composite b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/policy/xml/IntentNotSpecified/Calculator.composite
index 48c3c5ffc0..48c3c5ffc0 100644
--- a/branches/sca-java-1.5.2/itest/validation/src/main/resources/policy/xml/IntentNotSpecified/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/policy/xml/IntentNotSpecified/Calculator.composite
diff --git a/branches/sca-java-1.5.2/itest/validation/src/main/resources/policy/xml/IntentNotSpecified/definitions.xml b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/policy/xml/IntentNotSpecified/definitions.xml
index d214a7f40a..d214a7f40a 100644
--- a/branches/sca-java-1.5.2/itest/validation/src/main/resources/policy/xml/IntentNotSpecified/definitions.xml
+++ b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/policy/xml/IntentNotSpecified/definitions.xml
diff --git a/branches/sca-java-1.5.2/itest/validation/src/main/resources/policy/xml/MayProvideIntentNotFound/Calculator.composite b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/policy/xml/MayProvideIntentNotFound/Calculator.composite
index 48c3c5ffc0..48c3c5ffc0 100644
--- a/branches/sca-java-1.5.2/itest/validation/src/main/resources/policy/xml/MayProvideIntentNotFound/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/policy/xml/MayProvideIntentNotFound/Calculator.composite
diff --git a/branches/sca-java-1.5.2/itest/validation/src/main/resources/policy/xml/MayProvideIntentNotFound/definitions.xml b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/policy/xml/MayProvideIntentNotFound/definitions.xml
index ede1786942..ede1786942 100644
--- a/branches/sca-java-1.5.2/itest/validation/src/main/resources/policy/xml/MayProvideIntentNotFound/definitions.xml
+++ b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/policy/xml/MayProvideIntentNotFound/definitions.xml
diff --git a/branches/sca-java-1.5.2/itest/validation/src/main/resources/policy/xml/RequiredAttributeMissing/Calculator.composite b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/policy/xml/RequiredAttributeMissing/Calculator.composite
index 48c3c5ffc0..48c3c5ffc0 100644
--- a/branches/sca-java-1.5.2/itest/validation/src/main/resources/policy/xml/RequiredAttributeMissing/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/policy/xml/RequiredAttributeMissing/Calculator.composite
diff --git a/branches/sca-java-1.5.2/itest/validation/src/main/resources/policy/xml/RequiredAttributeMissing/definitions.xml b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/policy/xml/RequiredAttributeMissing/definitions.xml
index fcb43c949b..fcb43c949b 100644
--- a/branches/sca-java-1.5.2/itest/validation/src/main/resources/policy/xml/RequiredAttributeMissing/definitions.xml
+++ b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/policy/xml/RequiredAttributeMissing/definitions.xml
diff --git a/branches/sca-java-1.5.2/itest/validation/src/main/resources/policy/xml/UnableToMapPolicies/Calculator.composite b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/policy/xml/UnableToMapPolicies/Calculator.composite
index 48c3c5ffc0..48c3c5ffc0 100644
--- a/branches/sca-java-1.5.2/itest/validation/src/main/resources/policy/xml/UnableToMapPolicies/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/policy/xml/UnableToMapPolicies/Calculator.composite
diff --git a/branches/sca-java-1.5.2/itest/validation/src/main/resources/policy/xml/UnableToMapPolicies/definitions.xml b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/policy/xml/UnableToMapPolicies/definitions.xml
index 8346dcc01a..8346dcc01a 100644
--- a/branches/sca-java-1.5.2/itest/validation/src/main/resources/policy/xml/UnableToMapPolicies/definitions.xml
+++ b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/policy/xml/UnableToMapPolicies/definitions.xml
diff --git a/branches/sca-java-1.5.2/itest/validation/src/main/resources/policy/xml/UnrecognizedIntentAttachPointType/Calculator.composite b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/policy/xml/UnrecognizedIntentAttachPointType/Calculator.composite
index 48c3c5ffc0..48c3c5ffc0 100644
--- a/branches/sca-java-1.5.2/itest/validation/src/main/resources/policy/xml/UnrecognizedIntentAttachPointType/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/policy/xml/UnrecognizedIntentAttachPointType/Calculator.composite
diff --git a/branches/sca-java-1.5.2/itest/validation/src/main/resources/policy/xml/UnrecognizedIntentAttachPointType/definitions.xml b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/policy/xml/UnrecognizedIntentAttachPointType/definitions.xml
index 60f4de5cd3..60f4de5cd3 100644
--- a/branches/sca-java-1.5.2/itest/validation/src/main/resources/policy/xml/UnrecognizedIntentAttachPointType/definitions.xml
+++ b/sca-java-1.x/branches/sca-java-1.5.2/itest/validation/src/main/resources/policy/xml/UnrecognizedIntentAttachPointType/definitions.xml