Moving 2.x branches

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@835133 13f79535-47bb-0310-9956-ffa450edef68
author: lresende <lresende@13f79535-47bb-0310-9956-ffa450edef68> 2009-11-11 23:09:08 +0000
committer: lresende <lresende@13f79535-47bb-0310-9956-ffa450edef68> 2009-11-11 23:09:08 +0000
commit: cde3d2629677a07aa09e3c7fbe117b680c0f5df7 (patch)
tree: c6d50048ffad8dfa8a1c0019e7afb207cb6b4fe2 /branches/sca-equinox/tools/eclipse/plugins
parent: 4ef0430519e276c2bdecea75f7a0f42f49f0cf30 (diff)
105 files changed, 0 insertions, 6915 deletions
diff --git a/branches/sca-equinox/tools/eclipse/plugins/core/LICENSE b/branches/sca-equinox/tools/eclipse/plugins/core/LICENSE
deleted file mode 100644
index 8aa906c321..0000000000
--- a/branches/sca-equinox/tools/eclipse/plugins/core/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-equinox/tools/eclipse/plugins/core/META-INF/MANIFEST.MF b/branches/sca-equinox/tools/eclipse/plugins/core/META-INF/MANIFEST.MF
deleted file mode 100644
index 0d8b1053bf..0000000000
--- a/branches/sca-equinox/tools/eclipse/plugins/core/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,32 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Apache Tuscany SCA Core Eclipse Plugin
-Bundle-SymbolicName: org.apache.tuscany.sca.plugin.core;singleton:=true
-Bundle-Version: 1.4.0
-Import-Package: org.eclipse.core.resources,
- org.eclipse.core.runtime,
- org.eclipse.core.runtime.jobs,
- org.eclipse.debug.core,
- org.eclipse.debug.core.model,
- org.eclipse.debug.ui,
- org.eclipse.debug.ui.sourcelookup,
- org.eclipse.jdt.core,
- org.eclipse.jdt.debug.ui.launchConfigurations,
- org.eclipse.jdt.launching,
- org.eclipse.jdt.ui.wizards,
- org.eclipse.jface.dialogs,
- org.eclipse.jface.operation,
- org.eclipse.jface.resource,
- org.eclipse.jface.viewers,
- org.eclipse.jface.wizard,
- org.eclipse.osgi.service.datalocation;version="1.0.0",
- org.eclipse.swt,
- org.eclipse.swt.graphics,
- org.eclipse.swt.widgets,
- org.eclipse.ui,
- org.eclipse.ui.progress,
- org.osgi.framework;version="1.3.0"
-Bundle-Vendor: Apache Software Foundation
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Require-Bundle: org.eclipse.ui.ide
-Export-Package: org.apache.tuscany.sca.plugin.core.classpath
diff --git a/branches/sca-equinox/tools/eclipse/plugins/core/NOTICE b/branches/sca-equinox/tools/eclipse/plugins/core/NOTICE
deleted file mode 100644
index 6dcfe88195..0000000000
--- a/branches/sca-equinox/tools/eclipse/plugins/core/NOTICE
+++ /dev/null
@@ -1,12 +0,0 @@
-${pom.name}
-Copyright (c) 2005 - 2008 The Apache Software Foundation
-
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
-
-This product also includes software under the SCA Collaboration license 
-(see the LICENSE file contained in this distribution), with the following
-copyright:
-
-(c) Copyright SCA Collaboration 2006, 2007
-
diff --git a/branches/sca-equinox/tools/eclipse/plugins/core/build.properties b/branches/sca-equinox/tools/eclipse/plugins/core/build.properties
deleted file mode 100644
index c402b2eb45..0000000000
--- a/branches/sca-equinox/tools/eclipse/plugins/core/build.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-output.. = bin/
-bin.includes = META-INF/,\
-               plugin.xml,\
-               xsd/,\
-               icons/,\
-               .,\
-               LICENSE,\
-               NOTICE,\
-               org/
-src.includes = xsd/,\
-               plugin.xml,\
-               .classpath,\
-               .project,\
-               LICENSE,\
-               META-INF/,\
-               NOTICE,\
-               build.properties,\
-               icons/,\
-               .settings/,\
-               org/,\
-               pom.xml
-jars.compile.order = .
-source.. = .
diff --git a/branches/sca-equinox/tools/eclipse/plugins/core/exsd/runtimeClasspathContainerInitializer.exsd b/branches/sca-equinox/tools/eclipse/plugins/core/exsd/runtimeClasspathContainerInitializer.exsd
deleted file mode 100644
index 6b6d79d45b..0000000000
--- a/branches/sca-equinox/tools/eclipse/plugins/core/exsd/runtimeClasspathContainerInitializer.exsd
+++ /dev/null
@@ -1,106 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.apache.tuscany.sca.plugin.core" xmlns="http://www.w3.org/2001/XMLSchema">
-<annotation>
-      <appinfo>
-         <meta.schema plugin="org.apache.tuscany.sca.plugin.core" id="runtimeClasspathContainerInitializer" name="Tuscany Runtime Classpath Container Initializers"/>
-      </appinfo>
-      <documentation>
-         [Enter description of this extension point.]
-      </documentation>
-   </annotation>
-
-   <element name="extension">
-      <annotation>
-         <appinfo>
-            <meta.element />
-         </appinfo>
-      </annotation>
-      <complexType>
-         <attribute name="point" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-               <appinfo>
-                  <meta.attribute translatable="true"/>
-               </appinfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="runtimeClasspathContainerInitializer">
-      <complexType>
-         <attribute name="id" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="class" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-               <appinfo>
-                  <meta.attribute kind="java" basedOn=":org.eclipse.jdt.core.IClasspathContainer"/>
-               </appinfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <annotation>
-      <appinfo>
-         <meta.section type="since"/>
-      </appinfo>
-      <documentation>
-         [Enter the first release in which this extension point appears.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appinfo>
-         <meta.section type="examples"/>
-      </appinfo>
-      <documentation>
-         [Enter extension point usage example here.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appinfo>
-         <meta.section type="apiInfo"/>
-      </appinfo>
-      <documentation>
-         [Enter API information here.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appinfo>
-         <meta.section type="implementation"/>
-      </appinfo>
-      <documentation>
-         [Enter information about supplied implementation of this extension point.]
-      </documentation>
-   </annotation>
-
-
-</schema>
diff --git a/branches/sca-equinox/tools/eclipse/plugins/core/icons/t.gif b/branches/sca-equinox/tools/eclipse/plugins/core/icons/t.gif
deleted file mode 100644
index ba896ced08..0000000000
--- a/branches/sca-equinox/tools/eclipse/plugins/core/icons/t.gif
+++ /dev/null
diff --git a/branches/sca-equinox/tools/eclipse/plugins/core/icons/tuscany.gif b/branches/sca-equinox/tools/eclipse/plugins/core/icons/tuscany.gif
deleted file mode 100644
index 849dd76d4a..0000000000
--- a/branches/sca-equinox/tools/eclipse/plugins/core/icons/tuscany.gif
+++ /dev/null
diff --git a/branches/sca-equinox/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/BaseClasspathContainer.java b/branches/sca-equinox/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/BaseClasspathContainer.java
deleted file mode 100644
index ee9a3d2de9..0000000000
--- a/branches/sca-equinox/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/BaseClasspathContainer.java
+++ /dev/null
@@ -1,253 +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.plugin.core.classpath;
-
-import java.io.File;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.tuscany.sca.plugin.core.classpath.RuntimeClasspathContainer;
-import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jdt.core.IClasspathContainer;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.JavaCore;
-import org.osgi.framework.Bundle;
-
-/**
- * A base classpath container implementation.
- * 
- * @version $Rev$ $Date$
- */
-public class BaseClasspathContainer implements RuntimeClasspathContainer {
-    
-    private String pluginID;
-    private String libraryID;
-    private String libraryName;
-    private String distributionName;
-    private String sourceDistributionName;
-    private String distributionVersion;
-    private String homeProperty;
-    private String sourceProperty;
-    
-    /**
-     * Constructs a new Classpath container.
-     * 
-     * @param pluginID
-     * @param libraryID
-     * @param libraryName
-     * @param distributionName
-     * @param distributionVersion
-     * @param homeProperty
-     * @param sourceProperty
-     */
-    public BaseClasspathContainer(String pluginID, String libraryID, String libraryName,
-                                  String distributionName, String sourceDistributionName, String distributionVersion,
-                                  String homeProperty, String sourceProperty) {
-        this.pluginID = pluginID;
-        this.libraryID = libraryID;
-        this.libraryName = libraryName;
-        this.distributionName = distributionName;
-        this.sourceDistributionName = sourceDistributionName;
-        this.distributionVersion = distributionVersion;
-        this.homeProperty = homeProperty;
-        this.sourceProperty = sourceProperty;
-    }
-
-    public IClasspathEntry[] getClasspathEntries() {
-        List<IClasspathEntry> list = new ArrayList<IClasspathEntry>();
-        
-        // Get the runtime distribution location
-        IPath runtimePath = runtimePath();
-        
-        // Get the source distribution location
-        IPath sourcePath = sourcePath();
-        
-        // Add the JARs from runtime/lib and runtime/modules as classpath entries
-        if (runtimePath != null) {
-            
-            // Add the jars from runtime/modules
-            File modulesDirectory = runtimePath.append("modules").toFile();
-            if (modulesDirectory != null && modulesDirectory.exists()) {
-                for (File file : modulesDirectory.listFiles()) {
-                    IPath path = new Path(file.getPath());
-                    String name = path.lastSegment();
-                    String extension = path.getFileExtension();
-                    
-                    // Only include API and launcher JARs
-                    if (!"jar".equals(extension)) {
-                        continue;
-                    }
-                    if (name.indexOf("-api-") == -1 && name.indexOf("-launcher-") == -1) {
-                        continue;
-                    }
-
-                    list.add(JavaCore.newLibraryEntry(path, sourcePath, null));
-                }
-            }
-
-            // Add the jars from runtime/lib
-            File libDirectory = runtimePath.append("lib").toFile();
-            if (libDirectory != null && libDirectory.exists()) {
-                for (File file : libDirectory.listFiles()) {
-                    IPath path = new Path(file.getPath());
-                    String name = path.lastSegment();
-                    String extension = path.getFileExtension();
-                    
-                    // Only include jaxb, jaxws and jsr API JARs
-                    if (!"jar".equals(extension)) {
-                        continue;
-                    }
-                    if (name.indexOf("-api-") != -1) {
-                        if (name.startsWith("jaxb") || name.startsWith("jaxws") || name.startsWith("jsr")) {
-                            list.add(JavaCore.newLibraryEntry(path, sourcePath, null));
-                        }
-                    }
-                }
-            }
-        }
-        
-        return (IClasspathEntry[])list.toArray(new IClasspathEntry[list.size()]);
-    }
-
-    public IClasspathEntry[] getRuntimeClasspathEntries() {
-        
-        // Get the runtime distribution location
-        IPath runtimePath = runtimePath();
-
-        if (runtimePath != null) {
-            return new IClasspathEntry[] {JavaCore.newLibraryEntry(runtimePath, null, null)};
-        } else {
-            return new IClasspathEntry[0];
-        }
-    }
-
-    public String getDescription() {
-        return libraryName;
-    }
-
-    public int getKind() {
-        return IClasspathContainer.K_APPLICATION;
-    }
-
-    public IPath getPath() {
-        return new Path(libraryID);
-    }
-
-    /**
-     * Returns the location of the runtime distribution.
-     * 
-     * @return
-     */
-    private IPath runtimePath() {
-        IPath path = artifactLocation(pluginID, distributionName, distributionVersion, null, null);
-        
-        if (path == null) {
-            
-            // Try to get the location of the distribution from
-            // the HOME property or environment variable
-            String home = System.getProperty(homeProperty);
-            if (home == null || home.length() == 0) {
-                home = System.getenv(homeProperty);
-            }
-            if (home != null && home.length() != 0) {
-                if (new File(home).exists()) {
-                    path = new Path(home);
-                }
-            }
-        }
-        return path;
-    }
-    
-    /**
-     * Returns the location of the source distribution.
-     * 
-     * @return
-     */
-    private IPath sourcePath() {
-        IPath path = artifactLocation(pluginID, sourceDistributionName, distributionVersion, "src", ".zip");
-
-        if (path == null) {
-            
-            // Try to get the location of the source distribution from
-            // the SRC property or environment variable
-            String source = System.getProperty(sourceProperty);
-            if (source == null || source.length() == 0) {
-                source = System.getenv(sourceProperty);
-            }
-            if (source != null && source.length() != 0) {
-                if (new File(source).exists()) {
-                    path = new Path(source);
-                }
-            }
-        }
-        return path;
-    }
-
-    /**
-     * Returns the location of the specified artifact.
-     *  
-     * @param pluginId
-     * @param artifactId
-     * @param version
-     * @param classifier
-     * @param extension
-     * @return
-     */
-    private IPath artifactLocation(String pluginId, String artifactId, String version, String classifier, String extension) {
-        String artifactName;
-        if (classifier != null) {
-            artifactName = artifactId + '-' + version + '-' + classifier; 
-        } else {
-            artifactName = artifactId + '-' + version; 
-        }
-        if (extension != null) {
-            artifactName += extension;
-        }
-        try {
-            Bundle bundle = Platform.getBundle(pluginId);
-            URL location = FileLocator.find(bundle, new Path(artifactName), null);
-            location = FileLocator.toFileURL(location);
-            IPath path = new Path(new File(location.toURI()).getPath());
-            return path;
-        } catch (Exception e) {
-            error("Artifact not found: " + artifactName, e);
-            return null;
-        }
-    }
-
-    /**
-     * Log an error.
-     * 
-     * @param msg
-     * @param e
-     */
-    private void error(String msg, Exception e) {
-        Platform.getLog(
-                        Platform.getBundle(pluginID)).log(
-                        new Status(IStatus.ERROR, pluginID, IStatus.OK, msg, e));
-    }
-
-}
diff --git a/branches/sca-equinox/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/BaseClasspathContainerInitializer.java b/branches/sca-equinox/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/BaseClasspathContainerInitializer.java
deleted file mode 100644
index 7ea8d700f7..0000000000
--- a/branches/sca-equinox/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/BaseClasspathContainerInitializer.java
+++ /dev/null
@@ -1,77 +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.plugin.core.classpath;
-
-import org.apache.tuscany.sca.plugin.core.classpath.RuntimeClasspathContainer;
-import org.apache.tuscany.sca.plugin.core.classpath.RuntimeClasspathContainerInitializer;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jdt.core.ClasspathContainerInitializer;
-import org.eclipse.jdt.core.IClasspathContainer;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-
-/**
- * A base classpath container implementation.
- *
- * @version $Rev$ $Date$
- */
-public class BaseClasspathContainerInitializer extends ClasspathContainerInitializer implements RuntimeClasspathContainerInitializer {
-    
-    private RuntimeClasspathContainer container;
-    
-    public BaseClasspathContainerInitializer(RuntimeClasspathContainer container) {
-        this.container = container;
-    }
-
-    @Override
-    public void initialize(IPath containerPath, IJavaProject project) throws CoreException {
-        JavaCore.setClasspathContainer(containerPath,
-                                       new IJavaProject[] {project},
-                                       new IClasspathContainer[] {container},
-                                       null);
-    }
-
-    @Override
-    public boolean canUpdateClasspathContainer(IPath containerPath, IJavaProject project) {
-        return true;
-    }
-    
-    public IClasspathContainer getRuntimeClasspathContainer() {
-        return new IClasspathContainer() {
-            public IClasspathEntry[] getClasspathEntries() {
-                return container.getRuntimeClasspathEntries();
-            }
-            
-            public String getDescription() {
-                return container.getDescription();
-            }
-            
-            public int getKind() {
-                return container.getKind();
-            }
-            
-            public IPath getPath() {
-                return container.getPath();
-            }
-        };
-    }
-}
diff --git a/branches/sca-equinox/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/BaseLibraryEntryPage.java b/branches/sca-equinox/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/BaseLibraryEntryPage.java
deleted file mode 100644
index 70e794d2ce..0000000000
--- a/branches/sca-equinox/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/BaseLibraryEntryPage.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.plugin.core.classpath;
-
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.ui.wizards.IClasspathContainerPage;
-import org.eclipse.jface.wizard.WizardPage;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-
-/**
- * A base classpath container page implementation.
- *
- * @version $Rev$ $Date$
- */
-public class BaseLibraryEntryPage extends WizardPage implements IClasspathContainerPage {
-
-    private String name;
-    private String id;
-    private IClasspathEntry classpathEntry;
-
-    public BaseLibraryEntryPage(String id, String name) {
-        super(name);
-        this.name = name;
-        this.id = id;
-    }
-
-    public void createControl(Composite parent) {
-        setTitle(name);
-
-        Label label = new Label(parent, SWT.NONE);
-        label.setText("Press Finish to add the library.");
-        label.setFont(parent.getFont());
-
-        setControl(label);
-    }
-
-    public boolean finish() {
-        classpathEntry = JavaCore.newContainerEntry(new Path(id));
-        return true;
-    }
-
-    public boolean isPageComplete() {
-        return true;
-    }
-
-    public IClasspathEntry getSelection() {
-        return classpathEntry;
-    }
-
-    public void setSelection(IClasspathEntry containerEntry) {
-        this.classpathEntry = containerEntry;
-    }
-}
diff --git a/branches/sca-equinox/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/CoreClasspathContainer.java b/branches/sca-equinox/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/CoreClasspathContainer.java
deleted file mode 100644
index 53a8f8b32f..0000000000
--- a/branches/sca-equinox/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/CoreClasspathContainer.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.plugin.core.classpath;
-
-import org.apache.tuscany.sca.plugin.core.classpath.BaseClasspathContainer;
-import org.apache.tuscany.sca.plugin.core.classpath.RuntimeClasspathContainer;
-
-
-/**
- * A classpath container for the core runtime.
- * 
- * @version $Rev$ $Date$
- */
-public class CoreClasspathContainer extends BaseClasspathContainer implements RuntimeClasspathContainer {
-    
-    public CoreClasspathContainer() {
-        super("org.apache.tuscany.sca.plugin.core",
-              "org.apache.tuscany.sca.plugin.core.runtime.library", "Tuscany SCA Core Library", 
-              "tuscany-sca", "tuscany-distribution-core", "1.4-EQUINOX-SNAPSHOT",
-              "TUSCANY_HOME", "TUSCANY_SRC");
-    }
-}
diff --git a/branches/sca-equinox/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/CoreClasspathContainerInitializer.java b/branches/sca-equinox/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/CoreClasspathContainerInitializer.java
deleted file mode 100644
index 883c7c0781..0000000000
--- a/branches/sca-equinox/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/CoreClasspathContainerInitializer.java
+++ /dev/null
@@ -1,38 +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.plugin.core.classpath;
-
-import org.apache.tuscany.sca.plugin.core.classpath.BaseClasspathContainerInitializer;
-import org.apache.tuscany.sca.plugin.core.classpath.CoreClasspathContainer;
-import org.apache.tuscany.sca.plugin.core.classpath.RuntimeClasspathContainerInitializer;
-
-
-/**
- * A classpath container initializer for the core runtime.
- *
- * @version $Rev$ $Date$
- */
-public class CoreClasspathContainerInitializer extends BaseClasspathContainerInitializer implements RuntimeClasspathContainerInitializer {
-    
-    public CoreClasspathContainerInitializer() {
-        super(new CoreClasspathContainer());
-    }
-
-}
diff --git a/branches/sca-equinox/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/CoreLibraryEntryPage.java b/branches/sca-equinox/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/CoreLibraryEntryPage.java
deleted file mode 100644
index f90483a00d..0000000000
--- a/branches/sca-equinox/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/CoreLibraryEntryPage.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.plugin.core.classpath;
-
-import org.apache.tuscany.sca.plugin.core.classpath.BaseLibraryEntryPage;
-
-
-/**
- * A classpath container page for the core runtime library.
- *
- * @version $Rev$ $Date$
- */
-public class CoreLibraryEntryPage extends BaseLibraryEntryPage {
-
-    public CoreLibraryEntryPage() {
-        super("org.apache.tuscany.sca.plugin.core.runtime.library", "Tuscany SCA Core Library");
-    }
-
-}
diff --git a/branches/sca-equinox/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/RuntimeClasspathContainer.java b/branches/sca-equinox/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/RuntimeClasspathContainer.java
deleted file mode 100644
index 4830268272..0000000000
--- a/branches/sca-equinox/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/RuntimeClasspathContainer.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-
-package org.apache.tuscany.sca.plugin.core.classpath;
-
-import org.eclipse.jdt.core.IClasspathContainer;
-import org.eclipse.jdt.core.IClasspathEntry;
-
-/**
- * A provider of a classpath container for use when launching the Tuscany
- * runtime.
- *
- * @version $Rev: $ $Date: $
- */
-public interface RuntimeClasspathContainer extends IClasspathContainer {
-
-    /**
-     * Returns the classpath entries to use at runtime.
-     * 
-     * @return
-     */
-    IClasspathEntry[] getRuntimeClasspathEntries();
-        
-}
diff --git a/branches/sca-equinox/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/RuntimeClasspathContainerInitializer.java b/branches/sca-equinox/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/RuntimeClasspathContainerInitializer.java
deleted file mode 100644
index 18850d9333..0000000000
--- a/branches/sca-equinox/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/RuntimeClasspathContainerInitializer.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.plugin.core.classpath;
-
-import org.eclipse.jdt.core.IClasspathContainer;
-
-/**
- * A provider of a classpath container for use when launching the Tuscany
- * runtime.
- *
- * @version $Rev: $ $Date: $
- */
-public interface RuntimeClasspathContainerInitializer {
-
-    /**
-     * Returns the classpath container to use.
-     * 
-     * @return
-     */
-    IClasspathContainer getRuntimeClasspathContainer();
-        
-}
diff --git a/branches/sca-equinox/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/RuntimeClasspathContainerInitializerExtensionPoint.java b/branches/sca-equinox/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/RuntimeClasspathContainerInitializerExtensionPoint.java
deleted file mode 100644
index 909290859a..0000000000
--- a/branches/sca-equinox/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/classpath/RuntimeClasspathContainerInitializerExtensionPoint.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.plugin.core.classpath;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import org.apache.tuscany.sca.plugin.core.classpath.RuntimeClasspathContainerInitializer;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtension;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jdt.core.IClasspathContainer;
-import org.eclipse.jdt.core.IClasspathEntry;
-
-/**
- * Utility functions to help list extensions registered in the runtime classpath
- * extension point.
- *
- * @version $Rev: $ $Date: $
- */
-public class RuntimeClasspathContainerInitializerExtensionPoint {
-
-    private static final String EXTENSION_POINT_ID = "org.apache.tuscany.sca.plugin.core.runtimeClasspathContainerInitializer";
-
-    /**
-     * Return the installed runtime classpath entries.
-     * 
-     * @return
-     * @throws CoreException
-     */
-    public static String installedRuntimeClasspath() throws CoreException {
-        
-        List<IClasspathEntry> classpathEntries = new ArrayList<IClasspathEntry>(); 
-        for (IExtension extension: Platform.getExtensionRegistry().getExtensionPoint(EXTENSION_POINT_ID).getExtensions()) {
-            for (IConfigurationElement configuration: extension.getConfigurationElements()) {
-                RuntimeClasspathContainerInitializer initializer = (RuntimeClasspathContainerInitializer)configuration.createExecutableExtension("class");
-                IClasspathContainer container = initializer.getRuntimeClasspathContainer();
-                classpathEntries.addAll(Arrays.asList(container.getClasspathEntries()));
-            }
-        }
-        
-        String separator = System.getProperty("path.separator");
-        StringBuffer classpath = new StringBuffer();
-        for (int i = 0, n = classpathEntries.size(); i < n; i++) {
-            IClasspathEntry entry = classpathEntries.get(i);
-            if (i >0) {
-                classpath.append(separator);
-            }
-            classpath.append(entry.getPath().toFile().toURI().getPath());
-        }
-        
-        return classpath.toString();
-    }
-
-}
diff --git a/branches/sca-equinox/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/launch/DomainManagerLauncherUtil.java b/branches/sca-equinox/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/launch/DomainManagerLauncherUtil.java
deleted file mode 100644
index 060f6ff6cb..0000000000
--- a/branches/sca-equinox/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/launch/DomainManagerLauncherUtil.java
+++ /dev/null
@@ -1,255 +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.plugin.core.launch;
-
-import static org.apache.tuscany.sca.plugin.core.launch.TuscanyLaunchConfigurationDelegate.TUSCANY_LAUNCH_CONFIGURATIONTYPE;
-
-import java.io.BufferedReader;
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.OutputStream;
-import java.net.Socket;
-
-import org.apache.tuscany.sca.plugin.core.classpath.CoreClasspathContainer;
-import org.apache.tuscany.sca.plugin.core.classpath.RuntimeClasspathContainerInitializerExtensionPoint;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IProjectDescription;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.SubProgressMonitor;
-import org.eclipse.debug.core.DebugPlugin;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.core.ILaunchConfigurationType;
-import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
-import org.eclipse.debug.core.ILaunchManager;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants;
-import org.eclipse.jdt.launching.JavaRuntime;
-
-/**
- * Provides utility methods to launch the SCA Domain Manager.
- *
- * @version $Rev: $ $Date: $
- */
-public class DomainManagerLauncherUtil {
-    
-    private static final String TUSCANY_DOMAIN_LAUNCH_CONFIGURATION = "SCA Domain Manager";
-    private static final String TUSCANY_SCA_DOMAIN_PROJECT = "tuscany-sca-domain";
-
-    private static final String PING_HEADER =
-        "GET /ping HTTP/1.0\n" + "Host: localhost\n"
-            + "Content-Type: text/xml\n"
-            + "Connection: close\n"
-            + "Content-Length: ";
-    private static final String PING_CONTENT = "";
-    private static final String PING =
-        PING_HEADER + PING_CONTENT.getBytes().length + "\n\n" + PING_CONTENT;
-    
-    /**
-     * Returns the SCA domain project.
-     * 
-     * @return
-     * @throws CoreException
-     */
-    static IProject domainProject(IProgressMonitor progressMonitor) throws CoreException {
-        
-        IProject domainProject = ResourcesPlugin.getWorkspace().getRoot().getProject(TUSCANY_SCA_DOMAIN_PROJECT);
-        if (progressMonitor.isCanceled()) {
-            return domainProject;
-        }
-        if (!domainProject.exists()) {
-            progressMonitor.subTask("Creating SCA domain resources");
-            
-            // Create SCA domain project if necessary 
-            domainProject.create(new SubProgressMonitor(progressMonitor, 5));
-            domainProject.open(new SubProgressMonitor(progressMonitor, 5));
-            
-            String html = "<html>\n" +
-                "<head>\n" +
-                "<meta http-equiv=\"refresh\" content=\"0;url=http://localhost:9990/ui/home\">\n" +
-                "</head>\n" +
-                "<body>\n" +
-                "<a href=\"http://localhost:9990/ui/home\">SCA Domain</a>\n" +
-                "</body>\n" +
-                "</html>"; 
-            
-            IFile file = domainProject.getFile(new Path("domain.html"));
-            file.create(new ByteArrayInputStream(html.getBytes()), true, new SubProgressMonitor(progressMonitor, 5));
-            
-            IProjectDescription description = domainProject.getDescription();
-            String[] prevNatures= description.getNatureIds();
-            String[] newNatures= new String[prevNatures.length + 1];
-            System.arraycopy(prevNatures, 0, newNatures, 0, prevNatures.length);
-            newNatures[prevNatures.length]= JavaCore.NATURE_ID;
-            description.setNatureIds(newNatures);
-            domainProject.setDescription(description, new SubProgressMonitor(progressMonitor, 5));
-            
-            IJavaProject javaProject = JavaCore.create(domainProject);
-            javaProject.setOutputLocation(domainProject.getFullPath(), new SubProgressMonitor(progressMonitor, 5));
-            
-            IClasspathEntry classPath = JavaCore.newContainerEntry(new CoreClasspathContainer().getPath());
-            IClasspathEntry jrePath = JavaRuntime.getDefaultJREContainerEntry();
-            javaProject.setRawClasspath(new IClasspathEntry[] {jrePath, classPath}, new SubProgressMonitor(progressMonitor, 5));
-        
-        } else {
-            domainProject.open(new SubProgressMonitor(progressMonitor, 5));
-        }
-        
-        return domainProject;
-    }
-
-    /**
-     * Returns true if the SCA domain controller is running.
-     * 
-     * @return
-     */
-    private static boolean isDomainManagerRunning() {
-        try {
-            Socket client = new Socket("localhost", 9990);
-            OutputStream os = client.getOutputStream();
-            os.write(DomainManagerLauncherUtil.PING.getBytes());
-            os.flush();
-            String response = DomainManagerLauncherUtil.read(client);
-            if (response.indexOf("<span id=\"ping\">") != -1) {
-                return true;
-            } else {
-                return false;
-            }
-        } catch (IOException e) {
-            return false;
-        }
-    }
-
-    /**
-     * Wait for domain to be running.
-     * 
-     * @return
-     */
-    private static boolean waitForDomainManager(IProgressMonitor progressMonitor) throws InterruptedException {
-        progressMonitor.subTask("Contacting SCA domain manager");
-        for (int i = 0; i < 40; i++) {
-            if (progressMonitor.isCanceled()) {
-                return false;
-            }
-            if (isDomainManagerRunning()) {
-                return true;
-            }
-            Thread.sleep(500);
-        }
-        return false;
-    }
-
-    static void launchDomainManager(IProgressMonitor progressMonitor) throws JavaModelException, CoreException, InterruptedException {
-        
-        progressMonitor.beginTask("Starting SCA Domain Manager", 100);
-        
-        // If the SCA domain controller is not running yet, launch it
-        if (!isDomainManagerRunning()) {
-
-            progressMonitor.subTask("Starting SCA domain manager");
-            if (progressMonitor.isCanceled()) {
-                return;
-            }
-            
-            // Get the SCA domain project
-            IProject domainProject = domainProject(progressMonitor);
-            
-            // Get the domain manager launch configuration
-            ILaunchManager launchManager = DebugPlugin.getDefault().getLaunchManager();
-            ILaunchConfigurationType launchConfigurationType =launchManager.getLaunchConfigurationType(TUSCANY_LAUNCH_CONFIGURATIONTYPE);
-            ILaunchConfiguration configuration = null;
-            for (ILaunchConfiguration c : launchManager.getLaunchConfigurations(launchConfigurationType)) {
-                if (TUSCANY_DOMAIN_LAUNCH_CONFIGURATION.equals(c.getName())) {
-                    configuration = c;
-                    break;
-                }
-            }
-            
-            if (configuration == null) {
-                progressMonitor.worked(10);
-                if (progressMonitor.isCanceled()) {
-                    return;
-                }
-    
-                // Create a new launch configuration
-                ILaunchConfigurationWorkingCopy newConfiguration = launchConfigurationType.newInstance(null, TUSCANY_DOMAIN_LAUNCH_CONFIGURATION);
-
-                // Set the project and type to launch
-                newConfiguration.setAttribute(IJavaLaunchConfigurationConstants.ATTR_PROJECT_NAME, domainProject.getProject().getName());
-                newConfiguration.setAttribute(IJavaLaunchConfigurationConstants.ATTR_MAIN_TYPE_NAME, "org.apache.tuscany.sca.node.launcher.DomainManagerLauncher");
-                newConfiguration.setAttribute(IJavaLaunchConfigurationConstants.ATTR_WORKING_DIRECTORY, domainProject.getLocation().toString());
-                
-                // Pass the runtime classpath as a system property
-                newConfiguration.setAttribute(IJavaLaunchConfigurationConstants.ATTR_VM_ARGUMENTS, "\"-DTUSCANY_PATH=" + RuntimeClasspathContainerInitializerExtensionPoint.installedRuntimeClasspath() + "\"");
-
-                // Save the configuration
-                newConfiguration.doSave();
-
-                configuration = newConfiguration;
-            }
-
-            // Launch
-            configuration.launch(ILaunchManager.RUN_MODE, new SubProgressMonitor(progressMonitor, 20));
-            
-            if (progressMonitor.isCanceled()) {
-                return;
-            }
-            if (!waitForDomainManager(progressMonitor)) {
-                throw new RuntimeException("SCA Domain Manager could not be started.");
-            }
-        }
-        if (progressMonitor.isCanceled()) {
-            return;
-        }
-        progressMonitor.done();
-            
-    }
-
-    /**
-     * Read a String from a socket.
-     * 
-     * @param socket
-     * @return
-     * @throws IOException
-     */
-    static String read(Socket socket) throws IOException {
-        BufferedReader reader = null;
-        try {
-            reader = new BufferedReader(new InputStreamReader(socket.getInputStream()));
-            StringBuffer sb = new StringBuffer();
-            String str;
-            while ((str = reader.readLine()) != null) {
-                sb.append(str);
-            }
-            return sb.toString();
-        } finally {
-            if (reader != null) {
-                reader.close();
-            }
-        }
-    }
-}
diff --git a/branches/sca-equinox/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/launch/NodeLauncherUtil.java b/branches/sca-equinox/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/launch/NodeLauncherUtil.java
deleted file mode 100644
index edbe4b3e69..0000000000
--- a/branches/sca-equinox/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/launch/NodeLauncherUtil.java
+++ /dev/null
@@ -1,244 +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.plugin.core.launch;
-
-import static org.apache.tuscany.sca.plugin.core.launch.DomainManagerLauncherUtil.domainProject;
-import static org.apache.tuscany.sca.plugin.core.launch.DomainManagerLauncherUtil.launchDomainManager;
-import static org.apache.tuscany.sca.plugin.core.launch.TuscanyLaunchConfigurationDelegate.TUSCANY_LAUNCH_CONFIGURATIONTYPE;
-
-import java.io.IOException;
-import java.io.OutputStream;
-import java.net.MalformedURLException;
-import java.net.Socket;
-
-import org.apache.tuscany.sca.plugin.core.classpath.RuntimeClasspathContainerInitializerExtensionPoint;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.SubProgressMonitor;
-import org.eclipse.debug.core.DebugPlugin;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.core.ILaunchConfigurationType;
-import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
-import org.eclipse.debug.core.ILaunchManager;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants;
-
-/**
- * Provides utility methods to launch SCA nodes.
- *
- * @version $Rev: $ $Date: $
- */
-public class NodeLauncherUtil {
-
-    private static final String START_HEADER1 =
-        "GET /quickstart?";
-    private static final String START_HEADER2 =
-        " HTTP/1.0\n" + "Host: localhost\n"
-            + "Content-Type: text/xml\n"
-            + "Connection: close\n"
-            + "Content-Length: ";
-    private static final String START_CONTENT = "";
-
-    /**
-     * Launch an SCA node.
-     * 
-     * @param mode
-     * @param file
-     * @param launchManager
-     * @param launchConfigurationType
-     * @throws CoreException
-     * @throws JavaModelException
-     */
-    static void launchNode(String mode,
-                            IFile file,
-                            IProgressMonitor progressMonitor) throws CoreException, JavaModelException, IOException, InterruptedException {
-        progressMonitor.subTask("Starting SCA node");
-        if (progressMonitor.isCanceled()) {
-            return;
-        }
-        
-        // First start the SCA domain manager
-        launchDomainManager(new SubProgressMonitor(progressMonitor, 20));
-        
-        // Get the Java project
-        IJavaProject javaProject = JavaCore.create(file.getProject());
-        
-        // Get the contribution location and URI
-        String contributionLocation = contributionLocation(javaProject);
-        String contributionURI = contributionURI(javaProject);
-    
-        // Determine the composite file URI
-        String compositeURI = compositeURI(javaProject, file);
-        
-        // Configure the node
-        String nodeName = configureNode(contributionURI, contributionLocation, compositeURI, progressMonitor);
-    
-        // Get the node launch configuration
-        ILaunchManager launchManager = DebugPlugin.getDefault().getLaunchManager();
-        ILaunchConfigurationType launchConfigurationType =launchManager.getLaunchConfigurationType(TUSCANY_LAUNCH_CONFIGURATIONTYPE);
-        ILaunchConfiguration configuration = null;
-        for (ILaunchConfiguration c : launchManager.getLaunchConfigurations(launchConfigurationType)) {
-            if (file.getFullPath().toString().equals(c.getAttribute("COMPOSITE_PATH", ""))) {
-                configuration = c;
-                break;
-            }
-        }
-        
-        if (configuration == null) {
-            progressMonitor.worked(10);
-            if (progressMonitor.isCanceled()) {
-                return;
-            }
-
-            // Create a new launch configuration
-            ILaunchConfigurationWorkingCopy newConfiguration = launchConfigurationType.newInstance(null,
-                                        launchManager.generateUniqueLaunchConfigurationNameFrom(file.getName()));
-
-            // Set the project and type to launch
-            newConfiguration.setAttribute(IJavaLaunchConfigurationConstants.ATTR_PROJECT_NAME, file.getProject().getName());
-            newConfiguration.setAttribute(IJavaLaunchConfigurationConstants.ATTR_MAIN_TYPE_NAME, "org.apache.tuscany.sca.node.launcher.NodeLauncher");
-
-            // Pass the URL of the node install image to the launcher
-            newConfiguration.setAttribute(IJavaLaunchConfigurationConstants.ATTR_PROGRAM_ARGUMENTS,
-                                       "http://localhost:9990/node-config/" + nodeName);
-            
-            // Save the composite path in the launch configuration
-            newConfiguration.setAttribute("COMPOSITE_PATH", file.getFullPath().toString());
-
-            // Pass the runtime classpath as a system property
-            newConfiguration.setAttribute(IJavaLaunchConfigurationConstants.ATTR_VM_ARGUMENTS, "\"-DTUSCANY_PATH=" + RuntimeClasspathContainerInitializerExtensionPoint.installedRuntimeClasspath() + "\"");
-
-            // Save the configuration
-            newConfiguration.doSave();
-
-            configuration = newConfiguration;
-        }
-
-        // Launch
-        configuration.launch(mode, null);
-    }
-
-    /**
-     * Returns the location of the SCA contribution representing a Java project. 
-     * @param javaProject
-     * @return
-     * @throws MalformedURLException
-     * @throws JavaModelException
-     */
-    private static String contributionLocation(IJavaProject javaProject) throws MalformedURLException, JavaModelException {
-        IPath location = javaProject.getOutputLocation();
-        IResource resource;
-        if (location.segmentCount() == 1) {
-            resource = javaProject.getProject();
-        } else {
-            resource = javaProject.getProject().getWorkspace().getRoot().getFolder(location);
-        }
-        location = resource.getLocation();
-        String url = location.toFile().toURI().toURL().toString();
-        if (url.endsWith("/")) {
-            url = url.substring(0, url.length() - 1);
-        }
-        return url;
-    }
-
-    /**
-     * Returns the URI of the SCA contribution representing a Java project. 
-     * @param javaProject
-     * @return
-     */
-    private static String contributionURI(IJavaProject javaProject) {
-        return javaProject.getProject().getName();
-    }
-
-    /**
-     * Returns the SCA artifact URI of a composite file inside a Java project.
-     * 
-     * @param javaProject
-     * @param file
-     * @return
-     * @throws JavaModelException
-     */
-    private static String compositeURI(IJavaProject javaProject, IFile file) throws JavaModelException {
-    
-        // Find the Java source container containing the specified file
-        IClasspathEntry[] classpathEntries = javaProject.getRawClasspath();
-        int sourceFolderSegments = 0;
-        for (IClasspathEntry entry : classpathEntries) {
-            if (entry.getEntryKind() == IClasspathEntry.CPE_SOURCE) {
-                sourceFolderSegments = entry.getPath().matchingFirstSegments(file.getFullPath());
-                if (sourceFolderSegments > 0)
-                    break;
-            }
-        }
-    
-        // Determine the composite URI
-        String compositeURI = file.getFullPath().removeFirstSegments(sourceFolderSegments).toString();
-        return compositeURI;
-    }
-
-    /**
-     * Send a request to the SCA domain manager to configure an SCA node for
-     * the specified composite.
-     *  
-     * @param contributionURI
-     * @param contributionLocation
-     * @param compositeURI
-     * @return
-     * @throws IOException
-     */
-    private static String configureNode(String contributionURI, String contributionLocation, String compositeURI,
-                                        IProgressMonitor progressMonitor) throws IOException, CoreException {
-        progressMonitor.subTask("Configuring node");
-        
-        // Send the request to configure the node
-        Socket client = new Socket("localhost", 9990);
-        OutputStream os = client.getOutputStream();
-        String request = START_HEADER1 +
-            "contribution=" + contributionURI + "&location=" + contributionLocation + "&composite=" + compositeURI +
-            START_HEADER2 + START_CONTENT.getBytes().length + "\n\n" + START_CONTENT;
-        os.write(request.getBytes());
-        os.flush();
-        String response = DomainManagerLauncherUtil.read(client);
-        
-        // Refresh the domain project
-        domainProject(progressMonitor).refreshLocal(IResource.DEPTH_INFINITE, new NullProgressMonitor());
-        
-        int i = response.indexOf("<span id=\"node\">");
-        if (i != -1) {
-            
-            // Extract the node name
-            response = response.substring(i + 16);
-            i = response.indexOf("</span>");
-            String nodeName = response.substring(0, i);
-            return nodeName;
-            
-        } else {
-            throw new RuntimeException("Node could not be configured: " + response);
-        }
-    }
-
-}
diff --git a/branches/sca-equinox/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/launch/TuscanyLaunchConfigurationDelegate.java b/branches/sca-equinox/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/launch/TuscanyLaunchConfigurationDelegate.java
deleted file mode 100644
index 056deb5b27..0000000000
--- a/branches/sca-equinox/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/launch/TuscanyLaunchConfigurationDelegate.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-
-package org.apache.tuscany.sca.plugin.core.launch;
-
-import java.io.File;
-import java.util.Map;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.debug.core.ILaunch;
-import org.eclipse.debug.core.ILaunchConfiguration;
-import org.eclipse.debug.core.model.ILaunchConfigurationDelegate;
-import org.eclipse.jdt.launching.AbstractJavaLaunchConfigurationDelegate;
-import org.eclipse.jdt.launching.ExecutionArguments;
-import org.eclipse.jdt.launching.IVMInstall;
-import org.eclipse.jdt.launching.IVMRunner;
-import org.eclipse.jdt.launching.VMRunnerConfiguration;
-
-/**
- * Launch configuration delegate for the Tuscany launch configuration.
- *
- * @version $Rev$ $Date$
- */
-public class TuscanyLaunchConfigurationDelegate extends AbstractJavaLaunchConfigurationDelegate implements
-    ILaunchConfigurationDelegate {
-
-    public static final String TUSCANY_LAUNCH_CONFIGURATIONTYPE = "org.apache.tuscany.sca.plugin.core.launch.configurationtype";
-
-    public void launch(ILaunchConfiguration configuration, String mode, ILaunch launch, IProgressMonitor monitor)
-        throws CoreException {
-
-        // Verify the configuration
-        String mainTypeName = verifyMainTypeName(configuration);
-        IVMInstall vm = verifyVMInstall(configuration);
-        IVMRunner runner = vm.getVMRunner(mode);
-
-        ExecutionArguments execArgs =
-            new ExecutionArguments(getVMArguments(configuration), getProgramArguments(configuration));
-        Map vmAttributesMap = getVMSpecificAttributesMap(configuration);
-        String[] classpath = getClasspath(configuration);
-
-        File workingDir = verifyWorkingDirectory(configuration);
-        String workingDirName = null;
-        if (workingDir != null)
-            workingDirName = workingDir.getAbsolutePath();
-
-        // Create a VM runner configuration
-        VMRunnerConfiguration runConfig = new VMRunnerConfiguration(mainTypeName, classpath);
-        runConfig.setProgramArguments(execArgs.getProgramArgumentsArray());
-        runConfig.setVMArguments(execArgs.getVMArgumentsArray());
-        runConfig.setVMSpecificAttributesMap(vmAttributesMap);
-        runConfig.setWorkingDirectory(workingDirName);
-        runConfig.setBootClassPath(getBootpath(configuration));
-
-        // Run!!
-        runner.run(runConfig, launch, monitor);
-    }
-}
diff --git a/branches/sca-equinox/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/launch/TuscanyLaunchConfigurationTabGroup.java b/branches/sca-equinox/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/launch/TuscanyLaunchConfigurationTabGroup.java
deleted file mode 100644
index 5f8ea73db4..0000000000
--- a/branches/sca-equinox/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/launch/TuscanyLaunchConfigurationTabGroup.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.plugin.core.launch;
-
-import org.eclipse.debug.ui.AbstractLaunchConfigurationTabGroup;
-import org.eclipse.debug.ui.CommonTab;
-import org.eclipse.debug.ui.EnvironmentTab;
-import org.eclipse.debug.ui.ILaunchConfigurationDialog;
-import org.eclipse.debug.ui.ILaunchConfigurationTab;
-import org.eclipse.debug.ui.ILaunchConfigurationTabGroup;
-import org.eclipse.debug.ui.sourcelookup.SourceLookupTab;
-import org.eclipse.jdt.debug.ui.launchConfigurations.JavaArgumentsTab;
-import org.eclipse.jdt.debug.ui.launchConfigurations.JavaClasspathTab;
-import org.eclipse.jdt.debug.ui.launchConfigurations.JavaJRETab;
-
-/**
- * Tab groups from the Tuscany launch configuration.
- *
- * @version $Rev$ $Date$
- */
-public class TuscanyLaunchConfigurationTabGroup extends AbstractLaunchConfigurationTabGroup implements
-    ILaunchConfigurationTabGroup {
-
-    public void createTabs(ILaunchConfigurationDialog dialog, String mode) {
-        ILaunchConfigurationTab[] tabs =
-            new ILaunchConfigurationTab[] {new JavaArgumentsTab(), new JavaJRETab(), new JavaClasspathTab(),
-                                           new SourceLookupTab(), new EnvironmentTab(), new CommonTab()};
-
-        setTabs(tabs);
-    }
-}
diff --git a/branches/sca-equinox/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/launch/TuscanyLaunchDomainManagerAction.java b/branches/sca-equinox/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/launch/TuscanyLaunchDomainManagerAction.java
deleted file mode 100644
index f66fa71191..0000000000
--- a/branches/sca-equinox/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/launch/TuscanyLaunchDomainManagerAction.java
+++ /dev/null
@@ -1,79 +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.plugin.core.launch;
-
-import static org.apache.tuscany.sca.plugin.core.launch.DomainManagerLauncherUtil.launchDomainManager;
-import static org.apache.tuscany.sca.plugin.core.log.LogUtil.error;
-
-import java.lang.reflect.InvocationTargetException;
-
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.IWorkbenchWindowActionDelegate;
-
-/**
- * Launch the SCA DomainManager.
- * 
- * @version $Rev: $ $Date: $
- */
-public class TuscanyLaunchDomainManagerAction implements IWorkbenchWindowActionDelegate {
-    
-    private IWorkbenchWindow window;
-
-    public TuscanyLaunchDomainManagerAction() {
-    }
-
-    public void run(IAction action) {
-
-        try {
-            
-            // Run with a progress monitor
-            window.run(true, true, new IRunnableWithProgress() {
-
-                public void run(IProgressMonitor progressMonitor) throws InvocationTargetException, InterruptedException {
-                    try {
-                        
-                        launchDomainManager(progressMonitor);
-                            
-                    } catch (Exception e) {
-                        throw new InvocationTargetException(e);
-                    } finally {
-                        progressMonitor.done();
-                    }
-                }
-            });
-
-        } catch (Exception e) {
-            error("Could not launch SCA Domain Manager", e);
-        }
-    }
-
-    public void selectionChanged(IAction action, ISelection selection) {
-    }
-
-    public void dispose() {
-    }
-
-    public void init(IWorkbenchWindow window) {
-        this.window = window;
-    }
-}
diff --git a/branches/sca-equinox/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/launch/TuscanyLaunchNodeFilter.java b/branches/sca-equinox/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/launch/TuscanyLaunchNodeFilter.java
deleted file mode 100644
index 6eba5ffdc2..0000000000
--- a/branches/sca-equinox/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/launch/TuscanyLaunchNodeFilter.java
+++ /dev/null
@@ -1,29 +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.plugin.core.launch;
-
-/**
- * TuscanyLaunchNodeFilter
- *
- * @version $Rev: $ $Date: $
- */
-public class TuscanyLaunchNodeFilter {
-
-}
diff --git a/branches/sca-equinox/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/launch/TuscanyLaunchNodeShortcut.java b/branches/sca-equinox/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/launch/TuscanyLaunchNodeShortcut.java
deleted file mode 100644
index 2a4c7206db..0000000000
--- a/branches/sca-equinox/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/launch/TuscanyLaunchNodeShortcut.java
+++ /dev/null
@@ -1,88 +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.plugin.core.launch;
-
-import static org.apache.tuscany.sca.plugin.core.launch.NodeLauncherUtil.launchNode;
-import static org.apache.tuscany.sca.plugin.core.log.LogUtil.error;
-
-import java.lang.reflect.InvocationTargetException;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.debug.ui.ILaunchShortcut;
-import org.eclipse.jface.operation.IRunnableWithProgress;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * A launch shortcut for SCA .composite files.
- *
- * @version $Rev$ $Date$
- */
-public class TuscanyLaunchNodeShortcut implements ILaunchShortcut {
-    
-    public void launch(final ISelection selection, final String mode) {
-
-        try {
-            
-            // Make sure we have a .composite file selected
-            if (!(selection instanceof IStructuredSelection)) {
-                return;
-            }
-            Object[] selections = ((IStructuredSelection)selection).toArray();
-            if (selections.length == 0) {
-                return;
-            }
-            final IFile file = (IFile)selections[0];
-            if (!file.getFileExtension().equals("composite")) {
-                return;
-            }
-            
-            // Run with a progress monitor
-            PlatformUI.getWorkbench().getActiveWorkbenchWindow().run(true, true, new IRunnableWithProgress() {
-
-                public void run(IProgressMonitor progressMonitor) throws InvocationTargetException, InterruptedException {
-                    try {
-                        progressMonitor.beginTask("Starting SCA Composite", 100);
-                        
-                        launchNode(mode, file, progressMonitor);
-                        
-                        progressMonitor.done();
-                            
-                    } catch (Exception e) {
-                        throw new InvocationTargetException(e);
-                    } finally {
-                        progressMonitor.done();
-                    }
-                }
-            });
-
-        } catch (Exception e) {
-            error("Could not launch SCA composite", e);
-        }
-    }
-
-    public void launch(IEditorPart editor, String mode) {
-        //TODO later...
-    }
-    
-}
diff --git a/branches/sca-equinox/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/log/LogUtil.java b/branches/sca-equinox/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/log/LogUtil.java
deleted file mode 100644
index 5fc1a75960..0000000000
--- a/branches/sca-equinox/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/log/LogUtil.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.plugin.core.log;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.Status;
-
-/**
- * A log utility
- *
- * @version $Rev: $ $Date: $
- */
-public class LogUtil {
-    
-    public static void error(String msg, Exception e) {
-        Platform.getLog(
-                        Platform.getBundle("org.apache.tuscany.sca.plugin.core")).log(
-                        new Status(IStatus.ERROR, "org.apache.tuscany.sca.plugin.core", IStatus.OK, msg, e));
-    }
-
-}
diff --git a/branches/sca-equinox/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/newwizards/NewComponentTypeWizard.java b/branches/sca-equinox/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/newwizards/NewComponentTypeWizard.java
deleted file mode 100644
index 702da9701e..0000000000
--- a/branches/sca-equinox/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/newwizards/NewComponentTypeWizard.java
+++ /dev/null
@@ -1,53 +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.plugin.core.newwizards;
-
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchWizard;
-
-/**
- * A wizard to create new .componentType files.
- *
- * @version $Rev$ $Date$
- */
-public class NewComponentTypeWizard extends Wizard implements IWorkbenchWizard {
-
-	private IWorkbench workbench;
-	private IStructuredSelection selection;
-	private NewComponentTypeWizardPage mainPage;
-
-	public void init(IWorkbench workbench, IStructuredSelection selection) {
-	      this.workbench = workbench;
-	      this.selection = selection;
-	      setWindowTitle("New SCA ComponentType");
-	}
-	
-	public void addPages() {
-		mainPage = new NewComponentTypeWizardPage(workbench, selection);
-		addPage(mainPage);
-	}	
-	
-	@Override
-	public boolean performFinish() {
-		return mainPage.finish();
-	}
-}
diff --git a/branches/sca-equinox/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/newwizards/NewComponentTypeWizardPage.java b/branches/sca-equinox/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/newwizards/NewComponentTypeWizardPage.java
deleted file mode 100644
index a1c6cb86a7..0000000000
--- a/branches/sca-equinox/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/newwizards/NewComponentTypeWizardPage.java
+++ /dev/null
@@ -1,98 +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.plugin.core.newwizards;
-
-import static org.apache.tuscany.sca.plugin.core.log.LogUtil.error;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.InputStream;
-import java.io.PrintWriter;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.swt.graphics.ImageLoader;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.dialogs.WizardNewFileCreationPage;
-import org.eclipse.ui.ide.IDE;
-
-/**
- * Wizard page for the new .componentType file wizard.
- *
- * @version $Rev$ $Date$
- */
-public class NewComponentTypeWizardPage extends WizardNewFileCreationPage {
-        
-        private IWorkbench workbench;
-
-        public NewComponentTypeWizardPage(IWorkbench workbench, IStructuredSelection selection)  {
-                super("New SCA ComponentType Page", selection);
-                
-                this.workbench = workbench;
-                
-                setTitle("SCA ComponentType");
-                setDescription("Create a new SCA ComponentType.");
-                
-                try {
-                        String location = FileLocator.toFileURL(Platform.getBundle("org.apache.tuscany.sca.plugin.core").getEntry("/")).getFile().toString();
-                        setImageDescriptor(ImageDescriptor.createFromImageData((new ImageLoader()).load(location + "/icons/tuscany.gif")[0]));
-                } catch (Exception e) {
-                    error("Could not create wizard", e);
-                }
-                
-                setFileName("sample.componentType");
-                
-        }
-        
-        public boolean finish() {
-                try {
-                        IFile file = createNewFile();
-                        
-            IWorkbenchWindow workbenchWindow = workbench.getActiveWorkbenchWindow();
-                IWorkbenchPage workbenchPage = workbenchWindow.getActivePage();
-                IDE.openEditor(workbenchPage, file, true);
-                } catch (Exception e) {
-                    error("Could not open editor", e);
-                    return false;
-                }
-                return true;
-        }
-
-        @Override
-        protected InputStream getInitialContents() {
-                
-                ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
-                PrintWriter printWriter = new PrintWriter(outputStream);
-                printWriter.println("<?xml version=\"1.0\" encoding=\"UTF-8\"?>");
-                printWriter.println("<componentType xmlns=\"http://www.osoa.org/xmlns/sca/1.0\"");
-                printWriter.println("    xmlns:t=\"http://tuscany.apache.org/xmlns/sca/1.0\">");        
-                printWriter.println();
-                printWriter.println();
-                printWriter.println("</componentType>");
-                printWriter.close();
-                
-                return new ByteArrayInputStream(outputStream.toByteArray());
-        }
-}
diff --git a/branches/sca-equinox/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/newwizards/NewCompositeWizard.java b/branches/sca-equinox/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/newwizards/NewCompositeWizard.java
deleted file mode 100644
index 5e059308e6..0000000000
--- a/branches/sca-equinox/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/newwizards/NewCompositeWizard.java
+++ /dev/null
@@ -1,53 +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.plugin.core.newwizards;
-
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchWizard;
-
-/**
- * A wizard to create new .composite files.
- *
- * @version $Rev$ $Date$
- */
-public class NewCompositeWizard extends Wizard implements IWorkbenchWizard {
-	
-	private IWorkbench workbench;
-	private IStructuredSelection selection;
-	private NewCompositeWizardPage mainPage;
-
-	public void init(IWorkbench workbench, IStructuredSelection selection) {
-	      this.workbench = workbench;
-	      this.selection = selection;
-	      setWindowTitle("New SCA Composite");
-	}
-	
-	public void addPages() {
-		mainPage = new NewCompositeWizardPage(workbench, selection);
-		addPage(mainPage);
-	}	
-	
-	@Override
-	public boolean performFinish() {
-		return mainPage.finish();
-	}
-}
diff --git a/branches/sca-equinox/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/newwizards/NewCompositeWizardPage.java b/branches/sca-equinox/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/newwizards/NewCompositeWizardPage.java
deleted file mode 100644
index 5d9f2bdf70..0000000000
--- a/branches/sca-equinox/tools/eclipse/plugins/core/org/apache/tuscany/sca/plugin/core/newwizards/NewCompositeWizardPage.java
+++ /dev/null
@@ -1,105 +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.plugin.core.newwizards;
-
-import static org.apache.tuscany.sca.plugin.core.log.LogUtil.error;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.InputStream;
-import java.io.PrintWriter;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.FileLocator;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.swt.graphics.ImageLoader;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.dialogs.WizardNewFileCreationPage;
-import org.eclipse.ui.ide.IDE;
-
-/**
- * Wizard page for the new .composite file wizard.
- *
- * @version $Rev$ $Date$
- */
-public class NewCompositeWizardPage extends WizardNewFileCreationPage {
-        
-        private IWorkbench workbench;
-
-        public NewCompositeWizardPage(IWorkbench workbench, IStructuredSelection selection)  {
-                super("New SCA Composite Page", selection);
-                
-                this.workbench = workbench;
-                
-                setTitle("SCA Composite");
-                setDescription("Create a new SCA Composite.");
-                
-                try {
-                        String location = FileLocator.toFileURL(Platform.getBundle("org.apache.tuscany.sca.plugin.core").getEntry("/")).getFile().toString();
-                        setImageDescriptor(ImageDescriptor.createFromImageData((new ImageLoader()).load(location + "/icons/tuscany.gif")[0]));
-                } catch (Exception e) {
-                    error("Could not create wizard", e);
-                }
-                
-                setFileName("sample.composite");
-                
-        }
-        
-        public boolean finish() {
-                try {
-                        IFile file = createNewFile();
-                        
-            IWorkbenchWindow workbenchWindow = workbench.getActiveWorkbenchWindow();
-                IWorkbenchPage workbenchPage = workbenchWindow.getActivePage();
-                IDE.openEditor(workbenchPage, file, true);
-                } catch (Exception e) {
-                    error("Could not open editor", e);
-                        return false;
-                }
-                return true;
-        }
-
-        @Override
-        protected InputStream getInitialContents() {
-
-                IPath path = new Path(getFileName());
-                String name = path.removeFileExtension().toString();
-                ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
-                PrintWriter printWriter = new PrintWriter(outputStream);
-                printWriter.println("<?xml version=\"1.0\" encoding=\"UTF-8\"?>");              
-                printWriter.println("<composite xmlns=\"http://www.osoa.org/xmlns/sca/1.0\"");
-                printWriter.println("    xmlns:t=\"http://tuscany.apache.org/xmlns/sca/1.0\"");
-                printWriter.println("    xmlns:c=\"http://" + name + "\"");     
-                printWriter.println("    targetNamespace=\"http://" + name + "\"");      
-                printWriter.println("    name=\"" + name + "\">");
-                printWriter.println();
-                printWriter.println();
-                printWriter.println("</composite>");
-                printWriter.close();
-                
-                return new ByteArrayInputStream(outputStream.toByteArray());
-        }
-}
diff --git a/branches/sca-equinox/tools/eclipse/plugins/core/plugin.xml b/branches/sca-equinox/tools/eclipse/plugins/core/plugin.xml
deleted file mode 100644
index edc17c5ee2..0000000000
--- a/branches/sca-equinox/tools/eclipse/plugins/core/plugin.xml
+++ /dev/null
@@ -1,149 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.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.    
--->
-<plugin>
-
-	<extension-point id="runtimeClasspathContainerInitializer"
-		name="Tuscany Runtime Classpath Container Initializers"
-		schema="exsd/runtimeClasspathContainerInitializer.exsd"/>
-
-	<extension point = "org.eclipse.wst.xml.core.catalogContributions">
-		<catalogContribution id="default">
-			<uri name="http://www.osoa.org/xmlns/sca/1.0" uri="xsd/sca-all.xsd"/>
-		</catalogContribution>
-	</extension>
-	
-	<extension point = "org.eclipse.wst.xml.core.catalogContributions">
-		<catalogContribution id="default">
-			<uri name="http://tuscany.apache.org/xmlns/sca/1.0" uri="xsd/tuscany-sca.xsd"/>
-		</catalogContribution>
-	</extension>	
-	
-	<extension point="org.eclipse.core.runtime.contentTypes"> 
-      <file-association content-type="org.eclipse.core.runtime.xml" file-extensions="composite"/>
-      <file-association content-type="org.eclipse.core.runtime.xml" file-extensions="componentType"/>       
-	</extension>
-	
-	<extension
-       point="org.apache.tuscany.sca.plugin.core.runtimeClasspathContainerInitializer">
-    	<runtimeClasspathContainerInitializer
-    			id="org.apache.tuscany.sca.plugin.core.runtime.library"
-				class="org.apache.tuscany.sca.plugin.core.classpath.CoreClasspathContainerInitializer"/>                       
-	</extension>	
-
-	<extension point="org.eclipse.jdt.core.classpathContainerInitializer">
-    	<classpathContainerInitializer 
-    			id="org.apache.tuscany.sca.plugin.core.runtime.library"
-				class="org.apache.tuscany.sca.plugin.core.classpath.CoreClasspathContainerInitializer"/>                       
-	</extension>
-	
-	<extension point="org.eclipse.jdt.ui.classpathContainerPage">
-		<classpathContainerPage 
-				id="org.apache.tuscany.sca.plugin.core.runtime.library"
-				name="Tuscany SCA Core Library"
-				class="org.apache.tuscany.sca.plugin.core.classpath.CoreLibraryEntryPage">
-		</classpathContainerPage>
-	</extension>
-
-   <extension
-         point="org.eclipse.ui.actionSets">
-      <actionSet
-            label="Tuscany"
-            visible="true"
-            id="org.apache.tuscany.sca.plugin.core.launch.actionSet">
-         <action
-               label="&amp;Start SCA Domain Manager"
-               icon="icons/t.gif"
-               class="org.apache.tuscany.sca.plugin.core.launch.TuscanyLaunchDomainManagerAction"
-               tooltip="Start SCA Domain Manager"
-               toolbarPath="tuscanyGroup"
-               id="org.apache.tuscany.sca.plugin.core.launch.TuscanyLaunchDomainManagerAction">
-         </action>
-      </actionSet>
-   </extension>
-
-	<extension point="org.eclipse.debug.core.launchConfigurationTypes">
-		<launchConfigurationType
-       		name="Tuscany"
-        	delegate="org.apache.tuscany.sca.plugin.core.launch.TuscanyLaunchConfigurationDelegate"
-        	modes="run, debug"
-			sourceLocatorId="org.eclipse.jdt.launching.sourceLocator.JavaSourceLookupDirector"
-    		sourcePathComputerId="org.eclipse.jdt.launching.sourceLookup.javaSourcePathComputer"
-        	id="org.apache.tuscany.sca.plugin.core.launch.configurationtype">        
-    	</launchConfigurationType>
-	</extension>
-	
-	<extension point="org.eclipse.debug.ui.launchConfigurationTypeImages">
-    	<launchConfigurationTypeImage
-        	icon="icons/t.gif"
-        	configTypeID="org.apache.tuscany.sca.plugin.core.launch.configurationtype"
-        	id="org.apache.tuscany.sca.plugin.core.launch.configurationtypeimage">
-    	</launchConfigurationTypeImage>
-	</extension>
-	
-	<extension point="org.eclipse.debug.ui.launchConfigurationTabGroups">
-    	<launchConfigurationTabGroup
-        	type="org.apache.tuscany.sca.plugin.core.launch.configurationtype"
-        	class="org.apache.tuscany.sca.plugin.core.launch.TuscanyLaunchConfigurationTabGroup"
-        	id="org.apache.tuscany.sca.plugin.core.launch.configurationtypetabgroup">
-    	</launchConfigurationTabGroup>
-	</extension>	
-	
-	<extension point="org.eclipse.debug.ui.launchShortcuts">
-		<shortcut
-			id="org.apache.tuscany.sca.plugin.core.launchshortcut"
-			class="org.apache.tuscany.sca.plugin.core.launch.TuscanyLaunchNodeShortcut"
-			label="Tuscany"
-			icon="icons/t.gif"
-			modes="run, debug">
-			<contextualLaunch>
-				<enablement>
-					<with variable="selection">
-						<count value="1"/>
-						<iterate>
-							<or>
-								<test property="org.eclipse.debug.ui.matchesPattern" value="*.composite"/>
-							</or>
-						</iterate>
-					</with>
-			 	</enablement>
-			</contextualLaunch>
-		</shortcut>
-	</extension>
-
-	<extension point="org.eclipse.ui.newWizards">
-		<category name="Tuscany" id="org.apache.tuscany.sca.plugin.core.newwizards" /> 
-		<wizard name="Composite" icon="icons/t.gif" 
-				category="org.apache.tuscany.sca.plugin.core.newwizards" 
-				class="org.apache.tuscany.sca.plugin.core.newwizards.NewCompositeWizard" 
-				preferredPerspectives="org.eclipse.jdt.ui.JavaPerspective" 
-				id="org.apache.tuscany.sca.plugin.core.newwizards.newcompositewizard">
-			<description>Create a new SCA Composite</description> 
-		</wizard>
-		<wizard name="ComponentType" icon="icons/t.gif" 
-				category="org.apache.tuscany.sca.plugin.core.newwizards" 
-				class="org.apache.tuscany.sca.plugin.core.newwizards.NewComponentTypeWizard" 
-				preferredPerspectives="org.eclipse.jdt.ui.JavaPerspective" 
-				id="org.apache.tuscany.sca.plugin.core.newwizards.newcompositewizard">
-			<description>Create a new SCA ComponentType</description> 
-		</wizard>		
-	</extension>
-	
-</plugin>
diff --git a/branches/sca-equinox/tools/eclipse/plugins/core/pom.xml b/branches/sca-equinox/tools/eclipse/plugins/core/pom.xml
deleted file mode 100644
index 939ddc5d15..0000000000
--- a/branches/sca-equinox/tools/eclipse/plugins/core/pom.xml
+++ /dev/null
@@ -1,145 +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-sca-eclipse-tools</artifactId>
-        <version>1.4-EQUINOX-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
-    </parent>
-    <artifactId>org.apache.tuscany.sca.plugin.core</artifactId>
-    <name>Apache Tuscany SCA Core Eclipse Plugin</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.eclipse.jdt.debug</groupId>
-            <artifactId>ui</artifactId>
-            <version>3.2.100-v20070531-1800</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.eclipse.equinox</groupId>
-                    <artifactId>common</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.eclipse.equinox</groupId>
-                    <artifactId>app</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
-        <dependency>
-            <groupId>org.eclipse.equinox</groupId>
-            <artifactId>app</artifactId>
-            <version>1.0.0-v20070606</version>
-        </dependency>        
-
-        <dependency>
-            <groupId>org.eclipse.equinox</groupId>
-            <artifactId>common</artifactId>
-            <version>3.3.0-v20070426</version>
-        </dependency>        
-
-        <dependency>
-            <groupId>org.eclipse.swt.win32.win32</groupId>
-            <artifactId>x86</artifactId>
-            <version>3.3.0-v3346</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-distribution-core</artifactId>
-            <version>1.4-EQUINOX-SNAPSHOT</version>
-            <type>zip</type>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-distribution-core</artifactId>
-            <version>1.4-EQUINOX-SNAPSHOT</version>
-            <classifier>src</classifier>
-            <type>zip</type>
-        </dependency>
-    </dependencies>
-
-    <build>
-       <sourceDirectory>${basedir}</sourceDirectory>
-       <resources>
-          <resource>
-              <directory>${basedir}</directory>
-              <excludes>
-                  <exclude>**/*.java</exclude>
-                  <exclude>**/.*/**</exclude>
-                  <exclude>pom.xml</exclude>
-                  <exclude>build.*</exclude>
-                  <exclude>target/**</exclude>
-              </excludes>
-          </resource>
-       </resources>
-       
-       <plugins>
-           <plugin>
-               <groupId>org.apache.maven.plugins</groupId>
-               <artifactId>maven-jar-plugin</artifactId>
-               <configuration>
-                   <classifier>tmp</classifier>
-                   <archive>
-                       <manifestFile>META-INF/MANIFEST.MF</manifestFile>
-                   </archive>
-               </configuration>
-            </plugin>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-assembly-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>distribution-package</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>single</goal>
-                        </goals>
-                        <configuration>
-                            <descriptors>
-                                <descriptor>src/main/assembly/jar.xml</descriptor>
-                            </descriptors>
-                            <tarLongFileMode>gnu</tarLongFileMode>
-                            <appendAssemblyId>false</appendAssemblyId>
-                            <archive>
-                                <manifestFile>META-INF/MANIFEST.MF</manifestFile>
-                            </archive>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
-    <repositories>
-        <repository>
-            <id>repo1.eclipse</id>
-            <url>http://repo1.maven.org/eclipse/</url>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-        </repository>
-    </repositories>
-
-</project>
diff --git a/branches/sca-equinox/tools/eclipse/plugins/core/src/main/assembly/jar.xml b/branches/sca-equinox/tools/eclipse/plugins/core/src/main/assembly/jar.xml
deleted file mode 100644
index 7832ba5131..0000000000
--- a/branches/sca-equinox/tools/eclipse/plugins/core/src/main/assembly/jar.xml
+++ /dev/null
@@ -1,81 +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.
--->
-<assembly>
-    <!-- id typically identifies the "type" (src vs bin etc) of the assembly -->
-    <id>plugin</id>
-    <includeBaseDirectory>false</includeBaseDirectory>
-    <formats>
-        <!--
-        <format>dir</format>
-        <format>tar.gz</format>
-        -->
-        <format>jar</format>
-    </formats>
-
-    <fileSets>
-
-        <!-- Add the classes -->
-        <fileSet>
-            <directory>target/classes</directory>
-            <outputDirectory></outputDirectory>
-            <excludes>
-                <!-- General file/folders to exclude -->
-                <exclude>**/.*</exclude>
-                <exclude>**/.*/**</exclude>
-                <exclude>**/*.log</exclude>
-
-                <!-- Sample specific files/folders to exclude -->
-                <exclude>pom.xml</exclude>
-                <exclude>src/</exclude>
-                <exclude>src/**/*</exclude>
-            </excludes>
-        </fileSet>
-    </fileSets>
-
-    <dependencySets>
-
-        <!-- Add the distributions -->
-        <dependencySet>
-            <useTransitiveDependencies>false</useTransitiveDependencies>
-            <unpack>true</unpack>
-            <includes>
-                <include>*:zip</include>
-            </includes>
-            <excludes>
-                <exclude>*:zip:src</exclude>
-            </excludes>
-            <unpackOptions>
-                <excludes>
-                    <exclude>*/samples</exclude>
-                    <exclude>*/samples/**/*</exclude>
-                </excludes>
-            </unpackOptions>
-        </dependencySet>
-
-        <dependencySet>
-            <useTransitiveDependencies>false</useTransitiveDependencies>
-            <unpack>false</unpack>
-            <includes>
-                <include>*:zip:src</include>
-            </includes>
-        </dependencySet>
-    </dependencySets>
-
-</assembly>
diff --git a/branches/sca-equinox/tools/eclipse/plugins/core/xsd/sca-all.xsd b/branches/sca-equinox/tools/eclipse/plugins/core/xsd/sca-all.xsd
deleted file mode 100644
index 1b19ede427..0000000000
--- a/branches/sca-equinox/tools/eclipse/plugins/core/xsd/sca-all.xsd
+++ /dev/null
@@ -1,34 +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.    
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema"
-    targetNamespace="http://www.osoa.org/xmlns/sca/1.0" 
-    xmlns:sca="http://www.osoa.org/xmlns/sca/1.0">
-
-    <include schemaLocation="sca.xsd"/>
-
-    <include schemaLocation="sca-contribution.xsd"/>
-    
-    <include schemaLocation="sca-binding-ejb.xsd"/>
-
-    <include schemaLocation="sca-implementation-bpel.xsd"/>
-    <include schemaLocation="sca-implementation-spring.xsd"/>
-    <include schemaLocation="sca-implementation-ejb.xsd"/>
-
-</schema>
-\ No newline at end of file
diff --git a/branches/sca-equinox/tools/eclipse/plugins/core/xsd/sca-binding-ejb.xsd b/branches/sca-equinox/tools/eclipse/plugins/core/xsd/sca-binding-ejb.xsd
deleted file mode 100644
index 26bedfcce5..0000000000
--- a/branches/sca-equinox/tools/eclipse/plugins/core/xsd/sca-binding-ejb.xsd
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- (c) Copyright SCA Collaboration 2006, 2007 -->
-<schema xmlns="http://www.w3.org/2001/XMLSchema"
-        xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"
-        targetNamespace="http://www.osoa.org/xmlns/sca/1.0"
-        elementFormDefault="qualified">
-   <include schemaLocation="sca-core.xsd"/>
-
-   <element name="binding.ejb" type="sca:EJBSessionBeanBinding" 
-            substitutionGroup="sca:binding" />
-
-    <simpleType name="BeanType">
-        <restriction base="string">
-            <enumeration value="stateless"/>
-            <enumeration value="stateful"/>
-        </restriction>
-    </simpleType>
-
-    <simpleType name="VersionValue">
-        <restriction base="string">
-            <enumeration value="EJB2"/>
-            <enumeration value="EJB3"/>
-        </restriction>
-    </simpleType>
-
-
-     <complexType name="EJBSessionBeanBinding">
-	 <complexContent>
-	  <extension base="sca:Binding">
-         <sequence>
-            <any namespace="##other" processContents="lax"
-                 minOccurs="0" maxOccurs="unbounded"/>
-         </sequence>
-         <attribute name="homeInterface" type="NCName" use="optional"/>
-         <attribute name="ejb-link-name" type="NCName" use="optional"/>
-         <attribute name="session-type" type="sca:BeanType" use="optional" default="stateless"/>
-         <attribute name="ejb-version" type="sca:VersionValue" use="optional" default="EJB2"/>
-         <anyAttribute namespace="##any" processContents="lax"/>
-	  </extension>
-	 </complexContent>
-     </complexType>
-
-</schema>
diff --git a/branches/sca-equinox/tools/eclipse/plugins/core/xsd/sca-binding-jms.xsd b/branches/sca-equinox/tools/eclipse/plugins/core/xsd/sca-binding-jms.xsd
deleted file mode 100644
index 850f32b56a..0000000000
--- a/branches/sca-equinox/tools/eclipse/plugins/core/xsd/sca-binding-jms.xsd
+++ /dev/null
@@ -1,135 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- (c) Copyright SCA Collaboration 2006, 2007 -->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.osoa.org/xmlns/sca/1.0" 
-        xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"
-        elementFormDefault="qualified">
-
-   <include schemaLocation="sca-core.xsd"/>
-
-   <complexType name="JMSBinding">
-      <complexContent>
-         <extension base="sca:Binding">
-            <sequence>
-               <element name="destination" type="sca:Destination" minOccurs="0"/>
-   	         <element name="connectionFactory" type="sca:ConnectionFactory"  
-                        minOccurs="0"/>
- 	         <element name="activationSpec" type="sca:ActivationSpec" 
-                        minOccurs="0"/>
-  	         <element name="response" type="sca:Response" minOccurs="0"/>
-               <element name="headers" type="sca:Headers" minOccurs="0"/>
-    	         <element name="resourceAdapter" type="sca:ResourceAdapter" 
-                        minOccurs="0"/>
-               <element name="operationProperties" type="sca:OperationProperties" 
-                        minOccurs="0" maxOccurs="unbounded"/>
-               <any namespace="##other" processContents="lax" 
-                    minOccurs="0" maxOccurs="unbounded"/>
-            </sequence>
-    	      <attribute name="correlationScheme"
-                       default="RequestMsgIDToCorrelID">
-    	         <simpleType>
-                  <restriction base="string">
-                     <enumeration value="RequestMsgIDToCorrelID"/>
-                     <enumeration value="RequestCorrelIDToCorrelID"/>
-                     <enumeration value="None"/>
-                  </restriction>
-               </simpleType>
-            </attribute>
-
-            <attribute name="initialContextFactory" type="anyURI"/>
-            <attribute name="jndiURL" type="anyURI"/>
-            <attribute name="requestConnection" type="QName"/>
-            <attribute name="responseConnection" type="QName"/>
-            <attribute name="operationProperties" type="QName"/>
-            <anyAttribute/>
-         </extension>
-      </complexContent>
-   </complexType>
-
-   <simpleType name="CreateResource">
-      <restriction base="string">
-         <enumeration value="always"/>
-         <enumeration value="never"/>
-         <enumeration value="ifnotexist"/>
-      </restriction>
-   </simpleType>
-
-   <complexType name="Destination">
-      <sequence>
-         <element name="property" type="string" 
-                  minOccurs="0" maxOccurs="unbounded"/>
-      </sequence>
-      <attribute name="name" type="anyURI" use="required"/>
-      <attribute name="type" use="optional" default="queue">
-         <simpleType>
-            <restriction base="string">
-               <enumeration value="queue"/>
-               <enumeration value="topic"/>
-            </restriction>
-         </simpleType>
-      </attribute>
-      <attribute name="create" type="sca:CreateResource" 
-                 use="optional" default="ifnotexist"/>
-   </complexType>
-
-   <complexType name="ConnectionFactory">
-    	<sequence>          <element name="property" type="string" 
-                  minOccurs="0" maxOccurs="unbounded"/>
-    	</sequence>
-    	<attribute name="name" type="anyURI" use="required"/>
-    	<attribute name="create" type="sca:CreateResource" 
-                 use="optional" default="ifnotexist"/>
-   </complexType>
-
-   <complexType name="ActivationSpec">
-      <sequence>
-         <element name="property" type="string" 
-                  minOccurs="0" maxOccurs="unbounded"/>
-      </sequence>
-      <attribute name="name" type="anyURI" use="required"/>
-      <attribute name="create" type="sca:CreateResource"
-                 use="optional" default="ifnotexist"/>
-   </complexType>
-
-   <complexType name="Response">
-      <sequence>
-         <element name="destination" type="sca:Destination" minOccurs="0"/>
-         <element name="connectionFactory" type="sca:ConnectionFactory" 
-                  minOccurs="0"/>
-         <element name="activationSpec" type="sca:ActivationSpec" minOccurs="0"/>
-      </sequence>
-   </complexType>
-
-   <complexType name="Headers">
-      <sequence>
-         <element name="property" type="string" 
-                  minOccurs="0" maxOccurs="unbounded"/>
-      </sequence>
-      <attribute name="JMSType" type="string"/>
-      <attribute name="JMSCorrelationID" type="string"/>
-      <attribute name="JMSDeliveryMode" type="string"/>
-      <attribute name="JMSTimeToLive" type="int"/>
-      <attribute name="JMSPriority" type="string"/>
-   </complexType>
-
-   <complexType name="ResourceAdapter">
-      <sequence>
-         <element name="property" type="string" 
-                  minOccurs="0" maxOccurs="unbounded"/>
-      </sequence>
-      <attribute name="name" type="string" use="required"/>
-   </complexType>
-
-   <complexType name="OperationProperties">
-      <sequence>
-         <element name="property" type="string" 
-                  minOccurs="0" maxOccurs="unbounded"/>
-         <element name="headers" type="sca:Headers"/>
-      </sequence>
-      <attribute name="name" type="string" use="required"/>
-      <attribute name="nativeOperation" type="string"/>
-   </complexType>
-
-   <element name="binding.jms" type="sca:JMSBinding" 
-            substitutionGroup="sca:binding"/>
-</schema>
diff --git a/branches/sca-equinox/tools/eclipse/plugins/core/xsd/sca-binding-sca.xsd b/branches/sca-equinox/tools/eclipse/plugins/core/xsd/sca-binding-sca.xsd
deleted file mode 100644
index 02703402ef..0000000000
--- a/branches/sca-equinox/tools/eclipse/plugins/core/xsd/sca-binding-sca.xsd
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- (c) Copyright SCA Collaboration 2006, 2007 -->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-    targetNamespace="http://www.osoa.org/xmlns/sca/1.0" 
-    xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"
-        elementFormDefault="qualified">
-
-    <include schemaLocation="sca-core.xsd"/>
-
-    <element name="binding.sca" type="sca:SCABinding" 
-    	substitutionGroup="sca:binding"/>
-    <complexType name="SCABinding">
-        <complexContent>
-            <extension base="sca:Binding">
-		    	<sequence>
-                    <any namespace="##other" processContents="lax" minOccurs="0"
-                         maxOccurs="unbounded"/>
-		    	</sequence>
-                <anyAttribute namespace="##any" processContents="lax"/>
-            </extension>
-        </complexContent>
-    </complexType>
-</schema>
-\ No newline at end of file
diff --git a/branches/sca-equinox/tools/eclipse/plugins/core/xsd/sca-binding-webservice.xsd b/branches/sca-equinox/tools/eclipse/plugins/core/xsd/sca-binding-webservice.xsd
deleted file mode 100644
index 3e92de193b..0000000000
--- a/branches/sca-equinox/tools/eclipse/plugins/core/xsd/sca-binding-webservice.xsd
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- (c) Copyright SCA Collaboration 2006, 2007 -->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-    targetNamespace="http://www.osoa.org/xmlns/sca/1.0" 
-    xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"
-    xmlns:wsdli="http://www.w3.org/2004/08/wsdl-instance"
-    xmlns:wsa="http://www.w3.org/2004/12/addressing"
-    elementFormDefault="qualified">
-
-    <include schemaLocation="sca-core.xsd"/>
-
-    <element name="binding.ws" type="sca:WebServiceBinding"
-             substitutionGroup="sca:binding"/>
-    <complexType name="WebServiceBinding">
-        <complexContent>
-            <extension base="sca:Binding">
-                <sequence>
-                    <any namespace="##other" processContents="lax" minOccurs="0"
-                         maxOccurs="unbounded"/>
-                </sequence>
-			 <attribute name="wsdlElement" type="anyURI" use="optional"/>
-                <anyAttribute namespace="##any" processContents="lax"/>
-            </extension>
-        </complexContent>
-    </complexType>
-</schema>
diff --git a/branches/sca-equinox/tools/eclipse/plugins/core/xsd/sca-contribution.xsd b/branches/sca-equinox/tools/eclipse/plugins/core/xsd/sca-contribution.xsd
deleted file mode 100644
index c7f92f6c3b..0000000000
--- a/branches/sca-equinox/tools/eclipse/plugins/core/xsd/sca-contribution.xsd
+++ /dev/null
@@ -1,38 +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.    
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-    targetNamespace="http://www.osoa.org/xmlns/sca/1.0" 
-    xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"
-        elementFormDefault="qualified">
-
-    <include schemaLocation="sca-core.xsd"/>
-
-    <element name="contribution" type="sca:Contribution"/>
-    
-    <complexType name="Contribution">
-        <sequence>
-            <choice minOccurs="0" maxOccurs="unbounded">
-                <any namespace="##any" processContents="lax"/>
-            </choice>
-        </sequence>
-        <anyAttribute namespace="##any" processContents="lax"/>
-    </complexType>
-    
-</schema>
-\ No newline at end of file
diff --git a/branches/sca-equinox/tools/eclipse/plugins/core/xsd/sca-core.xsd b/branches/sca-equinox/tools/eclipse/plugins/core/xsd/sca-core.xsd
deleted file mode 100644
index 1c6291792b..0000000000
--- a/branches/sca-equinox/tools/eclipse/plugins/core/xsd/sca-core.xsd
+++ /dev/null
@@ -1,350 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- (c) Copyright SCA Collaboration 2006, 2007 -->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.osoa.org/xmlns/sca/1.0" 
-        xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"
-        elementFormDefault="qualified">
-
-    <element name="componentType" type="sca:ComponentType"/>
-    <complexType name="ComponentType">
-    	<sequence>
-             <choice minOccurs="0" maxOccurs="1">
-	             <element ref="sca:implementation"/>
-	             <any namespace="##other" processContents="lax"/>
-             </choice>
-        	<choice minOccurs="0" maxOccurs="unbounded">
-            	<element name="service" type="sca:ComponentService" />
-            	<element name="reference" type="sca:ComponentReference"/>
-            	<element name="property" type="sca:Property"/>
-        	</choice>
-        	<!-- 
-        	<any namespace="##other" processContents="lax" minOccurs="0" 
-        		maxOccurs="unbounded"/>
-        	-->
-        </sequence>
-        <attribute name="constrainingType" type="QName" use="optional"/>
-        <anyAttribute namespace="##any" processContents="lax"/>
-    </complexType>
-
-    <element name="composite" type="sca:Composite"/>
-    <complexType name="Composite">
-         <sequence>
-             <choice minOccurs="0" maxOccurs="unbounded">
-	             <element name="include" type="sca:Include"/>
-                 <element name="service" type="sca:Service"/>
-                 <element name="property" type="sca:Property"/>
-                 <element name="component" type="sca:Component"/>
-                 <element name="reference" type="sca:Reference"/>
-                 <element name="wire" type="sca:Wire"/>
-                 <any namespace="##other" processContents="lax"/>
-             </choice>
-             <!-- 
-             <any namespace="##other" processContents="lax" minOccurs="0" 
-             	maxOccurs="unbounded"/>
-             -->
-        </sequence>
-        <attribute name="name" type="NCName" use="required"/>
-        <attribute name="targetNamespace" type="anyURI" use="optional"/>
-        <attribute name="local" type="boolean" use="optional" default="false"/>
-        <attribute name="autowire" type="boolean" use="optional" default="false"/>
-        <attribute name="constrainingType" type="QName" use="optional"/>
-        <attribute name="requires" type="sca:listOfQNames" use="optional"/>
-        <attribute name="policySets" type="sca:listOfQNames" use="optional"/>
-        <anyAttribute namespace="##any" processContents="lax"/>
-    </complexType>
-    
-    <complexType name="Service">
-    	<sequence>
-    		<element ref="sca:interface" minOccurs="0" maxOccurs="1" />
-    		<element name="operation" type="sca:Operation" minOccurs="0" 
-    			maxOccurs="unbounded" />
-    		<choice minOccurs="0" maxOccurs="unbounded">
-    			<element ref="sca:binding" />
-    			<any namespace="##other" processContents="lax"/>
-    		</choice>
-    		<element ref="sca:callback" minOccurs="0" maxOccurs="1" />
-    		<!--
-    		<any namespace="##other" processContents="lax" minOccurs="0"
-    			maxOccurs="unbounded" />
-    		-->
-    	</sequence>
-    	<attribute name="name" type="NCName" use="required" />
-    	<attribute name="promote" type="anyURI" use="required" />
-    	<attribute name="requires" type="sca:listOfQNames" use="optional" />
-    	<attribute name="policySets" type="sca:listOfQNames" use="optional"/>
-    	<anyAttribute namespace="##any" processContents="lax" />
-    </complexType>
-
-    <element name="interface" type="sca:Interface" abstract="true" />
-    <complexType name="Interface" abstract="true"/>
-
-    <complexType name="Reference">
-    	<sequence>
-    		<element ref="sca:interface" minOccurs="0" maxOccurs="1" />
-    		<element name="operation" type="sca:Operation" minOccurs="0" 
-    			maxOccurs="unbounded" />
-    		<choice minOccurs="0" maxOccurs="unbounded">
-    			<element ref="sca:binding" />
-    			<any namespace="##other" processContents="lax" />
-    		</choice>
-    		<element ref="sca:callback" minOccurs="0" maxOccurs="1" />
-    		<!--
-    		<any namespace="##other" processContents="lax" minOccurs="0"
-    			maxOccurs="unbounded" />
-    		-->
-    	</sequence>
-    	<attribute name="name" type="NCName" use="required" />
-    	<attribute name="target" type="sca:listOfAnyURIs" use="optional"/>
-    	<attribute name="wiredByImpl" type="boolean" use="optional" default="false"/>
-    	<attribute name="multiplicity" type="sca:Multiplicity"
-    		use="optional" default="1..1" />
-    	<attribute name="promote" type="sca:listOfAnyURIs" use="required" />
-    	<attribute name="requires" type="sca:listOfQNames" use="optional" />
-    	<attribute name="policySets" type="sca:listOfQNames" use="optional"/>
-    	<anyAttribute namespace="##any" processContents="lax" />
-    </complexType>
-
-    <complexType name="SCAPropertyBase" mixed="true">
-    	<!-- mixed="true" to handle simple type -->
-    	<sequence>
-    		<any namespace="##any" processContents="lax" minOccurs="0"
-    			maxOccurs="1" />
-    		<!-- NOT an extension point; This xsd:any exists to accept
-    			 the element-based or complex type property
-    			 i.e. no element-based extension point under "sca:property" -->
-    	</sequence>
-    </complexType>
-
-    <!-- complex type for sca:property declaration --> 
-    <complexType name="Property" mixed="true">
-       <complexContent>
-	       <extension base="sca:SCAPropertyBase">  
-	          <!-- extension defines the place to hold default value --> 
-	          <attribute name="name" type="NCName" use="required"/>
-	          <attribute name="type" type="QName" use="optional"/> 
-	          <attribute name="element" type="QName" use="optional"/>
-	          <attribute name="many" type="boolean" default="false" 
-	          	use="optional"/>
-	          <attribute name="noDefault" type="boolean" default="false" 
-	          	use="optional"/>
-	          <anyAttribute namespace="##any" processContents="lax"/>
-	          <!-- an extension point ; attribute-based only --> 
-	       </extension>
-       </complexContent> 
-    </complexType>
-    
-    <complexType name="PropertyValue" mixed="true">
-       <complexContent>
-          <extension base="sca:SCAPropertyBase">
-             <attribute name="name" type="NCName" use="required"/>
-	         <attribute name="type" type="QName" use="optional"/> 
-	         <attribute name="element" type="QName" use="optional"/> 
-	         <attribute name="many" type="boolean" default="false" 
-	         	use="optional"/>            
-             <attribute name="source" type="string" use="optional"/>
-             <attribute name="file" type="anyURI" use="optional"/> 
-             <anyAttribute namespace="##any" processContents="lax"/>
-             <!-- an extension point ; attribute-based only --> 
-          </extension> 
-       </complexContent> 
-    </complexType>
-
-    <element name="binding" type="sca:Binding" abstract="true"/>
-    <complexType name="Binding" abstract="true">
-    	<sequence>
-    		<element name="operation" type="sca:Operation" minOccurs="0" 
-    			maxOccurs="unbounded" />
-    	</sequence>
-        <attribute name="uri" type="anyURI" use="optional"/>
-        <attribute name="name" type="QName" use="optional"/>
-        <attribute name="requires" type="sca:listOfQNames" use="optional"/>
-        <attribute name="policySets" type="sca:listOfQNames" use="optional"/>
-    </complexType>
-    
-    <element name="bindingType" type="sca:BindingType"/>
-    <complexType name="BindingType">
-    	<sequence minOccurs="0" maxOccurs="unbounded">
-    		<any namespace="##other" processContents="lax" />
-    	</sequence>
-    	<attribute name="type" type="QName" use="required"/>
-    	<attribute name="alwaysProvides" type="sca:listOfQNames" use="optional"/>
-    	<attribute name="mayProvide" type="sca:listOfQNames" use="optional"/>
-    	<anyAttribute namespace="##any" processContents="lax"/>
-    </complexType>
-    
-    <element name="callback" type="sca:Callback"/>
-    <complexType name="Callback">
-    	<choice minOccurs="0" maxOccurs="unbounded">
-        	<element ref="sca:binding"/>
-        	<any namespace="##other" processContents="lax"/>
-        </choice>
-        <attribute name="requires" type="sca:listOfQNames" use="optional"/>
-        <attribute name="policySets" type="sca:listOfQNames" use="optional"/>
-        <anyAttribute namespace="##any" processContents="lax"/>
-    </complexType>  
-      
-    <complexType name="Component">
-        <sequence>
-             <choice minOccurs="0" maxOccurs="1">
-	             <element ref="sca:implementation"/>
-	             <any namespace="##other" processContents="lax"/>
-             </choice>
-             <choice minOccurs="0" maxOccurs="unbounded">
-             	<element name="service" type="sca:ComponentService"/>
-                <element name="reference" type="sca:ComponentReference"/>
-                <element name="property" type="sca:PropertyValue" />
-             </choice>
-             <!-- 
-             <any namespace="##other" processContents="lax" minOccurs="0" 
-             	maxOccurs="unbounded"/>
-             -->
-        </sequence>
-        <attribute name="name" type="NCName" use="required"/>
-        <attribute name="autowire" type="boolean" use="optional" default="false"/>
-        <attribute name="constrainingType" type="QName" use="optional"/>
-        <attribute name="requires" type="sca:listOfQNames" use="optional"/>
-        <attribute name="policySets" type="sca:listOfQNames" use="optional"/>
-        <anyAttribute namespace="##any" processContents="lax"/>
-    </complexType>
-
-    <complexType name="ComponentService">
-        <sequence>
-        	 <element ref="sca:interface" minOccurs="0" maxOccurs="1"/>
-        	 <element name="operation" type="sca:Operation" minOccurs="0" 
-  					maxOccurs="unbounded" />
-    		<choice minOccurs="0" maxOccurs="unbounded">
-    			<element ref="sca:binding" />
-    			<any namespace="##other" processContents="lax"/>
-    		</choice>
-             <element ref="sca:callback" minOccurs="0" maxOccurs="1"/>
-             <!--
-             <any namespace="##other" processContents="lax" minOccurs="0" 
-             	maxOccurs="unbounded"/>
-             -->
-        </sequence>
-        <attribute name="name" type="NCName" use="required"/>
-        <attribute name="requires" type="sca:listOfQNames" 
-        	use="optional"/>
-        <attribute name="policySets" type="sca:listOfQNames" 
-        	use="optional"/>
-        <anyAttribute namespace="##any" processContents="lax"/>
-    </complexType>
-
-    <complexType name="ComponentReference">
-		<sequence>
-			<element ref="sca:interface" minOccurs="0" maxOccurs="1" />
-			<element name="operation" type="sca:Operation" minOccurs="0" 
-				maxOccurs="unbounded" />
-			<choice minOccurs="0" maxOccurs="unbounded">
-				<element ref="sca:binding" />
-				<any namespace="##other" processContents="lax" />
-			</choice>
-			<element ref="sca:callback" minOccurs="0" maxOccurs="1" />
-			<!--
-			<any namespace="##other" processContents="lax" minOccurs="0" 
-				maxOccurs="unbounded" />
-			-->
-		</sequence>
-		<attribute name="name" type="NCName" use="required" />
-		<attribute name="target" type="sca:listOfAnyURIs" use="optional"/>
-		<attribute name="multiplicity" type="sca:Multiplicity" 
-			use="optional" default="1..1" />
-		<attribute name="requires" type="sca:listOfQNames" use="optional"/>
-   		<attribute name="policySets" type="sca:listOfQNames" 
-   			use="optional"/>
-		<anyAttribute namespace="##any" processContents="lax" />
-    </complexType>
-
-    <element name="implementation" type="sca:Implementation"
-    	abstract="true" />
-    <complexType name="Implementation" abstract="true">
-    	<attribute name="requires" type="sca:listOfQNames" use="optional"/>
-    	<attribute name="policySets" type="sca:listOfQNames" use="optional"/>
-    </complexType>
-
-    <element name="implementationType" type="sca:ImplementationType"/>
-    <complexType name="ImplementationType">
-    	<sequence minOccurs="0" maxOccurs="unbounded">
-    		<any namespace="##other" processContents="lax" />
-    	</sequence>
-    	<attribute name="type" type="QName" use="required"/>
-    	<attribute name="alwaysProvides" type="sca:listOfQNames" use="optional"/>
-    	<attribute name="mayProvide" type="sca:listOfQNames" use="optional"/>
-    	<anyAttribute namespace="##any" processContents="lax"/>
-    </complexType>
-    
-    <complexType name="Wire">
-        <sequence>
-            <any namespace="##other" processContents="lax" minOccurs="0" 
-            	maxOccurs="unbounded"/>
-        </sequence>
-        <attribute name="source" type="anyURI" use="required"/>
-        <attribute name="target" type="anyURI" use="required"/>
-        <anyAttribute namespace="##any" processContents="lax"/>     
-    </complexType>
-    
-    <element name="include" type="sca:Include"/>
-    <complexType name="Include">
-		<attribute name="name" type="QName"/>
-		<anyAttribute namespace="##any" processContents="lax"/>   
-	</complexType>
-    
-    <complexType name="Operation">
-    	<attribute name="name" type="NCName" use="required"/>
-    	<attribute name="requires" type="sca:listOfQNames" use="optional"/>
-    	<attribute name="policySets" type="sca:listOfQNames" use="optional"/>
-    	<anyAttribute namespace="##any" processContents="lax"/>  	
-    </complexType>
-    
-    <element name="constrainingType" type="sca:ConstrainingType"/>
-    <complexType name="ConstrainingType">
-        <sequence>
-        	<choice minOccurs="0" maxOccurs="unbounded">
-                <element name="service" type="sca:ComponentService"/>
-                <element name="reference" type="sca:ComponentReference"/>
-                <element name="property" type="sca:Property" />
-            </choice>
-            <any namespace="##other" processContents="lax" minOccurs="0"
-            	maxOccurs="unbounded"/>
-        </sequence>
-        <attribute name="name" type="NCName" use="required"/>
-        <attribute name="targetNamespace" type="anyURI"/>
-        <attribute name="requires" type="sca:listOfQNames" use="optional"/>
-        <anyAttribute namespace="##any" processContents="lax"/>
-    </complexType>
-    
-
-    <simpleType name="Multiplicity">
-        <restriction base="string">
-            <enumeration value="0..1"/>
-            <enumeration value="1..1"/>
-            <enumeration value="0..n"/>
-            <enumeration value="1..n"/>
-        </restriction>
-    </simpleType>
-
-    <simpleType name="OverrideOptions">
-        <restriction base="string">
-            <enumeration value="no"/>
-            <enumeration value="may"/>
-            <enumeration value="must"/>
-        </restriction>
-    </simpleType>
-    
-    <!-- Global attribute definition for @requires to permit use of intents
-         within WSDL documents -->
-    <attribute name="requires" type="sca:listOfQNames"/>
-    
-    <!-- Global attribute defintion for @endsConversation to mark operations 
-         as ending a conversation -->
-    <attribute name="endsConversation" type="boolean" default="false"/>
-    
-    <simpleType name="listOfQNames">
-    	<list itemType="QName"/>
-    </simpleType>
-    
-    <simpleType name="listOfAnyURIs">
-        <list itemType="anyURI"/>
-    </simpleType>
-
-</schema>
-\ No newline at end of file
diff --git a/branches/sca-equinox/tools/eclipse/plugins/core/xsd/sca-definitions.xsd b/branches/sca-equinox/tools/eclipse/plugins/core/xsd/sca-definitions.xsd
deleted file mode 100644
index 0249882a92..0000000000
--- a/branches/sca-equinox/tools/eclipse/plugins/core/xsd/sca-definitions.xsd
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- (c) Copyright SCA Collaboration 2007 -->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-    targetNamespace="http://www.osoa.org/xmlns/sca/1.0" 
-    xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"
-    elementFormDefault="qualified">
-
-    <include schemaLocation="sca-core.xsd"/>
-    <include schemaLocation="sca-policy.xsd"/>
-
-    <element name="definitions">
-       <complexType>
-          <choice minOccurs="0" maxOccurs="unbounded">
-             <element ref="sca:intent"/>
-             <element ref="sca:policySet"/>
-             <element ref="sca:binding"/>
-             <element ref="sca:bindingType"/>
-             <element ref="sca:implementationType"/>
-             <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-          </choice>
-          <attribute name="targetNamespace" type="anyURI" use="optional"/>
-       </complexType>
-    </element>
-   
-</schema>
-\ No newline at end of file
diff --git a/branches/sca-equinox/tools/eclipse/plugins/core/xsd/sca-implementation-bpel.xsd b/branches/sca-equinox/tools/eclipse/plugins/core/xsd/sca-implementation-bpel.xsd
deleted file mode 100644
index 87b443fb36..0000000000
--- a/branches/sca-equinox/tools/eclipse/plugins/core/xsd/sca-implementation-bpel.xsd
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- (c) Copyright SCA Collaboration 2006 -->
-<xsd:schema xmlns="http://www.osoa.org/xmlns/sca/1.0"
-	targetNamespace="http://www.osoa.org/xmlns/sca/1.0"
-	xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-	elementFormDefault="qualified">
-
-	<xsd:include schemaLocation="sca-core.xsd" />
-
-	<xsd:element name="implementation.bpel" type="BpelImplementation"
-		substitutionGroup="implementation" />
-
-	<xsd:complexType name="BpelImplementation">
-		<xsd:complexContent>
-			<xsd:extension base="Implementation">
-				<xsd:sequence>
-					<xsd:any namespace="##other" processContents="lax"
-						minOccurs="0" maxOccurs="unbounded" />
-				</xsd:sequence>
-				<xsd:attribute name="process" type="xsd:QName" use="required" />
-				<xsd:anyAttribute namespace="##any" processContents="lax" />
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-
-	<xsd:element name="interface.partnerLinkType" type="BpelPartnerLinkType"
-		substitutionGroup="interface" />
-
-	<xsd:complexType name="BpelPartnerLinkType">
-		<xsd:complexContent>
-			<xsd:extension base="Interface">
-				<xsd:sequence>
-					<xsd:any namespace="##other" processContents="lax"
-						minOccurs="0" maxOccurs="unbounded" />
-				</xsd:sequence>
-				<xsd:attribute name="type" type="xsd:QName" use="required" />
-				<xsd:attribute name="serviceRole" type="xsd:NCName" use="optional" />
-				<xsd:anyAttribute namespace="##any" processContents="lax" />
-			</xsd:extension>
-		</xsd:complexContent>
-	</xsd:complexType>
-
-</xsd:schema>
-\ No newline at end of file
diff --git a/branches/sca-equinox/tools/eclipse/plugins/core/xsd/sca-implementation-composite.xsd b/branches/sca-equinox/tools/eclipse/plugins/core/xsd/sca-implementation-composite.xsd
deleted file mode 100644
index 99669bc672..0000000000
--- a/branches/sca-equinox/tools/eclipse/plugins/core/xsd/sca-implementation-composite.xsd
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- (c) Copyright SCA Collaboration 2006 -->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-    targetNamespace="http://www.osoa.org/xmlns/sca/1.0"
-    xmlns:sca="http://www.osoa.org/xmlns/sca/1.0" 
-    elementFormDefault="qualified">
-    
-    <include schemaLocation="sca-core.xsd"/>
-    <element name="implementation.composite" type="sca:SCAImplementation"
-        substitutionGroup="sca:implementation"/>
-    <complexType name="SCAImplementation">
-        <complexContent>
-            <extension base="sca:Implementation">
-                <sequence>
-                    <any namespace="##other" processContents="lax" minOccurs="0"
-                        maxOccurs="unbounded"/>
-                </sequence>
-                <attribute name="name" type="QName" use="required"/>
-                <anyAttribute namespace="##any" processContents="lax"/>
-            </extension>
-        </complexContent>
-    </complexType>
-</schema>
diff --git a/branches/sca-equinox/tools/eclipse/plugins/core/xsd/sca-implementation-cpp.xsd b/branches/sca-equinox/tools/eclipse/plugins/core/xsd/sca-implementation-cpp.xsd
deleted file mode 100644
index 6f1cf14a4b..0000000000
--- a/branches/sca-equinox/tools/eclipse/plugins/core/xsd/sca-implementation-cpp.xsd
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  (c) Copyright SCA Collaboration 2006  -->
-<schema xmlns="http://www.w3.org/2001/XMLSchema"
-    targetNamespace="http://www.osoa.org/xmlns/sca/1.0"
-    xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"
-    xmlns:sdo="commonj.sdo/XML"
-    elementFormDefault="qualified">
-
-    <include schemaLocation="sca-core.xsd"/>
-
-    <element name="implementation.cpp" type="sca:CPPImplementation" substitutionGroup="sca:implementation" />
-    <complexType name="CPPImplementation">
-        <complexContent>
-            <extension base="sca:Implementation">
-                <sequence>
-                    <element name="method" type="sca:CPPImplementationMethod" minOccurs="0" maxOccurs="unbounded" />
-                    <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-                </sequence>
-                <attribute name="library" type="NCName" use="required"/>
-                <attribute name="header" type="NCName" use="required"/>
-                <attribute name="path" type="NCName" use="optional"/>
-                <attribute name="class" type="Name" use="optional"/>
-                <attribute name="scope" type="sca:CPPImplementationScope" use="optional"/>
-                <attribute name="eagerInit" type="boolean" use="optional"/>
-                <attribute name="allowsPassByReference" type="boolean" use="optional"/>
-                <attribute name="conversationMaxAge" type="string" use="optional"/>
-                <attribute name="conversationMaxIdle" type="string" use="optional"/>
-                <attribute name="conversationSinglePrincipal" type="boolean" use="optional"/>
-                <anyAttribute namespace="##any" processContents="lax"/>
-            </extension>
-        </complexContent>
-    </complexType>
-
-    <simpleType name="CPPImplementationScope">
-        <restriction base="string">
-            <enumeration value="stateless"/>
-            <enumeration value="composite"/>
-            <enumeration value="request"/>
-            <enumeration value="converstion"/>
-        </restriction>
-    </simpleType>
-
-    <complexType name="CPPImplementationMethod">
-        <complexContent>
-            <attribute name="name" type="NCName" use="required"/>
-            <attribute name="allowsPassByReference" type="boolean" use="optional"/>
-            <anyAttribute namespace="##any" processContents="lax"/>
-        </complexContent>
-    </complexType>
-
-</schema>
-
-
diff --git a/branches/sca-equinox/tools/eclipse/plugins/core/xsd/sca-implementation-ejb.xsd b/branches/sca-equinox/tools/eclipse/plugins/core/xsd/sca-implementation-ejb.xsd
deleted file mode 100644
index 1bca6199cb..0000000000
--- a/branches/sca-equinox/tools/eclipse/plugins/core/xsd/sca-implementation-ejb.xsd
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- (c) Copyright SCA Collaboration 2006 -->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-    targetNamespace="http://www.osoa.org/xmlns/sca/1.0" 
-    xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"
-    elementFormDefault="qualified">
-
-    <include schemaLocation="sca-core.xsd"/>
-
-    <element name="implementation.ejb" type="sca:EJBImplementation" 
-    	substitutionGroup="sca:implementation"/>
-    <complexType name="EJBImplementation">
-        <complexContent>
-            <extension base="sca:Implementation">
-                <sequence>
-                    <any namespace="##other" processContents="lax" 
-                    	minOccurs="0" maxOccurs="unbounded"/>
-                </sequence>
-                <!--  we might want to make this refer to the JEE ejb-link type -->
-                <attribute name="ejb-link" type="token" use="required"/>
-                <anyAttribute namespace="##any" processContents="lax"/>
-            </extension>
-        </complexContent>
-    </complexType>
-</schema>
-\ No newline at end of file
diff --git a/branches/sca-equinox/tools/eclipse/plugins/core/xsd/sca-implementation-java.xsd b/branches/sca-equinox/tools/eclipse/plugins/core/xsd/sca-implementation-java.xsd
deleted file mode 100644
index f9d8171b8e..0000000000
--- a/branches/sca-equinox/tools/eclipse/plugins/core/xsd/sca-implementation-java.xsd
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- (c) Copyright SCA Collaboration 2006 -->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-    targetNamespace="http://www.osoa.org/xmlns/sca/1.0" 
-    xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"
-    elementFormDefault="qualified">
-
-    <include schemaLocation="sca-core.xsd"/>
-
-    <element name="implementation.java" type="sca:JavaImplementation" 
-    	substitutionGroup="sca:implementation"/>
-    <complexType name="JavaImplementation">
-        <complexContent>
-            <extension base="sca:Implementation">
-                <sequence>
-                    <any namespace="##other" processContents="lax" 
-                    	minOccurs="0" maxOccurs="unbounded"/>
-                </sequence>
-                <attribute name="class" type="NCName" use="required"/>
-                <anyAttribute namespace="##any" processContents="lax"/>
-            </extension>
-        </complexContent>
-    </complexType>
-</schema>
-\ No newline at end of file
diff --git a/branches/sca-equinox/tools/eclipse/plugins/core/xsd/sca-implementation-spring.xsd b/branches/sca-equinox/tools/eclipse/plugins/core/xsd/sca-implementation-spring.xsd
deleted file mode 100644
index 1cf9fb3ea9..0000000000
--- a/branches/sca-equinox/tools/eclipse/plugins/core/xsd/sca-implementation-spring.xsd
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- (c) Copyright SCA Collaboration 2006 -->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-    targetNamespace="http://www.osoa.org/xmlns/sca/1.0" 
-    xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"
-    elementFormDefault="qualified">
-
-    <include schemaLocation="sca-core.xsd"/>
-
-    <element name="implementation.spring" type="sca:SpringImplementation" 
-    	substitutionGroup="sca:implementation"/>
-    <complexType name="SpringImplementation">
-        <complexContent>
-            <extension base="sca:Implementation">
-                <sequence>
-                    <any namespace="##other" processContents="lax" 
-                    	minOccurs="0" maxOccurs="unbounded"/>
-                </sequence>
-                <attribute name="location" type="anyURI" use="required"/>
-                <anyAttribute namespace="##any" processContents="lax"/>
-            </extension>
-        </complexContent>
-    </complexType>
-</schema>
-\ No newline at end of file
diff --git a/branches/sca-equinox/tools/eclipse/plugins/core/xsd/sca-interface-cpp.xsd b/branches/sca-equinox/tools/eclipse/plugins/core/xsd/sca-interface-cpp.xsd
deleted file mode 100644
index 44f14e5ed5..0000000000
--- a/branches/sca-equinox/tools/eclipse/plugins/core/xsd/sca-interface-cpp.xsd
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--  (c) Copyright SCA Collaboration 2006  -->
-<schema xmlns="http://www.w3.org/2001/XMLSchema"
-    targetNamespace="http://www.commonj.org/xmlns/sca/1.0/"
-    xmlns:sca="http://www.commonj.org/xmlns/sca/1.0/"
-    xmlns:sdo="commonj.sdo/XML"
-    elementFormDefault="qualified">
-
-    <include schemaLocation="sca-core.xsd"/>
-
-    <element name="interface.cpp" type="sca:CPPInterface" substitutionGroup="sca:interface"/>
-
-    <complexType name="CPPInterface">
-        <complexContent>
-            <extension base="sca:Interface">
-                <sequence>
-                    <element name="method" type="sca:CPPMethod" minOccurs="0" maxOccurs="unbounded" />
-                    <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-                </sequence>
-                <attribute name="header" type="NCName" use="required"/>
-                <attribute name="class" type="Name" use="required"/>
-                <attribute name="callbackHeader" type="NCName" use="optional"/>
-                <attribute name="callbackClass" type="Name" use="optional"/>
-                <attribute name="remotable" type="boolean" use="optional"/>
-                <anyAttribute namespace="##any" processContents="lax"/>
-            </extension>
-        </complexContent>
-    </complexType>
-
-    <complexType name="CPPMethod">
-        <complexContent>
-            <attribute name="name" type="NCName" use="required"/>
-            <attribute name="oneWay" type="boolean" use="optional"/>
-            <attribute name="endConversation" type="boolean" use="optional"/>
-            <anyAttribute namespace="##any" processContents="lax"/>
-        </complexContent>
-    </complexType>
-
-</schema>
-
diff --git a/branches/sca-equinox/tools/eclipse/plugins/core/xsd/sca-interface-java.xsd b/branches/sca-equinox/tools/eclipse/plugins/core/xsd/sca-interface-java.xsd
deleted file mode 100644
index 81f939bdb4..0000000000
--- a/branches/sca-equinox/tools/eclipse/plugins/core/xsd/sca-interface-java.xsd
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- (c) Copyright SCA Collaboration 2006, 2007 -->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-    targetNamespace="http://www.osoa.org/xmlns/sca/1.0" 
-    xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"
-        elementFormDefault="qualified">
-
-    <include schemaLocation="sca-core.xsd"/>
-
-    <element name="interface.java" type="sca:JavaInterface" substitutionGroup="sca:interface"/>
-    <complexType name="JavaInterface">
-        <complexContent>
-            <extension base="sca:Interface">
-                <sequence>
-                    <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-                </sequence>
-                <attribute name="interface" type="NCName" use="required"/>
-                <attribute name="callbackInterface" type="NCName" use="optional"/>
-                <anyAttribute namespace="##any" processContents="lax"/>
-            </extension>
-        </complexContent>
-    </complexType>
-</schema>
-\ No newline at end of file
diff --git a/branches/sca-equinox/tools/eclipse/plugins/core/xsd/sca-interface-wsdl.xsd b/branches/sca-equinox/tools/eclipse/plugins/core/xsd/sca-interface-wsdl.xsd
deleted file mode 100644
index c1fdfd8f3c..0000000000
--- a/branches/sca-equinox/tools/eclipse/plugins/core/xsd/sca-interface-wsdl.xsd
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- (c) Copyright SCA Collaboration 2006, 2007 -->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-    targetNamespace="http://www.osoa.org/xmlns/sca/1.0" 
-    xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"
-        elementFormDefault="qualified">
-
-    <include schemaLocation="sca-core.xsd"/>
-
-    <element name="interface.wsdl" type="sca:WSDLPortType" substitutionGroup="sca:interface"/>
-    <complexType name="WSDLPortType">
-        <complexContent>
-            <extension base="sca:Interface">
-                <sequence>
-                    <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-                </sequence>
-                <attribute name="interface" type="anyURI" use="required"/>
-                <attribute name="callbackInterface" type="anyURI" use="optional"/>
-                <anyAttribute namespace="##any" processContents="lax"/>
-            </extension>
-        </complexContent>
-    </complexType>
-</schema>
-\ No newline at end of file
diff --git a/branches/sca-equinox/tools/eclipse/plugins/core/xsd/sca-policy.xsd b/branches/sca-equinox/tools/eclipse/plugins/core/xsd/sca-policy.xsd
deleted file mode 100644
index c22ffd6618..0000000000
--- a/branches/sca-equinox/tools/eclipse/plugins/core/xsd/sca-policy.xsd
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- (c) Copyright SCA Collaboration 2006, 2007 -->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-        targetNamespace="http://www.osoa.org/xmlns/sca/1.0" 
-        xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"
-		xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy"
-        elementFormDefault="qualified">
-        
-    <include schemaLocation="sca-core.xsd"/>
-		
-	<element name="intent" type="sca:Intent"/>	
-	<complexType name="Intent">
-		<sequence>
-			<element name="description" type="string" minOccurs="0" maxOccurs="1" />
-			<any namespace="##other" processContents="lax"
-				minOccurs="0" maxOccurs="unbounded"/>
-		</sequence>
-        <attribute name="name" type="QName" use="required"/>
-		<attribute name="constrains" type="sca:listOfQNames" use="optional"/>
-		<attribute name="requires" type="sca:listOfQNames" use="optional"/>
-		<anyAttribute namespace="##any" processContents="lax"/>    
-	</complexType>
-		
-	<element name="policySet" type="sca:PolicySet"/>
-	<complexType name="PolicySet">
-		<choice minOccurs="0" maxOccurs="unbounded">
-			<element name="policySetReference" type="sca:PolicySetReference"/>
-			<element name="intentMap" type="sca:IntentMap"/>
-			<any namespace="##other" processContents="lax"/>
-		</choice>
-		<attribute name="name" type="QName" use="required"/>
-		<attribute name="provides" type="sca:listOfQNames" use="optional"/>
-		<attribute name="appliesTo" type="string" use="required"/>
-		<anyAttribute namespace="##any" processContents="lax"/>    
-	</complexType>
-
-	<complexType name="PolicySetReference">
-		<attribute name="name" type="QName" use="required"/>
-		<anyAttribute namespace="##any" processContents="lax"/>    
-	</complexType>
-	
-	<complexType name="IntentMap">
-		<choice minOccurs="1" maxOccurs="unbounded">
-			<element name="qualifier" type="sca:Qualifier"/>
-			<any namespace="##other" processContents="lax"/>
-		</choice>
-		<attribute name="provides" type="QName" use="required"/>
-		<attribute name="default" type="string" use="optional"/>
-		<anyAttribute namespace="##any" processContents="lax"/>    
-	</complexType>
-	
-	<complexType name="Qualifier">
-		<choice minOccurs="1" maxOccurs="unbounded">
-			<element name="intentMap" type="sca:IntentMap"/>
-			<any namespace="##other" processContents="lax"/>
-		</choice>
-		<attribute name="name" type="string" use="required"/>
-		<anyAttribute namespace="##any" processContents="lax"/>    
-	</complexType>
-
-	<element name="allow" type="sca:Allow"/>
-	<complexType name="Allow">
-		<attribute name="roles" type="string" use="required"/>
-	</complexType>
-
-	<element name="permitAll" type="sca:PermitAll"/>
-	<complexType name="PermitAll"/>
-
-	<element name="denyAll" type="sca:DenyAll"/>
-	<complexType name="DenyAll"/>
-
-	<element name="runAs" type="sca:RunAs"/>
-	<complexType name="RunAs">
-		<attribute name="role" type="string" use="required"/>
-	</complexType>
-</schema>
diff --git a/branches/sca-equinox/tools/eclipse/plugins/core/xsd/sca.xsd b/branches/sca-equinox/tools/eclipse/plugins/core/xsd/sca.xsd
deleted file mode 100644
index 10f54275d0..0000000000
--- a/branches/sca-equinox/tools/eclipse/plugins/core/xsd/sca.xsd
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- (c) Copyright SCA Collaboration 2006, 2007 -->
-<schema xmlns="http://www.w3.org/2001/XMLSchema"
-    targetNamespace="http://www.osoa.org/xmlns/sca/1.0" 
-    xmlns:sca="http://www.osoa.org/xmlns/sca/1.0">
-
-    <include schemaLocation="sca-core.xsd"/>
-
-    <include schemaLocation="sca-interface-java.xsd"/>
-    <include schemaLocation="sca-interface-wsdl.xsd"/>
-
-    <include schemaLocation="sca-implementation-java.xsd"/>
-    <include schemaLocation="sca-implementation-composite.xsd"/>
-
-    <include schemaLocation="sca-binding-webservice.xsd"/>
-    <include schemaLocation="sca-binding-jms.xsd"/>
-    <include schemaLocation="sca-binding-sca.xsd"/>
-    
-    <include schemaLocation="sca-definitions.xsd"/>
-    <include schemaLocation="sca-policy.xsd"/>
-    
-</schema>
-\ No newline at end of file
diff --git a/branches/sca-equinox/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-atom.xsd b/branches/sca-equinox/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-atom.xsd
deleted file mode 100644
index c93a1d72de..0000000000
--- a/branches/sca-equinox/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-atom.xsd
+++ /dev/null
@@ -1,41 +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.    
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-    targetNamespace="http://tuscany.apache.org/xmlns/sca/1.0" 
-    xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"
-    xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0" 
-    elementFormDefault="qualified">
-
-    <import namespace="http://www.osoa.org/xmlns/sca/1.0" schemaLocation="sca-core.xsd"/>
-
-    <element name="binding.atom" type="t:AtomBinding"/>
-    
-    <complexType name="AtomBinding">
-        <complexContent>
-            <extension base="sca:Binding">
-                <sequence>
-                    <any namespace="##targetNamespace" processContents="lax" minOccurs="0"
-                         maxOccurs="unbounded"/>
-                </sequence>
-                <attribute name="title" type="string" use="optional"/>
-            </extension>
-        </complexContent>
-    </complexType>
-</schema>
diff --git a/branches/sca-equinox/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-dwr.xsd b/branches/sca-equinox/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-dwr.xsd
deleted file mode 100644
index d0da5421ec..0000000000
--- a/branches/sca-equinox/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-dwr.xsd
+++ /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.    
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-    targetNamespace="http://tuscany.apache.org/xmlns/sca/1.0" 
-    xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"
-    xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0" 
-    elementFormDefault="qualified">
-
-    <import namespace="http://www.osoa.org/xmlns/sca/1.0" schemaLocation="sca-core.xsd"/>
-
-    <element name="binding.dwr" type="t:DWRBinding"/>
-    
-    <complexType name="DWRBinding">
-        <complexContent>
-            <extension base="sca:Binding">
-                <sequence>
-                    <any namespace="##targetNamespace" processContents="lax" minOccurs="0"
-                         maxOccurs="unbounded"/>
-                </sequence>
-            </extension>
-        </complexContent>
-    </complexType>
-</schema>
diff --git a/branches/sca-equinox/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-http.xsd b/branches/sca-equinox/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-http.xsd
deleted file mode 100644
index ff48b97d7a..0000000000
--- a/branches/sca-equinox/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-http.xsd
+++ /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.    
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-    targetNamespace="http://tuscany.apache.org/xmlns/sca/1.0" 
-    xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"
-    xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0" 
-    elementFormDefault="qualified">
-
-    <import namespace="http://www.osoa.org/xmlns/sca/1.0" schemaLocation="sca-core.xsd"/>
-
-    <element name="binding.http" type="t:HTTPBinding"/>
-    
-    <complexType name="HTTPBinding">
-        <complexContent>
-            <extension base="sca:Binding">
-                <sequence>
-                    <any namespace="##targetNamespace" processContents="lax" minOccurs="0"
-                         maxOccurs="unbounded"/>
-                </sequence>
-            </extension>
-        </complexContent>
-    </complexType>
-</schema>
diff --git a/branches/sca-equinox/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-jsonrpc.xsd b/branches/sca-equinox/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-jsonrpc.xsd
deleted file mode 100644
index 7c79738898..0000000000
--- a/branches/sca-equinox/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-jsonrpc.xsd
+++ /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.    
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-    targetNamespace="http://tuscany.apache.org/xmlns/sca/1.0" 
-    xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"
-    xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0" 
-    elementFormDefault="qualified">
-
-    <import namespace="http://www.osoa.org/xmlns/sca/1.0" schemaLocation="sca-core.xsd"/>
-
-    <element name="binding.jsonrpc" type="t:JSONRPCBinding"/>
-    
-    <complexType name="JSONRPCBinding">
-        <complexContent>
-            <extension base="sca:Binding">
-                <sequence>
-                    <any namespace="##targetNamespace" processContents="lax" minOccurs="0"
-                         maxOccurs="unbounded"/>
-                </sequence>
-            </extension>
-        </complexContent>
-    </complexType>
-</schema>
diff --git a/branches/sca-equinox/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-notification.xsd b/branches/sca-equinox/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-notification.xsd
deleted file mode 100644
index 6d5468b2f9..0000000000
--- a/branches/sca-equinox/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-notification.xsd
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-    targetNamespace="http://tuscany.apache.org/xmlns/sca/1.0" 
-    xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"
-    xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0" 
-    elementFormDefault="qualified">
-
-    <import namespace="http://www.osoa.org/xmlns/sca/1.0" schemaLocation="sca-core.xsd"/>
-
-    <element name="binding.notification" type="t:NotificationBinding"/>
-    
-    <complexType name="NotificationBinding">
-        <complexContent>
-            <extension base="sca:Binding">
-                <sequence>
-                    <any namespace="##targetNamespace" processContents="lax" minOccurs="0"
-                         maxOccurs="unbounded"/>
-                </sequence>
-                <attribute name="ntm" type="anyURI" use="optional"/>
-                <attribute name="notificationType" type="anyURI" use="optional"/>
-            </extension>
-        </complexContent>
-    </complexType>
-</schema>
diff --git a/branches/sca-equinox/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-rmi.xsd b/branches/sca-equinox/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-rmi.xsd
deleted file mode 100644
index 26be6feae5..0000000000
--- a/branches/sca-equinox/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-rmi.xsd
+++ /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.    
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-    targetNamespace="http://tuscany.apache.org/xmlns/sca/1.0" 
-    xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"
-    xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0" 
-    elementFormDefault="qualified">
-
-    <import namespace="http://www.osoa.org/xmlns/sca/1.0" schemaLocation="sca-core.xsd"/>
-
-    <element name="binding.rmi" type="t:RMIBinding"/>
-    
-    <complexType name="RMIBinding">
-        <complexContent>
-            <extension base="sca:Binding">
-                <sequence>
-                    <any namespace="##targetNamespace" processContents="lax" minOccurs="0"
-                         maxOccurs="unbounded"/>
-                </sequence>
-            </extension>
-        </complexContent>
-    </complexType>
-</schema>
diff --git a/branches/sca-equinox/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-rss.xsd b/branches/sca-equinox/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-rss.xsd
deleted file mode 100644
index 821f323d73..0000000000
--- a/branches/sca-equinox/tools/eclipse/plugins/core/xsd/tuscany-sca-binding-rss.xsd
+++ /dev/null
@@ -1,41 +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.    
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-    targetNamespace="http://tuscany.apache.org/xmlns/sca/1.0" 
-    xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"
-    xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0" 
-    elementFormDefault="qualified">
-
-    <import namespace="http://www.osoa.org/xmlns/sca/1.0" schemaLocation="sca-core.xsd"/>
-
-    <element name="binding.rss" type="t:RSSBinding"/>
-    
-    <complexType name="RSSBinding">
-        <complexContent>
-            <extension base="sca:Binding">
-                <sequence>
-                    <any namespace="##targetNamespace" processContents="lax" minOccurs="0"
-                         maxOccurs="unbounded"/>
-                </sequence>
-                <attribute name="title" type="string" use="optional"/>
-            </extension>
-        </complexContent>
-    </complexType>
-</schema>
diff --git a/branches/sca-equinox/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-node.xsd b/branches/sca-equinox/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-node.xsd
deleted file mode 100644
index 1b5c8aece2..0000000000
--- a/branches/sca-equinox/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-node.xsd
+++ /dev/null
@@ -1,43 +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.    
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-    targetNamespace="http://tuscany.apache.org/xmlns/sca/1.0" 
-    xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"
-    xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0" 
-    elementFormDefault="qualified">
-
-    <import namespace="http://www.osoa.org/xmlns/sca/1.0" schemaLocation="sca-core.xsd"/>
-
-    <element name="implementation.node" type="t:NodeImplementation"/>
-    	
-    <complexType name="NodeImplementation">
-        <complexContent>
-            <extension base="sca:Implementation">
-                <sequence>
-                    <any namespace="##targetNamespace" processContents="lax" 
-                    	minOccurs="0" maxOccurs="unbounded"/>
-                </sequence>
-                <attribute name="uri" type="string" use="required"/>
-                <attribute name="composite" type="QName" use="required"/>
-            </extension>
-        </complexContent>
-    </complexType>
-
-</schema>
diff --git a/branches/sca-equinox/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-notification.xsd b/branches/sca-equinox/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-notification.xsd
deleted file mode 100644
index f8d437310e..0000000000
--- a/branches/sca-equinox/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-notification.xsd
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-    targetNamespace="http://tuscany.apache.org/xmlns/sca/1.0" 
-    xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"
-    xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0" 
-    elementFormDefault="qualified">
-
-    <import namespace="http://www.osoa.org/xmlns/sca/1.0" schemaLocation="sca-core.xsd"/>
-
-    <element name="implementation.notification" type="t:NotificationImplementation"/>
-    	
-    <complexType name="NotificationImplementation">
-        <complexContent>
-            <extension base="sca:Implementation">
-                <sequence>
-                    <any namespace="##targetNamespace" processContents="lax" 
-                    	minOccurs="0" maxOccurs="unbounded"/>
-                </sequence>
-                <attribute name="name" type="NCName" use="required"/>
-            </extension>
-        </complexContent>
-    </complexType>
-
-</schema>
diff --git a/branches/sca-equinox/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-osgi.xsd b/branches/sca-equinox/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-osgi.xsd
deleted file mode 100644
index f8ece54a07..0000000000
--- a/branches/sca-equinox/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-osgi.xsd
+++ /dev/null
@@ -1,43 +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.    
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-    targetNamespace="http://tuscany.apache.org/xmlns/sca/1.0" 
-    xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"
-    xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0" 
-    elementFormDefault="qualified">
-
-    <import namespace="http://www.osoa.org/xmlns/sca/1.0" schemaLocation="sca-core.xsd"/>
-
-    <element name="implementation.osgi" type="t:OSGiImplementation"/>
-    	
-    <!-- TODO Declare the proper attributes and elements -->
-    <complexType name="OSGiImplementation">
-        <complexContent>
-            <extension base="sca:Implementation">
-                <sequence>
-                    <any namespace="##any" processContents="lax" 
-                    	minOccurs="0" maxOccurs="unbounded"/>
-                </sequence>
-                <anyAttribute namespace="##any" processContents="lax"/>
-            </extension>
-        </complexContent>
-    </complexType>
-
-</schema>
diff --git a/branches/sca-equinox/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-resource.xsd b/branches/sca-equinox/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-resource.xsd
deleted file mode 100644
index dd596821ea..0000000000
--- a/branches/sca-equinox/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-resource.xsd
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-    targetNamespace="http://tuscany.apache.org/xmlns/sca/1.0" 
-    xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"
-    xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0" 
-    elementFormDefault="qualified">
-
-    <import namespace="http://www.osoa.org/xmlns/sca/1.0" schemaLocation="sca-core.xsd"/>
-
-    <element name="implementation.resource" type="t:ResourceImplementation"/>
-    	
-    <complexType name="ResourceImplementation">
-        <complexContent>
-            <extension base="sca:Implementation">
-                <sequence>
-                    <any namespace="##targetNamespace" processContents="lax" 
-                    	minOccurs="0" maxOccurs="unbounded"/>
-                </sequence>
-                <attribute name="location" type="anyURI" use="required"/>
-            </extension>
-        </complexContent>
-    </complexType>
-
-</schema>
diff --git a/branches/sca-equinox/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-script.xsd b/branches/sca-equinox/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-script.xsd
deleted file mode 100644
index e1723d65f0..0000000000
--- a/branches/sca-equinox/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-script.xsd
+++ /dev/null
@@ -1,43 +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.    
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-    targetNamespace="http://tuscany.apache.org/xmlns/sca/1.0" 
-    xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"
-    xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0" 
-    elementFormDefault="qualified">
-
-    <import namespace="http://www.osoa.org/xmlns/sca/1.0" schemaLocation="sca-core.xsd"/>
-
-    <element name="implementation.script" type="t:ScriptImplementation"/>
-    	
-    <complexType name="ScriptImplementation">
-        <complexContent mixed="true">
-            <extension base="sca:Implementation">
-                <sequence>
-                    <any namespace="##targetNamespace" processContents="lax" 
-                    	minOccurs="0" maxOccurs="unbounded"/>
-                </sequence>
-                <attribute name="script" type="anyURI" use="optional"/>
-                <attribute name="language" type="NCName" use="optional"/>
-            </extension>
-        </complexContent>
-    </complexType>
-
-</schema>
diff --git a/branches/sca-equinox/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-widget.xsd b/branches/sca-equinox/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-widget.xsd
deleted file mode 100644
index 0c0998595f..0000000000
--- a/branches/sca-equinox/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-widget.xsd
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-    targetNamespace="http://tuscany.apache.org/xmlns/sca/1.0" 
-    xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"
-    xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0" 
-    elementFormDefault="qualified">
-
-    <import namespace="http://www.osoa.org/xmlns/sca/1.0" schemaLocation="sca-core.xsd"/>
-
-    <element name="implementation.widget" type="t:WidgetImplementation"/>
-    	
-    <complexType name="WidgetImplementation">
-        <complexContent>
-            <extension base="sca:Implementation">
-                <sequence>
-                    <any namespace="##targetNamespace" processContents="lax" 
-                    	minOccurs="0" maxOccurs="unbounded"/>
-                </sequence>
-                <attribute name="location" type="anyURI" use="required"/>
-            </extension>
-        </complexContent>
-    </complexType>
-
-</schema>
diff --git a/branches/sca-equinox/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-xquery.xsd b/branches/sca-equinox/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-xquery.xsd
deleted file mode 100644
index cdabb697aa..0000000000
--- a/branches/sca-equinox/tools/eclipse/plugins/core/xsd/tuscany-sca-implementation-xquery.xsd
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" 
-    targetNamespace="http://tuscany.apache.org/xmlns/sca/1.0" 
-    xmlns:sca="http://www.osoa.org/xmlns/sca/1.0"
-    xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0" 
-    elementFormDefault="qualified">
-
-    <import namespace="http://www.osoa.org/xmlns/sca/1.0" schemaLocation="sca-core.xsd"/>
-
-    <element name="implementation.xquery" type="t:XQueryImplementation"/>
-    	
-    <complexType name="XQueryImplementation">
-        <complexContent>
-            <extension base="sca:Implementation">
-                <sequence>
-                    <any namespace="##targetNamespace" processContents="lax" 
-                    	minOccurs="0" maxOccurs="unbounded"/>
-                </sequence>
-                <attribute name="location" type="anyURI" use="required"/>
-            </extension>
-        </complexContent>
-    </complexType>
-
-</schema>
diff --git a/branches/sca-equinox/tools/eclipse/plugins/core/xsd/tuscany-sca.xsd b/branches/sca-equinox/tools/eclipse/plugins/core/xsd/tuscany-sca.xsd
deleted file mode 100644
index da5e696e01..0000000000
--- a/branches/sca-equinox/tools/eclipse/plugins/core/xsd/tuscany-sca.xsd
+++ /dev/null
@@ -1,45 +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.    
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema"
-    targetNamespace="http://tuscany.apache.org/xmlns/sca/1.0">
-    
-    <import namespace="http://www.osoa.org/xmlns/sca/1.0" schemaLocation="sca-all.xsd"/>
-
-    <include schemaLocation="tuscany-sca-binding-atom.xsd"/>
-    <include schemaLocation="tuscany-sca-binding-dwr.xsd"/>
-    <include schemaLocation="tuscany-sca-binding-http.xsd"/>
-    <include schemaLocation="tuscany-sca-binding-jsonrpc.xsd"/>
-    <include schemaLocation="tuscany-sca-binding-notification.xsd"/>
-    <include schemaLocation="tuscany-sca-binding-rmi.xsd"/>
-    <include schemaLocation="tuscany-sca-binding-rss.xsd"/>
-    
-    <!--
-    <include schemaLocation="tuscany-sca-implementation-das.xsd"/>
-    <include schemaLocation="tuscany-sca-implementation-data.xsd"/>
-    -->
-    <include schemaLocation="tuscany-sca-implementation-node.xsd"/>
-    <include schemaLocation="tuscany-sca-implementation-notification.xsd"/>
-    <include schemaLocation="tuscany-sca-implementation-osgi.xsd"/>
-    <include schemaLocation="tuscany-sca-implementation-resource.xsd"/>
-    <include schemaLocation="tuscany-sca-implementation-script.xsd"/>
-    <include schemaLocation="tuscany-sca-implementation-widget.xsd"/>
-    <include schemaLocation="tuscany-sca-implementation-xquery.xsd"/>
-    
-</schema>
-\ No newline at end of file
diff --git a/branches/sca-equinox/tools/eclipse/plugins/ejava/LICENSE b/branches/sca-equinox/tools/eclipse/plugins/ejava/LICENSE
deleted file mode 100644
index 8aa906c321..0000000000
--- a/branches/sca-equinox/tools/eclipse/plugins/ejava/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-equinox/tools/eclipse/plugins/ejava/META-INF/MANIFEST.MF b/branches/sca-equinox/tools/eclipse/plugins/ejava/META-INF/MANIFEST.MF
deleted file mode 100644
index fb238f04b1..0000000000
--- a/branches/sca-equinox/tools/eclipse/plugins/ejava/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,32 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Apache Tuscany SCA JEE Eclipse Plugin
-Bundle-SymbolicName: org.apache.tuscany.sca.plugin.ejava;singleton:=true
-Bundle-Version: 1.4.0
-Import-Package: org.apache.tuscany.sca.plugin.core.classpath,
- org.eclipse.core.resources,
- org.eclipse.core.runtime,
- org.eclipse.core.runtime.jobs,
- org.eclipse.debug.core,
- org.eclipse.debug.core.model,
- org.eclipse.debug.ui,
- org.eclipse.debug.ui.sourcelookup,
- org.eclipse.jdt.core,
- org.eclipse.jdt.debug.ui.launchConfigurations,
- org.eclipse.jdt.launching,
- org.eclipse.jdt.ui.wizards,
- org.eclipse.jface.dialogs,
- org.eclipse.jface.operation,
- org.eclipse.jface.resource,
- org.eclipse.jface.viewers,
- org.eclipse.jface.wizard,
- org.eclipse.osgi.service.datalocation;version="1.0.0",
- org.eclipse.swt,
- org.eclipse.swt.graphics,
- org.eclipse.swt.widgets,
- org.eclipse.ui,
- org.eclipse.ui.progress,
- org.osgi.framework;version="1.3.0"
-Bundle-Vendor: Apache Software Foundation
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Require-Bundle: org.eclipse.ui.ide
diff --git a/branches/sca-equinox/tools/eclipse/plugins/ejava/NOTICE b/branches/sca-equinox/tools/eclipse/plugins/ejava/NOTICE
deleted file mode 100644
index 6dcfe88195..0000000000
--- a/branches/sca-equinox/tools/eclipse/plugins/ejava/NOTICE
+++ /dev/null
@@ -1,12 +0,0 @@
-${pom.name}
-Copyright (c) 2005 - 2008 The Apache Software Foundation
-
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
-
-This product also includes software under the SCA Collaboration license 
-(see the LICENSE file contained in this distribution), with the following
-copyright:
-
-(c) Copyright SCA Collaboration 2006, 2007
-
diff --git a/branches/sca-equinox/tools/eclipse/plugins/ejava/build.properties b/branches/sca-equinox/tools/eclipse/plugins/ejava/build.properties
deleted file mode 100644
index c402b2eb45..0000000000
--- a/branches/sca-equinox/tools/eclipse/plugins/ejava/build.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-output.. = bin/
-bin.includes = META-INF/,\
-               plugin.xml,\
-               xsd/,\
-               icons/,\
-               .,\
-               LICENSE,\
-               NOTICE,\
-               org/
-src.includes = xsd/,\
-               plugin.xml,\
-               .classpath,\
-               .project,\
-               LICENSE,\
-               META-INF/,\
-               NOTICE,\
-               build.properties,\
-               icons/,\
-               .settings/,\
-               org/,\
-               pom.xml
-jars.compile.order = .
-source.. = .
diff --git a/branches/sca-equinox/tools/eclipse/plugins/ejava/org/apache/tuscany/sca/plugin/ejava/classpath/EJavaClasspathContainer.java b/branches/sca-equinox/tools/eclipse/plugins/ejava/org/apache/tuscany/sca/plugin/ejava/classpath/EJavaClasspathContainer.java
deleted file mode 100644
index eae6682e3b..0000000000
--- a/branches/sca-equinox/tools/eclipse/plugins/ejava/org/apache/tuscany/sca/plugin/ejava/classpath/EJavaClasspathContainer.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.plugin.ejava.classpath;
-
-import org.apache.tuscany.sca.plugin.core.classpath.BaseClasspathContainer;
-import org.apache.tuscany.sca.plugin.core.classpath.RuntimeClasspathContainer;
-
-
-/**
- * A classpath container for the core runtime.
- * 
- * @version $Rev$ $Date$
- */
-public class EJavaClasspathContainer extends BaseClasspathContainer implements RuntimeClasspathContainer {
-    
-    public EJavaClasspathContainer() {
-        super("org.apache.tuscany.sca.plugin.ejava",
-              "org.apache.tuscany.sca.plugin.ejava.runtime.library", "Tuscany SCA JEE Library", 
-              "tuscany-sca", "tuscany-distribution-ejava", "1.4-EQUINOX-SNAPSHOT",
-              "TUSCANY_HOME", "TUSCANY_SRC");
-    }
-}
diff --git a/branches/sca-equinox/tools/eclipse/plugins/ejava/org/apache/tuscany/sca/plugin/ejava/classpath/EJavaClasspathContainerInitializer.java b/branches/sca-equinox/tools/eclipse/plugins/ejava/org/apache/tuscany/sca/plugin/ejava/classpath/EJavaClasspathContainerInitializer.java
deleted file mode 100644
index 9b7c199c79..0000000000
--- a/branches/sca-equinox/tools/eclipse/plugins/ejava/org/apache/tuscany/sca/plugin/ejava/classpath/EJavaClasspathContainerInitializer.java
+++ /dev/null
@@ -1,38 +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.plugin.ejava.classpath;
-
-import org.apache.tuscany.sca.plugin.core.classpath.BaseClasspathContainerInitializer;
-import org.apache.tuscany.sca.plugin.core.classpath.RuntimeClasspathContainerInitializer;
-import org.apache.tuscany.sca.plugin.ejava.classpath.EJavaClasspathContainer;
-
-
-/**
- * A classpath container initializer for the core runtime.
- *
- * @version $Rev$ $Date$
- */
-public class EJavaClasspathContainerInitializer extends BaseClasspathContainerInitializer implements RuntimeClasspathContainerInitializer {
-    
-    public EJavaClasspathContainerInitializer() {
-        super(new EJavaClasspathContainer());
-    }
-
-}
diff --git a/branches/sca-equinox/tools/eclipse/plugins/ejava/plugin.xml b/branches/sca-equinox/tools/eclipse/plugins/ejava/plugin.xml
deleted file mode 100644
index fef1afe0b9..0000000000
--- a/branches/sca-equinox/tools/eclipse/plugins/ejava/plugin.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.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.    
--->
-<plugin>
-
-	<extension
-       point="org.apache.tuscany.sca.plugin.core.runtimeClasspathContainerInitializer">
-    	<runtimeClasspathContainerInitializer
-    			id="org.apache.tuscany.sca.plugin.ejava.runtime.library"
-				class="org.apache.tuscany.sca.plugin.ejava.classpath.EJavaClasspathContainerInitializer"/>                       
-	</extension>	
-
-</plugin>
diff --git a/branches/sca-equinox/tools/eclipse/plugins/ejava/pom.xml b/branches/sca-equinox/tools/eclipse/plugins/ejava/pom.xml
deleted file mode 100644
index 9c340135a5..0000000000
--- a/branches/sca-equinox/tools/eclipse/plugins/ejava/pom.xml
+++ /dev/null
@@ -1,151 +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-sca-eclipse-tools</artifactId>
-        <version>1.4-EQUINOX-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
-    </parent>
-    <artifactId>org.apache.tuscany.sca.plugin.ejava</artifactId>
-    <name>Apache Tuscany SCA JEE Eclipse Plugin</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.eclipse.jdt.debug</groupId>
-            <artifactId>ui</artifactId>
-            <version>3.2.100-v20070531-1800</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.eclipse.equinox</groupId>
-                    <artifactId>common</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.eclipse.equinox</groupId>
-                    <artifactId>app</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
-        <dependency>
-            <groupId>org.eclipse.equinox</groupId>
-            <artifactId>app</artifactId>
-            <version>1.0.0-v20070606</version>
-        </dependency>        
-
-        <dependency>
-            <groupId>org.eclipse.equinox</groupId>
-            <artifactId>common</artifactId>
-            <version>3.3.0-v20070426</version>
-        </dependency>        
-
-        <dependency>
-            <groupId>org.eclipse.swt.win32.win32</groupId>
-            <artifactId>x86</artifactId>
-            <version>3.3.0-v3346</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>org.apache.tuscany.sca.plugin.core</artifactId>
-            <version>1.4-EQUINOX-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-distribution-ejava</artifactId>
-            <version>1.4-EQUINOX-SNAPSHOT</version>
-            <type>zip</type>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-distribution-ejava</artifactId>
-            <version>1.4-EQUINOX-SNAPSHOT</version>
-            <classifier>src</classifier>
-            <type>zip</type>
-        </dependency>
-    </dependencies>
-
-    <build>
-       <sourceDirectory>${basedir}</sourceDirectory>
-       <resources>
-          <resource>
-              <directory>${basedir}</directory>
-              <excludes>
-                  <exclude>**/*.java</exclude>
-                  <exclude>**/.*/**</exclude>
-                  <exclude>pom.xml</exclude>
-                  <exclude>build.*</exclude>
-                  <exclude>target/**</exclude>
-              </excludes>
-          </resource>
-       </resources>
-       
-       <plugins>
-           <plugin>
-               <groupId>org.apache.maven.plugins</groupId>
-               <artifactId>maven-jar-plugin</artifactId>
-               <configuration>
-                   <classifier>tmp</classifier>
-                   <archive>
-                       <manifestFile>META-INF/MANIFEST.MF</manifestFile>
-                   </archive>
-               </configuration>
-            </plugin>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-assembly-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>distribution-package</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>single</goal>
-                        </goals>
-                        <configuration>
-                            <descriptors>
-                                <descriptor>../core/src/main/assembly/jar.xml</descriptor>
-                            </descriptors>
-                            <tarLongFileMode>gnu</tarLongFileMode>
-                            <appendAssemblyId>false</appendAssemblyId>
-                            <archive>
-                                <manifestFile>META-INF/MANIFEST.MF</manifestFile>
-                            </archive>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
-    <repositories>
-        <repository>
-            <id>repo1.eclipse</id>
-            <url>http://repo1.maven.org/eclipse/</url>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-        </repository>
-    </repositories>
-
-</project>
diff --git a/branches/sca-equinox/tools/eclipse/plugins/manager/LICENSE b/branches/sca-equinox/tools/eclipse/plugins/manager/LICENSE
deleted file mode 100644
index 8aa906c321..0000000000
--- a/branches/sca-equinox/tools/eclipse/plugins/manager/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-equinox/tools/eclipse/plugins/manager/META-INF/MANIFEST.MF b/branches/sca-equinox/tools/eclipse/plugins/manager/META-INF/MANIFEST.MF
deleted file mode 100644
index 2a70682fae..0000000000
--- a/branches/sca-equinox/tools/eclipse/plugins/manager/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,32 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Apache Tuscany SCA Domain Manager Eclipse Plugin
-Bundle-SymbolicName: org.apache.tuscany.sca.plugin.manager;singleton:=true
-Bundle-Version: 1.4.0
-Import-Package: org.apache.tuscany.sca.plugin.core.classpath,
- org.eclipse.core.resources,
- org.eclipse.core.runtime,
- org.eclipse.core.runtime.jobs,
- org.eclipse.debug.core,
- org.eclipse.debug.core.model,
- org.eclipse.debug.ui,
- org.eclipse.debug.ui.sourcelookup,
- org.eclipse.jdt.core,
- org.eclipse.jdt.debug.ui.launchConfigurations,
- org.eclipse.jdt.launching,
- org.eclipse.jdt.ui.wizards,
- org.eclipse.jface.dialogs,
- org.eclipse.jface.operation,
- org.eclipse.jface.resource,
- org.eclipse.jface.viewers,
- org.eclipse.jface.wizard,
- org.eclipse.osgi.service.datalocation;version="1.0.0",
- org.eclipse.swt,
- org.eclipse.swt.graphics,
- org.eclipse.swt.widgets,
- org.eclipse.ui,
- org.eclipse.ui.progress,
- org.osgi.framework;version="1.3.0"
-Bundle-Vendor: Apache Software Foundation
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Require-Bundle: org.eclipse.ui.ide
diff --git a/branches/sca-equinox/tools/eclipse/plugins/manager/NOTICE b/branches/sca-equinox/tools/eclipse/plugins/manager/NOTICE
deleted file mode 100644
index 6dcfe88195..0000000000
--- a/branches/sca-equinox/tools/eclipse/plugins/manager/NOTICE
+++ /dev/null
@@ -1,12 +0,0 @@
-${pom.name}
-Copyright (c) 2005 - 2008 The Apache Software Foundation
-
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
-
-This product also includes software under the SCA Collaboration license 
-(see the LICENSE file contained in this distribution), with the following
-copyright:
-
-(c) Copyright SCA Collaboration 2006, 2007
-
diff --git a/branches/sca-equinox/tools/eclipse/plugins/manager/build.properties b/branches/sca-equinox/tools/eclipse/plugins/manager/build.properties
deleted file mode 100644
index c402b2eb45..0000000000
--- a/branches/sca-equinox/tools/eclipse/plugins/manager/build.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-output.. = bin/
-bin.includes = META-INF/,\
-               plugin.xml,\
-               xsd/,\
-               icons/,\
-               .,\
-               LICENSE,\
-               NOTICE,\
-               org/
-src.includes = xsd/,\
-               plugin.xml,\
-               .classpath,\
-               .project,\
-               LICENSE,\
-               META-INF/,\
-               NOTICE,\
-               build.properties,\
-               icons/,\
-               .settings/,\
-               org/,\
-               pom.xml
-jars.compile.order = .
-source.. = .
diff --git a/branches/sca-equinox/tools/eclipse/plugins/manager/org/apache/tuscany/sca/plugin/manager/classpath/ManagerClasspathContainer.java b/branches/sca-equinox/tools/eclipse/plugins/manager/org/apache/tuscany/sca/plugin/manager/classpath/ManagerClasspathContainer.java
deleted file mode 100644
index 3676883f87..0000000000
--- a/branches/sca-equinox/tools/eclipse/plugins/manager/org/apache/tuscany/sca/plugin/manager/classpath/ManagerClasspathContainer.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.plugin.manager.classpath;
-
-import org.apache.tuscany.sca.plugin.core.classpath.BaseClasspathContainer;
-import org.apache.tuscany.sca.plugin.core.classpath.RuntimeClasspathContainer;
-
-
-/**
- * A classpath container for the core runtime.
- * 
- * @version $Rev$ $Date$
- */
-public class ManagerClasspathContainer extends BaseClasspathContainer implements RuntimeClasspathContainer {
-    
-    public ManagerClasspathContainer() {
-        super("org.apache.tuscany.sca.plugin.manager",
-              "org.apache.tuscany.sca.plugin.manager.runtime.library", "Tuscany SCA Domain Manager Library", 
-              "tuscany-sca", "tuscany-distribution-manager", "1.4-EQUINOX-SNAPSHOT",
-              "TUSCANY_HOME", "TUSCANY_SRC");
-    }
-}
diff --git a/branches/sca-equinox/tools/eclipse/plugins/manager/org/apache/tuscany/sca/plugin/manager/classpath/ManagerClasspathContainerInitializer.java b/branches/sca-equinox/tools/eclipse/plugins/manager/org/apache/tuscany/sca/plugin/manager/classpath/ManagerClasspathContainerInitializer.java
deleted file mode 100644
index 9c7df0f488..0000000000
--- a/branches/sca-equinox/tools/eclipse/plugins/manager/org/apache/tuscany/sca/plugin/manager/classpath/ManagerClasspathContainerInitializer.java
+++ /dev/null
@@ -1,38 +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.plugin.manager.classpath;
-
-import org.apache.tuscany.sca.plugin.core.classpath.BaseClasspathContainerInitializer;
-import org.apache.tuscany.sca.plugin.core.classpath.RuntimeClasspathContainerInitializer;
-import org.apache.tuscany.sca.plugin.manager.classpath.ManagerClasspathContainer;
-
-
-/**
- * A classpath container initializer for the core runtime.
- *
- * @version $Rev$ $Date$
- */
-public class ManagerClasspathContainerInitializer extends BaseClasspathContainerInitializer implements RuntimeClasspathContainerInitializer {
-    
-    public ManagerClasspathContainerInitializer() {
-        super(new ManagerClasspathContainer());
-    }
-
-}
diff --git a/branches/sca-equinox/tools/eclipse/plugins/manager/plugin.xml b/branches/sca-equinox/tools/eclipse/plugins/manager/plugin.xml
deleted file mode 100644
index 2e09146dfd..0000000000
--- a/branches/sca-equinox/tools/eclipse/plugins/manager/plugin.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.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.    
--->
-<plugin>
-
-	<extension
-       point="org.apache.tuscany.sca.plugin.core.runtimeClasspathContainerInitializer">
-    	<runtimeClasspathContainerInitializer
-    			id="org.apache.tuscany.sca.plugin.manager.runtime.library"
-				class="org.apache.tuscany.sca.plugin.manager.classpath.ManagerClasspathContainerInitializer"/>                       
-	</extension>	
-
-</plugin>
diff --git a/branches/sca-equinox/tools/eclipse/plugins/manager/pom.xml b/branches/sca-equinox/tools/eclipse/plugins/manager/pom.xml
deleted file mode 100644
index 12077cdd54..0000000000
--- a/branches/sca-equinox/tools/eclipse/plugins/manager/pom.xml
+++ /dev/null
@@ -1,151 +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-sca-eclipse-tools</artifactId>
-        <version>1.4-EQUINOX-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
-    </parent>
-    <artifactId>org.apache.tuscany.sca.plugin.manager</artifactId>
-    <name>Apache Tuscany SCA Domain Manager Eclipse Plugin</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.eclipse.jdt.debug</groupId>
-            <artifactId>ui</artifactId>
-            <version>3.2.100-v20070531-1800</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.eclipse.equinox</groupId>
-                    <artifactId>common</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.eclipse.equinox</groupId>
-                    <artifactId>app</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
-        <dependency>
-            <groupId>org.eclipse.equinox</groupId>
-            <artifactId>app</artifactId>
-            <version>1.0.0-v20070606</version>
-        </dependency>        
-
-        <dependency>
-            <groupId>org.eclipse.equinox</groupId>
-            <artifactId>common</artifactId>
-            <version>3.3.0-v20070426</version>
-        </dependency>        
-
-        <dependency>
-            <groupId>org.eclipse.swt.win32.win32</groupId>
-            <artifactId>x86</artifactId>
-            <version>3.3.0-v3346</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>org.apache.tuscany.sca.plugin.core</artifactId>
-            <version>1.4-EQUINOX-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-distribution-manager</artifactId>
-            <version>1.4-EQUINOX-SNAPSHOT</version>
-            <type>zip</type>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-distribution-manager</artifactId>
-            <version>1.4-EQUINOX-SNAPSHOT</version>
-            <classifier>src</classifier>
-            <type>zip</type>
-        </dependency>
-    </dependencies>
-
-    <build>
-       <sourceDirectory>${basedir}</sourceDirectory>
-       <resources>
-          <resource>
-              <directory>${basedir}</directory>
-              <excludes>
-                  <exclude>**/*.java</exclude>
-                  <exclude>**/.*/**</exclude>
-                  <exclude>pom.xml</exclude>
-                  <exclude>build.*</exclude>
-                  <exclude>target/**</exclude>
-              </excludes>
-          </resource>
-       </resources>
-       
-       <plugins>
-           <plugin>
-               <groupId>org.apache.maven.plugins</groupId>
-               <artifactId>maven-jar-plugin</artifactId>
-               <configuration>
-                   <classifier>tmp</classifier>
-                   <archive>
-                       <manifestFile>META-INF/MANIFEST.MF</manifestFile>
-                   </archive>
-               </configuration>
-            </plugin>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-assembly-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>distribution-package</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>single</goal>
-                        </goals>
-                        <configuration>
-                            <descriptors>
-                                <descriptor>../core/src/main/assembly/jar.xml</descriptor>
-                            </descriptors>
-                            <tarLongFileMode>gnu</tarLongFileMode>
-                            <appendAssemblyId>false</appendAssemblyId>
-                            <archive>
-                                <manifestFile>META-INF/MANIFEST.MF</manifestFile>
-                            </archive>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
-    <repositories>
-        <repository>
-            <id>repo1.eclipse</id>
-            <url>http://repo1.maven.org/eclipse/</url>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-        </repository>
-    </repositories>
-
-</project>
diff --git a/branches/sca-equinox/tools/eclipse/plugins/process/LICENSE b/branches/sca-equinox/tools/eclipse/plugins/process/LICENSE
deleted file mode 100644
index 8aa906c321..0000000000
--- a/branches/sca-equinox/tools/eclipse/plugins/process/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-equinox/tools/eclipse/plugins/process/META-INF/MANIFEST.MF b/branches/sca-equinox/tools/eclipse/plugins/process/META-INF/MANIFEST.MF
deleted file mode 100644
index 0acd32e51c..0000000000
--- a/branches/sca-equinox/tools/eclipse/plugins/process/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,32 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Apache Tuscany SCA Process Eclipse Plugin
-Bundle-SymbolicName: org.apache.tuscany.sca.plugin.process;singleton:=true
-Bundle-Version: 1.4.0
-Import-Package: org.apache.tuscany.sca.plugin.core.classpath,
- org.eclipse.core.resources,
- org.eclipse.core.runtime,
- org.eclipse.core.runtime.jobs,
- org.eclipse.debug.core,
- org.eclipse.debug.core.model,
- org.eclipse.debug.ui,
- org.eclipse.debug.ui.sourcelookup,
- org.eclipse.jdt.core,
- org.eclipse.jdt.debug.ui.launchConfigurations,
- org.eclipse.jdt.launching,
- org.eclipse.jdt.ui.wizards,
- org.eclipse.jface.dialogs,
- org.eclipse.jface.operation,
- org.eclipse.jface.resource,
- org.eclipse.jface.viewers,
- org.eclipse.jface.wizard,
- org.eclipse.osgi.service.datalocation;version="1.0.0",
- org.eclipse.swt,
- org.eclipse.swt.graphics,
- org.eclipse.swt.widgets,
- org.eclipse.ui,
- org.eclipse.ui.progress,
- org.osgi.framework;version="1.3.0"
-Bundle-Vendor: Apache Software Foundation
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Require-Bundle: org.eclipse.ui.ide
diff --git a/branches/sca-equinox/tools/eclipse/plugins/process/NOTICE b/branches/sca-equinox/tools/eclipse/plugins/process/NOTICE
deleted file mode 100644
index 6dcfe88195..0000000000
--- a/branches/sca-equinox/tools/eclipse/plugins/process/NOTICE
+++ /dev/null
@@ -1,12 +0,0 @@
-${pom.name}
-Copyright (c) 2005 - 2008 The Apache Software Foundation
-
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
-
-This product also includes software under the SCA Collaboration license 
-(see the LICENSE file contained in this distribution), with the following
-copyright:
-
-(c) Copyright SCA Collaboration 2006, 2007
-
diff --git a/branches/sca-equinox/tools/eclipse/plugins/process/build.properties b/branches/sca-equinox/tools/eclipse/plugins/process/build.properties
deleted file mode 100644
index c402b2eb45..0000000000
--- a/branches/sca-equinox/tools/eclipse/plugins/process/build.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-output.. = bin/
-bin.includes = META-INF/,\
-               plugin.xml,\
-               xsd/,\
-               icons/,\
-               .,\
-               LICENSE,\
-               NOTICE,\
-               org/
-src.includes = xsd/,\
-               plugin.xml,\
-               .classpath,\
-               .project,\
-               LICENSE,\
-               META-INF/,\
-               NOTICE,\
-               build.properties,\
-               icons/,\
-               .settings/,\
-               org/,\
-               pom.xml
-jars.compile.order = .
-source.. = .
diff --git a/branches/sca-equinox/tools/eclipse/plugins/process/org/apache/tuscany/sca/plugin/process/classpath/ProcessClasspathContainer.java b/branches/sca-equinox/tools/eclipse/plugins/process/org/apache/tuscany/sca/plugin/process/classpath/ProcessClasspathContainer.java
deleted file mode 100644
index 225fa67b58..0000000000
--- a/branches/sca-equinox/tools/eclipse/plugins/process/org/apache/tuscany/sca/plugin/process/classpath/ProcessClasspathContainer.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.plugin.process.classpath;
-
-import org.apache.tuscany.sca.plugin.core.classpath.BaseClasspathContainer;
-import org.apache.tuscany.sca.plugin.core.classpath.RuntimeClasspathContainer;
-
-
-/**
- * A classpath container for the core runtime.
- * 
- * @version $Rev$ $Date$
- */
-public class ProcessClasspathContainer extends BaseClasspathContainer implements RuntimeClasspathContainer {
-    
-    public ProcessClasspathContainer() {
-        super("org.apache.tuscany.sca.plugin.process",
-              "org.apache.tuscany.sca.plugin.process.runtime.library", "Tuscany SCA Process Library", 
-              "tuscany-sca", "tuscany-distribution-process", "1.4-EQUINOX-SNAPSHOT",
-              "TUSCANY_HOME", "TUSCANY_SRC");
-    }
-}
diff --git a/branches/sca-equinox/tools/eclipse/plugins/process/org/apache/tuscany/sca/plugin/process/classpath/ProcessClasspathContainerInitializer.java b/branches/sca-equinox/tools/eclipse/plugins/process/org/apache/tuscany/sca/plugin/process/classpath/ProcessClasspathContainerInitializer.java
deleted file mode 100644
index dab0eeaadc..0000000000
--- a/branches/sca-equinox/tools/eclipse/plugins/process/org/apache/tuscany/sca/plugin/process/classpath/ProcessClasspathContainerInitializer.java
+++ /dev/null
@@ -1,38 +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.plugin.process.classpath;
-
-import org.apache.tuscany.sca.plugin.core.classpath.BaseClasspathContainerInitializer;
-import org.apache.tuscany.sca.plugin.core.classpath.RuntimeClasspathContainerInitializer;
-import org.apache.tuscany.sca.plugin.process.classpath.ProcessClasspathContainer;
-
-
-/**
- * A classpath container initializer for the core runtime.
- *
- * @version $Rev$ $Date$
- */
-public class ProcessClasspathContainerInitializer extends BaseClasspathContainerInitializer implements RuntimeClasspathContainerInitializer {
-    
-    public ProcessClasspathContainerInitializer() {
-        super(new ProcessClasspathContainer());
-    }
-
-}
diff --git a/branches/sca-equinox/tools/eclipse/plugins/process/plugin.xml b/branches/sca-equinox/tools/eclipse/plugins/process/plugin.xml
deleted file mode 100644
index 3e5f87f634..0000000000
--- a/branches/sca-equinox/tools/eclipse/plugins/process/plugin.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.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.    
--->
-<plugin>
-
-	<extension
-       point="org.apache.tuscany.sca.plugin.core.runtimeClasspathContainerInitializer">
-    	<runtimeClasspathContainerInitializer
-    			id="org.apache.tuscany.sca.plugin.process.runtime.library"
-				class="org.apache.tuscany.sca.plugin.process.classpath.ProcessClasspathContainerInitializer"/>                       
-	</extension>	
-
-</plugin>
diff --git a/branches/sca-equinox/tools/eclipse/plugins/process/pom.xml b/branches/sca-equinox/tools/eclipse/plugins/process/pom.xml
deleted file mode 100644
index 7fed5e97cc..0000000000
--- a/branches/sca-equinox/tools/eclipse/plugins/process/pom.xml
+++ /dev/null
@@ -1,151 +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-sca-eclipse-tools</artifactId>
-        <version>1.4-EQUINOX-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
-    </parent>
-    <artifactId>org.apache.tuscany.sca.plugin.process</artifactId>
-    <name>Apache Tuscany SCA Process Eclipse Plugin</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.eclipse.jdt.debug</groupId>
-            <artifactId>ui</artifactId>
-            <version>3.2.100-v20070531-1800</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.eclipse.equinox</groupId>
-                    <artifactId>common</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.eclipse.equinox</groupId>
-                    <artifactId>app</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
-        <dependency>
-            <groupId>org.eclipse.equinox</groupId>
-            <artifactId>app</artifactId>
-            <version>1.0.0-v20070606</version>
-        </dependency>        
-
-        <dependency>
-            <groupId>org.eclipse.equinox</groupId>
-            <artifactId>common</artifactId>
-            <version>3.3.0-v20070426</version>
-        </dependency>        
-
-        <dependency>
-            <groupId>org.eclipse.swt.win32.win32</groupId>
-            <artifactId>x86</artifactId>
-            <version>3.3.0-v3346</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>org.apache.tuscany.sca.plugin.core</artifactId>
-            <version>1.4-EQUINOX-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-distribution-process</artifactId>
-            <version>1.4-EQUINOX-SNAPSHOT</version>
-            <type>zip</type>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-distribution-process</artifactId>
-            <version>1.4-EQUINOX-SNAPSHOT</version>
-            <classifier>src</classifier>
-            <type>zip</type>
-        </dependency>
-    </dependencies>
-
-    <build>
-       <sourceDirectory>${basedir}</sourceDirectory>
-       <resources>
-          <resource>
-              <directory>${basedir}</directory>
-              <excludes>
-                  <exclude>**/*.java</exclude>
-                  <exclude>**/.*/**</exclude>
-                  <exclude>pom.xml</exclude>
-                  <exclude>build.*</exclude>
-                  <exclude>target/**</exclude>
-              </excludes>
-          </resource>
-       </resources>
-       
-       <plugins>
-           <plugin>
-               <groupId>org.apache.maven.plugins</groupId>
-               <artifactId>maven-jar-plugin</artifactId>
-               <configuration>
-                   <classifier>tmp</classifier>
-                   <archive>
-                       <manifestFile>META-INF/MANIFEST.MF</manifestFile>
-                   </archive>
-               </configuration>
-            </plugin>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-assembly-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>distribution-package</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>single</goal>
-                        </goals>
-                        <configuration>
-                            <descriptors>
-                                <descriptor>../core/src/main/assembly/jar.xml</descriptor>
-                            </descriptors>
-                            <tarLongFileMode>gnu</tarLongFileMode>
-                            <appendAssemblyId>false</appendAssemblyId>
-                            <archive>
-                                <manifestFile>META-INF/MANIFEST.MF</manifestFile>
-                            </archive>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
-    <repositories>
-        <repository>
-            <id>repo1.eclipse</id>
-            <url>http://repo1.maven.org/eclipse/</url>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-        </repository>
-    </repositories>
-
-</project>
diff --git a/branches/sca-equinox/tools/eclipse/plugins/web20/LICENSE b/branches/sca-equinox/tools/eclipse/plugins/web20/LICENSE
deleted file mode 100644
index 8aa906c321..0000000000
--- a/branches/sca-equinox/tools/eclipse/plugins/web20/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-equinox/tools/eclipse/plugins/web20/META-INF/MANIFEST.MF b/branches/sca-equinox/tools/eclipse/plugins/web20/META-INF/MANIFEST.MF
deleted file mode 100644
index 3c2816ec4b..0000000000
--- a/branches/sca-equinox/tools/eclipse/plugins/web20/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,32 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Apache Tuscany SCA Web 2.0 Eclipse Plugin
-Bundle-SymbolicName: org.apache.tuscany.sca.plugin.web20;singleton:=true
-Bundle-Version: 1.4.0
-Import-Package: org.apache.tuscany.sca.plugin.core.classpath,
- org.eclipse.core.resources,
- org.eclipse.core.runtime,
- org.eclipse.core.runtime.jobs,
- org.eclipse.debug.core,
- org.eclipse.debug.core.model,
- org.eclipse.debug.ui,
- org.eclipse.debug.ui.sourcelookup,
- org.eclipse.jdt.core,
- org.eclipse.jdt.debug.ui.launchConfigurations,
- org.eclipse.jdt.launching,
- org.eclipse.jdt.ui.wizards,
- org.eclipse.jface.dialogs,
- org.eclipse.jface.operation,
- org.eclipse.jface.resource,
- org.eclipse.jface.viewers,
- org.eclipse.jface.wizard,
- org.eclipse.osgi.service.datalocation;version="1.0.0",
- org.eclipse.swt,
- org.eclipse.swt.graphics,
- org.eclipse.swt.widgets,
- org.eclipse.ui,
- org.eclipse.ui.progress,
- org.osgi.framework;version="1.3.0"
-Bundle-Vendor: Apache Software Foundation
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Require-Bundle: org.eclipse.ui.ide
diff --git a/branches/sca-equinox/tools/eclipse/plugins/web20/NOTICE b/branches/sca-equinox/tools/eclipse/plugins/web20/NOTICE
deleted file mode 100644
index 6dcfe88195..0000000000
--- a/branches/sca-equinox/tools/eclipse/plugins/web20/NOTICE
+++ /dev/null
@@ -1,12 +0,0 @@
-${pom.name}
-Copyright (c) 2005 - 2008 The Apache Software Foundation
-
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
-
-This product also includes software under the SCA Collaboration license 
-(see the LICENSE file contained in this distribution), with the following
-copyright:
-
-(c) Copyright SCA Collaboration 2006, 2007
-
diff --git a/branches/sca-equinox/tools/eclipse/plugins/web20/build.properties b/branches/sca-equinox/tools/eclipse/plugins/web20/build.properties
deleted file mode 100644
index c402b2eb45..0000000000
--- a/branches/sca-equinox/tools/eclipse/plugins/web20/build.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-output.. = bin/
-bin.includes = META-INF/,\
-               plugin.xml,\
-               xsd/,\
-               icons/,\
-               .,\
-               LICENSE,\
-               NOTICE,\
-               org/
-src.includes = xsd/,\
-               plugin.xml,\
-               .classpath,\
-               .project,\
-               LICENSE,\
-               META-INF/,\
-               NOTICE,\
-               build.properties,\
-               icons/,\
-               .settings/,\
-               org/,\
-               pom.xml
-jars.compile.order = .
-source.. = .
diff --git a/branches/sca-equinox/tools/eclipse/plugins/web20/org/apache/tuscany/sca/plugin/web20/classpath/Web20ClasspathContainer.java b/branches/sca-equinox/tools/eclipse/plugins/web20/org/apache/tuscany/sca/plugin/web20/classpath/Web20ClasspathContainer.java
deleted file mode 100644
index e153ad3d25..0000000000
--- a/branches/sca-equinox/tools/eclipse/plugins/web20/org/apache/tuscany/sca/plugin/web20/classpath/Web20ClasspathContainer.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.plugin.web20.classpath;
-
-import org.apache.tuscany.sca.plugin.core.classpath.BaseClasspathContainer;
-import org.apache.tuscany.sca.plugin.core.classpath.RuntimeClasspathContainer;
-
-
-/**
- * A classpath container for the core runtime.
- * 
- * @version $Rev$ $Date$
- */
-public class Web20ClasspathContainer extends BaseClasspathContainer implements RuntimeClasspathContainer {
-    
-    public Web20ClasspathContainer() {
-        super("org.apache.tuscany.sca.plugin.web20",
-              "org.apache.tuscany.sca.plugin.web20.runtime.library", "Tuscany SCA Web 2.0 Library", 
-              "tuscany-sca", "tuscany-distribution-web20", "1.4-EQUINOX-SNAPSHOT",
-              "TUSCANY_HOME", "TUSCANY_SRC");
-    }
-}
diff --git a/branches/sca-equinox/tools/eclipse/plugins/web20/org/apache/tuscany/sca/plugin/web20/classpath/Web20ClasspathContainerInitializer.java b/branches/sca-equinox/tools/eclipse/plugins/web20/org/apache/tuscany/sca/plugin/web20/classpath/Web20ClasspathContainerInitializer.java
deleted file mode 100644
index 96026db08e..0000000000
--- a/branches/sca-equinox/tools/eclipse/plugins/web20/org/apache/tuscany/sca/plugin/web20/classpath/Web20ClasspathContainerInitializer.java
+++ /dev/null
@@ -1,38 +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.plugin.web20.classpath;
-
-import org.apache.tuscany.sca.plugin.core.classpath.BaseClasspathContainerInitializer;
-import org.apache.tuscany.sca.plugin.core.classpath.RuntimeClasspathContainerInitializer;
-import org.apache.tuscany.sca.plugin.web20.classpath.Web20ClasspathContainer;
-
-
-/**
- * A classpath container initializer for the core runtime.
- *
- * @version $Rev$ $Date$
- */
-public class Web20ClasspathContainerInitializer extends BaseClasspathContainerInitializer implements RuntimeClasspathContainerInitializer {
-    
-    public Web20ClasspathContainerInitializer() {
-        super(new Web20ClasspathContainer());
-    }
-
-}
diff --git a/branches/sca-equinox/tools/eclipse/plugins/web20/plugin.xml b/branches/sca-equinox/tools/eclipse/plugins/web20/plugin.xml
deleted file mode 100644
index 6bf9087474..0000000000
--- a/branches/sca-equinox/tools/eclipse/plugins/web20/plugin.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.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.    
--->
-<plugin>
-
-	<extension
-       point="org.apache.tuscany.sca.plugin.core.runtimeClasspathContainerInitializer">
-    	<runtimeClasspathContainerInitializer
-    			id="org.apache.tuscany.sca.plugin.web20.runtime.library"
-				class="org.apache.tuscany.sca.plugin.web20.classpath.Web20ClasspathContainerInitializer"/>                       
-	</extension>	
-
-</plugin>
diff --git a/branches/sca-equinox/tools/eclipse/plugins/web20/pom.xml b/branches/sca-equinox/tools/eclipse/plugins/web20/pom.xml
deleted file mode 100644
index 80dbe131c0..0000000000
--- a/branches/sca-equinox/tools/eclipse/plugins/web20/pom.xml
+++ /dev/null
@@ -1,151 +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-sca-eclipse-tools</artifactId>
-        <version>1.4-EQUINOX-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
-    </parent>
-    <artifactId>org.apache.tuscany.sca.plugin.web20</artifactId>
-    <name>Apache Tuscany SCA Web 2.0 Eclipse Plugin</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.eclipse.jdt.debug</groupId>
-            <artifactId>ui</artifactId>
-            <version>3.2.100-v20070531-1800</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.eclipse.equinox</groupId>
-                    <artifactId>common</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.eclipse.equinox</groupId>
-                    <artifactId>app</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
-        <dependency>
-            <groupId>org.eclipse.equinox</groupId>
-            <artifactId>app</artifactId>
-            <version>1.0.0-v20070606</version>
-        </dependency>        
-
-        <dependency>
-            <groupId>org.eclipse.equinox</groupId>
-            <artifactId>common</artifactId>
-            <version>3.3.0-v20070426</version>
-        </dependency>        
-
-        <dependency>
-            <groupId>org.eclipse.swt.win32.win32</groupId>
-            <artifactId>x86</artifactId>
-            <version>3.3.0-v3346</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>org.apache.tuscany.sca.plugin.core</artifactId>
-            <version>1.4-EQUINOX-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-distribution-web20</artifactId>
-            <version>1.4-EQUINOX-SNAPSHOT</version>
-            <type>zip</type>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-distribution-web20</artifactId>
-            <version>1.4-EQUINOX-SNAPSHOT</version>
-            <classifier>src</classifier>
-            <type>zip</type>
-        </dependency>
-    </dependencies>
-
-    <build>
-       <sourceDirectory>${basedir}</sourceDirectory>
-       <resources>
-          <resource>
-              <directory>${basedir}</directory>
-              <excludes>
-                  <exclude>**/*.java</exclude>
-                  <exclude>**/.*/**</exclude>
-                  <exclude>pom.xml</exclude>
-                  <exclude>build.*</exclude>
-                  <exclude>target/**</exclude>
-              </excludes>
-          </resource>
-       </resources>
-       
-       <plugins>
-           <plugin>
-               <groupId>org.apache.maven.plugins</groupId>
-               <artifactId>maven-jar-plugin</artifactId>
-               <configuration>
-                   <classifier>tmp</classifier>
-                   <archive>
-                       <manifestFile>META-INF/MANIFEST.MF</manifestFile>
-                   </archive>
-               </configuration>
-            </plugin>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-assembly-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>distribution-package</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>single</goal>
-                        </goals>
-                        <configuration>
-                            <descriptors>
-                                <descriptor>../core/src/main/assembly/jar.xml</descriptor>
-                            </descriptors>
-                            <tarLongFileMode>gnu</tarLongFileMode>
-                            <appendAssemblyId>false</appendAssemblyId>
-                            <archive>
-                                <manifestFile>META-INF/MANIFEST.MF</manifestFile>
-                            </archive>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
-    <repositories>
-        <repository>
-            <id>repo1.eclipse</id>
-            <url>http://repo1.maven.org/eclipse/</url>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-        </repository>
-    </repositories>
-
-</project>
diff --git a/branches/sca-equinox/tools/eclipse/plugins/webservice/LICENSE b/branches/sca-equinox/tools/eclipse/plugins/webservice/LICENSE
deleted file mode 100644
index 8aa906c321..0000000000
--- a/branches/sca-equinox/tools/eclipse/plugins/webservice/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-equinox/tools/eclipse/plugins/webservice/META-INF/MANIFEST.MF b/branches/sca-equinox/tools/eclipse/plugins/webservice/META-INF/MANIFEST.MF
deleted file mode 100644
index 9d83fd9b6b..0000000000
--- a/branches/sca-equinox/tools/eclipse/plugins/webservice/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,32 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Apache Tuscany SCA Web Service Eclipse Plugin
-Bundle-SymbolicName: org.apache.tuscany.sca.plugin.webservice;singleton:=true
-Bundle-Version: 1.4.0
-Import-Package: org.apache.tuscany.sca.plugin.core.classpath,
- org.eclipse.core.resources,
- org.eclipse.core.runtime,
- org.eclipse.core.runtime.jobs,
- org.eclipse.debug.core,
- org.eclipse.debug.core.model,
- org.eclipse.debug.ui,
- org.eclipse.debug.ui.sourcelookup,
- org.eclipse.jdt.core,
- org.eclipse.jdt.debug.ui.launchConfigurations,
- org.eclipse.jdt.launching,
- org.eclipse.jdt.ui.wizards,
- org.eclipse.jface.dialogs,
- org.eclipse.jface.operation,
- org.eclipse.jface.resource,
- org.eclipse.jface.viewers,
- org.eclipse.jface.wizard,
- org.eclipse.osgi.service.datalocation;version="1.0.0",
- org.eclipse.swt,
- org.eclipse.swt.graphics,
- org.eclipse.swt.widgets,
- org.eclipse.ui,
- org.eclipse.ui.progress,
- org.osgi.framework;version="1.3.0"
-Bundle-Vendor: Apache Software Foundation
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Require-Bundle: org.eclipse.ui.ide
diff --git a/branches/sca-equinox/tools/eclipse/plugins/webservice/NOTICE b/branches/sca-equinox/tools/eclipse/plugins/webservice/NOTICE
deleted file mode 100644
index 6dcfe88195..0000000000
--- a/branches/sca-equinox/tools/eclipse/plugins/webservice/NOTICE
+++ /dev/null
@@ -1,12 +0,0 @@
-${pom.name}
-Copyright (c) 2005 - 2008 The Apache Software Foundation
-
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
-
-This product also includes software under the SCA Collaboration license 
-(see the LICENSE file contained in this distribution), with the following
-copyright:
-
-(c) Copyright SCA Collaboration 2006, 2007
-
diff --git a/branches/sca-equinox/tools/eclipse/plugins/webservice/build.properties b/branches/sca-equinox/tools/eclipse/plugins/webservice/build.properties
deleted file mode 100644
index c402b2eb45..0000000000
--- a/branches/sca-equinox/tools/eclipse/plugins/webservice/build.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-output.. = bin/
-bin.includes = META-INF/,\
-               plugin.xml,\
-               xsd/,\
-               icons/,\
-               .,\
-               LICENSE,\
-               NOTICE,\
-               org/
-src.includes = xsd/,\
-               plugin.xml,\
-               .classpath,\
-               .project,\
-               LICENSE,\
-               META-INF/,\
-               NOTICE,\
-               build.properties,\
-               icons/,\
-               .settings/,\
-               org/,\
-               pom.xml
-jars.compile.order = .
-source.. = .
diff --git a/branches/sca-equinox/tools/eclipse/plugins/webservice/org/apache/tuscany/sca/plugin/webservice/classpath/WebServiceClasspathContainer.java b/branches/sca-equinox/tools/eclipse/plugins/webservice/org/apache/tuscany/sca/plugin/webservice/classpath/WebServiceClasspathContainer.java
deleted file mode 100644
index f588dc191c..0000000000
--- a/branches/sca-equinox/tools/eclipse/plugins/webservice/org/apache/tuscany/sca/plugin/webservice/classpath/WebServiceClasspathContainer.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.plugin.webservice.classpath;
-
-import org.apache.tuscany.sca.plugin.core.classpath.BaseClasspathContainer;
-import org.apache.tuscany.sca.plugin.core.classpath.RuntimeClasspathContainer;
-
-
-/**
- * A classpath container for the core runtime.
- * 
- * @version $Rev$ $Date$
- */
-public class WebServiceClasspathContainer extends BaseClasspathContainer implements RuntimeClasspathContainer {
-    
-    public WebServiceClasspathContainer() {
-        super("org.apache.tuscany.sca.plugin.webservice",
-              "org.apache.tuscany.sca.plugin.webservice.runtime.library", "Tuscany SCA Web Service Library", 
-              "tuscany-sca", "tuscany-distribution-webservice", "1.4-EQUINOX-SNAPSHOT",
-              "TUSCANY_HOME", "TUSCANY_SRC");
-    }
-}
diff --git a/branches/sca-equinox/tools/eclipse/plugins/webservice/org/apache/tuscany/sca/plugin/webservice/classpath/WebServiceClasspathContainerInitializer.java b/branches/sca-equinox/tools/eclipse/plugins/webservice/org/apache/tuscany/sca/plugin/webservice/classpath/WebServiceClasspathContainerInitializer.java
deleted file mode 100644
index 6310209c3a..0000000000
--- a/branches/sca-equinox/tools/eclipse/plugins/webservice/org/apache/tuscany/sca/plugin/webservice/classpath/WebServiceClasspathContainerInitializer.java
+++ /dev/null
@@ -1,38 +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.plugin.webservice.classpath;
-
-import org.apache.tuscany.sca.plugin.core.classpath.BaseClasspathContainerInitializer;
-import org.apache.tuscany.sca.plugin.core.classpath.RuntimeClasspathContainerInitializer;
-import org.apache.tuscany.sca.plugin.webservice.classpath.WebServiceClasspathContainer;
-
-
-/**
- * A classpath container initializer for the core runtime.
- *
- * @version $Rev$ $Date$
- */
-public class WebServiceClasspathContainerInitializer extends BaseClasspathContainerInitializer implements RuntimeClasspathContainerInitializer {
-    
-    public WebServiceClasspathContainerInitializer() {
-        super(new WebServiceClasspathContainer());
-    }
-
-}
diff --git a/branches/sca-equinox/tools/eclipse/plugins/webservice/plugin.xml b/branches/sca-equinox/tools/eclipse/plugins/webservice/plugin.xml
deleted file mode 100644
index 1fd46d3e75..0000000000
--- a/branches/sca-equinox/tools/eclipse/plugins/webservice/plugin.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.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.    
--->
-<plugin>
-
-	<extension
-       point="org.apache.tuscany.sca.plugin.core.runtimeClasspathContainerInitializer">
-    	<runtimeClasspathContainerInitializer
-    			id="org.apache.tuscany.sca.plugin.webservice.runtime.library"
-				class="org.apache.tuscany.sca.plugin.webservice.classpath.WebServiceClasspathContainerInitializer"/>                       
-	</extension>	
-
-</plugin>
diff --git a/branches/sca-equinox/tools/eclipse/plugins/webservice/pom.xml b/branches/sca-equinox/tools/eclipse/plugins/webservice/pom.xml
deleted file mode 100644
index d3e508c1e4..0000000000
--- a/branches/sca-equinox/tools/eclipse/plugins/webservice/pom.xml
+++ /dev/null
@@ -1,151 +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-sca-eclipse-tools</artifactId>
-        <version>1.4-EQUINOX-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
-    </parent>
-    <artifactId>org.apache.tuscany.sca.plugin.webservice</artifactId>
-    <name>Apache Tuscany SCA Web Service Eclipse Plugin</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.eclipse.jdt.debug</groupId>
-            <artifactId>ui</artifactId>
-            <version>3.2.100-v20070531-1800</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.eclipse.equinox</groupId>
-                    <artifactId>common</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.eclipse.equinox</groupId>
-                    <artifactId>app</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
-        <dependency>
-            <groupId>org.eclipse.equinox</groupId>
-            <artifactId>app</artifactId>
-            <version>1.0.0-v20070606</version>
-        </dependency>        
-
-        <dependency>
-            <groupId>org.eclipse.equinox</groupId>
-            <artifactId>common</artifactId>
-            <version>3.3.0-v20070426</version>
-        </dependency>        
-
-        <dependency>
-            <groupId>org.eclipse.swt.win32.win32</groupId>
-            <artifactId>x86</artifactId>
-            <version>3.3.0-v3346</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>org.apache.tuscany.sca.plugin.core</artifactId>
-            <version>1.4-EQUINOX-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-distribution-webservice</artifactId>
-            <version>1.4-EQUINOX-SNAPSHOT</version>
-            <type>zip</type>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-distribution-webservice</artifactId>
-            <version>1.4-EQUINOX-SNAPSHOT</version>
-            <classifier>src</classifier>
-            <type>zip</type>
-        </dependency>
-    </dependencies>
-
-    <build>
-       <sourceDirectory>${basedir}</sourceDirectory>
-       <resources>
-          <resource>
-              <directory>${basedir}</directory>
-              <excludes>
-                  <exclude>**/*.java</exclude>
-                  <exclude>**/.*/**</exclude>
-                  <exclude>pom.xml</exclude>
-                  <exclude>build.*</exclude>
-                  <exclude>target/**</exclude>
-              </excludes>
-          </resource>
-       </resources>
-       
-       <plugins>
-           <plugin>
-               <groupId>org.apache.maven.plugins</groupId>
-               <artifactId>maven-jar-plugin</artifactId>
-               <configuration>
-                   <classifier>tmp</classifier>
-                   <archive>
-                       <manifestFile>META-INF/MANIFEST.MF</manifestFile>
-                   </archive>
-               </configuration>
-            </plugin>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-assembly-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>distribution-package</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>single</goal>
-                        </goals>
-                        <configuration>
-                            <descriptors>
-                                <descriptor>../core/src/main/assembly/jar.xml</descriptor>
-                            </descriptors>
-                            <tarLongFileMode>gnu</tarLongFileMode>
-                            <appendAssemblyId>false</appendAssemblyId>
-                            <archive>
-                                <manifestFile>META-INF/MANIFEST.MF</manifestFile>
-                            </archive>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
-    <repositories>
-        <repository>
-            <id>repo1.eclipse</id>
-            <url>http://repo1.maven.org/eclipse/</url>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-        </repository>
-    </repositories>
-
-</project>
author	lresende <lresende@13f79535-47bb-0310-9956-ffa450edef68>	2009-11-11 23:09:08 +0000
committer	lresende <lresende@13f79535-47bb-0310-9956-ffa450edef68>	2009-11-11 23:09:08 +0000
commit	cde3d2629677a07aa09e3c7fbe117b680c0f5df7 (patch)
tree	c6d50048ffad8dfa8a1c0019e7afb207cb6b4fe2 /branches/sca-equinox/tools/eclipse/plugins
parent	4ef0430519e276c2bdecea75f7a0f42f49f0cf30 (diff)