Move the SDO folder as new trunk for SDO sub project

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

88 files changed, 0 insertions, 0 deletions

diff --git a/java/sdo/tools-test/pom.xml b/sdo-java/trunk/tools-test/pom.xml
index 999e3c91e5..999e3c91e5 100644
--- a/java/sdo/tools-test/pom.xml
+++ b/sdo-java/trunk/tools-test/pom.xml
diff --git a/java/sdo/tools-test/src/main/resources/CustomerAccount.xsd b/sdo-java/trunk/tools-test/src/main/resources/CustomerAccount.xsd
index a720670e3b..a720670e3b 100644
--- a/java/sdo/tools-test/src/main/resources/CustomerAccount.xsd
+++ b/sdo-java/trunk/tools-test/src/main/resources/CustomerAccount.xsd
diff --git a/java/sdo/tools-test/src/main/resources/InternalInElement.xsd b/sdo-java/trunk/tools-test/src/main/resources/InternalInElement.xsd
index 6144b1e117..6144b1e117 100644
--- a/java/sdo/tools-test/src/main/resources/InternalInElement.xsd
+++ b/sdo-java/trunk/tools-test/src/main/resources/InternalInElement.xsd
diff --git a/java/sdo/tools-test/src/main/resources/Open.xsd b/sdo-java/trunk/tools-test/src/main/resources/Open.xsd
index 0f158e591a..0f158e591a 100644
--- a/java/sdo/tools-test/src/main/resources/Open.xsd
+++ b/sdo-java/trunk/tools-test/src/main/resources/Open.xsd
diff --git a/java/sdo/tools-test/src/main/resources/extensible/customer.xsd b/sdo-java/trunk/tools-test/src/main/resources/extensible/customer.xsd
index 1a0531e040..1a0531e040 100644
--- a/java/sdo/tools-test/src/main/resources/extensible/customer.xsd
+++ b/sdo-java/trunk/tools-test/src/main/resources/extensible/customer.xsd
diff --git a/java/sdo/tools-test/src/main/resources/extensible/customers.xml b/sdo-java/trunk/tools-test/src/main/resources/extensible/customers.xml
index 40558f6cf8..40558f6cf8 100644
--- a/java/sdo/tools-test/src/main/resources/extensible/customers.xml
+++ b/sdo-java/trunk/tools-test/src/main/resources/extensible/customers.xml
diff --git a/java/sdo/tools-test/src/main/resources/extensible/infostreet.xml b/sdo-java/trunk/tools-test/src/main/resources/extensible/infostreet.xml
index c57b0b98c1..c57b0b98c1 100644
--- a/java/sdo/tools-test/src/main/resources/extensible/infostreet.xml
+++ b/sdo-java/trunk/tools-test/src/main/resources/extensible/infostreet.xml
diff --git a/java/sdo/tools-test/src/main/resources/extensible/infostreet.xsd b/sdo-java/trunk/tools-test/src/main/resources/extensible/infostreet.xsd
index 4b71628c89..4b71628c89 100644
--- a/java/sdo/tools-test/src/main/resources/extensible/infostreet.xsd
+++ b/sdo-java/trunk/tools-test/src/main/resources/extensible/infostreet.xsd
diff --git a/java/sdo/tools-test/src/main/resources/extensible/infozipcode.xml b/sdo-java/trunk/tools-test/src/main/resources/extensible/infozipcode.xml
index a5f551908a..a5f551908a 100644
--- a/java/sdo/tools-test/src/main/resources/extensible/infozipcode.xml
+++ b/sdo-java/trunk/tools-test/src/main/resources/extensible/infozipcode.xml
diff --git a/java/sdo/tools-test/src/main/resources/extensible/infozipcode.xsd b/sdo-java/trunk/tools-test/src/main/resources/extensible/infozipcode.xsd
index cd1c55c138..cd1c55c138 100644
--- a/java/sdo/tools-test/src/main/resources/extensible/infozipcode.xsd
+++ b/sdo-java/trunk/tools-test/src/main/resources/extensible/infozipcode.xsd
diff --git a/java/sdo/tools-test/src/main/resources/extensible/nonamespace.xsd b/sdo-java/trunk/tools-test/src/main/resources/extensible/nonamespace.xsd
index b551c8aae2..b551c8aae2 100644
--- a/java/sdo/tools-test/src/main/resources/extensible/nonamespace.xsd
+++ b/sdo-java/trunk/tools-test/src/main/resources/extensible/nonamespace.xsd
diff --git a/java/sdo/tools-test/src/main/resources/listAccess.xsd b/sdo-java/trunk/tools-test/src/main/resources/listAccess.xsd
index 917ce78f8a..917ce78f8a 100644
--- a/java/sdo/tools-test/src/main/resources/listAccess.xsd
+++ b/sdo-java/trunk/tools-test/src/main/resources/listAccess.xsd
diff --git a/java/sdo/tools-test/src/main/resources/mixedTypesStatic.xsd b/sdo-java/trunk/tools-test/src/main/resources/mixedTypesStatic.xsd
index 436c1ec9a4..436c1ec9a4 100644
--- a/java/sdo/tools-test/src/main/resources/mixedTypesStatic.xsd
+++ b/sdo-java/trunk/tools-test/src/main/resources/mixedTypesStatic.xsd
diff --git a/java/sdo/tools-test/src/main/resources/simple.xsd b/sdo-java/trunk/tools-test/src/main/resources/simple.xsd
index aff9f9c5bf..aff9f9c5bf 100644
--- a/java/sdo/tools-test/src/main/resources/simple.xsd
+++ b/sdo-java/trunk/tools-test/src/main/resources/simple.xsd
diff --git a/java/sdo/tools-test/src/main/resources/simpleNoIF.xsd b/sdo-java/trunk/tools-test/src/main/resources/simpleNoIF.xsd
index aff9f9c5bf..aff9f9c5bf 100644
--- a/java/sdo/tools-test/src/main/resources/simpleNoIF.xsd
+++ b/sdo-java/trunk/tools-test/src/main/resources/simpleNoIF.xsd
diff --git a/java/sdo/tools-test/src/main/resources/simpleNoTns.xsd b/sdo-java/trunk/tools-test/src/main/resources/simpleNoTns.xsd
index 4702f57251..4702f57251 100644
--- a/java/sdo/tools-test/src/main/resources/simpleNoTns.xsd
+++ b/sdo-java/trunk/tools-test/src/main/resources/simpleNoTns.xsd
diff --git a/java/sdo/tools-test/src/main/resources/simpleWithChangeSummary.xsd b/sdo-java/trunk/tools-test/src/main/resources/simpleWithChangeSummary.xsd
index c81e10ee00..c81e10ee00 100644
--- a/java/sdo/tools-test/src/main/resources/simpleWithChangeSummary.xsd
+++ b/sdo-java/trunk/tools-test/src/main/resources/simpleWithChangeSummary.xsd
diff --git a/java/sdo/tools-test/src/main/resources/subgroup.xsd b/sdo-java/trunk/tools-test/src/main/resources/subgroup.xsd
index 61e0642dfa..61e0642dfa 100644
--- a/java/sdo/tools-test/src/main/resources/subgroup.xsd
+++ b/sdo-java/trunk/tools-test/src/main/resources/subgroup.xsd
diff --git a/java/sdo/tools-test/src/main/resources/subgroup1.xml b/sdo-java/trunk/tools-test/src/main/resources/subgroup1.xml
index 007aef9aa3..007aef9aa3 100644
--- a/java/sdo/tools-test/src/main/resources/subgroup1.xml
+++ b/sdo-java/trunk/tools-test/src/main/resources/subgroup1.xml
diff --git a/java/sdo/tools-test/src/main/resources/substitutionWithExtensionValues.xsd b/sdo-java/trunk/tools-test/src/main/resources/substitutionWithExtensionValues.xsd
index 72474a62eb..72474a62eb 100644
--- a/java/sdo/tools-test/src/main/resources/substitutionWithExtensionValues.xsd
+++ b/sdo-java/trunk/tools-test/src/main/resources/substitutionWithExtensionValues.xsd
diff --git a/java/sdo/tools-test/src/main/resources/substitutionWithExtensionValues1.xml b/sdo-java/trunk/tools-test/src/main/resources/substitutionWithExtensionValues1.xml
index 45c592a333..45c592a333 100644
--- a/java/sdo/tools-test/src/main/resources/substitutionWithExtensionValues1.xml
+++ b/sdo-java/trunk/tools-test/src/main/resources/substitutionWithExtensionValues1.xml
diff --git a/java/sdo/tools-test/src/main/resources/substitutionWithExtensionValues2.xsd b/sdo-java/trunk/tools-test/src/main/resources/substitutionWithExtensionValues2.xsd
index 769cce4f65..769cce4f65 100644
--- a/java/sdo/tools-test/src/main/resources/substitutionWithExtensionValues2.xsd
+++ b/sdo-java/trunk/tools-test/src/main/resources/substitutionWithExtensionValues2.xsd
diff --git a/java/sdo/tools-test/src/main/resources/xsdImportOnly.wsdl b/sdo-java/trunk/tools-test/src/main/resources/xsdImportOnly.wsdl
index 576997a0a4..576997a0a4 100644
--- a/java/sdo/tools-test/src/main/resources/xsdImportOnly.wsdl
+++ b/sdo-java/trunk/tools-test/src/main/resources/xsdImportOnly.wsdl
diff --git a/java/sdo/tools-test/src/main/resources/xsdImportOnly_1.xsd b/sdo-java/trunk/tools-test/src/main/resources/xsdImportOnly_1.xsd
index a62c26d948..a62c26d948 100644
--- a/java/sdo/tools-test/src/main/resources/xsdImportOnly_1.xsd
+++ b/sdo-java/trunk/tools-test/src/main/resources/xsdImportOnly_1.xsd
diff --git a/java/sdo/tools-test/src/main/resources/xsdlistitem.xsd b/sdo-java/trunk/tools-test/src/main/resources/xsdlistitem.xsd
index e416efaa25..e416efaa25 100644
--- a/java/sdo/tools-test/src/main/resources/xsdlistitem.xsd
+++ b/sdo-java/trunk/tools-test/src/main/resources/xsdlistitem.xsd
diff --git a/java/sdo/tools-test/src/test/java/org/apache/tuscany/sdo/test/AllTests.java b/sdo-java/trunk/tools-test/src/test/java/org/apache/tuscany/sdo/test/AllTests.java
index 7c10cb2c62..7c10cb2c62 100644
--- a/java/sdo/tools-test/src/test/java/org/apache/tuscany/sdo/test/AllTests.java
+++ b/sdo-java/trunk/tools-test/src/test/java/org/apache/tuscany/sdo/test/AllTests.java
diff --git a/java/sdo/tools-test/src/test/java/org/apache/tuscany/sdo/test/ChangeSummaryGenTestCase.java b/sdo-java/trunk/tools-test/src/test/java/org/apache/tuscany/sdo/test/ChangeSummaryGenTestCase.java
index 37759458b9..37759458b9 100644
--- a/java/sdo/tools-test/src/test/java/org/apache/tuscany/sdo/test/ChangeSummaryGenTestCase.java
+++ b/sdo-java/trunk/tools-test/src/test/java/org/apache/tuscany/sdo/test/ChangeSummaryGenTestCase.java
diff --git a/java/sdo/tools-test/src/test/java/org/apache/tuscany/sdo/test/DataObjectGetListTestCase.java b/sdo-java/trunk/tools-test/src/test/java/org/apache/tuscany/sdo/test/DataObjectGetListTestCase.java
index b6650cade3..b6650cade3 100644
--- a/java/sdo/tools-test/src/test/java/org/apache/tuscany/sdo/test/DataObjectGetListTestCase.java
+++ b/sdo-java/trunk/tools-test/src/test/java/org/apache/tuscany/sdo/test/DataObjectGetListTestCase.java
diff --git a/java/sdo/tools-test/src/test/java/org/apache/tuscany/sdo/test/ExtensibleTestCase.java b/sdo-java/trunk/tools-test/src/test/java/org/apache/tuscany/sdo/test/ExtensibleTestCase.java
index c9cc384beb..c9cc384beb 100644
--- a/java/sdo/tools-test/src/test/java/org/apache/tuscany/sdo/test/ExtensibleTestCase.java
+++ b/sdo-java/trunk/tools-test/src/test/java/org/apache/tuscany/sdo/test/ExtensibleTestCase.java
diff --git a/java/sdo/tools-test/src/test/java/org/apache/tuscany/sdo/test/GenPatternsTestCase.java b/sdo-java/trunk/tools-test/src/test/java/org/apache/tuscany/sdo/test/GenPatternsTestCase.java
index e63697738e..e63697738e 100644
--- a/java/sdo/tools-test/src/test/java/org/apache/tuscany/sdo/test/GenPatternsTestCase.java
+++ b/sdo-java/trunk/tools-test/src/test/java/org/apache/tuscany/sdo/test/GenPatternsTestCase.java
diff --git a/java/sdo/tools-test/src/test/java/org/apache/tuscany/sdo/test/InheritanceTestCase.java b/sdo-java/trunk/tools-test/src/test/java/org/apache/tuscany/sdo/test/InheritanceTestCase.java
index 0b291b3365..0b291b3365 100644
--- a/java/sdo/tools-test/src/test/java/org/apache/tuscany/sdo/test/InheritanceTestCase.java
+++ b/sdo-java/trunk/tools-test/src/test/java/org/apache/tuscany/sdo/test/InheritanceTestCase.java
diff --git a/java/sdo/tools-test/src/test/java/org/apache/tuscany/sdo/test/InternalInElementTestCase.java b/sdo-java/trunk/tools-test/src/test/java/org/apache/tuscany/sdo/test/InternalInElementTestCase.java
index dfa4b02221..dfa4b02221 100644
--- a/java/sdo/tools-test/src/test/java/org/apache/tuscany/sdo/test/InternalInElementTestCase.java
+++ b/sdo-java/trunk/tools-test/src/test/java/org/apache/tuscany/sdo/test/InternalInElementTestCase.java
diff --git a/java/sdo/tools-test/src/test/java/org/apache/tuscany/sdo/test/ListWithDefaultTestCase.java b/sdo-java/trunk/tools-test/src/test/java/org/apache/tuscany/sdo/test/ListWithDefaultTestCase.java
index 59799bf23e..59799bf23e 100644
--- a/java/sdo/tools-test/src/test/java/org/apache/tuscany/sdo/test/ListWithDefaultTestCase.java
+++ b/sdo-java/trunk/tools-test/src/test/java/org/apache/tuscany/sdo/test/ListWithDefaultTestCase.java
diff --git a/java/sdo/tools-test/src/test/java/org/apache/tuscany/sdo/test/MixedTypesTestCase.java b/sdo-java/trunk/tools-test/src/test/java/org/apache/tuscany/sdo/test/MixedTypesTestCase.java
index e716076366..e716076366 100644
--- a/java/sdo/tools-test/src/test/java/org/apache/tuscany/sdo/test/MixedTypesTestCase.java
+++ b/sdo-java/trunk/tools-test/src/test/java/org/apache/tuscany/sdo/test/MixedTypesTestCase.java
diff --git a/java/sdo/tools-test/src/test/java/org/apache/tuscany/sdo/test/OpenContentTestCase.java b/sdo-java/trunk/tools-test/src/test/java/org/apache/tuscany/sdo/test/OpenContentTestCase.java
index cff0c3ba85..cff0c3ba85 100644
--- a/java/sdo/tools-test/src/test/java/org/apache/tuscany/sdo/test/OpenContentTestCase.java
+++ b/sdo-java/trunk/tools-test/src/test/java/org/apache/tuscany/sdo/test/OpenContentTestCase.java
diff --git a/java/sdo/tools-test/src/test/java/org/apache/tuscany/sdo/test/SimpleStaticTestCase.java b/sdo-java/trunk/tools-test/src/test/java/org/apache/tuscany/sdo/test/SimpleStaticTestCase.java
index c085245f13..c085245f13 100644
--- a/java/sdo/tools-test/src/test/java/org/apache/tuscany/sdo/test/SimpleStaticTestCase.java
+++ b/sdo-java/trunk/tools-test/src/test/java/org/apache/tuscany/sdo/test/SimpleStaticTestCase.java
diff --git a/java/sdo/tools-test/src/test/java/org/apache/tuscany/sdo/test/SubstitutionWithExtensionValuesTestCase.java b/sdo-java/trunk/tools-test/src/test/java/org/apache/tuscany/sdo/test/SubstitutionWithExtensionValuesTestCase.java
index 92cef546a6..92cef546a6 100644
--- a/java/sdo/tools-test/src/test/java/org/apache/tuscany/sdo/test/SubstitutionWithExtensionValuesTestCase.java
+++ b/sdo-java/trunk/tools-test/src/test/java/org/apache/tuscany/sdo/test/SubstitutionWithExtensionValuesTestCase.java
diff --git a/java/sdo/tools-test/src/test/resources/mixedTypesDynamic.xsd b/sdo-java/trunk/tools-test/src/test/resources/mixedTypesDynamic.xsd
index 25276792fc..25276792fc 100644
--- a/java/sdo/tools-test/src/test/resources/mixedTypesDynamic.xsd
+++ b/sdo-java/trunk/tools-test/src/test/resources/mixedTypesDynamic.xsd
diff --git a/java/sdo/tools-test/src/test/resources/stockquote.xml b/sdo-java/trunk/tools-test/src/test/resources/stockquote.xml
index 526743868d..526743868d 100644
--- a/java/sdo/tools-test/src/test/resources/stockquote.xml
+++ b/sdo-java/trunk/tools-test/src/test/resources/stockquote.xml
diff --git a/java/sdo/tools/pom.xml b/sdo-java/trunk/tools/pom.xml
index 6e41098943..6e41098943 100644
--- a/java/sdo/tools/pom.xml
+++ b/sdo-java/trunk/tools/pom.xml
diff --git a/java/sdo/tools/readme.htm b/sdo-java/trunk/tools/readme.htm
index e7aa8d6718..e7aa8d6718 100644
--- a/java/sdo/tools/readme.htm
+++ b/sdo-java/trunk/tools/readme.htm
diff --git a/java/sdo/tools/src/main/java/org/apache/tuscany/sdo/generate/JavaGenerator.java b/sdo-java/trunk/tools/src/main/java/org/apache/tuscany/sdo/generate/JavaGenerator.java
index c735e55e2a..c735e55e2a 100644
--- a/java/sdo/tools/src/main/java/org/apache/tuscany/sdo/generate/JavaGenerator.java
+++ b/sdo-java/trunk/tools/src/main/java/org/apache/tuscany/sdo/generate/JavaGenerator.java
diff --git a/java/sdo/tools/src/main/java/org/apache/tuscany/sdo/generate/XSD2JavaGenerator.java b/sdo-java/trunk/tools/src/main/java/org/apache/tuscany/sdo/generate/XSD2JavaGenerator.java
index 7e65549165..7e65549165 100644
--- a/java/sdo/tools/src/main/java/org/apache/tuscany/sdo/generate/XSD2JavaGenerator.java
+++ b/sdo-java/trunk/tools/src/main/java/org/apache/tuscany/sdo/generate/XSD2JavaGenerator.java
diff --git a/java/sdo/tools/src/main/java/org/apache/tuscany/sdo/generate/adapter/SDOGenClassGeneratorAdapter.java b/sdo-java/trunk/tools/src/main/java/org/apache/tuscany/sdo/generate/adapter/SDOGenClassGeneratorAdapter.java
index d522ad5fad..d522ad5fad 100644
--- a/java/sdo/tools/src/main/java/org/apache/tuscany/sdo/generate/adapter/SDOGenClassGeneratorAdapter.java
+++ b/sdo-java/trunk/tools/src/main/java/org/apache/tuscany/sdo/generate/adapter/SDOGenClassGeneratorAdapter.java
diff --git a/java/sdo/tools/src/main/java/org/apache/tuscany/sdo/generate/adapter/SDOGenModelGeneratorAdapter.java b/sdo-java/trunk/tools/src/main/java/org/apache/tuscany/sdo/generate/adapter/SDOGenModelGeneratorAdapter.java
index 16678e001b..16678e001b 100644
--- a/java/sdo/tools/src/main/java/org/apache/tuscany/sdo/generate/adapter/SDOGenModelGeneratorAdapter.java
+++ b/sdo-java/trunk/tools/src/main/java/org/apache/tuscany/sdo/generate/adapter/SDOGenModelGeneratorAdapter.java
diff --git a/java/sdo/tools/src/main/java/org/apache/tuscany/sdo/generate/adapter/SDOGenModelGeneratorAdapterFactory.java b/sdo-java/trunk/tools/src/main/java/org/apache/tuscany/sdo/generate/adapter/SDOGenModelGeneratorAdapterFactory.java
index dfe62878af..dfe62878af 100644
--- a/java/sdo/tools/src/main/java/org/apache/tuscany/sdo/generate/adapter/SDOGenModelGeneratorAdapterFactory.java
+++ b/sdo-java/trunk/tools/src/main/java/org/apache/tuscany/sdo/generate/adapter/SDOGenModelGeneratorAdapterFactory.java
diff --git a/java/sdo/tools/src/main/java/org/apache/tuscany/sdo/generate/adapter/SDOGenPackageGeneratorAdapter.java b/sdo-java/trunk/tools/src/main/java/org/apache/tuscany/sdo/generate/adapter/SDOGenPackageGeneratorAdapter.java
index 6616be995c..6616be995c 100644
--- a/java/sdo/tools/src/main/java/org/apache/tuscany/sdo/generate/adapter/SDOGenPackageGeneratorAdapter.java
+++ b/sdo-java/trunk/tools/src/main/java/org/apache/tuscany/sdo/generate/adapter/SDOGenPackageGeneratorAdapter.java
diff --git a/java/sdo/tools/src/main/java/org/apache/tuscany/sdo/generate/templates/model/SDOClass.java b/sdo-java/trunk/tools/src/main/java/org/apache/tuscany/sdo/generate/templates/model/SDOClass.java
index 74e6a77699..74e6a77699 100644
--- a/java/sdo/tools/src/main/java/org/apache/tuscany/sdo/generate/templates/model/SDOClass.java
+++ b/sdo-java/trunk/tools/src/main/java/org/apache/tuscany/sdo/generate/templates/model/SDOClass.java
diff --git a/java/sdo/tools/src/main/java/org/apache/tuscany/sdo/generate/templates/model/SDOFactoryClass.java b/sdo-java/trunk/tools/src/main/java/org/apache/tuscany/sdo/generate/templates/model/SDOFactoryClass.java
index 8da8d643dc..8da8d643dc 100644
--- a/java/sdo/tools/src/main/java/org/apache/tuscany/sdo/generate/templates/model/SDOFactoryClass.java
+++ b/sdo-java/trunk/tools/src/main/java/org/apache/tuscany/sdo/generate/templates/model/SDOFactoryClass.java
diff --git a/java/sdo/tools/src/main/java/org/apache/tuscany/sdo/generate/util/SDOGenUtil.java b/sdo-java/trunk/tools/src/main/java/org/apache/tuscany/sdo/generate/util/SDOGenUtil.java
index 062580f4b8..062580f4b8 100644
--- a/java/sdo/tools/src/main/java/org/apache/tuscany/sdo/generate/util/SDOGenUtil.java
+++ b/sdo-java/trunk/tools/src/main/java/org/apache/tuscany/sdo/generate/util/SDOGenUtil.java
diff --git a/java/sdo/tools/src/main/java/org/eclipse/jdt/core/formatter/CodeFormatter.java b/sdo-java/trunk/tools/src/main/java/org/eclipse/jdt/core/formatter/CodeFormatter.java
index 1c1f37682f..1c1f37682f 100644
--- a/java/sdo/tools/src/main/java/org/eclipse/jdt/core/formatter/CodeFormatter.java
+++ b/sdo-java/trunk/tools/src/main/java/org/eclipse/jdt/core/formatter/CodeFormatter.java
diff --git a/java/sdo/tools/src/main/resources/META-INF/DISCLAIMER b/sdo-java/trunk/tools/src/main/resources/META-INF/DISCLAIMER
index a65af91c5a..a65af91c5a 100644
--- a/java/sdo/tools/src/main/resources/META-INF/DISCLAIMER
+++ b/sdo-java/trunk/tools/src/main/resources/META-INF/DISCLAIMER
diff --git a/java/sdo/tools/src/main/resources/META-INF/LICENSE.txt b/sdo-java/trunk/tools/src/main/resources/META-INF/LICENSE.txt
index 9a90d375bc..9a90d375bc 100644
--- a/java/sdo/tools/src/main/resources/META-INF/LICENSE.txt
+++ b/sdo-java/trunk/tools/src/main/resources/META-INF/LICENSE.txt
diff --git a/java/sdo/tools/src/main/resources/META-INF/MANIFEST.MF b/sdo-java/trunk/tools/src/main/resources/META-INF/MANIFEST.MF
index 8bb7dea1fe..8bb7dea1fe 100644
--- a/java/sdo/tools/src/main/resources/META-INF/MANIFEST.MF
+++ b/sdo-java/trunk/tools/src/main/resources/META-INF/MANIFEST.MF
diff --git a/java/sdo/tools/src/main/resources/META-INF/NOTICE b/sdo-java/trunk/tools/src/main/resources/META-INF/NOTICE
index 9f9572a167..9f9572a167 100644
--- a/java/sdo/tools/src/main/resources/META-INF/NOTICE
+++ b/sdo-java/trunk/tools/src/main/resources/META-INF/NOTICE
diff --git a/java/sdo/tools/src/main/resources/META-INF/README.txt b/sdo-java/trunk/tools/src/main/resources/META-INF/README.txt
index 1b8144f7c5..1b8144f7c5 100644
--- a/java/sdo/tools/src/main/resources/META-INF/README.txt
+++ b/sdo-java/trunk/tools/src/main/resources/META-INF/README.txt
diff --git a/java/sdo/tools/src/test/java/com/example/repchoice/RCType.java b/sdo-java/trunk/tools/src/test/java/com/example/repchoice/RCType.java
index 29a558b5a2..29a558b5a2 100644
--- a/java/sdo/tools/src/test/java/com/example/repchoice/RCType.java
+++ b/sdo-java/trunk/tools/src/test/java/com/example/repchoice/RCType.java
diff --git a/java/sdo/tools/src/test/java/com/example/repchoice/RepchoiceFactory.java b/sdo-java/trunk/tools/src/test/java/com/example/repchoice/RepchoiceFactory.java
index 9a7c3033a5..9a7c3033a5 100644
--- a/java/sdo/tools/src/test/java/com/example/repchoice/RepchoiceFactory.java
+++ b/sdo-java/trunk/tools/src/test/java/com/example/repchoice/RepchoiceFactory.java
diff --git a/java/sdo/tools/src/test/java/com/example/repchoice/impl/RCTypeImpl.java b/sdo-java/trunk/tools/src/test/java/com/example/repchoice/impl/RCTypeImpl.java
index 322dc5a8e0..322dc5a8e0 100644
--- a/java/sdo/tools/src/test/java/com/example/repchoice/impl/RCTypeImpl.java
+++ b/sdo-java/trunk/tools/src/test/java/com/example/repchoice/impl/RCTypeImpl.java
diff --git a/java/sdo/tools/src/test/java/com/example/repchoice/impl/RepchoiceFactoryImpl.java b/sdo-java/trunk/tools/src/test/java/com/example/repchoice/impl/RepchoiceFactoryImpl.java
index 40d3e9eeec..40d3e9eeec 100644
--- a/java/sdo/tools/src/test/java/com/example/repchoice/impl/RepchoiceFactoryImpl.java
+++ b/sdo-java/trunk/tools/src/test/java/com/example/repchoice/impl/RepchoiceFactoryImpl.java
diff --git a/java/sdo/tools/src/test/java/com/example/sequences/MixedQuote.java b/sdo-java/trunk/tools/src/test/java/com/example/sequences/MixedQuote.java
index f1882ba616..f1882ba616 100644
--- a/java/sdo/tools/src/test/java/com/example/sequences/MixedQuote.java
+++ b/sdo-java/trunk/tools/src/test/java/com/example/sequences/MixedQuote.java
diff --git a/java/sdo/tools/src/test/java/com/example/sequences/MixedRepeatingChoice.java b/sdo-java/trunk/tools/src/test/java/com/example/sequences/MixedRepeatingChoice.java
index dba64b0487..dba64b0487 100644
--- a/java/sdo/tools/src/test/java/com/example/sequences/MixedRepeatingChoice.java
+++ b/sdo-java/trunk/tools/src/test/java/com/example/sequences/MixedRepeatingChoice.java
diff --git a/java/sdo/tools/src/test/java/com/example/sequences/RepeatingChoice.java b/sdo-java/trunk/tools/src/test/java/com/example/sequences/RepeatingChoice.java
index 3f0b0839f2..3f0b0839f2 100644
--- a/java/sdo/tools/src/test/java/com/example/sequences/RepeatingChoice.java
+++ b/sdo-java/trunk/tools/src/test/java/com/example/sequences/RepeatingChoice.java
diff --git a/java/sdo/tools/src/test/java/com/example/sequences/SequencesFactory.java b/sdo-java/trunk/tools/src/test/java/com/example/sequences/SequencesFactory.java
index 900b51ddc3..900b51ddc3 100644
--- a/java/sdo/tools/src/test/java/com/example/sequences/SequencesFactory.java
+++ b/sdo-java/trunk/tools/src/test/java/com/example/sequences/SequencesFactory.java
diff --git a/java/sdo/tools/src/test/java/com/example/sequences/TwoRCs.java b/sdo-java/trunk/tools/src/test/java/com/example/sequences/TwoRCs.java
index c6e54e6598..c6e54e6598 100644
--- a/java/sdo/tools/src/test/java/com/example/sequences/TwoRCs.java
+++ b/sdo-java/trunk/tools/src/test/java/com/example/sequences/TwoRCs.java
diff --git a/java/sdo/tools/src/test/java/com/example/sequences/TwoRCsMixed.java b/sdo-java/trunk/tools/src/test/java/com/example/sequences/TwoRCsMixed.java
index 90d5f942b6..90d5f942b6 100644
--- a/java/sdo/tools/src/test/java/com/example/sequences/TwoRCsMixed.java
+++ b/sdo-java/trunk/tools/src/test/java/com/example/sequences/TwoRCsMixed.java
diff --git a/java/sdo/tools/src/test/java/com/example/sequences/impl/MixedQuoteImpl.java b/sdo-java/trunk/tools/src/test/java/com/example/sequences/impl/MixedQuoteImpl.java
index 96fe832ef3..96fe832ef3 100644
--- a/java/sdo/tools/src/test/java/com/example/sequences/impl/MixedQuoteImpl.java
+++ b/sdo-java/trunk/tools/src/test/java/com/example/sequences/impl/MixedQuoteImpl.java
diff --git a/java/sdo/tools/src/test/java/com/example/sequences/impl/MixedRepeatingChoiceImpl.java b/sdo-java/trunk/tools/src/test/java/com/example/sequences/impl/MixedRepeatingChoiceImpl.java
index d9cb3ac080..d9cb3ac080 100644
--- a/java/sdo/tools/src/test/java/com/example/sequences/impl/MixedRepeatingChoiceImpl.java
+++ b/sdo-java/trunk/tools/src/test/java/com/example/sequences/impl/MixedRepeatingChoiceImpl.java
diff --git a/java/sdo/tools/src/test/java/com/example/sequences/impl/RepeatingChoiceImpl.java b/sdo-java/trunk/tools/src/test/java/com/example/sequences/impl/RepeatingChoiceImpl.java
index 376a8471cf..376a8471cf 100644
--- a/java/sdo/tools/src/test/java/com/example/sequences/impl/RepeatingChoiceImpl.java
+++ b/sdo-java/trunk/tools/src/test/java/com/example/sequences/impl/RepeatingChoiceImpl.java
diff --git a/java/sdo/tools/src/test/java/com/example/sequences/impl/SequencesFactoryImpl.java b/sdo-java/trunk/tools/src/test/java/com/example/sequences/impl/SequencesFactoryImpl.java
index 84631cb06d..84631cb06d 100644
--- a/java/sdo/tools/src/test/java/com/example/sequences/impl/SequencesFactoryImpl.java
+++ b/sdo-java/trunk/tools/src/test/java/com/example/sequences/impl/SequencesFactoryImpl.java
diff --git a/java/sdo/tools/src/test/java/com/example/sequences/impl/TwoRCsImpl.java b/sdo-java/trunk/tools/src/test/java/com/example/sequences/impl/TwoRCsImpl.java
index c1e385ec63..c1e385ec63 100644
--- a/java/sdo/tools/src/test/java/com/example/sequences/impl/TwoRCsImpl.java
+++ b/sdo-java/trunk/tools/src/test/java/com/example/sequences/impl/TwoRCsImpl.java
diff --git a/java/sdo/tools/src/test/java/com/example/sequences/impl/TwoRCsMixedImpl.java b/sdo-java/trunk/tools/src/test/java/com/example/sequences/impl/TwoRCsMixedImpl.java
index 0d48a9df69..0d48a9df69 100644
--- a/java/sdo/tools/src/test/java/com/example/sequences/impl/TwoRCsMixedImpl.java
+++ b/sdo-java/trunk/tools/src/test/java/com/example/sequences/impl/TwoRCsMixedImpl.java
diff --git a/java/sdo/tools/src/test/java/org/apache/tuscany/sdo/test/AllTests.java b/sdo-java/trunk/tools/src/test/java/org/apache/tuscany/sdo/test/AllTests.java
index 67b0e1a3fd..67b0e1a3fd 100644
--- a/java/sdo/tools/src/test/java/org/apache/tuscany/sdo/test/AllTests.java
+++ b/sdo-java/trunk/tools/src/test/java/org/apache/tuscany/sdo/test/AllTests.java
diff --git a/java/sdo/tools/src/test/java/org/apache/tuscany/sdo/test/GeneratedPackagesTestCase.java b/sdo-java/trunk/tools/src/test/java/org/apache/tuscany/sdo/test/GeneratedPackagesTestCase.java
index 290f27338a..290f27338a 100644
--- a/java/sdo/tools/src/test/java/org/apache/tuscany/sdo/test/GeneratedPackagesTestCase.java
+++ b/sdo-java/trunk/tools/src/test/java/org/apache/tuscany/sdo/test/GeneratedPackagesTestCase.java
diff --git a/java/sdo/tools/src/test/resources/TUSCANY1050.xsd b/sdo-java/trunk/tools/src/test/resources/TUSCANY1050.xsd
index a218eb574c..a218eb574c 100644
--- a/java/sdo/tools/src/test/resources/TUSCANY1050.xsd
+++ b/sdo-java/trunk/tools/src/test/resources/TUSCANY1050.xsd
diff --git a/java/sdo/tools/src/test/resources/enum.xsd b/sdo-java/trunk/tools/src/test/resources/enum.xsd
index 6c906539a9..6c906539a9 100644
--- a/java/sdo/tools/src/test/resources/enum.xsd
+++ b/sdo-java/trunk/tools/src/test/resources/enum.xsd
diff --git a/java/sdo/tools/src/test/resources/mixedRepeatingChoiceTestResult.xml b/sdo-java/trunk/tools/src/test/resources/mixedRepeatingChoiceTestResult.xml
index 0aa17bb50a..0aa17bb50a 100644
--- a/java/sdo/tools/src/test/resources/mixedRepeatingChoiceTestResult.xml
+++ b/sdo-java/trunk/tools/src/test/resources/mixedRepeatingChoiceTestResult.xml
diff --git a/java/sdo/tools/src/test/resources/mixedStaticTestResult.xml b/sdo-java/trunk/tools/src/test/resources/mixedStaticTestResult.xml
index 9136f0780d..9136f0780d 100644
--- a/java/sdo/tools/src/test/resources/mixedStaticTestResult.xml
+++ b/sdo-java/trunk/tools/src/test/resources/mixedStaticTestResult.xml
diff --git a/java/sdo/tools/src/test/resources/repeatingChoice.xsd b/sdo-java/trunk/tools/src/test/resources/repeatingChoice.xsd
index 1d566da671..1d566da671 100644
--- a/java/sdo/tools/src/test/resources/repeatingChoice.xsd
+++ b/sdo-java/trunk/tools/src/test/resources/repeatingChoice.xsd
diff --git a/java/sdo/tools/src/test/resources/repeatingChoiceTestResult.xml b/sdo-java/trunk/tools/src/test/resources/repeatingChoiceTestResult.xml
index 2719457b6d..2719457b6d 100644
--- a/java/sdo/tools/src/test/resources/repeatingChoiceTestResult.xml
+++ b/sdo-java/trunk/tools/src/test/resources/repeatingChoiceTestResult.xml
diff --git a/java/sdo/tools/src/test/resources/sdoModel.xsd b/sdo-java/trunk/tools/src/test/resources/sdoModel.xsd
index 6b596c5b36..6b596c5b36 100644
--- a/java/sdo/tools/src/test/resources/sdoModel.xsd
+++ b/sdo-java/trunk/tools/src/test/resources/sdoModel.xsd
diff --git a/java/sdo/tools/src/test/resources/sequences.xsd b/sdo-java/trunk/tools/src/test/resources/sequences.xsd
index b74a56eab7..b74a56eab7 100644
--- a/java/sdo/tools/src/test/resources/sequences.xsd
+++ b/sdo-java/trunk/tools/src/test/resources/sequences.xsd
diff --git a/java/sdo/tools/src/test/resources/twoRepeatingChoicesMixedTestResult.xml b/sdo-java/trunk/tools/src/test/resources/twoRepeatingChoicesMixedTestResult.xml
index a62cd66b58..a62cd66b58 100644
--- a/java/sdo/tools/src/test/resources/twoRepeatingChoicesMixedTestResult.xml
+++ b/sdo-java/trunk/tools/src/test/resources/twoRepeatingChoicesMixedTestResult.xml
diff --git a/java/sdo/tools/src/test/resources/twoRepeatingChoicesTestResult.xml b/sdo-java/trunk/tools/src/test/resources/twoRepeatingChoicesTestResult.xml
index 3585ad00d3..3585ad00d3 100644
--- a/java/sdo/tools/src/test/resources/twoRepeatingChoicesTestResult.xml
+++ b/sdo-java/trunk/tools/src/test/resources/twoRepeatingChoicesTestResult.xml
diff --git a/java/sdo/tools/templates/Header.javajetinc b/sdo-java/trunk/tools/templates/Header.javajetinc
index 27becf3645..27becf3645 100644
--- a/java/sdo/tools/templates/Header.javajetinc
+++ b/sdo-java/trunk/tools/templates/Header.javajetinc
diff --git a/java/sdo/tools/templates/models/SDOClass.javajet b/sdo-java/trunk/tools/templates/models/SDOClass.javajet
index 758f1126bd..758f1126bd 100644
--- a/java/sdo/tools/templates/models/SDOClass.javajet
+++ b/sdo-java/trunk/tools/templates/models/SDOClass.javajet
diff --git a/java/sdo/tools/templates/models/SDOFactoryClass.javajet b/sdo-java/trunk/tools/templates/models/SDOFactoryClass.javajet
index af5bdbee36..af5bdbee36 100644
--- a/java/sdo/tools/templates/models/SDOFactoryClass.javajet
+++ b/sdo-java/trunk/tools/templates/models/SDOFactoryClass.javajet
diff --git a/java/sdo/tools/templates/models/generator.skeleton b/sdo-java/trunk/tools/templates/models/generator.skeleton
index 5c123c01fd..5c123c01fd 100644
--- a/java/sdo/tools/templates/models/generator.skeleton
+++ b/sdo-java/trunk/tools/templates/models/generator.skeleton