Delete and redo release branch

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

12 files changed, 0 insertions, 1108 deletions

diff --git a/sca-java-2.x/branches/2.0-Beta1/modules/extensibility-equinox/LICENSE b/sca-java-2.x/branches/2.0-Beta1/modules/extensibility-equinox/LICENSE
deleted file mode 100644
index 6e529a25c4..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/modules/extensibility-equinox/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/sca-java-2.x/branches/2.0-Beta1/modules/extensibility-equinox/META-INF/MANIFEST.MF b/sca-java-2.x/branches/2.0-Beta1/modules/extensibility-equinox/META-INF/MANIFEST.MF
deleted file mode 100644
index 7ece048182..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/modules/extensibility-equinox/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,30 +0,0 @@
-Manifest-Version: 1.0

-Private-Package: org.apache.tuscany.sca.extensibility.equinox;version=

- "2.0.0"

-Bundle-ActivationPolicy: lazy

-SCA-Version: 1.1

-Bundle-Name: Apache Tuscany SCA Extensibility for Eclipse Equinox

-Bundle-Vendor: The Apache Software Foundation

-Eclipse-LazyStart: true

-Bundle-Version: 2.0.0

-Bundle-Activator: org.apache.tuscany.sca.extensibility.equinox.Equinox

- ServiceDiscoveryActivator

-Bundle-ManifestVersion: 2

-Bundle-Description: Apache Tuscany SCA Extensibility for Eclipse Equin

- ox

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

-Import-Package: org.apache.tuscany.sca.core;version="2.0.0",

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

- org.osgi.framework;version="1.4",

- org.osgi.framework.launch;version="1.0.0";resolution:=optional,

- org.osgi.util.tracker;version="1.4.2"

-Tuscany-Comment2: The system bundle exports javax.transaction* packages that only

- contains a subset of the classes

-DynamicImport-Package: org.apache.tuscany.sca.extensibility.equinox,

- javax.transaction;version="1.1",

- javax.transaction.xa;version="1.1",

- * 

-Bundle-SymbolicName: org.apache.tuscany.sca.extensibility.equinox

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

-Bundle-RequiredExecutionEnvironment: J2SE-1.5,JavaSE-1.6
-Export-Package: org.apache.tuscany.sca.extensibility.equinox;version="2.0.0"

diff --git a/sca-java-2.x/branches/2.0-Beta1/modules/extensibility-equinox/NOTICE b/sca-java-2.x/branches/2.0-Beta1/modules/extensibility-equinox/NOTICE
deleted file mode 100644
index a67cd7c175..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/modules/extensibility-equinox/NOTICE
+++ /dev/null
@@ -1,5 +0,0 @@
-Copyright (c) 2005 - 2010 The Apache Software Foundation

-

-This product includes software developed by

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

-

