From 2b0cce6d6355082229a377870598c42f401a0580 Mon Sep 17 00:00:00 2001 From: slaws Date: Tue, 8 Sep 2009 10:55:36 +0000 Subject: Remove extensibility-equinox module. It wasn't shipped in 1.5. git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@812453 13f79535-47bb-0310-9956-ffa450edef68 --- .../modules/extensibility-equinox/LICENSE | 205 --------------- .../modules/extensibility-equinox/NOTICE | 5 - .../modules/extensibility-equinox/pom.xml | 112 -------- .../equinox/EquinoxServiceDiscoverer.java | 281 --------------------- .../equinox/EquinoxServiceDiscoveryActivator.java | 46 ---- .../extensibility/equinox/EquinoxHostTestCase.java | 96 ------- .../equinox/EquinoxServiceDiscovererTestCase.java | 152 ----------- .../sca/extensibility/equinox/TestEquinoxHost.java | 100 -------- .../src/test/resources/test-bundle.jar | Bin 1797 -> 0 bytes branches/sca-java-1.5.1/modules/pom.xml | 1 - 10 files changed, 998 deletions(-) delete mode 100644 branches/sca-java-1.5.1/modules/extensibility-equinox/LICENSE delete mode 100644 branches/sca-java-1.5.1/modules/extensibility-equinox/NOTICE delete mode 100644 branches/sca-java-1.5.1/modules/extensibility-equinox/pom.xml delete mode 100644 branches/sca-java-1.5.1/modules/extensibility-equinox/src/main/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxServiceDiscoverer.java delete mode 100644 branches/sca-java-1.5.1/modules/extensibility-equinox/src/main/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxServiceDiscoveryActivator.java delete mode 100644 branches/sca-java-1.5.1/modules/extensibility-equinox/src/test/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxHostTestCase.java delete mode 100644 branches/sca-java-1.5.1/modules/extensibility-equinox/src/test/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxServiceDiscovererTestCase.java delete mode 100644 branches/sca-java-1.5.1/modules/extensibility-equinox/src/test/java/org/apache/tuscany/sca/extensibility/equinox/TestEquinoxHost.java delete mode 100644 branches/sca-java-1.5.1/modules/extensibility-equinox/src/test/resources/test-bundle.jar diff --git a/branches/sca-java-1.5.1/modules/extensibility-equinox/LICENSE b/branches/sca-java-1.5.1/modules/extensibility-equinox/LICENSE deleted file mode 100644 index 6e529a25c4..0000000000 --- a/branches/sca-java-1.5.1/modules/extensibility-equinox/LICENSE +++ /dev/null @@ -1,205 +0,0 @@ - - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - - - diff --git a/branches/sca-java-1.5.1/modules/extensibility-equinox/NOTICE b/branches/sca-java-1.5.1/modules/extensibility-equinox/NOTICE deleted file mode 100644 index 65c52d01c7..0000000000 --- a/branches/sca-java-1.5.1/modules/extensibility-equinox/NOTICE +++ /dev/null @@ -1,5 +0,0 @@ -Copyright (c) 2005 - 2008 The Apache Software Foundation - -This product includes software developed by -The Apache Software Foundation (http://www.apache.org/). - diff --git a/branches/sca-java-1.5.1/modules/extensibility-equinox/pom.xml b/branches/sca-java-1.5.1/modules/extensibility-equinox/pom.xml deleted file mode 100644 index d992054ee5..0000000000 --- a/branches/sca-java-1.5.1/modules/extensibility-equinox/pom.xml +++ /dev/null @@ -1,112 +0,0 @@ - - - - 4.0.0 - - org.apache.tuscany.sca - tuscany-modules - 1.5.1-SNAPSHOT - ../pom.xml - - tuscany-extensibility-equinox - Apache Tuscany SCA Extensibility for Eclipse Equinox - - - org.apache.tuscany.sca - tuscany-extensibility - 1.5.1-SNAPSHOT - - - - org.eclipse - osgi - 3.3.0-v20070530 - compile - - - - - org.eclipse.core - runtime - 3.3.100-v20070530 - test - - - org.eclipse.equinox - app - - - - - - - org.eclipse.equinox - app - 1.0.0-v20070606 - test - - - - - - - org.apache.maven.plugins - maven-dependency-plugin - 2.0 - - - copy-dependencies - process-test-resources - - copy-dependencies - - - ${project.build.directory}/bundles - osgi,junit,easymock,tuscany-extensibility - - - - - - org.apache.felix - maven-bundle-plugin - - - ${tuscany.version} - org.apache.tuscany.sca.extensibility.equinox - ${pom.name} - org.apache.tuscany.sca.extensibility.equinox.EquinoxServiceDiscoveryActivator - org.apache.tuscany.sca.extensibility.equinox* - true - lazy - * - - - - - - diff --git a/branches/sca-java-1.5.1/modules/extensibility-equinox/src/main/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxServiceDiscoverer.java b/branches/sca-java-1.5.1/modules/extensibility-equinox/src/main/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxServiceDiscoverer.java deleted file mode 100644 index 5ab5a66077..0000000000 --- a/branches/sca-java-1.5.1/modules/extensibility-equinox/src/main/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxServiceDiscoverer.java +++ /dev/null @@ -1,281 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package org.apache.tuscany.sca.extensibility.equinox; - -import java.io.BufferedReader; -import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.net.URL; -import java.security.AccessController; -import java.security.PrivilegedAction; -import java.security.PrivilegedActionException; -import java.security.PrivilegedExceptionAction; -import java.util.Arrays; -import java.util.Collections; -import java.util.Enumeration; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Map; -import java.util.Set; -import java.util.StringTokenizer; -import java.util.logging.Level; -import java.util.logging.Logger; - -import org.apache.tuscany.sca.extensibility.ServiceDeclaration; -import org.apache.tuscany.sca.extensibility.ServiceDiscoverer; -import org.osgi.framework.Bundle; -import org.osgi.framework.BundleContext; - -/** - * A ServiceDiscoverer that find META-INF/services/... in installed bundles - * - * @version $Rev$ $Date$ - */ -public class EquinoxServiceDiscoverer implements ServiceDiscoverer { - private static final Logger logger = Logger.getLogger(EquinoxServiceDiscoverer.class.getName()); - - private BundleContext context; - - public EquinoxServiceDiscoverer(BundleContext context) { - this.context = context; - } - - public static class ServiceDeclarationImpl implements ServiceDeclaration { - private Bundle bundle; - private URL url; - private String className; - private Class javaClass; - private Map attributes; - - public ServiceDeclarationImpl(Bundle bundle, URL url, String className, Map attributes) { - super(); - this.bundle = bundle; - this.url = url; - this.className = className; - this.attributes = attributes; - } - - public Map getAttributes() { - return attributes; - } - - public String getClassName() { - return className; - } - - public Class loadClass() throws ClassNotFoundException { - if (className == null) { - return null; - } - if (javaClass == null) { - javaClass = loadClass(className); - } - return javaClass; - } - - public Class loadClass(String className) throws ClassNotFoundException { - return bundle.loadClass(className); - } - - public URL getLocation() { - return url; - } - - public URL getResource(final String name) { - return AccessController.doPrivileged(new PrivilegedAction() { - public URL run() { - return bundle.getResource(name); - } - }); - } - - public String toString() { - StringBuffer sb = new StringBuffer(); - sb.append("Bundle: ").append(EquinoxServiceDiscoverer.toString(bundle)); - sb.append(" Resource: ").append(url); - sb.append(" Attributes: ").append(attributes); - return sb.toString(); - } - - } - - public static void init() { - // Empty static method to trigger the activation of this bundle - } - - private static String toString(Bundle b) { - StringBuffer sb = new StringBuffer(); - sb.append(b.getBundleId()).append(" ").append(b.getSymbolicName()); - int s = b.getState(); - if ((s & Bundle.UNINSTALLED) != 0) { - sb.append(" UNINSTALLED"); - } - if ((s & Bundle.INSTALLED) != 0) { - sb.append(" INSTALLED"); - } - if ((s & Bundle.RESOLVED) != 0) { - sb.append(" RESOLVED"); - } - if ((s & Bundle.STARTING) != 0) { - sb.append(" STARTING"); - } - if ((s & Bundle.STOPPING) != 0) { - sb.append(" STOPPING"); - } - if ((s & Bundle.ACTIVE) != 0) { - sb.append(" ACTIVE"); - } - return sb.toString(); - - } - - /** - * Parse a service declaration in the form class;attr=value,attr=value and - * return a map of attributes - * - * @param declaration - * @return a map of attributes - */ - private static Map parseServiceDeclaration(String declaration) { - Map attributes = new HashMap(); - int index = declaration.indexOf(';'); - if (index != -1) { - attributes.put("class", declaration.substring(0, index).trim()); - declaration = declaration.substring(index); - } else { - int j = declaration.indexOf('='); - if (j == -1) { - attributes.put("class", declaration.trim()); - return attributes; - } else { - declaration = ";" + declaration; - } - } - StringTokenizer tokens = new StringTokenizer(declaration); - for (; tokens.hasMoreTokens();) { - String key = tokens.nextToken("=").substring(1).trim(); - if (key == null) - break; - String value = tokens.nextToken(",").substring(1).trim(); - if (value == null) - break; - attributes.put(key, value); - } - return attributes; - } - - public Set discover(String serviceName, boolean firstOnly) { - boolean debug = logger.isLoggable(Level.FINE); - Set descriptors = new HashSet(); - - serviceName = "META-INF/services/" + serviceName; - - for (Bundle bundle : context.getBundles()) { - if (bundle.getBundleId() == 0) { - // Skip system bundle as it has access to the application classloader - continue; - } - Enumeration urls = null; - try { - // Use getResources to find resources on the classpath of the bundle - // Please note if there is an DynamicImport-Package=*, and another bundle - // exports the resource package, there is a possiblity that it doesn't - // find the containing entry - urls = bundle.getResources(serviceName); - if (urls == null) { - URL entry = bundle.getEntry(serviceName); - if (entry != null) { - urls = Collections.enumeration(Arrays.asList(entry)); - } - } - } catch (IOException e) { - logger.log(Level.SEVERE, e.getMessage(), e); - } - if (urls == null) { - continue; - } - while (urls.hasMoreElements()) { - final URL url = urls.nextElement(); - - if (debug) { - logger.fine("Reading service provider file: " + url.toExternalForm()); - } - try { - // Allow privileged access to open URL stream. Add FilePermission to added to security - // policy file. - InputStream is; - try { - is = AccessController.doPrivileged(new PrivilegedExceptionAction() { - public InputStream run() throws IOException { - return url.openStream(); - } - }); - } catch (PrivilegedActionException e) { - throw (IOException)e.getException(); - } - BufferedReader reader = null; - try { - reader = new BufferedReader(new InputStreamReader(is)); - int count = 0; - while (true) { - String line = reader.readLine(); - if (line == null) - break; - line = line.trim(); - if (!line.startsWith("#") && !"".equals(line)) { - String reg = line.trim(); - if (debug) { - logger.fine("Registering service provider: " + reg); - } - - Map attributes = parseServiceDeclaration(reg); - String className = attributes.get("class"); - if (className == null) { - // Add a unique class name to prevent equals() from returning true - className = "_class_" + count; - count++; - } - ServiceDeclarationImpl descriptor = - new ServiceDeclarationImpl(bundle, url, className, attributes); - descriptors.add(descriptor); - if (firstOnly) { - return descriptors; - } - } - } - } finally { - if (reader != null) { - try { - reader.close(); - } catch (IOException e) { - // Ignore - } - } - } - } catch (IOException e) { - logger.log(Level.SEVERE, e.getMessage(), e); - } - } - } - return descriptors; - } - -} diff --git a/branches/sca-java-1.5.1/modules/extensibility-equinox/src/main/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxServiceDiscoveryActivator.java b/branches/sca-java-1.5.1/modules/extensibility-equinox/src/main/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxServiceDiscoveryActivator.java deleted file mode 100644 index 1cb1d09f8d..0000000000 --- a/branches/sca-java-1.5.1/modules/extensibility-equinox/src/main/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxServiceDiscoveryActivator.java +++ /dev/null @@ -1,46 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package org.apache.tuscany.sca.extensibility.equinox; - -import java.util.logging.Logger; - -import org.apache.tuscany.sca.extensibility.ServiceDiscovery; -import org.osgi.framework.BundleActivator; -import org.osgi.framework.BundleContext; - -/** - * The Bundle Activator that creates the Equinox-based service discoverer - * - * @version $Rev: $ $Date: $ - */ -public class EquinoxServiceDiscoveryActivator implements BundleActivator { - private static Logger logger = Logger.getLogger(EquinoxServiceDiscoveryActivator.class.getName()); - - public void start(BundleContext context) throws Exception { - logger.info("Installing service discovery"); - EquinoxServiceDiscoverer discoverer = new EquinoxServiceDiscoverer(context); - ServiceDiscovery.getInstance().setServiceDiscoverer(discoverer); - logger.info("Installed service discovery"); - } - - public void stop(BundleContext context) throws Exception { - } - -} diff --git a/branches/sca-java-1.5.1/modules/extensibility-equinox/src/test/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxHostTestCase.java b/branches/sca-java-1.5.1/modules/extensibility-equinox/src/test/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxHostTestCase.java deleted file mode 100644 index 7602b02488..0000000000 --- a/branches/sca-java-1.5.1/modules/extensibility-equinox/src/test/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxHostTestCase.java +++ /dev/null @@ -1,96 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package org.apache.tuscany.sca.extensibility.equinox; - -import java.util.Dictionary; -import java.util.Enumeration; - -import junit.framework.Assert; - -import org.junit.Test; -import org.osgi.framework.Bundle; -import org.osgi.framework.BundleContext; - -/** - * Test start/stop the Equinox runtime. - * - * @version $Rev: $ $Date: $ - */ -public class EquinoxHostTestCase { - @Test - public void testStartThenStop() { - TestEquinoxHost host = new TestEquinoxHost(); - BundleContext context = host.start(); - Assert.assertNotNull(context); - for (Bundle b : context.getBundles()) { - System.out.println(toString(b, false)); - } - host.stop(); - } - - @Test - public void testStartTwice() { - TestEquinoxHost host = new TestEquinoxHost(); - host.start(); - try { - host.start(); - Assert.fail(); - } catch (IllegalStateException e) { - Assert.assertTrue(IllegalStateException.class.isInstance(e.getCause())); - } finally { - host.stop(); - } - } - - public static String toString(Bundle b, boolean verbose) { - StringBuffer sb = new StringBuffer(); - sb.append(b.getBundleId()).append(" ").append(b.getSymbolicName()); - int s = b.getState(); - if ((s & Bundle.UNINSTALLED) != 0) { - sb.append(" UNINSTALLED"); - } - if ((s & Bundle.INSTALLED) != 0) { - sb.append(" INSTALLED"); - } - if ((s & Bundle.RESOLVED) != 0) { - sb.append(" RESOLVED"); - } - if ((s & Bundle.STARTING) != 0) { - sb.append(" STARTING"); - } - if ((s & Bundle.STOPPING) != 0) { - sb.append(" STOPPING"); - } - if ((s & Bundle.ACTIVE) != 0) { - sb.append(" ACTIVE"); - } - - sb.append(" ").append(b.getLocation()); - if (verbose) { - Dictionary dict = b.getHeaders(); - Enumeration keys = dict.keys(); - while (keys.hasMoreElements()) { - Object key = keys.nextElement(); - sb.append(" ").append(key).append("=").append(dict.get(key)); - } - } - return sb.toString(); - } -} diff --git a/branches/sca-java-1.5.1/modules/extensibility-equinox/src/test/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxServiceDiscovererTestCase.java b/branches/sca-java-1.5.1/modules/extensibility-equinox/src/test/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxServiceDiscovererTestCase.java deleted file mode 100644 index 3126365748..0000000000 --- a/branches/sca-java-1.5.1/modules/extensibility-equinox/src/test/java/org/apache/tuscany/sca/extensibility/equinox/EquinoxServiceDiscovererTestCase.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.extensibility.equinox; - -import java.io.BufferedInputStream; -import java.io.File; -import java.io.FileInputStream; -import java.io.InputStream; -import java.lang.reflect.Method; -import java.util.ArrayList; -import java.util.List; -import java.util.Set; -import java.util.jar.JarInputStream; -import java.util.jar.Manifest; - -import junit.framework.Assert; - -import org.apache.tuscany.sca.extensibility.ServiceDeclaration; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Test; -import org.osgi.framework.Bundle; -import org.osgi.framework.BundleContext; - -/** - * Test the Equinox service discoverer. - * - * @version $Rev$ $Date$ - */ -public class EquinoxServiceDiscovererTestCase { - private static EquinoxServiceDiscoverer discoverer; - private static Bundle testBundle; - private static TestEquinoxHost host; - - private static String getState(Bundle b) { - StringBuffer sb = new StringBuffer(); - int s = b.getState(); - if ((s & Bundle.UNINSTALLED) != 0) { - sb.append("UNINSTALLED "); - } - if ((s & Bundle.INSTALLED) != 0) { - sb.append("INSTALLED "); - } - if ((s & Bundle.RESOLVED) != 0) { - sb.append("RESOLVED "); - } - if ((s & Bundle.STARTING) != 0) { - sb.append("STARTING "); - } - if ((s & Bundle.STOPPING) != 0) { - sb.append("STOPPING "); - } - if ((s & Bundle.ACTIVE) != 0) { - sb.append("ACTIVE "); - } - return sb.toString(); - - } - - /** - * @throws java.lang.Exception - */ - @BeforeClass - public static void setUpBeforeClass() throws Exception { - host = new TestEquinoxHost(); - BundleContext context = host.start(); - - InputStream is = EquinoxServiceDiscovererTestCase.class.getResourceAsStream("/test-bundle.jar"); - testBundle = context.installBundle("test-bundle", is); - is.close(); - discoverer = new EquinoxServiceDiscoverer(context); - File dep = new File("target/bundles"); - List bundles = new ArrayList(); - for (File f : dep.listFiles()) { - BufferedInputStream bis = new BufferedInputStream(new FileInputStream(f)); - JarInputStream jis = new JarInputStream(bis); - Manifest manifest = jis.getManifest(); - if (manifest == null || manifest.getMainAttributes().getValue("Bundle-Name") == null) { - bis.close(); - continue; - } - bis.close(); - bis = new BufferedInputStream(new FileInputStream(f)); - Bundle b = context.installBundle(f.getName(), bis); - System.out.println("Installed "+b.getSymbolicName() + " [" + getState(b) + "]"); - bundles.add(b); - bis.close(); - } - for (Bundle b : bundles) { - b.start(); - System.out.println("Started "+b.getSymbolicName() + " [" + getState(b) + "]"); - // Get the Platform.getExtensionRegistry() - if ("org.eclipse.core.runtime".equals(b.getSymbolicName())) { - // The Platform class loaded by the bundle is different that the one - // on the classpath - Class cls = b.loadClass("org.eclipse.core.runtime.Platform"); - Method m = cls.getMethod("getExtensionRegistry"); - Object reg = m.invoke(cls); - System.out.println(reg); - } - } - } - - /** - * @throws java.lang.Exception - */ - @AfterClass - public static void tearDownAfterClass() throws Exception { - if (testBundle != null) { - // Uninstall the bundle to clean up the cache - testBundle.uninstall(); - } - host.stop(); - } - - @Test - public void testDiscovery() { - Set descriptors = - discoverer.discover("test.TestService", false); - Assert.assertEquals(1, descriptors.size()); - descriptors = discoverer.discover("notthere", false); - Assert.assertEquals(0, descriptors.size()); - } - - @Test - public void testDiscoveryFirst() { - Set descriptors = - discoverer.discover("test.TestService", true); - Assert.assertEquals(1, descriptors.size()); - descriptors = discoverer.discover("notthere", true); - Assert.assertEquals(0, descriptors.size()); - } - - -} diff --git a/branches/sca-java-1.5.1/modules/extensibility-equinox/src/test/java/org/apache/tuscany/sca/extensibility/equinox/TestEquinoxHost.java b/branches/sca-java-1.5.1/modules/extensibility-equinox/src/test/java/org/apache/tuscany/sca/extensibility/equinox/TestEquinoxHost.java deleted file mode 100644 index e000faa447..0000000000 --- a/branches/sca-java-1.5.1/modules/extensibility-equinox/src/test/java/org/apache/tuscany/sca/extensibility/equinox/TestEquinoxHost.java +++ /dev/null @@ -1,100 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package org.apache.tuscany.sca.extensibility.equinox; - -import java.io.File; -import java.util.HashMap; -import java.util.Map; - -import org.eclipse.core.runtime.adaptor.EclipseStarter; -import org.eclipse.core.runtime.adaptor.LocationManager; -import org.osgi.framework.BundleContext; - -/** - * A test host that starts/stops Equinox. - * - * @version $Rev: $ $Date: $ - */ -public class TestEquinoxHost { - - private final static String systemPackages = - "org.osgi.framework; version=1.3.0," + "org.osgi.service.packageadmin; version=1.2.0, " - + "org.osgi.service.startlevel; version=1.0.0, " - + "org.osgi.service.url; version=1.0.0, " - + "org.osgi.util.tracker; version=1.3.2, " - + "javax.xml, " - + "javax.xml.datatype, " - + "javax.xml.namespace, " - + "javax.xml.parsers, " - + "javax.xml.transform, " - + "javax.xml.transform.dom, " - + "javax.xml.transform.sax, " - + "javax.xml.transform.stream, " - + "javax.xml.validation, " - + "javax.xml.xpath, " - // Force the classes to be imported from the system bundle - + "javax.xml.stream, " - + "javax.xml.stream.util, " - + "javax.sql," - + "org.w3c.dom, " - + "org.xml.sax, " - + "org.xml.sax.ext, " - + "org.xml.sax.helpers, " - + "javax.security.auth, " - + "javax.security.cert, " - + "javax.security.auth.login, " - + "javax.security.auth.callback, " - + "javax.naming, " - + "javax.naming.spi, " - + "javax.naming.directory, " - + "javax.management, " - + "javax.imageio, " - + "sun.misc, " - + "javax.net, " - + "javax.net.ssl, " - + "javax.crypto, " - + "javax.rmi, " - + "javax.transaction, " - + "javax.transaction.xa"; - - public BundleContext start() { - try { - Map props = new HashMap(); - props.put("org.osgi.framework.system.packages", systemPackages); - props.put(EclipseStarter.PROP_CLEAN, "true"); - props.put(LocationManager.PROP_INSTANCE_AREA, new File("target/workspace").toURI().toString()); - props.put(LocationManager.PROP_INSTALL_AREA, new File("target/eclipse").toURI().toString()); - EclipseStarter.setInitialProperties(props); - BundleContext context = EclipseStarter.startup(new String[]{}, null); - return context; - } catch (Exception e) { - throw new IllegalStateException(e); - } - } - - public void stop() { - try { - EclipseStarter.shutdown(); - } catch (Exception e) { - throw new IllegalStateException(e); - } - } - -} diff --git a/branches/sca-java-1.5.1/modules/extensibility-equinox/src/test/resources/test-bundle.jar b/branches/sca-java-1.5.1/modules/extensibility-equinox/src/test/resources/test-bundle.jar deleted file mode 100644 index afee051f61..0000000000 Binary files a/branches/sca-java-1.5.1/modules/extensibility-equinox/src/test/resources/test-bundle.jar and /dev/null differ diff --git a/branches/sca-java-1.5.1/modules/pom.xml b/branches/sca-java-1.5.1/modules/pom.xml index f9ef0a5765..359ddf2d9a 100644 --- a/branches/sca-java-1.5.1/modules/pom.xml +++ b/branches/sca-java-1.5.1/modules/pom.xml @@ -116,7 +116,6 @@ endpoint extensibility extensibility-osgi - extensibility-equinox extension-helper host-android host-corba -- cgit v1.2.3