Moving 1.x branches

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

17 files changed, 1660 insertions, 0 deletions

diff --git a/sca-java-1.x/branches/sca-java-0.91/modules/databinding-sdo-axiom/.checkstyle b/sca-java-1.x/branches/sca-java-0.91/modules/databinding-sdo-axiom/.checkstyle
new file mode 100644
index 0000000000..c7b30ffd5e
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/databinding-sdo-axiom/.checkstyle
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ *

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ *

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * KIND, either express or implied.  See the License for the

+ * specific language governing permissions and limitations

+ * under the License.

+-->

+

+<fileset-config file-format-version="1.2.0" simple-config="true">

+    <fileset name="all" enabled="true" check-config-name="Tuscany Checks" local="false">

+        <file-match-pattern match-pattern="." include-pattern="true"/>

+    </fileset>

+</fileset-config>

diff --git a/sca-java-1.x/branches/sca-java-0.91/modules/databinding-sdo-axiom/.ruleset b/sca-java-1.x/branches/sca-java-0.91/modules/databinding-sdo-axiom/.ruleset
new file mode 100644
index 0000000000..27b9ab847c
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/databinding-sdo-axiom/.ruleset
@@ -0,0 +1,191 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<!--

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you under the Apache License, Version 2.0 (the

+ * "License"); you may not use this file except in compliance

+ * with the License.  You may obtain a copy of the License at

+ *

+ *   http://www.apache.org/licenses/LICENSE-2.0

+ *

+ * Unless required by applicable law or agreed to in writing,

+ * software distributed under the License is distributed on an

+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+ * KIND, either express or implied.  See the License for the

+ * specific language governing permissions and limitations

+ * under the License.

+-->

+

+<ruleset name="pmd-eclipse">

+  <description>PMD Plugin preferences rule set</description>

+  

+  

+  <rule ref="rulesets/basic.xml/BooleanInstantiation"/>

+  <rule ref="rulesets/basic.xml/CollapsibleIfStatements"/>

+  <rule ref="rulesets/basic.xml/DoubleCheckedLocking"/>

+<!--<rule ref="rulesets/basic.xml/EmptyCatchBlock"/>-->

+<!--<rule ref="rulesets/basic.xml/EmptyFinallyBlock"/>-->

+<!--<rule ref="rulesets/basic.xml/EmptyIfStmt"/>-->

+  <rule ref="rulesets/basic.xml/EmptyStatementNotInLoop"/>

+<!--<rule ref="rulesets/basic.xml/EmptyStaticInitializer"/>-->

+<!--<rule ref="rulesets/basic.xml/EmptySwitchStatements"/>-->

+<!--<rule ref="rulesets/basic.xml/EmptySynchronizedBlock"/>-->

+<!--<rule ref="rulesets/basic.xml/EmptyTryBlock"/>-->

+<!--<rule ref="rulesets/basic.xml/EmptyWhileStmt"/>-->

+  <rule ref="rulesets/basic.xml/ForLoopShouldBeWhileLoop"/>

+  <rule ref="rulesets/basic.xml/JumbledIncrementer"/>

+<!--<rule ref="rulesets/basic.xml/OverrideBothEqualsAndHashcode"/>-->

+  <rule ref="rulesets/basic.xml/ReturnFromFinallyBlock"/>

+  <rule ref="rulesets/basic.xml/UnconditionalIfStatement"/>

+  <rule ref="rulesets/basic.xml/UnnecessaryConversionTemporary"/>

+  <rule ref="rulesets/basic.xml/UnnecessaryFinalModifier"/>

+  <rule ref="rulesets/basic.xml/UnnecessaryReturn"/>

+<!--<rule ref="rulesets/basic.xml/UselessOverridingMethod"/>-->

+  

+<!--<rule ref="rulesets/braces.xml/ForLoopsMustUseBraces"/>-->

+<!--<rule ref="rulesets/braces.xml/IfElseStmtsMustUseBraces"/>-->

+<!--<rule ref="rulesets/braces.xml/IfStmtsMustUseBraces"/>-->

+<!--<rule ref="rulesets/braces.xml/WhileLoopsMustUseBraces"/>-->

+

+<!--<rule ref="rulesets/clone.xml/CloneMethodMustImplementCloneable"/>-->

+<!--<rule ref="rulesets/clone.xml/CloneThrowsCloneNotSupportedException"/>-->

+<!--<rule ref="rulesets/clone.xml/ProperCloneImplementation"/>-->

+  

+<!--<rule ref="rulesets/codesize.xml/CyclomaticComplexity"/>-->

+<!--<rule ref="rulesets/codesize.xml/ExcessiveClassLength"/>-->

+<!--<rule ref="rulesets/codesize.xml/ExcessiveMethodLength"/>-->

+<!--<rule ref="rulesets/codesize.xml/ExcessiveParameterList"/>-->

+<!--<rule ref="rulesets/codesize.xml/ExcessivePublicCount"/>-->

+<!--<rule ref="rulesets/codesize.xml/TooManyFields"/>-->

+

+<rule ref="rulesets/controversial.xml/AssignmentInOperand"/>

+<!--<rule ref="rulesets/controversial.xml/AtLeastOneConstructor"/>-->

+<!--<rule ref="rulesets/controversial.xml/CallSuperInConstructor"/>-->

+<!--<rule ref="rulesets/controversial.xml/DontImportSun"/>-->

+<!--<rule ref="rulesets/controversial.xml/NullAssignment"/>-->

+<!--<rule ref="rulesets/controversial.xml/OnlyOneReturn"/>-->

+<!--<rule ref="rulesets/controversial.xml/SingularField"/>-->

+<!--<rule ref="rulesets/controversial.xml/SuspiciousOctalEscape"/>-->

+<!--<rule ref="rulesets/controversial.xml/UnnecessaryConstructor"/>-->

+<rule ref="rulesets/controversial.xml/UnnecessaryParentheses"/>

+<!--<rule ref="rulesets/controversial.xml/UnusedModifier"/>-->

+

+<!--<rule ref="rulesets/coupling.xml/CouplingBetweenObjects"/>-->

+<!--<rule ref="rulesets/coupling.xml/ExcessiveImports"/>-->

+<!--<rule ref="rulesets/coupling.xml/LooseCoupling"/>-->

+

+<!--<rule ref="rulesets/design.xml/AbstractClassWithoutAbstractMethod"/>-->

+<!--<rule ref="rulesets/design.xml/AccessorClassGeneration"/>-->

+<!--<rule ref="rulesets/design.xml/AssignmentToNonFinalStatic"/>-->

+<!--<rule ref="rulesets/design.xml/AvoidDeeplyNestedIfStmts"/>-->

+<!--<rule ref="rulesets/design.xml/AvoidInstanceofChecksInCatchClause"/>-->

+<rule ref="rulesets/design.xml/AvoidProtectedFieldInFinalClass"/>

+<!--<rule ref="rulesets/design.xml/AvoidReassigningParameters"/>-->

+<!--<rule ref="rulesets/design.xml/AvoidSynchronizedAtMethodLevel"/>-->

+<!--<rule ref="rulesets/design.xml/BadComparison"/>-->

+<!--<rule ref="rulesets/design.xml/CloseConnection"/>-->

+<!--<rule ref="rulesets/design.xml/CompareObjectsWithEquals"/>-->

+<!--<rule ref="rulesets/design.xml/ConfusingTernary"/>-->

+<rule ref="rulesets/design.xml/ConstructorCallsOverridableMethod"/>

