Official Tuscany 2.0.1 Release

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

28 files changed, 0 insertions, 1856 deletions

diff --git a/sca-java-2.x/tags/2.0.1-RC1/modules/node-manager/LICENSE b/sca-java-2.x/tags/2.0.1-RC1/modules/node-manager/LICENSE
deleted file mode 100644
index 0affce048a..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/modules/node-manager/LICENSE
+++ /dev/null
@@ -1,442 +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, service marks, or product names of the Licensor,

-      except as required for reasonable and customary use in describing the

-      origin of the Work and reproducing the content of the NOTICE file.

-

-   7. Disclaimer of Warranty. Unless required by applicable law or

-      agreed to in writing, Licensor provides the Work (and each

-      Contributor provides its Contributions) on an "AS IS" BASIS,

-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or

-      implied, including, without limitation, any warranties or conditions

-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A

-      PARTICULAR PURPOSE. You are solely responsible for determining the

-      appropriateness of using or redistributing the Work and assume any

-      risks associated with Your exercise of permissions under this License.

-

-   8. Limitation of Liability. In no event and under no legal theory,

-      whether in tort (including negligence), contract, or otherwise,

-      unless required by applicable law (such as deliberate and grossly

-      negligent acts) or agreed to in writing, shall any Contributor be

-      liable to You for damages, including any direct, indirect, special,

-      incidental, or consequential damages of any character arising as a

-      result of this License or out of the use or inability to use the

-      Work (including but not limited to damages for loss of goodwill,

-      work stoppage, computer failure or malfunction, or any and all

-      other commercial damages or losses), even if such Contributor

-      has been advised of the possibility of such damages.

-

-   9. Accepting Warranty or Additional Liability. While redistributing

-      the Work or Derivative Works thereof, You may choose to offer,

-      and charge a fee for, acceptance of support, warranty, indemnity,

-      or other liability obligations and/or rights consistent with this

-      License. However, in accepting such obligations, You may act only

-      on Your own behalf and on Your sole responsibility, not on behalf

-      of any other Contributor, and only if You agree to indemnify,

-      defend, and hold each Contributor harmless for any liability

-      incurred by, or claims asserted against, such Contributor by reason

-      of your accepting any such warranty or additional liability.

-

-   END OF TERMS AND CONDITIONS

-

-   APPENDIX: How to apply the Apache License to your work.

-

-      To apply the Apache License to your work, attach the following

-      boilerplate notice, with the fields enclosed by brackets "[]"

-      replaced with your own identifying information. (Don't include

-      the brackets!)  The text should be enclosed in the appropriate

-      comment syntax for the file format. We also recommend that a

-      file or class name and description of purpose be included on the

-      same "printed page" as the copyright notice for easier

-      identification within third-party archives.

-

-   Copyright [yyyy] [name of copyright owner]

-

-   Licensed under the Apache License, Version 2.0 (the "License");

-   you may not use this file except in compliance with the License.

-   You may obtain a copy of the License at

-

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

-

-   Unless required by applicable law or agreed to in writing, software

-   distributed under the License is distributed on an "AS IS" BASIS,

-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

-   See the License for the specific language governing permissions and

-   limitations under the License.
-

-===============================================================================

-The following gig images are under EPL license
- - component.gif
- - composite.gif
- - interface.gif
- - property.gif
- - reference.gif
- - service.gif
-

-Eclipse Public License - v 1.0

-

-THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE

-PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF

-THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.

-

-1. DEFINITIONS

-

-"Contribution" means:

-

-a) in the case of the initial Contributor, the initial code and

-documentation distributed under this Agreement, and

-b) in the case of each subsequent Contributor:

-

-i) changes to the Program, and

-

-ii) additions to the Program;

-

-where such changes and/or additions to the Program originate from and

-are distributed by that particular Contributor. A Contribution

-'originates' from a Contributor if it was added to the Program by such

-Contributor itself or anyone acting on such Contributor's behalf.

-Contributions do not include additions to the Program which: (i) are

-separate modules of software distributed in conjunction with the

-Program under their own license agreement, and (ii) are not derivative

-works of the Program.

-

-"Contributor" means any person or entity that distributes the Program.

-

-"Licensed Patents " mean patent claims licensable by a Contributor

-which are necessarily infringed by the use or sale of its Contribution

-alone or when combined with the Program.

-

-"Program" means the Contributions distributed in accordance with this 

-Agreement.

-

-"Recipient" means anyone who receives the Program under this

-Agreement, including all Contributors.

-

-2. GRANT OF RIGHTS

-

-a) Subject to the terms of this Agreement, each Contributor hereby

-grants Recipient a non-exclusive, worldwide, royalty-free copyright

-license to reproduce, prepare derivative works of, publicly display,

-publicly perform, distribute and sublicense the Contribution of such

-Contributor, if any, and such derivative works, in source code and

-object code form.

-

-b) Subject to the terms of this Agreement, each Contributor hereby

-grants Recipient a non-exclusive, worldwide, royalty-free patent

-license under Licensed Patents to make, use, sell, offer to sell,

-import and otherwise transfer the Contribution of such Contributor, if

-any, in source code and object code form. This patent license shall

-apply to the combination of the Contribution and the Program if, at

-the time the Contribution is added by the Contributor, such addition

-of the Contribution causes such combination to be covered by the

-Licensed Patents. The patent license shall not apply to any other

-combinations which include the Contribution. No hardware per se is

-licensed hereunder.

-

-c) Recipient understands that although each Contributor grants the

-licenses to its Contributions set forth herein, no assurances are

-provided by any Contributor that the Program does not infringe the

-patent or other intellectual property rights of any other entity. Each

-Contributor disclaims any liability to Recipient for claims brought by

-any other entity based on infringement of intellectual property rights

-or otherwise. As a condition to exercising the rights and licenses

-granted hereunder, each Recipient hereby assumes sole responsibility

-to secure any other intellectual property rights needed, if any. For

-example, if a third party patent license is required to allow

-Recipient to distribute the Program, it is Recipient's responsibility

-to acquire that license before distributing the Program.

-

-d) Each Contributor represents that to its knowledge it has sufficient

-copyright rights in its Contribution, if any, to grant the copyright

-license set forth in this Agreement.

-

-3. REQUIREMENTS

-

-A Contributor may choose to distribute the Program in object code form

-under its own license agreement, provided that:

-

-a) it complies with the terms and conditions of this Agreement; and

-

-b) its license agreement:

-

-i) effectively disclaims on behalf of all Contributors all warranties

-and conditions, express and implied, including warranties or

-conditions of title and non-infringement, and implied warranties or

-conditions of merchantability and fitness for a particular purpose;

-

-ii) effectively excludes on behalf of all Contributors all liability

-for damages, including direct, indirect, special, incidental and

