Removed more modules as in Oscar's TUSCANY-2440 reduced-set patch. Also removed newer modules added since r643746 and are not required to run the minimum set that we are porting to android. Set svn ignore properties to ignore Manifest files produced by the build.

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

14 files changed, 0 insertions, 1450 deletions

diff --git a/branches/sca-android/modules/contribution-osgi/LICENSE b/branches/sca-android/modules/contribution-osgi/LICENSE
deleted file mode 100644
index 8aa906c321..0000000000
--- a/branches/sca-android/modules/contribution-osgi/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-android/modules/contribution-osgi/META-INF/README b/branches/sca-android/modules/contribution-osgi/META-INF/README
deleted file mode 100644
index 009570154d..0000000000
--- a/branches/sca-android/modules/contribution-osgi/META-INF/README
+++ /dev/null
@@ -1 +0,0 @@
-This directory contains a generated MANIFEST.MF file.
diff --git a/branches/sca-android/modules/contribution-osgi/NOTICE b/branches/sca-android/modules/contribution-osgi/NOTICE
deleted file mode 100644
index fdfa0e9faa..0000000000
--- a/branches/sca-android/modules/contribution-osgi/NOTICE
+++ /dev/null
@@ -1,6 +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/).
-
diff --git a/branches/sca-android/modules/contribution-osgi/pom.xml b/branches/sca-android/modules/contribution-osgi/pom.xml
deleted file mode 100644
index 5622978bd9..0000000000
--- a/branches/sca-android/modules/contribution-osgi/pom.xml
+++ /dev/null
@@ -1,96 +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>1.4-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-    <artifactId>tuscany-contribution-osgi</artifactId>
-    <name>Apache Tuscany SCA Contribution Service OSGi </name>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-contribution</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-osgi-runtime</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-contribution-java</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-core-spi</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.felix</groupId>
-            <artifactId>org.apache.felix.main</artifactId>
-            <version>1.0.4</version>
-        </dependency>
-
-
-
-        <dependency>
-            <groupId>org.codehaus.woodstox</groupId>
-            <artifactId>wstx-asl</artifactId>
-            <version>3.2.1</version>
-            <scope>runtime</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>stax</groupId>
-                    <artifactId>stax-api</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-
-                <configuration>
-                    <instructions>
-                        <Bundle-Version>${tuscany.version}</Bundle-Version>
-                        <Bundle-SymbolicName>org.apache.tuscany.sca.contribution.osgi</Bundle-SymbolicName>
-                        <Bundle-Description>${pom.name}</Bundle-Description>
-                        <Export-Package>org.apache.tuscany.sca.contribution.osgi*</Export-Package>
-                    </instructions>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
diff --git a/branches/sca-android/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/BundleReference.java b/branches/sca-android/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/BundleReference.java
deleted file mode 100644
index 0bbb8b707a..0000000000
--- a/branches/sca-android/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/BundleReference.java
+++ /dev/null
@@ -1,161 +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.contribution.osgi;
-
-
-/**
- * A weak reference to a class, which should be used to register classes
- * with an ArtifactResolver and resolve these classes later.
- *
- * @version $Rev$ $Date$
- */
-public class BundleReference {
-
-    /**
-     * The bundle.
-     */
-    private Object bundle;
-
-    /**
-     * The bundle name.
-     */
-    private String bundleName;
-
-    /**
-     * The bundle version.
-     */
-    private String bundleVersion;
-
-    /**
-     * The bundle name and version.
-     */
-    private String bundleUniqueName;
-
-    /**
-     * The bundle relative path.
-     */
-    private String bundleRelativePath;
-
-    /**
-     * Constructs a new BundleReference.
-     * 
-     * @param bundle The bundle reference
-     * @param bundleName The bundle name
-     * @param bundleVersion The bundle version
-     * @param bundleRelativePath The relative path for the bundle
-     */
-    public BundleReference(Object bundle, String bundleName, String bundleVersion, String bundleRelativePath) {
-        this.bundle = bundle;
-        this.bundleName = bundleName;
-        this.bundleVersion = bundleVersion;       
-        this.bundleRelativePath = bundleRelativePath;
-        this.bundleUniqueName = bundleName + "(" + (bundleVersion == null?"0.0.0":bundleVersion) + ")";
-    }
-    
-    /**
-     * Constructs a new BundleReference.
-     * 
-     * @param bundleName The bundle name
-     * @param bundleVersion The bundle version
-     */
-    public BundleReference(String bundleName, String bundleVersion) {
-        this.bundleName = bundleName;
-        this.bundleVersion = bundleVersion;
-        this.bundleUniqueName = bundleName + "(" + (bundleVersion == null?"0.0.0":bundleVersion) + ")";
-    }
-    
-    /**
-     * Get the referenced bundle.
-     * 
-     * @return The referenced bundle
-     */
-    public Object getBundle() {
-        return bundle;
-    }
-    
-    /**
-     * Get the referenced bundle name.
-     * 
-     * @return The bundle name
-     */
-    public String getBundleName() {
-        return bundleName;
-    }
-    
-    /**
-     * Get the referenced bundle version.
-     * 
-     * @return The bundle version
-     */
-    public String getBundleVersion() {
-        return bundleVersion;
-    }
-    
-    /**
-     * Get the referenced bundle name and version.
-     * 
-     * @return The bundle name
-     */
-    public String getBundleUniqueName() {
-        return bundleUniqueName;
-    }
-    
-    /**
-     * Get the relative location of the bundle inside its contribution.
-     * 
-     * @return The bundle path
-     */
-    public String getBundleRelativePath() {
-        return bundleRelativePath;
-    }
-    
-    
-    
-    /**
-     * Returns true if the bundle reference is unresolved.
-     * 
-     * @return Whether or not the bundle has been resolved
-     */
-    public boolean isUnresolved() {
-        return bundle == null;
-    }
-
-    @Override
-    public int hashCode() {
-        return bundleUniqueName.hashCode();
-    }
-    
-    @Override
-    public boolean equals(Object obj) {
-        if (obj == this) {
-            return true;
-        } else {
-            if (obj instanceof BundleReference) {
-                BundleReference ref = (BundleReference)obj;
-                return bundleName.equals(ref.bundleName) &&
-                       (bundleVersion == null || ref.bundleVersion == null ||
-                        bundleVersion.equals(ref.bundleVersion));
-            } else {
-                return false;
-            }
-        }
-    }
-
-}
diff --git a/branches/sca-android/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiBundleContributionProcessor.java b/branches/sca-android/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiBundleContributionProcessor.java
deleted file mode 100644
index 5033d7eefc..0000000000
--- a/branches/sca-android/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiBundleContributionProcessor.java
+++ /dev/null
@@ -1,161 +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.contribution.osgi.impl;