+<!--<rule ref="rulesets/design.xml/DefaultLabelNotLastInSwitchStmt"/>-->

+<!--<rule ref="rulesets/design.xml/FinalFieldCouldBeStatic"/>-->

+<rule ref="rulesets/design.xml/IdempotentOperations"/>

+<!--<rule ref="rulesets/design.xml/ImmutableField"/>-->

+<!--<rule ref="rulesets/design.xml/InstantiationToGetClass"/>-->

+<!--<rule ref="rulesets/design.xml/MissingBreakInSwitch"/>-->

+<!--<rule ref="rulesets/design.xml/MissingStaticMethodInNonInstantiatableClass"/>-->

+<!--<rule ref="rulesets/design.xml/NonCaseLabelInSwitchStatement"/>-->

+<!--<rule ref="rulesets/design.xml/NonStaticInitializer"/>-->

+<rule ref="rulesets/design.xml/OptimizableToArrayCall"/>

+<rule ref="rulesets/design.xml/PositionLiteralsFirstInComparisons"/>

+<rule ref="rulesets/design.xml/SimplifyBooleanExpressions"/>

+<rule ref="rulesets/design.xml/SimplifyBooleanReturns"/>

+<rule ref="rulesets/design.xml/SimplifyConditional"/>

+<!--<rule ref="rulesets/design.xml/SwitchDensity"/>-->

+<!--<rule ref="rulesets/design.xml/SwitchStmtsShouldHaveDefault"/>-->

+<rule ref="rulesets/design.xml/UnnecessaryLocalBeforeReturn"/>

+<!--<rule ref="rulesets/design.xml/UseLocaleWithCaseConversions"/>-->

+<!--<rule ref="rulesets/design.xml/UseNotifyAllInsteadOfNotify"/>-->

+<!--<rule ref="rulesets/design.xml/UseSingleton"/>-->

+

+<!--<rule ref="rulesets/finalizers.xml/EmptyFinalizer"/>-->

+<!--<rule ref="rulesets/finalizers.xml/FinalizeOnlyCallsSuperFinalize"/>-->

+<!--<rule ref="rulesets/finalizers.xml/FinalizeOverloaded"/>-->

+<!--<rule ref="rulesets/finalizers.xml/FinalizeDoesNotCallSuperFinalize"/>-->

+<!--<rule ref="rulesets/finalizers.xml/FinalizeShouldBeProtected"/>-->

+<!--<rule ref="rulesets/finalizers.xml/AvoidCallingFinalize"/>-->

+

+<!--<rule ref="rulesets/imports.xml/DuplicateImports"/>-->

+<!--<rule ref="rulesets/imports.xml/DontImportJavaLang"/>-->

+<!--<rule ref="rulesets/imports.xml/UnusedImports"/>-->

+<!--<rule ref="rulesets/imports.xml/ImportFromSamePackage"/>-->

+

+<!--<rule ref="rulesets/javabeans.xml/BeanMembersShouldSerialize"/>-->

+<!--<rule ref="rulesets/javabeans.xml/MissingSerialVersionUID"/>-->

+

+<!--<rule ref="rulesets/junit.xml/JUnitStaticSuite"/>-->

+<!--<rule ref="rulesets/junit.xml/JUnitSpelling"/>-->

+<!--<rule ref="rulesets/junit.xml/JUnitAssertionsShouldIncludeMessage"/>-->

+<!--<rule ref="rulesets/junit.xml/JUnitTestsShouldIncludeAssert"/>-->

+<!--<rule ref="rulesets/junit.xml/TestClassWithoutTestCases"/>-->

+<!--<rule ref="rulesets/junit.xml/UnnecessaryBooleanAssertion"/>-->

+<!--<rule ref="rulesets/junit.xml/UseAssertEqualsInsteadOfAssertTrue"/>-->

+<!--<rule ref="rulesets/junit.xml/UseAssertSameInsteadOfAssertTrue"/>-->

+

+  <!--<rule ref="rulesets/logging-java.xml/AvoidPrintStackTrace"/>-->

+  <!--<rule ref="rulesets/logging-java.xml/LoggerIsNotStaticFinal"/>-->

+  <!--<rule ref="rulesets/logging-java.xml/MoreThanOneLogger"/>-->

+  <!--<rule ref="rulesets/logging-java.xml/LoggerIsNotStaticFinal"/>-->

+  <!--<rule ref="rulesets/logging-java.xml/LogBlockWithoutIf"/>-->

+  <!--<rule ref="rulesets/logging-java.xml/SystemPrintln"/>-->

+  <!--<rule ref="rulesets/logging-jakarta-commons.xml/UseCorrectExceptionLogging"/>-->

+  <!--<rule ref="rulesets/logging-jakarta-commons.xml/ProperLogger"/>-->

+  

+  <!--<rule ref="rulesets/naming.xml/ShortVariable"/>-->

+  <!--<rule ref="rulesets/naming.xml/LongVariable"/>-->

+  <!--<rule ref="rulesets/naming.xml/ShortMethodName"/>-->

+  <!--<rule ref="rulesets/naming.xml/VariableNamingConventions"/>-->

+  <!--<rule ref="rulesets/naming.xml/MethodNamingConventions"/>-->

+  <!--<rule ref="rulesets/naming.xml/ClassNamingConventions"/>-->

+  <!--<rule ref="rulesets/naming.xml/AbstractNaming"/>-->

+  <!--<rule ref="rulesets/naming.xml/AvoidDollarSigns"/>-->

+  <!--<rule ref="rulesets/naming.xml/MethodWithSameNameAsEnclosingClass"/>-->

+  <!--<rule ref="rulesets/naming.xml/SuspiciousHashcodeMethodName"/>-->

+  <!--<rule ref="rulesets/naming.xml/SuspiciousConstantFieldName"/>-->

+  <!--<rule ref="rulesets/naming.xml/AvoidFieldNameMatchingTypeName"/>-->

+  <!--<rule ref="rulesets/naming.xml/AvoidFieldNameMatchingMethodName"/>-->

+  <!--<rule ref="rulesets/naming.xml/AvoidNonConstructorMethodsWithClassName"/>-->

+  <!--<rule ref="rulesets/naming.xml/NoPackage"/>-->

+  <!--<rule ref="rulesets/naming.xml/PackageCase"/>-->

+

+  <!--<rule ref="rulesets/optimizations.xml/LocalVariableCouldBeFinal"/>-->

+  <!--<rule ref="rulesets/optimizations.xml/MethodArgumentCouldBeFinal"/>-->

+  <!--<rule ref="rulesets/optimizations.xml/AvoidInstantiatingObjectsInLoops"/>-->

+  <!--<rule ref="rulesets/optimizations.xml/UseArrayListInsteadOfVector"/>-->

+  <!--<rule ref="rulesets/optimizations.xml/SimplifyStartsWith"/>-->

+  <!--<rule ref="rulesets/optimizations.xml/UseStringBufferForStringAppends"/>-->

+

+  <!--<rule ref="rulesets/strictexception.xml/AvoidCatchingThrowable"/>-->

+  <!--<rule ref="rulesets/strictexception.xml/SignatureDeclareThrowsException"/>-->

+  <!--<rule ref="rulesets/strictexception.xml/ExceptionAsFlowControl"/>-->

+  <!--<rule ref="rulesets/strictexception.xml/AvoidCatchingNPE"/>-->

+  <!--<rule ref="rulesets/strictexception.xml/AvoidThrowingRawExceptionTypes"/>-->

+  <!--<rule ref="rulesets/strictexception.xml/AvoidThrowingNullPointerException"/>-->

