Moving 1.x branches

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

16 files changed, 0 insertions, 1600 deletions

diff --git a/branches/sca-java-integration/sca/kernel/api/.checkstyle b/branches/sca-java-integration/sca/kernel/api/.checkstyle
deleted file mode 100644
index 3e57539570..0000000000
--- a/branches/sca-java-integration/sca/kernel/api/.checkstyle
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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/branches/sca-java-integration/sca/kernel/api/.pmd b/branches/sca-java-integration/sca/kernel/api/.pmd
deleted file mode 100644
index ffc4fe2bbb..0000000000
--- a/branches/sca-java-integration/sca/kernel/api/.pmd
+++ /dev/null
@@ -1,20 +0,0 @@
-<?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.
--->
-<pmd><useProjectRuleSet>true</useProjectRuleSet><rules/></pmd>
diff --git a/branches/sca-java-integration/sca/kernel/api/.ruleset b/branches/sca-java-integration/sca/kernel/api/.ruleset
deleted file mode 100644
index 3886f07f2d..0000000000
--- a/branches/sca-java-integration/sca/kernel/api/.ruleset
+++ /dev/null
@@ -1,190 +0,0 @@
-<?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/branches/sca-java-integration/sca/kernel/api/LICENSE.txt b/branches/sca-java-integration/sca/kernel/api/LICENSE.txt
deleted file mode 100644
index 0084319535..0000000000
--- a/branches/sca-java-integration/sca/kernel/api/LICENSE.txt
+++ /dev/null
@@ -1,202 +0,0 @@
-
-                                 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, serviceDefinition 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/branches/sca-java-integration/sca/kernel/api/NOTICE.txt b/branches/sca-java-integration/sca/kernel/api/NOTICE.txt
deleted file mode 100644
index d83ebbe236..0000000000
--- a/branches/sca-java-integration/sca/kernel/api/NOTICE.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-${pom.name}
-Copyright (c) 2005 - 2006 The Apache Software Foundation
-
-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.
-
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
-
diff --git a/branches/sca-java-integration/sca/kernel/api/pom.xml b/branches/sca-java-integration/sca/kernel/api/pom.xml
deleted file mode 100644
index 6738f93bd5..0000000000
--- a/branches/sca-java-integration/sca/kernel/api/pom.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?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>
-    <parent>
-        <groupId>org.apache.tuscany.sca.kernel</groupId>
-        <artifactId>parent</artifactId>
-        <version>0.1-integration-incubating-SNAPSHOT</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>tuscany-api</artifactId>
-    <packaging>jar</packaging>
-    <name>Apache Tuscany SCA API</name>
-    <description>Tuscany Application Programming Interfaces.</description>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.osoa</groupId>
-            <artifactId>sca-api-r${scaSpecVersion}</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-        </dependency>
-    </dependencies>
-</project>
diff --git a/branches/sca-java-integration/sca/kernel/api/src/main/java/org/apache/tuscany/api/SCARuntime.java b/branches/sca-java-integration/sca/kernel/api/src/main/java/org/apache/tuscany/api/SCARuntime.java
deleted file mode 100644
index 15b9731121..0000000000
--- a/branches/sca-java-integration/sca/kernel/api/src/main/java/org/apache/tuscany/api/SCARuntime.java
+++ /dev/null
@@ -1,251 +0,0 @@
-/*
- * 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.api;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.net.URL;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-
-import org.osoa.sca.ComponentContext;
-
-/**
- * SCARuntime is used to start a Tuscany SCA runtime.
- */
-public abstract class SCARuntime {
-    public static final String DEFAULT_SYSTEM_SCDL = "META-INF/tuscany/default-system.composite";
-    public static final String SYSTEM_SCDL = "system.composite";
-    public static final String EXTENSION_SCDL = "META-INF/sca/extension.composite";
-    public static final String SERVICE_SCDL = "META-INF/sca/service.composite";
-    public static final String META_APPLICATION_SCDL = "META-INF/sca/application.composite";
-    public static final String APPLICATION_SCDL = "application.composite";
-
-    private static SCARuntime instance;
-
-    /**
-     * Read the service name from a configuration file
-     * 
-     * @param classLoader
-     * @param name The name of the service class
-     * @return A class name which extends/implements the service class
-     * @throws IOException
-     */
-    private static String getServiceName(ClassLoader classLoader, String name) throws IOException {
-        InputStream is = classLoader.getResourceAsStream("META-INF/services/" + name);
-        if (is == null) {
-            return null;
-        }
-        BufferedReader reader = null;
-        try {
-            reader = new BufferedReader(new InputStreamReader(is));
-            while (true) {
-                String line = reader.readLine();
-                if (line == null) {
-                    break;
-                } else if (!line.startsWith("#")) {
-                    return line.trim();
-                }
-            }
-        } finally {
-            if (reader != null) {
-                reader.close();
-            }
-        }
-        return null;
-    }
-
-    /**
-     * Returns a SCARuntime instance. If the system property "org.apache.tuscany.api.SCARuntime" is set, its value is
-     * used as the name of the implementation class. Otherwise, if the resource
-     * "META-INF/services/org.apache.tuscany.api.SCARuntime" can be loaded from the supplied classloader. Otherwise, it
-     * will use "org.apache.tuscany.core.bootstrap.DefaultSCARuntime" as the default. The named class is loaded from the
-     * supplied classloader and instantiated using its default (no-arg) constructor.
-     * 
-     * @return
-     */
-    private static SCARuntime newInstance(final ClassLoader classLoader) {
-
-        try {
-            final String name = SCARuntime.class.getName();
-            String className = AccessController.doPrivileged(new PrivilegedAction<String>() {
-                public String run() {
-                    return System.getProperty(name);
-                }
-            });
-
-            if (className == null) {
-                className = getServiceName(classLoader, name);
-            }
-            if (className == null) {
-                className = "org.apache.tuscany.core.bootstrap.DefaultSCARuntime";
-            }
-            Class cls = Class.forName(className, true, classLoader);
-            return (SCARuntime)cls.newInstance(); // NOPMD lresende
-        } catch (Exception e) {
-            throw new IllegalStateException(e);
-        }
-    }
-
-    /**
-     * Get an instance of SCA Runtime
-     * 
-     * @return The instance
-     */
-    public synchronized static SCARuntime getInstance() { // NOPMD
-        if (instance != null) {
-            return instance;
-        }
-        ClassLoader classLoader = SCARuntime.class.getClassLoader();
-        instance = newInstance(classLoader);
-        return instance;
-    }
-
-    /**
-     * Start the Tuscany runtime using default SCDLs
-     */
-    public static void start() {
-        try {
-            getInstance().startup(null, null, null, null);
-        } catch (Exception e) {
-            throw new IllegalStateException(e);
-        }
-    }
-
-    /**
-     * Start the SCA Runtime with the given SCDLs
-     * 
-     * @param system The URL for the system SCDL
-     * @param extensions An array of URLs for extensions
-     * @param application The URL for the application SCDL
-     */
-    public static void start(URL system, URL[] extensions, URL application, String compositePath) {
-        try {
-            getInstance().startup(system, extensions, application, compositePath);
-        } catch (Exception e) {
-            throw new IllegalStateException(e);
-        }
-    }
-
-    /**
-     * Start the SCA Runtime with the given SCDL
-     * 
-     * @param application The URL for the application SCDL
-     */
-    public static void start(URL application, String compositePath) {
-        try {
-            getInstance().startup(null, null, application, compositePath);
-        } catch (Exception e) {
-            throw new IllegalStateException(e);
-        }
-    }
-
-    /**
-     * Start the SCA Runtime with the given SCDL
-     * 
-     * @param compositePath The path of the application SCDL
-     */
-    public static void start(String compositePath) {
-        try {
-            ClassLoader cl = Thread.currentThread().getContextClassLoader();
-            URL applicationURL = cl.getResource(compositePath);
-            getInstance().startup(null, null, applicationURL, compositePath);
-        } catch (Exception e) {
-            throw new IllegalStateException(e);
-        }
-    }
-
-    /**
-     * Start the SCA Runtime with the given SCDL
-     * 
-     * @param compositePath The path of the system SCDL
-     * @param compositePath The path of the application SCDL
-     */
-    public static void start(String system, String compositePath) {
-        try {
-            ClassLoader cl = Thread.currentThread().getContextClassLoader();
-            URL systemURL = cl.getResource(system);
-            URL applicationURL = cl.getResource(compositePath);
-            getInstance().startup(systemURL, null, applicationURL, compositePath);
-        } catch (Exception e) {
-            throw new IllegalStateException(e);
-        }
-    }
-
-    /**
-     * Get the ComponentContext by name
-     * 
-     * @param componentName
-     * @return
-     */
-    public static ComponentContext getComponentContext(String componentName) {
-        return getInstance().getContext(componentName);
-    }
-
-    /**
-     * Get access to a system service
-     * 
-     * @param serviceName
-     * @return
-     */
-    protected abstract Object getSystemService(String serviceName);
-
-    /**
-     * Stop the SCA Runtime
-     */
-    public static void stop() {
-        try {
-            getInstance().shutdown();
-        } catch (Exception e) {
-            throw new IllegalStateException(e);
-        } finally {
-            instance = null;
-        }
-    }
-
-    /**
-     * Look up the ComponentContext by name
-     * 
-     * @param componentName
-     * @return
-     */
-    protected abstract ComponentContext getContext(String componentName);
-
-    /**
-     * Start up the runtime
-     * 
-     * @param system The URL of the SCDL for tuscany system composite
-     * @param extensions The URLs of the SCDLs for tuscany extension composites
-     * @param application The URL of the SCDL for the application composite
-     * @param compositePath The path of the application composite relative to the application URL
-     * @throws Exception
-     */
-    protected abstract void startup(URL system, URL[] extensions, URL application, String compositePath)
-        throws Exception;
-
-    /**
-     * Shutdown the runtime
-     * 
-     * @throws Exception
-     */
-    protected abstract void shutdown() throws Exception;
-}
diff --git a/branches/sca-java-integration/sca/kernel/api/src/main/java/org/apache/tuscany/api/TuscanyException.java b/branches/sca-java-integration/sca/kernel/api/src/main/java/org/apache/tuscany/api/TuscanyException.java
deleted file mode 100644
index ad649d716f..0000000000
--- a/branches/sca-java-integration/sca/kernel/api/src/main/java/org/apache/tuscany/api/TuscanyException.java
+++ /dev/null
@@ -1,164 +0,0 @@
-/*
- * 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.api;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Collections;
-import java.io.PrintWriter;
-
-/**
- * The root checked exception for the Tuscany runtime.
- *
- * @version $Rev$ $Date$
- */
-public abstract class TuscanyException extends Exception {
-    private static final long serialVersionUID = -7847121698339635268L;
-    private List<String> contextStack;
-    private final String identifier;
-
-    /**
-     * Override constructor from Exception.
-     *
-     * @see Exception
-     */
-    public TuscanyException() {
-        super();
-        this.identifier = null;
-    }
-
-    /**
-     * Override constructor from Exception.
-     *
-     * @param message passed to Exception
-     * @see Exception
-     */
-    public TuscanyException(String message) {
-        super(message);
-        this.identifier = null;
-    }
-
-    /**
-     * Override constructor from Exception.
-     *
-     * @param message    passed to Exception
-     * @param identifier additional error information referred to in the error message
-     * @see Exception
-     */
-    public TuscanyException(String message, String identifier) {
-        super(message);
-        this.identifier = identifier;
-    }
-
-    /**
-     * Override constructor from Exception.
-     *
-     * @param message passed to Exception
-     * @param cause   passed to Exception
-     * @see Exception
-     */
-    public TuscanyException(String message, Throwable cause) {
-        super(message, cause);
-        this.identifier = null;
-    }
-
-    /**
-     * Override constructor from Exception.
-     *
-     * @param message    passed to Exception
-     * @param identifier additional error information referred to in the error message
-     * @param cause      passed to Exception
-     * @see Exception
-     */
-    public TuscanyException(String message, String identifier, Throwable cause) {
-        super(message, cause);
-        this.identifier = identifier;
-    }
-
-    /**
-     * Override constructor from Exception.
-     *
-     * @param cause passed to Exception
-     * @see Exception
-     */
-    public TuscanyException(Throwable cause) {
-        super(cause);
-        this.identifier = null;
-    }
-
-    /**
-     * Returns a collection of names representing the context call stack where the error occured. The top of the stack
-     * is the first element in the collection.
-     *
-     * @return a collection of names representing the context call stack
-     */
-    public List<String> returnContextNames() {
-        if (contextStack == null) {
-            contextStack = new ArrayList<String>();
-        }
-        return Collections.unmodifiableList(contextStack);
-    }
-
-    /**
-     * Pushes a context name where an error occured onto the call stack.
-     *
-     * @param name the name of a context to push on the stack
-     */
-    public void addContextName(String name) {
-        if (contextStack == null) {
-            contextStack = new ArrayList<String>();
-        }
-        contextStack.add(name);
-    }                       
-
-    /**
-     * Returns a string representing additional error information referred to in the error message.
-     *
-     * @return additional error information
-     */
-    public String getIdentifier() {
-        return identifier;
-    }
-
-    public PrintWriter appendBaseMessage(PrintWriter writer) {
-        if (identifier == null && contextStack == null) {
-            if (super.getMessage() == null) {
-                return writer;
-            }
-            return writer.append(super.getMessage());
-        }
-        if (super.getMessage() != null) {
-            writer.append(super.getMessage());
-        }
-        if (identifier != null) {
-            writer.append(" [").append(identifier).append(']');
-        }
-        return writer;
-    }
-
-    public PrintWriter appendContextStack(PrintWriter writer) {
-        if (contextStack != null) {
-            writer.append("\nContext stack trace: ");
-            for (int i = contextStack.size() - 1; i >= 0; i--) {
-                writer.append('[').append(contextStack.get(i)).append(']');
-            }
-        }
-        return writer;
-    }
-}
diff --git a/branches/sca-java-integration/sca/kernel/api/src/main/java/org/apache/tuscany/api/TuscanyRuntimeException.java b/branches/sca-java-integration/sca/kernel/api/src/main/java/org/apache/tuscany/api/TuscanyRuntimeException.java
deleted file mode 100644
index fc92c57fa0..0000000000
--- a/branches/sca-java-integration/sca/kernel/api/src/main/java/org/apache/tuscany/api/TuscanyRuntimeException.java
+++ /dev/null
@@ -1,168 +0,0 @@
-/*
- * 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.api;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Collections;
-import java.io.PrintWriter;
-
-/**
- * The root unchecked exception for the Tuscany runtime.
- *
- * @version $Rev$ $Date$
- */
-
-public abstract class TuscanyRuntimeException extends RuntimeException {
-    private static final long serialVersionUID = -759677431966121786L;
-    private List<String> contextStack;
-    private final String identifier;
-
-    /**
-     * Override constructor from RuntimeException.
-     *
-     * @see RuntimeException
-     */
-    public TuscanyRuntimeException() {
-        super();
-        this.identifier = null;
-    }
-
-    /**
-     * Override constructor from RuntimeException.
-     *
-     * @param message passed to RuntimeException
-     * @see RuntimeException
-     */
-    public TuscanyRuntimeException(String message) {
-        super(message);
-        this.identifier = null;
-    }
-
-
-    /**
-     * Override constructor from Exception.
-     *
-     * @param message    passed to Exception
-     * @param identifier additional error information referred to in the error message
-     * @see Exception
-     */
-    protected TuscanyRuntimeException(String message, String identifier) {
-        super(message);
-        this.identifier = identifier;
-    }
-
-    /**
-     * Override constructor from RuntimeException.
-     *
-     * @param message passed to RuntimeException
-     * @param cause   passed to RuntimeException
-     * @see RuntimeException
-     */
-    public TuscanyRuntimeException(String message, Throwable cause) {
-        super(message, cause);
-        this.identifier = null;
-    }
-
-
-    /**
-     * Override constructor from Exception.
-     *
-     * @param message    passed to Exception
-     * @param identifier additional error information referred to in the error message
-     * @param cause      passed to RuntimeException
-     * @see Exception
-     */
-    protected TuscanyRuntimeException(String message, String identifier, Throwable cause) {
-        super(message, cause);
-        this.identifier = identifier;
-    }
-
-    /**
-     * Override constructor from RuntimeException.
-     *
-     * @param cause passed to RuntimeException
-     * @see RuntimeException
-     */
-    public TuscanyRuntimeException(Throwable cause) {
-        super(cause);
-        this.identifier = null;
-    }
-
-    /**
-     * Returns a collection of names representing the context call stack where the error occured. The top of the stack
-     * is the first element in the collection.
-     *
-     * @return a collection of names representing the context call stack
-     */
-    public List<String> returnContextNames() {
-        if (contextStack == null) {
-            contextStack = new ArrayList<String>();
-        }
-        return Collections.unmodifiableList(contextStack);
-    }
-
-    /**
-     * Pushes a context name where an error occured onto the call stack.
-     *
-     * @param name the name of a context to push on the stack
-     */
-    public void addContextName(String name) {
-        if (contextStack == null) {
-            contextStack = new ArrayList<String>();
-        }
-        contextStack.add(name);
-    }
-
-    /**
-     * Returns a string representing additional error information referred to in the error message.
-     *
-     * @return additional error information
-     */
-    public String getIdentifier() {
-        return identifier;
-    }
-
-    public PrintWriter appendBaseMessage(PrintWriter writer) {
-        if (identifier == null && contextStack == null) {
-            if (super.getMessage() == null) {
-                return writer;
-            }
-            return writer.append(super.getMessage());
-        }
-        if (super.getMessage() != null) {
-            writer.append(super.getMessage());
-        }
-        if (identifier != null) {
-            writer.append(" [").append(identifier).append(']');
-        }
-        return writer;
-    }
-
-    public PrintWriter appendContextStack(PrintWriter writer) {
-        if (contextStack != null) {
-            writer.append("Context stack trace: ");
-            for (int i = contextStack.size() - 1; i >= 0; i--) {
-                writer.append('[').append(contextStack.get(i)).append(']');
-            }
-        }
-        return writer;
-    }
-
-}
diff --git a/branches/sca-java-integration/sca/kernel/api/src/main/java/org/apache/tuscany/api/annotation/DataType.java b/branches/sca-java-integration/sca/kernel/api/src/main/java/org/apache/tuscany/api/annotation/DataType.java
deleted file mode 100644
index 33e67a60ae..0000000000
--- a/branches/sca-java-integration/sca/kernel/api/src/main/java/org/apache/tuscany/api/annotation/DataType.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * 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.api.annotation;
-
-import static java.lang.annotation.ElementType.FIELD;
-import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.ElementType.PARAMETER;
-import static java.lang.annotation.ElementType.TYPE;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-/**
- * Used to demarcate expected data types for an operation
- *
- * @version $Rev$ $Date$
- */
-@Target({TYPE, METHOD, FIELD, PARAMETER})
-@Retention(RUNTIME)
-public @interface DataType {
-
-    /**
-     * Returns the unique name of the data binding
-     * @return the unique name of the data binding
-     */
-    String name();
-
-}
diff --git a/branches/sca-java-integration/sca/kernel/api/src/main/java/org/apache/tuscany/api/annotation/IDLMapping.java b/branches/sca-java-integration/sca/kernel/api/src/main/java/org/apache/tuscany/api/annotation/IDLMapping.java
deleted file mode 100644
index e8c88b6176..0000000000
--- a/branches/sca-java-integration/sca/kernel/api/src/main/java/org/apache/tuscany/api/annotation/IDLMapping.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * 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.api.annotation;
-
-import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.ElementType.TYPE;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-/**
- * Annotation that can be applied to interfaces or methods to provide IDL mapping metadata 
- * 
- * @version $Rev$ $Date$
- */
-@Target({METHOD, TYPE})
-@Retention(RUNTIME)
-public @interface IDLMapping {
-
-    /**
-     * The name of the databinding for the wrapper
-     */
-    String dataBinding() default "";
-    
-    /**
-     * To indicate if the java interface/method is generated from a WSDL using wrapper style.
-     * 
-     * @see javax.xml.ws.RequestWrapper
-     * @see javax.xml.ws.RequestWrapper
-     * 
-     * @return
-     */
-    boolean wrapperStyle() default true;
-}
diff --git a/branches/sca-java-integration/sca/kernel/api/src/main/java/org/apache/tuscany/api/annotation/LogLevel.java b/branches/sca-java-integration/sca/kernel/api/src/main/java/org/apache/tuscany/api/annotation/LogLevel.java
deleted file mode 100644
index 83c5df26d9..0000000000
--- a/branches/sca-java-integration/sca/kernel/api/src/main/java/org/apache/tuscany/api/annotation/LogLevel.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * 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.api.annotation;
-
-import static java.lang.annotation.ElementType.METHOD;
-import java.lang.annotation.Retention;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-import java.lang.annotation.Target;
-
-/**
- * Annotation that can be applied to methods in a monitoring interface to indicate to logging frameworks the severity of
- * the event.
- *
- * @version $Rev$ $Date$
- */
-@Target({METHOD})
-@Retention(RUNTIME)
-public @interface LogLevel {
-
-    /**
-     * The log level as specified by {@link java.util.logging.Level}.
-     */
-    @SuppressWarnings({"JavaDoc"}) String value();
-}
diff --git a/branches/sca-java-integration/sca/kernel/api/src/main/java/org/apache/tuscany/api/annotation/Monitor.java b/branches/sca-java-integration/sca/kernel/api/src/main/java/org/apache/tuscany/api/annotation/Monitor.java
deleted file mode 100644
index dea9489e5b..0000000000
--- a/branches/sca-java-integration/sca/kernel/api/src/main/java/org/apache/tuscany/api/annotation/Monitor.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * 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.api.annotation;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * A system annotation to inject a monitor
- *
- * @version $Rev$ $Date$
- */
-@Target({ElementType.METHOD, ElementType.FIELD, ElementType.PARAMETER})
-@Retention(RetentionPolicy.RUNTIME)
-public @interface Monitor {
-}
diff --git a/branches/sca-java-integration/sca/kernel/api/src/main/java/org/apache/tuscany/api/annotation/Resource.java b/branches/sca-java-integration/sca/kernel/api/src/main/java/org/apache/tuscany/api/annotation/Resource.java
deleted file mode 100644
index a7158ab6b8..0000000000
--- a/branches/sca-java-integration/sca/kernel/api/src/main/java/org/apache/tuscany/api/annotation/Resource.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * 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.api.annotation;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Annotation used to indicate a resource should be provided to an implementation by the runtime.
- *
- * @version $Rev$ $Date$
- */
-@Target({ElementType.FIELD, ElementType.METHOD, ElementType.PARAMETER})
-@Retention(RetentionPolicy.RUNTIME)
-public @interface Resource {
-
-    /**
-     * Denotes the name of the resource declared by the implementation.
-     */
-    String name() default "";
-
-    /**
-     * Denotes if the resource is optional
-     */
-    boolean optional() default false;
-
-    /**
-     * Denotes the default name of the resource provided by the runtime environment.
-     */
-    String mappedName() default "";
-}
diff --git a/branches/sca-java-integration/sca/kernel/api/src/test/java/org/apache/tuscany/api/TuscanyExceptionTestCase.java b/branches/sca-java-integration/sca/kernel/api/src/test/java/org/apache/tuscany/api/TuscanyExceptionTestCase.java
deleted file mode 100644
index 9f0674238f..0000000000
--- a/branches/sca-java-integration/sca/kernel/api/src/test/java/org/apache/tuscany/api/TuscanyExceptionTestCase.java
+++ /dev/null
@@ -1,164 +0,0 @@
-/*
- * 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.api;
-
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.util.ArrayList;
-import java.util.List;
-
-import junit.framework.TestCase;
-
-/**
- * @version $Rev$ $Date$
- */
-public class TuscanyExceptionTestCase extends TestCase {
-    private static final Throwable CAUSE = new Throwable("Cause");
-    private static final String IDENTIFIER = "IDENTIFIER";
-    private static final String MESSAGE = "Message";
-    private static final String CONTEXT1 = "CONTEXT1";
-    private static final String CONTEXT2 = "CONTEXT2";
-
-    public void testNoArgConstructor() {
-        TuscanyException ex = new DummyException();
-        assertNull(ex.getMessage());
-        assertNull(ex.getCause());
-        assertNull(ex.getIdentifier());
-        assertTrue(ex.returnContextNames().isEmpty());
-    }
-
-    public void testMessageConstructor() {
-        TuscanyException ex = new DummyException(MESSAGE);
-        assertEquals(MESSAGE, ex.getMessage());
-        assertNull(ex.getCause());
-        assertNull(ex.getIdentifier());
-        assertTrue(ex.returnContextNames().isEmpty());
-    }
-
-    public void testAppendBaseMessage() {
-        TuscanyException ex = new DummyException(MESSAGE, IDENTIFIER);
-        StringWriter writer = new StringWriter();
-        PrintWriter pw = new PrintWriter(writer);
-        ex.appendBaseMessage(pw);
-        assertEquals("Message [IDENTIFIER]", writer.toString());
-    }
-
-    public void testAppendBaseMessageNoIdentifier() {
-        TuscanyException ex = new DummyException(MESSAGE);
-        StringWriter writer = new StringWriter();
-        PrintWriter pw = new PrintWriter(writer);
-        ex.appendBaseMessage(pw);
-        assertEquals("Message", writer.toString());
-    }
-
-    public void testThrowableConstructor() {
-        TuscanyException ex = new DummyException(CAUSE);
-        assertEquals(CAUSE.getClass().getName() + ": " + CAUSE.getMessage(), ex.getMessage());
-        assertEquals(CAUSE, ex.getCause());
-        assertNull(ex.getIdentifier());
-        assertTrue(ex.returnContextNames().isEmpty());
-    }
-
-    public void testMessageThrowableConstructor() {
-        TuscanyException ex = new DummyException(MESSAGE, CAUSE);
-        assertEquals(MESSAGE, ex.getMessage());
-        assertEquals(CAUSE, ex.getCause());
-        assertNull(ex.getIdentifier());
-        assertTrue(ex.returnContextNames().isEmpty());
-    }
-
-    public void testContextStack() {
-        TuscanyException ex = new DummyException(MESSAGE);
-        List<String> contexts = new ArrayList<String>();
-        contexts.add(CONTEXT1);
-        ex.addContextName(CONTEXT1);
-        assertEquals(contexts, ex.returnContextNames());
-        contexts.add(CONTEXT2);
-        ex.addContextName(CONTEXT2);
-        assertEquals(contexts, ex.returnContextNames());
-    }
-
-    public void testAppendContextMessage() {
-        TuscanyException ex = new DummyException(MESSAGE);
-        ex.addContextName(CONTEXT1);
-        ex.addContextName(CONTEXT2);
-        StringWriter writer = new StringWriter();
-        PrintWriter pw = new PrintWriter(writer);
-        ex.appendContextStack(pw);
-        assertEquals("\nContext stack trace: [CONTEXT2][CONTEXT1]", writer.toString());
-    }
-
-    public void testAddContext() throws Exception {
-        TuscanyException e = new DummyException();
-        e.addContextName("foo");
-        e.addContextName("bar");
-        assertEquals("foo", e.returnContextNames().get(0));
-        assertEquals("bar", e.returnContextNames().get(1));
-    }
-
-    public void testEmptyContext() throws Exception {
-        TuscanyException e = new DummyException();
-        assertEquals(0, e.returnContextNames().size());
-    }
-
-    public void testGetMessage() throws Exception {
-        TuscanyException e = new DummyException();
-        e.getMessage();
-    }
-
-    public void testFullMessage() throws Exception {
-        TuscanyException e = new DummyException("message", "foo");
-        e.addContextName("foo");
-        e.getMessage();
-    }
-
-    public void testImmutableContextNames() {
-        TuscanyException e = new DummyException("message", "foo");
-        try {
-            e.returnContextNames().add("foo");
-            fail();
-        } catch (UnsupportedOperationException e1) {
-            // expected
-        }
-    }
-
-
-    public static class DummyException extends TuscanyException {
-
-        public DummyException() {
-        }
-
-        public DummyException(String message) {
-            super(message);
-        }
-
-
-        public DummyException(String message, String identifier) {
-            super(message, identifier);
-        }
-
-        public DummyException(String message, Throwable cause) {
-            super(message, cause);
-        }
-
-        public DummyException(Throwable cause) {
-            super(cause);
-        }
-    }
-}
diff --git a/branches/sca-java-integration/sca/kernel/api/src/test/java/org/apache/tuscany/api/TuscanyRuntimeExceptionTestCase.java b/branches/sca-java-integration/sca/kernel/api/src/test/java/org/apache/tuscany/api/TuscanyRuntimeExceptionTestCase.java
deleted file mode 100644
index 4addd5ab38..0000000000
--- a/branches/sca-java-integration/sca/kernel/api/src/test/java/org/apache/tuscany/api/TuscanyRuntimeExceptionTestCase.java
+++ /dev/null
@@ -1,142 +0,0 @@
-/*
- * 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.api;
-
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.util.ArrayList;
-import java.util.List;
-
-import junit.framework.TestCase;
-
-/**
- * @version $Rev$ $Date$
- */
-public class TuscanyRuntimeExceptionTestCase extends TestCase {
-    private static final Throwable CAUSE = new Throwable("Cause");
-    private static final String MESSAGE = "Message";
-    private static final String IDENTIFIER = "IDENTIFIER";
-    private static final String CONTEXT1 = "CONTEXT1";
-    private static final String CONTEXT2 = "CONTEXT2";
-
-    public void testNoArgConstructor() {
-        TuscanyRuntimeException ex = new DummyException();
-        assertNull(ex.getMessage());
-        assertNull(ex.getCause());
-        assertNull(ex.getIdentifier());
-        assertTrue(ex.returnContextNames().isEmpty());
-    }
-
-    public void testMessageConstructor() {
-        TuscanyRuntimeException ex = new DummyException(MESSAGE);
-        assertSame(MESSAGE, ex.getMessage());
-        assertNull(ex.getCause());
-        assertNull(ex.getIdentifier());
-        assertTrue(ex.returnContextNames().isEmpty());
-    }
-
-    public void testThrowableConstructor() {
-        TuscanyRuntimeException ex = new DummyException(CAUSE);
-        assertEquals(CAUSE.getClass().getName() + ": " + CAUSE.getMessage(), ex.getMessage());
-        assertSame(CAUSE, ex.getCause());
-        assertNull(ex.getIdentifier());
-        assertTrue(ex.returnContextNames().isEmpty());
-    }
-
-    public void testMessageThrowableConstructor() {
-        TuscanyRuntimeException ex = new DummyException(MESSAGE, CAUSE);
-        assertSame(MESSAGE, ex.getMessage());
-        assertSame(CAUSE, ex.getCause());
-        assertNull(ex.getIdentifier());
-        assertTrue(ex.returnContextNames().isEmpty());
-    }
-
-    public void testIdentifier() {
-        TuscanyRuntimeException ex = new DummyException(MESSAGE, IDENTIFIER);
-        assertEquals(IDENTIFIER, ex.getIdentifier());
-    }
-
-    public void testContextStack() {
-        TuscanyRuntimeException ex = new DummyException(MESSAGE);
-        List<String> contexts = new ArrayList<String>();
-        contexts.add(CONTEXT1);
-        ex.addContextName(CONTEXT1);
-        assertEquals(contexts, ex.returnContextNames());
-        contexts.add(CONTEXT2);
-        ex.addContextName(CONTEXT2);
-        assertEquals(contexts, ex.returnContextNames());
-    }
-
-    public void testAppendContextMessage() {
-        TuscanyRuntimeException ex = new DummyException(MESSAGE);
-        ex.addContextName(CONTEXT1);
-        ex.addContextName(CONTEXT2);
-        StringWriter writer = new StringWriter();
-        PrintWriter pw = new PrintWriter(writer);
-        ex.appendContextStack(pw);
-        assertEquals("Context stack trace: [CONTEXT2][CONTEXT1]", writer.toString());
-    }
-
-    public void testAppendBaseMessage() {
-        TuscanyRuntimeException ex = new DummyException(MESSAGE, IDENTIFIER);
-        StringWriter writer = new StringWriter();
-        PrintWriter pw = new PrintWriter(writer);
-        ex.appendBaseMessage(pw);
-        assertEquals("Message [IDENTIFIER]", writer.toString());
-    }
-
-    public void testAppendBaseMessageNoIdentifier() {
-        TuscanyRuntimeException ex = new DummyException(MESSAGE);
-        StringWriter writer = new StringWriter();
-        PrintWriter pw = new PrintWriter(writer);
-        ex.appendBaseMessage(pw);
-        assertEquals("Message", writer.toString());
-    }
-
-    public void testImmutableContextNames() {
-        TuscanyRuntimeException e = new DummyException("message", "foo");
-        try {
-            e.returnContextNames().add("foo");
-            fail();
-        } catch (UnsupportedOperationException e1) {
-            // expected
-        }
-    }
-
-    public static class DummyException extends TuscanyRuntimeException {
-        public DummyException() {
-        }
-
-        public DummyException(String message) {
-            super(message);
-        }
-
-        public DummyException(String message, String identifier) {
-            super(message, identifier);
-        }
-
-        public DummyException(String message, Throwable cause) {
-            super(message, cause);
-        }
-
-        public DummyException(Throwable cause) {
-            super(cause);
-        }
-    }
-}