Moving 2.x branches

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

12 files changed, 0 insertions, 1778 deletions

diff --git a/branches/sca-java-2.0-M2/modules/node-launcher/LICENSE b/branches/sca-java-2.0-M2/modules/node-launcher/LICENSE
deleted file mode 100644
index 6e529a25c4..0000000000
--- a/branches/sca-java-2.0-M2/modules/node-launcher/LICENSE
+++ /dev/null
@@ -1,205 +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.

-

-

-

diff --git a/branches/sca-java-2.0-M2/modules/node-launcher/META-INF/MANIFEST.MF b/branches/sca-java-2.0-M2/modules/node-launcher/META-INF/MANIFEST.MF
deleted file mode 100644
index 19e42299b4..0000000000
--- a/branches/sca-java-2.0-M2/modules/node-launcher/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,17 +0,0 @@
-Manifest-Version: 1.0

-Export-Package: org.apache.tuscany.sca.node.launcher;uses:="javax.serv

- let";version="2.0.0"

-Tool: Bnd-0.0.255

-Bundle-Name: Apache Tuscany SCA Node Launcher

-Created-By: 1.6.0_07 (Sun Microsystems Inc.)

-Bundle-Vendor: The Apache Software Foundation

-Bundle-Version: 2.0.0

-Bnd-LastModified: 1225397407125

-Bundle-ManifestVersion: 2

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

-Bundle-Description: Apache Tuscany SCA Node Launcher

-Import-Package: javax.servlet,org.apache.tuscany.sca.node.launcher;ver

- sion="2.0.0",org.apache.commons.cli;resolution:=optional

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

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

-

diff --git a/branches/sca-java-2.0-M2/modules/node-launcher/NOTICE b/branches/sca-java-2.0-M2/modules/node-launcher/NOTICE
deleted file mode 100644
index 51042eab05..0000000000
--- a/branches/sca-java-2.0-M2/modules/node-launcher/NOTICE
+++ /dev/null
@@ -1,6 +0,0 @@
-${pom.name}

-Copyright (c) 2005 - 2009 The Apache Software Foundation

-

-This product includes software developed by