+ 

+  <!--<rule ref="rulesets/strings.xml/AvoidDuplicateLiterals"/>-->

+  <!--<rule ref="rulesets/strings.xml/StringInstantiation"/>-->

+  <!--<rule ref="rulesets/strings.xml/StringToString"/>-->

+  <!--<rule ref="rulesets/strings.xml/AvoidConcatenatingNonLiteralsInStringBuffer"/>-->

+  <!--<rule ref="rulesets/strings.xml/UnnecessaryCaseChange"/>-->

+  

+  <!--<rule ref="rulesets/sunsecure.xml/MethodReturnsInternalArray"/>-->

+  <!--<rule ref="rulesets/sunsecure.xml/ArrayIsStoredDirectly"/>-->

+  

+  <rule ref="rulesets/unusedcode.xml/UnusedLocalVariable"/>

+  <rule ref="rulesets/unusedcode.xml/UnusedPrivateField"/>

+  <rule ref="rulesets/unusedcode.xml/UnusedPrivateMethod"/>

+  <!--<rule ref="rulesets/unusedcode.xml/UnusedFormalParameter"/>-->

+  

+</ruleset>

diff --git a/sca-java-1.x/branches/sca-java-0.91/modules/databinding-sdo-axiom/DISCLAIMER b/sca-java-1.x/branches/sca-java-0.91/modules/databinding-sdo-axiom/DISCLAIMER
new file mode 100644
index 0000000000..d68a410903
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/databinding-sdo-axiom/DISCLAIMER
@@ -0,0 +1,8 @@
+Apache Tuscany is an effort undergoing incubation at The Apache Software

+Foundation (ASF), sponsored by the Apache Web Services PMC. Incubation is

+required of all newly accepted projects until a further review indicates that

+the infrastructure, communications, and decision making process have stabilized

+in a manner consistent with other successful ASF projects. While incubation

+status is not necessarily a reflection of the completeness or stability of the

+code, it does indicate that the project has yet to be fully endorsed by the ASF.

+

