From 5e78e2a84f0cfcf141f48e58404e8c21c061b079 Mon Sep 17 00:00:00 2001 From: lresende Date: Wed, 11 Nov 2009 23:23:10 +0000 Subject: Moving 2.x tags git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@835154 13f79535-47bb-0310-9956-ffa450edef68 --- .../2.0-M4-RC2/modules/contribution-osgi/LICENSE | 205 --------------------- .../modules/contribution-osgi/META-INF/MANIFEST.MF | 23 --- .../2.0-M4-RC2/modules/contribution-osgi/NOTICE | 6 - .../2.0-M4-RC2/modules/contribution-osgi/pom.xml | 72 -------- .../sca/contribution/osgi/BundleReference.java | 136 -------------- .../osgi/impl/OSGiBundleActivator.java | 152 --------------- .../osgi/impl/OSGiBundleContributionScanner.java | 200 -------------------- .../osgi/impl/OSGiBundleProcessor.java | 75 -------- .../impl/OSGiBundleReferenceModelResolver.java | 117 ------------ .../osgi/impl/OSGiClassReferenceModelResolver.java | 73 -------- ...tuscany.sca.contribution.resolver.ModelResolver | 19 -- ...ny.sca.contribution.scanner.ContributionScanner | 22 --- 12 files changed, 1100 deletions(-) delete mode 100644 tags/java/sca/2.0-M4-RC2/modules/contribution-osgi/LICENSE delete mode 100644 tags/java/sca/2.0-M4-RC2/modules/contribution-osgi/META-INF/MANIFEST.MF delete mode 100644 tags/java/sca/2.0-M4-RC2/modules/contribution-osgi/NOTICE delete mode 100644 tags/java/sca/2.0-M4-RC2/modules/contribution-osgi/pom.xml delete mode 100644 tags/java/sca/2.0-M4-RC2/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/BundleReference.java delete mode 100644 tags/java/sca/2.0-M4-RC2/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiBundleActivator.java delete mode 100644 tags/java/sca/2.0-M4-RC2/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiBundleContributionScanner.java delete mode 100644 tags/java/sca/2.0-M4-RC2/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiBundleProcessor.java delete mode 100644 tags/java/sca/2.0-M4-RC2/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiBundleReferenceModelResolver.java delete mode 100644 tags/java/sca/2.0-M4-RC2/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiClassReferenceModelResolver.java delete mode 100644 tags/java/sca/2.0-M4-RC2/modules/contribution-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver delete mode 100644 tags/java/sca/2.0-M4-RC2/modules/contribution-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.scanner.ContributionScanner (limited to 'tags/java/sca/2.0-M4-RC2/modules/contribution-osgi') diff --git a/tags/java/sca/2.0-M4-RC2/modules/contribution-osgi/LICENSE b/tags/java/sca/2.0-M4-RC2/modules/contribution-osgi/LICENSE deleted file mode 100644 index 6e529a25c4..0000000000 --- a/tags/java/sca/2.0-M4-RC2/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/tags/java/sca/2.0-M4-RC2/modules/contribution-osgi/META-INF/MANIFEST.MF b/tags/java/sca/2.0-M4-RC2/modules/contribution-osgi/META-INF/MANIFEST.MF deleted file mode 100644 index c70f81ea94..0000000000 --- a/tags/java/sca/2.0-M4-RC2/modules/contribution-osgi/META-INF/MANIFEST.MF +++ /dev/null @@ -1,23 +0,0 @@ -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 -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/tags/java/sca/2.0-M4-RC2/modules/contribution-osgi/NOTICE b/tags/java/sca/2.0-M4-RC2/modules/contribution-osgi/NOTICE deleted file mode 100644 index 51042eab05..0000000000 --- a/tags/java/sca/2.0-M4-RC2/modules/contribution-osgi/NOTICE +++ /dev/null @@ -1,6 +0,0 @@ -${pom.name} -Copyright (c) 2005 - 2009 The Apache Software Foundation - -This product includes software developed by -The Apache Software Foundation (http://www.apache.org/). - diff --git a/tags/java/sca/2.0-M4-RC2/modules/contribution-osgi/pom.xml b/tags/java/sca/2.0-M4-RC2/modules/contribution-osgi/pom.xml deleted file mode 100644 index 8aeeebd9af..0000000000 --- a/tags/java/sca/2.0-M4-RC2/modules/contribution-osgi/pom.xml +++ /dev/null @@ -1,72 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-modules - 2.0-M4 - ../pom.xml - - tuscany-contribution-osgi - Apache Tuscany SCA Contribution OSGi Bundle - - - - org.apache.tuscany.sca - tuscany-contribution - 2.0-M4 - - - - org.apache.tuscany.sca - tuscany-core-spi - 2.0-M4 - - - - org.apache.tuscany.sca - tuscany-monitor - 2.0-M4 - - - - org.eclipse - osgi - 3.5.0-v20090520 - compile - - - - org.codehaus.woodstox - wstx-asl - 3.2.4 - runtime - - - stax - stax-api - - - - - - - diff --git a/tags/java/sca/2.0-M4-RC2/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/BundleReference.java b/tags/java/sca/2.0-M4-RC2/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/BundleReference.java deleted file mode 100644 index 3f82f6fb17..0000000000 --- a/tags/java/sca/2.0-M4-RC2/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/BundleReference.java +++ /dev/null @@ -1,136 +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; - -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/tags/java/sca/2.0-M4-RC2/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiBundleActivator.java b/tags/java/sca/2.0-M4-RC2/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiBundleActivator.java deleted file mode 100644 index af13d2ee98..0000000000 --- a/tags/java/sca/2.0-M4-RC2/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiBundleActivator.java +++ /dev/null @@ -1,152 +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.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/tags/java/sca/2.0-M4-RC2/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiBundleContributionScanner.java b/tags/java/sca/2.0-M4-RC2/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiBundleContributionScanner.java deleted file mode 100644 index 91f2bba5c5..0000000000 --- a/tags/java/sca/2.0-M4-RC2/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiBundleContributionScanner.java +++ /dev/null @@ -1,200 +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.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.Contribution; -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 { - - public OSGiBundleContributionScanner() { - } - - public String getContributionType() { - return PackageType.BUNDLE; - } - - public URL getArtifactURL(Contribution contribution, String artifact) throws ContributionReadException { - Bundle bundle = null; - try { - bundle = OSGiBundleActivator.findBundle(contribution.getLocation()); - if (bundle != null) { - URL url = bundle.getResource(artifact); - return url; - } - } catch (Exception e) { - } - return null; - } - - public List 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 names = new HashSet(); - 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 artifacts = new ArrayList(); - for (String name : names) { - artifacts.add(name); - } - return artifacts; - - } finally { - jar.close(); - } - } - - public List 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 artifacts = new ArrayList(); - Set bundleClassPath = new HashSet(); - 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); - } - artifacts.add(entryName); - - if (entryName.endsWith(".jar") && bundleClassPath.contains(entryName)) { - artifacts.addAll(getJarArtifacts(entry, entry.openStream())); - } - - } - } catch (Exception e) { - throw new RuntimeException(e); - } - contribution.getExtensions().add(bundle); - contribution.getTypes().add(getContributionType()); - contribution.setClassLoader(new BundleClassLoader(bundle)); - return artifacts; - } - - 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); - } - - @Override - protected Enumeration findResources(String name) throws IOException { - Enumeration urls = bundle.getResources(name); - if (urls == null) { - List list = Collections.emptyList(); - return Collections.enumeration(list); - } else { - return urls; - } - } - } - -} diff --git a/tags/java/sca/2.0-M4-RC2/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiBundleProcessor.java b/tags/java/sca/2.0-M4-RC2/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiBundleProcessor.java deleted file mode 100644 index 0b0d49de3e..0000000000 --- a/tags/java/sca/2.0-M4-RC2/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiBundleProcessor.java +++ /dev/null @@ -1,75 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package org.apache.tuscany.sca.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 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/tags/java/sca/2.0-M4-RC2/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiBundleReferenceModelResolver.java b/tags/java/sca/2.0-M4-RC2/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiBundleReferenceModelResolver.java deleted file mode 100644 index 7958eb4b6d..0000000000 --- a/tags/java/sca/2.0-M4-RC2/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiBundleReferenceModelResolver.java +++ /dev/null @@ -1,117 +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.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 refs = new HashMap(); - - 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 resolveModel(Class 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/tags/java/sca/2.0-M4-RC2/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiClassReferenceModelResolver.java b/tags/java/sca/2.0-M4-RC2/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiClassReferenceModelResolver.java deleted file mode 100644 index 3963968940..0000000000 --- a/tags/java/sca/2.0-M4-RC2/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiClassReferenceModelResolver.java +++ /dev/null @@ -1,73 +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 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 resolveModel(Class 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/tags/java/sca/2.0-M4-RC2/modules/contribution-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver b/tags/java/sca/2.0-M4-RC2/modules/contribution-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver deleted file mode 100644 index 87c2208e40..0000000000 --- a/tags/java/sca/2.0-M4-RC2/modules/contribution-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.resolver.ModelResolver +++ /dev/null @@ -1,19 +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/tags/java/sca/2.0-M4-RC2/modules/contribution-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.scanner.ContributionScanner b/tags/java/sca/2.0-M4-RC2/modules/contribution-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.scanner.ContributionScanner deleted file mode 100644 index 5c26e07e0c..0000000000 --- a/tags/java/sca/2.0-M4-RC2/modules/contribution-osgi/src/main/resources/META-INF/services/org.apache.tuscany.sca.contribution.scanner.ContributionScanner +++ /dev/null @@ -1,22 +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. -# -# 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 -- cgit v1.2.3