Create branch for next release

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

12 files changed, 1123 insertions, 0 deletions

diff --git a/sca-java-2.x/branches/2.0-Beta1/modules/contribution-osgi/LICENSE b/sca-java-2.x/branches/2.0-Beta1/modules/contribution-osgi/LICENSE
new file mode 100644
index 0000000000..6e529a25c4
--- /dev/null
+++ b/sca-java-2.x/branches/2.0-Beta1/modules/contribution-osgi/LICENSE
@@ -0,0 +1,205 @@
+

+                                 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/contribution-osgi/META-INF/MANIFEST.MF b/sca-java-2.x/branches/2.0-Beta1/modules/contribution-osgi/META-INF/MANIFEST.MF
new file mode 100644
index 0000000000..fdebec4d1c
--- /dev/null
+++ b/sca-java-2.x/branches/2.0-Beta1/modules/contribution-osgi/META-INF/MANIFEST.MF
@@ -0,0 +1,24 @@
+Manifest-Version: 1.0

+Bundle-ManifestVersion: 2

+Bundle-SymbolicName: org.apache.tuscany.sca.contribution.osgi

+Bundle-Version: 2.0.0

+Bundle-ActivationPolicy: lazy

+Bundle-Name: Apache Tuscany SCA Contribution OSGi Bundle

+Bundle-Vendor: The Apache Software Foundation

+Eclipse-LazyStart: true

+Bundle-Activator: org.apache.tuscany.sca.contribution.osgi.impl.OSGiBundleActivator

+Bundle-Description: Apache Tuscany SCA OSGi Implementation

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

+SCA-Version: 1.1

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

+ org.apache.tuscany.sca.contribution;version="2.0.0",

+ org.apache.tuscany.sca.contribution.osgi;version="2.0.0",

+ org.apache.tuscany.sca.contribution.processor;version="2.0.0",

+ org.apache.tuscany.sca.contribution.resolver;version="2.0.0",

+ org.apache.tuscany.sca.contribution.scanner;version="2.0.0",

+ org.apache.tuscany.sca.core;version="2.0.0",

+ org.apache.tuscany.sca.monitor;version="2.0.0",

+ org.osgi.framework;version="1.4.0"

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

+Export-Package: org.apache.tuscany.sca.contribution.osgi;version="2.0.0"

+Bundle-RequiredExecutionEnvironment: J2SE-1.5,JavaSE-1.6
diff --git a/sca-java-2.x/branches/2.0-Beta1/modules/contribution-osgi/NOTICE b/sca-java-2.x/branches/2.0-Beta1/modules/contribution-osgi/NOTICE
new file mode 100644
index 0000000000..9ddba06a32
--- /dev/null
+++ b/sca-java-2.x/branches/2.0-Beta1/modules/contribution-osgi/NOTICE
@@ -0,0 +1,6 @@
+${pom.name}