diff --git a/sca-java-1.x/branches/sca-java-0.91/modules/databinding-sdo-axiom/LICENSE b/sca-java-1.x/branches/sca-java-0.91/modules/databinding-sdo-axiom/LICENSE
new file mode 100644
index 0000000000..8aa906c321
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/databinding-sdo-axiom/LICENSE
@@ -0,0 +1,205 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+
+
diff --git a/sca-java-1.x/branches/sca-java-0.91/modules/databinding-sdo-axiom/NOTICE b/sca-java-1.x/branches/sca-java-0.91/modules/databinding-sdo-axiom/NOTICE
new file mode 100644
index 0000000000..94481d6cfa
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/databinding-sdo-axiom/NOTICE
@@ -0,0 +1,6 @@
+${pom.name}
+Copyright (c) 2005 - 2007 The Apache Software Foundation
+
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).
+
diff --git a/sca-java-1.x/branches/sca-java-0.91/modules/databinding-sdo-axiom/pom.xml b/sca-java-1.x/branches/sca-java-0.91/modules/databinding-sdo-axiom/pom.xml
new file mode 100644
index 0000000000..0486cbf1bc
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/databinding-sdo-axiom/pom.xml
@@ -0,0 +1,131 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    * KIND, either express or implied.  See the License for the
+    * specific language governing permissions and limitations
+    * under the License.    
+-->
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.tuscany.sca</groupId>
+        <artifactId>tuscany-modules</artifactId>
+        <version>0.91-incubating-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    <artifactId>tuscany-databinding-sdo-axiom</artifactId>
+    <name>Apache Tuscany Data Binding for SDO/AXIOM</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-databinding</artifactId>
+            <version>0.91-incubating-SNAPSHOT</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-databinding-sdo</artifactId>
+            <version>0.91-incubating-SNAPSHOT</version>
+        </dependency>
+
+       <dependency>
+            <groupId>org.apache.ws.commons.axiom</groupId>
+            <artifactId>axiom-api</artifactId>
+            <version>1.2.4</version>
+            <exclusions>
+               <exclusion>
+                  <groupId>xerces</groupId>
+                  <artifactId>xercesImpl</artifactId>
+               </exclusion>
+            </exclusions>
+        </dependency>
+
+		<dependency>
+            <groupId>org.apache.ws.commons.axiom</groupId>
+            <artifactId>axiom-impl</artifactId>
+            <version>1.2.4</version>
+            <scope>runtime</scope>
+        </dependency>
+        
+        <dependency>
+            <groupId>xerces</groupId>
+            <artifactId>xercesImpl</artifactId>
+            <version>2.8.1</version>
+            <scope>runtime</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+                <version>1.0</version>
+                <executions>
+                    <execution>
+                        <id>add-test-source</id>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>add-test-source</goal>
+                        </goals>
+                        <configuration>
+                            <sources>
+                                <source>target/sdo-source</source>
+                            </sources>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>        
+            <plugin>
+                <groupId>org.apache.tuscany.sdo</groupId>
+                <artifactId>tuscany-sdo-plugin</artifactId>
+                <version>1.0-incubating-beta1</version>
+                <executions>
+                    <execution>
+                        <id>generate-po-sdo</id>
+                        <phase>generate-test-sources</phase>
+                        <configuration>
+                            <schemaFile>${basedir}/src/test/resources/ipo.xsd</schemaFile>
+                            <javaPackage>com.example.ipo.sdo</javaPackage>
+                            <noNotification>true</noNotification>
+                            <noContainer>true</noContainer>
+                            <noUnsettable>true</noUnsettable>
+                        </configuration>
+                        <goals>
+                            <goal>generate</goal>
+                        </goals>
+                    </execution>
+                    <execution>
+                        <id>generate-stock-sdo</id>
+                        <phase>generate-test-sources</phase>
+                        <configuration>
+                            <schemaFile>${basedir}/src/test/resources/stock.xsd</schemaFile>
+                            <javaPackage>com.example.stock.sdo</javaPackage>
+                            <prefix>Stock</prefix>
+                            <noNotification>true</noNotification>
+                            <noContainer>true</noContainer>
+                            <noUnsettable>true</noUnsettable>
+                        </configuration>
+                        <goals>
+                            <goal>generate</goal>
+                        </goals>
+                    </execution>                    
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>
diff --git a/sca-java-1.x/branches/sca-java-0.91/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/DataObject2OMElement.java b/sca-java-1.x/branches/sca-java-0.91/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/DataObject2OMElement.java
new file mode 100644
index 0000000000..4060fd8e5b
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/DataObject2OMElement.java
@@ -0,0 +1,88 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+ */
+package org.apache.tuscany.sca.databinding.sdo2om;
+
+import static org.apache.tuscany.sca.databinding.sdo.SDODataBinding.ROOT_ELEMENT;
+
+import org.apache.axiom.om.OMAbstractFactory;
+import org.apache.axiom.om.OMElement;
+import org.apache.axiom.om.OMFactory;
+import org.apache.axiom.om.OMNamespace;
+import org.apache.tuscany.sca.databinding.PullTransformer;
+import org.apache.tuscany.sca.databinding.TransformationContext;
+import org.apache.tuscany.sca.databinding.impl.BaseTransformer;
+import org.apache.tuscany.sca.databinding.sdo.SDOContextHelper;
+import org.apache.tuscany.sca.interfacedef.DataType;
+import org.apache.tuscany.sca.interfacedef.util.XMLType;
+
+import commonj.sdo.DataObject;
+import commonj.sdo.helper.HelperContext;
+import commonj.sdo.helper.XMLDocument;
+
+/**
+ * SDO DataObject --> AXIOM OMElement transformer
+ * 
+ * @version $Rev$ $Date$
+ */
+public class DataObject2OMElement extends BaseTransformer<DataObject, OMElement> implements
+    PullTransformer<DataObject, OMElement> {
+
+    public OMElement transform(DataObject source, TransformationContext context) {
+        HelperContext helperContext = SDOContextHelper.getHelperContext(context);
+        OMFactory factory = OMAbstractFactory.getOMFactory();
+
+        OMNamespace namespace = null;
+        String localName = ROOT_ELEMENT.getLocalPart();
+        if (context != null) {
+            DataType dataType = context.getTargetDataType();
+            Object logical = dataType == null ? null : dataType.getLogical();
+            if (logical instanceof XMLType) {
+                XMLType xmlType = (XMLType)logical;
+                if (xmlType.isElement()) {
+                    namespace = factory.createOMNamespace(xmlType.getElementName().getNamespaceURI(), xmlType
+                        .getElementName().getPrefix());
+                    localName = xmlType.getElementName().getLocalPart();
+                }
+            }
+        }
+        if (namespace == null) {
+            namespace = factory.createOMNamespace(ROOT_ELEMENT.getNamespaceURI(), ROOT_ELEMENT.getPrefix());
+        }
+
+        XMLDocument document = helperContext.getXMLHelper().createDocument(source,
+                                                                           namespace.getNamespaceURI(),
+                                                                           localName);
+        SDODataSource dataSource = new SDODataSource(document, helperContext);
+        OMElement element = factory.createOMElement(dataSource, localName, namespace);
+        return element;
+    }
+
+    public Class getSourceType() {
+        return DataObject.class;
+    }
+
+    public Class getTargetType() {
+        return OMElement.class;
+    }
+
+    public int getWeight() {
+        return 10;
+    }
+
+}
diff --git a/sca-java-1.x/branches/sca-java-0.91/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/DataObjectSerializer.java b/sca-java-1.x/branches/sca-java-0.91/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/DataObjectSerializer.java
new file mode 100644
index 0000000000..4301ba09e3
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/DataObjectSerializer.java
@@ -0,0 +1,427 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+ */
+
+package org.apache.tuscany.sca.databinding.sdo2om;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+import javax.xml.namespace.NamespaceContext;
+import javax.xml.namespace.QName;
+import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamWriter;
+
+import org.apache.tuscany.sca.databinding.TransformationContext;
+import org.apache.tuscany.sca.interfacedef.DataType;
+import org.apache.tuscany.sdo.impl.AttributeImpl;
+import org.apache.tuscany.sdo.impl.ReferenceImpl;
+import org.apache.tuscany.sdo.util.SDOUtil;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EDataType;
+import org.eclipse.emf.ecore.EReference;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.ecore.util.ExtendedMetaData;
+
+import commonj.sdo.DataObject;
+import commonj.sdo.Property;
+import commonj.sdo.Sequence;
+import commonj.sdo.Type;
+import commonj.sdo.helper.HelperContext;
+import commonj.sdo.helper.XMLDocument;
+import commonj.sdo.helper.XSDHelper;
+
+public class DataObjectSerializer {
+    private static final String ELEMENT_TEXT = "Text Element";
+
+    // static final String ELEMENT_TEXT = "Element Text";
+    private static final QName XSI_TYPE_QNAME = new QName("http://www.w3.org/2001/XMLSchema-instance", "type", "xsi");
+
+    private Map<String, String> declaredNamespaceMap = new HashMap<String, String>();
+
+    private NameSpaceContextImpl namespaceContext = new NameSpaceContextImpl();
+
+    private DataObject rootDataObject;
+
+    private String rootElementName;
+
+    private String rootElementURI;
+
+    private XMLStreamWriter xmlWriter;
+
+    private XSDHelper xsdHelper;
+
+    public DataObjectSerializer(DataObject rootObject,
+                                XMLStreamWriter xmlWriter,
+                                HelperContext helperCtx,
+                                TransformationContext context) {
+        this.xmlWriter = xmlWriter;
+        this.rootDataObject = rootObject;
+        this.xsdHelper = helperCtx.getXSDHelper();
+        this.rootElementName = xsdHelper.getLocalName(rootObject.getType());
+        this.rootElementURI = rootDataObject.getType().getURI();
+
+        if (context != null) {
+            DataType dataType = context.getTargetDataType();
+            Object targetQName = dataType == null ? null : dataType.getLogical();
+            if (targetQName instanceof QName) {
+                QName name = (QName)targetQName;
+                this.rootElementName = name.getLocalPart();
+                this.rootElementURI = name.getNamespaceURI();
+            }
+        }
+
+    }
+
+    // private void serializeNamespace(String prefix, String URI,
+    // XMLStreamWriter writer) throws XMLStreamException {
+    // String prefix1 = writer.getPrefix(URI);
+    // if (prefix1 == null) {
+    // writer.writeNamespace(prefix, URI);
+    // writer.setPrefix(prefix, URI);
+    // }
+    // }
+
+    public DataObjectSerializer(XMLDocument sourceDocument, XMLStreamWriter xmlWriter, HelperContext helperCtx) {
+        this.xmlWriter = xmlWriter;
+        this.rootDataObject = sourceDocument.getRootObject();
+        this.rootElementName = sourceDocument.getRootElementName();
+        this.rootElementURI = sourceDocument.getRootElementURI();
+        this.xsdHelper = helperCtx.getXSDHelper();
+    }
+
+    protected class NameSpaceContextImpl implements NamespaceContext {
+        private int counter;
+
+        private Map<String, String> prefixToNamespaceMapping = new HashMap<String, String>();
+
+        public NameSpaceContextImpl() {
+            prefixToNamespaceMapping.put("xml", "http://www.w3.org/XML/1998/namespace");
+            prefixToNamespaceMapping.put("xmlns", "http://www.w3.org/2000/xmlns/");
+            prefixToNamespaceMapping.put("xsi", "http://www.w3.org/2001/XMLSchema-instance");
+        }
+
+        public synchronized QName createQName(String nsURI, String name) {
+            String prefix = nsURI != null ? (String)getPrefix(nsURI) : null;
+            if (prefix == null && nsURI != null && !nsURI.equals("")) {
+                prefix = "p" + (counter++);
+            }
+            if (prefix == null) {
+                prefix = "";
+            }
+            if (nsURI != null) {
+                prefixToNamespaceMapping.put(prefix, nsURI);
+                declaredNamespaceMap.put(prefix, nsURI);
+            }
+            return new QName(nsURI, name, prefix);
+        }
+
+        public String getNamespaceURI(String prefix) {
+            if (prefix == null) {
+                throw new IllegalArgumentException("Prefix is null");
+            }
+
+            String ns = (String)prefixToNamespaceMapping.get(prefix);
+            if (ns != null) {
+                return ns;
+            } else {
+                return null;
+            }
+        }
+
+        public String getPrefix(String nsURI) {
+            if (nsURI == null) {
+                throw new IllegalArgumentException("Namespace is null");
+            }
+            for (Iterator i = prefixToNamespaceMapping.entrySet().iterator(); i.hasNext();) {
+                Map.Entry entry = (Map.Entry)i.next();
+                if (entry.getValue().equals(nsURI)) {
+                    return (String)entry.getKey();
+                }
+            }
+            return null;
+        }
+
+        public Iterator getPrefixes(String nsURI) {
+            List prefixList = new ArrayList();
+            for (Iterator i = prefixToNamespaceMapping.entrySet().iterator(); i.hasNext();) {
+                Map.Entry entry = (Map.Entry)i.next();
+                if (entry.getValue().equals(nsURI)) {
+                    prefixList.add(entry.getKey());
+                }
+            }
+            return prefixList.iterator();
+        }
+
+        public void registerMapping(String prefix, String nsURI) {
+            prefixToNamespaceMapping.put(prefix, nsURI);
+        }
+
+        public void removeMapping(String prefix) {
+            prefixToNamespaceMapping.remove(prefix);
+        }
+    }
+
+    protected static class NameValuePair implements Map.Entry {
+        private Object key;
+
+        private Object value;
+
+        public NameValuePair(Object key, Object value) {
+            this.key = key;
+            this.value = value;
+        }
+
+        public Object getKey() {
+            return key;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object setValue(Object value) {
+            Object v = this.value;
+            this.value = value;
+            return v;
+        }
+
+    }
+
+    private static boolean isTransient(Property property, Object type) {
+        // HACK: We need some SDOUtil extension to understand a property is
+        // derived
+        EStructuralFeature feature = (EStructuralFeature)property;
+        if (ExtendedMetaData.INSTANCE.getGroup(feature) != null) {
+            return false;
+        }
+        feature = ExtendedMetaData.INSTANCE.getAffiliation((EClass)type, feature);
+        if (feature != null && feature != property) {
+            return false;
+        }
+        if (property instanceof ReferenceImpl) {
+            ReferenceImpl r = (ReferenceImpl)property;
+            if (r.isTransient()) {
+                return true;
+            }
+            EReference opposite = r.getEOpposite();
+            if (opposite != null && opposite.isContainment()) {
+                return true;
+            }
+        } else if (property instanceof AttributeImpl) {
+            AttributeImpl a = (AttributeImpl)property;
+            if (a.isTransient()) {
+                return true;
+            }
+            EDataType d = (EDataType)a.getEType();
+            if (!d.isSerializable()) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    private void addListValue(List<NameValuePair> propertyList,
+                              List<DataObject> children,
+                              Property property,
+                              List objList) throws XMLStreamException {
+        if (objList != null) {
+            for (int j = 0; j < objList.size(); j++) {
+                Object object = objList.get(j);
+                addSingleValue(propertyList, children, property, object);
+            }
+        }
+    }
+
+    private void addProperty(List<NameValuePair> propertyList,
+                             List<DataObject> children,
+                             Property property,
+                             Object value,
+                             DataObject dataObject) throws XMLStreamException {
+
+        if (property.isMany() && property.getContainingType().isOpen() && value instanceof Sequence) {
+            addSequenceValue(propertyList, children, (Sequence)value);
+        } else if (SDOUtil.isMany(property, dataObject) && value instanceof List) {
+            addListValue(propertyList, children, property, (List)value);
+        } else {
+            // Complex Type
+            addSingleValue(propertyList, children, property, value);
+        }
+    }
+
+    private void addSequenceValue(List<NameValuePair> elements, List<DataObject> children, Sequence seq)
+        throws XMLStreamException {
+        if (seq != null && seq.size() > 0) {
+            for (int j = 0; j < seq.size(); j++) {
+                Object o = seq.getValue(j);
+                Property p = seq.getProperty(j);
+                addSingleValue(elements, children, p, o);
+            }
+        }
+    }
+
+    private void addSingleValue(List<NameValuePair> propertyList,
+                                List<DataObject> children,
+                                Property property,
+                                Object value) throws XMLStreamException {
+        String uri = xsdHelper.getNamespaceURI(property);
+        String name = xsdHelper.getLocalName(property);
+        QName qname = namespaceContext.createQName(uri, name);
+        Type propertyType = property.getType();
+
+        if (property.getName().equals("value") && uri == null && name.equals(":0")) {
+            propertyList.add(new NameValuePair(ELEMENT_TEXT, value.toString()));
+        } else if (value == null) {
+            NameValuePair entry = new NameValuePair(qname, null);
+            propertyList.add(entry);
+        } else if (propertyType.isDataType()) {
+            NameValuePair entry = new NameValuePair(qname, SDOUtil.convertToString(propertyType, value));
+            propertyList.add(entry);
+        } else {
+            children.add((DataObject)value);
+        }
+    }
+
+    private void registerNamespace(String prefix, String uri) {
+        if (!uri.equals(namespaceContext.getNamespaceURI(prefix))) {
+            namespaceContext.registerMapping(prefix, uri);
+            declaredNamespaceMap.put(prefix, uri);
+        }
+    }
+
+    public void serialize() throws XMLStreamException {
+        xmlWriter.setNamespaceContext(namespaceContext);
+        writeDataObject(rootDataObject, rootElementName, rootElementURI);
+        xmlWriter.flush();
+    }
+
+    private void writeDataObject(DataObject obj, String elementName, String elementURI) throws XMLStreamException {
+        List<NameValuePair> elementList = new ArrayList<NameValuePair>();
+        List<DataObject> children = new ArrayList<DataObject>();
+        List<NameValuePair> attributes = new ArrayList<NameValuePair>();
+
+        String typeName;
+        QName realTypeName = null;
+
+        if (elementName != null) {
+            realTypeName = namespaceContext.createQName(elementURI, elementName);
+            String typeQName = realTypeName.getPrefix() + ":" + realTypeName.getLocalPart();
+            declaredNamespaceMap.put(realTypeName.getPrefix(), realTypeName.getNamespaceURI());
+            attributes.add(new NameValuePair(XSI_TYPE_QNAME, typeQName));
+            registerNamespace(XSI_TYPE_QNAME.getPrefix(), XSI_TYPE_QNAME.getNamespaceURI());
+        } else {
+
+            typeName = xsdHelper.getLocalName(obj.getContainmentProperty());
+            realTypeName = namespaceContext.createQName(obj.getType().getURI(), typeName);
+            registerNamespace(realTypeName.getPrefix(), realTypeName.getNamespaceURI());
+        }
+
+        registerNamespace(realTypeName.getPrefix(), realTypeName.getNamespaceURI());
+
+        if (obj.getType().isSequenced()) {
+            Sequence sequence = obj.getSequence();
+            for (int i = 0; i < sequence.size(); i++) {
+                Property property = sequence.getProperty(i);
+                Object value = sequence.getValue(i);
+                if (property == null) {
+                    elementList.add(new NameValuePair(ELEMENT_TEXT, value));
+                } else {
+                    addProperty(elementList, children, property, value, obj);
+                }
+            }
+
+            // Attributes are not in the sequence
+            List properties = obj.getInstanceProperties();
+            for (Iterator i = properties.iterator(); i.hasNext();) {
+                Property property = (Property)i.next();
+                if (xsdHelper.isAttribute(property) && obj.isSet(property) && !isTransient(property, obj.getType())) {
+                    Object value = obj.get(property);
+                    QName name =
+                        namespaceContext.createQName(xsdHelper.getNamespaceURI(property), xsdHelper
+                            .getLocalName(property));
+                    attributes.add(new NameValuePair(name, SDOUtil.convertToString(property.getType(), value)));
+                }
+            }
+        } else {
+            Iterator i = obj.getInstanceProperties().iterator();
+            while (i.hasNext()) {
+                Property p = (Property)i.next();
+                if (obj.isSet(p) && !isTransient(p, obj.getType())) {
+                    Object value = obj.get(p);
+                    if (xsdHelper.isAttribute(p)) {
+                        QName name =
+                            namespaceContext.createQName(xsdHelper.getNamespaceURI(p), xsdHelper.getLocalName(p));
+                        attributes.add(new NameValuePair(name, SDOUtil.convertToString(p.getType(), value)));
+                    } else {
+                        addProperty(elementList, children, p, value, obj);
+                    }
+                }
+            }
+        }
+
+        String prefix = realTypeName.getPrefix();
+        String nameSpaceName = realTypeName.getNamespaceURI();
+
+        if (nameSpaceName != null) {
+            String writerPrefix = xmlWriter.getPrefix(nameSpaceName);
+            if (writerPrefix != null) {
+                xmlWriter.writeStartElement(nameSpaceName, realTypeName.getLocalPart());
+            } else {
+                if (prefix != null) {
+                    xmlWriter.writeStartElement(prefix, realTypeName.getLocalPart(), nameSpaceName);
+                    xmlWriter.writeNamespace(prefix, nameSpaceName);
+                    xmlWriter.setPrefix(prefix, nameSpaceName);
+                } else {
+                    xmlWriter.writeStartElement(nameSpaceName, realTypeName.getLocalPart());
+                    xmlWriter.writeDefaultNamespace(nameSpaceName);
+                    xmlWriter.setDefaultNamespace(nameSpaceName);
+                }
+            }
+        } else {
+            xmlWriter.writeStartElement(realTypeName.getLocalPart());
+        }
+
+        for (NameValuePair pair : attributes) {
+            QName name = (QName)pair.getKey();
+            assert namespaceContext.getPrefix(name.getPrefix()).equals(name.getNamespaceURI());
+            xmlWriter.writeAttribute(name.getPrefix(), name.getNamespaceURI(), name.getLocalPart(), (String)pair
+                .getValue());
+        }
+
+        for (NameValuePair pair : elementList) {
+            if (ELEMENT_TEXT.equals(pair.getKey().toString())) {
+                xmlWriter.writeCharacters((String)pair.getValue());
+            } else {
+                QName name = (QName)pair.getKey();
+                xmlWriter.writeStartElement(name.getPrefix(), name.getLocalPart(), name.getNamespaceURI());
+                xmlWriter.writeCharacters((String)pair.getValue());
+                xmlWriter.writeEndElement();
+            }
+        }
+
+        for (DataObject child : children) {
+            writeDataObject(child, null, null);
+        }
+        xmlWriter.writeEndElement();
+
+    }
+
+}
diff --git a/sca-java-1.x/branches/sca-java-0.91/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/SDODataSource.java b/sca-java-1.x/branches/sca-java-0.91/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/SDODataSource.java
new file mode 100644
index 0000000000..96d0ee563c
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/SDODataSource.java
@@ -0,0 +1,85 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+ */
+
+package org.apache.tuscany.sca.databinding.sdo2om;
+
+import static org.apache.tuscany.sca.databinding.sdo.SDODataBinding.ROOT_ELEMENT;
+
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.Writer;
+
+import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamReader;
+import javax.xml.stream.XMLStreamWriter;
+
+import org.apache.axiom.om.OMDataSource;
+import org.apache.axiom.om.OMOutputFormat;
+import org.apache.axiom.om.impl.serialize.StreamingOMSerializer;
+import org.apache.tuscany.sdo.helper.XMLStreamHelper;
+import org.apache.tuscany.sdo.util.SDOUtil;
+
+import commonj.sdo.DataObject;
+import commonj.sdo.helper.HelperContext;
+import commonj.sdo.helper.XMLDocument;
+
+public class SDODataSource implements OMDataSource {
+    private HelperContext helperContext;
+    private XMLDocument sourceDocument;
+
+    public SDODataSource(XMLDocument source, HelperContext helperContext) {
+        this.sourceDocument = source;
+        this.helperContext = helperContext;
+    }
+
+    public SDODataSource(DataObject obj, HelperContext helperContext) {
+        this.helperContext = helperContext;
+        this.sourceDocument =
+            helperContext.getXMLHelper().createDocument(obj,
+                                                        ROOT_ELEMENT.getNamespaceURI(),
+                                                        ROOT_ELEMENT.getLocalPart());
+    }
+
+    public XMLStreamReader getReader() throws XMLStreamException {
+        XMLStreamHelper streamHelper = SDOUtil.createXMLStreamHelper(helperContext.getTypeHelper());
+        return streamHelper.createXMLStreamReader(sourceDocument);
+    }
+
+    public void serialize(XMLStreamWriter xmlWriter) throws XMLStreamException {
+        StreamingOMSerializer serializer = new StreamingOMSerializer();
+        serializer.serialize(getReader(), xmlWriter);
+    }
+
+    public void serialize(OutputStream output, OMOutputFormat format) throws XMLStreamException {
+        try {
+            helperContext.getXMLHelper().save(sourceDocument, output, null);
+        } catch (Exception e) {
+            throw new XMLStreamException(e);
+        }
+    }
+
+    public void serialize(Writer writer, OMOutputFormat format) throws XMLStreamException {
+        try {
+            helperContext.getXMLHelper().save(sourceDocument, writer, null);
+        } catch (IOException e) {
+            throw new XMLStreamException(e);
+        }
+    }
+
+}
diff --git a/sca-java-1.x/branches/sca-java-0.91/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/XMLDocument2OMElement.java b/sca-java-1.x/branches/sca-java-0.91/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/XMLDocument2OMElement.java
new file mode 100644
index 0000000000..d6ae818f31
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/XMLDocument2OMElement.java
@@ -0,0 +1,61 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+ */
+package org.apache.tuscany.sca.databinding.sdo2om;
+
+import org.apache.axiom.om.OMAbstractFactory;
+import org.apache.axiom.om.OMElement;
+import org.apache.axiom.om.OMFactory;
+import org.apache.axiom.om.OMNamespace;
+import org.apache.tuscany.sca.databinding.PullTransformer;
+import org.apache.tuscany.sca.databinding.TransformationContext;
+import org.apache.tuscany.sca.databinding.impl.BaseTransformer;
+import org.apache.tuscany.sca.databinding.sdo.SDOContextHelper;
+
+import commonj.sdo.helper.HelperContext;
+import commonj.sdo.helper.XMLDocument;
+
+/**
+ * SDO XMLDocument --> AXIOM OMElement transformer
+ * @version $Rev$ $Date$
+ */
+public class XMLDocument2OMElement extends BaseTransformer<XMLDocument, OMElement> implements
+    PullTransformer<XMLDocument, OMElement> {
+
+    public OMElement transform(XMLDocument source, TransformationContext context) {
+        HelperContext helperContext = SDOContextHelper.getHelperContext(context);
+        SDODataSource dataSource = new SDODataSource(source, helperContext);
+        OMFactory factory = OMAbstractFactory.getOMFactory();
+        OMNamespace namespace = factory.createOMNamespace(source.getRootElementURI(), source.getRootElementName());
+        OMElement element = factory.createOMElement(dataSource, source.getRootElementName(), namespace);
+        return element;
+    }
+
+    public Class getSourceType() {
+        return XMLDocument.class;
+    }
+
+    public Class getTargetType() {
+        return OMElement.class;
+    }
+
+    public int getWeight() {
+        return 10;
+    }
+
+}
diff --git a/sca-java-1.x/branches/sca-java-0.91/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/module/SDOAxiomModuleActivator.java b/sca-java-1.x/branches/sca-java-0.91/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/module/SDOAxiomModuleActivator.java
new file mode 100644
index 0000000000..dc9ecdafae
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/databinding-sdo-axiom/src/main/java/org/apache/tuscany/sca/databinding/sdo2om/module/SDOAxiomModuleActivator.java
@@ -0,0 +1,48 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+ */
+
+package org.apache.tuscany.sca.databinding.sdo2om.module;
+
+import org.apache.tuscany.sca.core.ExtensionPointRegistry;
+import org.apache.tuscany.sca.core.ModuleActivator;
+import org.apache.tuscany.sca.databinding.TransformerExtensionPoint;
+import org.apache.tuscany.sca.databinding.sdo2om.DataObject2OMElement;
+import org.apache.tuscany.sca.databinding.sdo2om.XMLDocument2OMElement;
+
+/**
+ * Module activator for SDO/AXIOM databinding
+ * 
+ * @version $Rev$ $Date$
+ */
+public class SDOAxiomModuleActivator implements ModuleActivator {
+
+    public Object[] getExtensionPoints() {
+        return null;
+    }
+
+    public void start(ExtensionPointRegistry registry) {
+        TransformerExtensionPoint transformers = registry.getExtensionPoint(TransformerExtensionPoint.class);
+        transformers.addTransformer(new DataObject2OMElement());
+        transformers.addTransformer(new XMLDocument2OMElement());
+    }
+
+    public void stop(ExtensionPointRegistry registry) {
+    }
+
+}
diff --git a/sca-java-1.x/branches/sca-java-0.91/modules/databinding-sdo-axiom/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator b/sca-java-1.x/branches/sca-java-0.91/modules/databinding-sdo-axiom/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
new file mode 100644
index 0000000000..a16317431c
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/databinding-sdo-axiom/src/main/resources/META-INF/services/org.apache.tuscany.sca.core.ModuleActivator
@@ -0,0 +1,18 @@
+# Licensed to the Apache Software Foundation (ASF) under one

+# or more contributor license agreements.  See the NOTICE file

+# distributed with this work for additional information

+# regarding copyright ownership.  The ASF licenses this file

+# to you under the Apache License, Version 2.0 (the

+# "License"); you may not use this file except in compliance

+# with the License.  You may obtain a copy of the License at

+# 

+#   http://www.apache.org/licenses/LICENSE-2.0

+# 

+# Unless required by applicable law or agreed to in writing,

+# software distributed under the License is distributed on an

+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

+# KIND, either express or implied.  See the License for the

+# specific language governing permissions and limitations

+# under the License.

+# Implementation class for the ExtensionActivator

+org.apache.tuscany.sca.databinding.sdo2om.module.SDOAxiomModuleActivator
\ No newline at end of file
diff --git a/sca-java-1.x/branches/sca-java-0.91/modules/databinding-sdo-axiom/src/test/java/org/apache/tuscany/sca/databinding/sdo2om/DataObject2OMElementTestCase.java b/sca-java-1.x/branches/sca-java-0.91/modules/databinding-sdo-axiom/src/test/java/org/apache/tuscany/sca/databinding/sdo2om/DataObject2OMElementTestCase.java
new file mode 100644
index 0000000000..9d32991bf9
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/databinding-sdo-axiom/src/test/java/org/apache/tuscany/sca/databinding/sdo2om/DataObject2OMElementTestCase.java
@@ -0,0 +1,57 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+ */
+
+package org.apache.tuscany.sca.databinding.sdo2om;
+
+import javax.xml.stream.XMLStreamException;
+
+import junit.framework.Assert;
+
+import org.apache.axiom.om.OMElement;
+import org.apache.tuscany.sca.interfacedef.DataType;
+import org.apache.tuscany.sca.interfacedef.impl.DataTypeImpl;
+import org.apache.tuscany.sca.interfacedef.util.XMLType;
+
+import commonj.sdo.DataObject;
+
+/**
+ * 
+ */
+public class DataObject2OMElementTestCase extends SDOTransformerTestCaseBase {
+
+    @Override
+    protected DataType<?> getSourceDataType() {
+        return new DataTypeImpl<XMLType>(DataObject.class.getName(), DataObject.class, new XMLType(ORDER_QNAME, null));
+    }
+
+    @Override
+    protected DataType<?> getTargetDataType() {
+        return new DataTypeImpl<XMLType>(OMElement.class.getName(), OMElement.class, new XMLType(ORDER_QNAME, null));
+    }
+
+    public final void testTransform() throws XMLStreamException {
+        OMElement element = new DataObject2OMElement().transform(dataObject, context);
+        Assert.assertEquals(ORDER_QNAME.getNamespaceURI(), element.getNamespace().getNamespaceURI());
+        Assert.assertEquals(ORDER_QNAME.getLocalPart(), element.getLocalName());
+//      TODO: This fails with Axiom 1.2.4        
+//        StringWriter writer = new StringWriter();
+//        element.serialize(writer);
+    }
+
+}
diff --git a/sca-java-1.x/branches/sca-java-0.91/modules/databinding-sdo-axiom/src/test/java/org/apache/tuscany/sca/databinding/sdo2om/SDOTransformerTestCaseBase.java b/sca-java-1.x/branches/sca-java-0.91/modules/databinding-sdo-axiom/src/test/java/org/apache/tuscany/sca/databinding/sdo2om/SDOTransformerTestCaseBase.java
new file mode 100644
index 0000000000..7485910db6
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/databinding-sdo-axiom/src/test/java/org/apache/tuscany/sca/databinding/sdo2om/SDOTransformerTestCaseBase.java
@@ -0,0 +1,79 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+ */
+
+package org.apache.tuscany.sca.databinding.sdo2om;
+
+import javax.xml.namespace.QName;
+
+import junit.framework.TestCase;
+
+import org.apache.tuscany.sca.databinding.TransformationContext;
+import org.apache.tuscany.sca.databinding.impl.TransformationContextImpl;
+import org.apache.tuscany.sca.interfacedef.DataType;
+
+import com.example.ipo.sdo.PurchaseOrderType;
+import com.example.ipo.sdo.SdoFactory;
+import com.example.ipo.sdo.USAddress;
+import commonj.sdo.DataObject;
+import commonj.sdo.helper.HelperContext;
+import commonj.sdo.impl.HelperProvider;
+
+/**
+ * The base class for SDO-related test cases
+ */
+public abstract class SDOTransformerTestCaseBase extends TestCase {
+    protected static final QName ORDER_QNAME = new QName("http://www.example.com/IPO", "purchaseOrder");
+
+    protected HelperContext helperContext;
+    protected String binding = DataObject.class.getName();
+    protected TransformationContext context;
+    protected TransformationContext reversedContext; 
+    protected DataObject dataObject;
+
+    /**
+     * @see junit.framework.TestCase#setUp()
+     */
+    protected void setUp() throws Exception {
+        super.setUp();
+        helperContext = HelperProvider.getDefaultContext();
+        SdoFactory.INSTANCE.register(helperContext);
+        
+        context = new TransformationContextImpl();
+        context.setSourceDataType(getSourceDataType());
+        context.setTargetDataType(getTargetDataType());
+
+        reversedContext = new TransformationContextImpl();
+        reversedContext.setSourceDataType(getTargetDataType());
+        reversedContext.setTargetDataType(getSourceDataType());
+        
+        PurchaseOrderType po = SdoFactory.INSTANCE.createPurchaseOrderType();
+        USAddress address = SdoFactory.INSTANCE.createUSAddress();
+        address.setCity("San Jose");
+        address.setStreet("123 ABC St");
+        address.setState("CA");
+        address.setStreet("95131");
+        po.setBillTo(address);
+        dataObject = (DataObject) po;
+    }
+
+    protected abstract DataType<?> getSourceDataType();
+
+    protected abstract DataType<?> getTargetDataType();
+
+}
diff --git a/sca-java-1.x/branches/sca-java-0.91/modules/databinding-sdo-axiom/src/test/java/org/apache/tuscany/sca/databinding/sdo2om/XMLDocument2OMElementTestCase.java b/sca-java-1.x/branches/sca-java-0.91/modules/databinding-sdo-axiom/src/test/java/org/apache/tuscany/sca/databinding/sdo2om/XMLDocument2OMElementTestCase.java
new file mode 100644
index 0000000000..e141e27098
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/databinding-sdo-axiom/src/test/java/org/apache/tuscany/sca/databinding/sdo2om/XMLDocument2OMElementTestCase.java
@@ -0,0 +1,62 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+ */
+
+package org.apache.tuscany.sca.databinding.sdo2om;
+
+import java.io.StringWriter;
+
+import javax.xml.stream.XMLStreamException;
+
+import junit.framework.Assert;
+
+import org.apache.axiom.om.OMElement;
+import org.apache.tuscany.sca.interfacedef.DataType;
+import org.apache.tuscany.sca.interfacedef.impl.DataTypeImpl;
+import org.apache.tuscany.sca.interfacedef.util.XMLType;
+
+import commonj.sdo.helper.XMLDocument;
+
+/**
+ * 
+ */
+public class XMLDocument2OMElementTestCase extends SDOTransformerTestCaseBase {
+
+    @Override
+    protected DataType<?> getSourceDataType() {
+        return new DataTypeImpl<XMLType>(XMLDocument.class.getName(), XMLDocument.class, new XMLType(ORDER_QNAME, null));
+    }
+
+    @Override
+    protected DataType<?> getTargetDataType() {
+        return new DataTypeImpl<XMLType>(OMElement.class.getName(), OMElement.class, new XMLType(ORDER_QNAME, null));
+    }
+
+    public final void testTransform() throws XMLStreamException {
+        XMLDocument document =
+            helperContext.getXMLHelper().createDocument(dataObject,
+                                                        ORDER_QNAME.getNamespaceURI(),
+                                                        ORDER_QNAME.getLocalPart());
+        OMElement element = new XMLDocument2OMElement().transform(document, context);
+        Assert.assertEquals(ORDER_QNAME.getNamespaceURI(), element.getNamespace().getNamespaceURI());
+        Assert.assertEquals(ORDER_QNAME.getLocalPart(), element.getLocalName());
+        StringWriter writer = new StringWriter();
+        element.serialize(writer);
+    }
+
+}
diff --git a/sca-java-1.x/branches/sca-java-0.91/modules/databinding-sdo-axiom/src/test/resources/ipo.xsd b/sca-java-1.x/branches/sca-java-0.91/modules/databinding-sdo-axiom/src/test/resources/ipo.xsd
new file mode 100644
index 0000000000..241ec15d36
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/databinding-sdo-axiom/src/test/resources/ipo.xsd
@@ -0,0 +1,136 @@
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+-->
+<schema targetNamespace="http://www.example.com/IPO"
+	xmlns="http://www.w3.org/2001/XMLSchema"
+	xmlns:ipo="http://www.example.com/IPO">
+
+	<annotation>
+		<documentation xml:lang="en">
+			International Purchase order schema for Example.com
+			Copyright 2000 Example.com. All rights reserved.
+		</documentation>
+	</annotation>
+
+
+	<element name="purchaseOrder" type="ipo:PurchaseOrderType" />
+
+	<element name="comment" type="string" />
+
+	<complexType name="PurchaseOrderType">
+		<sequence>
+			<element name="shipTo" type="ipo:Address" />
+			<element name="billTo" type="ipo:Address" />
+			<element ref="ipo:comment" minOccurs="0" />
+			<element name="items" type="ipo:Items" />
+		</sequence>
+		<attribute name="orderDate" type="date" />
+	</complexType>
+
+	<complexType name="Items">
+		<sequence>
+			<element name="item" minOccurs="0" maxOccurs="unbounded">
+				<complexType>
+					<sequence>
+						<element name="productName" type="string" />
+						<element name="quantity">
+							<simpleType>
+								<restriction base="positiveInteger">
+									<maxExclusive value="100" />
+								</restriction>
+							</simpleType>
+						</element>
+						<element name="USPrice" type="decimal" />
+						<element ref="ipo:comment" minOccurs="0" />
+						<element name="shipDate" type="date"
+							minOccurs="0" />
+					</sequence>
+					<attribute name="partNum" type="ipo:SKU"
+						use="required" />
+				</complexType>
+			</element>
+		</sequence>
+	</complexType>
+
+	<simpleType name="SKU">
+		<restriction base="string">
+			<pattern value="\d{3}-[A-Z]{2}" />
+		</restriction>
+	</simpleType>
+
+	<complexType name="Address">
+		<sequence>
+			<element name="name" type="string" />
+			<element name="street" type="string" />
+			<element name="city" type="string" />
+		</sequence>
+	</complexType>
+
+	<complexType name="USAddress">
+		<complexContent>
+			<extension base="ipo:Address">
+				<sequence>
+					<element name="state" type="ipo:USState" />
+					<element name="zip" type="positiveInteger" />
+				</sequence>
+			</extension>
+		</complexContent>
+	</complexType>
+
+	<complexType name="UKAddress">
+		<complexContent>
+			<extension base="ipo:Address">
+				<sequence>
+					<element name="postcode" type="ipo:UKPostcode" />
+				</sequence>
+				<attribute name="exportCode" type="positiveInteger"
+					fixed="1" />
+			</extension>
+		</complexContent>
+	</complexType>
+
+	<!-- other Address derivations for more countries -->
+
+	<simpleType name="USState">
+		<restriction base="string">
+			<enumeration value="AK" />
+			<enumeration value="AL" />
+			<enumeration value="AR" />
+			<enumeration value="CA" />
+			<enumeration value="PA" />
+			<!-- and so on ... -->
+		</restriction>
+	</simpleType>
+
+	<simpleType name="Postcode">
+		<restriction base="string">
+			<length value="7" fixed="true" />
+		</restriction>
+	</simpleType>
+
+
+	<simpleType name="UKPostcode">
+		<restriction base="ipo:Postcode">
+			<pattern value="[A-Z]{2}\d\s\d[A-Z]{2}" />
+		</restriction>
+	</simpleType>
+
+
+
+</schema>
+
diff --git a/sca-java-1.x/branches/sca-java-0.91/modules/databinding-sdo-axiom/src/test/resources/stock.xsd b/sca-java-1.x/branches/sca-java-0.91/modules/databinding-sdo-axiom/src/test/resources/stock.xsd
new file mode 100644
index 0000000000..a0a6717371
--- /dev/null
+++ b/sca-java-1.x/branches/sca-java-0.91/modules/databinding-sdo-axiom/src/test/resources/stock.xsd
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    * KIND, either express or implied.  See the License for the
+    * specific language governing permissions and limitations
+    * under the License.    
+-->
+<schema targetNamespace="http://www.example.com/stock" xmlns="http://www.w3.org/2001/XMLSchema">
+    <!-- Faults -->
+    <element name="InvalidSymbolFault">
+        <complexType>
+            <sequence>
+                <element name="message" minOccurs="1" type="string" />
+                <element name="symbol" minOccurs="1" type="string" />
+            </sequence>
+        </complexType>
+    </element>
+
+    <element name="MarketClosedFault" type="string" />
+
+</schema>
\ No newline at end of file