-

-import java.io.IOException;

-import java.io.InputStream;

-import java.net.MalformedURLException;

-import java.net.URI;

-import java.net.URL;

-import java.util.ArrayList;

-import java.util.Enumeration;

-import java.util.HashSet;

-import java.util.List;

-import java.util.Set;

-import java.util.jar.JarEntry;

-import java.util.jar.JarInputStream;

-

-import org.apache.tuscany.sca.contribution.PackageType;

-import org.apache.tuscany.sca.contribution.processor.PackageProcessor;

-import org.apache.tuscany.sca.contribution.service.ContributionException;

-import org.apache.tuscany.sca.osgi.runtime.OSGiRuntime;

-import org.osgi.framework.Bundle;

-

-/**

- * Bundle Contribution package processor.

- *

- * @version $Rev$ $Date$

- */

-public class OSGiBundleContributionProcessor implements PackageProcessor {

-

-    public OSGiBundleContributionProcessor() {

-    }

-

-    public String getPackageType() {

-        return PackageType.BUNDLE;

-    }

-

-    public URL getArtifactURL(URL sourceURL, URI artifact) throws MalformedURLException {

-        Bundle bundle = null;

-        try {

-            bundle = OSGiRuntime.findInstalledBundle(sourceURL);

-            if (bundle != null) {

-                URL url = bundle.getResource(artifact.getPath());

-                if (url == null)

-                    System.out.println("Could not load resource " + artifact);

-                return url;

-            }

-        } catch (Exception e) {

-        }

-        return null;

-    }

-    

-    public List<URI> getJarArtifacts(URL packageSourceURL, InputStream inputStream) throws ContributionException,

-    IOException {

-    if (packageSourceURL == null) {

-        throw new IllegalArgumentException("Invalid null package source URL.");

-    }

-

-    if (inputStream == null) {

-        throw new IllegalArgumentException("Invalid null source inputstream.");

-    }

-

-    // Assume the root is a jar file

-    JarInputStream jar = new JarInputStream(inputStream);

-    try {

-        Set<String> names = new HashSet<String>();

-        while (true) {

-            JarEntry entry = jar.getNextJarEntry();

-            if (entry == null) {

-                // EOF

-                break;

-            }

-

-            // FIXME: Maybe we should externalize the filter as a property

-            String name = entry.getName(); 

-            if (!name.startsWith(".") && !entry.isDirectory()) {

-                

-                // Trim trailing /

-                if (name.endsWith("/")) {

-                    name = name.substring(0, name.length() - 1);

-                }

-

-                // Add the entry name

-                if (!names.contains(name) && name.length() > 0) {

-                    names.add(name);

-                    

-                }

-            }

-        }

-        

-        // Return list of URIs

-        List<URI> artifacts = new ArrayList<URI>();

-        for (String name: names) {

-            artifacts.add(URI.create(name));

-        }

-        return artifacts;

-        

-    } finally {

-        jar.close();

-    }

-}

-

-    public List<URI> getArtifacts(URL packageSourceURL, InputStream inputStream) throws ContributionException,

-        IOException {

-        

-        Bundle bundle = null;

-        try {

-            bundle = OSGiRuntime.findInstalledBundle(packageSourceURL);

-        } catch (Exception e) {

-        }

-        

-        if (bundle == null) {

-            throw new IllegalArgumentException("Could not find OSGi bundle " + packageSourceURL);

-        }

-        

-        if (packageSourceURL == null) {

-            throw new IllegalArgumentException("Invalid null package source URL.");

-        }

-

-        List<URI> artifacts = new ArrayList<URI>();

-

-        try {

-            Enumeration entries = bundle.findEntries("/", "*", true);

-            while (entries.hasMoreElements()) {

-                URL entry = (URL)entries.nextElement();

-                String entryName = entry.getPath();

-                if (entryName.startsWith("/"))

-                    entryName = entryName.substring(1);

-                artifacts.add(new URI(entryName));

-                

-                if (entryName.endsWith(".jar")) {

-

-                    URL jarResource = bundle.getResource(entryName);

-                    artifacts.addAll(getJarArtifacts(jarResource, jarResource.openStream()));

-                }

-            

-            }

-        } catch (Exception e) {

-            throw new RuntimeException(e);

-        }

-

-        return artifacts;

-    }

-}