-consequential damages, such as lost profits;

-

-iii) states that any provisions which differ from this Agreement are

-offered by that Contributor alone and not by any other party; and

-

-iv) states that source code for the Program is available from such

-Contributor, and informs licensees how to obtain it in a reasonable

-manner on or through a medium customarily used for software exchange.

-

-When the Program is made available in source code form:

-

-a) it must be made available under this Agreement; and

-

-b) a copy of this Agreement must be included with each copy of the 

-Program.

-

-Contributors may not remove or alter any copyright notices contained

-within the Program.

-

-Each Contributor must identify itself as the originator of its

-Contribution, if any, in a manner that reasonably allows subsequent

-Recipients to identify the originator of the Contribution.

-

-4. COMMERCIAL DISTRIBUTION

-

-Commercial distributors of software may accept certain

-responsibilities with respect to end users, business partners and the

-like. While this license is intended to facilitate the commercial use

-of the Program, the Contributor who includes the Program in a

-commercial product offering should do so in a manner which does not

-create potential liability for other Contributors. Therefore, if a

-Contributor includes the Program in a commercial product offering,

-such Contributor ("Commercial Contributor") hereby agrees to defend

-and indemnify every other Contributor ("Indemnified Contributor")

-against any losses, damages and costs (collectively "Losses") arising

-from claims, lawsuits and other legal actions brought by a third party

-against the Indemnified Contributor to the extent caused by the acts

-or omissions of such Commercial Contributor in connection with its

-distribution of the Program in a commercial product offering. The

-obligations in this section do not apply to any claims or Losses

-relating to any actual or alleged intellectual property infringement.

-In order to qualify, an Indemnified Contributor must: a) promptly

-notify the Commercial Contributor in writing of such claim, and b)

-allow the Commercial Contributor to control, and cooperate with the

-Commercial Contributor in, the defense and any related settlement

-negotiations. The Indemnified Contributor may participate in any such

-claim at its own expense.

-

-For example, a Contributor might include the Program in a commercial

-product offering, Product X. That Contributor is then a Commercial

-Contributor. If that Commercial Contributor then makes performance

-claims, or offers warranties related to Product X, those performance

-claims and warranties are such Commercial Contributor's responsibility

-alone. Under this section, the Commercial Contributor would have to

-defend claims against the other Contributors related to those

-performance claims and warranties, and if a court requires any other

-Contributor to pay any damages as a result, the Commercial Contributor

-must pay those damages.

-

-5. NO WARRANTY

-

-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS

-PROVIDED 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. Each Recipient is solely

-responsible for determining the appropriateness of using and

-distributing the Program and assumes all risks associated with its

-exercise of rights under this Agreement , including but not limited to

-the risks and costs of program errors, compliance with applicable

-laws, damage to or loss of data, programs or equipment, and

-unavailability or interruption of operations.

-

-6. DISCLAIMER OF LIABILITY

-

-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR

-ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT,

-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING

-WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF

-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING

-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR

-DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED

-HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.

-

-7. GENERAL

-

-If any provision of this Agreement is invalid or unenforceable under

-applicable law, it shall not affect the validity or enforceability of

-the remainder of the terms of this Agreement, and without further

-action by the parties hereto, such provision shall be reformed to the

-minimum extent necessary to make such provision valid and enforceable.

-

-If Recipient institutes patent litigation against any entity

-(including a cross-claim or counterclaim in a lawsuit) alleging that

-the Program itself (excluding combinations of the Program with other

-software or hardware) infringes such Recipient's patent(s), then such

-Recipient's rights granted under Section 2(b) shall terminate as of

-the date such litigation is filed.

-

-All Recipient's rights under this Agreement shall terminate if it

-fails to comply with any of the material terms or conditions of this

-Agreement and does not cure such failure in a reasonable period of

-time after becoming aware of such noncompliance. If all Recipient's

-rights under this Agreement terminate, Recipient agrees to cease use

-and distribution of the Program as soon as reasonably practicable.

-However, Recipient's obligations under this Agreement and any licenses

-granted by Recipient relating to the Program shall continue and

-survive.

-

-Everyone is permitted to copy and distribute copies of this Agreement,

-but in order to avoid inconsistency the Agreement is copyrighted and

-may only be modified in the following manner. The Agreement Steward

-reserves the right to publish new versions (including revisions) of

-this Agreement from time to time. No one other than the Agreement

-Steward has the right to modify this Agreement. The Eclipse Foundation

-is the initial Agreement Steward. The Eclipse Foundation may assign

-the responsibility to serve as the Agreement Steward to a suitable

-separate entity. Each new version of the Agreement will be given a

-distinguishing version number. The Program (including Contributions)

-may always be distributed subject to the version of the Agreement

-under which it was received. In addition, after a new version of the

-Agreement is published, Contributor may elect to distribute the

-Program (including its Contributions) under the new version. Except as

-expressly stated in Sections 2(a) and 2(b) above, Recipient receives

-no rights or licenses to the intellectual property of any Contributor

-under this Agreement, whether expressly, by implication, estoppel or

-otherwise. All rights in the Program not expressly granted under this

-Agreement are reserved.

-

-This Agreement is governed by the laws of the State of New York and

-the intellectual property laws of the United States of America. No

-party to this Agreement will bring a legal action under this Agreement

-more than one year after the cause of action arose. Each party waives

-its rights to a jury trial in any resulting litigation.

-

-===============================================================================

-

diff --git a/sca-java-2.x/tags/2.0.1-RC1/modules/node-manager/META-INF/MANIFEST.MF b/sca-java-2.x/tags/2.0.1-RC1/modules/node-manager/META-INF/MANIFEST.MF
deleted file mode 100644
index 3f03d67860..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/modules/node-manager/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,24 +0,0 @@
-Manifest-Version: 1.0

-Export-Package: org.apache.tuscany.sca.node.manager;version="2.0.0"

-SCA-Version: 1.1

-Bundle-Name: Apache Tuscany SCA Node Manager

-DynamicImport-Package: org.apache.tuscany.sca.node.impl,org.apache.tus

- cany.sca.extensibility

-Bundle-Vendor: The Apache Software Foundation

-Bundle-Version: 2.0.0

-Bundle-ManifestVersion: 2

-Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt

-Bundle-Description: Apache Tuscany SCA Node Manager

-Import-Package: javax.servlet;version="2.5.0",

- javax.ws.rs,

- javax.ws.rs.core,

- org.apache.tuscany.sca.assembly;version="2.0.0",

- org.apache.tuscany.sca.interfacedef;version="2.0.0",

- org.apache.tuscany.sca.node;version="2.0.0",

- org.apache.tuscany.sca.node.configuration;version="2.0.0",

- org.apache.tuscany.sca.node.extensibility;version="2.0.0",

- org.oasisopen.sca;version="2.0.0",

