310 files changed, 0 insertions, 0 deletions

diff --git a/java/sca/itest/databindings/common/pom.xml b/java/sca/contrib/itest/databindings/common/pom.xml
index 661b264a49..661b264a49 100644
--- a/java/sca/itest/databindings/common/pom.xml
+++ b/java/sca/contrib/itest/databindings/common/pom.xml
diff --git a/java/sca/itest/databindings/common/src/main/java/org/apache/tuscany/sca/itest/generate/Generate.java b/java/sca/contrib/itest/databindings/common/src/main/java/org/apache/tuscany/sca/itest/generate/Generate.java
index adb546a1ea..adb546a1ea 100644
--- a/java/sca/itest/databindings/common/src/main/java/org/apache/tuscany/sca/itest/generate/Generate.java
+++ b/java/sca/contrib/itest/databindings/common/src/main/java/org/apache/tuscany/sca/itest/generate/Generate.java
diff --git a/java/sca/itest/databindings/common/src/main/resources/generate/DatabindingTestCase.java.vm b/java/sca/contrib/itest/databindings/common/src/main/resources/generate/DatabindingTestCase.java.vm
index db24ceab14..db24ceab14 100644
--- a/java/sca/itest/databindings/common/src/main/resources/generate/DatabindingTestCase.java.vm
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/generate/DatabindingTestCase.java.vm
diff --git a/java/sca/itest/databindings/common/src/main/resources/generate/Greeter.wsdl.vm b/java/sca/contrib/itest/databindings/common/src/main/resources/generate/Greeter.wsdl.vm
index 88616cc997..88616cc997 100644
--- a/java/sca/itest/databindings/common/src/main/resources/generate/Greeter.wsdl.vm
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/generate/Greeter.wsdl.vm
diff --git a/java/sca/itest/databindings/common/src/main/resources/generate/GreeterService.java.vm b/java/sca/contrib/itest/databindings/common/src/main/resources/generate/GreeterService.java.vm
index 2df4a558e6..2df4a558e6 100644
--- a/java/sca/itest/databindings/common/src/main/resources/generate/GreeterService.java.vm
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/generate/GreeterService.java.vm
diff --git a/java/sca/itest/databindings/common/src/main/resources/generate/GreeterServiceClient.java.vm b/java/sca/contrib/itest/databindings/common/src/main/resources/generate/GreeterServiceClient.java.vm
index b73173247f..b73173247f 100644
--- a/java/sca/itest/databindings/common/src/main/resources/generate/GreeterServiceClient.java.vm
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/generate/GreeterServiceClient.java.vm
diff --git a/java/sca/itest/databindings/common/src/main/resources/generate/GreeterServiceClientImpl.java.vm b/java/sca/contrib/itest/databindings/common/src/main/resources/generate/GreeterServiceClientImpl.java.vm
index 46c74ec819..46c74ec819 100644
--- a/java/sca/itest/databindings/common/src/main/resources/generate/GreeterServiceClientImpl.java.vm
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/generate/GreeterServiceClientImpl.java.vm
diff --git a/java/sca/itest/databindings/common/src/main/resources/generate/GreeterServiceImpl.java.vm b/java/sca/contrib/itest/databindings/common/src/main/resources/generate/GreeterServiceImpl.java.vm
index 2fd10ef0bf..2fd10ef0bf 100644
--- a/java/sca/itest/databindings/common/src/main/resources/generate/GreeterServiceImpl.java.vm
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/generate/GreeterServiceImpl.java.vm
diff --git a/java/sca/itest/databindings/common/src/main/resources/generate/generate.xsd b/java/sca/contrib/itest/databindings/common/src/main/resources/generate/generate.xsd
index 1fabedf55f..1fabedf55f 100644
--- a/java/sca/itest/databindings/common/src/main/resources/generate/generate.xsd
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/generate/generate.xsd
diff --git a/java/sca/itest/databindings/common/src/main/resources/wsdl/Dummy.txt b/java/sca/contrib/itest/databindings/common/src/main/resources/wsdl/Dummy.txt
index 8927d725b6..8927d725b6 100644
--- a/java/sca/itest/databindings/common/src/main/resources/wsdl/Dummy.txt
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/wsdl/Dummy.txt
diff --git a/java/sca/itest/databindings/common/src/main/resources/xsd/Annotation.xml b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/Annotation.xml
index f1f4346e58..f1f4346e58 100644
--- a/java/sca/itest/databindings/common/src/main/resources/xsd/Annotation.xml
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/Annotation.xml
diff --git a/java/sca/itest/databindings/common/src/main/resources/xsd/Annotation.xsd b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/Annotation.xsd
index 1fae43eb09..1fae43eb09 100644
--- a/java/sca/itest/databindings/common/src/main/resources/xsd/Annotation.xsd
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/Annotation.xsd
diff --git a/java/sca/itest/databindings/common/src/main/resources/xsd/Attribute.xml b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/Attribute.xml
index c20c80b658..c20c80b658 100644
--- a/java/sca/itest/databindings/common/src/main/resources/xsd/Attribute.xml
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/Attribute.xml
diff --git a/java/sca/itest/databindings/common/src/main/resources/xsd/Attribute.xsd b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/Attribute.xsd
index bd3db2e030..bd3db2e030 100644
--- a/java/sca/itest/databindings/common/src/main/resources/xsd/Attribute.xsd
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/Attribute.xsd
diff --git a/java/sca/itest/databindings/common/src/main/resources/xsd/AttributeReference.xml b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/AttributeReference.xml
index 30e4979dca..30e4979dca 100644
--- a/java/sca/itest/databindings/common/src/main/resources/xsd/AttributeReference.xml
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/AttributeReference.xml
diff --git a/java/sca/itest/databindings/common/src/main/resources/xsd/AttributeReference.xsd b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/AttributeReference.xsd
index e7738dcff7..e7738dcff7 100644
--- a/java/sca/itest/databindings/common/src/main/resources/xsd/AttributeReference.xsd
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/AttributeReference.xsd
diff --git a/java/sca/itest/databindings/common/src/main/resources/xsd/AttributeWithDefaultValue.xml b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/AttributeWithDefaultValue.xml
index 9552421e2d..9552421e2d 100644
--- a/java/sca/itest/databindings/common/src/main/resources/xsd/AttributeWithDefaultValue.xml
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/AttributeWithDefaultValue.xml
diff --git a/java/sca/itest/databindings/common/src/main/resources/xsd/AttributeWithDefaultValue.xsd b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/AttributeWithDefaultValue.xsd
index c7b9655749..c7b9655749 100644
--- a/java/sca/itest/databindings/common/src/main/resources/xsd/AttributeWithDefaultValue.xsd
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/AttributeWithDefaultValue.xsd
diff --git a/java/sca/itest/databindings/common/src/main/resources/xsd/AttributeWithFixedValue.xml b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/AttributeWithFixedValue.xml
index 5e5e7fbd55..5e5e7fbd55 100644
--- a/java/sca/itest/databindings/common/src/main/resources/xsd/AttributeWithFixedValue.xml
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/AttributeWithFixedValue.xml
diff --git a/java/sca/itest/databindings/common/src/main/resources/xsd/AttributeWithFixedValue.xsd b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/AttributeWithFixedValue.xsd
index 5c455c2ab5..5c455c2ab5 100644
--- a/java/sca/itest/databindings/common/src/main/resources/xsd/AttributeWithFixedValue.xsd
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/AttributeWithFixedValue.xsd
diff --git a/java/sca/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOAliasName.xml b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOAliasName.xml
index 635e851632..635e851632 100644
--- a/java/sca/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOAliasName.xml
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOAliasName.xml
diff --git a/java/sca/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOAliasName.xsd b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOAliasName.xsd
index 004dab4fbb..004dab4fbb 100644
--- a/java/sca/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOAliasName.xsd
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOAliasName.xsd
diff --git a/java/sca/itest/databindings/common/src/main/resources/xsd/AttributeWithSDODataType.xml b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/AttributeWithSDODataType.xml
index 136092951b..136092951b 100644
--- a/java/sca/itest/databindings/common/src/main/resources/xsd/AttributeWithSDODataType.xml
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/AttributeWithSDODataType.xml
diff --git a/java/sca/itest/databindings/common/src/main/resources/xsd/AttributeWithSDODataType.xsd b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/AttributeWithSDODataType.xsd
index 796f08e1cf..796f08e1cf 100644
--- a/java/sca/itest/databindings/common/src/main/resources/xsd/AttributeWithSDODataType.xsd
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/AttributeWithSDODataType.xsd
diff --git a/java/sca/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOName.xml b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOName.xml
index 927b94885c..927b94885c 100644
--- a/java/sca/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOName.xml
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOName.xml
diff --git a/java/sca/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOName.xsd b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOName.xsd
index 93f83cd0a1..93f83cd0a1 100644
--- a/java/sca/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOName.xsd
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOName.xsd
diff --git a/java/sca/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertySDOOppositePropertyType.xml b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertySDOOppositePropertyType.xml
index ea7db70595..ea7db70595 100644
--- a/java/sca/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertySDOOppositePropertyType.xml
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertySDOOppositePropertyType.xml
diff --git a/java/sca/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertySDOOppositePropertyType.xsd b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertySDOOppositePropertyType.xsd
index c64323e7e1..c64323e7e1 100644
--- a/java/sca/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertySDOOppositePropertyType.xsd
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertySDOOppositePropertyType.xsd
diff --git a/java/sca/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertyType.xml b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertyType.xml
index 85c7d85fd4..85c7d85fd4 100644
--- a/java/sca/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertyType.xml
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertyType.xml
diff --git a/java/sca/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertyType.xsd b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertyType.xsd
index 543f276c50..543f276c50 100644
--- a/java/sca/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertyType.xsd
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOPropertyType.xsd
diff --git a/java/sca/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOString.xml b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOString.xml
index fcd281539b..fcd281539b 100644
--- a/java/sca/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOString.xml
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOString.xml
diff --git a/java/sca/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOString.xsd b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOString.xsd
index 1610c2b861..1610c2b861 100644
--- a/java/sca/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOString.xsd
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/AttributeWithSDOString.xsd
diff --git a/java/sca/itest/databindings/common/src/main/resources/xsd/BuiltInAnySimpleType.xml b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInAnySimpleType.xml
index 36a0760a61..36a0760a61 100644
--- a/java/sca/itest/databindings/common/src/main/resources/xsd/BuiltInAnySimpleType.xml
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInAnySimpleType.xml
diff --git a/java/sca/itest/databindings/common/src/main/resources/xsd/BuiltInAnySimpleType.xsd b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInAnySimpleType.xsd
index 999b72bb35..999b72bb35 100644
--- a/java/sca/itest/databindings/common/src/main/resources/xsd/BuiltInAnySimpleType.xsd
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInAnySimpleType.xsd
diff --git a/java/sca/itest/databindings/common/src/main/resources/xsd/BuiltInAnyType.xml b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInAnyType.xml
index 5849165fe0..5849165fe0 100644
--- a/java/sca/itest/databindings/common/src/main/resources/xsd/BuiltInAnyType.xml
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInAnyType.xml
diff --git a/java/sca/itest/databindings/common/src/main/resources/xsd/BuiltInAnyType.xsd b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInAnyType.xsd
index 71dad561ca..71dad561ca 100644
--- a/java/sca/itest/databindings/common/src/main/resources/xsd/BuiltInAnyType.xsd
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInAnyType.xsd
diff --git a/java/sca/itest/databindings/common/src/main/resources/xsd/BuiltInAnyURI.xml b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInAnyURI.xml
index 8acf9376d7..8acf9376d7 100644
--- a/java/sca/itest/databindings/common/src/main/resources/xsd/BuiltInAnyURI.xml
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInAnyURI.xml
diff --git a/java/sca/itest/databindings/common/src/main/resources/xsd/BuiltInAnyURI.xsd b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInAnyURI.xsd
index a49987c352..a49987c352 100644
--- a/java/sca/itest/databindings/common/src/main/resources/xsd/BuiltInAnyURI.xsd
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInAnyURI.xsd
diff --git a/java/sca/itest/databindings/common/src/main/resources/xsd/BuiltInBase64Binary.xml b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInBase64Binary.xml
index a35b6e174a..a35b6e174a 100644
--- a/java/sca/itest/databindings/common/src/main/resources/xsd/BuiltInBase64Binary.xml
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInBase64Binary.xml
diff --git a/java/sca/itest/databindings/common/src/main/resources/xsd/BuiltInBase64Binary.xsd b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInBase64Binary.xsd
index e1995890f9..e1995890f9 100644
--- a/java/sca/itest/databindings/common/src/main/resources/xsd/BuiltInBase64Binary.xsd
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInBase64Binary.xsd
diff --git a/java/sca/itest/databindings/common/src/main/resources/xsd/BuiltInBoolean.xml b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInBoolean.xml
index 91cfce51b8..91cfce51b8 100644
--- a/java/sca/itest/databindings/common/src/main/resources/xsd/BuiltInBoolean.xml
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInBoolean.xml
diff --git a/java/sca/itest/databindings/common/src/main/resources/xsd/BuiltInBoolean.xsd b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInBoolean.xsd
index a2f86ba8c5..a2f86ba8c5 100644
--- a/java/sca/itest/databindings/common/src/main/resources/xsd/BuiltInBoolean.xsd
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInBoolean.xsd
diff --git a/java/sca/itest/databindings/common/src/main/resources/xsd/BuiltInByte.xml b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInByte.xml
index 907474cd1b..907474cd1b 100644
--- a/java/sca/itest/databindings/common/src/main/resources/xsd/BuiltInByte.xml
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInByte.xml
diff --git a/java/sca/itest/databindings/common/src/main/resources/xsd/BuiltInByte.xsd b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInByte.xsd
index a2f6bcfa77..a2f6bcfa77 100644
--- a/java/sca/itest/databindings/common/src/main/resources/xsd/BuiltInByte.xsd
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInByte.xsd
diff --git a/java/sca/itest/databindings/common/src/main/resources/xsd/BuiltInDate.xml b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInDate.xml
index c5820e1a2e..c5820e1a2e 100644
--- a/java/sca/itest/databindings/common/src/main/resources/xsd/BuiltInDate.xml
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInDate.xml
diff --git a/java/sca/itest/databindings/common/src/main/resources/xsd/BuiltInDate.xsd b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInDate.xsd
index f4d596bfe3..f4d596bfe3 100644
--- a/java/sca/itest/databindings/common/src/main/resources/xsd/BuiltInDate.xsd
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInDate.xsd
diff --git a/java/sca/itest/databindings/common/src/main/resources/xsd/BuiltInDateTime.xml b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInDateTime.xml
index 0debe2fec5..0debe2fec5 100644
--- a/java/sca/itest/databindings/common/src/main/resources/xsd/BuiltInDateTime.xml
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInDateTime.xml
diff --git a/java/sca/itest/databindings/common/src/main/resources/xsd/BuiltInDateTime.xsd b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInDateTime.xsd
index b5bcfdcfd4..b5bcfdcfd4 100644
--- a/java/sca/itest/databindings/common/src/main/resources/xsd/BuiltInDateTime.xsd
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInDateTime.xsd
diff --git a/java/sca/itest/databindings/common/src/main/resources/xsd/BuiltInDecimal.xml b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInDecimal.xml
index 7f001254cc..7f001254cc 100644
--- a/java/sca/itest/databindings/common/src/main/resources/xsd/BuiltInDecimal.xml
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInDecimal.xml
diff --git a/java/sca/itest/databindings/common/src/main/resources/xsd/BuiltInDecimal.xsd b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInDecimal.xsd
index 8d4d106f59..8d4d106f59 100644
--- a/java/sca/itest/databindings/common/src/main/resources/xsd/BuiltInDecimal.xsd
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInDecimal.xsd
diff --git a/java/sca/itest/databindings/common/src/main/resources/xsd/BuiltInDouble.xml b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInDouble.xml
index f875b9f94d..f875b9f94d 100644
--- a/java/sca/itest/databindings/common/src/main/resources/xsd/BuiltInDouble.xml
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInDouble.xml
diff --git a/java/sca/itest/databindings/common/src/main/resources/xsd/BuiltInDouble.xsd b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInDouble.xsd
index 4c8a39b06c..4c8a39b06c 100644
--- a/java/sca/itest/databindings/common/src/main/resources/xsd/BuiltInDouble.xsd
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInDouble.xsd
diff --git a/java/sca/itest/databindings/common/src/main/resources/xsd/BuiltInDuration.xml b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInDuration.xml
index 7d343d6dda..7d343d6dda 100644
--- a/java/sca/itest/databindings/common/src/main/resources/xsd/BuiltInDuration.xml
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInDuration.xml
diff --git a/java/sca/itest/databindings/common/src/main/resources/xsd/BuiltInDuration.xsd b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInDuration.xsd
index bb12bc04a9..bb12bc04a9 100644
--- a/java/sca/itest/databindings/common/src/main/resources/xsd/BuiltInDuration.xsd
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInDuration.xsd
diff --git a/java/sca/itest/databindings/common/src/main/resources/xsd/BuiltInFloat.xml b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInFloat.xml
index 7a81f3b0dd..7a81f3b0dd 100644
--- a/java/sca/itest/databindings/common/src/main/resources/xsd/BuiltInFloat.xml
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInFloat.xml
diff --git a/java/sca/itest/databindings/common/src/main/resources/xsd/BuiltInFloat.xsd b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInFloat.xsd
index f0e1c21233..f0e1c21233 100644
--- a/java/sca/itest/databindings/common/src/main/resources/xsd/BuiltInFloat.xsd
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInFloat.xsd
diff --git a/java/sca/itest/databindings/common/src/main/resources/xsd/BuiltInGDay.xml b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInGDay.xml
index d35568b3c9..d35568b3c9 100644
--- a/java/sca/itest/databindings/common/src/main/resources/xsd/BuiltInGDay.xml
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInGDay.xml
diff --git a/java/sca/itest/databindings/common/src/main/resources/xsd/BuiltInGDay.xsd b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInGDay.xsd
index 92bd9a4b66..92bd9a4b66 100644
--- a/java/sca/itest/databindings/common/src/main/resources/xsd/BuiltInGDay.xsd
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInGDay.xsd
diff --git a/java/sca/itest/databindings/common/src/main/resources/xsd/BuiltInGMonth.xml b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInGMonth.xml
index 52cdfa8c4e..52cdfa8c4e 100644
--- a/java/sca/itest/databindings/common/src/main/resources/xsd/BuiltInGMonth.xml
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInGMonth.xml
diff --git a/java/sca/itest/databindings/common/src/main/resources/xsd/BuiltInGMonth.xsd b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInGMonth.xsd
index 78d001a585..78d001a585 100644
--- a/java/sca/itest/databindings/common/src/main/resources/xsd/BuiltInGMonth.xsd
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInGMonth.xsd
diff --git a/java/sca/itest/databindings/common/src/main/resources/xsd/BuiltInGMonthDay.xml b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInGMonthDay.xml
index 2609a858f7..2609a858f7 100644
--- a/java/sca/itest/databindings/common/src/main/resources/xsd/BuiltInGMonthDay.xml
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInGMonthDay.xml
diff --git a/java/sca/itest/databindings/common/src/main/resources/xsd/BuiltInGMonthDay.xsd b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInGMonthDay.xsd
index 38f6c55059..38f6c55059 100644
--- a/java/sca/itest/databindings/common/src/main/resources/xsd/BuiltInGMonthDay.xsd
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInGMonthDay.xsd
diff --git a/java/sca/itest/databindings/common/src/main/resources/xsd/BuiltInGYear.xml b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInGYear.xml
index 7868a47ca3..7868a47ca3 100644
--- a/java/sca/itest/databindings/common/src/main/resources/xsd/BuiltInGYear.xml
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInGYear.xml
diff --git a/java/sca/itest/databindings/common/src/main/resources/xsd/BuiltInGYear.xsd b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInGYear.xsd
index 0d65b124ff..0d65b124ff 100644
--- a/java/sca/itest/databindings/common/src/main/resources/xsd/BuiltInGYear.xsd
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInGYear.xsd
diff --git a/java/sca/itest/databindings/common/src/main/resources/xsd/BuiltInGYearMonth.xml b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInGYearMonth.xml
index 3f5080d49f..3f5080d49f 100644
--- a/java/sca/itest/databindings/common/src/main/resources/xsd/BuiltInGYearMonth.xml
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInGYearMonth.xml
diff --git a/java/sca/itest/databindings/common/src/main/resources/xsd/BuiltInGYearMonth.xsd b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInGYearMonth.xsd
index 340555dc5f..340555dc5f 100644
--- a/java/sca/itest/databindings/common/src/main/resources/xsd/BuiltInGYearMonth.xsd
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInGYearMonth.xsd
diff --git a/java/sca/itest/databindings/common/src/main/resources/xsd/BuiltInHexBinary.xml b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInHexBinary.xml
index 0deb7af980..0deb7af980 100644
--- a/java/sca/itest/databindings/common/src/main/resources/xsd/BuiltInHexBinary.xml
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInHexBinary.xml
diff --git a/java/sca/itest/databindings/common/src/main/resources/xsd/BuiltInHexBinary.xsd b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInHexBinary.xsd
index 8059fe6da0..8059fe6da0 100644
--- a/java/sca/itest/databindings/common/src/main/resources/xsd/BuiltInHexBinary.xsd
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInHexBinary.xsd
diff --git a/java/sca/itest/databindings/common/src/main/resources/xsd/BuiltInID.xml b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInID.xml
index 06c92ce19b..06c92ce19b 100644
--- a/java/sca/itest/databindings/common/src/main/resources/xsd/BuiltInID.xml
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInID.xml
diff --git a/java/sca/itest/databindings/common/src/main/resources/xsd/BuiltInID.xsd b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInID.xsd
index 7b1f02d1d4..7b1f02d1d4 100644
--- a/java/sca/itest/databindings/common/src/main/resources/xsd/BuiltInID.xsd
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInID.xsd
diff --git a/java/sca/itest/databindings/common/src/main/resources/xsd/BuiltInIDREF.xml b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInIDREF.xml
index 9bc0cefd0f..9bc0cefd0f 100644
--- a/java/sca/itest/databindings/common/src/main/resources/xsd/BuiltInIDREF.xml
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInIDREF.xml
diff --git a/java/sca/itest/databindings/common/src/main/resources/xsd/BuiltInIDREF.xsd b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInIDREF.xsd
index 0c207983bc..0c207983bc 100644
--- a/java/sca/itest/databindings/common/src/main/resources/xsd/BuiltInIDREF.xsd
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInIDREF.xsd
diff --git a/java/sca/itest/databindings/common/src/main/resources/xsd/BuiltInIDREFS.xml b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInIDREFS.xml
index f91b602f99..f91b602f99 100644
--- a/java/sca/itest/databindings/common/src/main/resources/xsd/BuiltInIDREFS.xml
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInIDREFS.xml
diff --git a/java/sca/itest/databindings/common/src/main/resources/xsd/BuiltInIDREFS.xsd b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInIDREFS.xsd
index b99bf01b73..b99bf01b73 100644
--- a/java/sca/itest/databindings/common/src/main/resources/xsd/BuiltInIDREFS.xsd
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInIDREFS.xsd
diff --git a/java/sca/itest/databindings/common/src/main/resources/xsd/BuiltInInt.xml b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInInt.xml
index c99698e175..c99698e175 100644
--- a/java/sca/itest/databindings/common/src/main/resources/xsd/BuiltInInt.xml
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInInt.xml
diff --git a/java/sca/itest/databindings/common/src/main/resources/xsd/BuiltInInt.xsd b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInInt.xsd
index b5b9b0d1eb..b5b9b0d1eb 100644
--- a/java/sca/itest/databindings/common/src/main/resources/xsd/BuiltInInt.xsd
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInInt.xsd
diff --git a/java/sca/itest/databindings/common/src/main/resources/xsd/BuiltInInteger.xml b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInInteger.xml
index 80d22ce057..80d22ce057 100644
--- a/java/sca/itest/databindings/common/src/main/resources/xsd/BuiltInInteger.xml
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInInteger.xml
diff --git a/java/sca/itest/databindings/common/src/main/resources/xsd/BuiltInInteger.xsd b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInInteger.xsd
index 4902935db5..4902935db5 100644
--- a/java/sca/itest/databindings/common/src/main/resources/xsd/BuiltInInteger.xsd
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInInteger.xsd
diff --git a/java/sca/itest/databindings/common/src/main/resources/xsd/BuiltInLanguage.xml b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInLanguage.xml
index 664bf824b4..664bf824b4 100644
--- a/java/sca/itest/databindings/common/src/main/resources/xsd/BuiltInLanguage.xml
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInLanguage.xml
diff --git a/java/sca/itest/databindings/common/src/main/resources/xsd/BuiltInLanguage.xsd b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInLanguage.xsd
index 5d3658d224..5d3658d224 100644
--- a/java/sca/itest/databindings/common/src/main/resources/xsd/BuiltInLanguage.xsd
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInLanguage.xsd
diff --git a/java/sca/itest/databindings/common/src/main/resources/xsd/BuiltInLong.xml b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInLong.xml
index c5861fa92a..c5861fa92a 100644
--- a/java/sca/itest/databindings/common/src/main/resources/xsd/BuiltInLong.xml
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInLong.xml
diff --git a/java/sca/itest/databindings/common/src/main/resources/xsd/BuiltInLong.xsd b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInLong.xsd
index 0aa4710057..0aa4710057 100644
--- a/java/sca/itest/databindings/common/src/main/resources/xsd/BuiltInLong.xsd
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInLong.xsd
diff --git a/java/sca/itest/databindings/common/src/main/resources/xsd/BuiltInNCName.xml b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInNCName.xml
index 1f95950394..1f95950394 100644
--- a/java/sca/itest/databindings/common/src/main/resources/xsd/BuiltInNCName.xml
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInNCName.xml
diff --git a/java/sca/itest/databindings/common/src/main/resources/xsd/BuiltInNCName.xsd b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInNCName.xsd
index 6ee9c435db..6ee9c435db 100644
--- a/java/sca/itest/databindings/common/src/main/resources/xsd/BuiltInNCName.xsd
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInNCName.xsd
diff --git a/java/sca/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKEN.xml b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKEN.xml
index 0297f1aeb4..0297f1aeb4 100644
--- a/java/sca/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKEN.xml
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKEN.xml
diff --git a/java/sca/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKEN.xsd b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKEN.xsd
index 56d027bdbb..56d027bdbb 100644
--- a/java/sca/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKEN.xsd
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKEN.xsd
diff --git a/java/sca/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKENS.xml b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKENS.xml
index 81ba1069bd..81ba1069bd 100644
--- a/java/sca/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKENS.xml
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKENS.xml
diff --git a/java/sca/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKENS.xsd b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKENS.xsd
index 866ab73024..866ab73024 100644
--- a/java/sca/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKENS.xsd
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInNMTOKENS.xsd
diff --git a/java/sca/itest/databindings/common/src/main/resources/xsd/BuiltInNOTATION.xml b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInNOTATION.xml
index 8bb3a08b94..8bb3a08b94 100644
--- a/java/sca/itest/databindings/common/src/main/resources/xsd/BuiltInNOTATION.xml
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInNOTATION.xml
diff --git a/java/sca/itest/databindings/common/src/main/resources/xsd/BuiltInNOTATION.xsd b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInNOTATION.xsd
index c7c62f812b..c7c62f812b 100644
--- a/java/sca/itest/databindings/common/src/main/resources/xsd/BuiltInNOTATION.xsd
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInNOTATION.xsd
diff --git a/java/sca/itest/databindings/common/src/main/resources/xsd/BuiltInName.xml b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInName.xml
index 8235718c5e..8235718c5e 100644
--- a/java/sca/itest/databindings/common/src/main/resources/xsd/BuiltInName.xml
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInName.xml
diff --git a/java/sca/itest/databindings/common/src/main/resources/xsd/BuiltInName.xsd b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInName.xsd
index 36caba2f16..36caba2f16 100644
--- a/java/sca/itest/databindings/common/src/main/resources/xsd/BuiltInName.xsd
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInName.xsd
diff --git a/java/sca/itest/databindings/common/src/main/resources/xsd/BuiltInNegativeInteger.xml b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInNegativeInteger.xml
index 599c428a44..599c428a44 100644
--- a/java/sca/itest/databindings/common/src/main/resources/xsd/BuiltInNegativeInteger.xml
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInNegativeInteger.xml
diff --git a/java/sca/itest/databindings/common/src/main/resources/xsd/BuiltInNegativeInteger.xsd b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInNegativeInteger.xsd
index 389d5a99f0..389d5a99f0 100644
--- a/java/sca/itest/databindings/common/src/main/resources/xsd/BuiltInNegativeInteger.xsd
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInNegativeInteger.xsd
diff --git a/java/sca/itest/databindings/common/src/main/resources/xsd/BuiltInNonNegativeInteger.xml b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInNonNegativeInteger.xml
index 919c4a20ee..919c4a20ee 100644
--- a/java/sca/itest/databindings/common/src/main/resources/xsd/BuiltInNonNegativeInteger.xml
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInNonNegativeInteger.xml
diff --git a/java/sca/itest/databindings/common/src/main/resources/xsd/BuiltInNonNegativeInteger.xsd b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInNonNegativeInteger.xsd
index 59887078b5..59887078b5 100644
--- a/java/sca/itest/databindings/common/src/main/resources/xsd/BuiltInNonNegativeInteger.xsd
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInNonNegativeInteger.xsd
diff --git a/java/sca/itest/databindings/common/src/main/resources/xsd/BuiltInNonPositiveInteger.xml b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInNonPositiveInteger.xml
index 79011f26ab..79011f26ab 100644
--- a/java/sca/itest/databindings/common/src/main/resources/xsd/BuiltInNonPositiveInteger.xml
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInNonPositiveInteger.xml
diff --git a/java/sca/itest/databindings/common/src/main/resources/xsd/BuiltInNonPositiveInteger.xsd b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInNonPositiveInteger.xsd
index 5de7d64d7b..5de7d64d7b 100644
--- a/java/sca/itest/databindings/common/src/main/resources/xsd/BuiltInNonPositiveInteger.xsd
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInNonPositiveInteger.xsd
diff --git a/java/sca/itest/databindings/common/src/main/resources/xsd/BuiltInNormalizedString.xml b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInNormalizedString.xml
index c40be9e18b..c40be9e18b 100644
--- a/java/sca/itest/databindings/common/src/main/resources/xsd/BuiltInNormalizedString.xml
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInNormalizedString.xml
diff --git a/java/sca/itest/databindings/common/src/main/resources/xsd/BuiltInNormalizedString.xsd b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInNormalizedString.xsd
index d4a78787b8..d4a78787b8 100644
--- a/java/sca/itest/databindings/common/src/main/resources/xsd/BuiltInNormalizedString.xsd
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInNormalizedString.xsd
diff --git a/java/sca/itest/databindings/common/src/main/resources/xsd/BuiltInPositiveInteger.xml b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInPositiveInteger.xml
index c30434de66..c30434de66 100644
--- a/java/sca/itest/databindings/common/src/main/resources/xsd/BuiltInPositiveInteger.xml
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInPositiveInteger.xml
diff --git a/java/sca/itest/databindings/common/src/main/resources/xsd/BuiltInPositiveInteger.xsd b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInPositiveInteger.xsd
index 5381590cd1..5381590cd1 100644
--- a/java/sca/itest/databindings/common/src/main/resources/xsd/BuiltInPositiveInteger.xsd
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInPositiveInteger.xsd
diff --git a/java/sca/itest/databindings/common/src/main/resources/xsd/BuiltInQName.xml b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInQName.xml
index 4cd6ea7e72..4cd6ea7e72 100644
--- a/java/sca/itest/databindings/common/src/main/resources/xsd/BuiltInQName.xml
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInQName.xml
diff --git a/java/sca/itest/databindings/common/src/main/resources/xsd/BuiltInQName.xsd b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInQName.xsd
index e8faf6225b..e8faf6225b 100644
--- a/java/sca/itest/databindings/common/src/main/resources/xsd/BuiltInQName.xsd
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInQName.xsd
diff --git a/java/sca/itest/databindings/common/src/main/resources/xsd/BuiltInShort.xml b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInShort.xml
index b4375467c4..b4375467c4 100644
--- a/java/sca/itest/databindings/common/src/main/resources/xsd/BuiltInShort.xml
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInShort.xml
diff --git a/java/sca/itest/databindings/common/src/main/resources/xsd/BuiltInShort.xsd b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInShort.xsd
index a4f564d9b7..a4f564d9b7 100644
--- a/java/sca/itest/databindings/common/src/main/resources/xsd/BuiltInShort.xsd
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInShort.xsd
diff --git a/java/sca/itest/databindings/common/src/main/resources/xsd/BuiltInString.xml b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInString.xml
index d30ab85530..d30ab85530 100644
--- a/java/sca/itest/databindings/common/src/main/resources/xsd/BuiltInString.xml
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInString.xml
diff --git a/java/sca/itest/databindings/common/src/main/resources/xsd/BuiltInString.xsd b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInString.xsd
index 8abb34b5a5..8abb34b5a5 100644
--- a/java/sca/itest/databindings/common/src/main/resources/xsd/BuiltInString.xsd
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInString.xsd
diff --git a/java/sca/itest/databindings/common/src/main/resources/xsd/BuiltInTime.xml b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInTime.xml
index 7fd9a061ae..7fd9a061ae 100644
--- a/java/sca/itest/databindings/common/src/main/resources/xsd/BuiltInTime.xml
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInTime.xml
diff --git a/java/sca/itest/databindings/common/src/main/resources/xsd/BuiltInTime.xsd b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInTime.xsd
index 1615976813..1615976813 100644
--- a/java/sca/itest/databindings/common/src/main/resources/xsd/BuiltInTime.xsd
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInTime.xsd
diff --git a/java/sca/itest/databindings/common/src/main/resources/xsd/BuiltInToken.xml b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInToken.xml
index cd567ba528..cd567ba528 100644
--- a/java/sca/itest/databindings/common/src/main/resources/xsd/BuiltInToken.xml
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInToken.xml
diff --git a/java/sca/itest/databindings/common/src/main/resources/xsd/BuiltInToken.xsd b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInToken.xsd
index 0beaac571f..0beaac571f 100644
--- a/java/sca/itest/databindings/common/src/main/resources/xsd/BuiltInToken.xsd
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInToken.xsd
diff --git a/java/sca/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedByte.xml b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedByte.xml
index 025362defb..025362defb 100644
--- a/java/sca/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedByte.xml
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedByte.xml
diff --git a/java/sca/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedByte.xsd b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedByte.xsd
index d6d951fe5d..d6d951fe5d 100644
--- a/java/sca/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedByte.xsd
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedByte.xsd
diff --git a/java/sca/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedInt.xml b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedInt.xml
index 5736a8c121..5736a8c121 100644
--- a/java/sca/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedInt.xml
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedInt.xml
diff --git a/java/sca/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedInt.xsd b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedInt.xsd
index 242be1d53b..242be1d53b 100644
--- a/java/sca/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedInt.xsd
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedInt.xsd
diff --git a/java/sca/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedLong.xml b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedLong.xml
index d728115a77..d728115a77 100644
--- a/java/sca/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedLong.xml
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedLong.xml
diff --git a/java/sca/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedLong.xsd b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedLong.xsd
index 108e3a8619..108e3a8619 100644
--- a/java/sca/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedLong.xsd
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedLong.xsd
diff --git a/java/sca/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedShort.xml b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedShort.xml
index d4ffae5e17..d4ffae5e17 100644
--- a/java/sca/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedShort.xml
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedShort.xml
diff --git a/java/sca/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedShort.xsd b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedShort.xsd
index 5ee5e0229e..5ee5e0229e 100644
--- a/java/sca/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedShort.xsd
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/BuiltInUnsignedShort.xsd
diff --git a/java/sca/itest/databindings/common/src/main/resources/xsd/ComplexTypeComplexContentRestrictingComplexType.xml b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeComplexContentRestrictingComplexType.xml
index 3d5aed5aa8..3d5aed5aa8 100644
--- a/java/sca/itest/databindings/common/src/main/resources/xsd/ComplexTypeComplexContentRestrictingComplexType.xml
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeComplexContentRestrictingComplexType.xml
diff --git a/java/sca/itest/databindings/common/src/main/resources/xsd/ComplexTypeComplexContentRestrictingComplexType.xsd b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeComplexContentRestrictingComplexType.xsd
index e7b80ab11c..e7b80ab11c 100644
--- a/java/sca/itest/databindings/common/src/main/resources/xsd/ComplexTypeComplexContentRestrictingComplexType.xsd
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeComplexContentRestrictingComplexType.xsd
diff --git a/java/sca/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingComplexType.xml b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingComplexType.xml
index 2b4fe5594e..2b4fe5594e 100644
--- a/java/sca/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingComplexType.xml
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingComplexType.xml
diff --git a/java/sca/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingComplexType.xsd b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingComplexType.xsd
index fc4deb63c2..fc4deb63c2 100644
--- a/java/sca/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingComplexType.xsd
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingComplexType.xsd
diff --git a/java/sca/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingSimpleType.xml b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingSimpleType.xml
index 03570f41d9..03570f41d9 100644
--- a/java/sca/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingSimpleType.xml
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingSimpleType.xml
diff --git a/java/sca/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingSimpleType.xsd b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingSimpleType.xsd
index c754502645..c754502645 100644
--- a/java/sca/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingSimpleType.xsd
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeExtendingSimpleType.xsd
diff --git a/java/sca/itest/databindings/common/src/main/resources/xsd/ComplexTypeSimpleContentRestrictingComplexType.xml b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeSimpleContentRestrictingComplexType.xml
index 4603793bfc..4603793bfc 100644
--- a/java/sca/itest/databindings/common/src/main/resources/xsd/ComplexTypeSimpleContentRestrictingComplexType.xml
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeSimpleContentRestrictingComplexType.xml
diff --git a/java/sca/itest/databindings/common/src/main/resources/xsd/ComplexTypeSimpleContentRestrictingComplexType.xsd b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeSimpleContentRestrictingComplexType.xsd
index 4bcd2f8c46..4bcd2f8c46 100644
--- a/java/sca/itest/databindings/common/src/main/resources/xsd/ComplexTypeSimpleContentRestrictingComplexType.xsd
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeSimpleContentRestrictingComplexType.xsd
diff --git a/java/sca/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithAbstract.xml b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithAbstract.xml
index a6861f803a..a6861f803a 100644
--- a/java/sca/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithAbstract.xml
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithAbstract.xml
diff --git a/java/sca/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithAbstract.xsd b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithAbstract.xsd
index 8bb251cab2..8bb251cab2 100644
--- a/java/sca/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithAbstract.xsd
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithAbstract.xsd
diff --git a/java/sca/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithCDATA.xml b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithCDATA.xml
index 467ec007ed..467ec007ed 100644
--- a/java/sca/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithCDATA.xml
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithCDATA.xml
diff --git a/java/sca/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithCDATA.xsd b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithCDATA.xsd
index 8d00646678..8d00646678 100644
--- a/java/sca/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithCDATA.xsd
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithCDATA.xsd
diff --git a/java/sca/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithContent.xml b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithContent.xml
index 7deafd798a..7deafd798a 100644
--- a/java/sca/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithContent.xml
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithContent.xml
diff --git a/java/sca/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithContent.xsd b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithContent.xsd
index 72ac75fee0..72ac75fee0 100644
--- a/java/sca/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithContent.xsd
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithContent.xsd
diff --git a/java/sca/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithMixed.xml b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithMixed.xml
index f6208f81b3..f6208f81b3 100644
--- a/java/sca/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithMixed.xml
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithMixed.xml
diff --git a/java/sca/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithMixed.xsd b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithMixed.xsd
index 1f26e13673..1f26e13673 100644
--- a/java/sca/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithMixed.xsd
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithMixed.xsd
diff --git a/java/sca/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenAttributes.xml b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenAttributes.xml
index 97de7b98eb..97de7b98eb 100644
--- a/java/sca/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenAttributes.xml
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenAttributes.xml
diff --git a/java/sca/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenAttributes.xsd b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenAttributes.xsd
index 67716553d8..67716553d8 100644
--- a/java/sca/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenAttributes.xsd
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenAttributes.xsd
diff --git a/java/sca/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenContent.xml b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenContent.xml
index 5941348921..5941348921 100644
--- a/java/sca/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenContent.xml
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenContent.xml
diff --git a/java/sca/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenContent.xsd b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenContent.xsd
index 24d5d09054..24d5d09054 100644
--- a/java/sca/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenContent.xsd
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOpenContent.xsd
diff --git a/java/sca/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOppositeProperty.xml b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOppositeProperty.xml
index f684d06a4d..f684d06a4d 100644
--- a/java/sca/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOppositeProperty.xml
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOppositeProperty.xml
diff --git a/java/sca/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOppositeProperty.xsd b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOppositeProperty.xsd
index de4a8a666d..de4a8a666d 100644
--- a/java/sca/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOppositeProperty.xsd
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithOppositeProperty.xsd
diff --git a/java/sca/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOAliasName.xml b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOAliasName.xml
index 242908bd27..242908bd27 100644
--- a/java/sca/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOAliasName.xml
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOAliasName.xml
diff --git a/java/sca/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOAliasName.xsd b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOAliasName.xsd
index 4c00fbe295..4c00fbe295 100644
--- a/java/sca/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOAliasName.xsd
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOAliasName.xsd
diff --git a/java/sca/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOName.xml b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOName.xml
index 925e8625d5..925e8625d5 100644
--- a/java/sca/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOName.xml
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOName.xml
diff --git a/java/sca/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOName.xsd b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOName.xsd
index b12bec040b..b12bec040b 100644
--- a/java/sca/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOName.xsd
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOName.xsd
diff --git a/java/sca/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOSequence.xml b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOSequence.xml
index c73708ce46..c73708ce46 100644
--- a/java/sca/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOSequence.xml
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOSequence.xml
diff --git a/java/sca/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOSequence.xsd b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOSequence.xsd
index 795c3ea7d9..795c3ea7d9 100644
--- a/java/sca/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOSequence.xsd
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithSDOSequence.xsd
diff --git a/java/sca/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutContent.xml b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutContent.xml
index 3ebdc89ae0..3ebdc89ae0 100644
--- a/java/sca/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutContent.xml
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutContent.xml
diff --git a/java/sca/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutContent.xsd b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutContent.xsd
index 21546d0f67..21546d0f67 100644
--- a/java/sca/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutContent.xsd
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutContent.xsd
diff --git a/java/sca/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutName.xml b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutName.xml
index 89657e42ca..89657e42ca 100644
--- a/java/sca/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutName.xml
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutName.xml
diff --git a/java/sca/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutName.xsd b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutName.xsd
index d01b4172e4..d01b4172e4 100644
--- a/java/sca/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutName.xsd
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/ComplexTypeWithoutName.xsd
diff --git a/java/sca/itest/databindings/common/src/main/resources/xsd/DefaultNamespace.xml b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/DefaultNamespace.xml
index 82fd1eedaf..82fd1eedaf 100644
--- a/java/sca/itest/databindings/common/src/main/resources/xsd/DefaultNamespace.xml
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/DefaultNamespace.xml
diff --git a/java/sca/itest/databindings/common/src/main/resources/xsd/DefaultNamespace.xsd b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/DefaultNamespace.xsd
index e1dcf06194..e1dcf06194 100644
--- a/java/sca/itest/databindings/common/src/main/resources/xsd/DefaultNamespace.xsd
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/DefaultNamespace.xsd
diff --git a/java/sca/itest/databindings/common/src/main/resources/xsd/ElementInAll.xml b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/ElementInAll.xml
index ebf03c9d5d..ebf03c9d5d 100644
--- a/java/sca/itest/databindings/common/src/main/resources/xsd/ElementInAll.xml
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/ElementInAll.xml
diff --git a/java/sca/itest/databindings/common/src/main/resources/xsd/ElementInAll.xsd b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/ElementInAll.xsd
index 8b9ba5b4b8..8b9ba5b4b8 100644
--- a/java/sca/itest/databindings/common/src/main/resources/xsd/ElementInAll.xsd
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/ElementInAll.xsd
diff --git a/java/sca/itest/databindings/common/src/main/resources/xsd/ElementInChoice.xml b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/ElementInChoice.xml
index 26466b1b39..26466b1b39 100644
--- a/java/sca/itest/databindings/common/src/main/resources/xsd/ElementInChoice.xml
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/ElementInChoice.xml
diff --git a/java/sca/itest/databindings/common/src/main/resources/xsd/ElementInChoice.xsd b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/ElementInChoice.xsd
index ff418c56ab..ff418c56ab 100644
--- a/java/sca/itest/databindings/common/src/main/resources/xsd/ElementInChoice.xsd
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/ElementInChoice.xsd
diff --git a/java/sca/itest/databindings/common/src/main/resources/xsd/ElementOfSDOChangeSummaryType.xml b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/ElementOfSDOChangeSummaryType.xml
index 27bb1ce9cc..27bb1ce9cc 100644
--- a/java/sca/itest/databindings/common/src/main/resources/xsd/ElementOfSDOChangeSummaryType.xml
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/ElementOfSDOChangeSummaryType.xml
diff --git a/java/sca/itest/databindings/common/src/main/resources/xsd/ElementOfSDOChangeSummaryType.xsd b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/ElementOfSDOChangeSummaryType.xsd
index 2bf1df8c99..2bf1df8c99 100644
--- a/java/sca/itest/databindings/common/src/main/resources/xsd/ElementOfSDOChangeSummaryType.xsd
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/ElementOfSDOChangeSummaryType.xsd
diff --git a/java/sca/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithDefault.xml b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithDefault.xml
index 9b5561ed43..9b5561ed43 100644
--- a/java/sca/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithDefault.xml
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithDefault.xml
diff --git a/java/sca/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithDefault.xsd b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithDefault.xsd
index 0b4e7bdf45..0b4e7bdf45 100644
--- a/java/sca/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithDefault.xsd
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithDefault.xsd
diff --git a/java/sca/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithFixed.xml b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithFixed.xml
index f1b7cd264c..f1b7cd264c 100644
--- a/java/sca/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithFixed.xml
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithFixed.xml
diff --git a/java/sca/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithFixed.xsd b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithFixed.xsd
index a2c8456257..a2c8456257 100644
--- a/java/sca/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithFixed.xsd
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithFixed.xsd
diff --git a/java/sca/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDODataType.xml b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDODataType.xml
index 1f60b0423f..1f60b0423f 100644
--- a/java/sca/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDODataType.xml
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDODataType.xml
diff --git a/java/sca/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDODataType.xsd b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDODataType.xsd
index 21e55ab8c1..21e55ab8c1 100644
--- a/java/sca/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDODataType.xsd
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDODataType.xsd
diff --git a/java/sca/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOOppositePropertyType.xml b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOOppositePropertyType.xml
index 30762f4912..30762f4912 100644
--- a/java/sca/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOOppositePropertyType.xml
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOOppositePropertyType.xml
diff --git a/java/sca/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOOppositePropertyType.xsd b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOOppositePropertyType.xsd
index 5bf35d0d70..5bf35d0d70 100644
--- a/java/sca/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOOppositePropertyType.xsd
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOOppositePropertyType.xsd
diff --git a/java/sca/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOPropertyType.xml b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOPropertyType.xml
index 2dd01e4090..2dd01e4090 100644
--- a/java/sca/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOPropertyType.xml
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOPropertyType.xml
diff --git a/java/sca/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOPropertyType.xsd b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOPropertyType.xsd
index 6920cd8dd0..6920cd8dd0 100644
--- a/java/sca/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOPropertyType.xsd
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOPropertyType.xsd
diff --git a/java/sca/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOString.xml b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOString.xml
index 6a526bdc47..6a526bdc47 100644
--- a/java/sca/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOString.xml
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOString.xml
diff --git a/java/sca/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOString.xsd b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOString.xsd
index 1117a95eb8..1117a95eb8 100644
--- a/java/sca/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOString.xsd
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/ElementOfSimpleTypeWithSDOString.xsd
diff --git a/java/sca/itest/databindings/common/src/main/resources/xsd/ElementSubstitutionGroupBase.xml b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/ElementSubstitutionGroupBase.xml
index ab91458bff..ab91458bff 100644
--- a/java/sca/itest/databindings/common/src/main/resources/xsd/ElementSubstitutionGroupBase.xml
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/ElementSubstitutionGroupBase.xml
diff --git a/java/sca/itest/databindings/common/src/main/resources/xsd/ElementSubstitutionGroupBase.xsd b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/ElementSubstitutionGroupBase.xsd
index 3e015843b5..3e015843b5 100644
--- a/java/sca/itest/databindings/common/src/main/resources/xsd/ElementSubstitutionGroupBase.xsd
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/ElementSubstitutionGroupBase.xsd
diff --git a/java/sca/itest/databindings/common/src/main/resources/xsd/ElementWithMaxOccurs.xml b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/ElementWithMaxOccurs.xml
index b6d68fd08a..b6d68fd08a 100644
--- a/java/sca/itest/databindings/common/src/main/resources/xsd/ElementWithMaxOccurs.xml
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/ElementWithMaxOccurs.xml
diff --git a/java/sca/itest/databindings/common/src/main/resources/xsd/ElementWithMaxOccurs.xsd b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/ElementWithMaxOccurs.xsd
index d4453a4477..d4453a4477 100644
--- a/java/sca/itest/databindings/common/src/main/resources/xsd/ElementWithMaxOccurs.xsd
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/ElementWithMaxOccurs.xsd
diff --git a/java/sca/itest/databindings/common/src/main/resources/xsd/ElementWithNillable.xml b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/ElementWithNillable.xml
index 6de3adc937..6de3adc937 100644
--- a/java/sca/itest/databindings/common/src/main/resources/xsd/ElementWithNillable.xml
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/ElementWithNillable.xml
diff --git a/java/sca/itest/databindings/common/src/main/resources/xsd/ElementWithNillable.xsd b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/ElementWithNillable.xsd
index 786ab226da..786ab226da 100644
--- a/java/sca/itest/databindings/common/src/main/resources/xsd/ElementWithNillable.xsd
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/ElementWithNillable.xsd
diff --git a/java/sca/itest/databindings/common/src/main/resources/xsd/ElementWithSDOAliasName.xml b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/ElementWithSDOAliasName.xml
index 64093aa803..64093aa803 100644
--- a/java/sca/itest/databindings/common/src/main/resources/xsd/ElementWithSDOAliasName.xml
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/ElementWithSDOAliasName.xml
diff --git a/java/sca/itest/databindings/common/src/main/resources/xsd/ElementWithSDOAliasName.xsd b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/ElementWithSDOAliasName.xsd
index 01f4c2b1ef..01f4c2b1ef 100644
--- a/java/sca/itest/databindings/common/src/main/resources/xsd/ElementWithSDOAliasName.xsd
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/ElementWithSDOAliasName.xsd
diff --git a/java/sca/itest/databindings/common/src/main/resources/xsd/ElementWithSDOName.xml b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/ElementWithSDOName.xml
index 774646f682..774646f682 100644
--- a/java/sca/itest/databindings/common/src/main/resources/xsd/ElementWithSDOName.xml
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/ElementWithSDOName.xml
diff --git a/java/sca/itest/databindings/common/src/main/resources/xsd/ElementWithSDOName.xsd b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/ElementWithSDOName.xsd
index 34da37564c..34da37564c 100644
--- a/java/sca/itest/databindings/common/src/main/resources/xsd/ElementWithSDOName.xsd
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/ElementWithSDOName.xsd
diff --git a/java/sca/itest/databindings/common/src/main/resources/xsd/GlobalElementComplexType.xml b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/GlobalElementComplexType.xml
index a1fb3aa803..a1fb3aa803 100644
--- a/java/sca/itest/databindings/common/src/main/resources/xsd/GlobalElementComplexType.xml
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/GlobalElementComplexType.xml
diff --git a/java/sca/itest/databindings/common/src/main/resources/xsd/GlobalElementComplexType.xsd b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/GlobalElementComplexType.xsd
index 8eb7a4fce4..8eb7a4fce4 100644
--- a/java/sca/itest/databindings/common/src/main/resources/xsd/GlobalElementComplexType.xsd
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/GlobalElementComplexType.xsd
diff --git a/java/sca/itest/databindings/common/src/main/resources/xsd/GlobalElementSimpleType.xml b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/GlobalElementSimpleType.xml
index f68eb1939d..f68eb1939d 100644
--- a/java/sca/itest/databindings/common/src/main/resources/xsd/GlobalElementSimpleType.xml
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/GlobalElementSimpleType.xml
diff --git a/java/sca/itest/databindings/common/src/main/resources/xsd/GlobalElementSimpleType.xsd b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/GlobalElementSimpleType.xsd
index b9f77e6658..b9f77e6658 100644
--- a/java/sca/itest/databindings/common/src/main/resources/xsd/GlobalElementSimpleType.xsd
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/GlobalElementSimpleType.xsd
diff --git a/java/sca/itest/databindings/common/src/main/resources/xsd/Import.xml b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/Import.xml
index fd28850050..fd28850050 100644
--- a/java/sca/itest/databindings/common/src/main/resources/xsd/Import.xml
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/Import.xml
diff --git a/java/sca/itest/databindings/common/src/main/resources/xsd/Import.xsd b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/Import.xsd
index eae93fd44a..eae93fd44a 100644
--- a/java/sca/itest/databindings/common/src/main/resources/xsd/Import.xsd
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/Import.xsd
diff --git a/java/sca/itest/databindings/common/src/main/resources/xsd/ImportedSchema.xsd b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/ImportedSchema.xsd
index a7e568decf..a7e568decf 100644
--- a/java/sca/itest/databindings/common/src/main/resources/xsd/ImportedSchema.xsd
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/ImportedSchema.xsd
diff --git a/java/sca/itest/databindings/common/src/main/resources/xsd/Include.xml b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/Include.xml
index d4b9e24fa6..d4b9e24fa6 100644
--- a/java/sca/itest/databindings/common/src/main/resources/xsd/Include.xml
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/Include.xml
diff --git a/java/sca/itest/databindings/common/src/main/resources/xsd/Include.xsd b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/Include.xsd
index 34ff314a19..34ff314a19 100644
--- a/java/sca/itest/databindings/common/src/main/resources/xsd/Include.xsd
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/Include.xsd
diff --git a/java/sca/itest/databindings/common/src/main/resources/xsd/Interop.xsd b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/Interop.xsd
index ae22ab2c44..ae22ab2c44 100644
--- a/java/sca/itest/databindings/common/src/main/resources/xsd/Interop.xsd
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/Interop.xsd
diff --git a/java/sca/itest/databindings/common/src/main/resources/xsd/Notation.xml b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/Notation.xml
index b75ac6500a..b75ac6500a 100644
--- a/java/sca/itest/databindings/common/src/main/resources/xsd/Notation.xml
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/Notation.xml
diff --git a/java/sca/itest/databindings/common/src/main/resources/xsd/Notation.xsd b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/Notation.xsd
index 6ad019cb81..6ad019cb81 100644
--- a/java/sca/itest/databindings/common/src/main/resources/xsd/Notation.xsd
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/Notation.xsd
diff --git a/java/sca/itest/databindings/common/src/main/resources/xsd/Person.xsd b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/Person.xsd
index 5f5021b15e..5f5021b15e 100644
--- a/java/sca/itest/databindings/common/src/main/resources/xsd/Person.xsd
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/Person.xsd
diff --git a/java/sca/itest/databindings/common/src/main/resources/xsd/SDOJavaPackage.xml b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/SDOJavaPackage.xml
index 6c5ad88ff4..6c5ad88ff4 100644
--- a/java/sca/itest/databindings/common/src/main/resources/xsd/SDOJavaPackage.xml
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/SDOJavaPackage.xml
diff --git a/java/sca/itest/databindings/common/src/main/resources/xsd/SDOJavaPackage.xsd b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/SDOJavaPackage.xsd
index 6b7e39b334..6b7e39b334 100644
--- a/java/sca/itest/databindings/common/src/main/resources/xsd/SDOJavaPackage.xsd
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/SDOJavaPackage.xsd
diff --git a/java/sca/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithAbstract.xml b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithAbstract.xml
index f9d4a24a49..f9d4a24a49 100644
--- a/java/sca/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithAbstract.xml
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithAbstract.xml
diff --git a/java/sca/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithAbstract.xsd b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithAbstract.xsd
index f649e2ba83..f649e2ba83 100644
--- a/java/sca/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithAbstract.xsd
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithAbstract.xsd
diff --git a/java/sca/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithExtendedInstanceClass.xml b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithExtendedInstanceClass.xml
index 410df4b7e4..410df4b7e4 100644
--- a/java/sca/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithExtendedInstanceClass.xml
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithExtendedInstanceClass.xml
diff --git a/java/sca/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithExtendedInstanceClass.xsd b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithExtendedInstanceClass.xsd
index 5d27ef5ce1..5d27ef5ce1 100644
--- a/java/sca/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithExtendedInstanceClass.xsd
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithExtendedInstanceClass.xsd
diff --git a/java/sca/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithInstanceClass.xml b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithInstanceClass.xml
index 7b74867c03..7b74867c03 100644
--- a/java/sca/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithInstanceClass.xml
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithInstanceClass.xml
diff --git a/java/sca/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithInstanceClass.xsd b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithInstanceClass.xsd
index ec16a678a3..ec16a678a3 100644
--- a/java/sca/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithInstanceClass.xsd
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithInstanceClass.xsd
diff --git a/java/sca/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithList.xml b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithList.xml
index 708d526f44..708d526f44 100644
--- a/java/sca/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithList.xml
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithList.xml
diff --git a/java/sca/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithList.xsd b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithList.xsd
index ed681009f9..ed681009f9 100644
--- a/java/sca/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithList.xsd
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithList.xsd
diff --git a/java/sca/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithName.xml b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithName.xml
index e404ac86b7..e404ac86b7 100644
--- a/java/sca/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithName.xml
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithName.xml
diff --git a/java/sca/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithName.xsd b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithName.xsd
index af0431f048..af0431f048 100644
--- a/java/sca/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithName.xsd
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithName.xsd
diff --git a/java/sca/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithSDOName.xml b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithSDOName.xml
index c86a0f6bcb..c86a0f6bcb 100644
--- a/java/sca/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithSDOName.xml
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithSDOName.xml
diff --git a/java/sca/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithSDOName.xsd b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithSDOName.xsd
index 89b00a36cc..89b00a36cc 100644
--- a/java/sca/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithSDOName.xsd
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithSDOName.xsd
diff --git a/java/sca/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithUnion.xml b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithUnion.xml
index 399b0d8175..399b0d8175 100644
--- a/java/sca/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithUnion.xml
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithUnion.xml
diff --git a/java/sca/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithUnion.xsd b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithUnion.xsd
index ea35bec61a..ea35bec61a 100644
--- a/java/sca/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithUnion.xsd
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithUnion.xsd
diff --git a/java/sca/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithoutName.xml b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithoutName.xml
index bc8cf35368..bc8cf35368 100644
--- a/java/sca/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithoutName.xml
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithoutName.xml
diff --git a/java/sca/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithoutName.xsd b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithoutName.xsd
index 57981e3666..57981e3666 100644
--- a/java/sca/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithoutName.xsd
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/SimpleTypeWithoutName.xsd
diff --git a/java/sca/itest/databindings/common/src/main/resources/xsd/TargetNamespace.xml b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/TargetNamespace.xml
index da2929776e..da2929776e 100644
--- a/java/sca/itest/databindings/common/src/main/resources/xsd/TargetNamespace.xml
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/TargetNamespace.xml
diff --git a/java/sca/itest/databindings/common/src/main/resources/xsd/TargetNamespace.xsd b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/TargetNamespace.xsd
index ace5427786..ace5427786 100644
--- a/java/sca/itest/databindings/common/src/main/resources/xsd/TargetNamespace.xsd
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/TargetNamespace.xsd
diff --git a/java/sca/itest/databindings/common/src/main/resources/xsd/datagraph.xsd b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/datagraph.xsd
index e6b9697a8d..e6b9697a8d 100644
--- a/java/sca/itest/databindings/common/src/main/resources/xsd/datagraph.xsd
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/datagraph.xsd
diff --git a/java/sca/itest/databindings/common/src/main/resources/xsd/sdoJava.xsd b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/sdoJava.xsd
index 7387568942..7387568942 100644
--- a/java/sca/itest/databindings/common/src/main/resources/xsd/sdoJava.xsd
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/sdoJava.xsd
diff --git a/java/sca/itest/databindings/common/src/main/resources/xsd/sdoModel.xsd b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/sdoModel.xsd
index c5aabc9cc8..c5aabc9cc8 100644
--- a/java/sca/itest/databindings/common/src/main/resources/xsd/sdoModel.xsd
+++ b/java/sca/contrib/itest/databindings/common/src/main/resources/xsd/sdoModel.xsd
diff --git a/java/sca/itest/databindings/common/src/test/java/org/apache/tuscany/sca/itest/generate/GenerateTestCase.java b/java/sca/contrib/itest/databindings/common/src/test/java/org/apache/tuscany/sca/itest/generate/GenerateTestCase.java
index fa3f310d4d..fa3f310d4d 100644
--- a/java/sca/itest/databindings/common/src/test/java/org/apache/tuscany/sca/itest/generate/GenerateTestCase.java
+++ b/java/sca/contrib/itest/databindings/common/src/test/java/org/apache/tuscany/sca/itest/generate/GenerateTestCase.java
diff --git a/java/sca/itest/databindings/config.png b/java/sca/contrib/itest/databindings/config.png
index 7912019e9d..7912019e9d 100644
--- a/java/sca/itest/databindings/config.png
+++ b/java/sca/contrib/itest/databindings/config.png
diff --git a/java/sca/itest/databindings/config.svg b/java/sca/contrib/itest/databindings/config.svg
index aaf027e2df..aaf027e2df 100644
--- a/java/sca/itest/databindings/config.svg
+++ b/java/sca/contrib/itest/databindings/config.svg
diff --git a/java/sca/itest/databindings/databinding.png b/java/sca/contrib/itest/databindings/databinding.png
index 76a9c71b7d..76a9c71b7d 100644
--- a/java/sca/itest/databindings/databinding.png
+++ b/java/sca/contrib/itest/databindings/databinding.png
diff --git a/java/sca/itest/databindings/databinding.svg b/java/sca/contrib/itest/databindings/databinding.svg
index d6850ccf7d..d6850ccf7d 100644
--- a/java/sca/itest/databindings/databinding.svg
+++ b/java/sca/contrib/itest/databindings/databinding.svg
diff --git a/java/sca/itest/databindings/interop.png b/java/sca/contrib/itest/databindings/interop.png
index 005e0f24ea..005e0f24ea 100644
--- a/java/sca/itest/databindings/interop.png
+++ b/java/sca/contrib/itest/databindings/interop.png
diff --git a/java/sca/itest/databindings/interop.svg b/java/sca/contrib/itest/databindings/interop.svg
index 03897c6d09..03897c6d09 100644
--- a/java/sca/itest/databindings/interop.svg
+++ b/java/sca/contrib/itest/databindings/interop.svg
diff --git a/java/sca/itest/databindings/interop/pom.xml b/java/sca/contrib/itest/databindings/interop/pom.xml
index a8f7635183..a8f7635183 100644
--- a/java/sca/itest/databindings/interop/pom.xml
+++ b/java/sca/contrib/itest/databindings/interop/pom.xml
diff --git a/java/sca/itest/databindings/interop/src/main/resources/generate/InteropDatabindingTestCase.java.vm b/java/sca/contrib/itest/databindings/interop/src/main/resources/generate/InteropDatabindingTestCase.java.vm
index 7bdfc57924..7bdfc57924 100644
--- a/java/sca/itest/databindings/interop/src/main/resources/generate/InteropDatabindingTestCase.java.vm
+++ b/java/sca/contrib/itest/databindings/interop/src/main/resources/generate/InteropDatabindingTestCase.java.vm
diff --git a/java/sca/itest/databindings/interop/src/main/resources/generate/JAXBGreeter.wsdl.vm b/java/sca/contrib/itest/databindings/interop/src/main/resources/generate/JAXBGreeter.wsdl.vm
index 38bfccce0c..38bfccce0c 100644
--- a/java/sca/itest/databindings/interop/src/main/resources/generate/JAXBGreeter.wsdl.vm
+++ b/java/sca/contrib/itest/databindings/interop/src/main/resources/generate/JAXBGreeter.wsdl.vm
diff --git a/java/sca/itest/databindings/interop/src/main/resources/generate/SDOGreeter.wsdl.vm b/java/sca/contrib/itest/databindings/interop/src/main/resources/generate/SDOGreeter.wsdl.vm
index 6f02af4c9d..6f02af4c9d 100644
--- a/java/sca/itest/databindings/interop/src/main/resources/generate/SDOGreeter.wsdl.vm
+++ b/java/sca/contrib/itest/databindings/interop/src/main/resources/generate/SDOGreeter.wsdl.vm
diff --git a/java/sca/itest/databindings/interop/src/main/resources/generate/generate.xml b/java/sca/contrib/itest/databindings/interop/src/main/resources/generate/generate.xml
index 8453dd56b4..8453dd56b4 100644
--- a/java/sca/itest/databindings/interop/src/main/resources/generate/generate.xml
+++ b/java/sca/contrib/itest/databindings/interop/src/main/resources/generate/generate.xml
diff --git a/java/sca/itest/databindings/interop/src/main/resources/generate/interopgreeter.composite.vm b/java/sca/contrib/itest/databindings/interop/src/main/resources/generate/interopgreeter.composite.vm
index 36797fde57..36797fde57 100644
--- a/java/sca/itest/databindings/interop/src/main/resources/generate/interopgreeter.composite.vm
+++ b/java/sca/contrib/itest/databindings/interop/src/main/resources/generate/interopgreeter.composite.vm
diff --git a/java/sca/itest/databindings/jaxb-bottom-up/pom.xml b/java/sca/contrib/itest/databindings/jaxb-bottom-up/pom.xml
index 45e5720602..45e5720602 100644
--- a/java/sca/itest/databindings/jaxb-bottom-up/pom.xml
+++ b/java/sca/contrib/itest/databindings/jaxb-bottom-up/pom.xml
diff --git a/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/AClientService.java b/java/sca/contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/AClientService.java
index 5d389643cc..5d389643cc 100644
--- a/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/AClientService.java
+++ b/java/sca/contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/AClientService.java
diff --git a/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/AService.java b/java/sca/contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/AService.java
index 52f1c01fd8..52f1c01fd8 100644
--- a/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/AService.java
+++ b/java/sca/contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/AService.java
diff --git a/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean1.java b/java/sca/contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean1.java
index 7529c2b841..7529c2b841 100644
--- a/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean1.java
+++ b/java/sca/contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean1.java
diff --git a/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean10.java b/java/sca/contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean10.java
index 4a4419a42b..4a4419a42b 100644
--- a/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean10.java
+++ b/java/sca/contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean10.java
diff --git a/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean11.java b/java/sca/contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean11.java
index 65f019ec48..65f019ec48 100644
--- a/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean11.java
+++ b/java/sca/contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean11.java
diff --git a/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean2.java b/java/sca/contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean2.java
index 844e28863a..844e28863a 100644
--- a/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean2.java
+++ b/java/sca/contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean2.java
diff --git a/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean3.java b/java/sca/contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean3.java
index 4e0bd38b2b..4e0bd38b2b 100644
--- a/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean3.java
+++ b/java/sca/contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean3.java
diff --git a/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean31.java b/java/sca/contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean31.java
index 40aff31297..40aff31297 100644
--- a/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean31.java
+++ b/java/sca/contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/Bean31.java
diff --git a/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsLocalService.java b/java/sca/contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsLocalService.java
index ca012b967d..ca012b967d 100644
--- a/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsLocalService.java
+++ b/java/sca/contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsLocalService.java
diff --git a/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsService.java b/java/sca/contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsService.java
index be446c9759..be446c9759 100644
--- a/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsService.java
+++ b/java/sca/contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsService.java
diff --git a/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsServiceClient.java b/java/sca/contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsServiceClient.java
index 3bae554dc7..3bae554dc7 100644
--- a/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsServiceClient.java
+++ b/java/sca/contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsServiceClient.java
diff --git a/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloLocalServiceSimple.java b/java/sca/contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloLocalServiceSimple.java
index a31cc3d45a..a31cc3d45a 100644
--- a/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloLocalServiceSimple.java
+++ b/java/sca/contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloLocalServiceSimple.java
diff --git a/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloServiceSimple.java b/java/sca/contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloServiceSimple.java
index df9e6e53ec..df9e6e53ec 100644
--- a/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloServiceSimple.java
+++ b/java/sca/contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloServiceSimple.java
diff --git a/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloServiceSimpleClient.java b/java/sca/contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloServiceSimpleClient.java
index 23ed57dec9..23ed57dec9 100644
--- a/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloServiceSimpleClient.java
+++ b/java/sca/contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloServiceSimpleClient.java
diff --git a/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesLocalService.java b/java/sca/contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesLocalService.java
index 6239c0f5f1..6239c0f5f1 100644
--- a/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesLocalService.java
+++ b/java/sca/contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesLocalService.java
diff --git a/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesService.java b/java/sca/contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesService.java
index 690a2adb3d..690a2adb3d 100644
--- a/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesService.java
+++ b/java/sca/contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesService.java
diff --git a/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesServiceClient.java b/java/sca/contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesServiceClient.java
index 3bdf886dfa..3bdf886dfa 100644
--- a/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesServiceClient.java
+++ b/java/sca/contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesServiceClient.java
diff --git a/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesLocalService.java b/java/sca/contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesLocalService.java
index 0fdf69459f..0fdf69459f 100644
--- a/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesLocalService.java
+++ b/java/sca/contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesLocalService.java
diff --git a/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesService.java b/java/sca/contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesService.java
index 3b9690b7d2..3b9690b7d2 100644
--- a/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesService.java
+++ b/java/sca/contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesService.java
diff --git a/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesServiceClient.java b/java/sca/contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesServiceClient.java
index 351d9df0cb..351d9df0cb 100644
--- a/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesServiceClient.java
+++ b/java/sca/contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesServiceClient.java
diff --git a/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/AClientServiceImpl.java b/java/sca/contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/AClientServiceImpl.java
index 2f3bd3f2cb..2f3bd3f2cb 100644
--- a/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/AClientServiceImpl.java
+++ b/java/sca/contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/AClientServiceImpl.java
diff --git a/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/AServiceImpl.java b/java/sca/contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/AServiceImpl.java
index 078be8896e..078be8896e 100644
--- a/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/AServiceImpl.java
+++ b/java/sca/contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/AServiceImpl.java
diff --git a/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsLocalServiceClientImpl.java b/java/sca/contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsLocalServiceClientImpl.java
index 4d451e6d32..4d451e6d32 100644
--- a/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsLocalServiceClientImpl.java
+++ b/java/sca/contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsLocalServiceClientImpl.java
diff --git a/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsServiceClientImpl.java b/java/sca/contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsServiceClientImpl.java
index d520e64881..d520e64881 100644
--- a/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsServiceClientImpl.java
+++ b/java/sca/contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsServiceClientImpl.java
diff --git a/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsServiceImpl.java b/java/sca/contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsServiceImpl.java
index 27dc25289e..27dc25289e 100644
--- a/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsServiceImpl.java
+++ b/java/sca/contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsServiceImpl.java
diff --git a/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsTransformer.java b/java/sca/contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsTransformer.java
index 858b8da59a..858b8da59a 100644
--- a/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsTransformer.java
+++ b/java/sca/contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/GenericsTransformer.java
diff --git a/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloLocalServiceSimpleClientImpl.java b/java/sca/contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloLocalServiceSimpleClientImpl.java
index 37b3f1b680..37b3f1b680 100644
--- a/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloLocalServiceSimpleClientImpl.java
+++ b/java/sca/contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloLocalServiceSimpleClientImpl.java
diff --git a/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceSimpleClientImpl.java b/java/sca/contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceSimpleClientImpl.java
index 44b6e9d906..44b6e9d906 100644
--- a/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceSimpleClientImpl.java
+++ b/java/sca/contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceSimpleClientImpl.java
diff --git a/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceSimpleImpl.java b/java/sca/contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceSimpleImpl.java
index 5c389bf67f..5c389bf67f 100644
--- a/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceSimpleImpl.java
+++ b/java/sca/contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceSimpleImpl.java
diff --git a/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesLocalServiceClientImpl.java b/java/sca/contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesLocalServiceClientImpl.java
index eea19521c4..eea19521c4 100644
--- a/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesLocalServiceClientImpl.java
+++ b/java/sca/contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesLocalServiceClientImpl.java
diff --git a/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceClientImpl.java b/java/sca/contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceClientImpl.java
index 263d1212ca..263d1212ca 100644
--- a/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceClientImpl.java
+++ b/java/sca/contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceClientImpl.java
diff --git a/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceImpl.java b/java/sca/contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceImpl.java
index 9e14140752..9e14140752 100644
--- a/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceImpl.java
+++ b/java/sca/contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceImpl.java
diff --git a/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesLocalServiceClientImpl.java b/java/sca/contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesLocalServiceClientImpl.java
index 3ceee3c4b1..3ceee3c4b1 100644
--- a/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesLocalServiceClientImpl.java
+++ b/java/sca/contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesLocalServiceClientImpl.java
diff --git a/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceClientImpl.java b/java/sca/contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceClientImpl.java
index 6aefb05c83..6aefb05c83 100644
--- a/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceClientImpl.java
+++ b/java/sca/contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceClientImpl.java
diff --git a/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceImpl.java b/java/sca/contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceImpl.java
index 42fb9cbac2..42fb9cbac2 100644
--- a/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceImpl.java
+++ b/java/sca/contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceImpl.java
diff --git a/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesTransformer.java b/java/sca/contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesTransformer.java
index 68510b4b03..68510b4b03 100644
--- a/java/sca/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesTransformer.java
+++ b/java/sca/contrib/itest/databindings/jaxb-bottom-up/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesTransformer.java
diff --git a/java/sca/itest/databindings/jaxb-bottom-up/src/main/resources/aservice.wsdl b/java/sca/contrib/itest/databindings/jaxb-bottom-up/src/main/resources/aservice.wsdl
index 10a242be4d..10a242be4d 100644
--- a/java/sca/itest/databindings/jaxb-bottom-up/src/main/resources/aservice.wsdl
+++ b/java/sca/contrib/itest/databindings/jaxb-bottom-up/src/main/resources/aservice.wsdl
diff --git a/java/sca/itest/databindings/jaxb-bottom-up/src/main/resources/doclitbarewsdl.composite b/java/sca/contrib/itest/databindings/jaxb-bottom-up/src/main/resources/doclitbarewsdl.composite
index 5ecbb9edee..5ecbb9edee 100644
--- a/java/sca/itest/databindings/jaxb-bottom-up/src/main/resources/doclitbarewsdl.composite
+++ b/java/sca/contrib/itest/databindings/jaxb-bottom-up/src/main/resources/doclitbarewsdl.composite
diff --git a/java/sca/itest/databindings/jaxb-bottom-up/src/main/resources/generics-service.composite b/java/sca/contrib/itest/databindings/jaxb-bottom-up/src/main/resources/generics-service.composite
index 2d47ba7b14..2d47ba7b14 100644
--- a/java/sca/itest/databindings/jaxb-bottom-up/src/main/resources/generics-service.composite
+++ b/java/sca/contrib/itest/databindings/jaxb-bottom-up/src/main/resources/generics-service.composite
diff --git a/java/sca/itest/databindings/jaxb-bottom-up/src/main/resources/helloservice.composite b/java/sca/contrib/itest/databindings/jaxb-bottom-up/src/main/resources/helloservice.composite
index c39cf21002..c39cf21002 100644
--- a/java/sca/itest/databindings/jaxb-bottom-up/src/main/resources/helloservice.composite
+++ b/java/sca/contrib/itest/databindings/jaxb-bottom-up/src/main/resources/helloservice.composite
diff --git a/java/sca/itest/databindings/jaxb-bottom-up/src/main/resources/primitivesservice.composite b/java/sca/contrib/itest/databindings/jaxb-bottom-up/src/main/resources/primitivesservice.composite
index 4b0a6e215d..4b0a6e215d 100644
--- a/java/sca/itest/databindings/jaxb-bottom-up/src/main/resources/primitivesservice.composite
+++ b/java/sca/contrib/itest/databindings/jaxb-bottom-up/src/main/resources/primitivesservice.composite
diff --git a/java/sca/itest/databindings/jaxb-bottom-up/src/main/resources/standard-types-service.composite b/java/sca/contrib/itest/databindings/jaxb-bottom-up/src/main/resources/standard-types-service.composite
index 13ef73c082..13ef73c082 100644
--- a/java/sca/itest/databindings/jaxb-bottom-up/src/main/resources/standard-types-service.composite
+++ b/java/sca/contrib/itest/databindings/jaxb-bottom-up/src/main/resources/standard-types-service.composite
diff --git a/java/sca/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/DatabindingTestCase.java b/java/sca/contrib/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/DatabindingTestCase.java
index 4967b896a5..4967b896a5 100644
--- a/java/sca/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/DatabindingTestCase.java
+++ b/java/sca/contrib/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/DatabindingTestCase.java
diff --git a/java/sca/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/DocLitBareWsdlTestCase.java b/java/sca/contrib/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/DocLitBareWsdlTestCase.java
index 744bf20494..744bf20494 100644
--- a/java/sca/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/DocLitBareWsdlTestCase.java
+++ b/java/sca/contrib/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/DocLitBareWsdlTestCase.java
diff --git a/java/sca/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsDatabindingTestCase.java b/java/sca/contrib/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsDatabindingTestCase.java
index c22d00140e..c22d00140e 100644
--- a/java/sca/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsDatabindingTestCase.java
+++ b/java/sca/contrib/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/GenericsDatabindingTestCase.java
diff --git a/java/sca/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesDatabindingTestCase.java b/java/sca/contrib/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesDatabindingTestCase.java
index f8aaad3dac..f8aaad3dac 100644
--- a/java/sca/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesDatabindingTestCase.java
+++ b/java/sca/contrib/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesDatabindingTestCase.java
diff --git a/java/sca/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesDatabindingTestCase.java b/java/sca/contrib/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesDatabindingTestCase.java
index 2d023ab448..2d023ab448 100644
--- a/java/sca/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesDatabindingTestCase.java
+++ b/java/sca/contrib/itest/databindings/jaxb-bottom-up/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesDatabindingTestCase.java
diff --git a/java/sca/itest/databindings/jaxb-top-down/pom.xml b/java/sca/contrib/itest/databindings/jaxb-top-down/pom.xml
index 4e3fcfbe5c..4e3fcfbe5c 100644
--- a/java/sca/itest/databindings/jaxb-top-down/pom.xml
+++ b/java/sca/contrib/itest/databindings/jaxb-top-down/pom.xml
diff --git a/java/sca/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloService.java b/java/sca/contrib/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloService.java
index ab2d9630eb..ab2d9630eb 100644
--- a/java/sca/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloService.java
+++ b/java/sca/contrib/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloService.java
diff --git a/java/sca/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloServiceClient.java b/java/sca/contrib/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloServiceClient.java
index 7bd95cec95..7bd95cec95 100644
--- a/java/sca/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloServiceClient.java
+++ b/java/sca/contrib/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/HelloServiceClient.java
diff --git a/java/sca/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesService.java b/java/sca/contrib/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesService.java
index ac6c8d5a60..ac6c8d5a60 100644
--- a/java/sca/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesService.java
+++ b/java/sca/contrib/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesService.java
diff --git a/java/sca/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesServiceClient.java b/java/sca/contrib/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesServiceClient.java
index 3a5a81bae4..3a5a81bae4 100644
--- a/java/sca/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesServiceClient.java
+++ b/java/sca/contrib/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/PrimitivesServiceClient.java
diff --git a/java/sca/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesService.java b/java/sca/contrib/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesService.java
index 1f3b7ec633..1f3b7ec633 100644
--- a/java/sca/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesService.java
+++ b/java/sca/contrib/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesService.java
diff --git a/java/sca/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesServiceClient.java b/java/sca/contrib/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesServiceClient.java
index 0c073cd054..0c073cd054 100644
--- a/java/sca/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesServiceClient.java
+++ b/java/sca/contrib/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/StandardTypesServiceClient.java
diff --git a/java/sca/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceClientImpl.java b/java/sca/contrib/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceClientImpl.java
index 61449c8981..61449c8981 100644
--- a/java/sca/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceClientImpl.java
+++ b/java/sca/contrib/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceClientImpl.java
diff --git a/java/sca/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceImpl.java b/java/sca/contrib/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceImpl.java
index c0868f0146..c0868f0146 100644
--- a/java/sca/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceImpl.java
+++ b/java/sca/contrib/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/HelloServiceImpl.java
diff --git a/java/sca/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceClientImpl.java b/java/sca/contrib/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceClientImpl.java
index e55d2527f4..e55d2527f4 100644
--- a/java/sca/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceClientImpl.java
+++ b/java/sca/contrib/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceClientImpl.java
diff --git a/java/sca/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceImpl.java b/java/sca/contrib/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceImpl.java
index 72ff27b85e..72ff27b85e 100644
--- a/java/sca/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceImpl.java
+++ b/java/sca/contrib/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/PrimitivesServiceImpl.java
diff --git a/java/sca/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceClientImpl.java b/java/sca/contrib/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceClientImpl.java
index b3d3c3eb3a..b3d3c3eb3a 100644
--- a/java/sca/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceClientImpl.java
+++ b/java/sca/contrib/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceClientImpl.java
diff --git a/java/sca/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceImpl.java b/java/sca/contrib/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceImpl.java
index b58d04a04c..b58d04a04c 100644
--- a/java/sca/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceImpl.java
+++ b/java/sca/contrib/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesServiceImpl.java
diff --git a/java/sca/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesTransformer.java b/java/sca/contrib/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesTransformer.java
index 9d851455da..9d851455da 100644
--- a/java/sca/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesTransformer.java
+++ b/java/sca/contrib/itest/databindings/jaxb-top-down/src/main/java/org/apache/tuscany/sca/itest/databindings/jaxb/impl/StandardTypesTransformer.java
diff --git a/java/sca/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/hello-service.wsdl b/java/sca/contrib/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/hello-service.wsdl
index 926e4154aa..926e4154aa 100644
--- a/java/sca/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/hello-service.wsdl
+++ b/java/sca/contrib/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/hello-service.wsdl
diff --git a/java/sca/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/helloservice.composite b/java/sca/contrib/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/helloservice.composite
index 63151f6a2d..63151f6a2d 100644
--- a/java/sca/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/helloservice.composite
+++ b/java/sca/contrib/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/helloservice.composite
diff --git a/java/sca/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/primitives-service.wsdl b/java/sca/contrib/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/primitives-service.wsdl
index f366783e5e..f366783e5e 100644
--- a/java/sca/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/primitives-service.wsdl
+++ b/java/sca/contrib/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/primitives-service.wsdl
diff --git a/java/sca/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/primitivesservice.composite b/java/sca/contrib/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/primitivesservice.composite
index 85ca6d0789..85ca6d0789 100644
--- a/java/sca/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/primitivesservice.composite
+++ b/java/sca/contrib/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/primitivesservice.composite
diff --git a/java/sca/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/standard-types-service.composite b/java/sca/contrib/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/standard-types-service.composite
index 4788df78e0..4788df78e0 100644
--- a/java/sca/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/standard-types-service.composite
+++ b/java/sca/contrib/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/standard-types-service.composite
diff --git a/java/sca/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/standard-types-service.wsdl b/java/sca/contrib/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/standard-types-service.wsdl
index 5bfd1ea277..5bfd1ea277 100644
--- a/java/sca/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/standard-types-service.wsdl
+++ b/java/sca/contrib/itest/databindings/jaxb-top-down/src/main/resources/wsdl/wrapped/standard-types-service.wsdl
diff --git a/java/sca/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/DatabindingTestCase.java b/java/sca/contrib/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/DatabindingTestCase.java
index 35f69608e7..35f69608e7 100644
--- a/java/sca/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/DatabindingTestCase.java
+++ b/java/sca/contrib/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/DatabindingTestCase.java
diff --git a/java/sca/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/PrimitivesDatabindingTestCase.java b/java/sca/contrib/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/PrimitivesDatabindingTestCase.java
index 4a292a8b7a..4a292a8b7a 100644
--- a/java/sca/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/PrimitivesDatabindingTestCase.java
+++ b/java/sca/contrib/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/PrimitivesDatabindingTestCase.java
diff --git a/java/sca/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/StandardTypesDatabindingTestCase.java b/java/sca/contrib/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/StandardTypesDatabindingTestCase.java
index 263b2f81eb..263b2f81eb 100644
--- a/java/sca/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/StandardTypesDatabindingTestCase.java
+++ b/java/sca/contrib/itest/databindings/jaxb-top-down/src/test/java/org/apache/tuscany/sca/itest/databindings/jaxb/topdown/StandardTypesDatabindingTestCase.java
diff --git a/java/sca/itest/databindings/jaxbgen/pom.xml b/java/sca/contrib/itest/databindings/jaxbgen/pom.xml
index fb88bcfff1..fb88bcfff1 100644
--- a/java/sca/itest/databindings/jaxbgen/pom.xml
+++ b/java/sca/contrib/itest/databindings/jaxbgen/pom.xml
diff --git a/java/sca/itest/databindings/jaxbgen/src/main/resources/generate/generate.xml b/java/sca/contrib/itest/databindings/jaxbgen/src/main/resources/generate/generate.xml
index 8381a164ea..8381a164ea 100644
--- a/java/sca/itest/databindings/jaxbgen/src/main/resources/generate/generate.xml
+++ b/java/sca/contrib/itest/databindings/jaxbgen/src/main/resources/generate/generate.xml
diff --git a/java/sca/itest/databindings/jaxbgen/src/main/resources/greeter.composite b/java/sca/contrib/itest/databindings/jaxbgen/src/main/resources/greeter.composite
index ae0740e6fe..ae0740e6fe 100644
--- a/java/sca/itest/databindings/jaxbgen/src/main/resources/greeter.composite
+++ b/java/sca/contrib/itest/databindings/jaxbgen/src/main/resources/greeter.composite
diff --git a/java/sca/itest/databindings/pom.xml b/java/sca/contrib/itest/databindings/pom.xml
index 43f99aff39..43f99aff39 100644
--- a/java/sca/itest/databindings/pom.xml
+++ b/java/sca/contrib/itest/databindings/pom.xml
diff --git a/java/sca/itest/databindings/readme.html b/java/sca/contrib/itest/databindings/readme.html
index 24a44e4ed7..24a44e4ed7 100644
--- a/java/sca/itest/databindings/readme.html
+++ b/java/sca/contrib/itest/databindings/readme.html
diff --git a/java/sca/itest/databindings/sdogen/pom.xml b/java/sca/contrib/itest/databindings/sdogen/pom.xml
index e8a27753cf..e8a27753cf 100644
--- a/java/sca/itest/databindings/sdogen/pom.xml
+++ b/java/sca/contrib/itest/databindings/sdogen/pom.xml
diff --git a/java/sca/itest/databindings/sdogen/src/main/resources/generate/generate.xml b/java/sca/contrib/itest/databindings/sdogen/src/main/resources/generate/generate.xml
index 3f9926604d..3f9926604d 100644
--- a/java/sca/itest/databindings/sdogen/src/main/resources/generate/generate.xml
+++ b/java/sca/contrib/itest/databindings/sdogen/src/main/resources/generate/generate.xml
diff --git a/java/sca/itest/databindings/sdogen/src/main/resources/generate/greeter.composite.vm b/java/sca/contrib/itest/databindings/sdogen/src/main/resources/generate/greeter.composite.vm
index 9494d70f96..9494d70f96 100644
--- a/java/sca/itest/databindings/sdogen/src/main/resources/generate/greeter.composite.vm
+++ b/java/sca/contrib/itest/databindings/sdogen/src/main/resources/generate/greeter.composite.vm