diff --git a/branches/sca-android/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiBundleProcessor.java b/branches/sca-android/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiBundleProcessor.java
deleted file mode 100644
index b3c2302f60..0000000000
--- a/branches/sca-android/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiBundleProcessor.java
+++ /dev/null
@@ -1,141 +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.contribution.osgi.impl;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URL;
-import java.util.List;
-import java.util.jar.Attributes;
-import java.util.jar.JarInputStream;
-import java.util.jar.Manifest;
-
-import org.apache.tuscany.sca.contribution.Artifact;
-import org.apache.tuscany.sca.contribution.Contribution;
-import org.apache.tuscany.sca.contribution.osgi.BundleReference;
-import org.apache.tuscany.sca.osgi.runtime.OSGiRuntime;
-
-/**
- * OSGi bundle processor
- *
- * @version $Rev$ $Date$
- */
-public class OSGiBundleProcessor {
-
-    private boolean initializedOSGi;
-    private OSGiRuntime osgiRuntime;
-
-    public OSGiBundleProcessor() {
-    }
-
-    public Object installContributionBundle(Contribution contribution) {
-
-        JarInputStream jar = null;
-        Object bundle = null;
-
-        try {
-
-            URL contribURL = new URL(contribution.getLocation());
-            jar = new JarInputStream(contribURL.openStream());
-
-            Manifest manifest = jar.getManifest();
-            if (manifest != null && manifest.getMainAttributes()
-                .containsKey(new Attributes.Name("Bundle-SymbolicName"))) {
-
-                initialize();
-                if (osgiRuntime != null)
-                    bundle = osgiRuntime.installBundle(contribURL.toString(), null);
-            }
-        } catch (Exception e) {
-            // If OSGi cannot process the jar, treat the bundle as a plain jar file.
-        } finally {
-
-            try {
-                if (jar != null)
-                    jar.close();
-            } catch (IOException e) {
-            }
-        }
-
-        return bundle;
-    }
-
-    public BundleReference installNestedBundle(Contribution contribution,
-                                               String bundleSymbolicName,
-                                               String bundleVersion) {
-
-        BundleReference bundleReference = null;
-
-        initialize();
-        if (osgiRuntime == null)
-            return null;
-
-        List<Artifact> artifacts = contribution.getArtifacts();
-        for (Artifact a : artifacts) {
-            if (a.getURI().endsWith(".jar")) {
-
-                InputStream stream;
-                JarInputStream jar = null;
-                Object name;
-                Object version;
-                try {
-
-                    URL artifactURL = new URL(a.getLocation());
-                    stream = artifactURL.openStream();
-                    jar = new JarInputStream(artifactURL.openStream());
-                    Manifest manifest = jar.getManifest();
-                    name = manifest.getMainAttributes().get(new Attributes.Name("Bundle-SymbolicName"));
-                    version = manifest.getMainAttributes().get(new Attributes.Name("Bundle-Version"));
-
-                    if (bundleSymbolicName.equals(name) && (bundleVersion == null || version == null || bundleVersion
-                        .equals(version))) {
-
-                        Object bundle = osgiRuntime.installBundle(a.getLocation(), stream);
-
-                        bundleReference = new BundleReference(bundle, bundleSymbolicName, bundleVersion, a.getURI());
-
-                        break;
-                    }
-
-                } catch (Exception e) {
-
-                    // If OSGi cannot process the jar, treat the bundle as a plain jar file.
-                } finally {
-                    try {
-                        if (jar != null)
-                            jar.close();
-                    } catch (IOException e) {
-                    }
-                }
-            }
-        }
-        return bundleReference;
-    }
-
-    private void initialize() {
-        try {
-            if (!initializedOSGi) {
-                initializedOSGi = true;
-                osgiRuntime = OSGiRuntime.getRuntime();
-            }
-        } catch (Exception e) {
-        }
-    }
-}
diff --git a/branches/sca-android/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiBundleReferenceModelResolver.java b/branches/sca-android/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiBundleReferenceModelResolver.java
deleted file mode 100644
index 07e80f66f3..0000000000
--- a/branches/sca-android/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiBundleReferenceModelResolver.java
+++ /dev/null
@@ -1,154 +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.contribution.osgi.impl;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.tuscany.sca.contribution.Contribution;
-import org.apache.tuscany.sca.contribution.Import;
-import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
-import org.apache.tuscany.sca.contribution.osgi.BundleReference;
-import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
-import org.apache.tuscany.sca.osgi.runtime.OSGiRuntime;
-import org.osgi.framework.Bundle;
-
-/**
- * A Model Resolver for BundleReferences.
- *
- * @version $Rev$ $Date$
- */
-public class OSGiBundleReferenceModelResolver implements ModelResolver {
-    private Contribution contribution;
-    private Map<String, BundleReference> map = new HashMap<String, BundleReference>();
-    
-    OSGiRuntime osgiRuntime;
-    private OSGiBundleProcessor bundleProcessor;
-    
-    public OSGiBundleReferenceModelResolver(Contribution contribution, ModelFactoryExtensionPoint modelFactories) {
-        this.contribution = contribution;
-        this.bundleProcessor = new OSGiBundleProcessor();
-    }
-
-    public void addModel(Object resolved) {
-        BundleReference bundleRef = (BundleReference)resolved;
-        map.put(bundleRef.getBundleUniqueName(), bundleRef);
-    }
-    
-    public Object removeModel(Object resolved) {
-        return map.remove(((BundleReference)resolved).getBundleUniqueName());
-    }
-    
-    /**
-     * Handle artifact resolution when the specific class reference is imported from another contribution
-     * @param unresolved
-     * @return
-     */
-    private BundleReference resolveImportedModel(BundleReference unresolved) {
-        BundleReference resolved = unresolved;
-
-        if( this.contribution != null) {
-            for (Import import_ : this.contribution.getImports()) {
-                
-                resolved = import_.getModelResolver().resolveModel(BundleReference.class, unresolved);
-                if (resolved != unresolved)
-                        break;
-            }
-            
-        }
-        return resolved;
-    }
-    
-    
-    public <T> T resolveModel(Class<T> modelClass, T unresolved) {
-        Object resolved = map.get(unresolved);
-        
-        if (resolved != null ){
-            return modelClass.cast(resolved);
-        } 
-        
-        try {
-            if (osgiRuntime == null)
-                osgiRuntime = OSGiRuntime.getRuntime();
-        } catch (Exception e) {
-        }
-        if (osgiRuntime == null)
-            return unresolved;
-
-        //Load a class on demand
-        Object bundle = null;
-        String bundleName = ((BundleReference)unresolved).getBundleName();
-        String bundleVersion = ((BundleReference)unresolved).getBundleVersion();
-        
-        bundle = osgiRuntime.findBundle(bundleName, bundleVersion);
-        BundleReference bundleReference;
-        
-        if (bundle == null)
-            bundleReference = bundleProcessor.installNestedBundle(contribution, bundleName, bundleVersion);
-        else {
-            bundleReference = new BundleReference(bundle, 
-                    ((BundleReference)unresolved).getBundleName(),
-                    bundleVersion,
-                    getBundleFileName(bundle)
-                    );
-        }
-                
-        
-        if (bundleReference != null) {
-            //if we load the class            
-            
-            map.put(((BundleReference)unresolved).getBundleUniqueName(), bundleReference);
-            
-            // Return the resolved BundleReference
-            return modelClass.cast(bundleReference);            
-        } else {
-            //delegate resolution of the class
-            resolved = this.resolveImportedModel((BundleReference)unresolved);
-            return modelClass.cast(resolved);
-        }
-        
-
-    }
-    
-    
-    private String getBundleFileName(Object bundle) {
-        if (bundle instanceof Bundle) {
-            String path = ((Bundle)bundle).getLocation();
-            if (path.endsWith("/"))
-                path = path.substring(0, path.length()-1);
-            if (path.startsWith(contribution.getLocation())) {
-                if (path.equals(contribution.getLocation())) {
-                    int index = path.lastIndexOf('/');
-                    if (index > 0 && index < path.length()-1)
-                        path = path.substring(index+1);
-                } else {
-                    path = path.substring(contribution.getLocation().length());
-                    if (path.startsWith("/"))
-                        path = path.substring(1);
-                }
-            } else if (path.lastIndexOf('/') >= 0)
-                path = path.substring(path.lastIndexOf('/')+1);
-            return path;
-        }
-        return null;
-            
-    }
-    
-}
diff --git a/branches/sca-android/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiClassReferenceModelResolver.java b/branches/sca-android/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiClassReferenceModelResolver.java
deleted file mode 100644
index 528a287328..0000000000
--- a/branches/sca-android/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiClassReferenceModelResolver.java
+++ /dev/null
@@ -1,137 +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.contribution.osgi.impl;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.tuscany.sca.contribution.Contribution;
-import org.apache.tuscany.sca.contribution.Import;
-import org.apache.tuscany.sca.contribution.ModelFactoryExtensionPoint;
-import org.apache.tuscany.sca.contribution.resolver.ClassReference;
-import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
-import org.apache.tuscany.sca.osgi.runtime.OSGiRuntime;
-import org.osgi.framework.Bundle;
-
-/**
- * A Model Resolver for ClassReferences.
- *
- * @version $Rev$ $Date$
- */
-public class OSGiClassReferenceModelResolver implements ModelResolver {
-    private Contribution contribution;
-    private Map<String, ClassReference> map = new HashMap<String, ClassReference>();
-    private Bundle bundle;
-    private boolean initialized;
-    private boolean useOSGi;
-
-    public OSGiClassReferenceModelResolver(Contribution contribution, ModelFactoryExtensionPoint modelFactories) {
-        this.contribution = contribution;
-    }
-
-    public void addModel(Object resolved) {
-        ClassReference clazz = (ClassReference)resolved;
-        map.put(clazz.getClassName(), clazz);
-    }
-
-    public Object removeModel(Object resolved) {
-        return map.remove(((ClassReference)resolved).getClassName());
-    }
-
-    /**
-     * Handle artifact resolution when the specific class reference is imported from another contribution
-     * @param unresolved
-     * @return
-     */
-    private ClassReference resolveImportedModel(ClassReference unresolved) {
-        ClassReference resolved = unresolved;
-
-        if (this.contribution != null) {
-            for (Import import_ : this.contribution.getImports()) {
-
-                if (resolved == unresolved && bundle != null) {
-                    resolved = import_.getModelResolver().resolveModel(ClassReference.class, unresolved);
-                    if (resolved != unresolved)
-                        break;
-                }
-            }
-
-        }
-        return resolved;
-    }
-
-    public <T> T resolveModel(Class<T> modelClass, T unresolved) {
-        Object resolved = map.get(unresolved);
-
-        if (resolved != null) {
-            return modelClass.cast(resolved);
-        }
-        initialize();
-        if (!useOSGi)
-            return unresolved;
-
-        //Load a class on demand
-        Class clazz = null;
-        if (bundle != null) {
-            try {
-                clazz = bundle.loadClass(((ClassReference)unresolved).getClassName());
-            } catch (Exception e) {
-                // we will later try to delegate to imported model resolvers
-            }
-        }
-
-        if (clazz != null) {
-            //if we load the class            
-            // Store a new ClassReference wrapping the loaded class
-            ClassReference classReference = new ClassReference(clazz);
-            map.put(getPackageName(classReference), classReference);
-
-            // Return the resolved ClassReference
-            return modelClass.cast(classReference);
-        } else {
-            //delegate resolution of the class
-            resolved = this.resolveImportedModel((ClassReference)unresolved);
-            return modelClass.cast(resolved);
-        }
-
-    }
-
-    /***************
-     * Helper methods
-     ***************/
-
-    private String getPackageName(ClassReference clazz) {
-        int pos = clazz.getClassName().lastIndexOf(".");
-        return clazz.getClassName().substring(0, pos - 1);
-    }
-
-    private void initialize() {
-        if (initialized)
-            return;
-
-        initialized = true;
-        try {
-            bundle = OSGiRuntime.findInstalledBundle(contribution.getLocation());
-            useOSGi = bundle != null;
-        } catch (Throwable e) {
-            // Ignore errors, default to ClassReferenceModelResolver
-        }
-    }
-}
diff --git a/branches/sca-android/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiImportExportListener.java b/branches/sca-android/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiImportExportListener.java
deleted file mode 100644
index 15ad0bd948..0000000000
--- a/branches/sca-android/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiImportExportListener.java
+++ /dev/null
@@ -1,215 +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.contribution.osgi.impl;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.InputStream;
-import java.net.URL;
-import java.util.HashSet;
-import java.util.jar.JarOutputStream;
-import java.util.jar.Manifest;
-import java.util.zip.ZipEntry;
-
-import org.apache.tuscany.sca.contribution.Contribution;
-import org.apache.tuscany.sca.contribution.Export;
-import org.apache.tuscany.sca.contribution.Import;
-import org.apache.tuscany.sca.contribution.java.JavaExport;
-import org.apache.tuscany.sca.contribution.java.JavaImport;
-import org.apache.tuscany.sca.contribution.service.ContributionListener;
-import org.apache.tuscany.sca.contribution.service.ContributionRepository;
-import org.apache.tuscany.sca.osgi.runtime.OSGiRuntime;
-
-/**
- * Namespace Import/Export contribution listener
- * The listener would process all import/export from a given contribution 
- * and initialize the model resolvers properly
- * 
- * @version $Rev$ $Date$
- */
-public class OSGiImportExportListener implements ContributionListener {
-
-    private OSGiBundleProcessor bundleProcessor;
-
-    public OSGiImportExportListener() {
-        bundleProcessor = new OSGiBundleProcessor();
-    }
-
-    /**
-     * Initialize the import/export model resolvers
-     * Export model resolvers are same as Contribution model resolver
-     * Import model resolvers are matched to a specific contribution if a location URI is specified, 
-     *    otherwise it try to resolve against all the other contributions
-     */
-    public void contributionAdded(ContributionRepository repository, Contribution contribution) {
-
-        OSGiRuntime osgiRuntime = null;
-        try {
-            if (bundleProcessor.installContributionBundle(contribution) == null) {
-                return;
-            } else {
-                osgiRuntime = OSGiRuntime.getRuntime();
-            }
-        } catch (Exception e) {
-            return;
-        }
-
-        HashSet<Contribution> bundlesToInstall = new HashSet<Contribution>();
-        // Initialize the contribution imports
-        for (Import import_ : contribution.getImports()) {
-            boolean initialized = false;
-
-            if (import_ instanceof JavaImport) {
-                JavaImport javaImport = (JavaImport)import_;
-                String packageName = javaImport.getPackage();
-
-                //Find a matching contribution
-                if (javaImport.getLocation() != null) {
-                    Contribution targetContribution = repository.getContribution(javaImport.getLocation());
-                    if (targetContribution != null) {
-
-                        // Find a matching contribution export
-                        for (Export export : targetContribution.getExports()) {
-                            if (export instanceof JavaExport) {
-                                JavaExport javaExport = (JavaExport)export;
-                                if (packageName.equals(javaExport.getPackage())) {
-
-                                    if (osgiRuntime.findBundle(targetContribution.getLocation()) == null)
-                                        bundlesToInstall.add(targetContribution);
-
-                                    initialized = true;
-
-                                }
-                            }
-                            if (initialized)
-                                break;
-                        }
-                    }
-                }
-            }
-            if (!initialized) {
-                for (Contribution c : repository.getContributions()) {
-
-                    // Go over all exports in the contribution
-                    for (Export export : c.getExports()) {
-                        // If the export matches our namespace, try to the resolve the model object
-                        if (import_.match(export) && osgiRuntime.findBundle(c.getLocation()) == null) {
-                            bundlesToInstall.add(c);
-                        }
-                    }
-                }
-            }
-        }
-        for (Contribution c : bundlesToInstall) {
-            try {
-                installDummyBundle(osgiRuntime, c);
-            } catch (Exception e) {
-            }
-        }
-
-    }
-
-    public void contributionRemoved(ContributionRepository repository, Contribution contribution) {
-
-    }
-
-    public void contributionUpdated(ContributionRepository repository,
-                                    Contribution oldContribution,
-                                    Contribution contribution) {
-
-    }
-
-    private void installDummyBundle(OSGiRuntime osgiRuntime, Contribution contribution) throws Exception {
-        ByteArrayOutputStream out = new ByteArrayOutputStream();
-
-        String EOL = System.getProperty("line.separator");
-
-        String bundleName = contribution.getURI();
-        URL contribURL = new URL(contribution.getLocation());
-        String contribName = contribURL.getPath();
-        if (contribName.endsWith("/")) 
-            contribName = contribName.substring(0, contribName.length()-1);
-        if (contribName.lastIndexOf("/") >= 0)
-            contribName = contribName.substring(contribName.lastIndexOf("/")+1);            
-
-        StringBuffer exportPackageNames = new StringBuffer();
-        for (Export export : contribution.getExports()) {
-            if (export instanceof JavaExport) {
-                if (exportPackageNames.length() > 0)
-                    exportPackageNames.append(",");
-                exportPackageNames.append(((JavaExport)export).getPackage());
-            }
-        }
-        StringBuffer importPackageNames = new StringBuffer();
-        for (Import import_ : contribution.getImports()) {
-            if (import_ instanceof JavaImport) {
-                if (importPackageNames.length() > 0)
-                    importPackageNames.append(",");
-                importPackageNames.append(((JavaImport)import_).getPackage());
-            }
-        }
-
-        String manifestStr =
-            "Manifest-Version: 1.0" + EOL
-                + "Bundle-ManifestVersion: 2"
-                + EOL
-                + "Bundle-Name: "
-                + bundleName
-                + EOL
-                + "Bundle-SymbolicName: "
-                + bundleName
-                + EOL
-                + "Bundle-Version: "
-                + "1.0.0"
-                + EOL
-                + "Bundle-Localization: plugin"
-                + EOL;
-
-        StringBuilder manifestBuf = new StringBuilder();
-        manifestBuf.append(manifestStr);
-        manifestBuf.append("Export-Package: " + exportPackageNames + EOL);
-        manifestBuf.append("Import-Package: " + importPackageNames + EOL);
-        manifestBuf.append("Bundle-ClassPath: .," + contribName + EOL);
-
-        ByteArrayInputStream manifestStream = new ByteArrayInputStream(manifestBuf.toString().getBytes());
-        Manifest manifest = new Manifest();
-        manifest.read(manifestStream);
-
-        JarOutputStream jarOut = new JarOutputStream(out, manifest);
-
-        ZipEntry ze = new ZipEntry(contribName);
-        jarOut.putNextEntry(ze);
-        InputStream stream = contribURL.openStream();
-
-        byte[] bytes = new byte[stream.available()];
-        stream.read(bytes);
-        jarOut.write(bytes);
-        stream.close();
-
-        jarOut.close();
-        out.close();
-
-        ByteArrayInputStream in = new ByteArrayInputStream(out.toByteArray());
-
-        osgiRuntime.installBundle("file://" + bundleName + ".jar", in);
-
-    }
-
-}
diff --git a/branches/sca-android/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiModelResolverImpl.java b/branches/sca-android/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiModelResolverImpl.java
deleted file mode 100644
index e624b1d3b5..0000000000
--- a/branches/sca-android/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiModelResolverImpl.java
+++ /dev/null
@@ -1,119 +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.contribution.osgi.impl;
-
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Hashtable;
-import java.util.Map;
-
-import org.apache.tuscany.sca.contribution.osgi.BundleReference;
-import org.apache.tuscany.sca.contribution.resolver.ClassReference;
-import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
-import org.osgi.framework.Bundle;
-
-/**
- * An implementation of an artifact resolver for OSGi bundles.
- *
- * @version $Rev$ $Date$
- */
-public class OSGiModelResolverImpl implements ModelResolver {
-    private static final long serialVersionUID = -7826976465762296634L;
-    
-    private Map<Object, Object> map = new HashMap<Object, Object>();
-    
-    private Hashtable<String, Bundle>  bundles;
-    public OSGiModelResolverImpl(Hashtable<String, Bundle> bundles) {
-        this.bundles = bundles;
-    }
-    
-    
-    public <T> T resolveModel(Class<T> modelClass, T unresolved) {
-        Object resolved = map.get(unresolved);
-        if (resolved != null) {
-            
-            // Return the resolved object
-            return modelClass.cast(resolved);
-            
-        } else if (unresolved instanceof ClassReference) {
-            
-            // Load a class on demand
-            ClassReference classReference = (ClassReference)unresolved;
-            Class clazz = null;
-            for (Bundle bundle : bundles.values()) {
-                try {
-                    clazz = bundle.loadClass(classReference.getClassName());
-                } catch (ClassNotFoundException e) {
-                    continue;
-                }
-                break;
-            }
-            if (clazz == null) {
-
-                // Return the unresolved object
-                return unresolved;
-            }
-            
-            // Store a new ClassReference wrapping the loaded class
-            resolved = new ClassReference(clazz);
-            map.put(resolved, resolved);
-            
-            // Return the resolved ClassReference
-            return modelClass.cast(resolved);
-                
-        } else if (unresolved instanceof BundleReference) {
-            for (String bundlePath: bundles.keySet()) {
-                Bundle bundle = bundles.get(bundlePath);
-                BundleReference bundleRef = (BundleReference)unresolved;
-                String bundleVersion = (String)bundle.getHeaders().get("Bundle-Version");
-                if (bundle.getSymbolicName().equals(bundleRef.getBundleName())&&
-                    (bundleVersion == null || bundleRef.getBundleVersion() == null ||
-                    bundleVersion.equals(bundleRef.getBundleVersion()))) {
-                    
-                    resolved = new BundleReference(bundle, 
-                            bundle.getSymbolicName(), 
-                            bundleVersion,
-                            bundlePath);
-                    map.put(resolved, resolved);
-                    
-                    // Return the resolved BundleReference
-                    return modelClass.cast(resolved);
-                    
-                }
-            }
-        } 
-            
-        // Return the unresolved object
-        return unresolved;
-    }
-    
-    public void addModel(Object resolved) {
-        map.put(resolved, resolved);
-    }
-    
-    public Object removeModel(Object resolved) {
-        return map.remove(resolved);
-    }
-    
-    public Collection<Object> getModels() {
-        return map.values();
-    }
-    
-}
diff --git a/branches/sca-android/modules/contribution-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.PackageProcessor b/branches/sca-android/modules/contribution-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.PackageProcessor
deleted file mode 100644
index 632d135cb5..0000000000
--- a/branches/sca-android/modules/contribution-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.processor.PackageProcessor
+++ /dev/null
@@ -1,18 +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. 

-

-org.apache.tuscany.sca.contribution.osgi.impl.OSGiBundleContributionProcessor;type=application/osgi.bundle

diff --git a/branches/sca-android/modules/contribution-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver b/branches/sca-android/modules/contribution-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
deleted file mode 100644
index 02e8b411eb..0000000000
--- a/branches/sca-android/modules/contribution-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
+++ /dev/null
@@ -1,18 +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. 

-

-org.apache.tuscany.sca.contribution.osgi.impl.OSGiBundleReferenceModelResolver;model=org.apache.tuscany.sca.contribution.osgi.BundleReference

diff --git a/branches/sca-android/modules/contribution-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.service.ContributionListener b/branches/sca-android/modules/contribution-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.service.ContributionListener
deleted file mode 100644
index 8dec190930..0000000000
--- a/branches/sca-android/modules/contribution-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.service.ContributionListener
+++ /dev/null
@@ -1,18 +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. 

-

-org.apache.tuscany.sca.contribution.osgi.impl.OSGiImportExportListener