- org.oasisopen.sca.annotation

-Bundle-SymbolicName: org.apache.tuscany.sca.node.manager

-Bundle-DocURL: http://www.apache.org/

-Bundle-RequiredExecutionEnvironment: J2SE-1.5,JavaSE-1.6
diff --git a/sca-java-2.x/tags/2.0.1-RC1/modules/node-manager/NOTICE b/sca-java-2.x/tags/2.0.1-RC1/modules/node-manager/NOTICE
deleted file mode 100644
index 4dc9c94cd5..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/modules/node-manager/NOTICE
+++ /dev/null
@@ -1,6 +0,0 @@
-${pom.name}
-Copyright (c) 2005 - 2013 The Apache Software Foundation
-
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
-
diff --git a/sca-java-2.x/tags/2.0.1-RC1/modules/node-manager/pom.xml b/sca-java-2.x/tags/2.0.1-RC1/modules/node-manager/pom.xml
deleted file mode 100644
index 1d50ea5883..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/modules/node-manager/pom.xml
+++ /dev/null
@@ -1,184 +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>
-
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-modules</artifactId>
-        <version>2.0.1</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>tuscany-node-manager</artifactId>
-    <name>Apache Tuscany SCA Node Manager</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-assembly</artifactId>
-            <version>2.0.1</version>
-        </dependency>
-
-         <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-contribution</artifactId>
-            <version>2.0.1</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node-api</artifactId>
-            <version>2.0.1</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-core</artifactId>
-            <version>2.0.1</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-assembly-xml</artifactId>
-            <version>2.0.1</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-deployment</artifactId>
-            <version>2.0.1</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-builder</artifactId>
-            <version>2.0.1</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-sca-runtime</artifactId>
-            <version>2.0.1</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-core-databinding</artifactId>
-            <version>2.0.1</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-assembly-xsd</artifactId>
-            <version>2.0.1</version>
-            <scope>runtime</scope>
-        </dependency>
-
-       <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-common-http</artifactId>
-            <version>2.0.1</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-http</artifactId>
-            <version>2.0.1</version>
-        </dependency>
-
-       <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-runtime</artifactId>
-            <version>2.0.1</version>
-            <scope>runtime</scope>
-        </dependency>
-
-       <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-widget-runtime-dojo</artifactId>
-            <version>2.0.1</version>
-            <scope>runtime</scope>
-        </dependency>
-
-       <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-rest-runtime</artifactId>
-            <version>2.0.1</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.httpcomponents</groupId>
-            <artifactId>httpclient</artifactId>
-            <version>4.1.2</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>javax.ws.rs</groupId>
-            <artifactId>jsr311-api</artifactId>
-            <version>1.1.1</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
-            <version>2.5</version>
-            <scope>provided</scope>
-        </dependency>        
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-jetty</artifactId>
-            <version>2.0.1</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node-impl</artifactId>
-            <version>2.0.1</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-	        <groupId>httpunit</groupId>
-	        <artifactId>httpunit</artifactId>
-	        <version>1.7</version>
-	        <scope>test</scope>
-	        <exclusions>
-	        	<exclusion>
-		            <groupId>javax.servlet</groupId>
-		            <artifactId>servlet-api</artifactId>
-	        	</exclusion>
-	        </exclusions>
-        </dependency>
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.8.1</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
-</project>
diff --git a/sca-java-2.x/tags/2.0.1-RC1/modules/node-manager/src/main/java/org/apache/tuscany/sca/node/manager/DomainAssetManagerResource.java b/sca-java-2.x/tags/2.0.1-RC1/modules/node-manager/src/main/java/org/apache/tuscany/sca/node/manager/DomainAssetManagerResource.java
deleted file mode 100644
index 8a1fab65b7..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/modules/node-manager/src/main/java/org/apache/tuscany/sca/node/manager/DomainAssetManagerResource.java
+++ /dev/null
@@ -1,39 +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.sca.node.manager;
-
-import java.util.List;
-
-import javax.ws.rs.DefaultValue;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-@Remotable
-@Path("")
-public interface DomainAssetManagerResource {    
-
-    @GET
-    @Path("{domainURI}/services/status")
-    List<Status> getServiceStatus(@PathParam("domainURI") @DefaultValue("default") String domainURI);
-
-}
diff --git a/sca-java-2.x/tags/2.0.1-RC1/modules/node-manager/src/main/java/org/apache/tuscany/sca/node/manager/DomainCompositeResource.java b/sca-java-2.x/tags/2.0.1-RC1/modules/node-manager/src/main/java/org/apache/tuscany/sca/node/manager/DomainCompositeResource.java
deleted file mode 100644
index f917ca3b99..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/modules/node-manager/src/main/java/org/apache/tuscany/sca/node/manager/DomainCompositeResource.java
+++ /dev/null
@@ -1,36 +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.sca.node.manager;
-
-import javax.ws.rs.DefaultValue;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-@Remotable
-@Path("")
-public interface DomainCompositeResource {
-
-    @GET
-    @Path("{domainURI}")
-    String getDomainComposite(@PathParam("domainURI") @DefaultValue("default") String domainURI);
-}
diff --git a/sca-java-2.x/tags/2.0.1-RC1/modules/node-manager/src/main/java/org/apache/tuscany/sca/node/manager/Manageable.java b/sca-java-2.x/tags/2.0.1-RC1/modules/node-manager/src/main/java/org/apache/tuscany/sca/node/manager/Manageable.java
deleted file mode 100644
index 139e87c5f5..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/modules/node-manager/src/main/java/org/apache/tuscany/sca/node/manager/Manageable.java
+++ /dev/null
@@ -1,31 +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.sca.node.manager;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-@Remotable
-public interface Manageable {
-
-    /**
-     * isAlive method that allow service to be managed
-     */
-    void isAlive();
-}
diff --git a/sca-java-2.x/tags/2.0.1-RC1/modules/node-manager/src/main/java/org/apache/tuscany/sca/node/manager/Status.java b/sca-java-2.x/tags/2.0.1-RC1/modules/node-manager/src/main/java/org/apache/tuscany/sca/node/manager/Status.java
deleted file mode 100644
index 75d25734d8..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/modules/node-manager/src/main/java/org/apache/tuscany/sca/node/manager/Status.java
+++ /dev/null
@@ -1,87 +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.sca.node.manager;
-
-public class Status {
-    public static String OK ="ok";
-    public static String WARNING = "warning";
-    public static String CRITICAL = "critical";
-    public static String UNAVAILABLE = "unavailable";
-    
-    private String name;
-    private String uri;
-    private String status;
-    private String statusMessage;
-    private long   execution;
-    
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getUri() {
-        return uri;
-    }
-
-    public void setUri(String uri) {
-        this.uri = uri;
-    }
-
-    public String getStatus() {
-        return status;
-    }
-
-    public void setStatus(String status) {
-        this.status = status;
-    }
-
-    public String getStatusMessage() {
-        return statusMessage;
-    }
-
-    public void setStatusMessage(String statusMessage) {
-        this.statusMessage = statusMessage;
-    }
-
-    public long getExecution() {
-        return execution;
-    }
-
-    public void setExecution(long execution) {
-        this.execution = execution;
-    }
-
-    @Override
-    public String toString() {
-        return "Status [name=" + name
-            + ", uri="
-            + uri
-            + ", status="
-            + status
-            + ", statusMessage="
-            + statusMessage
-            + ", execution="
-            + execution
-            + "]";
-    }
-}
diff --git a/sca-java-2.x/tags/2.0.1-RC1/modules/node-manager/src/main/java/org/apache/tuscany/sca/node/manager/impl/DomainAssetManagerResourceImpl.java b/sca-java-2.x/tags/2.0.1-RC1/modules/node-manager/src/main/java/org/apache/tuscany/sca/node/manager/impl/DomainAssetManagerResourceImpl.java
deleted file mode 100644
index 3935c75021..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/modules/node-manager/src/main/java/org/apache/tuscany/sca/node/manager/impl/DomainAssetManagerResourceImpl.java
+++ /dev/null
@@ -1,160 +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.sca.node.manager.impl;
-
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.TimeUnit;
-
-import javax.ws.rs.DefaultValue;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.WebApplicationException;
-
-import org.apache.tuscany.sca.assembly.Component;
-import org.apache.tuscany.sca.assembly.Composite;
-import org.apache.tuscany.sca.assembly.Service;
-import org.apache.tuscany.sca.interfacedef.Interface;
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.extensibility.NodeActivator;
-import org.apache.tuscany.sca.node.extensibility.NodeExtension;
-import org.apache.tuscany.sca.node.manager.DomainAssetManagerResource;
-import org.apache.tuscany.sca.node.manager.Manageable;
-import org.apache.tuscany.sca.node.manager.Status;
-import org.oasisopen.sca.annotation.Init;
-import org.oasisopen.sca.annotation.Property;
-import org.oasisopen.sca.annotation.Scope;
-
-@Scope("COMPOSITE")
-public class DomainAssetManagerResourceImpl implements NodeActivator, DomainAssetManagerResource {    
-    private static Map<String, NodeExtension> nodeMap = new ConcurrentHashMap<String,NodeExtension>();
-    
-    @Property
-    private int warningThreshold;
-    
-    @Property
-    private int criticalThreshold;
-    
-    @Property
-    private int unavailableThreshold;
-    
-    public void nodeStarted(Node node) {
-        NodeExtension nodeExtension = (NodeExtension) node;
-        nodeMap.put(nodeExtension.getDomainURI(), nodeExtension);     
-    }
-
-    public void nodeStopped(Node node) {
-        NodeExtension nodeExtension = (NodeExtension) node;
-        nodeMap.remove(nodeExtension.getDomainURI());
-    }
-    
-    @Init
-    public void init() {
-        System.out.println("Initializing Domain Asset Manager");
-        System.out.println("  - Warning threshold : " + warningThreshold + " ms" );
-        System.out.println("  - Critical threshold : " + criticalThreshold + " ms");
-        System.out.println("  - Unavailable threshold : " + unavailableThreshold + " ms");
-        
-    }
-
-    @Override
-    public List<Status> getServiceStatus(@PathParam("domainURI") @DefaultValue("default") String domainURI) {
-        if( ! nodeMap.containsKey(domainURI)) {
-            throw new WebApplicationException(404);
-        }
-
-        NodeExtension node = nodeMap.get(domainURI);
-        Composite domainComposite = node.getDomainComposite();
-
-        List<Status> statuses = new ArrayList<Status>();
-        for(Component component : domainComposite.getComponents()) {
-            for(Service service : component.getServices()) {
-                Interface interfaceContract = service.getInterfaceContract().getInterface();
-                if(Manageable.class.getName().equals(interfaceContract.toString())) {
-
-                    Status status = new Status();
-                    status.setName(component.getName());
-                    status.setUri(service.getBindings().get(0).getURI());
-                    
-                    try {
-                        String serviceName = component.getName() + "/" + service.getName();
-                        Manageable serviceInstance = node.getService(Manageable.class, serviceName);
-                        Timer t = new Timer();
-                        serviceInstance.isAlive();
-                        status.setExecution(t.elapsed(TimeUnit.MILLISECONDS));
-
-                        if(status.getExecution() < warningThreshold) {
-                            status.setStatus(Status.OK);
-                        }else if(status.getExecution() > warningThreshold) {
-                            status.setStatus(Status.WARNING);
-                        }else if(status.getExecution() > criticalThreshold) {
-                            status.setStatus(Status.CRITICAL);
-                        } else {
-                            status.setStatus(Status.UNAVAILABLE);
-                        }
-                    } catch (Exception e) {
-                        status.setStatus(Status.UNAVAILABLE);
-                        status.setStatusMessage(e.getMessage());
-                    }
-                    
-                    statuses.add(status);
-                }
-            }
-        }
-        
-        return statuses;
-    }
-    
-    class Timer {
-        Date time;
-        long t;
-
-        public Timer() {
-            reset();
-        }
-
-        public void reset() {
-            time = new Date();
-            t = System.nanoTime();
-        }
-
-        public Date time() {
-            return time; 
-        }
-        
-        public long elapsed(TimeUnit timeUnit) {
-            long elapsedTime = elapsed();
-            return timeUnit.convert(elapsedTime, TimeUnit.NANOSECONDS);
-        }
-
-        public void print(String s, TimeUnit timeUnit) {
-            long elapsedTime = elapsed();
-
-            System.out.println(s + ": " + timeUnit.convert(elapsedTime, TimeUnit.NANOSECONDS)  + "ms");
-        }
-        
-        private long elapsed() {
-            return System.nanoTime() - t;
-        }
-    }
-    
-}
diff --git a/sca-java-2.x/tags/2.0.1-RC1/modules/node-manager/src/main/java/org/apache/tuscany/sca/node/manager/impl/DomainCompositeResourceImpl.java b/sca-java-2.x/tags/2.0.1-RC1/modules/node-manager/src/main/java/org/apache/tuscany/sca/node/manager/impl/DomainCompositeResourceImpl.java
deleted file mode 100644
index 9cb91e2917..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/modules/node-manager/src/main/java/org/apache/tuscany/sca/node/manager/impl/DomainCompositeResourceImpl.java
+++ /dev/null
@@ -1,100 +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.sca.node.manager.impl;
-
-import java.io.ByteArrayOutputStream;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-
-import javax.ws.rs.WebApplicationException;
-import javax.xml.namespace.QName;
-import javax.xml.stream.XMLOutputFactory;
-
-import org.apache.tuscany.sca.assembly.Component;
-import org.apache.tuscany.sca.assembly.Composite;
-import org.apache.tuscany.sca.contribution.processor.ProcessorContext;
-import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessor;
-import org.apache.tuscany.sca.contribution.processor.StAXArtifactProcessorExtensionPoint;
-import org.apache.tuscany.sca.core.ExtensionPointRegistry;
-import org.apache.tuscany.sca.core.FactoryExtensionPoint;
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.extensibility.NodeActivator;
-import org.apache.tuscany.sca.node.extensibility.NodeExtension;
-import org.apache.tuscany.sca.node.manager.DomainCompositeResource;
-
-public class DomainCompositeResourceImpl implements NodeActivator, DomainCompositeResource {
-    private static Map<String, NodeExtension> nodeMap = new ConcurrentHashMap<String,NodeExtension>();
-
-    public void nodeStarted(Node node) {
-        NodeExtension nodeExtension = (NodeExtension) node;
-        nodeMap.put(nodeExtension.getDomainURI(), nodeExtension);
-    }
-
-    public void nodeStopped(Node node) {
-        NodeExtension nodeExtension = (NodeExtension) node;
-        nodeMap.remove(nodeExtension.getDomainURI());
-    }
-
-    public String getDomainComposite(String domainURI) {
-        if( ! nodeMap.containsKey(domainURI)) {
-            throw new WebApplicationException(404);
-        }
-
-        NodeExtension node = nodeMap.get(domainURI);
-        Composite composite = node.getDomainComposite();
-
-        //set name, as it's empty by default
-        composite.setName(new QName("", "Domain"));
-
-        ExtensionPointRegistry registry = node.getExtensionPointRegistry();
-        StAXArtifactProcessorExtensionPoint xmlProcessors =
-            registry.getExtensionPoint(StAXArtifactProcessorExtensionPoint.class);
-        StAXArtifactProcessor<Composite>  compositeProcessor =
-            xmlProcessors.getProcessor(Composite.class);
-
-        return writeComposite(composite, registry, compositeProcessor);
-    }
-
-
-    private String writeComposite(Composite composite, ExtensionPointRegistry registry, StAXArtifactProcessor<Composite> compositeProcessor){
-        ByteArrayOutputStream bos = new ByteArrayOutputStream();
-        XMLOutputFactory outputFactory =
-            registry.getExtensionPoint(FactoryExtensionPoint.class)
-                .getFactory(XMLOutputFactory.class);
-
-        try {
-            compositeProcessor.write(composite, outputFactory.createXMLStreamWriter(bos), new ProcessorContext(registry));
-        } catch(Exception ex) {
-            return ex.toString();
-        }
-
-        String result = bos.toString();
-
-        // write out and nested composites
-        for (Component component : composite.getComponents()) {
-            if (component.getImplementation() instanceof Composite) {
-                result += "\n<!-- XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX -->\n" +
-                           writeComposite((Composite)component.getImplementation(), registry,
-                                          compositeProcessor);
-            }
-        }
-        return result;
-    }
-}
diff --git a/sca-java-2.x/tags/2.0.1-RC1/modules/node-manager/src/main/resources/META-INF/services/org.apache.tuscany.sca.node.extensibility.NodeActivator b/sca-java-2.x/tags/2.0.1-RC1/modules/node-manager/src/main/resources/META-INF/services/org.apache.tuscany.sca.node.extensibility.NodeActivator
deleted file mode 100644
index 632f62d67c..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/modules/node-manager/src/main/resources/META-INF/services/org.apache.tuscany.sca.node.extensibility.NodeActivator
+++ /dev/null
@@ -1,19 +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.
-# Implementation class for the ModuleActivator
-org.apache.tuscany.sca.node.manager.impl.DomainCompositeResourceImpl;ranking=100
-org.apache.tuscany.sca.node.manager.impl.DomainAssetManagerResourceImpl;ranking=101
diff --git a/sca-java-2.x/tags/2.0.1-RC1/modules/node-manager/src/test/java/org/apache/tuscany/sca/node/manager/DomainAssetManagerResourceTestCase.java b/sca-java-2.x/tags/2.0.1-RC1/modules/node-manager/src/test/java/org/apache/tuscany/sca/node/manager/DomainAssetManagerResourceTestCase.java
deleted file mode 100644
index cc288ea29a..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/modules/node-manager/src/test/java/org/apache/tuscany/sca/node/manager/DomainAssetManagerResourceTestCase.java
+++ /dev/null
@@ -1,74 +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.sca.node.manager;
-
-import org.apache.tuscany.sca.node.Contribution;
-import org.apache.tuscany.sca.node.ContributionLocationHelper;
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.NodeFactory;
-import org.junit.AfterClass;
-import org.junit.Assert;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-import com.meterware.httpunit.GetMethodWebRequest;
-import com.meterware.httpunit.WebConversation;
-import com.meterware.httpunit.WebRequest;
-import com.meterware.httpunit.WebResponse;
-
-public class DomainAssetManagerResourceTestCase {
-    private static String SERVICE_URL;
-    private static Node node;
-    
-
-    @BeforeClass
-    public static void init() throws Exception {
-        try {
-            String contribution = ContributionLocationHelper.getContributionLocation(DomainCompositeResourceTestCase.class);
-            node = NodeFactory.newInstance().createNode("node-asset-manager-test.composite", new Contribution("node-manager", contribution));
-            node.start();
-            
-            SERVICE_URL = node.getEndpointAddress("NodeAssetManagerComponent");
-            
-            System.out.println(">>" + SERVICE_URL);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-
-    @AfterClass
-    public static void destroy() throws Exception {
-        if (node != null) {
-            node.stop();
-        }
-    }
-    
-    
-    @Test
-    public void testServiceManagement() throws Exception {
-        WebConversation wc = new WebConversation();
-        WebRequest request = new GetMethodWebRequest(SERVICE_URL + "default/services/status");
-        request.setHeaderField("Accept","application/json");
-        WebResponse response = wc.getResource(request);
-
-        Assert.assertEquals(200, response.getResponseCode());
-        System.out.println(">>>" + response.getText());
-    }
-}
diff --git a/sca-java-2.x/tags/2.0.1-RC1/modules/node-manager/src/test/java/org/apache/tuscany/sca/node/manager/DomainCompositeResourceTestCase.java b/sca-java-2.x/tags/2.0.1-RC1/modules/node-manager/src/test/java/org/apache/tuscany/sca/node/manager/DomainCompositeResourceTestCase.java
deleted file mode 100644
index da50dca604..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/modules/node-manager/src/test/java/org/apache/tuscany/sca/node/manager/DomainCompositeResourceTestCase.java
+++ /dev/null
@@ -1,80 +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.sca.node.manager;
-
-import java.net.Socket;
-
-import org.apache.tuscany.sca.node.Contribution;
-import org.apache.tuscany.sca.node.ContributionLocationHelper;
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.NodeFactory;
-import org.junit.AfterClass;
-import org.junit.Assert;
-import org.junit.BeforeClass;
-import org.junit.Ignore;
-import org.junit.Test;
-
-import com.meterware.httpunit.GetMethodWebRequest;
-import com.meterware.httpunit.WebConversation;
-import com.meterware.httpunit.WebRequest;
-import com.meterware.httpunit.WebResponse;
-
-@Ignore
-public class DomainCompositeResourceTestCase {
-    private static final String SERVICE_URL = "http://localhost:8080/domain";
-
-    private static Node node;
-
-    @BeforeClass
-    public static void init() throws Exception {
-        try {
-            String contribution = ContributionLocationHelper.getContributionLocation(DomainCompositeResourceTestCase.class);
-            node = NodeFactory.newInstance().createNode("node-manager-test.composite", new Contribution("node-manager", contribution));
-            node.start();
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-
-    @AfterClass
-    public static void destroy() throws Exception {
-        if (node != null) {
-            node.stop();
-        }
-    }
-
-    @Test
-    public void testPing() throws Exception {
-        new Socket("127.0.0.1", 8080);
-        //System.in.read();
-    }
-
-    @Test
-    public void testDefaultDomainCompositeResource() throws Exception {
-        String url = SERVICE_URL + "/default";
-        WebConversation wc = new WebConversation();
-        WebRequest request = new GetMethodWebRequest(url);
-        WebResponse response = wc.getResource(request);
-
-        Assert.assertEquals(200, response.getResponseCode());
-        System.out.println(">>>" + response.getText());
-    }
-
-}
diff --git a/sca-java-2.x/tags/2.0.1-RC1/modules/node-manager/src/test/java/services/MyResource.java b/sca-java-2.x/tags/2.0.1-RC1/modules/node-manager/src/test/java/services/MyResource.java
deleted file mode 100644
index 74042d2561..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/modules/node-manager/src/test/java/services/MyResource.java
+++ /dev/null
@@ -1,31 +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 services;
-
-import javax.ws.rs.GET;
-import javax.ws.rs.core.Response;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-@Remotable
-public interface MyResource {
-    @GET
-    Response getSomething();
-}
diff --git a/sca-java-2.x/tags/2.0.1-RC1/modules/node-manager/src/test/java/services/MyService.java b/sca-java-2.x/tags/2.0.1-RC1/modules/node-manager/src/test/java/services/MyService.java
deleted file mode 100644
index 4a1b34eead..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/modules/node-manager/src/test/java/services/MyService.java
+++ /dev/null
@@ -1,28 +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 services;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-@Remotable
-public interface MyService {
-    
-    void doSomething();
-}
diff --git a/sca-java-2.x/tags/2.0.1-RC1/modules/node-manager/src/test/java/services/impl/MyLongRunningResourceImpl.java b/sca-java-2.x/tags/2.0.1-RC1/modules/node-manager/src/test/java/services/impl/MyLongRunningResourceImpl.java
deleted file mode 100644
index 59e72f9fd5..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/modules/node-manager/src/test/java/services/impl/MyLongRunningResourceImpl.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 services.impl;
-
-import javax.ws.rs.core.Response;
-
-import org.apache.tuscany.sca.node.manager.Manageable;
-
-import services.MyResource;
-
-public class MyLongRunningResourceImpl implements MyResource, Manageable {
-
-    @Override
-    public void isAlive() {
-        System.out.println(">>> long running ping");
-        try {
-            Thread.sleep(100);
-        } catch (InterruptedException e) {
-            e.printStackTrace();
-        }
-    }
-    
-
-    @Override
-    public Response getSomething() {
-        System.out.println(">>> getSomething");
-        return Response.ok("something").build();
-    }
-
-
-}
diff --git a/sca-java-2.x/tags/2.0.1-RC1/modules/node-manager/src/test/java/services/impl/MyOtherResourceImpl.java b/sca-java-2.x/tags/2.0.1-RC1/modules/node-manager/src/test/java/services/impl/MyOtherResourceImpl.java
deleted file mode 100644
index 421c8d92ec..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/modules/node-manager/src/test/java/services/impl/MyOtherResourceImpl.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 services.impl;
-
-import org.apache.tuscany.sca.node.manager.Manageable;
-
-public class MyOtherResourceImpl implements Manageable {
-
-    @Override
-    public void isAlive() {
-        System.out.println(">>> isAlive");
-    }
-}
diff --git a/sca-java-2.x/tags/2.0.1-RC1/modules/node-manager/src/test/java/services/impl/MyResourceImpl.java b/sca-java-2.x/tags/2.0.1-RC1/modules/node-manager/src/test/java/services/impl/MyResourceImpl.java
deleted file mode 100644
index 692f4ddb50..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/modules/node-manager/src/test/java/services/impl/MyResourceImpl.java
+++ /dev/null
@@ -1,41 +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 services.impl;
-
-import javax.ws.rs.core.Response;
-
-import services.MyResource;
-import org.apache.tuscany.sca.node.manager.Manageable;
-
-public class MyResourceImpl implements MyResource, Manageable {
-    
-    @Override
-    public Response getSomething() {
-        System.out.println(">>> getSomething");
-        return Response.ok("something").build();
-    }
-
-
-    @Override
-    public void isAlive() {
-        System.out.println(">>> isAlive");
-    }
-
-}
diff --git a/sca-java-2.x/tags/2.0.1-RC1/modules/node-manager/src/test/java/services/impl/MyServiceImpl.java b/sca-java-2.x/tags/2.0.1-RC1/modules/node-manager/src/test/java/services/impl/MyServiceImpl.java
deleted file mode 100644
index 0bf675549f..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/modules/node-manager/src/test/java/services/impl/MyServiceImpl.java
+++ /dev/null
@@ -1,37 +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 services.impl;
-
-import services.MyService;
-import org.apache.tuscany.sca.node.manager.Manageable;
-
-public class MyServiceImpl implements MyService, Manageable {
-
- 
-    @Override
-    public void isAlive() {
-        System.out.println(">>> isAlive");
-    }
-
-    @Override
-    public void doSomething() {
-        System.out.println(">>> doSomething");
-    }
-}
diff --git a/sca-java-2.x/tags/2.0.1-RC1/modules/node-manager/src/test/resources/node-asset-manager-test.composite b/sca-java-2.x/tags/2.0.1-RC1/modules/node-manager/src/test/resources/node-asset-manager-test.composite
deleted file mode 100644
index 69bc8bd0da..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/modules/node-manager/src/test/resources/node-asset-manager-test.composite
+++ /dev/null
@@ -1,51 +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://docs.oasis-open.org/ns/opencsa/sca/200912"
-		xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1"
-		targetNamespace="http://node-manager"
-		name="NodeAssetManager">
-
-	<component name="NodeAssetManagerComponent">
-		<implementation.java class="org.apache.tuscany.sca.node.manager.impl.DomainAssetManagerResourceImpl"/>
-		<service name="DomainAssetManagerResource">
-			<tuscany:binding.rest uri="/services/manager" />
-   		</service>
-   		<property name="warningThreshold">100</property>         <!-- 1s  -->
-   		<property name="criticalThreshold">30000</property>      <!-- 30s -->
-   		<property name="unavailableThreshold">60000</property>   <!-- 1m  -->
-	</component>
-	
-	<component name="Resource">
-		<implementation.java class="services.impl.MyResourceImpl"/>
-	</component>
-
-	<component name="LongRunningResource">
-		<implementation.java class="services.impl.MyLongRunningResourceImpl"/>
-	</component>
-
-	<component name="OtherResource">
-		<implementation.java class="services.impl.MyOtherResourceImpl"/>
-	</component>
-
-	
-	<component name="Service">
-		<implementation.java class="services.impl.MyServiceImpl"/>
-	</component>	
-</composite>
diff --git a/sca-java-2.x/tags/2.0.1-RC1/modules/node-manager/src/test/resources/node-manager-test.composite b/sca-java-2.x/tags/2.0.1-RC1/modules/node-manager/src/test/resources/node-manager-test.composite
deleted file mode 100644
index 6f107a392d..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/modules/node-manager/src/test/resources/node-manager-test.composite
+++ /dev/null
@@ -1,40 +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://docs.oasis-open.org/ns/opencsa/sca/200912"
-		xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1"
-		targetNamespace="http://node-manager"
-		name="NodeManager">
-
-	<component name="NodeManagerUI">
-		<tuscany:implementation.widget location="ui/index.html" />
-		<service name="Widget">
-			<tuscany:binding.rest uri="/manager/ui" />
-		</service>
-	</component>
-
-	<component name="NodeManagerComponent">
-		<implementation.java class="org.apache.tuscany.sca.node.manager.impl.DomainCompositeResourceImpl"/>
-		<service name="DomainCompositeResource">
-			<tuscany:binding.rest uri="/domain">
-			    <tuscany:operationSelector.jaxrs />
-    		</tuscany:binding.rest>
-   		</service>
-	</component>
-</composite>
diff --git a/sca-java-2.x/tags/2.0.1-RC1/modules/node-manager/src/test/resources/ui/component.gif b/sca-java-2.x/tags/2.0.1-RC1/modules/node-manager/src/test/resources/ui/component.gif
deleted file mode 100644
index 46b8963f4c..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/modules/node-manager/src/test/resources/ui/component.gif
+++ /dev/null
diff --git a/sca-java-2.x/tags/2.0.1-RC1/modules/node-manager/src/test/resources/ui/composite.gif b/sca-java-2.x/tags/2.0.1-RC1/modules/node-manager/src/test/resources/ui/composite.gif
deleted file mode 100644
index 6749240e15..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/modules/node-manager/src/test/resources/ui/composite.gif
+++ /dev/null
diff --git a/sca-java-2.x/tags/2.0.1-RC1/modules/node-manager/src/test/resources/ui/index.html b/sca-java-2.x/tags/2.0.1-RC1/modules/node-manager/src/test/resources/ui/index.html
deleted file mode 100644
index 4405422c53..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/modules/node-manager/src/test/resources/ui/index.html
+++ /dev/null
@@ -1,268 +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.    
--->
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>Tuscany SCA Domain Components</title>
-
-<script type="text/javascript" src="/dojo/dojo.js"></script>
-
-<style type="text/css">
-body,html {
-	font-family: helvetica, arial, sans-serif;
-	font-size: 90%;
-}
-
-.componentIcon {
-	margin-left: 16px;
-	width: 16px;
-	height: 16px;
-	background: url('component.gif') no-repeat;
-}
-
-.serviceIcon {
-	margin-left: 16px;
-	width: 16px;
-	height: 16px;
-	background: url('service.gif') no-repeat;
-}
-
-.referenceIcon {
-	margin-left: 16px;
-	width: 16px;
-	height: 16px;
-	background: url('reference.gif') no-repeat;
-}
-</style>
-
-</head>
-
-<body>
-	<div id="header" style="border-bottom: solid 1px silver; overflow: hidden;">
-		<img src="http://tuscany.apache.org/images/TuscanyLogo.jpg" style="float:right;"/>
-		<h1>Tuscany SCA Domain</h1>
-	</div> <!-- end header div -->
-
-    <div id="container" style="border:1px solid silver">
-		<div id="navigation" style="position:absolute; float:left; width:30%; height:80%; padding:10px; border:1px solid silver">
-			<div id="treeDomain" /> </div>
-		</div> <!-- end navigation div -->
-			
-		<div id="images" style="position:absolute; float:left; width:60%; height:80%; left:35%; padding:10px; border:1px solid silver">
-
-			<table style="margin-left:auto; margin-right:auto;" border="0" cellspacing="0" cellpadding="1">
-			   <tr>
-			      <td><a href="javascript:updatePage(-1)">prev</a></td>
-				  <td><a href="javascript:updatePage(1)">next</a></td>
-			   </tr>
-			   <tr>
-			      <td colspan="4">
-					  <table id="tableImageThumb" style="margin-left:auto; margin-right:auto;" border="0" cellspacing="0" cellpadding="1"></table>
-				  
-			      </td>
-			   </tr>
-			</table>
-		</div> <!-- end images div -->
-			
-	</div> <!-- end container div -->
-		
-</body>
-
-<script type="text/javascript">
-    dojo.require("dojo.data.ItemFileWriteStore");
-    dojo.require("dijit.Tree");
-    dojo.require("dojox.xml.parser");
-    dojo.require("tuscany.RestService");
-    //dojo.require("tuscany.Composite");
-
-    var restClient;
-    
-	var store;
-	var treeModel;
-	var treeControl;
-
-    var composite;
-
-
-	function prepare() {
-        store = new dojo.data.ItemFileWriteStore({
-            data: {
-                identifier: 'id',
-                label: 'label',
-                type: 'type',
-                items: [ ]
-            }
-        });
-        treeModel = new dijit.tree.ForestStoreModel({
-            store: store
-        });
-        
-        treeControl = new dijit.Tree({
-            model: treeModel,
-            showRoot: false,
-            getIconClass: function(/*dojo.data.Item*/ item, /*Boolean*/ opened) {
-            	console.log("##" + item.type);
-            	if(item.type != undefined) {
-            		if(item.type == 'component') {
-            			return "componentIcon";
-            		} else if(item.type == 'service' || item.type == 'service-binding') {
-            			return "serviceIcon";
-            		} else if(item.type == 'reference' || item.type == 'reference-binding') {
-            			return "referenceIcon";
-            		} 
-            	}
-            	return "serviceIcon";
-            },
-			onClick: showArtifactDocumentation,
-            _createTreeNode: function(/*Object*/ args) {
-                var tnode = new dijit._TreeNode(args);
-                tnode.labelNode.innerHTML = args.label;
-                return tnode;
-            }
-        },"treeDomain");
-
-        restClient = new tuscany.RestService("/domain","text/plain");
-        
-		showDomainArtifacts();			
-    }
-
-    
-    function composite_getResponse(xmlResponse, exception) {
-    	if(exception){
-			alert(exception.message);
-			return;
-		}
-    	
-    	var componentNode = xmlResponse.getElementsByTagName ("component");
-    	//loop trough all components
-        for (c = 0; c < componentNode.length; c++) {
-        	var componentAttributes = componentNode[c].attributes;
-       	 	var componentItem = store.newItem({id:componentAttributes['uri'].value, label:componentAttributes['name'].value, type:'component'});
-       	 	
-       	 	//loop trough all services
-       	    var serviceNode = componentNode[c].getElementsByTagName ("service");
-       	 	for(s = 0; s < serviceNode.length; s++) {
-            	var serviceAttributes = serviceNode[s].attributes;
-            	var serviceId = componentAttributes['uri'].value + "/" + serviceAttributes['name'].value;
-            	
-            	var parentInfo={
-    					parent: componentItem,
-    					attribute: "children"
-    				};
-            	
-           	 	var serviceItem = store.newItem({id:serviceId, label:serviceAttributes['name'].value, type:'service'}, parentInfo);
-           	 	
-           	 	//loop trough children to find bindings
-           	 	for(b=0; b < serviceNode[s].childNodes.length; b ++) {
-           	 		var childNode = serviceNode[s].childNodes[b];
-           	 		if(childNode.nodeName.indexOf('binding') == 0) {
-           	 			var bindingId = serviceId + "/" + childNode.nodeName;
-           	 			
-           	 			var parentInfo={
-    						parent: serviceItem,
-    						attribute: "children"
-    					};
-           	 			
-           	 			var bindingItem = store.newItem({id:bindingId, label:childNode.nodeName, type:'service-binding'}, parentInfo);
-           	 		}
-    	 		}
-       	 	}
-
-       	 	
-       	 	//loop trough all references
-       	    var referenceNode = componentNode[c].getElementsByTagName ("reference");
-       	 	for(r = 0; r < referenceNode.length; r++) {
-            	var referenceAttributes = referenceNode[r].attributes;
-            	var referenceId = componentAttributes['uri'].value + "/" + referenceAttributes['name'].value;
-            	
-            	var parentInfo={
-    					parent: componentItem,
-    					attribute: "children"
-    				};
-            	
-           	 	var referenceItem = store.newItem({id:serviceId, label:referenceAttributes['name'].value, type:'reference'}, parentInfo);
-           	 	
-           	 	//loop trough children to find bindings
-           	 	for(b=0; b < referenceNode[s].childNodes.length; b ++) {
-           	 		var childNode = referenceNode[s].childNodes[b];
-           	 		if(childNode.nodeName.indexOf('binding') == 0) {
-           	 			var bindingId = serviceId + "/" + childNode.nodeName;
-           	 			
-           	 			var parentInfo={
-    						parent: serviceItem,
-    						attribute: "children"
-    					};
-           	 			
-           	 			var bindingItem = store.newItem({id:bindingId, label:childNode.nodeName, type:'reference-binding'}, parentInfo);
-           	 		}
-    	 		}
-
-       	 		
-       	 	}
-       	 	
-        }
-    	
-    	//var composite = new tuscany.Composite(xmlResponse);
-    	
-
-    	/*
-    	 var itemTags = xmlResponse.getElementsByTagName ("component");
-         for (i = 0; i < itemTags.length; i++) {
-        	 var attributes = itemTags[i].attributes;
-        	 alert(attributes[0].name);
-             var recordNode = itemTags[i].getElementsByTagName ("name")[0];
-             if (recordNode.textContent != undefined) {
-                 alert(recordNode.textContent);
-             }
-             else {
-                 alert(recordNode.text);
-             }
-         }
-         */
-
-         compositeXML = dojox.xml.parser.innerXML(xmlResponse);
-
-
-    	//alert(compositeXML);
-
-    }
-
-    function showDomainArtifacts() {
-    	restClient.get("default").addCallback(composite_getResponse);
-    }
-    
-    function showArtifactDocumentation(/*dojo.data.Item*/ item) {
-    	alert('showing documentation for' + item.id);
-    }
-    
-    function guidGenerator() {
-        var S4 = function() {
-           return (((1+Math.random())*0x10000)|0).toString(16).substring(1);
-        };
-        return (S4()+S4()+"-"+S4()+"-"+S4()+"-"+S4()+"-"+S4()+S4()+S4());
-    }
-
-    
-    dojo.addOnLoad(prepare);
-</script>
-
-</body>
-
-</html>
diff --git a/sca-java-2.x/tags/2.0.1-RC1/modules/node-manager/src/test/resources/ui/interface.gif b/sca-java-2.x/tags/2.0.1-RC1/modules/node-manager/src/test/resources/ui/interface.gif
deleted file mode 100644
index 1d11c37913..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/modules/node-manager/src/test/resources/ui/interface.gif
+++ /dev/null
diff --git a/sca-java-2.x/tags/2.0.1-RC1/modules/node-manager/src/test/resources/ui/property.gif b/sca-java-2.x/tags/2.0.1-RC1/modules/node-manager/src/test/resources/ui/property.gif
deleted file mode 100644
index 354ad64645..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/modules/node-manager/src/test/resources/ui/property.gif
+++ /dev/null
diff --git a/sca-java-2.x/tags/2.0.1-RC1/modules/node-manager/src/test/resources/ui/reference.gif b/sca-java-2.x/tags/2.0.1-RC1/modules/node-manager/src/test/resources/ui/reference.gif
deleted file mode 100644
index b3e2c80188..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/modules/node-manager/src/test/resources/ui/reference.gif
+++ /dev/null
diff --git a/sca-java-2.x/tags/2.0.1-RC1/modules/node-manager/src/test/resources/ui/service.gif b/sca-java-2.x/tags/2.0.1-RC1/modules/node-manager/src/test/resources/ui/service.gif
deleted file mode 100644
index 9b986e3788..0000000000
--- a/sca-java-2.x/tags/2.0.1-RC1/modules/node-manager/src/test/resources/ui/service.gif
+++ /dev/null