-The Apache Software Foundation (http://www.apache.org/).

-

diff --git a/branches/sca-java-2.0-M2/modules/node-launcher/pom.xml b/branches/sca-java-2.0-M2/modules/node-launcher/pom.xml
deleted file mode 100644
index 311967d2c7..0000000000
--- a/branches/sca-java-2.0-M2/modules/node-launcher/pom.xml
+++ /dev/null
@@ -1,64 +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-M2-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>tuscany-node-launcher</artifactId>
-    <name>Apache Tuscany SCA Node Launcher</name>
-
-    <dependencies>   
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
-            <version>2.5</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>commons-cli</groupId>
-            <artifactId>commons-cli</artifactId>
-            <version>1.1</version>
-        </dependency>
-           
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <configuration>
-                    <archive>
-                        <manifest>
-                            <mainClass>org.apache.tuscany.sca.node.launcher.NodeMain</mainClass>
-                        </manifest>
-                    </archive>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
diff --git a/branches/sca-java-2.0-M2/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/Contribution.java b/branches/sca-java-2.0-M2/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/Contribution.java
deleted file mode 100644
index 4f4f861e2f..0000000000
--- a/branches/sca-java-2.0-M2/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/Contribution.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.sca.node.launcher;
-
-/**
- * Represents an SCA contribution uri + location.
- *
- * @version $Rev$ $Date$
- */
-public final class Contribution {
-    private String uri;
-    private String location;
-    
-    /**
-     * Constructs a new SCA contribution.
-     * 
-     * @param uri
-     * @param location
-     */
-    public Contribution(String uri, String location) {
-        this.uri = uri;
-        this.location = location;
-    }
-    
-    public String getURI() {
-        return uri;
-    }
-    
-    public String getLocation() {
-        return location;
-    }
-}
\ No newline at end of file
diff --git a/branches/sca-java-2.0-M2/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/DomainManagerLauncher.java b/branches/sca-java-2.0-M2/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/DomainManagerLauncher.java
deleted file mode 100644
index ba795216a9..0000000000
--- a/branches/sca-java-2.0-M2/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/DomainManagerLauncher.java
+++ /dev/null
@@ -1,180 +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.launcher;
-
-import static org.apache.tuscany.sca.node.launcher.NodeLauncherUtil.domainManager;
-
-import java.io.IOException;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-/**
- * Simple launcher for the SCA domain manager. 
- *
- * @version $Rev$ $Date$
- */
-public class DomainManagerLauncher {
-    
-    static final Logger logger = Logger.getLogger(DomainManagerLauncher.class.getName());    
-
-    /**
-     * Constructs a new DomainManagerLauncher.
-     */
-    private DomainManagerLauncher() {
-    }
-    
-    /**
-     * Returns a new launcher instance.
-     *  
-     * @return a new launcher instance
-     */
-    public static DomainManagerLauncher newInstance() {
-        return new DomainManagerLauncher();
-    }
-
-    /**
-     * Creates a new DomainManager.
-     * 
-     * @return a new DomainManager
-     * @throws LauncherException
-     */
-    public <T> T createDomainManager() throws LauncherException {
-        return (T)domainManager(".");
-    }
-    
-    /**
-     * Creates a new DomainManager.
-     * 
-     * @param rootDirectory the domain's root configuration directory 
-     * 
-     * @return a new DomainManager
-     * @throws LauncherException
-     */
-    public <T> T createDomainManager(String rootDirectory) throws LauncherException {
-        return (T)domainManager(rootDirectory);
-    }
-    
-    public static void main(String[] args) throws Exception {
-        logger.info("Apache Tuscany SCA Domain Manager is starting...");
-
-        // Create a launcher
-        DomainManagerLauncher launcher = newInstance();
-        
-        Object domainManager = null;
-        ShutdownThread shutdown = null;
-        try {
-            while (true) {
-                
-                // Start the domain manager
-                domainManager = launcher.createDomainManager();
-                try {
-                    domainManager.getClass().getMethod("start").invoke(domainManager);
-                } catch (Exception e) {
-                    logger.log(Level.SEVERE, "SCA Domain Manager could not be started", e);
-                    throw e;
-                }
-                logger.info("SCA Domain Manager is now started.");
-                
-                // Install a shutdown hook
-                shutdown = new ShutdownThread(domainManager);
-                Runtime.getRuntime().addShutdownHook(shutdown);
-                
-                logger.info("Press 'q' to quit, 'r' to restart.");
-                int k = 0;
-                try {
-                    while ((k != 'q') && (k != 'r')) {
-                        k = System.in.read();
-                    }
-                } catch (IOException e) {
-                    
-                    // Wait forever
-                    Object lock = new Object();
-                    synchronized(lock) {
-                        lock.wait();
-                    }
-                }
-
-                // Stop the domain manager
-                if (domainManager != null) {
-                    Object dm = domainManager;
-                    domainManager = null;
-                    stopDomainManager(dm);
-                }
-                
-                // Quit
-                if (k == 'q' ) {
-                    break;
-                }
-            }
-        } catch (Exception e) {
-            // Stop the domain manager
-            if (domainManager != null) {
-                try {
-                    Object dm = domainManager;
-                    domainManager = null;
-                    stopDomainManager(dm);
-                } catch (Exception e2) {
-                }
-            }
-            throw e;
-            
-        } finally {
-            
-            // Remove the shutdown hook
-            if (shutdown != null) {
-                Runtime.getRuntime().removeShutdownHook(shutdown);
-            }
-        }
-    }
-
-    /**
-     * Stop the given domain manager.
-     * 
-     * @param domainManager
-     * @throws Exception
-     */
-    private static void stopDomainManager(Object domainManager) throws Exception {
-        try {
-            domainManager.getClass().getMethod("stop").invoke(domainManager);
-            logger.info("SCA Domain Manager is now stopped.");
-        } catch (Exception e) {
-            logger.log(Level.SEVERE, "SCA Domain Manager could not be stopped", e);
-            throw e;
-        }
-    }
-    
-    private static class ShutdownThread extends Thread {
-        private Object domainManager;
-
-        public ShutdownThread(Object domainManager) {
-            super();
-            this.domainManager = domainManager;
-        }
-
-        @Override
-        public void run() {
-            try {
-                stopDomainManager(domainManager);
-            } catch (Exception e) {
-                // Ignore
-            }
-        }
-    }
-}
diff --git a/branches/sca-java-2.0-M2/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/LauncherException.java b/branches/sca-java-2.0-M2/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/LauncherException.java
deleted file mode 100644
index 39e8d81139..0000000000
--- a/branches/sca-java-2.0-M2/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/LauncherException.java
+++ /dev/null
@@ -1,55 +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.launcher;
-
-
-/**
- * Denotes an error launching an SCA domain manager or node.
- *
- * @version $Rev$ $Date$
- */
-public class LauncherException extends Exception {
-    private static final long serialVersionUID = 4581189418849190567L;
-
-    public LauncherException() {
-        super();
-    }
-
-    /**
-     * @param message
-     * @param cause
-     */
-    public LauncherException(String message, Throwable cause) {
-        super(message, cause);
-    }
-
-    /**
-     * @param message
-     */
-    public LauncherException(String message) {
-        super(message);
-    }
-
-    /**
-     * @param cause
-     */
-    public LauncherException(Throwable cause) {
-        super(cause);
-    }
-}
diff --git a/branches/sca-java-2.0-M2/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeDaemonLauncher.java b/branches/sca-java-2.0-M2/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeDaemonLauncher.java
deleted file mode 100644
index 56be9f9921..0000000000
--- a/branches/sca-java-2.0-M2/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeDaemonLauncher.java
+++ /dev/null
@@ -1,169 +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.launcher;
-
-import static org.apache.tuscany.sca.node.launcher.NodeLauncherUtil.nodeDaemon;
-
-import java.io.IOException;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-/**
- * A launcher for the SCA Node daemon.
- *  
- * @version $Rev$ $Date$
- */
-public class NodeDaemonLauncher {
-
-    static final Logger logger = Logger.getLogger(NodeDaemonLauncher.class.getName());
-    
-    /**
-     * Constructs a new node daemon launcher.
-     */
-    private NodeDaemonLauncher() {
-    }
-    
-    /**
-     * Returns a new launcher instance.
-     *  
-     * @return a new launcher instance
-     */
-    public static NodeDaemonLauncher newInstance() {
-        return new NodeDaemonLauncher();
-    }
-
-    /**
-     * Creates a new node daemon.
-     * 
-     * @param
-     * @return a new node daemon
-     * @throws LauncherException
-     */
-    public <T> T createNodeDaemon() throws LauncherException {
-        return (T)nodeDaemon();
-    }
-    
-    public static void main(String[] args) throws Exception {
-        logger.info("Apache Tuscany SCA Node Daemon is starting...");
-
-        // Create a node launcher
-        NodeDaemonLauncher launcher = newInstance();
-
-        Object node = null;
-        ShutdownThread shutdown = null;
-        try {
-            while (true) {
-                
-                // Start the node
-                node = launcher.createNodeDaemon();
-                try {
-                    node.getClass().getMethod("start").invoke(node);
-                } catch (Exception e) {
-                    logger.log(Level.SEVERE, "SCA Node Daemon could not be started", e);
-                    throw e;
-                }
-                logger.info("SCA Node Daemon is now started.");
-                
-                // Install a shutdown hook
-                shutdown = new ShutdownThread(node);
-                Runtime.getRuntime().addShutdownHook(shutdown);
-                
-                logger.info("Press 'q' to quit, 'r' to restart.");
-                int k = 0;
-                try {
-                    while ((k != 'q') && (k != 'r')) {
-                        k = System.in.read();
-                    }
-                } catch (IOException e) {
-                    
-                    // Wait forever
-                    Object lock = new Object();
-                    synchronized(lock) {
-                        lock.wait();
-                    }
-                }
-
-                // Stop the node
-                if (node != null) {
-                    Object n = node;
-                    node = null;
-                    stopNode(n);
-                }
-                
-                // Quit
-                if (k == 'q' ) {
-                    break;
-                }
-            } 
-        } catch (Exception e) {
-            // Stop the node
-            if (node != null) {
-                try {
-                    Object n = node;
-                    node = null;
-                    stopNode(n);
-                } catch (Exception e2) {
-                }
-            }
-            throw e;
-            
-        } finally {
-
-            // Remove the shutdown hook
-            if (shutdown != null) {
-                Runtime.getRuntime().removeShutdownHook(shutdown);
-            }
-        }
-    }
-    
-    /**
-     * Stop the given node.
-     * 
-     * @param node
-     * @throws Exception
-     */
-    private static void stopNode(Object node) throws Exception {
-        try {
-            node.getClass().getMethod("stop").invoke(node);
-            logger.info("SCA Node Daemon is now stopped.");
-        } catch (Exception e) {
-            logger.log(Level.SEVERE, "SCA Node Daemon could not be stopped", e);
-            throw e;
-        }
-    }
-    
-    private static class ShutdownThread extends Thread {
-        private Object node;
-
-        public ShutdownThread(Object node) {
-            super();
-            this.node = node;
-        }
-
-        @Override
-        public void run() {
-            try {
-                stopNode(node);
-            } catch (Exception e) {
-                // Ignore
-            }
-        }
-    }
-}
diff --git a/branches/sca-java-2.0-M2/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeLauncher.java b/branches/sca-java-2.0-M2/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeLauncher.java
deleted file mode 100644
index d8df30377b..0000000000
--- a/branches/sca-java-2.0-M2/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeLauncher.java
+++ /dev/null
@@ -1,303 +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.launcher;
-
-import static org.apache.tuscany.sca.node.launcher.NodeLauncherUtil.node;
-
-import java.io.File;
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.List;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import org.apache.commons.cli.CommandLine;
-import org.apache.commons.cli.CommandLineParser;
-import org.apache.commons.cli.HelpFormatter;
-import org.apache.commons.cli.Option;
-import org.apache.commons.cli.Options;
-import org.apache.commons.cli.PosixParser;
-
-/**
- * A launcher for SCA nodes in JSE.
- * 
- * Agruments:
- * [-c <compositeURI>]: The composite URI
- * [-t <ttl>]: Time to live in milliseconds before the node is started
- * contribution1 ... contributionN: A list of contribution files or URLs 
- *
- * @version $Rev$ $Date$
- */
-public class NodeLauncher {
-
-    static final Logger logger = Logger.getLogger(NodeLauncher.class.getName());
-
-    /**
-     * Constructs a new node launcher.
-     */
-    private NodeLauncher() {
-    }
-    
-    /**
-     * Returns a new launcher instance.
-     *  
-     * @return a new launcher instance
-     */
-    public static NodeLauncher newInstance() {
-        return new NodeLauncher();
-    }
-
-    /**
-     * Creates a new SCA node from the configuration URL
-     * 
-     * @param configurationURL the URL of the node configuration which is the ATOM feed
-     * that contains the URI of the composite and a collection of URLs for the contributions
-     *  
-     * @return a new SCA node.
-     * @throws LauncherException
-     */
-    public <T> T createNodeFromURL(String configurationURL) throws LauncherException {
-        return (T)node(configurationURL, null, null, null, null);
-    }
-    
-    /**
-     * Creates a new SCA Node.
-     * 
-     * @param compositeURI the URI of the composite to use 
-     * @param contributions the URI of the contributions that provides the composites and related 
-     * artifacts. If the list is empty, then we will use the thread context classloader to discover
-     * the contribution on the classpath
-     *   
-     * @return a new SCA node.
-     * @throws LauncherException
-     */
-    public <T> T createNode(String compositeURI, Contribution...contributions) throws LauncherException {
-        return (T)node(null, compositeURI, null, contributions, null);
-    }
-    
-    /**
-     * Creates a new SCA Node.
-     * 
-     * @param compositeURI the URI of the composite to use 
-     * @param compositeContent the XML content of the composite to use 
-     * @param contributions the URI of the contributions that provides the composites and related artifacts 
-     * @return a new SCA node.
-     * @throws LauncherException
-     */
-    public <T> T createNode(String compositeURI, String compositeContent, Contribution...contributions) throws LauncherException {
-        return (T)node(null, compositeURI, compositeContent, contributions, null);
-    }
-    
-    /**
-     * Create a SCA node based on the discovery of the contribution on the classpath for the 
-     * given classloader. This method should be treated a convenient shortcut with the following
-     * assumptions:
-     * <ul>
-     * <li>This is a standalone application and there is a deployable composite file on the classpath.
-     * <li>There is only one contribution which contains the deployable composite file physically in its packaging hierarchy.
-     * </ul> 
-     * 
-     * @param compositeURI The URI of the composite file relative to the root of the enclosing contribution
-     * @param classLoader The ClassLoader used to load the composite file as a resource. If the value is null,
-     * then thread context classloader will be used
-     * @return A newly created SCA node
-     */
-    public <T> T createNodeFromClassLoader(String compositeURI, ClassLoader classLoader) throws LauncherException {
-        return (T)node(null, compositeURI, null, null, classLoader);
-    }
-    
-    static Options getCommandLineOptions() {
-        Options options = new Options();
-        Option opt1 = new Option("c", "composite", true, "URI for the composite");
-        opt1.setArgName("compositeURI");
-        options.addOption(opt1);
-        Option opt2 = new Option("n", "node", true, "URI for the node configuration");
-        opt2.setArgName("nodeConfigurationURI");
-        options.addOption(opt2);
-        Option opt3 = new Option("t", "ttl", true, "Time to live");
-        opt3.setArgName("timeToLiveInMilliseconds");
-        // opt4.setType(long.class);
-        options.addOption(opt3);        
-        return options;
-    }
-
-    public static void main(String[] args) throws Exception {
-        CommandLineParser parser = new PosixParser();
-        Options options = getCommandLineOptions();
-        CommandLine cli = parser.parse(options, args);
-        
-        Object node = null;
-        ShutdownThread shutdown = null;
-        try {
-            while (true) {
-                if (cli.hasOption("node")) {
-                    
-                    // Create a node from a configuration URI
-                    String configurationURI = cli.getOptionValue("node");
-                    logger.info("SCA Node configuration: " + configurationURI);
-                    // Create a node launcher
-                    NodeLauncher launcher = newInstance();
-                    node = launcher.createNodeFromURL(configurationURI);
-                } else {
-                    
-                    // Create a node from a composite URI and a contribution location
-                    String compositeURI = cli.getOptionValue("composite");
-                    List<String> contribs = cli.getArgList();
-                    Contribution[] contributions = null;
-                    if (!contribs.isEmpty()) {
-                        contributions = new Contribution[contribs.size()];
-                        int index = 0;
-                        for (String contrib : contribs) {
-                            logger.info("SCA contribution: " + contrib);
-                            URL url = null;
-                            try {
-                                url = new URL(contrib);
-                            } catch(MalformedURLException e) {
-                                url = new File(contrib).toURI().toURL();
-                            }
-                            contributions[index] = new Contribution("contribution-" + index, url.toString());
-                            index++;
-                        }
-                    } else {
-                        HelpFormatter formatter = new HelpFormatter();
-                        formatter.setSyntaxPrefix("Usage: ");
-                        formatter.printHelp("java " + NodeLauncher.class.getName()
-                                            + " [-c <compositeURI>]"
-                                            + " [-t <ttl>]"
-                                            + " contribution1 ... contributionN", options);                        return;
-                    }
-                    // Create a node launcher
-                    logger.info("SCA composite: " + compositeURI);
-                    NodeLauncher launcher = newInstance();
-                    
-                    node = launcher.createNode(compositeURI, contributions);
-                }
-                
-                logger.info("Apache Tuscany SCA Node is starting...");
-
-                // Start the node
-                try {
-                    node.getClass().getMethod("start").invoke(node);
-                } catch (Exception e) {
-                    logger.log(Level.SEVERE, "SCA Node could not be started", e);
-                    throw e;
-                }
-                logger.info("SCA Node is now started.");
-                
-                // Install a shutdown hook
-                shutdown = new ShutdownThread(node);
-                Runtime.getRuntime().addShutdownHook(shutdown);
-
-                long ttl = Long.parseLong(cli.getOptionValue("ttl", "-1"));
-                if (ttl >= 0) {
-                    logger.info("Waiting for " + ttl + " milliseconds ...");
-                    Thread.sleep(ttl);
-                    // Stop the node
-                    if (node != null) {
-                        Object n = node;
-                        node = null;
-                        stopNode(n);
-                    }
-                    break; // Exit
-                }
-                
-                logger.info("Press 'q' to quit, 'r' to restart.");
-                int k = 0;
-                try {
-                    while ((k != 'q') && (k != 'r')) {
-                        k = System.in.read();
-                    }
-                } catch (IOException e) {
-                    
-                    // Wait forever
-                    Object lock = new Object();
-                    synchronized(lock) {
-                        lock.wait();
-                    }
-                }
-                
-                // Stop the node
-                if (node != null) {
-                    Object n = node;
-                    node = null;
-                    stopNode(n);
-                }
-                
-                // Quit
-                if (k == 'q' ) {
-                    break;
-                }
-            }
-        } catch (Exception e) {
-            // Stop the node
-            if (node != null) {
-                try {
-                    Object n = node;
-                    node = null;
-                    stopNode(n);
-                } catch (Exception e2) {
-                }
-            }
-            throw e;
-            
-        } finally {
-
-            // Remove the shutdown hook
-            if (shutdown != null) {
-                Runtime.getRuntime().removeShutdownHook(shutdown);
-            }
-        }
-    }
-
-    /**
-     * Stop the given node.
-     * 
-     * @param node
-     * @throws Exception
-     */
-    private static void stopNode(Object node) throws Exception {
-        try {
-            node.getClass().getMethod("stop").invoke(node);
-            logger.info("SCA Node is now stopped.");
-        } catch (Exception e) {
-            logger.log(Level.SEVERE, "SCA Node could not be stopped", e);
-            throw e;
-        }
-    }
-    
-    private static class ShutdownThread extends Thread {
-        private Object node;
-
-        public ShutdownThread(Object node) {
-            super();
-            this.node = node;
-        }
-
-        @Override
-        public void run() {
-            try {
-                stopNode(node);
-            } catch (Exception e) {
-                // Ignore
-            }
-        }
-    }
-}
diff --git a/branches/sca-java-2.0-M2/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeLauncherUtil.java b/branches/sca-java-2.0-M2/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeLauncherUtil.java
deleted file mode 100644
index 0b641c1b84..0000000000
--- a/branches/sca-java-2.0-M2/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeLauncherUtil.java
+++ /dev/null
@@ -1,539 +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.launcher;
-
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FilenameFilter;
-import java.io.IOException;
-import java.lang.reflect.Constructor;
-import java.net.MalformedURLException;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.net.URL;
-import java.net.URLClassLoader;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Enumeration;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-import java.util.StringTokenizer;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-/**
- * Common functions and constants used by the admin components.
- *
- * @version $Rev$ $Date$
- */
-final class NodeLauncherUtil {
-    private static final String NODE_IMPLEMENTATION_LAUNCHER_BOOTSTRAP = "org.apache.tuscany.sca.implementation.node.launcher.NodeImplementationLauncherBootstrap";
-
-    private static final Logger logger = Logger.getLogger(NodeLauncherUtil.class.getName());
-    
-    private static final String TUSCANY_HOME = "TUSCANY_HOME";
-    private static final String TUSCANY_PATH = "TUSCANY_PATH";
-
-
-    /**
-     * Returns a ClassLoader for the Tuscany runtime JARs for use in a standalone
-     * J2SE environment.
-     * 
-     * @param parentClassLoader
-     * 
-     * @return
-     */
-    static ClassLoader standAloneRuntimeClassLoader(ClassLoader parentClassLoader) throws FileNotFoundException, URISyntaxException, MalformedURLException {
-        return runtimeClassLoader(parentClassLoader, new StandAloneJARFileNameFilter());
-    }
-    
-    /**
-     * Returns a ClassLoader for the Tuscany runtime JARs for use in a Webapp
-     * environment.
-     * 
-     * @param parentClassLoader
-     * 
-     * @return
-     */
-    static ClassLoader webAppRuntimeClassLoader(ClassLoader parentClassLoader) throws FileNotFoundException, URISyntaxException, MalformedURLException {
-        return runtimeClassLoader(parentClassLoader, new WebAppJARFileNameFilter());
-    }
-    
-    /**
-     * Returns a ClassLoader for the Tuscany runtime JARs.
-     * 
-     * @param parentClassLoader
-     * @param filter
-     * 
-     * @return
-     */
-    private static ClassLoader runtimeClassLoader(ClassLoader parentClassLoader, FilenameFilter filter) throws FileNotFoundException, URISyntaxException, MalformedURLException {
-        // First try to see if the runtime classes are already on the classpath
-        // If yes, skip the discovery to avoid duplicate jars
-        try {
-            Class.forName(NODE_IMPLEMENTATION_LAUNCHER_BOOTSTRAP, false, parentClassLoader);
-            return parentClassLoader;
-        } catch (ClassNotFoundException e) {
-            // Ignore;
-        }
-        // Build list of runtime JARs
-        Set<URL> jarDirectoryURLs = new HashSet<URL>();
-        Set<URL> jarURLs = new HashSet<URL>();
-        
-        // First determine the path to the launcher class
-        String resource = NodeLauncherUtil.class.getName().replace('.', '/') + ".class"; 
-        URL url = NodeLauncherUtil.class.getClassLoader().getResource(resource);
-        if (url == null) {
-            throw new FileNotFoundException(resource);
-        }
-        URI uri = url.toURI();
-            
-        // If the launcher class is in a JAR, add all runtime JARs from directory containing
-        // that JAR (e.g. the Tuscany modules directory) as well as the ../modules and
-        // ../lib directories
-        String scheme = uri.getScheme();
-        if (scheme.equals("jar")) {
-            String path = uri.toString().substring(4);
-            int i = path.indexOf("!/");
-            if (i != -1) {
-                path = path.substring(0, i);
-                uri = URI.create(path);
-            }
-    
-            File file = new File(uri);
-            if (file.exists()) {
-                File jarDirectory = file.getParentFile();
-                if (jarDirectory != null && jarDirectory.exists()) {
-                    File homeDirectory = jarDirectory.getParentFile();
-                    if (homeDirectory != null && homeDirectory.exists()) {
-                        collectJARFiles(homeDirectory.getPath(), jarDirectoryURLs, jarURLs, filter);
-                    }
-                }
-            }
-        }
-        
-        // Look for a TUSCANY_HOME system property or environment variable
-        // Add all the JARs found under $TUSCANY_HOME, $TUSCANY_HOME/modules
-        // and $TUSCANY_HOME/lib
-        String home = System.getProperty(TUSCANY_HOME);
-        if (home == null || home.length() == 0) {
-            home = System.getenv(TUSCANY_HOME);
-        }
-        if (home != null && home.length() != 0) {
-            logger.fine(TUSCANY_HOME + ": " + home);
-            collectJARFiles(home, jarDirectoryURLs, jarURLs, filter);
-        }
-    
-        // Look for a TUSCANY_PATH system property or environment variable
-        // Add all the JARs found under $TUSCANY_PATH, $TUSCANY_PATH/modules
-        // and $TUSCANY_PATH/lib
-        String ext = System.getProperty(TUSCANY_PATH);
-        if (ext == null || ext.length() == 0) {
-            ext = System.getenv(TUSCANY_PATH);
-        }
-        if (ext != null && ext.length() != 0) {
-            logger.fine(TUSCANY_PATH + ": " + ext);
-            String separator = System.getProperty("path.separator");
-            for (StringTokenizer tokens = new StringTokenizer(ext, separator); tokens.hasMoreTokens(); ) {
-                collectJARFiles(tokens.nextToken(), jarDirectoryURLs, jarURLs, filter);
-            }
-        }
-    
-        // Return the runtime class loader
-        if (!jarURLs.isEmpty()) {
-            // Remove the URLs which are already in the parent classloader
-            if (parentClassLoader instanceof URLClassLoader) {
-                URLClassLoader cl = (URLClassLoader)parentClassLoader;
-                jarURLs.removeAll(Arrays.asList(cl.getURLs()));
-            }            
-            
-            // Return a ClassLoader configured with the runtime JARs
-            ClassLoader classLoader = new RuntimeClassLoader(jarURLs.toArray(new URL[jarURLs.size()]), parentClassLoader);
-            return classLoader;
-            
-        } else {
-            return null;
-        }
-    }
-
-    /**
-     * Collect JAR files under the given directory.
-     * 
-     * @param directory
-     * @param jarDirectoryURLs
-     * @param jarURLs
-     * @param filter
-     * @throws MalformedURLException
-     */
-    private static void collectJARFiles(String directory, Set<URL> jarDirectoryURLs, Collection<URL> jarURLs, FilenameFilter filter)
-        throws MalformedURLException {
-        File directoryFile = new File(directory);
-        URL directoryURL = directoryFile.toURI().toURL(); 
-        if (!jarDirectoryURLs.contains(directoryURL) && directoryFile.exists()) {
-            
-            // Collect files under $TUSCANY_HOME
-            jarDirectoryURLs.add(directoryURL);
-            collectJARFiles(directoryFile, jarURLs, filter, false);
-            
-            // Collect files under $TUSCANY_HOME/modules
-            File modulesDirectory = new File(directoryFile, "modules");
-            URL modulesDirectoryURL = modulesDirectory.toURI().toURL(); 
-            if (!jarDirectoryURLs.contains(modulesDirectoryURL) && modulesDirectory.exists()) {
-                jarDirectoryURLs.add(modulesDirectoryURL);
-                collectJARFiles(modulesDirectory, jarURLs, filter, true);
-            }          
-
-            // Collect files under $TUSCANY_HOME/lib
-            File libDirectory = new File(directoryFile, "lib");
-            URL libDirectoryURL = libDirectory.toURI().toURL(); 
-            if (!jarDirectoryURLs.contains(libDirectoryURL) && libDirectory.exists()) {
-                jarDirectoryURLs.add(libDirectoryURL);
-                collectJARFiles(libDirectory, jarURLs, filter, true);
-            }
-        }
-    }
-
-    /**
-     * Collect JAR files in the given directory
-     * @param directory
-     * @param urls
-     * @param filter
-     * @param recursive 
-     * @throws MalformedURLException
-     */
-    private static void collectJARFiles(File directory, Collection<URL> urls, FilenameFilter filter, boolean recursive) throws MalformedURLException {
-        File[] files = directory.listFiles(filter);
-        if (files != null) {
-            int count = 0;
-            for (File file: files) {
-                if (recursive && file.isDirectory()) {
-                    collectJARFiles(file, urls, filter, recursive);
-                } else if (file.isFile()) {
-                    urls.add(file.toURI().toURL());
-                    count++;
-                }
-            }
-            if (count != 0) {
-                logger.fine("Runtime classpath: "+ count + " JAR" + (count > 1? "s":"")+ " from " + directory.toString());
-            }
-        }
-    }
-
-    /**
-     * A file name filter used to filter JAR files.
-     */
-    private static class StandAloneJARFileNameFilter implements FilenameFilter {
-        
-        public boolean accept(File dir, String name) {
-            if(new File(dir, name).isDirectory()) {
-                return true;
-            }
-            name = name.toLowerCase(); 
-            
-            // Exclude tuscany-sca-all and tuscany-sca-manifest as they duplicate
-            // code in the individual runtime module JARs
-            if (name.startsWith("tuscany-sca-all")) {
-                return false;
-            }
-            if (name.startsWith("tuscany-sca-manifest")) {
-                return false;
-            }
-            
-            if ("features".equals(dir.getName()) && name.startsWith("equinox-manifest")) {
-                return false;
-            }
-            
-            // Filter out the Tomcat and Webapp hosts
-            if (name.startsWith("tuscany-host-tomcat") ||
-                name.startsWith("tuscany-host-webapp")) {
-                //FIXME This is temporary
-                return false;
-            }
-            
-            // Include JAR and MAR files
-            if (name.endsWith(".jar")) {
-                return true;
-            }
-            if (name.endsWith(".mar")) {
-                return true;
-            }
-            return false;
-        }
-    }
-    
-    /**
-     * A file name filter used to filter JAR files.
-     */
-    private static class WebAppJARFileNameFilter extends StandAloneJARFileNameFilter {
-
-        @Override
-        public boolean accept(File dir, String name) {
-            if (!super.accept(dir, name)) {
-                return false;
-            }
-            name = name.toLowerCase(); 
-            
-            // Exclude servlet-api JARs
-            if (name.startsWith("servlet-api")) {
-                return false;
-            }
-            
-            // Exclude the Tomcat and Jetty hosts 
-            if (name.startsWith("tuscany-host-tomcat") || name.startsWith("tuscany-host-jetty")) {
-                //FIXME This is temporary
-                return false;
-            }
-            
-            return true;
-        }
-    }
-    
-    
-    /**
-     * Creates a new node.
-     * 
-     * @param compositeURI
-     * @param contributions
-     * @throws LauncherException
-     */
-    static Object node(String configurationURI, String compositeURI, String compositeContent, Contribution[] contributions, ClassLoader contributionClassLoader) throws LauncherException {
-        ClassLoader tccl = Thread.currentThread().getContextClassLoader();
-        try {
-            
-            // Set up runtime ClassLoader
-            ClassLoader runtimeClassLoader = runtimeClassLoader(Thread.currentThread().getContextClassLoader(),
-                                                                new StandAloneJARFileNameFilter());
-            if (runtimeClassLoader != null) {
-                Thread.currentThread().setContextClassLoader(runtimeClassLoader);
-            }
-    
-            // Use Java reflection to create the node as only the runtime class
-            // loader knows the runtime classes required by the node
-            String className = NODE_IMPLEMENTATION_LAUNCHER_BOOTSTRAP;
-            Class<?> bootstrapClass;
-            if (runtimeClassLoader != null) {
-                bootstrapClass = Class.forName(className, true, runtimeClassLoader);
-            } else {
-                bootstrapClass = Class.forName(className);
-            }
-            
-            Object bootstrap;
-            if (configurationURI != null) {
-                
-                // Construct the node with a configuration URI
-                bootstrap = bootstrapClass.getConstructor(String.class).newInstance(configurationURI);
-                
-            } else if (contributionClassLoader != null) {
-                
-                // Construct the node with a compositeURI and a classloader
-                Constructor<?> constructor = bootstrapClass.getConstructor(String.class, ClassLoader.class);
-                bootstrap = constructor.newInstance(compositeURI, contributionClassLoader);
-
-            } else if (compositeContent != null) {
-                
-                // Construct the node with a composite URI, the composite content and
-                // the URIs and locations of a list of contributions
-                Constructor<?> constructor = bootstrapClass.getConstructor(String.class, String.class, String[].class, String[].class);
-                String[] uris = new String[contributions.length];
-                String[] locations = new String[contributions.length];
-                for (int i = 0; i < contributions.length; i++) {
-                    uris[i] = contributions[i].getURI();
-                    locations[i] = contributions[i].getLocation();
-                }
-                bootstrap = constructor.newInstance(compositeURI, compositeContent, uris, locations);
-            
-            } else {
-                
-                // Construct the node with a composite URI and the URIs and
-                // locations of a list of contributions
-                Constructor<?> constructor = bootstrapClass.getConstructor(String.class, String[].class, String[].class);
-                String[] uris = new String[contributions.length];
-                String[] locations = new String[contributions.length];
-                for (int i = 0; i < contributions.length; i++) {
-                    uris[i] = contributions[i].getURI();
-                    locations[i] = contributions[i].getLocation();
-                }
-                bootstrap = constructor.newInstance(compositeURI, uris, locations);
-            }
-            
-            Object node = bootstrapClass.getMethod("getNode").invoke(bootstrap);
-            return node;
-            
-        } catch (Exception e) {
-            NodeLauncher.logger.log(Level.SEVERE, "SCA Node could not be created", e);
-            throw new LauncherException(e);
-        } finally {
-            Thread.currentThread().setContextClassLoader(tccl);
-        }
-    }
-
-    /**
-     * Creates a new node daemon.
-     * 
-     * @throws LauncherException
-     */
-    static Object nodeDaemon() throws LauncherException {
-        ClassLoader tccl = Thread.currentThread().getContextClassLoader();
-        try {
-            // Set up runtime ClassLoader
-            ClassLoader runtimeClassLoader = runtimeClassLoader(Thread.currentThread().getContextClassLoader(),
-                                                                new StandAloneJARFileNameFilter());
-            if (runtimeClassLoader != null) {
-                Thread.currentThread().setContextClassLoader(runtimeClassLoader);
-            }
-    
-            // Use Java reflection to create the node daemon as only the runtime class
-            // loader knows the runtime classes required by the node
-            String className = "org.apache.tuscany.sca.implementation.node.launcher.NodeImplementationDaemonBootstrap";
-            Class<?> bootstrapClass;
-            if (runtimeClassLoader != null) {
-                bootstrapClass = Class.forName(className, true, runtimeClassLoader);
-            } else {
-                bootstrapClass = Class.forName(className);
-            }
-            Object bootstrap = bootstrapClass.getConstructor().newInstance();
-            
-            Object nodeDaemon = bootstrapClass.getMethod("getNode").invoke(bootstrap);
-            return nodeDaemon;
-            
-        } catch (Exception e) {
-            NodeDaemonLauncher.logger.log(Level.SEVERE, "SCA Node Daemon could not be created", e);
-            throw new LauncherException(e);
-        } finally {
-            Thread.currentThread().setContextClassLoader(tccl);
-        }
-    }
-
-    /**
-     * Creates a new domain manager.
-     * 
-     * @throws LauncherException
-     */
-    static Object domainManager(String rootDirectory) throws LauncherException {
-        ClassLoader tccl = Thread.currentThread().getContextClassLoader();
-        try {
-            // Set up runtime ClassLoader
-            ClassLoader runtimeClassLoader = runtimeClassLoader(Thread.currentThread().getContextClassLoader(),
-                                                                new StandAloneJARFileNameFilter());
-            if (runtimeClassLoader != null) {
-                Thread.currentThread().setContextClassLoader(runtimeClassLoader);
-            }
-    
-            // Use Java reflection to create the node daemon as only the runtime class
-            // loader knows the runtime classes required by the node
-            String className = "org.apache.tuscany.sca.domain.manager.launcher.DomainManagerLauncherBootstrap";
-            Class<?> bootstrapClass;
-            if (runtimeClassLoader != null) {
-                bootstrapClass = Class.forName(className, true, runtimeClassLoader);
-            } else {
-                bootstrapClass = Class.forName(className);
-            }
-            Constructor<?> constructor = bootstrapClass.getConstructor(String.class);
-            Object bootstrap = constructor.newInstance(rootDirectory);
-            
-            Object domainManager = bootstrapClass.getMethod("getNode").invoke(bootstrap);
-            return domainManager;
-            
-        } catch (Exception e) {
-            DomainManagerLauncher.logger.log(Level.SEVERE, "SCA Domain Manager could not be created", e);
-            throw new LauncherException(e);
-        } finally {
-            Thread.currentThread().setContextClassLoader(tccl);
-        }
-    }
-
-    /**
-     * Simple URL class loader for the runtime JARs
-     */
-    private static class RuntimeClassLoader extends URLClassLoader {
-        private static final ClassLoader systemClassLoader = ClassLoader.getSystemClassLoader();
-        private ClassLoader parent;
-        
-        /**
-         * Constructs a new class loader.
-         * @param urls
-         * @param parent
-         */
-        private RuntimeClassLoader(URL[] urls, ClassLoader parent) {
-            super(urls);
-            this.parent = parent;
-        }
-
-        @Override
-        public URL findResource(String name) {
-            URL url = super.findResource(name);
-            if (url == null) {
-                url = parent.getResource(name);
-            }
-            return url;
-        }
-
-        @Override
-        public Enumeration<URL> findResources(String name) throws IOException {
-            Enumeration<URL> resources = super.findResources(name);
-            Enumeration<URL> parentResources = parent.getResources(name);
-            List<URL> allResources = new ArrayList<URL>(); 
-            for (; resources.hasMoreElements(); ) {
-                allResources.add(resources.nextElement());
-            }
-            for (; parentResources.hasMoreElements(); ) {
-                allResources.add(parentResources.nextElement());
-            }
-            return Collections.enumeration(allResources);
-        }
-
-        @Override
-        protected Class<?> findClass(String name) throws ClassNotFoundException {
-            Class<?> cl;
-
-            // First try to load the class using the parent classloader
-            try {
-                cl = parent.loadClass(name);
-                ClassLoader loadedBy = cl.getClassLoader();
-
-                // If the class was not loaded directly by the parent classloader
-                // or the system classloader try to load a local version of the class
-                // using our RuntimeClassloader instead
-                if (loadedBy != parent &&
-                    loadedBy != systemClassLoader &&
-                    loadedBy != null) {
-
-                    try {
-                        cl = super.findClass(name);
-                    } catch (ClassNotFoundException e) {
-                        // No class alternative was found in our RuntimeClassloader,
-                        // use the class found in the parent classloader hierarchy
-                    }
-                }
-            } catch (ClassNotFoundException e) {
-                
-                // The class was not found by the parent class loader, try
-                // to load it using our RuntimeClassloader
-                cl = super.findClass(name);
-            }
-
-            return cl;
-        }
-    }
-    
-}
diff --git a/branches/sca-java-2.0-M2/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeMain.java b/branches/sca-java-2.0-M2/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeMain.java
deleted file mode 100644
index 77751dcc47..0000000000
--- a/branches/sca-java-2.0-M2/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeMain.java
+++ /dev/null
@@ -1,62 +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.launcher;
-
-import org.apache.commons.cli.CommandLine;
-import org.apache.commons.cli.CommandLineParser;
-import org.apache.commons.cli.Option;
-import org.apache.commons.cli.OptionGroup;
-import org.apache.commons.cli.Options;
-import org.apache.commons.cli.PosixParser;
-
-
-/**
- * Main class for this JAR.
- * With a "-nodeDaemon or -nd" this class launches the SCA Node Daemon.
- * With a "-domainManager or -dm" argument it launches the SCA domain admin node.
- * With any other argument it launches an SCA Node. 
- *  
- * @version $Rev$ $Date$
- */
-public class NodeMain {
-
-    public static void main(String[] args) throws Exception {
-        CommandLineParser parser = new PosixParser();
-        Options options = new Options();
-        OptionGroup group = new OptionGroup();
-        group.addOption(new Option("dm", "domainManager", false, "Domain Manager"));
-        group.addOption(new Option("nd", "nodeDaemon", false, "Node Domain"));
-        options.addOptionGroup(group);
-        
-        // Add options from NodeLauncher to avoid UnrecognizedOptionException
-        for (Object o : NodeLauncher.getCommandLineOptions().getOptions()) {
-            options.addOption((Option)o);
-        }
-        
-        CommandLine cli = parser.parse(options, args);
-        if (cli.hasOption("nd")) {
-            NodeDaemonLauncher.main(args);
-        } else if (cli.hasOption("dm")) {
-            DomainManagerLauncher.main(args);
-        } else {
-            NodeLauncher.main(args);
-        }
-    }
-}
\ No newline at end of file
diff --git a/branches/sca-java-2.0-M2/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeServletFilter.java b/branches/sca-java-2.0-M2/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeServletFilter.java
deleted file mode 100644
index 5345363031..0000000000
--- a/branches/sca-java-2.0-M2/modules/node-launcher/src/main/java/org/apache/tuscany/sca/node/launcher/NodeServletFilter.java
+++ /dev/null
@@ -1,130 +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.launcher;
-
-import static org.apache.tuscany.sca.node.launcher.NodeLauncherUtil.webAppRuntimeClassLoader;
-
-import java.io.IOException;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import javax.servlet.Filter;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-
-/**
- * A Servlet filter that forwards service requests to the Servlets registered with
- * the Tuscany ServletHost.
- * 
- * @version $Rev$ $Date$
- */
-public class NodeServletFilter implements Filter {
-    private static final long serialVersionUID = 1L;
-
-    private static final String NODE_WEB_APP_SERVLET_HOST = "org.apache.tuscany.sca.implementation.node.webapp.NodeWebAppServletHost";
-
-    private static final Logger logger = Logger.getLogger(NodeServletFilter.class.getName());
-
-    private ClassLoader runtimeClassLoader;
-    private Class<?> servletHostClass;
-    private Object servletHost;
-    private Filter filter;
-
-    public void init(FilterConfig filterConfig) throws ServletException {
-        logger.info("Apache Tuscany SCA WebApp Node is starting...");
-
-        try {
-            // Get the Tuscany runtime ClassLoader
-            ClassLoader tccl = Thread.currentThread().getContextClassLoader();
-            runtimeClassLoader = webAppRuntimeClassLoader(getClass().getClassLoader());
-            
-            try {
-                if (runtimeClassLoader != null) {
-                    Thread.currentThread().setContextClassLoader(runtimeClassLoader);
-                }
-        
-                // Load the Tuscany WebApp Servlet host and get the host instance
-                // for the current webapp
-                String className = NODE_WEB_APP_SERVLET_HOST; 
-                if (runtimeClassLoader != null) {
-                    servletHostClass = Class.forName(className, true, runtimeClassLoader);
-                } else {
-                    servletHostClass = Class.forName(className);
-                }
-                servletHost = servletHostClass.getMethod("servletHost").invoke(null);
-        
-                // Initialize the Servlet host
-                servletHostClass.getMethod("init", FilterConfig.class).invoke(servletHost, filterConfig);
-    
-                // The Servlet host also implements the filter interface 
-                filter = (Filter)servletHost;
-                
-            } finally {
-                Thread.currentThread().setContextClassLoader(tccl);
-            }
-            
-        } catch (Exception e) {
-            logger.log(Level.SEVERE, "Error Starting SCA WebApp Node", e);
-            throw new ServletException(e);
-        }
-
-        logger.info("SCA WebApp Node started.");
-    }
-
-    public void destroy() {
-        logger.info("Apache Tuscany WebApp Node stopping...");
-        if (servletHost != null) {
-            ClassLoader tccl = Thread.currentThread().getContextClassLoader();
-            try {
-                if (runtimeClassLoader != null) {
-                    Thread.currentThread().setContextClassLoader(runtimeClassLoader);
-                }
-                
-                servletHostClass.getMethod("destroy").invoke(servletHost);
-                
-            } catch (Exception e) {
-                logger.log(Level.SEVERE, "Error Stopping SCA WebApp Node", e);
-            } finally {
-                Thread.currentThread().setContextClassLoader(tccl);
-            }
-        }
-        logger.info("SCA WebApp Node stopped.");
-    }
-
-    public void doFilter(ServletRequest request, ServletResponse response, javax.servlet.FilterChain chain)
-        throws IOException, ServletException {
-
-        // Delegate to the Servlet host filter
-        ClassLoader tccl = Thread.currentThread().getContextClassLoader();
-        try {
-            if (runtimeClassLoader != null) {
-                Thread.currentThread().setContextClassLoader(runtimeClassLoader);
-            }
-            
-            filter.doFilter(request, response, chain);
-            
-        } finally {
-            Thread.currentThread().setContextClassLoader(tccl);
-        }
-    }
-
-}