diff --git a/sca-java-2.x/branches/2.0-Beta1/modules/extensibility-equinox/pom.xml b/sca-java-2.x/branches/2.0-Beta1/modules/extensibility-equinox/pom.xml
deleted file mode 100644
index f17e9967da..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/modules/extensibility-equinox/pom.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<project>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-modules</artifactId>
-        <version>2.0-Beta1-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>tuscany-extensibility-equinox</artifactId>
-    <name>Apache Tuscany SCA Extensibility for Eclipse Equinox</name>
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-extensibility</artifactId>
-            <version>2.0-Beta1-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.eclipse</groupId>
-            <artifactId>osgi</artifactId>
-            <version>3.5.0-v20090520</version>
-            <scope>compile</scope>
-        </dependency>
-    </dependencies>
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-dependency-plugin</artifactId>
-                <version>2.0</version>
-                <executions>
-                    <execution>
-                        <id>copy-dependencies</id>
-                        <phase>process-test-resources</phase>
-                        <goals>
-                            <goal>copy-dependencies</goal>
-                        </goals>
-                        <configuration>
-                            <outputDirectory>${project.build.directory}/bundles</outputDirectory>
-                            <excludeArtifactIds>osgi,junit,easymock,tuscany-extensibility</excludeArtifactIds>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-</project>
diff --git a/sca-java-2.x/branches/2.0-Beta1/modules/extensibility-equinox/src/main/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxServiceDiscoverer.java b/sca-java-2.x/branches/2.0-Beta1/modules/extensibility-equinox/src/main/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxServiceDiscoverer.java
deleted file mode 100644
index 122729a2a4..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/modules/extensibility-equinox/src/main/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxServiceDiscoverer.java
+++ /dev/null
@@ -1,337 +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.extensibility.equinox;
-
-import java.io.IOException;
-import java.net.URL;
-import java.security.AccessController;
-import java.security.PrivilegedAction;
-import java.util.Collection;
-import java.util.Enumeration;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import org.apache.tuscany.sca.extensibility.ServiceDeclaration;
-import org.apache.tuscany.sca.extensibility.ServiceDeclarationParser;
-import org.apache.tuscany.sca.extensibility.ServiceDiscoverer;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.BundleEvent;
-import org.osgi.framework.BundleException;
-import org.osgi.framework.Constants;
-import org.osgi.framework.Version;
-import org.osgi.util.tracker.BundleTracker;
-
-/**
- * A ServiceDiscoverer that find META-INF/services/... in installed bundles
- *
- * @version $Rev$ $Date$
- */
-public class EquinoxServiceDiscoverer implements ServiceDiscoverer {
-    private static final Logger logger = Logger.getLogger(EquinoxServiceDiscoverer.class.getName());
-
-    private BundleContext context;
-    private Version version;
-    private BundleTracker bundleTracker;
-
-    public EquinoxServiceDiscoverer(BundleContext context) {
-        this.context = context;
-        Bundle bundle = context.getBundle();
-        this.version = getSCAVersion(bundle);
-        if (this.version.equals(Version.emptyVersion)) {
-            this.version = Version.parseVersion("1.1");
-        }
-        bundleTracker = new ActiveBundleTracker(context);
-        bundleTracker.open();
-    }
-
-    public void stop() {
-        bundleTracker.close();
-    }
-
-    private Version getSCAVersion(Bundle bundle) {
-        String header = (String)bundle.getHeaders().get("SCA-Version");
-        return Version.parseVersion(header);
-    }
-
-    public static class ActiveBundleTracker extends BundleTracker {
-
-        /**
-         * @param context
-         * @param stateMask
-         * @param customizer
-         */
-        public ActiveBundleTracker(BundleContext context) {
-            super(context, Bundle.RESOLVED | Bundle.ACTIVE | Bundle.STARTING, null);
-        }
-
-        @Override
-        public Object addingBundle(Bundle bundle, BundleEvent event) {
-            if (event != null && event.getType() == BundleEvent.STOPPED) {
-                return null;
-            }
-            return super.addingBundle(bundle, event);
-        }
-
-    }
-
-    public static class ServiceDeclarationImpl implements ServiceDeclaration {
-        private Bundle bundle;
-        private URL url;
-        private String className;
-        private Class<?> javaClass;
-        private Map<String, String> attributes;
-
-        public ServiceDeclarationImpl(Bundle bundle, URL url, String className, Map<String, String> attributes) {
-            super();
-            this.bundle = bundle;
-            this.url = url;
-            this.className = className;
-            this.attributes = attributes;
-        }
-
-        public Map<String, String> getAttributes() {
-            return attributes;
-        }
-
-        public String getClassName() {
-            return className;
-        }
-
-        public Class<?> loadClass() throws ClassNotFoundException {
-            if (className == null) {
-                return null;
-            }
-            if (javaClass == null) {
-                javaClass = loadClass(className);
-            }
-            return javaClass;
-        }
-
-        public Class<?> loadClass(String className) throws ClassNotFoundException {
-            return bundle.loadClass(className);
-        }
-
-        public URL getLocation() {
-            return url;
-        }
-
-        public URL getResource(final String name) {
-            return AccessController.doPrivileged(new PrivilegedAction<URL>() {
-                public URL run() {
-                    return bundle.getResource(name);
-                }
-            });
-        }
-
-        @Override
-        public String toString() {
-            StringBuffer sb = new StringBuffer();
-            sb.append("Bundle: ").append(EquinoxServiceDiscoverer.toString(bundle));
-            sb.append(" Resource: ").append(url);
-            sb.append(" Attributes: ").append(attributes);
-            return sb.toString();
-        }
-
-        public Bundle getBundle() {
-            return bundle;
-        }
-
-        public boolean isAssignableTo(Class<?> serviceType) {
-            try {
-                loadClass();
-            } catch (ClassNotFoundException e) {
-                // Ignore
-            }
-            return (javaClass != null && serviceType.isAssignableFrom(javaClass));
-        }
-
-        @Override
-        public Enumeration<URL> getResources(final String name) throws IOException {
-            return (Enumeration<URL>) bundle.getResources(name);
-        }
-
-    }
-
-    /**
-     * Empty static method to trigger the activation of this bundle.
-     */
-    public static void init() {
-    }
-
-    private static String toString(Bundle b) {
-        StringBuffer sb = new StringBuffer();
-        sb.append(b.getBundleId()).append(" ").append(b.getSymbolicName());
-        int s = b.getState();
-        if ((s & Bundle.UNINSTALLED) != 0) {
-            sb.append(" UNINSTALLED");
-        }
-        if ((s & Bundle.INSTALLED) != 0) {
-            sb.append(" INSTALLED");
-        }
-        if ((s & Bundle.RESOLVED) != 0) {
-            sb.append(" RESOLVED");
-        }
-        if ((s & Bundle.STARTING) != 0) {
-            sb.append(" STARTING");
-        }
-        if ((s & Bundle.STOPPING) != 0) {
-            sb.append(" STOPPING");
-        }
-        if ((s & Bundle.ACTIVE) != 0) {
-            sb.append(" ACTIVE");
-        }
-        return sb.toString();
-
-    }
-
-    public ServiceDeclaration getServiceDeclaration(String name) throws IOException {
-        Collection<ServiceDeclaration> declarations = getServiceDeclarations(name);
-        if (declarations.isEmpty()) {
-            return null;
-        } else {
-            return declarations.iterator().next();
-        }
-    }
-
-    private boolean isProviderBundle(Bundle bundle, boolean isTuscanyService) {
-        if (bundle.getBundleId() == 0 || bundle.getSymbolicName().startsWith("1.x-osgi-bundle")
-            || bundle.getHeaders().get(Constants.FRAGMENT_HOST) != null) {
-            // Skip system bundle as it has access to the application classloader
-            // Skip the 1.x runtime bundle as this has 1.x services in it
-            //    For testing running 1.x and 2.x in same VM.
-            //    Don't know what final form will be yet.
-            // Skip bundle fragments too
-            return false;
-        }
-        // FIXME: [rfeng] What bundles should be searched? ACTIVE and STARTING?
-        if ((bundle.getState() & Bundle.UNINSTALLED) != 0) {
-            return false;
-        }
-        if (isTuscanyService) {
-            Version scaVersion = getSCAVersion(bundle);
-            return scaVersion.compareTo(version) == 0;
-        }
-        return true;
-    }
-
-    protected Collection<Bundle> getBundles(boolean isTuscanyService) {
-        // return bundles.keySet();
-        Set<Bundle> set = new HashSet<Bundle>();
-        for (Bundle b : context.getBundles()) {
-            if (isProviderBundle(b, isTuscanyService)) {
-                set.add(b);
-            }
-            /*
-            else {
-                if (b.getBundleId() != 0 && isTuscanyService) {
-                    logger.warning("Bundle is skipped for service discovery: " + toString(b));
-                }
-            }
-            */
-        }
-        return set;
-    }
-
-    public Collection<ServiceDeclaration> getServiceDeclarations(String serviceName) throws IOException {
-        boolean debug = logger.isLoggable(Level.FINE);
-        Collection<ServiceDeclaration> descriptors = new HashSet<ServiceDeclaration>();
-
-        // http://java.sun.com/j2se/1.5.0/docs/api/javax/xml/xpath/XPathFactory.html
-        boolean isPropertyFile = "javax.xml.xpath.XPathFactory".equals(serviceName);
-        boolean isTuscanyService = serviceName.startsWith("org.apache.tuscany.sca.");
-
-        if (serviceName.startsWith("/")) {
-            // If the service name starts with /, treat it as the entry name
-            serviceName = serviceName.substring(1);
-        } else {
-            // Use JDK SPI pattern
-            serviceName = "META-INF/services/" + serviceName;
-        }
-
-        Set<URL> visited = new HashSet<URL>();
-        //System.out.println(">>>> getServiceDeclarations()");
-        for (Bundle bundle : getBundles(isTuscanyService)) {
-            //            if (!isProviderBundle(bundle)) {
-            //                continue;
-            //            }
-            Enumeration<URL> urls = null;
-            try {
-                // Use getResources to find resources on the classpath of the bundle
-                // Please note there are cases that getResources will return null even
-                // the bundle containing such entries:
-                // 1. There is a match on Import-Package or DynamicImport-Package, and another
-                // bundle exports the resource package, there is a possiblity that it doesn't
-                // find the containing entry
-                // 2. The bundle cannot be resolved, then getResources will return null
-                urls = bundle.getResources(serviceName);
-                if (urls == null) {
-                    URL entry = bundle.getEntry(serviceName);
-                    if (entry != null) {
-                        logger.warning("Unresolved resource " + serviceName + " found in bundle: " + toString(bundle));
-                        try {
-                            bundle.start();
-                        } catch (BundleException e) {
-                            logger.log(Level.SEVERE, "Bundle: " + bundle.getSymbolicName() + " - " + e.getMessage(), e);
-                        }
-                        // urls = Collections.enumeration(Arrays.asList(entry));
-                    }
-                }
-            } catch (IOException e) {
-                logger.log(Level.SEVERE, "Bundle: " + bundle.getSymbolicName() + " - " + e.getMessage(), e);
-            }
-            if (urls == null) {
-                continue;
-            }
-            while (urls.hasMoreElements()) {
-                final URL url = urls.nextElement();
-
-                if (!visited.add(url)) {
-                    // The URL has already been processed
-                    continue;
-                }
-
-                if (debug) {
-                    logger.fine("Reading service provider file: " + url.toExternalForm());
-                }
-                try {
-                    for (Map<String, String> attributes : ServiceDeclarationParser.load(url, isPropertyFile)) {
-                        String className = attributes.get("class");
-                        ServiceDeclarationImpl descriptor =
-                            new ServiceDeclarationImpl(bundle, url, className, attributes);
-                        descriptors.add(descriptor);
-                    }
-                } catch (IOException e) {
-                    logger.log(Level.SEVERE, "Bundle: " + bundle.getSymbolicName() + " - " + e.getMessage(), e);
-                }
-            }
-        }
-        return descriptors;
-    }
-
-    public ClassLoader getContextClassLoader() {
-        // Get the bundle classloader for the extensibility bundle that has DynamicImport-Package *
-        return getClass().getClassLoader();
-    }
-
-}
diff --git a/sca-java-2.x/branches/2.0-Beta1/modules/extensibility-equinox/src/main/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxServiceDiscoveryActivator.java b/sca-java-2.x/branches/2.0-Beta1/modules/extensibility-equinox/src/main/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxServiceDiscoveryActivator.java
deleted file mode 100644
index 14ad6670a8..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/modules/extensibility-equinox/src/main/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxServiceDiscoveryActivator.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-
-package org.apache.tuscany.sca.extensibility.equinox;
-
-import org.apache.tuscany.sca.extensibility.ServiceDiscovery;
-import org.osgi.framework.BundleActivator;
-import org.osgi.framework.BundleContext;
-
-/**
- * The Bundle Activator that creates the Equinox-based service discoverer 
- *
- * @version $Rev$ $Date$
- */
-public class EquinoxServiceDiscoveryActivator implements BundleActivator {
-    // private static final Logger logger = Logger.getLogger(EquinoxServiceDiscoveryActivator.class.getName());
-    private EquinoxServiceDiscoverer discoverer;
-
-    public void start(BundleContext context) throws Exception {
-        discoverer = new EquinoxServiceDiscoverer(context);
-        ServiceDiscovery.getInstance().setServiceDiscoverer(discoverer);
-        // logger.info("Equinox-based service discoverer is now configured.");
-    }
-
-    public void stop(BundleContext context) throws Exception {
-        ServiceDiscovery.getInstance().setServiceDiscoverer(null);
-        if (discoverer != null) {
-            discoverer.stop();
-            discoverer = null;
-        }
-    }
-
-}
diff --git a/sca-java-2.x/branches/2.0-Beta1/modules/extensibility-equinox/src/main/java/org/apache/tuscany/sca/extensibility/equinox/OSGiExtensionPointRegistry.java b/sca-java-2.x/branches/2.0-Beta1/modules/extensibility-equinox/src/main/java/org/apache/tuscany/sca/extensibility/equinox/OSGiExtensionPointRegistry.java
deleted file mode 100644
index 4b5fffff01..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/modules/extensibility-equinox/src/main/java/org/apache/tuscany/sca/extensibility/equinox/OSGiExtensionPointRegistry.java
+++ /dev/null
@@ -1,106 +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.extensibility.equinox;
-
-import java.util.Dictionary;
-import java.util.Hashtable;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-
-import org.apache.tuscany.sca.core.DefaultExtensionPointRegistry;
-import org.apache.tuscany.sca.extensibility.ServiceDeclaration;
-import org.apache.tuscany.sca.extensibility.ServiceDiscovery;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.BundleException;
-import org.osgi.framework.ServiceReference;
-import org.osgi.framework.ServiceRegistration;
-
-/**
- * OSGi ServiceRegistry based extension point registry
- */
-public class OSGiExtensionPointRegistry extends DefaultExtensionPointRegistry {
-    private Map<Class<?>, ServiceRegistration> registrations = new ConcurrentHashMap<Class<?>, ServiceRegistration>();
-    private BundleContext bundleContext;
-
-    public OSGiExtensionPointRegistry(BundleContext bundleContext) {
-        super(ServiceDiscovery.getInstance(new EquinoxServiceDiscoverer(bundleContext)));
-        this.bundleContext = bundleContext;
-    }
-
-    @Override
-    protected void registerExtensionPoint(Class<?> extensionPointType,
-                                          Object extensionPoint,
-                                          ServiceDeclaration declaration) {
-        BundleContext context = bundleContext;
-        if (declaration instanceof EquinoxServiceDiscoverer.ServiceDeclarationImpl) {
-            EquinoxServiceDiscoverer.ServiceDeclarationImpl declarationImpl =
-                (EquinoxServiceDiscoverer.ServiceDeclarationImpl)declaration;
-            Bundle bundle = declarationImpl.getBundle();
-            /**
-             * If this bundle is not in the STARTING, ACTIVE, or STOPPING states or this bundle
-             * is a fragment bundle, then this bundle has no valid BundleContext. This method will
-             * return null if this bundle has no valid BundleContext
-             */
-            if ((bundle.getState() & (Bundle.ACTIVE | Bundle.STARTING)) == 0) {
-                try {
-                    bundle.start();
-                } catch (BundleException e) {
-                    throw new IllegalStateException(e);
-                }
-            }
-            context = bundle.getBundleContext();
-        }
-        Dictionary<Object, Object> props = new Hashtable<Object, Object>();
-        ServiceRegistration registration = context.registerService(extensionPointType.getName(), extensionPoint, props);
-        registrations.put(extensionPointType, registration);
-        super.registerExtensionPoint(extensionPointType, extensionPoint, declaration);
-    }
-
-    @Override
-    protected void unregisterExtensionPoint(Class<?> i) {
-        ServiceRegistration registration = registrations.remove(i);
-        if (registration != null) {
-            try {
-                registration.unregister();
-            } catch (IllegalStateException e) {
-                // The service has been unregistered, ignore it
-            }        
-        }
-        super.unregisterExtensionPoint(i);
-    }
-
-    @Override
-    public synchronized void stop() {
-        for (ServiceRegistration reg : registrations.values()) {
-            try {
-                ServiceReference ref = reg.getReference();
-                if (ref != null) {
-                    reg.unregister();
-                }
-            } catch (IllegalStateException e) {
-                // Ignore it, the service has been unregistered when the owning bundle stops
-            }
-        }
-        registrations.clear();
-        super.stop();
-    }
-
-}
diff --git a/sca-java-2.x/branches/2.0-Beta1/modules/extensibility-equinox/src/test/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxHostTestCase.java b/sca-java-2.x/branches/2.0-Beta1/modules/extensibility-equinox/src/test/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxHostTestCase.java
deleted file mode 100644
index aa9cd50abc..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/modules/extensibility-equinox/src/test/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxHostTestCase.java
+++ /dev/null
@@ -1,95 +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.extensibility.equinox;
-
-import java.util.Dictionary;
-import java.util.Enumeration;
-
-import org.junit.Assert;
-import org.junit.Test;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleContext;
-
-/**
- * Test start/stop the Equinox runtime.
- * 
- * @version $Rev$ $Date$
- */
-public class EquinoxHostTestCase {
-    @Test
-    public void testStartThenStop() {
-        TestEquinoxHost host = new TestEquinoxHost();
-        BundleContext context = host.start();
-        Assert.assertNotNull(context);
-        for (Bundle b : context.getBundles()) {
-            System.out.println(toString(b, false));
-        }
-        host.stop();
-    }
-
-    @Test
-    public void testStartTwice() {
-        TestEquinoxHost host = new TestEquinoxHost();
-        host.start();
-        try {
-            host.start();
-            Assert.fail();
-        } catch (IllegalStateException e) {
-            Assert.assertTrue(IllegalStateException.class.isInstance(e.getCause()));
-        } finally {
-            host.stop();
-        }
-    }
-
-    public static String toString(Bundle b, boolean verbose) {
-        StringBuffer sb = new StringBuffer();
-        sb.append(b.getBundleId()).append(" ").append(b.getSymbolicName());
-        int s = b.getState();
-        if ((s & Bundle.UNINSTALLED) != 0) {
-            sb.append(" UNINSTALLED");
-        }
-        if ((s & Bundle.INSTALLED) != 0) {
-            sb.append(" INSTALLED");
-        }
-        if ((s & Bundle.RESOLVED) != 0) {
-            sb.append(" RESOLVED");
-        }
-        if ((s & Bundle.STARTING) != 0) {
-            sb.append(" STARTING");
-        }
-        if ((s & Bundle.STOPPING) != 0) {
-            sb.append(" STOPPING");
-        }
-        if ((s & Bundle.ACTIVE) != 0) {
-            sb.append(" ACTIVE");
-        }
-
-        sb.append(" ").append(b.getLocation());
-        if (verbose) {
-            Dictionary<Object, Object> dict = b.getHeaders();
-            Enumeration<Object> keys = dict.keys();
-            while (keys.hasMoreElements()) {
-                Object key = keys.nextElement();
-                sb.append(" ").append(key).append("=").append(dict.get(key));
-            }
-        }
-        return sb.toString();
-    }
-}
diff --git a/sca-java-2.x/branches/2.0-Beta1/modules/extensibility-equinox/src/test/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxServiceDiscovererTestCase.java b/sca-java-2.x/branches/2.0-Beta1/modules/extensibility-equinox/src/test/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxServiceDiscovererTestCase.java
deleted file mode 100644
index 72c25427d6..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/modules/extensibility-equinox/src/test/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxServiceDiscovererTestCase.java
+++ /dev/null
@@ -1,138 +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.extensibility.equinox;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Collection;
-
-import org.apache.tuscany.sca.extensibility.ServiceDeclaration;
-import org.junit.AfterClass;
-import org.junit.Assert;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleContext;
-
-/**
- * Test the Equinox service discoverer.
- *
- * @version $Rev$ $Date$
- */
-public class EquinoxServiceDiscovererTestCase {
-    private static EquinoxServiceDiscoverer discoverer;
-    private static Bundle testBundle1;
-    private static Bundle testBundle2;
-    private static TestEquinoxHost host;
-
-    private static String getState(Bundle b) {
-        StringBuffer sb = new StringBuffer();
-        int s = b.getState();
-        if ((s & Bundle.UNINSTALLED) != 0) {
-            sb.append("UNINSTALLED ");
-        }
-        if ((s & Bundle.INSTALLED) != 0) {
-            sb.append("INSTALLED ");
-        }
-        if ((s & Bundle.RESOLVED) != 0) {
-            sb.append("RESOLVED ");
-        }
-        if ((s & Bundle.STARTING) != 0) {
-            sb.append("STARTING ");
-        }
-        if ((s & Bundle.STOPPING) != 0) {
-            sb.append("STOPPING ");
-        }
-        if ((s & Bundle.ACTIVE) != 0) {
-            sb.append("ACTIVE ");
-        }
-        return sb.toString();
-
-    }
-
-    /**
-     * @throws java.lang.Exception
-     */
-    @BeforeClass
-    public static void setUpBeforeClass() throws Exception {
-        host = new TestEquinoxHost();
-        BundleContext context = host.start();
-
-        InputStream is = EquinoxServiceDiscovererTestCase.class.getResourceAsStream("/test-bundle-v1.jar");
-        testBundle1 = context.installBundle("test-bundle-v1", is);
-        is.close();
-        
-        is = EquinoxServiceDiscovererTestCase.class.getResourceAsStream("/test-bundle-v2.jar");
-        testBundle2 = context.installBundle("test-bundle-v2", is);
-        is.close();
-
-        discoverer = new EquinoxServiceDiscoverer(context);
-    }
-
-    /**
-     * @throws java.lang.Exception
-     */
-    @AfterClass
-    public static void tearDownAfterClass() throws Exception {
-        if (testBundle1 != null) {
-            // Uninstall the bundle to clean up the cache
-            testBundle1.uninstall();
-        }
-        if (testBundle2 != null) {
-            // Uninstall the bundle to clean up the cache
-            testBundle2.uninstall();
-        }
-        host.stop();
-        System.out.println("Done");
-    }
-
-    @Test
-    public void testDiscovery() throws IOException {
-        // Both version 1 and 2 should be found because test.TestService is not a Tuscany service
-        Collection<ServiceDeclaration> descriptors = discoverer.getServiceDeclarations("test.TestService");
-        Assert.assertEquals(2, descriptors.size());
-        descriptors = discoverer.getServiceDeclarations("notthere");
-        Assert.assertEquals(0, descriptors.size());
-    }
-    
-    @Test
-    public void testDiscoverResources() throws IOException {
-        Collection<ServiceDeclaration> descriptors = discoverer.getServiceDeclarations("/META-INF/services/test.TestService");
-        Assert.assertEquals(2, descriptors.size());
-    }
-
-    @Test
-    public void testDiscoveryFirst() throws IOException {
-        ServiceDeclaration descriptor = discoverer.getServiceDeclaration("test.TestService");
-        Assert.assertNotNull(descriptor);
-        descriptor = discoverer.getServiceDeclaration("notthere");
-        Assert.assertNull(descriptor);
-    }
-
-    @Test
-    public void testTuscanyDiscovery() throws IOException {
-        Collection<ServiceDeclaration> descriptors = discoverer.getServiceDeclarations("org.apache.tuscany.sca.test.TestService");
-        // Only the version 2 should be found
-        Assert.assertEquals(1, descriptors.size());
-        ServiceDeclaration sd = descriptors.iterator().next();
-        Assert.assertEquals("2", sd.getAttributes().get("version"));
-    }
-
-}
diff --git a/sca-java-2.x/branches/2.0-Beta1/modules/extensibility-equinox/src/test/java/org/apache/tuscany/sca/extensibility/equinox/TestEquinoxHost.java b/sca-java-2.x/branches/2.0-Beta1/modules/extensibility-equinox/src/test/java/org/apache/tuscany/sca/extensibility/equinox/TestEquinoxHost.java
deleted file mode 100644
index 566cd6e1a5..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/modules/extensibility-equinox/src/test/java/org/apache/tuscany/sca/extensibility/equinox/TestEquinoxHost.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.extensibility.equinox;
-
-import java.io.File;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.tuscany.sca.extensibility.ServiceDeclaration;
-import org.apache.tuscany.sca.extensibility.ServiceDiscovery;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.launch.Framework;
-import org.osgi.framework.launch.FrameworkFactory;
-
-/**
- * A test host that starts/stops Equinox.
- *
- * @version $Rev$ $Date$
- */
-public class TestEquinoxHost {
-    private Framework framework;
-
-    private BundleContext init() throws Exception {
-        if (framework != null) {
-            throw new IllegalStateException("The framework is started already");
-        }
-        ServiceDeclaration sd = ServiceDiscovery.getInstance().getServiceDeclaration(FrameworkFactory.class.getName());
-        Class<?> factoryCls = sd.loadClass();
-        FrameworkFactory factory = (FrameworkFactory)factoryCls.newInstance();
-        Map<Object, Object> props = new HashMap<Object, Object>();
-        props.put("osgi.clean", "true");
-        props.put("osgi.instance.area", new File("target/workspace").toURI().toString());
-        props.put("osgi.install.area", new File("target/eclipse").toURI().toString());
-        props.put("osgi.configuration.area", new File("target/eclipse").toURI().toString());
-        framework = factory.newFramework(props);
-        framework.start();
-        return framework.getBundleContext();
-    }
-
-    public BundleContext start() {
-        try {
-            return init();
-        } catch (Exception e) {
-            throw new IllegalStateException(e);
-        }
-    }
-
-    public void stop() {
-        try {
-            if (framework != null) {
-                framework.stop();
-                framework.waitForStop(2000);
-                framework = null;
-            }
-        } catch (Exception e) {
-            throw new IllegalStateException(e);
-        }
-    }
-
-}
diff --git a/sca-java-2.x/branches/2.0-Beta1/modules/extensibility-equinox/src/test/resources/test-bundle-v1.jar b/sca-java-2.x/branches/2.0-Beta1/modules/extensibility-equinox/src/test/resources/test-bundle-v1.jar
deleted file mode 100644
index 61c7b5a49e..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/modules/extensibility-equinox/src/test/resources/test-bundle-v1.jar
+++ /dev/null
diff --git a/sca-java-2.x/branches/2.0-Beta1/modules/extensibility-equinox/src/test/resources/test-bundle-v2.jar b/sca-java-2.x/branches/2.0-Beta1/modules/extensibility-equinox/src/test/resources/test-bundle-v2.jar
deleted file mode 100644
index b02c368c58..0000000000
--- a/sca-java-2.x/branches/2.0-Beta1/modules/extensibility-equinox/src/test/resources/test-bundle-v2.jar
+++ /dev/null