+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/contribution-osgi/pom.xml b/sca-java-2.x/branches/2.0-Beta1/modules/contribution-osgi/pom.xml
new file mode 100644
index 0000000000..5db265b4a0
--- /dev/null
+++ b/sca-java-2.x/branches/2.0-Beta1/modules/contribution-osgi/pom.xml
@@ -0,0 +1,72 @@
+<?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-contribution-osgi</artifactId>
+    <name>Apache Tuscany SCA Contribution OSGi Bundle</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-contribution</artifactId>
+            <version>2.0-Beta1-SNAPSHOT</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-core-spi</artifactId>
+            <version>2.0-Beta1-SNAPSHOT</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-monitor</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>
+
+        <dependency>
+            <groupId>org.codehaus.woodstox</groupId>
+            <artifactId>wstx-asl</artifactId>
+            <version>3.2.4</version>
+            <scope>runtime</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>stax</groupId>
+                    <artifactId>stax-api</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+    </dependencies>
+
+
+</project>
diff --git a/sca-java-2.x/branches/2.0-Beta1/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/BundleReference.java b/sca-java-2.x/branches/2.0-Beta1/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/BundleReference.java
new file mode 100644
index 0000000000..3f82f6fb17
--- /dev/null
+++ b/sca-java-2.x/branches/2.0-Beta1/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/BundleReference.java
@@ -0,0 +1,136 @@
+/*
+ * 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;
+
+import org.osgi.framework.Bundle;
+import org.osgi.framework.Constants;
+
+/**
+ * A reference to an OSGi bundle
+ *
+ * @version $Rev$ $Date$
+ */
+public class BundleReference {
+
+    /**
+     * The bundle.
+     */
+    private Bundle bundle;
+
+    /**
+     * The bundle version.
+     */
+    private String version;
+
+    /**
+     * The bundle name and version.
+     */
+    private String symbolicName;
+
+    /**
+     * Constructs a new BundleReference.
+     * 
+     * @param bundle
+     */
+    public BundleReference(Bundle bundle) {
+        this.bundle = bundle;
+        this.symbolicName = bundle.getSymbolicName();
+        this.version = (String)bundle.getHeaders().get(Constants.BUNDLE_VERSION);
+    }
+
+    /**
+     * Constructs a new BundleReference.
+     * 
+     * @param bundleSymbolicName The bundle symbolic name
+     * @param bundleVersion The bundle version
+     */
+    public BundleReference(String bundleSymbolicName, String bundleVersion) {
+        this.version = bundleVersion;
+        this.symbolicName = bundleSymbolicName;
+    }
+
+    /**
+     * Get the referenced bundle.
+     * 
+     * @return The referenced bundle
+     */
+    public Bundle getBundle() {
+        return bundle;
+    }
+
+    /**
+     * Get the referenced bundle version.
+     * 
+     * @return The bundle version
+     */
+    public String getVersion() {
+        return version;
+    }
+
+    /**
+     * Get the referenced bundle name and version.
+     * 
+     * @return The bundle name
+     */
+    public String getSymbolicName() {
+        return symbolicName;
+    }
+
+    /**
+     * 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() {
+        final int prime = 31;
+        int result = 1;
+        result = prime * result + ((symbolicName == null) ? 0 : symbolicName.hashCode());
+        result = prime * result + ((version == null) ? 0 : version.hashCode());
+        return result;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj)
+            return true;
+        if (obj == null)
+            return false;
+        if (getClass() != obj.getClass())
+            return false;
+        BundleReference other = (BundleReference)obj;
+        if (symbolicName == null) {
+            if (other.symbolicName != null)
+                return false;
+        } else if (!symbolicName.equals(other.symbolicName))
+            return false;
+        if (version == null) {
+            if (other.version != null)
+                return false;
+        } else if (!version.equals(other.version))
+            return false;
+        return true;
+    }
+
+}
diff --git a/sca-java-2.x/branches/2.0-Beta1/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiBundleActivator.java b/sca-java-2.x/branches/2.0-Beta1/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiBundleActivator.java
new file mode 100644
index 0000000000..af13d2ee98
--- /dev/null
+++ b/sca-java-2.x/branches/2.0-Beta1/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiBundleActivator.java
@@ -0,0 +1,152 @@
+/*
+ * 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.URL;
+import java.util.jar.JarInputStream;
+import java.util.jar.Manifest;
+
+import org.osgi.framework.Bundle;
+import org.osgi.framework.BundleActivator;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.BundleException;
+import org.osgi.framework.Constants;
+
+/**
+ * The Bundle Activator that receives the BundleContext
+ */
+public class OSGiBundleActivator implements BundleActivator {
+    private static BundleContext bundleContext;
+
+    public static BundleContext getBundleContext() {
+        return bundleContext;
+    }
+
+    public void start(BundleContext context) throws Exception {
+        bundleContext = context;
+    }
+
+    public void stop(BundleContext context) throws Exception {
+        bundleContext = null;
+    }
+
+    public static Bundle findBundle(URL bundleURL) {
+        if (bundleContext == null) {
+            return null;
+        }
+        Bundle[] installedBundles = bundleContext.getBundles();
+        for (Bundle bundle : installedBundles) {
+            URL root = bundle.getEntry("/");
+            if (root != null && root.getHost() != null && root.getHost().equals(bundleURL.getHost())) {
+                return bundle;
+            }
+        }
+        return null;
+    }
+
+    public static Bundle findBundle(String symbolicName, String version) {
+        if (bundleContext == null) {
+            return null;
+        }
+        Bundle[] bundles = bundleContext.getBundles();
+        if (version == null) {
+            version = "0.0.0";
+        }
+        for (Bundle b : bundles) {
+            String v = (String)b.getHeaders().get(Constants.BUNDLE_VERSION);
+            if (v == null) {
+                v = "0.0.0";
+            }
+            if (b.getSymbolicName().equals(symbolicName) && (version.equals("0.0.0") || v.equals(version))) {
+                return b;
+            }
+        }
+        return null;
+    }
+
+    public static Bundle installBundle(String location, InputStream is) throws BundleException {
+        getBundleContext();
+        return bundleContext.installBundle(location, is);
+    }
+
+    public static Bundle installBundle(String location) throws BundleException, IOException {
+        getBundleContext();
+
+        URL url = new URL(location);
+        Bundle bundle = null;
+        InputStream is = url.openStream();
+        JarInputStream jar = new JarInputStream(is);
+
+        Manifest manifest = jar.getManifest();
+        jar.close();
+        if (manifest != null) {
+            String symbolicName = manifest.getMainAttributes().getValue(Constants.BUNDLE_SYMBOLICNAME);
+            String version = manifest.getMainAttributes().getValue(Constants.BUNDLE_VERSION);
+            if (symbolicName != null) {
+                bundle = findBundle(symbolicName, version);
+                if (bundle != null) {
+                    return bundle;
+                }
+            } else {
+                return null;
+            }
+        } else {
+            return null;
+        }
+        try {
+            is = url.openStream();
+            bundle = bundleContext.installBundle(location, is);
+        } finally {
+            is.close();
+        }
+        return bundle;
+    }
+
+    public static Bundle findBundleByLocation(String bundleLocation) {
+        if (bundleContext != null) {
+            Bundle[] installedBundles = bundleContext.getBundles();
+            for (Bundle bundle : installedBundles) {
+                if (bundle.getLocation().equals(bundleLocation))
+                    return bundle;
+            }
+        }
+        return null;
+    }
+
+    public static Bundle findBundle(String bundleLocation) {
+        if (bundleContext != null) {
+            if (bundleLocation.startsWith("bundle:") || bundleLocation.startsWith("bundleresource:")
+                || bundleLocation.startsWith("bundleentry:")) {
+                try {
+                    return findBundle(new URL(bundleLocation));
+                } catch (MalformedURLException e) {
+                    // ignore
+                }
+            } else {
+                return findBundleByLocation(bundleLocation);
+            }
+        }
+        return null;
+    }
+
+}
diff --git a/sca-java-2.x/branches/2.0-Beta1/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiBundleContributionScanner.java b/sca-java-2.x/branches/2.0-Beta1/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiBundleContributionScanner.java
new file mode 100644
index 0000000000..111f1f370c
--- /dev/null
+++ b/sca-java-2.x/branches/2.0-Beta1/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiBundleContributionScanner.java
@@ -0,0 +1,222 @@
+/*
+ * 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.ArrayList;
+import java.util.Collections;
+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.Artifact;
+import org.apache.tuscany.sca.contribution.Contribution;
+import org.apache.tuscany.sca.contribution.ContributionFactory;
+import org.apache.tuscany.sca.contribution.PackageType;
+import org.apache.tuscany.sca.contribution.processor.ContributionException;
+import org.apache.tuscany.sca.contribution.processor.ContributionReadException;
+import org.apache.tuscany.sca.contribution.scanner.ContributionScanner;
+import org.osgi.framework.Bundle;
+import org.osgi.framework.Constants;
+
+/**
+ * Bundle Contribution package processor.
+ *
+ * @version $Rev$ $Date$
+ */
+public class OSGiBundleContributionScanner implements ContributionScanner {
+    private ContributionFactory contributionFactory;
+
+    public OSGiBundleContributionScanner(ContributionFactory contributionFactory) {
+        this.contributionFactory = contributionFactory;
+    }
+
+    public String getContributionType() {
+        return PackageType.BUNDLE;
+    }
+
+    public List<Artifact> scan(Contribution contribution) throws ContributionReadException {
+        Bundle bundle = OSGiBundleActivator.findBundle(contribution.getLocation());
+
+        if (bundle == null) {
+            throw new IllegalArgumentException("Could not find OSGi bundle " + contribution.getLocation());
+        }
+
+        List<Artifact> artifacts = new ArrayList<Artifact>();
+        Set<String> bundleClassPath = new HashSet<String>();
+        String cp = (String)bundle.getHeaders().get(Constants.BUNDLE_CLASSPATH);
+        if (cp != null) {
+            String[] paths = cp.split(",");
+            for (String path : paths) {
+                bundleClassPath.add(path.trim());
+            }
+        }
+
+        try {
+            // Test if the bundle is an Eclipse project
+            boolean devMode = (bundle.getEntry("/.project") != null);
+            // FIXME: The entries can come from fragments. Do we need to have a way to differentiate the entries?
+            Enumeration<?> entries = bundle.findEntries("/", "*", true);
+            while (entries.hasMoreElements()) {
+                URL entry = (URL)entries.nextElement();
+                String entryName = entry.getPath();
+                if (devMode && entryName.contains("/.svn/")
+                    || entryName.startsWith("/.")
+                    || entryName.startsWith("/target/")
+                    || entryName.startsWith("/src/")) {
+                    // Ignore .svn files
+                    // Ignore .classpath, .project, src, and target
+                    continue;
+                }
+                if (entryName.startsWith("/")) {
+                    entryName = entryName.substring(1);
+                }
+                
+                //Add artifact to list
+                Artifact artifact = contributionFactory.createArtifact();
+                artifact.setURI(entryName);
+                artifact.setLocation(entry.toString());
+                
+                artifacts.add(artifact);
+
+                //if Artifact is a JAR, add jar artifacts as well
+                /*
+                if (entryName.endsWith(".jar") && bundleClassPath.contains(entryName)) {
+                    List<String> jarArtifactURIs = getJarArtifacts(entry, entry.openStream());
+                    for( String uri : jarArtifactURIs) {
+                        Artifact jarArtifact = contributionFactory.createArtifact();
+                        jarArtifact.setURI(uri);
+                        URL url = bundle.getResource(uri);
+                        String location = null;
+                        if(url!=null) {
+                            location = url.toString();
+                        }
+                        jarArtifact.setLocation(location);
+                        artifacts.add(jarArtifact);
+                        
+                    }
+                }
+                */
+
+            }
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+        contribution.getExtensions().add(bundle);
+        contribution.getTypes().add(getContributionType());
+        contribution.setClassLoader(new BundleClassLoader(bundle));
+        return artifacts;
+    }
+    
+    /**
+     * Retrieve a list of Artifact URIs for a given JAR
+     * @param packageSourceURL
+     * @param inputStream
+     * @return
+     * @throws ContributionException
+     * @throws IOException
+     */
+    private List<String> 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<String> artifacts = new ArrayList<String>();
+            for (String name : names) {
+                artifacts.add(name);
+            }
+            return artifacts;
+
+        } finally {
+            jar.close();
+        }
+    }
+    
+
+
+    private static class BundleClassLoader extends ClassLoader {
+        private Bundle bundle;
+        public BundleClassLoader(Bundle bundle) {
+            super(null);
+            this.bundle = bundle;
+        }
+
+        @Override
+        protected Class<?> findClass(String name) throws ClassNotFoundException {
+            return bundle.loadClass(name);
+        }
+
+        @Override
+        protected URL findResource(String name) {
+            return bundle.getResource(name);
+        }
+
+        @SuppressWarnings("unchecked")
+        @Override
+        protected Enumeration<URL> findResources(String name) throws IOException {
+            Enumeration<URL> urls = bundle.getResources(name);
+            if (urls == null) {
+                List<URL> list = Collections.emptyList();
+                return Collections.enumeration(list);
+            } else {
+                return urls;
+            }
+        }
+    }
+
+}
diff --git a/sca-java-2.x/branches/2.0-Beta1/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiBundleProcessor.java b/sca-java-2.x/branches/2.0-Beta1/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiBundleProcessor.java
new file mode 100644
index 0000000000..0b0d49de3e
--- /dev/null
+++ b/sca-java-2.x/branches/2.0-Beta1/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiBundleProcessor.java
@@ -0,0 +1,75 @@
+/*
+ * 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.List;
+
+import org.apache.tuscany.sca.contribution.Artifact;
+import org.apache.tuscany.sca.contribution.Contribution;
+import org.apache.tuscany.sca.contribution.osgi.BundleReference;
+import org.osgi.framework.Bundle;
+
+/**
+ * OSGi bundle processor
+ *
+ * @version $Rev$ $Date$
+ */
+public class OSGiBundleProcessor {
+
+    //    private boolean initializedOSGi;
+    //    private OSGiRuntime osgiRuntime;
+
+    public OSGiBundleProcessor() {
+    }
+
+    public Object installContributionBundle(Contribution contribution) {
+
+        Object bundle = null;
+        try {
+            bundle = OSGiBundleActivator.installBundle(contribution.getLocation());
+        } catch (Exception e) {
+            // If OSGi cannot process the jar, treat the bundle as a plain jar file.
+        }
+        return bundle;
+    }
+
+    public BundleReference installNestedBundle(Contribution contribution,
+                                               String bundleSymbolicName,
+                                               String bundleVersion) {
+
+        BundleReference bundleReference = null;
+
+        List<Artifact> artifacts = contribution.getArtifacts();
+        for (Artifact a : artifacts) {
+            if (a.getURI().endsWith(".jar")) {
+                try {
+                    Bundle bundle = OSGiBundleActivator.installBundle(a.getLocation());
+                    if (bundle != null) {
+                        bundleReference = new BundleReference(bundle);
+                        break;
+                    }
+                } catch (Exception e) {
+                    // If OSGi cannot process the jar, treat the bundle as a plain jar file.
+                }
+            }
+        }
+        return bundleReference;
+    }
+}
diff --git a/sca-java-2.x/branches/2.0-Beta1/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiBundleReferenceModelResolver.java b/sca-java-2.x/branches/2.0-Beta1/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiBundleReferenceModelResolver.java
new file mode 100644
index 0000000000..7958eb4b6d
--- /dev/null
+++ b/sca-java-2.x/branches/2.0-Beta1/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiBundleReferenceModelResolver.java
@@ -0,0 +1,117 @@
+/*
+ * 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.osgi.BundleReference;
+import org.apache.tuscany.sca.contribution.processor.ProcessorContext;
+import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
+import org.apache.tuscany.sca.core.FactoryExtensionPoint;
+import org.osgi.framework.Bundle;
+
+/**
+ * A Model Resolver for BundleReferences.
+ *
+ * @version $Rev$ $Date$
+ */
+public class OSGiBundleReferenceModelResolver implements ModelResolver {
+    private Contribution contribution;
+    private Map<BundleReference, BundleReference> refs = new HashMap<BundleReference, BundleReference>();
+
+    private OSGiBundleProcessor bundleProcessor;
+
+    public OSGiBundleReferenceModelResolver(Contribution contribution, FactoryExtensionPoint modelFactories) {
+        this.contribution = contribution;
+        this.bundleProcessor = new OSGiBundleProcessor();
+    }
+
+    public void addModel(Object resolved, ProcessorContext context) {
+        BundleReference bundleRef = (BundleReference)resolved;
+        refs.put(bundleRef, bundleRef);
+    }
+
+    public Object removeModel(Object resolved, ProcessorContext context) {
+        return refs.remove(resolved);
+    }
+
+    /**
+     * Handle artifact resolution when the specific class reference is imported from another contribution
+     * @param unresolved
+     * @param context 
+     * @return
+     */
+    private BundleReference resolveImportedModel(BundleReference unresolved, ProcessorContext context) {
+        BundleReference resolved = unresolved;
+
+        if (this.contribution != null) {
+            for (Import import_ : this.contribution.getImports()) {
+
+                resolved = import_.getModelResolver().resolveModel(BundleReference.class, unresolved, context);
+                if (resolved != unresolved)
+                    break;
+            }
+
+        }
+        return resolved;
+    }
+
+    public <T> T resolveModel(Class<T> modelClass, T unresolved, ProcessorContext context) {
+        Object resolved = refs.get(unresolved);
+
+        if (resolved != null) {
+            return modelClass.cast(resolved);
+        }
+
+        if (OSGiBundleActivator.getBundleContext() == null)
+            return unresolved;
+
+        //Load a class on demand
+        Bundle bundle = null;
+        String bundleName = ((BundleReference)unresolved).getSymbolicName();
+        String bundleVersion = ((BundleReference)unresolved).getVersion();
+
+        bundle = OSGiBundleActivator.findBundle(bundleName, bundleVersion);
+        BundleReference bundleReference;
+
+        if (bundle == null) {
+            bundleReference = bundleProcessor.installNestedBundle(contribution, bundleName, bundleVersion);
+        } else {
+            bundleReference = new BundleReference(bundle);
+        }
+
+        if (bundleReference != null) {
+            //if we load the class            
+
+            refs.put(((BundleReference)unresolved), bundleReference);
+
+            // Return the resolved BundleReference
+            return modelClass.cast(bundleReference);
+        } else {
+            //delegate resolution of the class
+            resolved = this.resolveImportedModel((BundleReference)unresolved, context);
+            return modelClass.cast(resolved);
+        }
+
+    }
+}
diff --git a/sca-java-2.x/branches/2.0-Beta1/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiClassReferenceModelResolver.java b/sca-java-2.x/branches/2.0-Beta1/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiClassReferenceModelResolver.java
new file mode 100644
index 0000000000..3963968940
--- /dev/null
+++ b/sca-java-2.x/branches/2.0-Beta1/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiClassReferenceModelResolver.java
@@ -0,0 +1,73 @@
+/*
+ * 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 org.apache.tuscany.sca.contribution.Contribution;
+import org.apache.tuscany.sca.contribution.processor.ProcessorContext;
+import org.apache.tuscany.sca.contribution.resolver.ClassReference;
+import org.apache.tuscany.sca.contribution.resolver.ModelResolver;
+import org.apache.tuscany.sca.core.FactoryExtensionPoint;
+import org.osgi.framework.Bundle;
+
+/**
+ * A Model Resolver for ClassReferences.
+ *
+ * @version $Rev$ $Date$
+ */
+public class OSGiClassReferenceModelResolver implements ModelResolver {
+    // private Contribution contribution;
+    private Bundle bundle;
+
+    public OSGiClassReferenceModelResolver(Contribution contribution, FactoryExtensionPoint modelFactories) {
+        // this.contribution = contribution;
+        this.bundle = OSGiBundleActivator.findBundle(contribution.getLocation());
+    }
+
+    public void addModel(Object resolved, ProcessorContext context) {
+    }
+
+    public Object removeModel(Object resolved, ProcessorContext context) {
+        return resolved;
+    }
+
+    public <T> T resolveModel(Class<T> modelClass, T unresolved, ProcessorContext context) {
+        //Load a class on demand
+        Class<?> clazz = null;
+        if (bundle != null) {
+            try {
+                clazz = bundle.loadClass(((ClassReference)unresolved).getClassName());
+            } catch (Exception e) {
+                // Ignore
+            }
+        }
+
+        if (clazz != null) {
+            //if we load the class
+            // Store a new ClassReference wrapping the loaded class
+            ClassReference classReference = new ClassReference(clazz);
+
+            // Return the resolved ClassReference
+            return modelClass.cast(classReference);
+        } else {
+            return unresolved;
+        }
+
+    }
+}
diff --git a/sca-java-2.x/branches/2.0-Beta1/modules/contribution-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver b/sca-java-2.x/branches/2.0-Beta1/modules/contribution-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
new file mode 100644
index 0000000000..87c2208e40
--- /dev/null
+++ b/sca-java-2.x/branches/2.0-Beta1/modules/contribution-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver
@@ -0,0 +1,19 @@
+# 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/sca-java-2.x/branches/2.0-Beta1/modules/contribution-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.scanner.ContributionScanner b/sca-java-2.x/branches/2.0-Beta1/modules/contribution-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.scanner.ContributionScanner
new file mode 100644
index 0000000000..5c26e07e0c
--- /dev/null
+++ b/sca-java-2.x/branches/2.0-Beta1/modules/contribution-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.scanner.ContributionScanner
@@ -0,0 +1,22 @@
+# 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.

+#

+# Eclipse Equinox 

+org.apache.tuscany.sca.contribution.osgi.impl.OSGiBundleContributionScanner;type=bundleentry

+org.apache.tuscany.sca.contribution.osgi.impl.OSGiBundleContributionScanner;type=bundleresource

+# Apache Felix

+org.apache.tuscany.sca.contribution.osgi.impl.OSGiBundleContributionScanner;type=bundle