27 files changed, 0 insertions, 2131 deletions
diff --git a/sandbox/rfeng/runtime/embedded/.checkstyle b/sandbox/rfeng/runtime/embedded/.checkstyle
deleted file mode 100644
index ea05637a07..0000000000
--- a/sandbox/rfeng/runtime/embedded/.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/sandbox/rfeng/runtime/embedded/.pmd b/sandbox/rfeng/runtime/embedded/.pmd
deleted file mode 100644
index 3493a9e386..0000000000
--- a/sandbox/rfeng/runtime/embedded/.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/><includeDerivedFiles>false</includeDerivedFiles></pmd>
-\ No newline at end of file
diff --git a/sandbox/rfeng/runtime/embedded/.ruleset b/sandbox/rfeng/runtime/embedded/.ruleset
deleted file mode 100644
index a7ff3be272..0000000000
--- a/sandbox/rfeng/runtime/embedded/.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/sandbox/rfeng/runtime/embedded/LICENSE.txt b/sandbox/rfeng/runtime/embedded/LICENSE.txt
deleted file mode 100644
index 0084319535..0000000000
--- a/sandbox/rfeng/runtime/embedded/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/sandbox/rfeng/runtime/embedded/NOTICE.txt b/sandbox/rfeng/runtime/embedded/NOTICE.txt
deleted file mode 100644
index d83ebbe236..0000000000
--- a/sandbox/rfeng/runtime/embedded/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/sandbox/rfeng/runtime/embedded/pom.xml b/sandbox/rfeng/runtime/embedded/pom.xml
deleted file mode 100644
index a51ff50160..0000000000
--- a/sandbox/rfeng/runtime/embedded/pom.xml
+++ /dev/null
@@ -1,47 +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</groupId>
-        <artifactId>runtime</artifactId>
-        <version>2.0-alpha2-incubating-SNAPSHOT</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>org.apache.tuscany.sca.runtime.embedded</groupId>
-    <artifactId>embedded-host</artifactId>
-    <packaging>jar</packaging>
-    <name>Apache Tuscany Embedded Runtime Host</name>
-    <description>Host code to support an embedded runtime</description>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca.kernel</groupId>
-            <artifactId>tuscany-core</artifactId>
-            <version>2.0-alpha2-incubating-SNAPSHOT</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.2</version>
-            <scope>test</scope>
-        </dependency>        
-    </dependencies>
-</project>
diff --git a/sandbox/rfeng/runtime/embedded/src/main/java/org/apache/tuscany/api/SCARuntime.java b/sandbox/rfeng/runtime/embedded/src/main/java/org/apache/tuscany/api/SCARuntime.java
deleted file mode 100644
index 8fb945a28a..0000000000
--- a/sandbox/rfeng/runtime/embedded/src/main/java/org/apache/tuscany/api/SCARuntime.java
+++ /dev/null
@@ -1,249 +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 {
-
-    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.runtime.embedded.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.runtime.embedded.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 static synchronized 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/sandbox/rfeng/runtime/embedded/src/main/java/org/apache/tuscany/runtime/embedded/DefaultSCARuntime.java b/sandbox/rfeng/runtime/embedded/src/main/java/org/apache/tuscany/runtime/embedded/DefaultSCARuntime.java
deleted file mode 100644
index 1a6ab28cf4..0000000000
--- a/sandbox/rfeng/runtime/embedded/src/main/java/org/apache/tuscany/runtime/embedded/DefaultSCARuntime.java
+++ /dev/null
@@ -1,75 +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.runtime.embedded;
-
-import java.net.URI;
-import java.net.URL;
-import java.util.Arrays;
-import java.util.List;
-
-import org.apache.tuscany.api.SCARuntime;
-import org.apache.tuscany.api.TuscanyException;
-import org.apache.tuscany.spi.component.TargetResolutionException;
-import org.osoa.sca.ComponentContext;
-import org.osoa.sca.ServiceUnavailableException;
-
-/**
- * Default implementation of SCARuntime.
- * 
- * @version $Rev$ $Date$
- */
-@SuppressWarnings("deprecation")
-public class DefaultSCARuntime extends SCARuntime {
-
-    protected SimpleRuntime runtime;
-
-    protected void startup(URL system, URL[] exts, URL applicationSCDL, String compositePath) throws Exception {
-        ClassLoader cl = Thread.currentThread().getContextClassLoader();
-        List<URL> extensions = exts == null ? null : Arrays.asList(exts);
-        URI contributionURI = URI.create("/default");
-        SimpleRuntimeInfo runtimeInfo = new SimpleRuntimeInfoImpl(cl, system, extensions, contributionURI,
-                                                                  applicationSCDL, compositePath);
-        runtime = new SimpleRuntimeImpl(runtimeInfo);
-
-        try {
-            runtime.start();
-        } catch (TuscanyException e) {
-            throw e;
-        }
-
-    }
-
-    protected void shutdown() throws Exception {
-        runtime.destroy();
-    }
-
-    @Override
-    protected ComponentContext getContext(String componentName) {
-        return runtime.getComponentContext(URI.create(SimpleRuntimeInfo.DEFAULT_COMPOSITE + "/" + componentName));
-    }
-
-    @Override
-    public Object getSystemService(String serviceName) {
-        try {
-            return runtime.getSystemService(Object.class, serviceName);
-        } catch (TargetResolutionException e) {
-            throw new ServiceUnavailableException(e);
-        }
-    }
-}
diff --git a/sandbox/rfeng/runtime/embedded/src/main/java/org/apache/tuscany/runtime/embedded/SimpleRuntime.java b/sandbox/rfeng/runtime/embedded/src/main/java/org/apache/tuscany/runtime/embedded/SimpleRuntime.java
deleted file mode 100644
index 676d42a3af..0000000000
--- a/sandbox/rfeng/runtime/embedded/src/main/java/org/apache/tuscany/runtime/embedded/SimpleRuntime.java
+++ /dev/null
@@ -1,48 +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.runtime.embedded;
-
-import org.apache.tuscany.host.runtime.TuscanyRuntime;
-import org.apache.tuscany.spi.component.Component;
-import org.apache.tuscany.spi.component.TargetResolutionException;
-
-/**
- * A simple runtime to host both Tuscany and application code on the same classpath
- * 
- * @version $Rev$ $Date$
- */
-public interface SimpleRuntime extends TuscanyRuntime<SimpleRuntimeInfo> {
-    /**
-     * Start the embedded Tuscany
-     * @return
-     * @throws Exception
-     */
-    Component start() throws Exception;
-    
-    /**
-     * Look up system services by name
-     * @param <T>
-     * @param type
-     * @param name
-     * @return
-     * @throws TargetResolutionException
-     */
-    <T> T getSystemService(Class<T> type, String name) throws TargetResolutionException;
-}
diff --git a/sandbox/rfeng/runtime/embedded/src/main/java/org/apache/tuscany/runtime/embedded/SimpleRuntimeImpl.java b/sandbox/rfeng/runtime/embedded/src/main/java/org/apache/tuscany/runtime/embedded/SimpleRuntimeImpl.java
deleted file mode 100644
index 990fa0107f..0000000000
--- a/sandbox/rfeng/runtime/embedded/src/main/java/org/apache/tuscany/runtime/embedded/SimpleRuntimeImpl.java
+++ /dev/null
@@ -1,136 +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.runtime.embedded;
-
-import static org.apache.tuscany.runtime.embedded.SimpleRuntimeInfo.DEFAULT_COMPOSITE;
-
-import java.net.URI;
-import java.net.URL;
-import java.util.Collection;
-
-import org.apache.tuscany.api.annotation.LogLevel;
-import org.apache.tuscany.core.component.SimpleWorkContext;
-import org.apache.tuscany.core.implementation.PojoWorkContextTunnel;
-import org.apache.tuscany.core.implementation.system.model.SystemCompositeImplementation;
-import org.apache.tuscany.core.runtime.AbstractRuntime;
-import org.apache.tuscany.spi.builder.BuilderException;
-import org.apache.tuscany.spi.component.AtomicComponent;
-import org.apache.tuscany.spi.component.Component;
-import org.apache.tuscany.spi.component.ComponentException;
-import org.apache.tuscany.spi.component.SCAObject;
-import org.apache.tuscany.spi.component.ScopeContainer;
-import org.apache.tuscany.spi.component.ScopeRegistry;
-import org.apache.tuscany.spi.component.TargetResolutionException;
-import org.apache.tuscany.spi.component.WorkContext;
-import org.apache.tuscany.spi.loader.LoaderException;
-import org.apache.tuscany.spi.model.ComponentDefinition;
-import org.apache.tuscany.spi.model.CompositeImplementation;
-import org.apache.tuscany.spi.model.Scope;
-import org.apache.tuscany.spi.resolver.ResolutionException;
-
-/**
- * @version $Rev$ $Date$
- */
-public class SimpleRuntimeImpl extends AbstractRuntime<SimpleRuntimeInfo> implements SimpleRuntime {
-    private ScopeContainer<URI> container;
-
-    public SimpleRuntimeImpl(SimpleRuntimeInfo runtimeInfo) {
-        super(SimpleRuntimeInfo.class);
-        ClassLoader hostClassLoader = ClassLoader.getSystemClassLoader();
-        setHostClassLoader(hostClassLoader);
-        setApplicationScdl(runtimeInfo.getApplicationSCDL());
-        setSystemScdl(runtimeInfo.getSystemSCDL());
-        setRuntimeInfo(runtimeInfo);
-    }
-
-    public interface SimpleMonitor {
-        @LogLevel("SEVERE")
-        void runError(Exception e);
-    }
-
-    protected Collection<Component> deployExtension(Component parent,
-                                                    URI name,
-                                                    URL extensionSCDL,
-                                                    ClassLoader systemClassLoader) throws LoaderException,
-        BuilderException, ComponentException, ResolutionException {
-
-        SystemCompositeImplementation impl = new SystemCompositeImplementation();
-        impl.setScdlLocation(extensionSCDL);
-        impl.setClassLoader(systemClassLoader);
-        ComponentDefinition<SystemCompositeImplementation> definition 
-            = new ComponentDefinition<SystemCompositeImplementation>(name, impl);
-
-        Collection<Component> components = getDeployer().deploy(parent, definition);
-        for (Component component : components) {
-            component.start();
-        }
-        return components;
-    }
-
-    @SuppressWarnings("unchecked")
-    public Component start() throws Exception {
-        initialize();
-
-        ScopeRegistry scopeRegistry = getScopeRegistry();
-        container = scopeRegistry.getScopeContainer(Scope.COMPOSITE);
-
-        /*
-        int i = 0;
-        for (URL ext : runtimeInfo.getExtensionSCDLs()) {
-            URI uri = URI.create("/extensions/extension" + (i++));
-            deployExtension(null, uri, ext, runtimeInfo.getClassLoader());
-        }
-        */
-        
-        CompositeImplementation impl = new CompositeImplementation();
-        impl.setScdlLocation(applicationScdl);
-        impl.setClassLoader(runtimeInfo.getClassLoader());
-
-        ComponentDefinition<CompositeImplementation> definition 
-            = new ComponentDefinition<CompositeImplementation>(DEFAULT_COMPOSITE, impl);
-        Collection<Component> components = getDeployer().deploy(null, definition);
-        for (Component component : components) {
-            component.start();
-        }
-        container.startContext(DEFAULT_COMPOSITE, DEFAULT_COMPOSITE);
-        getWorkContext().setIdentifier(Scope.COMPOSITE, DEFAULT_COMPOSITE);
-        WorkContext workContext = new SimpleWorkContext();
-        workContext.setIdentifier(Scope.COMPOSITE, DEFAULT_COMPOSITE);
-        PojoWorkContextTunnel.setThreadWorkContext(workContext);
-        return componentManager.getComponent(definition.getUri());
-    }
-
-    @SuppressWarnings("deprecation")
-    public <T> T getSystemService(Class<T> type, String name) throws TargetResolutionException {
-        SCAObject child = componentManager.getComponent(URI.create(name));
-        if (child == null) {
-            return null;
-        }
-        AtomicComponent service = (AtomicComponent)child;
-        return type.cast(service.getTargetInstance());
-    }
-
-    @Override
-    public void destroy() {
-        container.stopContext(DEFAULT_COMPOSITE);
-        getWorkContext().setIdentifier(Scope.COMPOSITE, null);
-        super.destroy();
-    }
-
-}
diff --git a/sandbox/rfeng/runtime/embedded/src/main/java/org/apache/tuscany/runtime/embedded/SimpleRuntimeInfo.java b/sandbox/rfeng/runtime/embedded/src/main/java/org/apache/tuscany/runtime/embedded/SimpleRuntimeInfo.java
deleted file mode 100644
index 740c51a3a3..0000000000
--- a/sandbox/rfeng/runtime/embedded/src/main/java/org/apache/tuscany/runtime/embedded/SimpleRuntimeInfo.java
+++ /dev/null
@@ -1,56 +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.runtime.embedded;
-
-import java.net.URI;
-import java.net.URL;
-import java.util.List;
-
-import org.apache.tuscany.host.RuntimeInfo;
-import org.apache.tuscany.spi.bootstrap.ComponentNames;
-
-/**
- * @version $Rev$ $Date$
- */
-public interface SimpleRuntimeInfo extends RuntimeInfo {
-    URI DEFAULT_COMPOSITE = ComponentNames.TUSCANY_APPLICATION_ROOT.resolve("default");
-
-    String DEFAULT_SYSTEM_SCDL = "META-INF/tuscany/default-system.composite";
-    String SYSTEM_SCDL = "system.composite";
-    String EXTENSION_SCDL = "META-INF/sca/extension.composite";
-    String SERVICE_SCDL = "META-INF/sca/service.composite";
-    String META_APPLICATION_SCDL = "META-INF/sca/application.composite";
-    String APPLICATION_SCDL = "application.composite";
-
-    ClassLoader getClassLoader();
-
-    String getCompositePath();
-
-    URL getSystemSCDL();
-
-    URL getApplicationSCDL();
-
-    List<URL> getExtensionSCDLs();
-
-    URL getContributionRoot();
-
-    URI getContributionURI();
-
-}
diff --git a/sandbox/rfeng/runtime/embedded/src/main/java/org/apache/tuscany/runtime/embedded/SimpleRuntimeInfoImpl.java b/sandbox/rfeng/runtime/embedded/src/main/java/org/apache/tuscany/runtime/embedded/SimpleRuntimeInfoImpl.java
deleted file mode 100644
index 6839eefc93..0000000000
--- a/sandbox/rfeng/runtime/embedded/src/main/java/org/apache/tuscany/runtime/embedded/SimpleRuntimeInfoImpl.java
+++ /dev/null
@@ -1,182 +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.runtime.embedded;
-
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URI;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Enumeration;
-import java.util.List;
-
-import org.apache.tuscany.core.util.FileHelper;
-import org.apache.tuscany.host.AbstractRuntimeInfo;
-
-/**
- * @version $Rev$ $Date$
- */
-public class SimpleRuntimeInfoImpl extends AbstractRuntimeInfo implements SimpleRuntimeInfo {
-    private ClassLoader classLoader;
-    private String compositePath;
-
-    private List<URL> extensions;
-    private URL applicationSCDL;
-    private URL systemSCDL;
-
-    private URL contributionURL;
-    private URI contributionURI;
-
-    /**
-     * @param classLoader
-     * @param compositePath
-     * @param extensions
-     * @param applicationSCDL
-     * @param systemSCDL
-     */
-    public SimpleRuntimeInfoImpl(ClassLoader classLoader,
-                                 URL systemSCDL,
-                                 List<URL> extensions,
-                                 URI contributionURI,
-                                 URL applicationSCDL,
-                                 String compositePath) {
-        this(classLoader, compositePath);
-        this.extensions = extensions;
-        this.applicationSCDL = applicationSCDL;
-        this.systemSCDL = systemSCDL;
-        this.contributionURI = contributionURI;
-    }
-
-    public SimpleRuntimeInfoImpl(ClassLoader classLoader, String compositePath) {
-        // super(domain, applicationRootDirectory, baseUrl, online, runtimeId);
-        super(URI.create("sca://domain/local"), null, null, false, "simple");
-        if (classLoader != null) {
-            this.classLoader = classLoader;
-        } else {
-            classLoader = Thread.currentThread().getContextClassLoader();
-        }
-        this.compositePath = compositePath != null ? compositePath : APPLICATION_SCDL;
-        getApplicationSCDL();
-        this.contributionURI = URI.create("/default");
-    }
-
-    public ClassLoader getClassLoader() {
-        return classLoader;
-    }
-
-    public String getCompositePath() {
-        return compositePath;
-    }
-
-    public final URL getApplicationSCDL() {
-        if (applicationSCDL == null) {
-            applicationSCDL = classLoader.getResource(compositePath);
-            if (applicationSCDL == null) {
-                applicationSCDL = classLoader.getResource(APPLICATION_SCDL);
-                if (applicationSCDL == null) {
-                    applicationSCDL = classLoader.getResource(META_APPLICATION_SCDL);
-                    if (applicationSCDL != null) {
-                        compositePath = META_APPLICATION_SCDL;
-                    }
-                } else {
-                    if (compositePath == null) {
-                        compositePath = APPLICATION_SCDL;
-                    }
-                }
-                if (applicationSCDL == null) {
-                    throw new IllegalArgumentException("application SCDL not found: " + APPLICATION_SCDL);
-                }
-            }
-        }
-        return applicationSCDL;
-    }
-
-    public URL getContributionRoot() {
-        if (contributionURL == null) {
-            contributionURL = getContributionLocation(getApplicationSCDL(), compositePath);
-        }
-        return contributionURL;
-    }
-
-    public List<URL> getExtensionSCDLs() {
-        if (extensions == null) {
-            try {
-                List<URL> extensionURLs = new ArrayList<URL>();
-                Enumeration<URL> urls = classLoader.getResources(SERVICE_SCDL);
-                extensionURLs.addAll(Collections.list(urls));
-                urls = classLoader.getResources(EXTENSION_SCDL);
-                extensionURLs.addAll(Collections.list(urls));
-                if (extensions != null) {
-                    for (URL ext : extensions) {
-                        if (!extensionURLs.contains(ext)) {
-                            extensionURLs.add(ext);
-                        }
-                    }
-                }
-                extensions = extensionURLs;
-            } catch (IOException e) {
-                throw new IllegalArgumentException(e);
-            }
-        }
-        return extensions;
-    }
-
-    public URL getSystemSCDL() {
-        if (systemSCDL == null) {
-            systemSCDL = classLoader.getResource(SYSTEM_SCDL);
-            if (systemSCDL == null) {
-                systemSCDL = classLoader.getResource(DEFAULT_SYSTEM_SCDL);
-            }
-        }
-        return systemSCDL;
-    }
-
-    private static URL getContributionLocation(URL applicationSCDL, String compositePath) {
-        URL root = null;
-        // "jar:file://....../something.jar!/a/b/c/app.composite"
-        try {
-            String scdlUrl = applicationSCDL.toExternalForm();
-            String protocol = applicationSCDL.getProtocol();
-            if ("file".equals(protocol)) {
-                // directory contribution
-                if (scdlUrl.endsWith(compositePath)) {
-                    String location = scdlUrl.substring(0, scdlUrl.lastIndexOf(compositePath));
-                    // workaround from evil url/uri form maven
-                    root = FileHelper.toFile(new URL(location)).toURI().toURL();
-                }
-
-            } else if ("jar".equals(protocol)) {
-                // jar contribution
-                String location = scdlUrl.substring(4, scdlUrl.lastIndexOf("!/"));
-                // workaround from evil url/uri form maven
-                root = FileHelper.toFile(new URL(location)).toURI().toURL();
-            }
-        } catch (MalformedURLException mfe) {
-            throw new IllegalArgumentException(mfe);
-        }
-
-        return root;
-    }
-
-    public URI getContributionURI() {
-        return contributionURI;
-    }
-}
diff --git a/sandbox/rfeng/runtime/embedded/src/test/java/calculator/AddService.java b/sandbox/rfeng/runtime/embedded/src/test/java/calculator/AddService.java
deleted file mode 100644
index 4eeb30a9c2..0000000000
--- a/sandbox/rfeng/runtime/embedded/src/test/java/calculator/AddService.java
+++ /dev/null
@@ -1,25 +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 calculator;
-
-public interface AddService {
-
-    double add(double n1, double n2);
-
-}
diff --git a/sandbox/rfeng/runtime/embedded/src/test/java/calculator/AddServiceImpl.java b/sandbox/rfeng/runtime/embedded/src/test/java/calculator/AddServiceImpl.java
deleted file mode 100644
index 8b6fe066a6..0000000000
--- a/sandbox/rfeng/runtime/embedded/src/test/java/calculator/AddServiceImpl.java
+++ /dev/null
@@ -1,30 +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 calculator;
-
-/**
- * An implementation of the Add service
- */
-public class AddServiceImpl implements AddService {
-
-    public double add(double n1, double n2) {
-        return n1 + n2;
-    }
-
-}
diff --git a/sandbox/rfeng/runtime/embedded/src/test/java/calculator/CalculatorClient.java b/sandbox/rfeng/runtime/embedded/src/test/java/calculator/CalculatorClient.java
deleted file mode 100644
index 37231e53fe..0000000000
--- a/sandbox/rfeng/runtime/embedded/src/test/java/calculator/CalculatorClient.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 calculator;
-
-import org.apache.tuscany.api.SCARuntime;
-import org.osoa.sca.ComponentContext;
-import org.osoa.sca.ServiceReference;
-
-/**
- * @version $Rev$ $Date$
- */
-public class CalculatorClient {
-
-    public CalculatorClient() {
-        super();
-    }
-
-    public static void main(String[] args) {
-        // Start the embedded SCA runtime
-        SCARuntime.start();
-        
-        // Look up the ComponentContext by name
-        ComponentContext context = SCARuntime.getComponentContext("CalculatorServiceComponent");
-        ServiceReference<CalculatorService> self = context.createSelfReference(CalculatorService.class);
-        CalculatorService calculatorService = self.getService();
-        System.out.println("1.0 x 2.0 = " + calculatorService.multiply(1.0, 2.0));
-        AddService addService = context.getService(AddService.class, "addService");
-        System.out.println("1.0 + 2.0 = " + addService.add(1.0, 2.0));
-        
-        // Stop the SCA embedded runtime
-        SCARuntime.stop();
-    }
-
-}
diff --git a/sandbox/rfeng/runtime/embedded/src/test/java/calculator/CalculatorService.java b/sandbox/rfeng/runtime/embedded/src/test/java/calculator/CalculatorService.java
deleted file mode 100644
index 031fa8b912..0000000000
--- a/sandbox/rfeng/runtime/embedded/src/test/java/calculator/CalculatorService.java
+++ /dev/null
@@ -1,35 +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 calculator;
-
-
-/**
- * The Calculator service interface.
- */
-public interface CalculatorService {
-
-    double add(double n1, double n2);
-
-    double subtract(double n1, double n2);
-
-    double multiply(double n1, double n2);
-
-    double divide(double n1, double n2);
-
-}
diff --git a/sandbox/rfeng/runtime/embedded/src/test/java/calculator/CalculatorServiceImpl.java b/sandbox/rfeng/runtime/embedded/src/test/java/calculator/CalculatorServiceImpl.java
deleted file mode 100644
index 3d861f2018..0000000000
--- a/sandbox/rfeng/runtime/embedded/src/test/java/calculator/CalculatorServiceImpl.java
+++ /dev/null
@@ -1,70 +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 calculator;
-
-import org.osoa.sca.annotations.Reference;
-
-
-/**
- * An implementation of the Calculator service.
- */
-public class CalculatorServiceImpl implements CalculatorService {
-
-    private AddService addService;
-    private SubtractService subtractService;
-    private MultiplyService multiplyService;
-    private DivideService divideService;
-
-    @Reference
-    public void setAddService(AddService addService) {
-        this.addService = addService;
-    }
-
-    @Reference
-    public void setSubtractService(SubtractService subtractService) {
-        this.subtractService = subtractService;
-    }
-
-    @Reference
-    public void setDivideService(DivideService divideService) {
-        this.divideService = divideService;
-    }
-
-    @Reference
-    public void setMultiplyService(MultiplyService multiplyService) {
-        this.multiplyService = multiplyService;
-    }
-
-    public double add(double n1, double n2) {
-        return addService.add(n1, n2);
-    }
-
-    public double subtract(double n1, double n2) {
-        return subtractService.subtract(n1, n2);
-    }
-
-    public double multiply(double n1, double n2) {
-        return multiplyService.multiply(n1, n2);
-    }
-
-    public double divide(double n1, double n2) {
-        return divideService.divide(n1, n2);
-    }
-
-}
diff --git a/sandbox/rfeng/runtime/embedded/src/test/java/calculator/DivideService.java b/sandbox/rfeng/runtime/embedded/src/test/java/calculator/DivideService.java
deleted file mode 100644
index 131c5a8014..0000000000
--- a/sandbox/rfeng/runtime/embedded/src/test/java/calculator/DivideService.java
+++ /dev/null
@@ -1,25 +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 calculator;
-
-public interface DivideService {
-
-    double divide(double n1, double n2);
-
-}
diff --git a/sandbox/rfeng/runtime/embedded/src/test/java/calculator/DivideServiceImpl.java b/sandbox/rfeng/runtime/embedded/src/test/java/calculator/DivideServiceImpl.java
deleted file mode 100644
index f7ac0b7287..0000000000
--- a/sandbox/rfeng/runtime/embedded/src/test/java/calculator/DivideServiceImpl.java
+++ /dev/null
@@ -1,30 +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 calculator;
-
-/**
- * An implementation of the Divide service.
- */
-public class DivideServiceImpl implements DivideService {
-
-    public double divide(double n1, double n2) {
-        return n1 / n2;
-    }
-
-}
diff --git a/sandbox/rfeng/runtime/embedded/src/test/java/calculator/MultiplyService.java b/sandbox/rfeng/runtime/embedded/src/test/java/calculator/MultiplyService.java
deleted file mode 100644
index a917896aeb..0000000000
--- a/sandbox/rfeng/runtime/embedded/src/test/java/calculator/MultiplyService.java
+++ /dev/null
@@ -1,25 +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 calculator;
-
-public interface MultiplyService {
-
-    double multiply(double n1, double n2);
-
-}
diff --git a/sandbox/rfeng/runtime/embedded/src/test/java/calculator/MultiplyServiceImpl.java b/sandbox/rfeng/runtime/embedded/src/test/java/calculator/MultiplyServiceImpl.java
deleted file mode 100644
index b7dca792b2..0000000000
--- a/sandbox/rfeng/runtime/embedded/src/test/java/calculator/MultiplyServiceImpl.java
+++ /dev/null
@@ -1,30 +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 calculator;
-
-/**
- * An implementation of the Multiply service.
- */
-public class MultiplyServiceImpl implements MultiplyService {
-
-    public double multiply(double n1, double n2) {
-        return n1 * n2;
-    }
-
-}
diff --git a/sandbox/rfeng/runtime/embedded/src/test/java/calculator/SubtractService.java b/sandbox/rfeng/runtime/embedded/src/test/java/calculator/SubtractService.java
deleted file mode 100644
index e328f024ea..0000000000
--- a/sandbox/rfeng/runtime/embedded/src/test/java/calculator/SubtractService.java
+++ /dev/null
@@ -1,25 +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 calculator;
-
-public interface SubtractService {
-
-    double subtract(double n1, double n2);
-
-}
diff --git a/sandbox/rfeng/runtime/embedded/src/test/java/calculator/SubtractServiceImpl.java b/sandbox/rfeng/runtime/embedded/src/test/java/calculator/SubtractServiceImpl.java
deleted file mode 100644
index 77b128ab8d..0000000000
--- a/sandbox/rfeng/runtime/embedded/src/test/java/calculator/SubtractServiceImpl.java
+++ /dev/null
@@ -1,30 +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 calculator;
-
-/**
- * An implementation of the subtract service.
- */
-public class SubtractServiceImpl implements SubtractService {
-
-    public double subtract(double n1, double n2) {
-        return n1 - n2;
-    }
-
-}
diff --git a/sandbox/rfeng/runtime/embedded/src/test/java/org/apache/tuscany/api/SCARuntimeTestCase.java b/sandbox/rfeng/runtime/embedded/src/test/java/org/apache/tuscany/api/SCARuntimeTestCase.java
deleted file mode 100644
index cacbb7162c..0000000000
--- a/sandbox/rfeng/runtime/embedded/src/test/java/org/apache/tuscany/api/SCARuntimeTestCase.java
+++ /dev/null
@@ -1,57 +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 junit.framework.TestCase;
-
-import org.osoa.sca.ComponentContext;
-import org.osoa.sca.ServiceReference;
-
-import calculator.AddService;
-import calculator.CalculatorService;
-
-/**
- * @version $Rev$ $Date$
- */
-public class SCARuntimeTestCase extends TestCase {
-    /**
-     * @throws java.lang.Exception
-     */
-    protected void setUp() throws Exception {
-        SCARuntime.start();
-    }
-
-    public void testStart() throws Exception {
-        ComponentContext context = SCARuntime.getComponentContext("CalculatorServiceComponent");
-        assertNotNull(context);
-        ServiceReference<CalculatorService> self = context.createSelfReference(CalculatorService.class);
-        assertEquals(2.0, self.getService().multiply(1.0, 2.0));
-        AddService service = context.getService(AddService.class, "addService");
-        assertEquals(3.0, service.add(1.0, 2.0));
-    }
-
-    /**
-     * @throws java.lang.Exception
-     */
-    protected void tearDown() throws Exception {
-        SCARuntime.stop();
-    }
-
-}
diff --git a/sandbox/rfeng/runtime/embedded/src/test/java/org/apache/tuscany/runtime/embedded/SimpleRuntimeImplTestCase.java b/sandbox/rfeng/runtime/embedded/src/test/java/org/apache/tuscany/runtime/embedded/SimpleRuntimeImplTestCase.java
deleted file mode 100644
index 1c4b04600d..0000000000
--- a/sandbox/rfeng/runtime/embedded/src/test/java/org/apache/tuscany/runtime/embedded/SimpleRuntimeImplTestCase.java
+++ /dev/null
@@ -1,60 +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.runtime.embedded;
-
-import java.net.URI;
-
-import junit.framework.TestCase;
-
-import org.osoa.sca.ComponentContext;
-
-import calculator.AddService;
-
-/**
- * @version $Rev$ $Date$
- */
-public class SimpleRuntimeImplTestCase extends TestCase {
-    private SimpleRuntime runtime;
-
-    /**
-     * @throws java.lang.Exception
-     */
-    protected void setUp() throws Exception {
-        SimpleRuntimeInfo runtimeInfo = new SimpleRuntimeInfoImpl(getClass().getClassLoader(), "application.composite");
-        runtime = new SimpleRuntimeImpl(runtimeInfo);
-        runtime.start();
-    }
-
-    public void testStart() throws Exception {
-        ComponentContext context = runtime.getComponentContext(URI
-            .create("sca://root.application/default/CalculatorServiceComponent"));
-        assertNotNull(context);
-        AddService service = context.getService(AddService.class, "addService");
-        assertEquals(3.0, service.add(1.0, 2.0));
-    }
-
-    /**
-     * @throws java.lang.Exception
-     */
-    protected void tearDown() throws Exception {
-        runtime.destroy();
-    }
-
-}
diff --git a/sandbox/rfeng/runtime/embedded/src/test/resources/application.composite b/sandbox/rfeng/runtime/embedded/src/test/resources/application.composite
deleted file mode 100644
index 55d4ca889b..0000000000
--- a/sandbox/rfeng/runtime/embedded/src/test/resources/application.composite
+++ /dev/null
@@ -1,46 +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.    
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" name="CalculatorComposite">
-
-    <component name="CalculatorServiceComponent">
-        <implementation.java class="calculator.CalculatorServiceImpl" />
-        <reference name="addService" target="AddServiceComponent" />
-        <reference name="subtractService" target="SubtractServiceComponent" />
-        <reference name="multiplyService" target="MultiplyServiceComponent" />
-        <reference name="divideService" target="DivideServiceComponent" />
-    </component>
-
-    <component name="AddServiceComponent">
-        <implementation.java class="calculator.AddServiceImpl" />
-    </component>
-
-    <component name="SubtractServiceComponent">
-        <implementation.java class="calculator.SubtractServiceImpl" />
-    </component>
-
-    <component name="MultiplyServiceComponent">
-        <implementation.java class="calculator.MultiplyServiceImpl" />
-    </component>
-
-    <component name="DivideServiceComponent">
-        <implementation.java class="calculator.DivideServiceImpl" />
-    </component>
-
-</composite>
diff --git a/sandbox/rfeng/runtime/embedded/src/test/resources/system.composite b/sandbox/rfeng/runtime/embedded/src/test/resources/system.composite
deleted file mode 100644
index 3974e06dd1..0000000000
--- a/sandbox/rfeng/runtime/embedded/src/test/resources/system.composite
+++ /dev/null
@@ -1,349 +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.    
--->
-<!--
-    Default system configuration for the launcher environment.
-    
-    $Rev: 520623 $ $Date: 2007-03-20 15:17:36 -0700 (Tue, 20 Mar 2007) $
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0" xmlns:system="http://tuscany.apache.org/xmlns/sca/system/2.0-alpha"
-    name="org.apache.tuscany.launcher.System" autowire="true">
-
-    <!-- Work manager -->
-    <component name="workManager">
-        <system:implementation.system class="org.apache.tuscany.core.services.work.jsr237.workmanager.ThreadPoolWorkManager" />
-        <property name="poolSize">10</property>
-    </component>
-
-    <component name="workScheduler">
-        <system:implementation.system class="org.apache.tuscany.core.services.work.jsr237.Jsr237WorkScheduler" />
-    </component>
-    <!-- Generator Registry -->
-    <component name="generatorRegistry">
-        <system:implementation.system class="org.apache.tuscany.core.generator.GeneratorRegistryImpl" />
-    </component>
-
-    <component name="javaGenerator">
-        <system:implementation.system class="org.apache.tuscany.core.implementation.java.JavaPhysicalComponentGenerator" />
-    </component>
-
-
-    <!-- JXTA network configurator -->
-    <!-- component name="networkConfigurator">
-        <system:implementation.system
-        class="net.jxta.platform.NetworkConfigurator"/>
-        <property name="principal">principal</property>
-        <property name="password">password</property>
-        </component-->
-
-    <!-- Discovery service -->
-    <!--component name="discoveryService">
-        <system:implementation.system
-        class="org.apache.tuscany.service.discovery.jxta.JxtaDiscoveryService"/>
-        <property name="interval">5000</property>
-        <reference name="configurator" target="networkConfigurator"/>
-        <reference name="workScheduler" target="workScheduler"/>
-        </component-->
-
-    <!-- JMS discovery service -->
-    <!--
-        <component name="discoveryService">
-        <system:implementation.system
-        class="org.apache.tuscany.service.discovery.jms.JmsDiscoveryService"/>
-        <property name="topic">tuscany.federation</property>
-        </component>
-    -->
-
-    <!-- Marshaller registry -->
-    <component name="marshallerRegistry">
-        <system:implementation.system class="org.apache.tuscany.core.marshaller.DefaultModelMarshallerRegistry" />
-    </component>
-
-    <!-- Changeset marshaller -->
-    <component name="changeSetMarshaller">
-        <system:implementation.system class="org.apache.tuscany.core.marshaller.PhysicalChangeSetMarshaller" />
-    </component>
-
-    <!-- Wide definition marshaller -->
-    <component name="wireDefinitionMarshaller">
-        <system:implementation.system class="org.apache.tuscany.core.marshaller.PhysicalWireDefinitionMarshaller" />
-    </component>
-
-    <!-- Operation definition marshaller -->
-    <component name="operationMarshaller">
-        <system:implementation.system class="org.apache.tuscany.core.marshaller.PhysicalOperationDefinitionMarshaller" />
-    </component>
-
-    <!-- Java component definition marshaller -->
-    <component name="javaComponentDefinitionMarshaller">
-        <system:implementation.system
-            class="org.apache.tuscany.core.marshaller.extensions.java.JavaPhysicalComponentDefinitionMarshaller" />
-    </component>
-
-    <!-- Reflective IF provider definition marshaller -->
-    <component name="reflectiveIfProviderDefinitionMarshaller">
-        <system:implementation.system
-            class="org.apache.tuscany.core.marshaller.extensions.instancefactory.ReflectiveIFProviderDefinitionMarshaller" />
-    </component>
-
-    <!-- Java physical wire source definition marshaller -->
-    <component name="javaWireSourceDefinitionMarshaller">
-        <system:implementation.system
-            class="org.apache.tuscany.core.marshaller.extensions.java.JavaPhysicalWireSourceDefinitionMarshaller" />
-    </component>
-
-    <!-- Java physical wire target definition marshaller -->
-    <component name="javaWireTargetDefinitionMarshaller">
-        <system:implementation.system
-            class="org.apache.tuscany.core.marshaller.extensions.java.JavaPhysicalWireTargetDefinitionMarshaller" />
-    </component>
-
-    <!-- Builder registry -->
-    <component name="builderRegistry">
-        <system:implementation.system class="org.apache.tuscany.core.builder.physical.DefaultPhysicalComponentBuilderRegistry" />
-    </component>
-    <component name="wireAttacherRegistry">
-        <system:implementation.system class="org.apache.tuscany.core.builder.physical.WireAttacherRegistryImpl" />
-    </component>
-    <component name="providerBuilderRegistry">
-        <system:implementation.system
-            class="org.apache.tuscany.core.component.instancefactory.impl.DefaultIFProviderBuilderRegistry" />
-    </component>
-
-    <component name="reflectiveIFProviderBuilder">
-        <system:implementation.system
-            class="org.apache.tuscany.core.component.instancefactory.impl.ReflectiveIFProviderBuilder" />
-    </component>
-
-    <!-- Java physical component builder -->
-    <component name="javaPhysicalComponentBuilder">
-        <system:implementation.system class="org.apache.tuscany.core.implementation.java.JavaPhysicalComponentBuilder" />
-    </component>
-
-    <!-- Classloader registry -->
-    <!-- 
-    <component name="classLoaderRegistry">
-        <system:implementation.system class="org.apache.tuscany.core.services.classloading.ClassLoaderRegistryImpl" />
-    </component>
-    -->
-    
-    <!-- Federated deployer -->
-    <component name="federateDeployer">
-        <system:implementation.system class="org.apache.tuscany.core.deployer.federation.FederatedDeployer" />
-    </component>
-
-    <!-- Component manager -->
-    <!--
-        <component name="componentManager">
-        <system:implementation.system
-        class="org.apache.tuscany.core.component.ComponentManagerImpl"/>
-        </component>
-    -->
-
-    <!-- Connector -->
-    <!-- 
-    <component name="connector">
-        <system:implementation.system class="org.apache.tuscany.core.builder.ConnectorImpl" />
-    </component>
-    -->
-    
-    <!-- Jetty HTTP service -->
-    <!--
-        <component name="httpService">
-        <system:implementation.system
-        class="org.apache.tuscany.service.jetty.JettyServiceImpl"/>
-        <property name="httpPort">7000</property>
-        </component>
-    -->
-
-    <!-- Console -->
-    <!--
-        <include name="org.apache.tuscany.sca.console"
-        scdlResource="org/apache/tuscany/console/console.scdl"/>
-    -->
-
-    <!-- Assembly service -->
-    <component name="assemblyService">
-        <system:implementation.system class="org.apache.tuscany.core.services.deployment.AssemblyServiceImpl" />
-    </component>
-
-
-    <!--_________________________________________________________________________________________-->
-
-    <!--__________________________Legacy from launcher SCDL _____________________________________-->
-
-    <!--_________________________________________________________________________________________-->
-
-    <!-- Component that provides the Deployer service -->
-    <component name="deployer">
-        <system:implementation.system class="org.apache.tuscany.core.deployer.DeployerImpl" />
-    </component>
-
-    <!-- Work management -->
-    <component name="WorkContext">
-        <system:implementation.system class="org.apache.tuscany.core.component.WorkContextImpl" />
-    </component>
-
-    <!-- Wire service -->
-    <component name="proxyService">
-        <system:implementation.system class="org.apache.tuscany.core.wire.jdk.JDKProxyService" />
-    </component>
-
-    <!-- Store infrastructure -->
-    <component name="store">
-        <system:implementation.system class="org.apache.tuscany.core.services.store.memory.MemoryStore" />
-    </component>
-
-    <!-- Builder and BuilderRegistry -->
-    <component name="builder">
-        <system:implementation.system class="org.apache.tuscany.core.builder.BuilderRegistryImpl" />
-    </component>
-
-    <!-- Resource host registry -->
-    <component name="resourceHostRegistry">
-        <system:implementation.system class="org.apache.tuscany.core.services.host.DelegatingResourceHostRegistry" />
-    </component>
-
-    <!-- Loader and LoaderRegistry -->
-    <component name="loader">
-        <system:implementation.system class="org.apache.tuscany.core.loader.LoaderRegistryImpl" />
-    </component>
-
-    <!-- Introspector and IntrospectionRegistry -->
-    <component name="interfaceProcessorRegistry">
-        <system:implementation.system class="org.apache.tuscany.core.implementation.IntrospectionRegistryImpl" />
-    </component>
-
-    <!-- Connector infrastructure -->
-    <component name="connector">
-        <system:implementation.system class="org.apache.tuscany.core.builder.ConnectorImpl" />
-    </component>
-
-    <component name="wirePostProcessorRegistry">
-        <system:implementation.system class="org.apache.tuscany.core.builder.WirePostProcessorRegistryImpl" />
-    </component>
-
-    <!-- Default scopes -->
-    <component name="scope.stateless">
-        <system:implementation.system class="org.apache.tuscany.core.component.scope.StatelessScopeContainer" />
-    </component>
-    <!--
-        <component name="scope.request">
-        <system:implementation.system class="org.apache.tuscany.core.component.scope.RequestScopeContainer"/>
-        </component>
-    -->
-    <!--
-        <component name="scope.conversational">
-        <system:implementation.system class="org.apache.tuscany.core.component.scope.ConversationalScopeContainer"/>
-        </component>
-    -->
-
-    <!-- include loader configuration -->
-    <include name="org.apache.tuscany.core.Loader" scdlResource="org/apache/tuscany/core/loader.scdl" />
-
-    <!-- include databinding configuration -->
-    <include name="org.apache.tuscany.core.DataBinding" scdlResource="org/apache/tuscany/core/databinding.scdl" />
-
-    <!-- include implementation processor configuration -->
-    <include name="org.apache.tuscany.core.Implementation" scdlResource="org/apache/tuscany/core/implementation.scdl" />
-
-    <!-- Java interface definition language -->
-    <include name="org.apache.tuscany.core.InterfaceJava" scdlResource="org/apache/tuscany/core/interfaceJava.scdl" />
-
-    <!-- include omposite implementation type -->
-    <include name="org.apache.tuscany.core.Composite" scdlResource="org/apache/tuscany/core/composite.scdl" />
-
-    <!-- System implementation type -->
-    <include name="org.apache.tuscany.core.SystemImplementation"
-        scdlResource="org/apache/tuscany/core/systemImplementation.scdl" />
-
-    <!-- Java implementation type -->
-    <include name="org.apache.tuscany.core.JavaImplementation" scdlResource="org/apache/tuscany/core/javaImplementation.scdl" />
-
-    <!-- service for resolving artifacts using Maven repositories -->
-    <!--
-        <component name="artifactRepository">
-        <system:implementation.system
-        class="org.apache.tuscany.services.maven.MavenArtifactRepository"/>
-        <property name="remoteRepoUrl">
-        http://repo1.maven.org/maven2/,http://people.apache.org/repo/m2-snapshot-repository,http://people.apache.org/repo/m2-incubating-repository/,http://people.apache.org/repo/m1-snapshot-repository/</property>
-        </component>
-    -->
-
-    <component name="policyBuilderRegistry">
-        <system:implementation.system class="org.apache.tuscany.core.policy.PolicyBuilderRegistryImpl" />
-    </component>
-
-    <component name="propertyFactory">
-        <system:implementation.system class="org.apache.tuscany.core.property.PropertyObjectFactoryImpl" />
-    </component>
-
-    <!-- component that scans the extension directory -->
-    <!--
-        <component name="directoryScanExtender" initLevel="90">
-        <system:implementation.system
-        class="org.apache.tuscany.runtime.standalone.host.DirectoryScanExtender"/>
-        <property name="path">extensions</property>
-        </component>
-    -->
-
-    <!-- the local binding -->
-    <component name="localBindingLoader">
-        <system:implementation.system class="org.apache.tuscany.core.binding.local.LocalBindingLoader" />
-    </component>
-
-    <component name="localBindingBuilder">
-        <system:implementation.system class="org.apache.tuscany.core.binding.local.LocalBindingBuilder" />
-    </component>
-
-    <component name="artifactRepository">
-        <system:implementation.system class="org.apache.tuscany.core.services.artifact.LocalMavenRepository" />
-        <property name="repository">.m2/repository</property>
-    </component>
-
-    <!--
-        <component name="launchedLoader">
-        <system:implementation.system
-        class="org.apache.tuscany.runtime.standalone.host.implementation.launched.LaunchedLoader"/>
-        </component>
-        
-        <component name="launchedComponentLoader">
-        <system:implementation.system
-        class="org.apache.tuscany.runtime.standalone.host.implementation.launched.LaunchedComponentTypeLoader"/>
-        </component>
-        
-        <component name="launchedComponentBuilder">
-        <system:implementation.system
-        class="org.apache.tuscany.runtime.standalone.host.implementation.launched.LaunchedComponentBuilder"/>
-        </component>
-    -->
-
-    <component name="wiringExceptionFormatter">
-        <system:implementation.system class="org.apache.tuscany.core.builder.WiringExceptionFormatter" />
-    </component>
-
-    <component name="loaderExceptionFormatter">
-        <system:implementation.system class="org.apache.tuscany.core.loader.LoaderExceptionFormatter" />
-    </component>
-
-    <component name="incompatibleServiceContractExceptionFormatter">
-        <system:implementation.system class="org.apache.tuscany.core.wire.IncompatibleServiceContractExceptionFormatter" />
-    </component>
-
-</composite>
-\ No newline at end of file