274 files changed, 0 insertions, 0 deletions

diff --git a/branches/sca-java-1.3.1/itest/validation/pom.xml b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/pom.xml
index 19339aa0cb..19339aa0cb 100644
--- a/branches/sca-java-1.3.1/itest/validation/pom.xml
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/pom.xml
diff --git a/branches/sca-java-1.3.1/itest/validation/src/main/java/binding/ejb/account/Customer.java b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/java/binding/ejb/account/Customer.java
index acb74c38ae..acb74c38ae 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/main/java/binding/ejb/account/Customer.java
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/java/binding/ejb/account/Customer.java
diff --git a/branches/sca-java-1.3.1/itest/validation/src/main/java/binding/ejb/account/CustomerImpl.java b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/java/binding/ejb/account/CustomerImpl.java
index 52ddfa9aba..52ddfa9aba 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/main/java/binding/ejb/account/CustomerImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/java/binding/ejb/account/CustomerImpl.java
diff --git a/branches/sca-java-1.3.1/itest/validation/src/main/java/binding/ejb/calculator/AddService.java b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/java/binding/ejb/calculator/AddService.java
index aec8998083..aec8998083 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/main/java/binding/ejb/calculator/AddService.java
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/java/binding/ejb/calculator/AddService.java
diff --git a/branches/sca-java-1.3.1/itest/validation/src/main/java/binding/ejb/calculator/AddServiceHome.java b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/java/binding/ejb/calculator/AddServiceHome.java
index 5df24b6379..5df24b6379 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/main/java/binding/ejb/calculator/AddServiceHome.java
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/java/binding/ejb/calculator/AddServiceHome.java
diff --git a/branches/sca-java-1.3.1/itest/validation/src/main/java/binding/jms/HelloWorldService.java b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/java/binding/jms/HelloWorldService.java
index 33bfe1d0ea..33bfe1d0ea 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/main/java/binding/jms/HelloWorldService.java
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/java/binding/jms/HelloWorldService.java
diff --git a/branches/sca-java-1.3.1/itest/validation/src/main/java/binding/jms/HelloWorldServiceImpl.java b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/java/binding/jms/HelloWorldServiceImpl.java
index a6a40b0ed1..a6a40b0ed1 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/main/java/binding/jms/HelloWorldServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/java/binding/jms/HelloWorldServiceImpl.java
diff --git a/branches/sca-java-1.3.1/itest/validation/src/main/java/calculator/warning/AddService.java b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/java/calculator/warning/AddService.java
index 35ba2cbfac..35ba2cbfac 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/main/java/calculator/warning/AddService.java
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/java/calculator/warning/AddService.java
diff --git a/branches/sca-java-1.3.1/itest/validation/src/main/java/calculator/warning/AddServiceImpl.java b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/java/calculator/warning/AddServiceImpl.java
index ef305370cc..ef305370cc 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/main/java/calculator/warning/AddServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/java/calculator/warning/AddServiceImpl.java
diff --git a/branches/sca-java-1.3.1/itest/validation/src/main/java/calculator/warning/AddServiceImplWithServiceName.java b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/java/calculator/warning/AddServiceImplWithServiceName.java
index aacde27842..aacde27842 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/main/java/calculator/warning/AddServiceImplWithServiceName.java
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/java/calculator/warning/AddServiceImplWithServiceName.java
diff --git a/branches/sca-java-1.3.1/itest/validation/src/main/java/calculator/warning/CalculatorClient.java b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/java/calculator/warning/CalculatorClient.java
index 185f17a5ca..185f17a5ca 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/main/java/calculator/warning/CalculatorClient.java
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/java/calculator/warning/CalculatorClient.java
diff --git a/branches/sca-java-1.3.1/itest/validation/src/main/java/calculator/warning/CalculatorService.java b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/java/calculator/warning/CalculatorService.java
index f472d6aaf6..f472d6aaf6 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/main/java/calculator/warning/CalculatorService.java
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/java/calculator/warning/CalculatorService.java
diff --git a/branches/sca-java-1.3.1/itest/validation/src/main/java/calculator/warning/CalculatorServiceImpl.java b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/java/calculator/warning/CalculatorServiceImpl.java
index 77aafe83de..77aafe83de 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/main/java/calculator/warning/CalculatorServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/java/calculator/warning/CalculatorServiceImpl.java
diff --git a/branches/sca-java-1.3.1/itest/validation/src/main/java/calculator/warning/DivideService.java b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/java/calculator/warning/DivideService.java
index a93d23e61c..a93d23e61c 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/main/java/calculator/warning/DivideService.java
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/java/calculator/warning/DivideService.java
diff --git a/branches/sca-java-1.3.1/itest/validation/src/main/java/calculator/warning/DivideServiceImpl.java b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/java/calculator/warning/DivideServiceImpl.java
index 080594034b..080594034b 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/main/java/calculator/warning/DivideServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/java/calculator/warning/DivideServiceImpl.java
diff --git a/branches/sca-java-1.3.1/itest/validation/src/main/java/calculator/warning/MultiplyService.java b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/java/calculator/warning/MultiplyService.java
index 20d48e93d5..20d48e93d5 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/main/java/calculator/warning/MultiplyService.java
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/java/calculator/warning/MultiplyService.java
diff --git a/branches/sca-java-1.3.1/itest/validation/src/main/java/calculator/warning/MultiplyServiceImpl.java b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/java/calculator/warning/MultiplyServiceImpl.java
index 96f0b55fa2..96f0b55fa2 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/main/java/calculator/warning/MultiplyServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/java/calculator/warning/MultiplyServiceImpl.java
diff --git a/branches/sca-java-1.3.1/itest/validation/src/main/java/calculator/warning/PropertyService.java b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/java/calculator/warning/PropertyService.java
index 4f1ccc96f8..4f1ccc96f8 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/main/java/calculator/warning/PropertyService.java
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/java/calculator/warning/PropertyService.java
diff --git a/branches/sca-java-1.3.1/itest/validation/src/main/java/calculator/warning/PropertyServiceImpl.java b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/java/calculator/warning/PropertyServiceImpl.java
index 429daf5f2d..429daf5f2d 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/main/java/calculator/warning/PropertyServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/java/calculator/warning/PropertyServiceImpl.java
diff --git a/branches/sca-java-1.3.1/itest/validation/src/main/java/calculator/warning/SubtractService.java b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/java/calculator/warning/SubtractService.java
index 40e382dc74..40e382dc74 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/main/java/calculator/warning/SubtractService.java
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/java/calculator/warning/SubtractService.java
diff --git a/branches/sca-java-1.3.1/itest/validation/src/main/java/calculator/warning/SubtractServiceImpl.java b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/java/calculator/warning/SubtractServiceImpl.java
index 8cdbe0813d..8cdbe0813d 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/main/java/calculator/warning/SubtractServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/java/calculator/warning/SubtractServiceImpl.java
diff --git a/branches/sca-java-1.3.1/itest/validation/src/main/java/calculator/warning/SubtractServiceImplWithServiceName.java b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/java/calculator/warning/SubtractServiceImplWithServiceName.java
index d5e9fcf020..d5e9fcf020 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/main/java/calculator/warning/SubtractServiceImplWithServiceName.java
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/java/calculator/warning/SubtractServiceImplWithServiceName.java
diff --git a/branches/sca-java-1.3.1/itest/validation/src/main/java/impl/java/AddService.java b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/java/impl/java/AddService.java
index 0db8ce4f5c..0db8ce4f5c 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/main/java/impl/java/AddService.java
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/java/impl/java/AddService.java
diff --git a/branches/sca-java-1.3.1/itest/validation/src/main/java/impl/java/AddServiceImpl.java b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/java/impl/java/AddServiceImpl.java
index 83f2685d54..83f2685d54 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/main/java/impl/java/AddServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/java/impl/java/AddServiceImpl.java
diff --git a/branches/sca-java-1.3.1/itest/validation/src/main/java/impl/java/CalculatorClient.java b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/java/impl/java/CalculatorClient.java
index e34ce3db26..e34ce3db26 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/main/java/impl/java/CalculatorClient.java
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/java/impl/java/CalculatorClient.java
diff --git a/branches/sca-java-1.3.1/itest/validation/src/main/java/impl/java/CalculatorService.java b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/java/impl/java/CalculatorService.java
index 5d583fd604..5d583fd604 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/main/java/impl/java/CalculatorService.java
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/java/impl/java/CalculatorService.java
diff --git a/branches/sca-java-1.3.1/itest/validation/src/main/java/impl/java/CalculatorServiceImpl.java b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/java/impl/java/CalculatorServiceImpl.java
index 0183e2a259..0183e2a259 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/main/java/impl/java/CalculatorServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/java/impl/java/CalculatorServiceImpl.java
diff --git a/branches/sca-java-1.3.1/itest/validation/src/main/java/impl/java/DivideService.java b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/java/impl/java/DivideService.java
index 85ebadc9a0..85ebadc9a0 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/main/java/impl/java/DivideService.java
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/java/impl/java/DivideService.java
diff --git a/branches/sca-java-1.3.1/itest/validation/src/main/java/impl/java/DivideServiceImpl.java b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/java/impl/java/DivideServiceImpl.java
index 863c298234..863c298234 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/main/java/impl/java/DivideServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/java/impl/java/DivideServiceImpl.java
diff --git a/branches/sca-java-1.3.1/itest/validation/src/main/java/impl/java/MultiplyService.java b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/java/impl/java/MultiplyService.java
index e1bf7fbddc..e1bf7fbddc 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/main/java/impl/java/MultiplyService.java
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/java/impl/java/MultiplyService.java
diff --git a/branches/sca-java-1.3.1/itest/validation/src/main/java/impl/java/MultiplyServiceImpl.java b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/java/impl/java/MultiplyServiceImpl.java
index 6346ea3582..6346ea3582 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/main/java/impl/java/MultiplyServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/java/impl/java/MultiplyServiceImpl.java
diff --git a/branches/sca-java-1.3.1/itest/validation/src/main/java/impl/java/SubtractService.java b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/java/impl/java/SubtractService.java
index 57759bb496..57759bb496 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/main/java/impl/java/SubtractService.java
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/java/impl/java/SubtractService.java
diff --git a/branches/sca-java-1.3.1/itest/validation/src/main/java/impl/java/SubtractServiceImpl.java b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/java/impl/java/SubtractServiceImpl.java
index 16e3e6a23d..16e3e6a23d 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/main/java/impl/java/SubtractServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/java/impl/java/SubtractServiceImpl.java
diff --git a/branches/sca-java-1.3.1/itest/validation/src/main/java/impl/osgi/OSGiTestImpl.java b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/java/impl/osgi/OSGiTestImpl.java
index 6f9df2c034..6f9df2c034 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/main/java/impl/osgi/OSGiTestImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/java/impl/osgi/OSGiTestImpl.java
diff --git a/branches/sca-java-1.3.1/itest/validation/src/main/java/impl/osgi/OSGiTestInterface.java b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/java/impl/osgi/OSGiTestInterface.java
index bafff878cd..bafff878cd 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/main/java/impl/osgi/OSGiTestInterface.java
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/java/impl/osgi/OSGiTestInterface.java
diff --git a/branches/sca-java-1.3.1/itest/validation/src/main/java/impl/osgi/OSGiTestWithPropertyImpl.java b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/java/impl/osgi/OSGiTestWithPropertyImpl.java
index e44d93e6be..e44d93e6be 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/main/java/impl/osgi/OSGiTestWithPropertyImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/java/impl/osgi/OSGiTestWithPropertyImpl.java
diff --git a/branches/sca-java-1.3.1/itest/validation/src/main/java/impl/spring/HelloWorld.java b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/java/impl/spring/HelloWorld.java
index ef0b491617..ef0b491617 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/main/java/impl/spring/HelloWorld.java
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/java/impl/spring/HelloWorld.java
diff --git a/branches/sca-java-1.3.1/itest/validation/src/main/java/impl/spring/HelloWorldProxy.java b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/java/impl/spring/HelloWorldProxy.java
index 2e3458f0d3..2e3458f0d3 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/main/java/impl/spring/HelloWorldProxy.java
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/java/impl/spring/HelloWorldProxy.java
diff --git a/branches/sca-java-1.3.1/itest/validation/src/main/java/impl/spring/TestHelloWorldBean.java b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/java/impl/spring/TestHelloWorldBean.java
index 87904f2a72..87904f2a72 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/main/java/impl/spring/TestHelloWorldBean.java
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/java/impl/spring/TestHelloWorldBean.java
diff --git a/branches/sca-java-1.3.1/itest/validation/src/main/java/interfacejava/xml/CalculatorService.java b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/java/interfacejava/xml/CalculatorService.java
index fa1a621f12..fa1a621f12 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/main/java/interfacejava/xml/CalculatorService.java
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/java/interfacejava/xml/CalculatorService.java
diff --git a/branches/sca-java-1.3.1/itest/validation/src/main/java/interfacejava/xml/CalculatorServiceImpl.java b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/java/interfacejava/xml/CalculatorServiceImpl.java
index ebf7a79589..ebf7a79589 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/main/java/interfacejava/xml/CalculatorServiceImpl.java
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/java/interfacejava/xml/CalculatorServiceImpl.java
diff --git a/branches/sca-java-1.3.1/itest/validation/src/main/resources/ComponentReferenceTargetNotFound/Calculator.composite b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/ComponentReferenceTargetNotFound/Calculator.composite
index b2e7da05a2..b2e7da05a2 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/main/resources/ComponentReferenceTargetNotFound/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/ComponentReferenceTargetNotFound/Calculator.composite
diff --git a/branches/sca-java-1.3.1/itest/validation/src/main/resources/DuplicateComponentName/Calculator.composite b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/DuplicateComponentName/Calculator.composite
index 4ba9f0724b..4ba9f0724b 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/main/resources/DuplicateComponentName/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/DuplicateComponentName/Calculator.composite
diff --git a/branches/sca-java-1.3.1/itest/validation/src/main/resources/DuplicateImplementationPropertyName/Calculator.composite b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/DuplicateImplementationPropertyName/Calculator.composite
index b935dd194a..b935dd194a 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/main/resources/DuplicateImplementationPropertyName/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/DuplicateImplementationPropertyName/Calculator.composite
diff --git a/branches/sca-java-1.3.1/itest/validation/src/main/resources/DuplicateImplementationPropertyName/dummyImplementation.composite b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/DuplicateImplementationPropertyName/dummyImplementation.composite
index 2b633f3139..2b633f3139 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/main/resources/DuplicateImplementationPropertyName/dummyImplementation.composite
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/DuplicateImplementationPropertyName/dummyImplementation.composite
diff --git a/branches/sca-java-1.3.1/itest/validation/src/main/resources/DuplicateImplementationReferenceName/Calculator.composite b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/DuplicateImplementationReferenceName/Calculator.composite
index 940e27a1e7..940e27a1e7 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/main/resources/DuplicateImplementationReferenceName/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/DuplicateImplementationReferenceName/Calculator.composite
diff --git a/branches/sca-java-1.3.1/itest/validation/src/main/resources/DuplicateImplementationReferenceName/dummyImplementation.composite b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/DuplicateImplementationReferenceName/dummyImplementation.composite
index 50d78cb2a6..50d78cb2a6 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/main/resources/DuplicateImplementationReferenceName/dummyImplementation.composite
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/DuplicateImplementationReferenceName/dummyImplementation.composite
diff --git a/branches/sca-java-1.3.1/itest/validation/src/main/resources/DuplicatePropertyName/Calculator.composite b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/DuplicatePropertyName/Calculator.composite
index bd788e47b8..bd788e47b8 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/main/resources/DuplicatePropertyName/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/DuplicatePropertyName/Calculator.composite
diff --git a/branches/sca-java-1.3.1/itest/validation/src/main/resources/DuplicateReferenceName/Calculator.composite b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/DuplicateReferenceName/Calculator.composite
index 7281878c0f..7281878c0f 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/main/resources/DuplicateReferenceName/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/DuplicateReferenceName/Calculator.composite
diff --git a/branches/sca-java-1.3.1/itest/validation/src/main/resources/META-INF/sca/SpringHelloWorld-context.xml b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/META-INF/sca/SpringHelloWorld-context.xml
index a37a01004e..a37a01004e 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/main/resources/META-INF/sca/SpringHelloWorld-context.xml
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/META-INF/sca/SpringHelloWorld-context.xml
diff --git a/branches/sca-java-1.3.1/itest/validation/src/main/resources/MultipleBindingsForService/Calculator.composite b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/MultipleBindingsForService/Calculator.composite
index 08e18decc1..08e18decc1 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/main/resources/MultipleBindingsForService/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/MultipleBindingsForService/Calculator.composite
diff --git a/branches/sca-java-1.3.1/itest/validation/src/main/resources/NoComponentImplementation/Calculator.composite b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/NoComponentImplementation/Calculator.composite
index 36e71e398b..36e71e398b 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/main/resources/NoComponentImplementation/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/NoComponentImplementation/Calculator.composite
diff --git a/branches/sca-java-1.3.1/itest/validation/src/main/resources/NoCompositeNamespace/Calculator.composite b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/NoCompositeNamespace/Calculator.composite
index 9a46e09363..9a46e09363 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/main/resources/NoCompositeNamespace/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/NoCompositeNamespace/Calculator.composite
diff --git a/branches/sca-java-1.3.1/itest/validation/src/main/resources/NoMatchingBinding/Calculator.composite b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/NoMatchingBinding/Calculator.composite
index b3ed5f98ba..b3ed5f98ba 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/main/resources/NoMatchingBinding/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/NoMatchingBinding/Calculator.composite
diff --git a/branches/sca-java-1.3.1/itest/validation/src/main/resources/PromotedReferenceNotFound/Calculator.composite b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/PromotedReferenceNotFound/Calculator.composite
index 462a95dd02..462a95dd02 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/main/resources/PromotedReferenceNotFound/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/PromotedReferenceNotFound/Calculator.composite
diff --git a/branches/sca-java-1.3.1/itest/validation/src/main/resources/PromotedServiceNotFound/Calculator.composite b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/PromotedServiceNotFound/Calculator.composite
index 4b6c44bd58..4b6c44bd58 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/main/resources/PromotedServiceNotFound/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/PromotedServiceNotFound/Calculator.composite
diff --git a/branches/sca-java-1.3.1/itest/validation/src/main/resources/PropertyAttribute/Calculator.composite b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/PropertyAttribute/Calculator.composite
index a397e3384c..a397e3384c 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/main/resources/PropertyAttribute/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/PropertyAttribute/Calculator.composite
diff --git a/branches/sca-java-1.3.1/itest/validation/src/main/resources/PropertyAttribute/CalculatorNullMustSupply.composite b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/PropertyAttribute/CalculatorNullMustSupply.composite
index 08fab865fa..08fab865fa 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/main/resources/PropertyAttribute/CalculatorNullMustSupply.composite
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/PropertyAttribute/CalculatorNullMustSupply.composite
diff --git a/branches/sca-java-1.3.1/itest/validation/src/main/resources/PropertyAttribute/CalculatorOverrideManyAttribute.composite b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/PropertyAttribute/CalculatorOverrideManyAttribute.composite
index 3a5f59b17c..3a5f59b17c 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/main/resources/PropertyAttribute/CalculatorOverrideManyAttribute.composite
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/PropertyAttribute/CalculatorOverrideManyAttribute.composite
diff --git a/branches/sca-java-1.3.1/itest/validation/src/main/resources/PropertyNotFound/Calculator.composite b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/PropertyNotFound/Calculator.composite
index 8221e41430..8221e41430 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/main/resources/PropertyNotFound/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/PropertyNotFound/Calculator.composite
diff --git a/branches/sca-java-1.3.1/itest/validation/src/main/resources/ReferenceIncompatibleComponentInterface/Calculator.composite b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/ReferenceIncompatibleComponentInterface/Calculator.composite
index 9c5ae7027f..9c5ae7027f 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/main/resources/ReferenceIncompatibleComponentInterface/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/ReferenceIncompatibleComponentInterface/Calculator.composite
diff --git a/branches/sca-java-1.3.1/itest/validation/src/main/resources/ReferenceIncompatibleInterface/Calculator.composite b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/ReferenceIncompatibleInterface/Calculator.composite
index 3c85ed32e2..3c85ed32e2 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/main/resources/ReferenceIncompatibleInterface/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/ReferenceIncompatibleInterface/Calculator.composite
diff --git a/branches/sca-java-1.3.1/itest/validation/src/main/resources/ReferenceIncompatibleMultiplicity/Calculator.composite b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/ReferenceIncompatibleMultiplicity/Calculator.composite
index 2d1a1e01f0..2d1a1e01f0 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/main/resources/ReferenceIncompatibleMultiplicity/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/ReferenceIncompatibleMultiplicity/Calculator.composite
diff --git a/branches/sca-java-1.3.1/itest/validation/src/main/resources/ReferenceNotFound/Calculator.composite b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/ReferenceNotFound/Calculator.composite
index efb457ac9e..efb457ac9e 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/main/resources/ReferenceNotFound/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/ReferenceNotFound/Calculator.composite
diff --git a/branches/sca-java-1.3.1/itest/validation/src/main/resources/ReferenceWithoutTargets/Calculator.composite b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/ReferenceWithoutTargets/Calculator.composite
index a5beaf4ec9..a5beaf4ec9 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/main/resources/ReferenceWithoutTargets/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/ReferenceWithoutTargets/Calculator.composite
diff --git a/branches/sca-java-1.3.1/itest/validation/src/main/resources/ServiceNotFoundForComponentService/Calculator.composite b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/ServiceNotFoundForComponentService/Calculator.composite
index 06c3eeeaca..06c3eeeaca 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/main/resources/ServiceNotFoundForComponentService/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/ServiceNotFoundForComponentService/Calculator.composite
diff --git a/branches/sca-java-1.3.1/itest/validation/src/main/resources/UnresolvedComponentImplementation/Calculator.composite b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/UnresolvedComponentImplementation/Calculator.composite
index 821ce570c8..821ce570c8 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/main/resources/UnresolvedComponentImplementation/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/UnresolvedComponentImplementation/Calculator.composite
diff --git a/branches/sca-java-1.3.1/itest/validation/src/main/resources/XsdValidation/Calculator.composite b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/XsdValidation/Calculator.composite
index 63ccaa9957..63ccaa9957 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/main/resources/XsdValidation/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/XsdValidation/Calculator.composite
diff --git a/branches/sca-java-1.3.1/itest/validation/src/main/resources/assemblyxml/ContributionReadException/Calculator.composite b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/assemblyxml/ContributionReadException/Calculator.composite
index da565081f3..da565081f3 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/main/resources/assemblyxml/ContributionReadException/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/assemblyxml/ContributionReadException/Calculator.composite
diff --git a/branches/sca-java-1.3.1/itest/validation/src/main/resources/assemblyxml/PolicyImplValidationException/Calculator.composite b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/assemblyxml/PolicyImplValidationException/Calculator.composite
index 6153d40c3d..6153d40c3d 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/main/resources/assemblyxml/PolicyImplValidationException/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/assemblyxml/PolicyImplValidationException/Calculator.composite
diff --git a/branches/sca-java-1.3.1/itest/validation/src/main/resources/assemblyxml/PolicyServiceValidationException/Calculator.composite b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/assemblyxml/PolicyServiceValidationException/Calculator.composite
index a3eb60bf58..a3eb60bf58 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/main/resources/assemblyxml/PolicyServiceValidationException/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/assemblyxml/PolicyServiceValidationException/Calculator.composite
diff --git a/branches/sca-java-1.3.1/itest/validation/src/main/resources/assemblyxml/UnexpectedBindingElement/Calculator.composite b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/assemblyxml/UnexpectedBindingElement/Calculator.composite
index 6233d47d8d..6233d47d8d 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/main/resources/assemblyxml/UnexpectedBindingElement/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/assemblyxml/UnexpectedBindingElement/Calculator.composite
diff --git a/branches/sca-java-1.3.1/itest/validation/src/main/resources/assemblyxml/UnexpectedImplementationElement/Calculator.composite b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/assemblyxml/UnexpectedImplementationElement/Calculator.composite
index 6a9af9e070..6a9af9e070 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/main/resources/assemblyxml/UnexpectedImplementationElement/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/assemblyxml/UnexpectedImplementationElement/Calculator.composite
diff --git a/branches/sca-java-1.3.1/itest/validation/src/main/resources/assemblyxml/UnexpectedInterfaceElement/Calculator.composite b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/assemblyxml/UnexpectedInterfaceElement/Calculator.composite
index 49b26c78f8..49b26c78f8 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/main/resources/assemblyxml/UnexpectedInterfaceElement/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/assemblyxml/UnexpectedInterfaceElement/Calculator.composite
diff --git a/branches/sca-java-1.3.1/itest/validation/src/main/resources/binding/wsxml/InvalidWsdlElementAttr/Calculator.composite b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/binding/wsxml/InvalidWsdlElementAttr/Calculator.composite
index c34a160b61..c34a160b61 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/main/resources/binding/wsxml/InvalidWsdlElementAttr/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/binding/wsxml/InvalidWsdlElementAttr/Calculator.composite
diff --git a/branches/sca-java-1.3.1/itest/validation/src/main/resources/binding/wsxml/MustUseWsdlBinding/Calculator.composite b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/binding/wsxml/MustUseWsdlBinding/Calculator.composite
index 293c4d725d..293c4d725d 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/main/resources/binding/wsxml/MustUseWsdlBinding/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/binding/wsxml/MustUseWsdlBinding/Calculator.composite
diff --git a/branches/sca-java-1.3.1/itest/validation/src/main/resources/binding/wsxml/WsdlBindingDoesNotMatch/helloworld.wsdl b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/binding/wsxml/WsdlBindingDoesNotMatch/helloworld.wsdl
index 013a55b61e..013a55b61e 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/main/resources/binding/wsxml/WsdlBindingDoesNotMatch/helloworld.wsdl
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/binding/wsxml/WsdlBindingDoesNotMatch/helloworld.wsdl
diff --git a/branches/sca-java-1.3.1/itest/validation/src/main/resources/binding/wsxml/WsdlBindingDoesNotMatch/helloworldwsjms.composite b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/binding/wsxml/WsdlBindingDoesNotMatch/helloworldwsjms.composite
index b7ff1e304f..b7ff1e304f 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/main/resources/binding/wsxml/WsdlBindingDoesNotMatch/helloworldwsjms.composite
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/binding/wsxml/WsdlBindingDoesNotMatch/helloworldwsjms.composite
diff --git a/branches/sca-java-1.3.1/itest/validation/src/main/resources/binding/wsxml/WsdlServiceDoesNotMatch/helloworld.wsdl b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/binding/wsxml/WsdlServiceDoesNotMatch/helloworld.wsdl
index 013a55b61e..013a55b61e 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/main/resources/binding/wsxml/WsdlServiceDoesNotMatch/helloworld.wsdl
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/binding/wsxml/WsdlServiceDoesNotMatch/helloworld.wsdl
diff --git a/branches/sca-java-1.3.1/itest/validation/src/main/resources/binding/wsxml/WsdlServiceDoesNotMatch/helloworldwsjms.composite b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/binding/wsxml/WsdlServiceDoesNotMatch/helloworldwsjms.composite
index 8cda0b007e..8cda0b007e 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/main/resources/binding/wsxml/WsdlServiceDoesNotMatch/helloworldwsjms.composite
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/binding/wsxml/WsdlServiceDoesNotMatch/helloworldwsjms.composite
diff --git a/branches/sca-java-1.3.1/itest/validation/src/main/resources/bindingejb/UnknownEJBSessionType/account.composite b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/bindingejb/UnknownEJBSessionType/account.composite
index 781319d619..781319d619 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/main/resources/bindingejb/UnknownEJBSessionType/account.composite
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/bindingejb/UnknownEJBSessionType/account.composite
diff --git a/branches/sca-java-1.3.1/itest/validation/src/main/resources/bindingejb/UnknownEJBVersion/account.composite b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/bindingejb/UnknownEJBVersion/account.composite
index 8a0dfac98b..8a0dfac98b 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/main/resources/bindingejb/UnknownEJBVersion/account.composite
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/bindingejb/UnknownEJBVersion/account.composite
diff --git a/branches/sca-java-1.3.1/itest/validation/src/main/resources/bindingjms/DoesntProcessActivationSpec/service.composite b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/bindingjms/DoesntProcessActivationSpec/service.composite
index fcfe408582..fcfe408582 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/main/resources/bindingjms/DoesntProcessActivationSpec/service.composite
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/bindingjms/DoesntProcessActivationSpec/service.composite
diff --git a/branches/sca-java-1.3.1/itest/validation/src/main/resources/bindingjms/DoesntProcessDestinationType/service.composite b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/bindingjms/DoesntProcessDestinationType/service.composite
index ede3b3fd40..ede3b3fd40 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/main/resources/bindingjms/DoesntProcessDestinationType/service.composite
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/bindingjms/DoesntProcessDestinationType/service.composite
diff --git a/branches/sca-java-1.3.1/itest/validation/src/main/resources/bindingjms/DoesntProcessHeaders/service.composite b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/bindingjms/DoesntProcessHeaders/service.composite
index a8c89a0bf5..a8c89a0bf5 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/main/resources/bindingjms/DoesntProcessHeaders/service.composite
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/bindingjms/DoesntProcessHeaders/service.composite
diff --git a/branches/sca-java-1.3.1/itest/validation/src/main/resources/bindingjms/DoesntProcessResourceAdapter/service.composite b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/bindingjms/DoesntProcessResourceAdapter/service.composite
index b4e56d1789..b4e56d1789 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/main/resources/bindingjms/DoesntProcessResourceAdapter/service.composite
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/bindingjms/DoesntProcessResourceAdapter/service.composite
diff --git a/branches/sca-java-1.3.1/itest/validation/src/main/resources/bindingjms/DoesntProcessResponseActivationSpec/service.composite b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/bindingjms/DoesntProcessResponseActivationSpec/service.composite
index e68eb75d64..e68eb75d64 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/main/resources/bindingjms/DoesntProcessResponseActivationSpec/service.composite
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/bindingjms/DoesntProcessResponseActivationSpec/service.composite
diff --git a/branches/sca-java-1.3.1/itest/validation/src/main/resources/bindingjms/DoesntProcessResponseConnectionFactory/service.composite b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/bindingjms/DoesntProcessResponseConnectionFactory/service.composite
index 00c7a3f86b..00c7a3f86b 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/main/resources/bindingjms/DoesntProcessResponseConnectionFactory/service.composite
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/bindingjms/DoesntProcessResponseConnectionFactory/service.composite
diff --git a/branches/sca-java-1.3.1/itest/validation/src/main/resources/bindingjms/DoesntProcessResponseDestinationType/service.composite b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/bindingjms/DoesntProcessResponseDestinationType/service.composite
index d656d47cfd..d656d47cfd 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/main/resources/bindingjms/DoesntProcessResponseDestinationType/service.composite
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/bindingjms/DoesntProcessResponseDestinationType/service.composite
diff --git a/branches/sca-java-1.3.1/itest/validation/src/main/resources/bindingjms/InvalidCorrelationScheme/service.composite b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/bindingjms/InvalidCorrelationScheme/service.composite
index ad1daacfcf..ad1daacfcf 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/main/resources/bindingjms/InvalidCorrelationScheme/service.composite
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/bindingjms/InvalidCorrelationScheme/service.composite
diff --git a/branches/sca-java-1.3.1/itest/validation/src/main/resources/bindingjms/InvalidResponseDestinationType/service.composite b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/bindingjms/InvalidResponseDestinationType/service.composite
index fb35f5d1b8..fb35f5d1b8 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/main/resources/bindingjms/InvalidResponseDestinationType/service.composite
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/bindingjms/InvalidResponseDestinationType/service.composite
diff --git a/branches/sca-java-1.3.1/itest/validation/src/main/resources/bindingjms/MissingActivationSpecName/service.composite b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/bindingjms/MissingActivationSpecName/service.composite
index fcdf25455c..fcdf25455c 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/main/resources/bindingjms/MissingActivationSpecName/service.composite
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/bindingjms/MissingActivationSpecName/service.composite
diff --git a/branches/sca-java-1.3.1/itest/validation/src/main/resources/bindingjms/MissingConnectionFactoryName/service.composite b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/bindingjms/MissingConnectionFactoryName/service.composite
index 14f1314a1b..14f1314a1b 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/main/resources/bindingjms/MissingConnectionFactoryName/service.composite
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/bindingjms/MissingConnectionFactoryName/service.composite
diff --git a/branches/sca-java-1.3.1/itest/validation/src/main/resources/bindingjms/MissingResponseActivationSpec/service.composite b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/bindingjms/MissingResponseActivationSpec/service.composite
index 1a3cb21ac6..1a3cb21ac6 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/main/resources/bindingjms/MissingResponseActivationSpec/service.composite
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/bindingjms/MissingResponseActivationSpec/service.composite
diff --git a/branches/sca-java-1.3.1/itest/validation/src/main/resources/bindingjms/MissingResponseConnectionFactory/service.composite b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/bindingjms/MissingResponseConnectionFactory/service.composite
index 80b8f9d938..80b8f9d938 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/main/resources/bindingjms/MissingResponseConnectionFactory/service.composite
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/bindingjms/MissingResponseConnectionFactory/service.composite
diff --git a/branches/sca-java-1.3.1/itest/validation/src/main/resources/bindingjms/MustStartWithSchema/service.composite b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/bindingjms/MustStartWithSchema/service.composite
index 8fd1e2f554..8fd1e2f554 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/main/resources/bindingjms/MustStartWithSchema/service.composite
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/bindingjms/MustStartWithSchema/service.composite
diff --git a/branches/sca-java-1.3.1/itest/validation/src/main/resources/bindingjms/UnexpectedElement/service.composite b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/bindingjms/UnexpectedElement/service.composite
index b74682e1bd..b74682e1bd 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/main/resources/bindingjms/UnexpectedElement/service.composite
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/bindingjms/UnexpectedElement/service.composite
diff --git a/branches/sca-java-1.3.1/itest/validation/src/main/resources/bindingjms/UnexpectedResponseElement/service.composite b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/bindingjms/UnexpectedResponseElement/service.composite
index f439ab6260..f439ab6260 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/main/resources/bindingjms/UnexpectedResponseElement/service.composite
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/bindingjms/UnexpectedResponseElement/service.composite
diff --git a/branches/sca-java-1.3.1/itest/validation/src/main/resources/bindingjms/UnknownTokenInURI/service.composite b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/bindingjms/UnknownTokenInURI/service.composite
index e22f30152e..e22f30152e 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/main/resources/bindingjms/UnknownTokenInURI/service.composite
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/bindingjms/UnknownTokenInURI/service.composite
diff --git a/branches/sca-java-1.3.1/itest/validation/src/main/resources/contribution/java/AttributePackageMissing/Calculator.composite b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/contribution/java/AttributePackageMissing/Calculator.composite
index 6ef7558d95..6ef7558d95 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/main/resources/contribution/java/AttributePackageMissing/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/contribution/java/AttributePackageMissing/Calculator.composite
diff --git a/branches/sca-java-1.3.1/itest/validation/src/main/resources/contribution/namespace/AttributeNameSpaceMissing/Calculator.composite b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/contribution/namespace/AttributeNameSpaceMissing/Calculator.composite
index 77a2715373..77a2715373 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/main/resources/contribution/namespace/AttributeNameSpaceMissing/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/contribution/namespace/AttributeNameSpaceMissing/Calculator.composite
diff --git a/branches/sca-java-1.3.1/itest/validation/src/main/resources/contribution/resource/AttributeURIMissing/Calculator.composite b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/contribution/resource/AttributeURIMissing/Calculator.composite
index d7fa82635e..d7fa82635e 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/main/resources/contribution/resource/AttributeURIMissing/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/contribution/resource/AttributeURIMissing/Calculator.composite
diff --git a/branches/sca-java-1.3.1/itest/validation/src/main/resources/contribution/xml/AttributeCompositeMissing/Calculator.composite b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/contribution/xml/AttributeCompositeMissing/Calculator.composite
index 70f91d1a7d..70f91d1a7d 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/main/resources/contribution/xml/AttributeCompositeMissing/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/contribution/xml/AttributeCompositeMissing/Calculator.composite
diff --git a/branches/sca-java-1.3.1/itest/validation/src/main/resources/contribution/xml/AttributeCompositeMissing/sca-contribution.xml b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/contribution/xml/AttributeCompositeMissing/sca-contribution.xml
index 7f5eb546e0..7f5eb546e0 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/main/resources/contribution/xml/AttributeCompositeMissing/sca-contribution.xml
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/contribution/xml/AttributeCompositeMissing/sca-contribution.xml
diff --git a/branches/sca-java-1.3.1/itest/validation/src/main/resources/impl/bpel/AttributeUnrecognizedNamespace/helloworld.composite b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/impl/bpel/AttributeUnrecognizedNamespace/helloworld.composite
index 0dfe52985a..0dfe52985a 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/main/resources/impl/bpel/AttributeUnrecognizedNamespace/helloworld.composite
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/impl/bpel/AttributeUnrecognizedNamespace/helloworld.composite
diff --git a/branches/sca-java-1.3.1/itest/validation/src/main/resources/impl/bpel/AttributeWithoutNamespace/helloworld.composite b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/impl/bpel/AttributeWithoutNamespace/helloworld.composite
index d3f249720d..d3f249720d 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/main/resources/impl/bpel/AttributeWithoutNamespace/helloworld.composite
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/impl/bpel/AttributeWithoutNamespace/helloworld.composite
diff --git a/branches/sca-java-1.3.1/itest/validation/src/main/resources/impl/bpel/BPELProcessNotFound/deploy.xml b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/impl/bpel/BPELProcessNotFound/deploy.xml
index 571aa37d58..571aa37d58 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/main/resources/impl/bpel/BPELProcessNotFound/deploy.xml
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/impl/bpel/BPELProcessNotFound/deploy.xml
diff --git a/branches/sca-java-1.3.1/itest/validation/src/main/resources/impl/bpel/BPELProcessNotFound/helloworld.bpel b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/impl/bpel/BPELProcessNotFound/helloworld.bpel
index a8eb389704..a8eb389704 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/main/resources/impl/bpel/BPELProcessNotFound/helloworld.bpel
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/impl/bpel/BPELProcessNotFound/helloworld.bpel
diff --git a/branches/sca-java-1.3.1/itest/validation/src/main/resources/impl/bpel/BPELProcessNotFound/helloworld.componentType b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/impl/bpel/BPELProcessNotFound/helloworld.componentType
index 2b360111cb..2b360111cb 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/main/resources/impl/bpel/BPELProcessNotFound/helloworld.componentType
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/impl/bpel/BPELProcessNotFound/helloworld.componentType
diff --git a/branches/sca-java-1.3.1/itest/validation/src/main/resources/impl/bpel/BPELProcessNotFound/helloworld.composite b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/impl/bpel/BPELProcessNotFound/helloworld.composite
index 575927a5de..575927a5de 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/main/resources/impl/bpel/BPELProcessNotFound/helloworld.composite
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/impl/bpel/BPELProcessNotFound/helloworld.composite
diff --git a/branches/sca-java-1.3.1/itest/validation/src/main/resources/impl/bpel/BPELProcessNotFound/helloworld.wsdl b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/impl/bpel/BPELProcessNotFound/helloworld.wsdl
index 46cf381577..46cf381577 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/main/resources/impl/bpel/BPELProcessNotFound/helloworld.wsdl
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/impl/bpel/BPELProcessNotFound/helloworld.wsdl
diff --git a/branches/sca-java-1.3.1/itest/validation/src/main/resources/impl/bpel/CannotResolveWSDLReference/deploy.xml b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/impl/bpel/CannotResolveWSDLReference/deploy.xml
index 571aa37d58..571aa37d58 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/main/resources/impl/bpel/CannotResolveWSDLReference/deploy.xml
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/impl/bpel/CannotResolveWSDLReference/deploy.xml
diff --git a/branches/sca-java-1.3.1/itest/validation/src/main/resources/impl/bpel/CannotResolveWSDLReference/helloworld.bpel b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/impl/bpel/CannotResolveWSDLReference/helloworld.bpel
index a8eb389704..a8eb389704 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/main/resources/impl/bpel/CannotResolveWSDLReference/helloworld.bpel
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/impl/bpel/CannotResolveWSDLReference/helloworld.bpel
diff --git a/branches/sca-java-1.3.1/itest/validation/src/main/resources/impl/bpel/CannotResolveWSDLReference/helloworld.componentType b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/impl/bpel/CannotResolveWSDLReference/helloworld.componentType
index 2b360111cb..2b360111cb 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/main/resources/impl/bpel/CannotResolveWSDLReference/helloworld.componentType
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/impl/bpel/CannotResolveWSDLReference/helloworld.componentType
diff --git a/branches/sca-java-1.3.1/itest/validation/src/main/resources/impl/bpel/CannotResolveWSDLReference/helloworld.composite b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/impl/bpel/CannotResolveWSDLReference/helloworld.composite
index b4623b5c2d..b4623b5c2d 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/main/resources/impl/bpel/CannotResolveWSDLReference/helloworld.composite
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/impl/bpel/CannotResolveWSDLReference/helloworld.composite
diff --git a/branches/sca-java-1.3.1/itest/validation/src/main/resources/impl/bpel/MyRolePartnerRoleNull/deploy.xml b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/impl/bpel/MyRolePartnerRoleNull/deploy.xml
index 571aa37d58..571aa37d58 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/main/resources/impl/bpel/MyRolePartnerRoleNull/deploy.xml
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/impl/bpel/MyRolePartnerRoleNull/deploy.xml
diff --git a/branches/sca-java-1.3.1/itest/validation/src/main/resources/impl/bpel/MyRolePartnerRoleNull/helloworld.bpel b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/impl/bpel/MyRolePartnerRoleNull/helloworld.bpel
index 973d1f618a..973d1f618a 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/main/resources/impl/bpel/MyRolePartnerRoleNull/helloworld.bpel
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/impl/bpel/MyRolePartnerRoleNull/helloworld.bpel
diff --git a/branches/sca-java-1.3.1/itest/validation/src/main/resources/impl/bpel/MyRolePartnerRoleNull/helloworld.componentType b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/impl/bpel/MyRolePartnerRoleNull/helloworld.componentType
index 2b360111cb..2b360111cb 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/main/resources/impl/bpel/MyRolePartnerRoleNull/helloworld.componentType
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/impl/bpel/MyRolePartnerRoleNull/helloworld.componentType
diff --git a/branches/sca-java-1.3.1/itest/validation/src/main/resources/impl/bpel/MyRolePartnerRoleNull/helloworld.composite b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/impl/bpel/MyRolePartnerRoleNull/helloworld.composite
index b4623b5c2d..b4623b5c2d 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/main/resources/impl/bpel/MyRolePartnerRoleNull/helloworld.composite
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/impl/bpel/MyRolePartnerRoleNull/helloworld.composite
diff --git a/branches/sca-java-1.3.1/itest/validation/src/main/resources/impl/bpel/MyRolePartnerRoleNull/helloworld.wsdl b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/impl/bpel/MyRolePartnerRoleNull/helloworld.wsdl
index 46cf381577..46cf381577 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/main/resources/impl/bpel/MyRolePartnerRoleNull/helloworld.wsdl
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/impl/bpel/MyRolePartnerRoleNull/helloworld.wsdl
diff --git a/branches/sca-java-1.3.1/itest/validation/src/main/resources/impl/bpel/PartnerLinkHasBothAttr/deploy.xml b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/impl/bpel/PartnerLinkHasBothAttr/deploy.xml
index 571aa37d58..571aa37d58 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/main/resources/impl/bpel/PartnerLinkHasBothAttr/deploy.xml
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/impl/bpel/PartnerLinkHasBothAttr/deploy.xml
diff --git a/branches/sca-java-1.3.1/itest/validation/src/main/resources/impl/bpel/PartnerLinkHasBothAttr/helloworld.bpel b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/impl/bpel/PartnerLinkHasBothAttr/helloworld.bpel
index 5d2aeddc3d..5d2aeddc3d 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/main/resources/impl/bpel/PartnerLinkHasBothAttr/helloworld.bpel
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/impl/bpel/PartnerLinkHasBothAttr/helloworld.bpel
diff --git a/branches/sca-java-1.3.1/itest/validation/src/main/resources/impl/bpel/PartnerLinkHasBothAttr/helloworld.componentType b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/impl/bpel/PartnerLinkHasBothAttr/helloworld.componentType
index 077df56290..077df56290 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/main/resources/impl/bpel/PartnerLinkHasBothAttr/helloworld.componentType
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/impl/bpel/PartnerLinkHasBothAttr/helloworld.componentType
diff --git a/branches/sca-java-1.3.1/itest/validation/src/main/resources/impl/bpel/PartnerLinkHasBothAttr/helloworld.composite b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/impl/bpel/PartnerLinkHasBothAttr/helloworld.composite
index b4623b5c2d..b4623b5c2d 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/main/resources/impl/bpel/PartnerLinkHasBothAttr/helloworld.composite
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/impl/bpel/PartnerLinkHasBothAttr/helloworld.composite
diff --git a/branches/sca-java-1.3.1/itest/validation/src/main/resources/impl/bpel/PartnerLinkHasBothAttr/helloworld.wsdl b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/impl/bpel/PartnerLinkHasBothAttr/helloworld.wsdl
index 46cf381577..46cf381577 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/main/resources/impl/bpel/PartnerLinkHasBothAttr/helloworld.wsdl
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/impl/bpel/PartnerLinkHasBothAttr/helloworld.wsdl
diff --git a/branches/sca-java-1.3.1/itest/validation/src/main/resources/impl/bpel/PartnerLinkNoMatchingType/deploy.xml b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/impl/bpel/PartnerLinkNoMatchingType/deploy.xml
index 571aa37d58..571aa37d58 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/main/resources/impl/bpel/PartnerLinkNoMatchingType/deploy.xml
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/impl/bpel/PartnerLinkNoMatchingType/deploy.xml
diff --git a/branches/sca-java-1.3.1/itest/validation/src/main/resources/impl/bpel/PartnerLinkNoMatchingType/helloworld.bpel b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/impl/bpel/PartnerLinkNoMatchingType/helloworld.bpel
index 68df3156a8..68df3156a8 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/main/resources/impl/bpel/PartnerLinkNoMatchingType/helloworld.bpel
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/impl/bpel/PartnerLinkNoMatchingType/helloworld.bpel
diff --git a/branches/sca-java-1.3.1/itest/validation/src/main/resources/impl/bpel/PartnerLinkNoMatchingType/helloworld.componentType b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/impl/bpel/PartnerLinkNoMatchingType/helloworld.componentType
index 2b360111cb..2b360111cb 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/main/resources/impl/bpel/PartnerLinkNoMatchingType/helloworld.componentType
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/impl/bpel/PartnerLinkNoMatchingType/helloworld.componentType
diff --git a/branches/sca-java-1.3.1/itest/validation/src/main/resources/impl/bpel/PartnerLinkNoMatchingType/helloworld.composite b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/impl/bpel/PartnerLinkNoMatchingType/helloworld.composite
index b4623b5c2d..b4623b5c2d 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/main/resources/impl/bpel/PartnerLinkNoMatchingType/helloworld.composite
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/impl/bpel/PartnerLinkNoMatchingType/helloworld.composite
diff --git a/branches/sca-java-1.3.1/itest/validation/src/main/resources/impl/bpel/PartnerLinkNoMatchingType/helloworld.wsdl b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/impl/bpel/PartnerLinkNoMatchingType/helloworld.wsdl
index 46cf381577..46cf381577 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/main/resources/impl/bpel/PartnerLinkNoMatchingType/helloworld.wsdl
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/impl/bpel/PartnerLinkNoMatchingType/helloworld.wsdl
diff --git a/branches/sca-java-1.3.1/itest/validation/src/main/resources/impl/bpel/PartnerLinkTypeNoRoles/deploy.xml b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/impl/bpel/PartnerLinkTypeNoRoles/deploy.xml
index 571aa37d58..571aa37d58 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/main/resources/impl/bpel/PartnerLinkTypeNoRoles/deploy.xml
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/impl/bpel/PartnerLinkTypeNoRoles/deploy.xml
diff --git a/branches/sca-java-1.3.1/itest/validation/src/main/resources/impl/bpel/PartnerLinkTypeNoRoles/helloworld.bpel b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/impl/bpel/PartnerLinkTypeNoRoles/helloworld.bpel
index a8eb389704..a8eb389704 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/main/resources/impl/bpel/PartnerLinkTypeNoRoles/helloworld.bpel
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/impl/bpel/PartnerLinkTypeNoRoles/helloworld.bpel
diff --git a/branches/sca-java-1.3.1/itest/validation/src/main/resources/impl/bpel/PartnerLinkTypeNoRoles/helloworld.componentType b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/impl/bpel/PartnerLinkTypeNoRoles/helloworld.componentType
index 2b360111cb..2b360111cb 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/main/resources/impl/bpel/PartnerLinkTypeNoRoles/helloworld.componentType
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/impl/bpel/PartnerLinkTypeNoRoles/helloworld.componentType
diff --git a/branches/sca-java-1.3.1/itest/validation/src/main/resources/impl/bpel/PartnerLinkTypeNoRoles/helloworld.composite b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/impl/bpel/PartnerLinkTypeNoRoles/helloworld.composite
index b4623b5c2d..b4623b5c2d 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/main/resources/impl/bpel/PartnerLinkTypeNoRoles/helloworld.composite
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/impl/bpel/PartnerLinkTypeNoRoles/helloworld.composite
diff --git a/branches/sca-java-1.3.1/itest/validation/src/main/resources/impl/bpel/PartnerLinkTypeNoRoles/helloworld.wsdl b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/impl/bpel/PartnerLinkTypeNoRoles/helloworld.wsdl
index 695fd60887..695fd60887 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/main/resources/impl/bpel/PartnerLinkTypeNoRoles/helloworld.wsdl
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/impl/bpel/PartnerLinkTypeNoRoles/helloworld.wsdl
diff --git a/branches/sca-java-1.3.1/itest/validation/src/main/resources/impl/java/ClassNotFoundException/Calculator.composite b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/impl/java/ClassNotFoundException/Calculator.composite
index f3cf93ddaa..f3cf93ddaa 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/main/resources/impl/java/ClassNotFoundException/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/impl/java/ClassNotFoundException/Calculator.composite
diff --git a/branches/sca-java-1.3.1/itest/validation/src/main/resources/impl/java/ContributionResolveException/Calculator.composite b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/impl/java/ContributionResolveException/Calculator.composite
index f9016219a5..f9016219a5 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/main/resources/impl/java/ContributionResolveException/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/impl/java/ContributionResolveException/Calculator.composite
diff --git a/branches/sca-java-1.3.1/itest/validation/src/main/resources/impl/osgi/CouldNotLocateOSGiBundle/OSGiTestService.componentType b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/impl/osgi/CouldNotLocateOSGiBundle/OSGiTestService.componentType
index 634c13b3cc..634c13b3cc 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/main/resources/impl/osgi/CouldNotLocateOSGiBundle/OSGiTestService.componentType
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/impl/osgi/CouldNotLocateOSGiBundle/OSGiTestService.componentType
diff --git a/branches/sca-java-1.3.1/itest/validation/src/main/resources/impl/osgi/CouldNotLocateOSGiBundle/osgitest.composite b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/impl/osgi/CouldNotLocateOSGiBundle/osgitest.composite
index 0d1861f2f5..0d1861f2f5 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/main/resources/impl/osgi/CouldNotLocateOSGiBundle/osgitest.composite
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/impl/osgi/CouldNotLocateOSGiBundle/osgitest.composite
diff --git a/branches/sca-java-1.3.1/itest/validation/src/main/resources/impl/osgi/MissingComponentTypeFile/OSGiTestService.jar b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/impl/osgi/MissingComponentTypeFile/OSGiTestService.jar
index 27b33bff3f..27b33bff3f 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/main/resources/impl/osgi/MissingComponentTypeFile/OSGiTestService.jar
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/impl/osgi/MissingComponentTypeFile/OSGiTestService.jar
diff --git a/branches/sca-java-1.3.1/itest/validation/src/main/resources/impl/osgi/MissingComponentTypeFile/osgitest.composite b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/impl/osgi/MissingComponentTypeFile/osgitest.composite
index 0d1861f2f5..0d1861f2f5 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/main/resources/impl/osgi/MissingComponentTypeFile/osgitest.composite
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/impl/osgi/MissingComponentTypeFile/osgitest.composite
diff --git a/branches/sca-java-1.3.1/itest/validation/src/main/resources/impl/osgi/PropertyShouldSpecifySR/OSGiTestService.componentType b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/impl/osgi/PropertyShouldSpecifySR/OSGiTestService.componentType
index 634c13b3cc..634c13b3cc 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/main/resources/impl/osgi/PropertyShouldSpecifySR/OSGiTestService.componentType
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/impl/osgi/PropertyShouldSpecifySR/OSGiTestService.componentType
diff --git a/branches/sca-java-1.3.1/itest/validation/src/main/resources/impl/osgi/PropertyShouldSpecifySR/OSGiTestService.jar b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/impl/osgi/PropertyShouldSpecifySR/OSGiTestService.jar
index d57906dffa..d57906dffa 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/main/resources/impl/osgi/PropertyShouldSpecifySR/OSGiTestService.jar
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/impl/osgi/PropertyShouldSpecifySR/OSGiTestService.jar
diff --git a/branches/sca-java-1.3.1/itest/validation/src/main/resources/impl/osgi/PropertyShouldSpecifySR/osgitest.composite b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/impl/osgi/PropertyShouldSpecifySR/osgitest.composite
index 881c24854b..881c24854b 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/main/resources/impl/osgi/PropertyShouldSpecifySR/osgitest.composite
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/impl/osgi/PropertyShouldSpecifySR/osgitest.composite
diff --git a/branches/sca-java-1.3.1/itest/validation/src/main/resources/impl/resource/CouldNotResolveLocation/resource.composite b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/impl/resource/CouldNotResolveLocation/resource.composite
index 4e680f1200..4e680f1200 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/main/resources/impl/resource/CouldNotResolveLocation/resource.composite
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/impl/resource/CouldNotResolveLocation/resource.composite
diff --git a/branches/sca-java-1.3.1/itest/validation/src/main/resources/impl/resource/LocationAttributeMissing/resource.composite b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/impl/resource/LocationAttributeMissing/resource.composite
index e01643ed8f..e01643ed8f 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/main/resources/impl/resource/LocationAttributeMissing/resource.composite
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/impl/resource/LocationAttributeMissing/resource.composite
diff --git a/branches/sca-java-1.3.1/itest/validation/src/main/resources/impl/spring/ContributionResolveException/SpringHelloWorld.composite b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/impl/spring/ContributionResolveException/SpringHelloWorld.composite
index d776882ed0..d776882ed0 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/main/resources/impl/spring/ContributionResolveException/SpringHelloWorld.composite
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/impl/spring/ContributionResolveException/SpringHelloWorld.composite
diff --git a/branches/sca-java-1.3.1/itest/validation/src/main/resources/impl/spring/LocationAttributeMissing/SpringHelloWorld.composite b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/impl/spring/LocationAttributeMissing/SpringHelloWorld.composite
index 0d1ffc97e4..0d1ffc97e4 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/main/resources/impl/spring/LocationAttributeMissing/SpringHelloWorld.composite
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/impl/spring/LocationAttributeMissing/SpringHelloWorld.composite
diff --git a/branches/sca-java-1.3.1/itest/validation/src/main/resources/impl/spring/UnableToResolveComponentType/SpringHelloWorld-context.xml b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/impl/spring/UnableToResolveComponentType/SpringHelloWorld-context.xml
index e69de29bb2..e69de29bb2 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/main/resources/impl/spring/UnableToResolveComponentType/SpringHelloWorld-context.xml
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/impl/spring/UnableToResolveComponentType/SpringHelloWorld-context.xml
diff --git a/branches/sca-java-1.3.1/itest/validation/src/main/resources/impl/spring/UnableToResolveComponentType/SpringHelloWorld.composite b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/impl/spring/UnableToResolveComponentType/SpringHelloWorld.composite
index 99c529d77f..99c529d77f 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/main/resources/impl/spring/UnableToResolveComponentType/SpringHelloWorld.composite
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/impl/spring/UnableToResolveComponentType/SpringHelloWorld.composite
diff --git a/branches/sca-java-1.3.1/itest/validation/src/main/resources/impl/spring/UnableToResolveComponentType/TestHelloWorldBean.componentType b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/impl/spring/UnableToResolveComponentType/TestHelloWorldBean.componentType
index c75f209b6d..c75f209b6d 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/main/resources/impl/spring/UnableToResolveComponentType/TestHelloWorldBean.componentType
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/impl/spring/UnableToResolveComponentType/TestHelloWorldBean.componentType
diff --git a/branches/sca-java-1.3.1/itest/validation/src/main/resources/impl/widget/CouldNotResolveLocation/widget.composite b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/impl/widget/CouldNotResolveLocation/widget.composite
index a5874707da..a5874707da 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/main/resources/impl/widget/CouldNotResolveLocation/widget.composite
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/impl/widget/CouldNotResolveLocation/widget.composite
diff --git a/branches/sca-java-1.3.1/itest/validation/src/main/resources/impl/widget/LocationAttributeMissing/widget.composite b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/impl/widget/LocationAttributeMissing/widget.composite
index 393b9fe674..393b9fe674 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/main/resources/impl/widget/LocationAttributeMissing/widget.composite
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/impl/widget/LocationAttributeMissing/widget.composite
diff --git a/branches/sca-java-1.3.1/itest/validation/src/main/resources/impl/xquery/CouldNotLocateFile/HelloWorld.composite b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/impl/xquery/CouldNotLocateFile/HelloWorld.composite
index 1dca444938..1dca444938 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/main/resources/impl/xquery/CouldNotLocateFile/HelloWorld.composite
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/impl/xquery/CouldNotLocateFile/HelloWorld.composite
diff --git a/branches/sca-java-1.3.1/itest/validation/src/main/resources/impl/xquery/LocationAttributeMissing/HelloWorld.composite b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/impl/xquery/LocationAttributeMissing/HelloWorld.composite
index 9a60183c5c..9a60183c5c 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/main/resources/impl/xquery/LocationAttributeMissing/HelloWorld.composite
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/impl/xquery/LocationAttributeMissing/HelloWorld.composite
diff --git a/branches/sca-java-1.3.1/itest/validation/src/main/resources/interfacejava/xml/ClassNotFoundException/Calculator.composite b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/interfacejava/xml/ClassNotFoundException/Calculator.composite
index 70f91d1a7d..70f91d1a7d 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/main/resources/interfacejava/xml/ClassNotFoundException/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/interfacejava/xml/ClassNotFoundException/Calculator.composite
diff --git a/branches/sca-java-1.3.1/itest/validation/src/main/resources/interfacejava/xml/ClassNotFoundException/CalculatorServiceImpl.componentType b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/interfacejava/xml/ClassNotFoundException/CalculatorServiceImpl.componentType
index bc7bf3f250..bc7bf3f250 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/main/resources/interfacejava/xml/ClassNotFoundException/CalculatorServiceImpl.componentType
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/interfacejava/xml/ClassNotFoundException/CalculatorServiceImpl.componentType
diff --git a/branches/sca-java-1.3.1/itest/validation/src/main/resources/interfacejava/xml/ContributionResolveException/Calculator.composite b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/interfacejava/xml/ContributionResolveException/Calculator.composite
index a1a699fc75..a1a699fc75 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/main/resources/interfacejava/xml/ContributionResolveException/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/interfacejava/xml/ContributionResolveException/Calculator.composite
diff --git a/branches/sca-java-1.3.1/itest/validation/src/main/resources/interfacejava/xml/ContributionResolveException/CalculatorServiceImpl.componentType b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/interfacejava/xml/ContributionResolveException/CalculatorServiceImpl.componentType
index 7446e4f06a..7446e4f06a 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/main/resources/interfacejava/xml/ContributionResolveException/CalculatorServiceImpl.componentType
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/interfacejava/xml/ContributionResolveException/CalculatorServiceImpl.componentType
diff --git a/branches/sca-java-1.3.1/itest/validation/src/main/resources/interfacewsdl/xml/InvalidWSDLInterfaceAttr/Calculator.composite b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/interfacewsdl/xml/InvalidWSDLInterfaceAttr/Calculator.composite
index 0bbb10706e..0bbb10706e 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/main/resources/interfacewsdl/xml/InvalidWSDLInterfaceAttr/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/interfacewsdl/xml/InvalidWSDLInterfaceAttr/Calculator.composite
diff --git a/branches/sca-java-1.3.1/itest/validation/src/main/resources/interfacewsdl/xml/InvalidWSDLInterfaceAttr/helloworld-interface.wsdl b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/interfacewsdl/xml/InvalidWSDLInterfaceAttr/helloworld-interface.wsdl
index 9d9376ad6c..9d9376ad6c 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/main/resources/interfacewsdl/xml/InvalidWSDLInterfaceAttr/helloworld-interface.wsdl
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/interfacewsdl/xml/InvalidWSDLInterfaceAttr/helloworld-interface.wsdl
diff --git a/branches/sca-java-1.3.1/itest/validation/src/main/resources/interfacewsdl/xml/InvalidWSDLInterfaceAttr/helloworld-service.wsdl b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/interfacewsdl/xml/InvalidWSDLInterfaceAttr/helloworld-service.wsdl
index 3885357625..3885357625 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/main/resources/interfacewsdl/xml/InvalidWSDLInterfaceAttr/helloworld-service.wsdl
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/interfacewsdl/xml/InvalidWSDLInterfaceAttr/helloworld-service.wsdl
diff --git a/branches/sca-java-1.3.1/itest/validation/src/main/resources/interfacewsdl/xml/WsdlInterfaceDoesNotMatch/helloworld.wsdl b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/interfacewsdl/xml/WsdlInterfaceDoesNotMatch/helloworld.wsdl
index 013a55b61e..013a55b61e 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/main/resources/interfacewsdl/xml/WsdlInterfaceDoesNotMatch/helloworld.wsdl
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/interfacewsdl/xml/WsdlInterfaceDoesNotMatch/helloworld.wsdl
diff --git a/branches/sca-java-1.3.1/itest/validation/src/main/resources/interfacewsdl/xml/WsdlInterfaceDoesNotMatch/helloworldwsjms.composite b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/interfacewsdl/xml/WsdlInterfaceDoesNotMatch/helloworldwsjms.composite
index d9252ba54f..d9252ba54f 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/main/resources/interfacewsdl/xml/WsdlInterfaceDoesNotMatch/helloworldwsjms.composite
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/interfacewsdl/xml/WsdlInterfaceDoesNotMatch/helloworldwsjms.composite
diff --git a/branches/sca-java-1.3.1/itest/validation/src/main/resources/policy/security/ClassNotFoundException/Calculator.composite b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/policy/security/ClassNotFoundException/Calculator.composite
index 48c3c5ffc0..48c3c5ffc0 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/main/resources/policy/security/ClassNotFoundException/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/policy/security/ClassNotFoundException/Calculator.composite
diff --git a/branches/sca-java-1.3.1/itest/validation/src/main/resources/policy/security/ClassNotFoundException/definitions.xml b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/policy/security/ClassNotFoundException/definitions.xml
index 53d1a581f0..53d1a581f0 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/main/resources/policy/security/ClassNotFoundException/definitions.xml
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/policy/security/ClassNotFoundException/definitions.xml
diff --git a/branches/sca-java-1.3.1/itest/validation/src/main/resources/policy/security/RequiredAttributeRolesMissing/Calculator.composite b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/policy/security/RequiredAttributeRolesMissing/Calculator.composite
index 48c3c5ffc0..48c3c5ffc0 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/main/resources/policy/security/RequiredAttributeRolesMissing/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/policy/security/RequiredAttributeRolesMissing/Calculator.composite
diff --git a/branches/sca-java-1.3.1/itest/validation/src/main/resources/policy/security/RequiredAttributeRolesMissing/definitions.xml b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/policy/security/RequiredAttributeRolesMissing/definitions.xml
index ac45d95ce8..ac45d95ce8 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/main/resources/policy/security/RequiredAttributeRolesMissing/definitions.xml
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/policy/security/RequiredAttributeRolesMissing/definitions.xml
diff --git a/branches/sca-java-1.3.1/itest/validation/src/main/resources/policy/xml/AlwaysProvidedIntentNotFound/Calculator.composite b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/policy/xml/AlwaysProvidedIntentNotFound/Calculator.composite
index 48c3c5ffc0..48c3c5ffc0 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/main/resources/policy/xml/AlwaysProvidedIntentNotFound/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/policy/xml/AlwaysProvidedIntentNotFound/Calculator.composite
diff --git a/branches/sca-java-1.3.1/itest/validation/src/main/resources/policy/xml/AlwaysProvidedIntentNotFound/definitions.xml b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/policy/xml/AlwaysProvidedIntentNotFound/definitions.xml
index 5cf6963a96..5cf6963a96 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/main/resources/policy/xml/AlwaysProvidedIntentNotFound/definitions.xml
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/policy/xml/AlwaysProvidedIntentNotFound/definitions.xml
diff --git a/branches/sca-java-1.3.1/itest/validation/src/main/resources/policy/xml/ErrorInPolicyIntentDefinition/Calculator.composite b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/policy/xml/ErrorInPolicyIntentDefinition/Calculator.composite
index 48c3c5ffc0..48c3c5ffc0 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/main/resources/policy/xml/ErrorInPolicyIntentDefinition/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/policy/xml/ErrorInPolicyIntentDefinition/Calculator.composite
diff --git a/branches/sca-java-1.3.1/itest/validation/src/main/resources/policy/xml/ErrorInPolicyIntentDefinition/definitions.xml b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/policy/xml/ErrorInPolicyIntentDefinition/definitions.xml
index d31c705fb5..d31c705fb5 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/main/resources/policy/xml/ErrorInPolicyIntentDefinition/definitions.xml
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/policy/xml/ErrorInPolicyIntentDefinition/definitions.xml
diff --git a/branches/sca-java-1.3.1/itest/validation/src/main/resources/policy/xml/IntentNotSpecified/Calculator.composite b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/policy/xml/IntentNotSpecified/Calculator.composite
index 48c3c5ffc0..48c3c5ffc0 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/main/resources/policy/xml/IntentNotSpecified/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/policy/xml/IntentNotSpecified/Calculator.composite
diff --git a/branches/sca-java-1.3.1/itest/validation/src/main/resources/policy/xml/IntentNotSpecified/definitions.xml b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/policy/xml/IntentNotSpecified/definitions.xml
index d214a7f40a..d214a7f40a 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/main/resources/policy/xml/IntentNotSpecified/definitions.xml
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/policy/xml/IntentNotSpecified/definitions.xml
diff --git a/branches/sca-java-1.3.1/itest/validation/src/main/resources/policy/xml/MayProvideIntentNotFound/Calculator.composite b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/policy/xml/MayProvideIntentNotFound/Calculator.composite
index 48c3c5ffc0..48c3c5ffc0 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/main/resources/policy/xml/MayProvideIntentNotFound/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/policy/xml/MayProvideIntentNotFound/Calculator.composite
diff --git a/branches/sca-java-1.3.1/itest/validation/src/main/resources/policy/xml/MayProvideIntentNotFound/definitions.xml b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/policy/xml/MayProvideIntentNotFound/definitions.xml
index ede1786942..ede1786942 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/main/resources/policy/xml/MayProvideIntentNotFound/definitions.xml
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/policy/xml/MayProvideIntentNotFound/definitions.xml
diff --git a/branches/sca-java-1.3.1/itest/validation/src/main/resources/policy/xml/RequiredAttributeMissing/Calculator.composite b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/policy/xml/RequiredAttributeMissing/Calculator.composite
index 48c3c5ffc0..48c3c5ffc0 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/main/resources/policy/xml/RequiredAttributeMissing/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/policy/xml/RequiredAttributeMissing/Calculator.composite
diff --git a/branches/sca-java-1.3.1/itest/validation/src/main/resources/policy/xml/RequiredAttributeMissing/definitions.xml b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/policy/xml/RequiredAttributeMissing/definitions.xml
index fcb43c949b..fcb43c949b 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/main/resources/policy/xml/RequiredAttributeMissing/definitions.xml
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/policy/xml/RequiredAttributeMissing/definitions.xml
diff --git a/branches/sca-java-1.3.1/itest/validation/src/main/resources/policy/xml/UnableToMapPolicies/Calculator.composite b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/policy/xml/UnableToMapPolicies/Calculator.composite
index 48c3c5ffc0..48c3c5ffc0 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/main/resources/policy/xml/UnableToMapPolicies/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/policy/xml/UnableToMapPolicies/Calculator.composite
diff --git a/branches/sca-java-1.3.1/itest/validation/src/main/resources/policy/xml/UnableToMapPolicies/definitions.xml b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/policy/xml/UnableToMapPolicies/definitions.xml
index 6faca15da0..6faca15da0 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/main/resources/policy/xml/UnableToMapPolicies/definitions.xml
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/policy/xml/UnableToMapPolicies/definitions.xml
diff --git a/branches/sca-java-1.3.1/itest/validation/src/main/resources/policy/xml/UnrecognizedIntentAttachPointType/Calculator.composite b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/policy/xml/UnrecognizedIntentAttachPointType/Calculator.composite
index 48c3c5ffc0..48c3c5ffc0 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/main/resources/policy/xml/UnrecognizedIntentAttachPointType/Calculator.composite
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/policy/xml/UnrecognizedIntentAttachPointType/Calculator.composite
diff --git a/branches/sca-java-1.3.1/itest/validation/src/main/resources/policy/xml/UnrecognizedIntentAttachPointType/definitions.xml b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/policy/xml/UnrecognizedIntentAttachPointType/definitions.xml
index 60f4de5cd3..60f4de5cd3 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/main/resources/policy/xml/UnrecognizedIntentAttachPointType/definitions.xml
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/main/resources/policy/xml/UnrecognizedIntentAttachPointType/definitions.xml
diff --git a/branches/sca-java-1.3.1/itest/validation/src/test/java/assembly/xml/ContributionReadException.java b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/test/java/assembly/xml/ContributionReadException.java
index 9b0d51eb59..9b0d51eb59 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/test/java/assembly/xml/ContributionReadException.java
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/test/java/assembly/xml/ContributionReadException.java
diff --git a/branches/sca-java-1.3.1/itest/validation/src/test/java/assembly/xml/PolicyImplValidationException.java b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/test/java/assembly/xml/PolicyImplValidationException.java
index e8476991a9..e8476991a9 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/test/java/assembly/xml/PolicyImplValidationException.java
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/test/java/assembly/xml/PolicyImplValidationException.java
diff --git a/branches/sca-java-1.3.1/itest/validation/src/test/java/assembly/xml/PolicyServiceValidationException.java b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/test/java/assembly/xml/PolicyServiceValidationException.java
index 8ae156d63e..8ae156d63e 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/test/java/assembly/xml/PolicyServiceValidationException.java
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/test/java/assembly/xml/PolicyServiceValidationException.java
diff --git a/branches/sca-java-1.3.1/itest/validation/src/test/java/assembly/xml/UnexpectedBindingElement.java b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/test/java/assembly/xml/UnexpectedBindingElement.java
index d757ff98dd..d757ff98dd 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/test/java/assembly/xml/UnexpectedBindingElement.java
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/test/java/assembly/xml/UnexpectedBindingElement.java
diff --git a/branches/sca-java-1.3.1/itest/validation/src/test/java/assembly/xml/UnexpectedImplementationElement.java b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/test/java/assembly/xml/UnexpectedImplementationElement.java
index 9a231a18c7..9a231a18c7 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/test/java/assembly/xml/UnexpectedImplementationElement.java
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/test/java/assembly/xml/UnexpectedImplementationElement.java
diff --git a/branches/sca-java-1.3.1/itest/validation/src/test/java/assembly/xml/UnexpectedInterfaceElement.java b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/test/java/assembly/xml/UnexpectedInterfaceElement.java
index 4ae88b9ba3..4ae88b9ba3 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/test/java/assembly/xml/UnexpectedInterfaceElement.java
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/test/java/assembly/xml/UnexpectedInterfaceElement.java
diff --git a/branches/sca-java-1.3.1/itest/validation/src/test/java/binding/ejb/UnknownEJBSessionTypeTestCase.java b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/test/java/binding/ejb/UnknownEJBSessionTypeTestCase.java
index 1cef8a902e..1cef8a902e 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/test/java/binding/ejb/UnknownEJBSessionTypeTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/test/java/binding/ejb/UnknownEJBSessionTypeTestCase.java
diff --git a/branches/sca-java-1.3.1/itest/validation/src/test/java/binding/ejb/UnknownEJBVersionTestCase.java b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/test/java/binding/ejb/UnknownEJBVersionTestCase.java
index bacddc93a8..bacddc93a8 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/test/java/binding/ejb/UnknownEJBVersionTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/test/java/binding/ejb/UnknownEJBVersionTestCase.java
diff --git a/branches/sca-java-1.3.1/itest/validation/src/test/java/binding/jms/DoesntProcessActivationSpecTestCase.java b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/test/java/binding/jms/DoesntProcessActivationSpecTestCase.java
index e0e5347d96..e0e5347d96 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/test/java/binding/jms/DoesntProcessActivationSpecTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/test/java/binding/jms/DoesntProcessActivationSpecTestCase.java
diff --git a/branches/sca-java-1.3.1/itest/validation/src/test/java/binding/jms/DoesntProcessDestinationTypeTestCase.java b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/test/java/binding/jms/DoesntProcessDestinationTypeTestCase.java
index 9e08afec09..9e08afec09 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/test/java/binding/jms/DoesntProcessDestinationTypeTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/test/java/binding/jms/DoesntProcessDestinationTypeTestCase.java
diff --git a/branches/sca-java-1.3.1/itest/validation/src/test/java/binding/jms/DoesntProcessHeadersTestCase.java b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/test/java/binding/jms/DoesntProcessHeadersTestCase.java
index bae9656433..bae9656433 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/test/java/binding/jms/DoesntProcessHeadersTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/test/java/binding/jms/DoesntProcessHeadersTestCase.java
diff --git a/branches/sca-java-1.3.1/itest/validation/src/test/java/binding/jms/DoesntProcessResourceAdapterTestCase.java b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/test/java/binding/jms/DoesntProcessResourceAdapterTestCase.java
index a2a5b0b872..a2a5b0b872 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/test/java/binding/jms/DoesntProcessResourceAdapterTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/test/java/binding/jms/DoesntProcessResourceAdapterTestCase.java
diff --git a/branches/sca-java-1.3.1/itest/validation/src/test/java/binding/jms/DoesntProcessResponseActivationSpecTestCase.java b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/test/java/binding/jms/DoesntProcessResponseActivationSpecTestCase.java
index 64b41623de..64b41623de 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/test/java/binding/jms/DoesntProcessResponseActivationSpecTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/test/java/binding/jms/DoesntProcessResponseActivationSpecTestCase.java
diff --git a/branches/sca-java-1.3.1/itest/validation/src/test/java/binding/jms/DoesntProcessResponseConnectionFactoryTestCase.java b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/test/java/binding/jms/DoesntProcessResponseConnectionFactoryTestCase.java
index 86fbe51dad..86fbe51dad 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/test/java/binding/jms/DoesntProcessResponseConnectionFactoryTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/test/java/binding/jms/DoesntProcessResponseConnectionFactoryTestCase.java
diff --git a/branches/sca-java-1.3.1/itest/validation/src/test/java/binding/jms/DoesntProcessResponseDestinationTypeTestCase.java b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/test/java/binding/jms/DoesntProcessResponseDestinationTypeTestCase.java
index 6e884c41cd..6e884c41cd 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/test/java/binding/jms/DoesntProcessResponseDestinationTypeTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/test/java/binding/jms/DoesntProcessResponseDestinationTypeTestCase.java
diff --git a/branches/sca-java-1.3.1/itest/validation/src/test/java/binding/jms/InvalidCorrelationSchemeTestCase.java b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/test/java/binding/jms/InvalidCorrelationSchemeTestCase.java
index c237f8af18..c237f8af18 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/test/java/binding/jms/InvalidCorrelationSchemeTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/test/java/binding/jms/InvalidCorrelationSchemeTestCase.java
diff --git a/branches/sca-java-1.3.1/itest/validation/src/test/java/binding/jms/InvalidResponseDestinationTypeTestCase.java b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/test/java/binding/jms/InvalidResponseDestinationTypeTestCase.java
index 949ec02134..949ec02134 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/test/java/binding/jms/InvalidResponseDestinationTypeTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/test/java/binding/jms/InvalidResponseDestinationTypeTestCase.java
diff --git a/branches/sca-java-1.3.1/itest/validation/src/test/java/binding/jms/MissingActivationSpecNameTestCase.java b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/test/java/binding/jms/MissingActivationSpecNameTestCase.java
index a974ef0db4..a974ef0db4 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/test/java/binding/jms/MissingActivationSpecNameTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/test/java/binding/jms/MissingActivationSpecNameTestCase.java
diff --git a/branches/sca-java-1.3.1/itest/validation/src/test/java/binding/jms/MissingConnectionFactoryNameTestCase.java b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/test/java/binding/jms/MissingConnectionFactoryNameTestCase.java
index adbaa50dc0..adbaa50dc0 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/test/java/binding/jms/MissingConnectionFactoryNameTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/test/java/binding/jms/MissingConnectionFactoryNameTestCase.java
diff --git a/branches/sca-java-1.3.1/itest/validation/src/test/java/binding/jms/MissingResponseActivationSpecTestCase.java b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/test/java/binding/jms/MissingResponseActivationSpecTestCase.java
index 4bba6b74de..4bba6b74de 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/test/java/binding/jms/MissingResponseActivationSpecTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/test/java/binding/jms/MissingResponseActivationSpecTestCase.java
diff --git a/branches/sca-java-1.3.1/itest/validation/src/test/java/binding/jms/MissingResponseConnectionFactoryTestCase.java b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/test/java/binding/jms/MissingResponseConnectionFactoryTestCase.java
index 8f4fc1a739..8f4fc1a739 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/test/java/binding/jms/MissingResponseConnectionFactoryTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/test/java/binding/jms/MissingResponseConnectionFactoryTestCase.java
diff --git a/branches/sca-java-1.3.1/itest/validation/src/test/java/binding/jms/MustStartWithSchemaTestCase.java b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/test/java/binding/jms/MustStartWithSchemaTestCase.java
index d9e1c782a8..d9e1c782a8 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/test/java/binding/jms/MustStartWithSchemaTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/test/java/binding/jms/MustStartWithSchemaTestCase.java
diff --git a/branches/sca-java-1.3.1/itest/validation/src/test/java/binding/jms/UnexpectedElementTestCase.java b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/test/java/binding/jms/UnexpectedElementTestCase.java
index 3e4e36d839..3e4e36d839 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/test/java/binding/jms/UnexpectedElementTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/test/java/binding/jms/UnexpectedElementTestCase.java
diff --git a/branches/sca-java-1.3.1/itest/validation/src/test/java/binding/jms/UnexpectedResponseElementTestCase.java b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/test/java/binding/jms/UnexpectedResponseElementTestCase.java
index 60ea47a85f..60ea47a85f 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/test/java/binding/jms/UnexpectedResponseElementTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/test/java/binding/jms/UnexpectedResponseElementTestCase.java
diff --git a/branches/sca-java-1.3.1/itest/validation/src/test/java/binding/jms/UnknownTokenInURITestCase.java b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/test/java/binding/jms/UnknownTokenInURITestCase.java
index 6a75a35f99..6a75a35f99 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/test/java/binding/jms/UnknownTokenInURITestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/test/java/binding/jms/UnknownTokenInURITestCase.java
diff --git a/branches/sca-java-1.3.1/itest/validation/src/test/java/binding/wsxml/InvalidWsdlElementAttrTestCase.java b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/test/java/binding/wsxml/InvalidWsdlElementAttrTestCase.java
index c0f60a848f..c0f60a848f 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/test/java/binding/wsxml/InvalidWsdlElementAttrTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/test/java/binding/wsxml/InvalidWsdlElementAttrTestCase.java
diff --git a/branches/sca-java-1.3.1/itest/validation/src/test/java/binding/wsxml/MustUseWsdlBindingTestCase.java b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/test/java/binding/wsxml/MustUseWsdlBindingTestCase.java
index 5a74194796..5a74194796 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/test/java/binding/wsxml/MustUseWsdlBindingTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/test/java/binding/wsxml/MustUseWsdlBindingTestCase.java
diff --git a/branches/sca-java-1.3.1/itest/validation/src/test/java/binding/wsxml/WsdlBindingDoesNotMatchTestCase.java b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/test/java/binding/wsxml/WsdlBindingDoesNotMatchTestCase.java
index 7991de7176..7991de7176 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/test/java/binding/wsxml/WsdlBindingDoesNotMatchTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/test/java/binding/wsxml/WsdlBindingDoesNotMatchTestCase.java
diff --git a/branches/sca-java-1.3.1/itest/validation/src/test/java/binding/wsxml/WsdlServiceDoesNotMatchTestCase.java b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/test/java/binding/wsxml/WsdlServiceDoesNotMatchTestCase.java
index a0a7d12b9f..a0a7d12b9f 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/test/java/binding/wsxml/WsdlServiceDoesNotMatchTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/test/java/binding/wsxml/WsdlServiceDoesNotMatchTestCase.java
diff --git a/branches/sca-java-1.3.1/itest/validation/src/test/java/calculator/warning/ComponentReferenceTargetNotFoundTestCase.java b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/test/java/calculator/warning/ComponentReferenceTargetNotFoundTestCase.java
index 84c77ae297..84c77ae297 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/test/java/calculator/warning/ComponentReferenceTargetNotFoundTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/test/java/calculator/warning/ComponentReferenceTargetNotFoundTestCase.java
diff --git a/branches/sca-java-1.3.1/itest/validation/src/test/java/calculator/warning/DuplicateComponentNameTestCase.java b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/test/java/calculator/warning/DuplicateComponentNameTestCase.java
index ff1bd6cb09..ff1bd6cb09 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/test/java/calculator/warning/DuplicateComponentNameTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/test/java/calculator/warning/DuplicateComponentNameTestCase.java
diff --git a/branches/sca-java-1.3.1/itest/validation/src/test/java/calculator/warning/DuplicateImplementationPropertyNameTestCase.java b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/test/java/calculator/warning/DuplicateImplementationPropertyNameTestCase.java
index 65dab38ee3..65dab38ee3 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/test/java/calculator/warning/DuplicateImplementationPropertyNameTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/test/java/calculator/warning/DuplicateImplementationPropertyNameTestCase.java
diff --git a/branches/sca-java-1.3.1/itest/validation/src/test/java/calculator/warning/DuplicateImplementationReferenceNameTestCase.java b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/test/java/calculator/warning/DuplicateImplementationReferenceNameTestCase.java
index 6c10d1279c..6c10d1279c 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/test/java/calculator/warning/DuplicateImplementationReferenceNameTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/test/java/calculator/warning/DuplicateImplementationReferenceNameTestCase.java
diff --git a/branches/sca-java-1.3.1/itest/validation/src/test/java/calculator/warning/DuplicatePropertyNameTestCase.java b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/test/java/calculator/warning/DuplicatePropertyNameTestCase.java
index 4531564ccb..4531564ccb 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/test/java/calculator/warning/DuplicatePropertyNameTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/test/java/calculator/warning/DuplicatePropertyNameTestCase.java
diff --git a/branches/sca-java-1.3.1/itest/validation/src/test/java/calculator/warning/DuplicateReferenceNameTestCase.java b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/test/java/calculator/warning/DuplicateReferenceNameTestCase.java
index 3b024c58c7..3b024c58c7 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/test/java/calculator/warning/DuplicateReferenceNameTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/test/java/calculator/warning/DuplicateReferenceNameTestCase.java
diff --git a/branches/sca-java-1.3.1/itest/validation/src/test/java/calculator/warning/MultipleBindingsForServiceTestCase.java b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/test/java/calculator/warning/MultipleBindingsForServiceTestCase.java
index 4f54b023f4..4f54b023f4 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/test/java/calculator/warning/MultipleBindingsForServiceTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/test/java/calculator/warning/MultipleBindingsForServiceTestCase.java
diff --git a/branches/sca-java-1.3.1/itest/validation/src/test/java/calculator/warning/NoComponentImplementationTestCase.java b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/test/java/calculator/warning/NoComponentImplementationTestCase.java
index 14af754860..14af754860 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/test/java/calculator/warning/NoComponentImplementationTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/test/java/calculator/warning/NoComponentImplementationTestCase.java
diff --git a/branches/sca-java-1.3.1/itest/validation/src/test/java/calculator/warning/NoCompositeNamespaceTestCase.java b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/test/java/calculator/warning/NoCompositeNamespaceTestCase.java
index 2f2e87f9af..2f2e87f9af 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/test/java/calculator/warning/NoCompositeNamespaceTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/test/java/calculator/warning/NoCompositeNamespaceTestCase.java
diff --git a/branches/sca-java-1.3.1/itest/validation/src/test/java/calculator/warning/NoMatchingBindingTestCase.java b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/test/java/calculator/warning/NoMatchingBindingTestCase.java
index eb1f514240..eb1f514240 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/test/java/calculator/warning/NoMatchingBindingTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/test/java/calculator/warning/NoMatchingBindingTestCase.java
diff --git a/branches/sca-java-1.3.1/itest/validation/src/test/java/calculator/warning/PromotedReferenceNotFoundTestCase.java b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/test/java/calculator/warning/PromotedReferenceNotFoundTestCase.java
index 07c75decbc..07c75decbc 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/test/java/calculator/warning/PromotedReferenceNotFoundTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/test/java/calculator/warning/PromotedReferenceNotFoundTestCase.java
diff --git a/branches/sca-java-1.3.1/itest/validation/src/test/java/calculator/warning/PromotedServiceNotFoundTestCase.java b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/test/java/calculator/warning/PromotedServiceNotFoundTestCase.java
index 26c988c1c1..26c988c1c1 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/test/java/calculator/warning/PromotedServiceNotFoundTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/test/java/calculator/warning/PromotedServiceNotFoundTestCase.java
diff --git a/branches/sca-java-1.3.1/itest/validation/src/test/java/calculator/warning/PropertyAttributeMustSupplyNullTestCase.java b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/test/java/calculator/warning/PropertyAttributeMustSupplyNullTestCase.java
index 3753fc278c..3753fc278c 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/test/java/calculator/warning/PropertyAttributeMustSupplyNullTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/test/java/calculator/warning/PropertyAttributeMustSupplyNullTestCase.java
diff --git a/branches/sca-java-1.3.1/itest/validation/src/test/java/calculator/warning/PropertyAttributeTestCase.java b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/test/java/calculator/warning/PropertyAttributeTestCase.java
index 08e5a9861b..08e5a9861b 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/test/java/calculator/warning/PropertyAttributeTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/test/java/calculator/warning/PropertyAttributeTestCase.java
diff --git a/branches/sca-java-1.3.1/itest/validation/src/test/java/calculator/warning/PropertyNotFoundTestCase.java b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/test/java/calculator/warning/PropertyNotFoundTestCase.java
index 4af2675c09..4af2675c09 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/test/java/calculator/warning/PropertyNotFoundTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/test/java/calculator/warning/PropertyNotFoundTestCase.java
diff --git a/branches/sca-java-1.3.1/itest/validation/src/test/java/calculator/warning/PropertyOverrideManyAttributeTestCase.java b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/test/java/calculator/warning/PropertyOverrideManyAttributeTestCase.java
index 11fde0a73d..11fde0a73d 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/test/java/calculator/warning/PropertyOverrideManyAttributeTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/test/java/calculator/warning/PropertyOverrideManyAttributeTestCase.java
diff --git a/branches/sca-java-1.3.1/itest/validation/src/test/java/calculator/warning/ReferenceIncompatibleComponentInterfaceTestCase.java b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/test/java/calculator/warning/ReferenceIncompatibleComponentInterfaceTestCase.java
index 19b04e6940..19b04e6940 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/test/java/calculator/warning/ReferenceIncompatibleComponentInterfaceTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/test/java/calculator/warning/ReferenceIncompatibleComponentInterfaceTestCase.java
diff --git a/branches/sca-java-1.3.1/itest/validation/src/test/java/calculator/warning/ReferenceIncompatibleInterfaceTestCase.java b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/test/java/calculator/warning/ReferenceIncompatibleInterfaceTestCase.java
index 3180539898..3180539898 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/test/java/calculator/warning/ReferenceIncompatibleInterfaceTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/test/java/calculator/warning/ReferenceIncompatibleInterfaceTestCase.java
diff --git a/branches/sca-java-1.3.1/itest/validation/src/test/java/calculator/warning/ReferenceIncompatibleMultiplicityTestCase.java b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/test/java/calculator/warning/ReferenceIncompatibleMultiplicityTestCase.java
index 87ae0f0e3c..87ae0f0e3c 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/test/java/calculator/warning/ReferenceIncompatibleMultiplicityTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/test/java/calculator/warning/ReferenceIncompatibleMultiplicityTestCase.java
diff --git a/branches/sca-java-1.3.1/itest/validation/src/test/java/calculator/warning/ReferenceNotFoundTestCase.java b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/test/java/calculator/warning/ReferenceNotFoundTestCase.java
index 4856ba507f..4856ba507f 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/test/java/calculator/warning/ReferenceNotFoundTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/test/java/calculator/warning/ReferenceNotFoundTestCase.java
diff --git a/branches/sca-java-1.3.1/itest/validation/src/test/java/calculator/warning/ReferenceWithoutTargetsTestCase.java b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/test/java/calculator/warning/ReferenceWithoutTargetsTestCase.java
index f456ae40af..f456ae40af 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/test/java/calculator/warning/ReferenceWithoutTargetsTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/test/java/calculator/warning/ReferenceWithoutTargetsTestCase.java
diff --git a/branches/sca-java-1.3.1/itest/validation/src/test/java/calculator/warning/ServiceNotFoundForComponentServiceTestCase.java b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/test/java/calculator/warning/ServiceNotFoundForComponentServiceTestCase.java
index 51adc22848..51adc22848 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/test/java/calculator/warning/ServiceNotFoundForComponentServiceTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/test/java/calculator/warning/ServiceNotFoundForComponentServiceTestCase.java
diff --git a/branches/sca-java-1.3.1/itest/validation/src/test/java/calculator/warning/UnresolvedComponentImplementationTestCase.java b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/test/java/calculator/warning/UnresolvedComponentImplementationTestCase.java
index 918108c275..918108c275 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/test/java/calculator/warning/UnresolvedComponentImplementationTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/test/java/calculator/warning/UnresolvedComponentImplementationTestCase.java
diff --git a/branches/sca-java-1.3.1/itest/validation/src/test/java/calculator/warning/XSDValidationTestCase.java b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/test/java/calculator/warning/XSDValidationTestCase.java
index 93edfa2e21..93edfa2e21 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/test/java/calculator/warning/XSDValidationTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/test/java/calculator/warning/XSDValidationTestCase.java
diff --git a/branches/sca-java-1.3.1/itest/validation/src/test/java/contribution/java/AttributePackageMissingTestCase.java b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/test/java/contribution/java/AttributePackageMissingTestCase.java
index 04135ab2cc..04135ab2cc 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/test/java/contribution/java/AttributePackageMissingTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/test/java/contribution/java/AttributePackageMissingTestCase.java
diff --git a/branches/sca-java-1.3.1/itest/validation/src/test/java/contribution/namespace/AttributeNameSpaceMissingTestCase.java b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/test/java/contribution/namespace/AttributeNameSpaceMissingTestCase.java
index ab0afc6f65..ab0afc6f65 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/test/java/contribution/namespace/AttributeNameSpaceMissingTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/test/java/contribution/namespace/AttributeNameSpaceMissingTestCase.java
diff --git a/branches/sca-java-1.3.1/itest/validation/src/test/java/contribution/resource/AttributeURIMissingTestCase.java b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/test/java/contribution/resource/AttributeURIMissingTestCase.java
index a1b42bf815..a1b42bf815 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/test/java/contribution/resource/AttributeURIMissingTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/test/java/contribution/resource/AttributeURIMissingTestCase.java
diff --git a/branches/sca-java-1.3.1/itest/validation/src/test/java/contribution/xml/AttributeCompositeMissingTestCase.java b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/test/java/contribution/xml/AttributeCompositeMissingTestCase.java
index 32c1a8b3a8..32c1a8b3a8 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/test/java/contribution/xml/AttributeCompositeMissingTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/test/java/contribution/xml/AttributeCompositeMissingTestCase.java
diff --git a/branches/sca-java-1.3.1/itest/validation/src/test/java/domain/CustomCompositeBuilder.java b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/test/java/domain/CustomCompositeBuilder.java
index 9ad5407ed6..9ad5407ed6 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/test/java/domain/CustomCompositeBuilder.java
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/test/java/domain/CustomCompositeBuilder.java
diff --git a/branches/sca-java-1.3.1/itest/validation/src/test/java/impl/bpel/AttributeUnrecognizedNamespaceTestCase.java b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/test/java/impl/bpel/AttributeUnrecognizedNamespaceTestCase.java
index 9d97e3611a..9d97e3611a 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/test/java/impl/bpel/AttributeUnrecognizedNamespaceTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/test/java/impl/bpel/AttributeUnrecognizedNamespaceTestCase.java
diff --git a/branches/sca-java-1.3.1/itest/validation/src/test/java/impl/bpel/AttributeWithoutNamespaceTestCase.java b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/test/java/impl/bpel/AttributeWithoutNamespaceTestCase.java
index 80c15dc444..80c15dc444 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/test/java/impl/bpel/AttributeWithoutNamespaceTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/test/java/impl/bpel/AttributeWithoutNamespaceTestCase.java
diff --git a/branches/sca-java-1.3.1/itest/validation/src/test/java/impl/bpel/BPELProcessNotFoundTestCase.java b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/test/java/impl/bpel/BPELProcessNotFoundTestCase.java
index 81e8aecfeb..81e8aecfeb 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/test/java/impl/bpel/BPELProcessNotFoundTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/test/java/impl/bpel/BPELProcessNotFoundTestCase.java
diff --git a/branches/sca-java-1.3.1/itest/validation/src/test/java/impl/bpel/CannotResolveWSDLReferenceTestCase.java b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/test/java/impl/bpel/CannotResolveWSDLReferenceTestCase.java
index fb0c525aea..fb0c525aea 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/test/java/impl/bpel/CannotResolveWSDLReferenceTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/test/java/impl/bpel/CannotResolveWSDLReferenceTestCase.java
diff --git a/branches/sca-java-1.3.1/itest/validation/src/test/java/impl/bpel/MyRolePartnerRoleNullTestCase.java b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/test/java/impl/bpel/MyRolePartnerRoleNullTestCase.java
index 445629457e..445629457e 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/test/java/impl/bpel/MyRolePartnerRoleNullTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/test/java/impl/bpel/MyRolePartnerRoleNullTestCase.java
diff --git a/branches/sca-java-1.3.1/itest/validation/src/test/java/impl/bpel/PartnerLinkHasBothAttrTestCase.java b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/test/java/impl/bpel/PartnerLinkHasBothAttrTestCase.java
index 00b904ae65..00b904ae65 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/test/java/impl/bpel/PartnerLinkHasBothAttrTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/test/java/impl/bpel/PartnerLinkHasBothAttrTestCase.java
diff --git a/branches/sca-java-1.3.1/itest/validation/src/test/java/impl/bpel/PartnerLinkNoMatchingTypeTestCase.java b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/test/java/impl/bpel/PartnerLinkNoMatchingTypeTestCase.java
index b7a4ee6fef..b7a4ee6fef 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/test/java/impl/bpel/PartnerLinkNoMatchingTypeTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/test/java/impl/bpel/PartnerLinkNoMatchingTypeTestCase.java
diff --git a/branches/sca-java-1.3.1/itest/validation/src/test/java/impl/bpel/PartnerLinkTypeNoRolesTestCase.java b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/test/java/impl/bpel/PartnerLinkTypeNoRolesTestCase.java
index 32d3211f36..32d3211f36 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/test/java/impl/bpel/PartnerLinkTypeNoRolesTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/test/java/impl/bpel/PartnerLinkTypeNoRolesTestCase.java
diff --git a/branches/sca-java-1.3.1/itest/validation/src/test/java/impl/java/ClassNotFoundExceptionTestCase.java b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/test/java/impl/java/ClassNotFoundExceptionTestCase.java
index 3a7745722a..3a7745722a 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/test/java/impl/java/ClassNotFoundExceptionTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/test/java/impl/java/ClassNotFoundExceptionTestCase.java
diff --git a/branches/sca-java-1.3.1/itest/validation/src/test/java/impl/java/ContributionResolveExceptionTestCase.java b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/test/java/impl/java/ContributionResolveExceptionTestCase.java
index 59fc3ce79c..59fc3ce79c 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/test/java/impl/java/ContributionResolveExceptionTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/test/java/impl/java/ContributionResolveExceptionTestCase.java
diff --git a/branches/sca-java-1.3.1/itest/validation/src/test/java/impl/osgi/CouldNotLocateOSGiBundleTestCase.java b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/test/java/impl/osgi/CouldNotLocateOSGiBundleTestCase.java
index 6f54ad140c..6f54ad140c 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/test/java/impl/osgi/CouldNotLocateOSGiBundleTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/test/java/impl/osgi/CouldNotLocateOSGiBundleTestCase.java
diff --git a/branches/sca-java-1.3.1/itest/validation/src/test/java/impl/osgi/MissingComponentTypeFileTestCase.java b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/test/java/impl/osgi/MissingComponentTypeFileTestCase.java
index 3d75fa8ccc..3d75fa8ccc 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/test/java/impl/osgi/MissingComponentTypeFileTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/test/java/impl/osgi/MissingComponentTypeFileTestCase.java
diff --git a/branches/sca-java-1.3.1/itest/validation/src/test/java/impl/osgi/OSGiTestBundles.java b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/test/java/impl/osgi/OSGiTestBundles.java
index 398c028dd8..398c028dd8 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/test/java/impl/osgi/OSGiTestBundles.java
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/test/java/impl/osgi/OSGiTestBundles.java
diff --git a/branches/sca-java-1.3.1/itest/validation/src/test/java/impl/osgi/PropertyShouldSpecifySRTestCase.java b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/test/java/impl/osgi/PropertyShouldSpecifySRTestCase.java
index 117a94337a..117a94337a 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/test/java/impl/osgi/PropertyShouldSpecifySRTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/test/java/impl/osgi/PropertyShouldSpecifySRTestCase.java
diff --git a/branches/sca-java-1.3.1/itest/validation/src/test/java/impl/resource/CouldNotResolveLocationTestCase.java b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/test/java/impl/resource/CouldNotResolveLocationTestCase.java
index 14ba8e992e..14ba8e992e 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/test/java/impl/resource/CouldNotResolveLocationTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/test/java/impl/resource/CouldNotResolveLocationTestCase.java
diff --git a/branches/sca-java-1.3.1/itest/validation/src/test/java/impl/resource/LocationAttributeMissingTestCase.java b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/test/java/impl/resource/LocationAttributeMissingTestCase.java
index 461895f824..461895f824 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/test/java/impl/resource/LocationAttributeMissingTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/test/java/impl/resource/LocationAttributeMissingTestCase.java
diff --git a/branches/sca-java-1.3.1/itest/validation/src/test/java/impl/spring/ContributionResolveExceptionTestCase.java b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/test/java/impl/spring/ContributionResolveExceptionTestCase.java
index 9b7dbef3dd..9b7dbef3dd 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/test/java/impl/spring/ContributionResolveExceptionTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/test/java/impl/spring/ContributionResolveExceptionTestCase.java
diff --git a/branches/sca-java-1.3.1/itest/validation/src/test/java/impl/spring/LocationAttributeMissingTestCase.java b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/test/java/impl/spring/LocationAttributeMissingTestCase.java
index cd38b53f66..cd38b53f66 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/test/java/impl/spring/LocationAttributeMissingTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/test/java/impl/spring/LocationAttributeMissingTestCase.java
diff --git a/branches/sca-java-1.3.1/itest/validation/src/test/java/impl/spring/UnableToResolveComponentTypeTestCase.java b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/test/java/impl/spring/UnableToResolveComponentTypeTestCase.java
index 83550ae58d..83550ae58d 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/test/java/impl/spring/UnableToResolveComponentTypeTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/test/java/impl/spring/UnableToResolveComponentTypeTestCase.java
diff --git a/branches/sca-java-1.3.1/itest/validation/src/test/java/impl/widget/CouldNotResolveLocationTestCase.java b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/test/java/impl/widget/CouldNotResolveLocationTestCase.java
index d098bb4bf8..d098bb4bf8 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/test/java/impl/widget/CouldNotResolveLocationTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/test/java/impl/widget/CouldNotResolveLocationTestCase.java
diff --git a/branches/sca-java-1.3.1/itest/validation/src/test/java/impl/widget/LocationAttributeMissingTestCase.java b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/test/java/impl/widget/LocationAttributeMissingTestCase.java
index 2f85d8ed4a..2f85d8ed4a 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/test/java/impl/widget/LocationAttributeMissingTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/test/java/impl/widget/LocationAttributeMissingTestCase.java
diff --git a/branches/sca-java-1.3.1/itest/validation/src/test/java/impl/xquery/CouldNotLocateFileTestCase.java b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/test/java/impl/xquery/CouldNotLocateFileTestCase.java
index f90fc3b83f..f90fc3b83f 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/test/java/impl/xquery/CouldNotLocateFileTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/test/java/impl/xquery/CouldNotLocateFileTestCase.java
diff --git a/branches/sca-java-1.3.1/itest/validation/src/test/java/impl/xquery/LocationAttributeMissingTestCase.java b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/test/java/impl/xquery/LocationAttributeMissingTestCase.java
index 01450a8836..01450a8836 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/test/java/impl/xquery/LocationAttributeMissingTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/test/java/impl/xquery/LocationAttributeMissingTestCase.java
diff --git a/branches/sca-java-1.3.1/itest/validation/src/test/java/interfacejava/xml/ClassNotFoundTestCase.java b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/test/java/interfacejava/xml/ClassNotFoundTestCase.java
index a03e056298..a03e056298 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/test/java/interfacejava/xml/ClassNotFoundTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/test/java/interfacejava/xml/ClassNotFoundTestCase.java
diff --git a/branches/sca-java-1.3.1/itest/validation/src/test/java/interfacejava/xml/ContributionResolveExceptionTestCase.java b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/test/java/interfacejava/xml/ContributionResolveExceptionTestCase.java
index e0524f57b7..e0524f57b7 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/test/java/interfacejava/xml/ContributionResolveExceptionTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/test/java/interfacejava/xml/ContributionResolveExceptionTestCase.java
diff --git a/branches/sca-java-1.3.1/itest/validation/src/test/java/interfacewsdl/xml/InvalidWSDLInterfaceAttrTestCase.java b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/test/java/interfacewsdl/xml/InvalidWSDLInterfaceAttrTestCase.java
index e212477c61..e212477c61 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/test/java/interfacewsdl/xml/InvalidWSDLInterfaceAttrTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/test/java/interfacewsdl/xml/InvalidWSDLInterfaceAttrTestCase.java
diff --git a/branches/sca-java-1.3.1/itest/validation/src/test/java/interfacewsdl/xml/WsdlInterfaceDoesNotMatchTestCase.java b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/test/java/interfacewsdl/xml/WsdlInterfaceDoesNotMatchTestCase.java
index df2a2671df..df2a2671df 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/test/java/interfacewsdl/xml/WsdlInterfaceDoesNotMatchTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/test/java/interfacewsdl/xml/WsdlInterfaceDoesNotMatchTestCase.java
diff --git a/branches/sca-java-1.3.1/itest/validation/src/test/java/policy/xml/AlwaysProvidedIntentNotFoundTestCase.java b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/test/java/policy/xml/AlwaysProvidedIntentNotFoundTestCase.java
index 361e2f2bfb..361e2f2bfb 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/test/java/policy/xml/AlwaysProvidedIntentNotFoundTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/test/java/policy/xml/AlwaysProvidedIntentNotFoundTestCase.java
diff --git a/branches/sca-java-1.3.1/itest/validation/src/test/java/policy/xml/ErrorInPolicyIntentDefinitionTestCase.java b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/test/java/policy/xml/ErrorInPolicyIntentDefinitionTestCase.java
index a85dc334f4..a85dc334f4 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/test/java/policy/xml/ErrorInPolicyIntentDefinitionTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/test/java/policy/xml/ErrorInPolicyIntentDefinitionTestCase.java
diff --git a/branches/sca-java-1.3.1/itest/validation/src/test/java/policy/xml/IntentNotSpecifiedTestCase.java b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/test/java/policy/xml/IntentNotSpecifiedTestCase.java
index 3f98757ce5..3f98757ce5 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/test/java/policy/xml/IntentNotSpecifiedTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/test/java/policy/xml/IntentNotSpecifiedTestCase.java
diff --git a/branches/sca-java-1.3.1/itest/validation/src/test/java/policy/xml/MayProvideIntentNotFoundTestCase.java b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/test/java/policy/xml/MayProvideIntentNotFoundTestCase.java
index 3b8d075165..3b8d075165 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/test/java/policy/xml/MayProvideIntentNotFoundTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/test/java/policy/xml/MayProvideIntentNotFoundTestCase.java
diff --git a/branches/sca-java-1.3.1/itest/validation/src/test/java/policy/xml/RequiredAttributeMissingTestCase.java b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/test/java/policy/xml/RequiredAttributeMissingTestCase.java
index bcf1f82392..bcf1f82392 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/test/java/policy/xml/RequiredAttributeMissingTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/test/java/policy/xml/RequiredAttributeMissingTestCase.java
diff --git a/branches/sca-java-1.3.1/itest/validation/src/test/java/policy/xml/UnableToMapPoliciesTestCase.java b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/test/java/policy/xml/UnableToMapPoliciesTestCase.java
index 2a767d3550..2a767d3550 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/test/java/policy/xml/UnableToMapPoliciesTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/test/java/policy/xml/UnableToMapPoliciesTestCase.java
diff --git a/branches/sca-java-1.3.1/itest/validation/src/test/java/policy/xml/UnrecognizedIntentAttachPointTypeTestCase.java b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/test/java/policy/xml/UnrecognizedIntentAttachPointTypeTestCase.java
index eec39d711e..eec39d711e 100644
--- a/branches/sca-java-1.3.1/itest/validation/src/test/java/policy/xml/UnrecognizedIntentAttachPointTypeTestCase.java
+++ b/sca-java-1.x/branches/sca-java-1.3.1/itest/validation/src/test/java/policy/xml/UnrecognizedIntentAttachPointTypeTestCase.java