diff options
Diffstat (limited to '')
25 files changed, 2375 insertions, 8 deletions
diff --git a/java/sca/modules/extensibility-eclipse/pom.xml b/java/sca/modules/extensibility-eclipse/pom.xml index 3f7f5a1e4c..e9c128adc4 100644 --- a/java/sca/modules/extensibility-eclipse/pom.xml +++ b/java/sca/modules/extensibility-eclipse/pom.xml @@ -75,8 +75,7 @@ <Bundle-SymbolicName>org.apache.tuscany.sca.extensibility.equinox </Bundle-SymbolicName> <Bundle-Description>${pom.name}</Bundle-Description> - <Export-Package>org.apache.tuscany.sca.extensibility.equinox* - </Export-Package> + <DynamicImport-Package>*</DynamicImport-Package> </instructions> </configuration> </plugin> diff --git a/java/sca/modules/extensibility-osgi/pom.xml b/java/sca/modules/extensibility-osgi/pom.xml index 1690e9504e..b4b00c3f58 100644 --- a/java/sca/modules/extensibility-osgi/pom.xml +++ b/java/sca/modules/extensibility-osgi/pom.xml @@ -52,12 +52,11 @@ <artifactId>maven-bundle-plugin</artifactId> <configuration> <instructions> - <Bundle-Version>${tuscany.version} - </Bundle-Version> - <Bundle-SymbolicName>org.apache.tuscany.sca.extensibility.osgi - </Bundle-SymbolicName> + <Bundle-Version>${tuscany.version}</Bundle-Version> + <Bundle-SymbolicName>org.apache.tuscany.sca.extensibility.osgi</Bundle-SymbolicName> <Bundle-Description>${pom.name}</Bundle-Description> - <Export-Package>org.apache.tuscany.sca.extensibility.osgi*</Export-Package> + <!-- This bundle will be the gateway to all exported packages --> + <DynamicImport-Package>*</DynamicImport-Package> </instructions> </configuration> </plugin> diff --git a/java/sca/modules/extensibility-osgi/src/main/java/org/apache/tuscany/sca/extensibility/osgi/OSGiServiceDiscoverer.java b/java/sca/modules/extensibility-osgi/src/main/java/org/apache/tuscany/sca/extensibility/osgi/OSGiServiceDiscoverer.java index b5543824dc..1d26d2891a 100644 --- a/java/sca/modules/extensibility-osgi/src/main/java/org/apache/tuscany/sca/extensibility/osgi/OSGiServiceDiscoverer.java +++ b/java/sca/modules/extensibility-osgi/src/main/java/org/apache/tuscany/sca/extensibility/osgi/OSGiServiceDiscoverer.java @@ -112,7 +112,7 @@ public class OSGiServiceDiscoverer implements ServiceDiscoverer { } - private static String toString(Bundle b) { + public static String toString(Bundle b) { StringBuffer sb = new StringBuffer(); sb.append(b.getBundleId()).append(" ").append(b.getSymbolicName()); int s = b.getState(); diff --git a/java/sca/modules/implementation-node-osgi-runtime/LICENSE b/java/sca/modules/implementation-node-osgi-runtime/LICENSE new file mode 100644 index 0000000000..6e529a25c4 --- /dev/null +++ b/java/sca/modules/implementation-node-osgi-runtime/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/java/sca/modules/implementation-node-osgi-runtime/NOTICE b/java/sca/modules/implementation-node-osgi-runtime/NOTICE new file mode 100644 index 0000000000..eb1926d971 --- /dev/null +++ b/java/sca/modules/implementation-node-osgi-runtime/NOTICE @@ -0,0 +1,6 @@ +${pom.name}
+Copyright (c) 2005 - 2007 The Apache Software Foundation
+
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).
+
diff --git a/java/sca/modules/implementation-node-osgi-runtime/pom.xml b/java/sca/modules/implementation-node-osgi-runtime/pom.xml new file mode 100644 index 0000000000..e301bf3a34 --- /dev/null +++ b/java/sca/modules/implementation-node-osgi-runtime/pom.xml @@ -0,0 +1,127 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. +--> +<project> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.apache.tuscany.sca</groupId> + <artifactId>tuscany-modules</artifactId> + <version>1.4-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> + </parent> + <artifactId>tuscany-implementation-node-osgi-runtime</artifactId> + <name>Apache Tuscany SCA OSGi Node Implementation Extension</name> + <dependencies> + <dependency> + <groupId>org.apache.tuscany.sca</groupId> + <artifactId>tuscany-extensibility-osgi</artifactId> + <version>1.4-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.apache.felix</groupId> + <artifactId>org.apache.felix.framework</artifactId> + <version>1.0.4</version> + <scope>test</scope> + <exclusions> + <exclusion> + <groupId>org.apache.felix</groupId> + <artifactId>javax.servlet</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.apache.tuscany.sca</groupId> + <artifactId>tuscany-implementation-node</artifactId> + <version>1.4-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.apache.tuscany.sca</groupId> + <artifactId>tuscany-node2-api</artifactId> + <version>1.4-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.apache.tuscany.sca</groupId> + <artifactId>tuscany-host-http</artifactId> + <version>1.4-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.apache.tuscany.sca</groupId> + <artifactId>tuscany-node2-impl</artifactId> + <version>1.4-SNAPSHOT</version> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <version>2.4</version> <!-- to keep compatible with older servlet containers --> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.apache.tuscany.sca</groupId> + <artifactId>tuscany-implementation-java-runtime</artifactId> + <version>1.4-SNAPSHOT</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>4.2</version> + <scope>test</scope> + </dependency> + </dependencies> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <version>2.0</version> + <executions> + <execution> + <id>copy-dependencies</id> + <phase>process-test-resources</phase> + <goals> + <goal>copy-dependencies</goal> + </goals> + <configuration> + <outputDirectory>${project.build.directory}/modules</outputDirectory> + <excludeArtifactIds></excludeArtifactIds> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <configuration> + <instructions> + <Bundle-Version>${tuscany.version}</Bundle-Version> + <Bundle-SymbolicName>org.apache.tuscany.sca.implementation.node.osgi.runtime + </Bundle-SymbolicName> + <Bundle-Description>${pom.name}</Bundle-Description> + <Export-Package>org.apache.tuscany.sca.implementation.node.osgi* + </Export-Package> + <Bundle-Activator> + org.apache.tuscany.sca.implementation.node.osgi.launcher.LauncherBundleActivator + </Bundle-Activator> + </instructions> + </configuration> + </plugin> + </plugins> + </build> +</project>
\ No newline at end of file diff --git a/java/sca/modules/implementation-node-osgi-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/osgi/launcher/JarFileFinder.java b/java/sca/modules/implementation-node-osgi-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/osgi/launcher/JarFileFinder.java new file mode 100644 index 0000000000..75e4bcdd35 --- /dev/null +++ b/java/sca/modules/implementation-node-osgi-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/osgi/launcher/JarFileFinder.java @@ -0,0 +1,348 @@ +/* + * 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.implementation.node.osgi.launcher; + +import java.io.File; +import java.io.FileNotFoundException; +import java.io.FilenameFilter; +import java.io.IOException; +import java.net.MalformedURLException; +import java.net.URI; +import java.net.URISyntaxException; +import java.net.URL; +import java.security.AccessController; +import java.security.PrivilegedAction; +import java.security.PrivilegedActionException; +import java.security.PrivilegedExceptionAction; +import java.util.ArrayList; +import java.util.HashSet; +import java.util.List; +import java.util.Set; +import java.util.StringTokenizer; +import java.util.logging.Logger; + +/** + * + */ +public class JarFileFinder { + /** + * A file name filter used to filter JAR files. + */ + static class StandAloneJARFileNameFilter implements FilenameFilter { + + public boolean accept(File dir, String name) { + name = name.toLowerCase(); + + // Exclude tuscany-sca-all and tuscany-sca-manifest as they duplicate + // code in the individual runtime module JARs + if (name.startsWith("tuscany-sca-all")) { + return false; + } + if (name.startsWith("tuscany-sca-manifest")) { + return false; + } + + // Filter out the Tomcat and Webapp hosts + if (name.startsWith("tuscany-host-tomcat") || name.startsWith("tuscany-host-webapp")) { + //FIXME This is temporary + return false; + } + + // Include JAR and MAR files + if (name.endsWith(".jar")) { + return true; + } + if (name.endsWith(".mar")) { + return true; + } + return false; + } + } + + /** + * A file name filter used to filter JAR files. + */ + static class WebAppJARFileNameFilter extends StandAloneJARFileNameFilter { + + public boolean accept(File dir, String name) { + if (!super.accept(dir, name)) { + return false; + } + name = name.toLowerCase(); + + // Exclude servlet-api JARs + if (name.startsWith("servlet-api")) { + return false; + } + + // Exclude the Tomcat and Jetty hosts + if (name.startsWith("tuscany-host-tomcat") || name.startsWith("tuscany-host-jetty")) { + //FIXME This is temporary + return false; + } + + return true; + } + } + + private static final Logger logger = Logger.getLogger(JarFileFinder.class.getName()); + + static final String TUSCANY_HOME = "TUSCANY_HOME"; + private static final String TUSCANY_PATH = "TUSCANY_PATH"; + + /** + * Collect JAR files in the given directory + * @param directory + * @param urls + * @param filter + * @throws MalformedURLException + */ + private static void collectJARFiles(File directory, List<URL> urls, FilenameFilter filter) + throws MalformedURLException { + String[] files = directory.list(filter); + if (files != null) { + URL directoryURL = new URL(directory.toURI().toString() + "/"); + int count = 0; + for (String file : files) { + URL url = new URL(directoryURL, file); + urls.add(url); + count++; + } + if (count != 0) { + logger.fine("Runtime classpath: " + count + + " JAR" + + (count > 1 ? "s" : "") + + " from " + + directory.toString()); + } + } + } + + /** + * Collect JAR files under the given directory. + * + * @param directory + * @param jarDirectoryURLs + * @param jarURLs + * @param filter + * @throws MalformedURLException + */ + private static void collectJARFiles(String directory, + Set<URL> jarDirectoryURLs, + List<URL> jarURLs, + FilenameFilter filter) throws MalformedURLException { + File directoryFile = new File(directory); + URL directoryURL = directoryFile.toURI().toURL(); + if (!jarDirectoryURLs.contains(directoryURL) && directoryFile.exists()) { + + // Collect files under $TUSCANY_HOME + jarDirectoryURLs.add(directoryURL); + collectJARFiles(directoryFile, jarURLs, filter); + + // Collect files under $TUSCANY_HOME/modules + File modulesDirectory = new File(directoryFile, "modules"); + URL modulesDirectoryURL = modulesDirectory.toURI().toURL(); + if (!jarDirectoryURLs.contains(modulesDirectoryURL) && modulesDirectory.exists()) { + jarDirectoryURLs.add(modulesDirectoryURL); + collectJARFiles(modulesDirectory, jarURLs, filter); + } + + // Collect files under $TUSCANY_HOME/lib + File libDirectory = new File(directoryFile, "lib"); + URL libDirectoryURL = libDirectory.toURI().toURL(); + if (!jarDirectoryURLs.contains(libDirectoryURL) && libDirectory.exists()) { + jarDirectoryURLs.add(libDirectoryURL); + collectJARFiles(libDirectory, jarURLs, filter); + } + } + } + + /** + * Returns a ClassLoader for the Tuscany runtime JARs. + * + * @param parentClassLoader + * @param filter + * + * @return + */ + public static List<URL> findJarFiles(File root, FilenameFilter filter) throws FileNotFoundException, + URISyntaxException, MalformedURLException { + + // Build list of runtime JARs + Set<URL> jarDirectoryURLs = new HashSet<URL>(); + List<URL> jarURLs = new ArrayList<URL>(); + + URL url = null; + if (root != null) { + url = root.toURI().toURL(); + } else { + // First determine the path to the launcher class + String resource = JarFileFinder.class.getName().replace('.', '/') + ".class"; + url = JarFileFinder.class.getClassLoader().getResource(resource); + if (url == null) { + throw new FileNotFoundException(resource); + } + + url = getContainer(url, resource); + } + URI uri = url.toURI(); + + // If the launcher class is in a JAR, add all runtime JARs from directory containing + // that JAR (e.g. the Tuscany modules directory) as well as the ../modules and + // ../lib directories + if (url != null && "file".equals(url.getProtocol())) { + + File file = new File(uri); + if (file.exists()) { + File jarDirectory = file.getParentFile(); + if (jarDirectory != null && jarDirectory.exists()) { + + // Collect JAR files from the directory containing the input JAR + // (e.g. the Tuscany modules directory) + URL jarDirectoryURL = jarDirectory.toURI().toURL(); + jarDirectoryURLs.add(jarDirectoryURL); + collectJARFiles(jarDirectory, jarURLs, filter); + + File homeDirectory = jarDirectory.getParentFile(); + if (homeDirectory != null && homeDirectory.exists()) { + + // Collect JARs from the ../modules directory + File modulesDirectory = new File(homeDirectory, "modules"); + URL modulesDirectoryURL = modulesDirectory.toURI().toURL(); + if (!jarDirectoryURLs.contains(modulesDirectoryURL) && modulesDirectory.exists()) { + jarDirectoryURLs.add(modulesDirectoryURL); + collectJARFiles(modulesDirectory, jarURLs, filter); + } + + // Collect JARs from the ../lib directory + File libDirectory = new File(homeDirectory, "lib"); + URL libDirectoryURL = libDirectory.toURI().toURL(); + if (!jarDirectoryURLs.contains(libDirectoryURL) && libDirectory.exists()) { + jarDirectoryURLs.add(libDirectoryURL); + collectJARFiles(libDirectory, jarURLs, filter); + } + } + } + } + } + + // Look for a TUSCANY_HOME system property or environment variable + // Add all the JARs found under $TUSCANY_HOME, $TUSCANY_HOME/modules + // and $TUSCANY_HOME/lib + String home = getProperty(TUSCANY_HOME); + if (home != null && home.length() != 0) { + logger.fine(TUSCANY_HOME + ": " + home); + collectJARFiles(home, jarDirectoryURLs, jarURLs, filter); + } + + // Look for a TUSCANY_PATH system property or environment variable + // Add all the JARs found under $TUSCANY_PATH, $TUSCANY_PATH/modules + // and $TUSCANY_PATH/lib + String ext = getProperty(TUSCANY_PATH); + if (ext != null && ext.length() != 0) { + logger.fine(TUSCANY_PATH + ": " + ext); + String separator = getProperty("path.separator"); + for (StringTokenizer tokens = new StringTokenizer(ext, separator); tokens.hasMoreTokens();) { + collectJARFiles(tokens.nextToken(), jarDirectoryURLs, jarURLs, filter); + } + } + + return jarURLs; + + } + + static String getProperty(final String prop) { + return AccessController.doPrivileged(new PrivilegedAction<String>() { + public String run() { + String value = System.getProperty(prop); + if (value == null || value.length() == 0) { + return System.getenv(prop); + } else { + return value; + } + } + }); + } + + private static File toFile(URL url) { + if (url == null || !url.getProtocol().equals("file")) { + return null; + } else { + String filename = url.getFile().replace('/', File.separatorChar); + int pos = 0; + while ((pos = filename.indexOf('%', pos)) >= 0) { + if (pos + 2 < filename.length()) { + String hexStr = filename.substring(pos + 1, pos + 3); + char ch = (char)Integer.parseInt(hexStr, 16); + filename = filename.substring(0, pos) + ch + filename.substring(pos + 3); + } + } + return new File(filename); + } + } + + private static URL getContainer(URL resourceURL, String resourceName) { + URL root = null; + // "jar:file://....../something.jar!/a/b/c/app.composite" + try { + String url = resourceURL.toExternalForm(); + String protocol = resourceURL.getProtocol(); + if ("file".equals(protocol)) { + // directory contribution + if (url.endsWith("/" + resourceName)) { + final String location = url.substring(0, url.length() - resourceName.length() - 1); + // workaround from evil URL/URI form Maven + // contributionURL = FileHelper.toFile(new URL(location)).toURI().toURL(); + // Allow privileged access to open URL stream. Add FilePermission to added to + // security policy file. + try { + root = AccessController.doPrivileged(new PrivilegedExceptionAction<URL>() { + public URL run() throws IOException { + return toFile(new URL(location)).toURI().toURL(); + } + }); + } catch (PrivilegedActionException e) { + throw (MalformedURLException)e.getException(); + } + } + + } else if ("jar".equals(protocol)) { + // jar contribution + String location = url.substring(4, url.lastIndexOf("!/")); + // workaround for evil URL/URI from Maven + root = toFile(new URL(location)).toURI().toURL(); + + } else if ("wsjar".equals(protocol)) { + // See https://issues.apache.org/jira/browse/TUSCANY-2219 + // wsjar contribution + String location = url.substring(6, url.lastIndexOf("!/")); + // workaround for evil url/uri from maven + root = toFile(new URL(location)).toURI().toURL(); + + } else if (protocol != null && (protocol.equals("bundle") || protocol.equals("bundleresource"))) { + root = new URL(resourceURL.getProtocol(), resourceURL.getHost(), resourceURL.getPort(), "/"); + } + } catch (MalformedURLException mfe) { + throw new IllegalArgumentException(mfe); + } + return root; + } + +} diff --git a/java/sca/modules/implementation-node-osgi-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/osgi/launcher/LauncherBundleActivator.java b/java/sca/modules/implementation-node-osgi-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/osgi/launcher/LauncherBundleActivator.java new file mode 100644 index 0000000000..8296da93b5 --- /dev/null +++ b/java/sca/modules/implementation-node-osgi-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/osgi/launcher/LauncherBundleActivator.java @@ -0,0 +1,344 @@ +package org.apache.tuscany.sca.implementation.node.osgi.launcher; + +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.net.URI; +import java.net.URL; +import java.security.CodeSource; +import java.util.ArrayList; +import java.util.HashSet; +import java.util.List; +import java.util.jar.Attributes; +import java.util.jar.JarEntry; +import java.util.jar.JarInputStream; +import java.util.jar.JarOutputStream; +import java.util.jar.Manifest; +import java.util.logging.Level; +import java.util.logging.Logger; +import java.util.regex.Matcher; +import java.util.regex.Pattern; +import java.util.zip.ZipEntry; + +import org.osgi.framework.Bundle; +import org.osgi.framework.BundleActivator; +import org.osgi.framework.BundleContext; +import org.osgi.framework.Constants; + +/** + * Bundle activator which installs Tuscany modules and 3rd party jars into an OSGi runtime. + * + */ +public class LauncherBundleActivator implements BundleActivator, Constants { + + private static Logger logger = Logger.getLogger(LauncherBundleActivator.class.getName()); + private ArrayList<Bundle> tuscanyBundles = new ArrayList<Bundle>(); + + private static final String[] immutableJars = {"bcprov"}; + + public void start(BundleContext bundleContext) throws Exception { + installTuscany(bundleContext); + } + + public void stop(BundleContext bundleContext) throws Exception { + for (Bundle bundle : tuscanyBundles) { + try { + bundle.stop(); + } catch (Exception e) { + // Ignore error + } + } + + for (Bundle bundle : tuscanyBundles) { + try { + bundle.uninstall(); + } catch (Exception e) { + // Ignore error + } + } + + } + + public void installTuscany(BundleContext bundleContext) { + long start = System.currentTimeMillis(); + + try { + + // FIXME: SDO bundles dont have the correct dependencies + System.setProperty("commonj.sdo.impl.HelperProvider", "org.apache.tuscany.sdo.helper.HelperProviderImpl"); + File tuscanyInstallDir = findTuscanyInstallDir(bundleContext.getBundle()); + + List<URL> urls = + JarFileFinder.findJarFiles(tuscanyInstallDir, new JarFileFinder.StandAloneJARFileNameFilter()); + + for (URL url : urls) { + File file = new File(url.toURI()); + if (file.getName().startsWith("org.apache.felix.") || file.getName().startsWith("org.osgi.")) { + continue; + } + try { + Bundle bundle = createAndInstallBundle(bundleContext, file); + tuscanyBundles.add(bundle); + } catch (Exception e) { + logger.log(Level.SEVERE, e.getMessage(), e); + } + } + + long end = System.currentTimeMillis(); + logger.info("Tuscany bundles are installed in " + (end - start) + " ms."); + + } catch (Exception e) { + e.printStackTrace(); + } + } + + private File findTuscanyInstallDir(Bundle bundle) throws IOException { + String tuscanyDirName = JarFileFinder.getProperty(JarFileFinder.TUSCANY_HOME); + if (tuscanyDirName != null) { + File tuscanyInstallDir = new File(tuscanyDirName); + if (tuscanyInstallDir.exists() && tuscanyInstallDir.isDirectory()) + return tuscanyInstallDir; + } + + String location = bundle.getLocation(); + + if (location != null && location.startsWith("file:")) { + File file = new File(URI.create(location)); + File tuscanyInstallDir = file.getParentFile(); + if (tuscanyInstallDir.exists() && tuscanyInstallDir.isDirectory()) + return tuscanyInstallDir; + } + if (this.getClass().getProtectionDomain() != null) { + CodeSource codeSource = this.getClass().getProtectionDomain().getCodeSource(); + if (codeSource != null) { + try { + File tuscanyInstallDir = new File(codeSource.getLocation().toURI()); + if (tuscanyInstallDir.exists() && tuscanyInstallDir.isDirectory()) + return tuscanyInstallDir; + } catch (Exception e) { + // ignore + } + } + } + return null; + } + + public Bundle createAndInstallBundle(BundleContext bundleContext, File bundleFile) throws Exception { + logger.info("Installing bundle: " + bundleFile); + long start = System.currentTimeMillis(); + String bundleLocation = bundleFile.toURI().toString(); + Manifest manifest = createBundleManifest(bundleFile); + + InputStream inStream = null; + if (manifest != null) { + // We need to repackage the bundle + ByteArrayOutputStream out = new ByteArrayOutputStream(); + JarOutputStream jarOut = new JarOutputStream(out, manifest); + + String classpath = manifest.getMainAttributes().getValue("Bundle-ClassPath"); + boolean embedded = classpath != null && !classpath.trim().equals("."); + if (embedded) { + addFileToJar(bundleFile, jarOut); + } else { + copyJar(bundleFile, jarOut); + } + + jarOut.close(); + inStream = new ByteArrayInputStream(out.toByteArray()); + } else { + // The file itself is already a bundle + inStream = new FileInputStream(bundleFile); + } + + try { + Bundle bundle = bundleContext.installBundle(bundleLocation, inStream); + logger.info("Bundle installed in " + (System.currentTimeMillis() - start) + " ms: " + bundleLocation); + return bundle; + } finally { + inStream.close(); + } + + } + + private void addFileToJar(File file, JarOutputStream jarOut) throws IOException { + JarEntry ze = new JarEntry(file.getName()); + jarOut.putNextEntry(ze); + FileInputStream inStream = new FileInputStream(file); + copy(inStream, jarOut); + } + + private void copy(InputStream in, OutputStream out) throws IOException { + byte[] readBuf = new byte[4096]; + int bytesRead; + while ((bytesRead = in.read(readBuf)) > 0) { + out.write(readBuf, 0, bytesRead); + } + } + + private void copyJar(File file, JarOutputStream jarOut) throws IOException { + JarInputStream jarIn = new JarInputStream(new FileInputStream(file)); + ZipEntry ze; + while ((ze = jarIn.getNextEntry()) != null) { + // Skip the MANIFEST.MF + if (ze.getName().equals("META-INF/MANIFEST.MF")) + continue; + jarOut.putNextEntry(ze); + copy(jarIn, jarOut); + } + jarIn.close(); + } + + private Manifest createBundleManifest(File jarFile) throws Exception { + + if (!jarFile.exists()) { + return null; + } + JarInputStream jar = new JarInputStream(new FileInputStream(jarFile)); + // Read the Manifest from the jar file + Manifest manifest = jar.getManifest(); + jar.close(); + + if (manifest == null) { + // Create a new one if no Manifest is found + manifest = new Manifest(); + } else { + Attributes attributes = manifest.getMainAttributes(); + if (attributes.getValue(BUNDLE_SYMBOLICNAME) != null) { + return null; + } + } + + // Check if we have an associated .mf file + String name = jarFile.getName(); + int index = name.lastIndexOf('.'); + if (index != -1) { + File mf = new File(jarFile.getParentFile(), name.substring(0, index) + ".mf"); + if (mf.isFile()) { + FileInputStream is = new FileInputStream(mf); + manifest.read(is); + is.close(); + } + } + + String jarFileName = jarFile.getName(); + boolean isImmutableJar = false; + for (String immutableJar : immutableJars) { + if (jarFileName.startsWith(immutableJar)) { + isImmutableJar = true; + break; + } + } + + Attributes attributes = manifest.getMainAttributes(); + if (attributes.getValue(BUNDLE_SYMBOLICNAME) == null) { + String bundleSymbolicName = jarFile.getName(); + if (bundleSymbolicName.endsWith(".jar")) { + bundleSymbolicName = bundleSymbolicName.substring(0, bundleSymbolicName.length() - 4); + } + attributes.putValue(BUNDLE_SYMBOLICNAME, bundleSymbolicName); + } else { + // Assume the jar is already a bundle + return null; + } + + if (attributes.getValue("Manifest-Version") == null) { + attributes.putValue("Manifest-Version", "1.0"); + } + + if (attributes.getValue(BUNDLE_MANIFESTVERSION) == null) { + attributes.putValue(BUNDLE_MANIFESTVERSION, "2"); + } + + if (isImmutableJar && attributes.getValue(BUNDLE_CLASSPATH) == null) { + attributes.putValue(BUNDLE_CLASSPATH, ".," + jarFileName); + } + + jar = new JarInputStream(new FileInputStream(jarFile)); + HashSet<String> packages = getPackagesInJar(jarFileName, jar); + jar.close(); + String version = getJarVersion(jarFileName); + + // attributes.remove(new Attributes.Name("Require-Bundle")); + // attributes.remove(new Attributes.Name("Import-Package")); + + if (attributes.getValue(BUNDLE_VERSION) == null) { + attributes.putValue(BUNDLE_VERSION, version); + } + // Existing export statements in bundles may contain versions, so they should be used as is + // SDO exports are not sufficient, and should be changed + if (attributes.getValue(EXPORT_PACKAGE) == null || jarFileName.startsWith("tuscany-sdo-impl")) { + String pkgs = packagesToString(packages, version); + if (pkgs.length() > 0) { + attributes.putValue(EXPORT_PACKAGE, pkgs); + attributes.putValue(IMPORT_PACKAGE, packagesToString(packages, null)); + } + // attributes.putValue("Import-Package", packagesToString(packages, null)); + } + + attributes.putValue(DYNAMICIMPORT_PACKAGE, "*"); + return manifest; + } + + private HashSet<String> getPackagesInJar(String bundleName, JarInputStream jar) throws Exception { + HashSet<String> packages = new HashSet<String>(); + ZipEntry entry; + while ((entry = jar.getNextEntry()) != null) { + String entryName = entry.getName(); + if (!entry.isDirectory() && entryName != null && entryName.length() > 0 && !entryName.startsWith(".") + // && !entryName.startsWith("META-INF") + && entryName.lastIndexOf("/") > 0) { + String pkg = entryName.substring(0, entryName.lastIndexOf("/")).replace('/', '.'); + packages.add(pkg); + + } + } + // FIXME: Split package + if (bundleName.startsWith("axis2-adb")) { + packages.remove("org.apache.axis2.util"); + } else if (bundleName.startsWith("axis2-codegen")) { + packages.remove("org.apache.axis2.wsdl"); + packages.remove("org.apache.axis2.wsdl.util"); + } else if (bundleName.startsWith("bsf-all")) { + packages.remove("org.mozilla.javascript"); + } + + return packages; + } + + private String packagesToString(HashSet<String> packages, String version) { + + StringBuilder pkgBuf = new StringBuilder(); + for (String pkg : packages) { + if (pkgBuf.length() > 0) { + pkgBuf.append(','); + } + pkgBuf.append(pkg); + if (version != null && !pkg.startsWith("META-INF.")) { + pkgBuf.append(";version=\""); + pkgBuf.append(version); + pkgBuf.append('\"'); + } + } + return pkgBuf.toString(); + } + + private String getJarVersion(String bundleName) { + Pattern pattern = Pattern.compile("-([0-9.]+)"); + Matcher matcher = pattern.matcher(bundleName); + String version = "1.0.0"; + if (matcher.find()) { + version = matcher.group(); + if (version.endsWith(".")) { + version = version.substring(1, version.length() - 1); + } else { + version = version.substring(1); + } + } + return version; + } + +} diff --git a/java/sca/modules/implementation-node-osgi-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/osgi/launcher/NodeImplementationDaemonBootstrap.java b/java/sca/modules/implementation-node-osgi-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/osgi/launcher/NodeImplementationDaemonBootstrap.java new file mode 100644 index 0000000000..9baaa8b4a6 --- /dev/null +++ b/java/sca/modules/implementation-node-osgi-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/osgi/launcher/NodeImplementationDaemonBootstrap.java @@ -0,0 +1,87 @@ +/* + * 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.implementation.node.osgi.launcher; + +import org.apache.tuscany.sca.node.SCANode2; +import org.apache.tuscany.sca.node.SCANode2Factory; + +/** + * Bootstrap class for the SCA node daemon. + * + * @version $Rev$ $Date$ + */ +public class NodeImplementationDaemonBootstrap { + private SCANode2 node; + + /** + * A node wrappering an instance of a node daemon. + */ + public static class NodeFacade implements SCANode2 { + private ClassLoader threadContextClassLoader; + private ClassLoader runtimeClassLoader; + private SCANode2 daemon; + + private NodeFacade() { + runtimeClassLoader = Thread.currentThread().getContextClassLoader(); + } + + public void start() { + threadContextClassLoader = Thread.currentThread().getContextClassLoader(); + boolean started = false; + try { + Thread.currentThread().setContextClassLoader(runtimeClassLoader); + daemon = + SCANode2Factory.newInstance().createSCANodeFromClassLoader("NodeDaemon.composite", + getClass().getClassLoader()); + daemon.start(); + started = true; + } finally { + if (!started) { + Thread.currentThread().setContextClassLoader(threadContextClassLoader); + } + } + } + + public void stop() { + try { + Thread.currentThread().setContextClassLoader(runtimeClassLoader); + daemon.stop(); + } finally { + Thread.currentThread().setContextClassLoader(threadContextClassLoader); + } + } + } + + /** + * Constructs a new daemon bootstrap. + */ + public NodeImplementationDaemonBootstrap() throws Exception { + node = new NodeFacade(); + } + + /** + * Returns the node representing the daemon. + * @return + */ + public SCANode2 getNode() { + return node; + } + +} diff --git a/java/sca/modules/implementation-node-osgi-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/osgi/launcher/NodeImplementationLauncherBootstrap.java b/java/sca/modules/implementation-node-osgi-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/osgi/launcher/NodeImplementationLauncherBootstrap.java new file mode 100644 index 0000000000..2cd91ddff3 --- /dev/null +++ b/java/sca/modules/implementation-node-osgi-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/osgi/launcher/NodeImplementationLauncherBootstrap.java @@ -0,0 +1,149 @@ +/* + * 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.implementation.node.osgi.launcher; + +import org.apache.tuscany.sca.node.SCAClient; +import org.apache.tuscany.sca.node.SCAContribution; +import org.apache.tuscany.sca.node.SCANode2; +import org.apache.tuscany.sca.node.SCANode2Factory; +import org.osoa.sca.CallableReference; +import org.osoa.sca.ServiceReference; + +/** + * Bootstrap class for standalone SCA nodes. + * + * @version $Rev$ $Date$ + */ +public class NodeImplementationLauncherBootstrap { + + private SCANode2 node; + + /** + * A node facade. + */ + public static class NodeFacade implements SCANode2, SCAClient { + private ClassLoader threadContextClassLoader; + private ClassLoader runtimeClassLoader; + private SCANode2 delegate; + + private NodeFacade(SCANode2 delegate) { + runtimeClassLoader = Thread.currentThread().getContextClassLoader(); + this.delegate = delegate; + } + + public void start() { + threadContextClassLoader = Thread.currentThread().getContextClassLoader(); + boolean started = false; + try { + Thread.currentThread().setContextClassLoader(runtimeClassLoader); + delegate.start(); + started = true; + } finally { + if (!started) { + Thread.currentThread().setContextClassLoader(threadContextClassLoader); + } + } + } + + public void stop() { + try { + Thread.currentThread().setContextClassLoader(runtimeClassLoader); + delegate.stop(); + } finally { + Thread.currentThread().setContextClassLoader(threadContextClassLoader); + } + } + + public <B, R extends CallableReference<B>> R cast(B target) throws IllegalArgumentException { + return (R)((SCAClient)delegate).cast(target); + } + + public <B> B getService(Class<B> businessInterface, String serviceName) { + return (B)((SCAClient)delegate).getService(businessInterface, serviceName); + } + + public <B> ServiceReference<B> getServiceReference(Class<B> businessInterface, String referenceName) { + return (ServiceReference<B>)((SCAClient)delegate).getServiceReference(businessInterface, referenceName); + } + } + + /** + * Bootstrap a new SCA node. + * + * @param configurationURI + */ + public NodeImplementationLauncherBootstrap(String configurationURI) throws Exception { + SCANode2Factory nodeFactory = SCANode2Factory.newInstance(); + node = new NodeFacade(nodeFactory.createSCANodeFromURL(configurationURI)); + } + + /** + * Bootstrap a new SCA node. + * + * @param configurationURI + * @param contributionClassLoader + */ + public NodeImplementationLauncherBootstrap(String compositeURI, ClassLoader contributionClassLoader) throws Exception { + SCANode2Factory nodeFactory = SCANode2Factory.newInstance(); + node = new NodeFacade(nodeFactory.createSCANodeFromClassLoader(compositeURI, contributionClassLoader)); + } + + /** + * Bootstrap a new SCA node. + * + * @param compositeURI + * @param uris + * @param locations + */ + public NodeImplementationLauncherBootstrap(String compositeURI, String[] uris, String[] locations) throws Exception { + SCANode2Factory nodeFactory = SCANode2Factory.newInstance(); + SCAContribution[] contributions = new SCAContribution[uris.length]; + for (int i = 0; i < uris.length; i++) { + contributions[i] = new SCAContribution(uris[i], locations[i]); + } + node = new NodeFacade(nodeFactory.createSCANode(compositeURI, contributions)); + } + + /** + * Bootstrap a new SCA node. + * + * @param compositeURI + * @param uris + * @param locations + */ + public NodeImplementationLauncherBootstrap(String compositeURI, String compositeContent, String[] uris, String[] locations) throws Exception { + SCANode2Factory nodeFactory = SCANode2Factory.newInstance(); + SCAContribution[] contributions = new SCAContribution[uris.length]; + for (int i = 0; i < uris.length; i++) { + contributions[i] = new SCAContribution(uris[i], locations[i]); + } + node = new NodeFacade(nodeFactory.createSCANode(compositeURI, compositeContent, contributions)); + } + + /** + * Returns the SCA node. + * + * @return + */ + public SCANode2 getNode() { + return node; + } + +} diff --git a/java/sca/modules/implementation-node-osgi-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/osgi/launcher/NodeImplementationLauncherUtil.java b/java/sca/modules/implementation-node-osgi-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/osgi/launcher/NodeImplementationLauncherUtil.java new file mode 100644 index 0000000000..a4b9a13a96 --- /dev/null +++ b/java/sca/modules/implementation-node-osgi-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/osgi/launcher/NodeImplementationLauncherUtil.java @@ -0,0 +1,51 @@ +/* + * 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.implementation.node.osgi.launcher; + +/** + * Utility methods for node implementation launchers. + * + * @version $Rev$ $Date$ + */ +public class NodeImplementationLauncherUtil { + + private static final String TUSCANY_DOMAIN = "TUSCANY_DOMAIN"; + private static final String DEFAULT_DOMAIN = "http://localhost:9990"; + + /** + * Determine the URI of a node configuration. The domain URI can be configured + * using a TUSCANY_DOMAIN system property or environment variable. + * + * @param nodeName + * @return + */ + public static String nodeConfigurationURI(String nodeName) { + String domain = System.getProperty(TUSCANY_DOMAIN); + if (domain == null || domain.length() == 0) { + domain = System.getenv(TUSCANY_DOMAIN); + } + if (domain == null || domain.length() ==0) { + domain = DEFAULT_DOMAIN; + } + String nodeConfiguration = domain + "/node-config/" + nodeName; + return nodeConfiguration; + } + +} diff --git a/java/sca/modules/implementation-node-osgi-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/osgi/provider/NodeImplementationInvoker.java b/java/sca/modules/implementation-node-osgi-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/osgi/provider/NodeImplementationInvoker.java new file mode 100644 index 0000000000..72a4de14d0 --- /dev/null +++ b/java/sca/modules/implementation-node-osgi-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/osgi/provider/NodeImplementationInvoker.java @@ -0,0 +1,44 @@ +/* + * 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.implementation.node.osgi.provider; + +import org.apache.tuscany.sca.assembly.Composite; +import org.apache.tuscany.sca.invocation.Invoker; +import org.apache.tuscany.sca.invocation.Message; + +/** + * Implements an invoker for node component implementations. + * + * @version $Rev$ $Date$ + */ +class NodeImplementationInvoker implements Invoker { + private Composite composite; + + NodeImplementationInvoker(Composite composite) { + this.composite = composite; + } + + public Message invoke(Message msg) { + //FIXME Implement later + msg.setBody(composite); + return msg; + } + +} diff --git a/java/sca/modules/implementation-node-osgi-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/osgi/provider/NodeImplementationProvider.java b/java/sca/modules/implementation-node-osgi-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/osgi/provider/NodeImplementationProvider.java new file mode 100644 index 0000000000..f2c4bcf32f --- /dev/null +++ b/java/sca/modules/implementation-node-osgi-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/osgi/provider/NodeImplementationProvider.java @@ -0,0 +1,62 @@ +/* + * 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.implementation.node.osgi.provider; + +import org.apache.tuscany.sca.implementation.node.NodeImplementation; +import org.apache.tuscany.sca.interfacedef.Operation; +import org.apache.tuscany.sca.invocation.Invoker; +import org.apache.tuscany.sca.provider.ImplementationProvider; +import org.apache.tuscany.sca.runtime.RuntimeComponent; +import org.apache.tuscany.sca.runtime.RuntimeComponentService; + +/** + * An implementation provider for node component implementations. + * + * @version $Rev$ $Date$ + */ +class NodeImplementationProvider implements ImplementationProvider { + + private NodeImplementation implementation; + + /** + * Constructs a new node implementation provider. + * + * @param component + * @param implementation + */ + NodeImplementationProvider(RuntimeComponent component, NodeImplementation implementation) { + this.implementation = implementation; + } + + public Invoker createInvoker(RuntimeComponentService service, Operation operation) { + NodeImplementationInvoker invoker = new NodeImplementationInvoker(implementation.getComposite()); + return invoker; + } + + public boolean supportsOneWayInvocation() { + return false; + } + + public void start() { + } + + public void stop() { + } + +} diff --git a/java/sca/modules/implementation-node-osgi-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/osgi/provider/NodeImplementationProviderFactory.java b/java/sca/modules/implementation-node-osgi-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/osgi/provider/NodeImplementationProviderFactory.java new file mode 100644 index 0000000000..834b68bdb2 --- /dev/null +++ b/java/sca/modules/implementation-node-osgi-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/osgi/provider/NodeImplementationProviderFactory.java @@ -0,0 +1,49 @@ +/* + * 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.implementation.node.osgi.provider; + +import org.apache.tuscany.sca.core.ExtensionPointRegistry; +import org.apache.tuscany.sca.implementation.node.NodeImplementation; +import org.apache.tuscany.sca.provider.ImplementationProvider; +import org.apache.tuscany.sca.provider.ImplementationProviderFactory; +import org.apache.tuscany.sca.runtime.RuntimeComponent; + +/** + * Factory for node component implementation providers. + * + * @version $Rev$ $Date$ + */ +public class NodeImplementationProviderFactory implements ImplementationProviderFactory<NodeImplementation> { + + /** + * Constructs a new factory. + * + * @param extensionPoints + */ + public NodeImplementationProviderFactory(ExtensionPointRegistry extensionPoints) { + } + + public ImplementationProvider createImplementationProvider(RuntimeComponent component, NodeImplementation implementation) { + return new NodeImplementationProvider(component, implementation); + } + + public Class<NodeImplementation> getModelType() { + return NodeImplementation.class; + } +} diff --git a/java/sca/modules/implementation-node-osgi-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/osgi/webapp/NodeWebAppRequestDispatcher.java b/java/sca/modules/implementation-node-osgi-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/osgi/webapp/NodeWebAppRequestDispatcher.java new file mode 100644 index 0000000000..3f74d63ee5 --- /dev/null +++ b/java/sca/modules/implementation-node-osgi-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/osgi/webapp/NodeWebAppRequestDispatcher.java @@ -0,0 +1,119 @@ +/* + * 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.implementation.node.osgi.webapp; + +import java.io.IOException; +import java.util.StringTokenizer; + +import javax.servlet.RequestDispatcher; +import javax.servlet.Servlet; +import javax.servlet.ServletException; +import javax.servlet.ServletRequest; +import javax.servlet.ServletResponse; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletRequestWrapper; + +/** + * A Servlet request dispatcher that can be used to delegate requests to a + * Serlvet registered with the Webapp Servlet host. + * + * @version $Rev$ $Date$ + */ +class NodeWebAppRequestDispatcher implements RequestDispatcher { + private String servletPath; + private Servlet servlet; + + /** + * Constructs a new request dispatcher. + * + * @param mapping + * @param servlet + */ + public NodeWebAppRequestDispatcher(String mapping, Servlet servlet) { + if (mapping.endsWith("*")) { + mapping = mapping.substring(0, mapping.length()-1); + } + if (mapping.endsWith("/")) { + mapping = mapping.substring(0, mapping.length()-1); + } + this.servletPath = mapping; + this.servlet = servlet; + } + + /** + * Returns a request wrapper which will return the correct Servlet path + * and path info. + * + * @param request + * @return + */ + private HttpServletRequest createRequestWrapper(ServletRequest request) { + HttpServletRequest requestWrapper = new HttpServletRequestWrapper((HttpServletRequest)request) { + + @Override + public String getServletPath() { + return servletPath; + } + + @Override + public String getPathInfo() { + String path = super.getServletPath(); + if (path.length() == 0) { + path = super.getPathInfo(); + } + + // TODO: another context path hack, revisit when context path is sorted out + path = fiddlePath(path, servletPath); + + return path; + } + }; + return requestWrapper; + } + + /** + * Remove any path suffix thats part of the Servlet context path. + * + * @param path + * @param servletPath + */ + private static String fiddlePath(String path, String servletPath) { + StringTokenizer st = new StringTokenizer(path, "/"); + String root = ""; + while (st.hasMoreTokens()){ + String s = st.nextToken(); + if (servletPath.endsWith((root + "/" + s))) { + root += "/" + s; + } else { + break; + } + } + String fiddlePath = path.substring(root.length()); + return fiddlePath; + } + + public void forward(ServletRequest request, ServletResponse response) throws ServletException, IOException { + servlet.service(createRequestWrapper(request), response); + } + + public void include(ServletRequest request, ServletResponse response) throws ServletException, IOException { + servlet.service(createRequestWrapper(request), response); + } +} diff --git a/java/sca/modules/implementation-node-osgi-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/osgi/webapp/NodeWebAppServletHost.java b/java/sca/modules/implementation-node-osgi-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/osgi/webapp/NodeWebAppServletHost.java new file mode 100644 index 0000000000..98b498638d --- /dev/null +++ b/java/sca/modules/implementation-node-osgi-runtime/src/main/java/org/apache/tuscany/sca/implementation/node/osgi/webapp/NodeWebAppServletHost.java @@ -0,0 +1,392 @@ +/* + * 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.implementation.node.osgi.webapp; + +import java.io.IOException; +import java.lang.reflect.Method; +import java.net.InetAddress; +import java.net.MalformedURLException; +import java.net.URI; +import java.net.URL; +import java.net.UnknownHostException; +import java.util.Enumeration; +import java.util.HashMap; +import java.util.Map; +import java.util.logging.Logger; + +import javax.servlet.Filter; +import javax.servlet.FilterConfig; +import javax.servlet.RequestDispatcher; +import javax.servlet.Servlet; +import javax.servlet.ServletConfig; +import javax.servlet.ServletContext; +import javax.servlet.ServletException; +import javax.servlet.ServletRequest; +import javax.servlet.ServletResponse; +import javax.servlet.http.HttpServletRequest; + +import org.apache.tuscany.sca.core.ExtensionPointRegistry; +import org.apache.tuscany.sca.host.http.ServletHost; +import org.apache.tuscany.sca.host.http.ServletHostExtensionPoint; +import org.apache.tuscany.sca.host.http.ServletMappingException; +import org.apache.tuscany.sca.implementation.node.osgi.launcher.NodeImplementationLauncherUtil; +import org.apache.tuscany.sca.node.SCAClient; +import org.apache.tuscany.sca.node.SCANode2; +import org.apache.tuscany.sca.node.SCANode2Factory; + +/** + * ServletHost implementation for use in a Webapp Node environment. + * + * @version $Rev$ $Date$ + */ +public class NodeWebAppServletHost implements ServletHost, Filter { + private static final Logger logger = Logger.getLogger(NodeWebAppServletHost.class.getName()); + + private static final NodeWebAppServletHost servletHost = new NodeWebAppServletHost(); + + private Map<String, Servlet> servlets = new HashMap<String, Servlet>(); + private SCANode2 node; + + private String contextPath = "/"; + private int defaultPort = 8080; + + /** + * Constructs a new NodeWebAppServletHost. + */ + private NodeWebAppServletHost() { + } + + /** + * Returns the Servlet host for the current Web app. + * + * @return + */ + public static NodeWebAppServletHost servletHost() { + return servletHost; + } + + /** + * Initialize the Servlet host. + * + * @param filterConfig + * @throws ServletException + */ + public void init(final FilterConfig filterConfig) throws ServletException { + + // Create a Servlet config wrapping the given filter config + ServletConfig servletConfig = servletConfig(filterConfig); + + // Get the Servlet context + ServletContext servletContext = servletConfig.getServletContext(); + + // Initialize the context path + contextPath = contextPath(servletContext); + + // Derive the node name from the Webapp context path + String nodeName = contextPath; + if (nodeName.startsWith("/")) { + nodeName = nodeName.substring(1); + } + if (nodeName.endsWith("/")) { + nodeName = nodeName.substring(0, nodeName.length() - 1); + } + + // Determine the node configuration URI + String nodeConfiguration = NodeImplementationLauncherUtil.nodeConfigurationURI(nodeName); + + // Create the SCA node + SCANode2Factory nodeFactory = SCANode2Factory.newInstance(); + node = nodeFactory.createSCANodeFromURL(nodeConfiguration); + + // Register the Servlet host + ServletHostExtensionPoint servletHosts = servletHosts(node); + servletHosts.getServletHosts().clear(); + servletHosts.addServletHost(servletHost); + + // Save the node in the Servlet context + servletContext.setAttribute(SCAClient.class.getName(), node); + + // Start the node + node.start(); + + // Initialize the registered Servlets + for (Servlet servlet : servlets.values()) { + servlet.init(servletConfig); + } + } + + public void addServletMapping(String suri, Servlet servlet) throws ServletMappingException { + URI pathURI = URI.create(suri); + + // Make sure that the path starts with a / + suri = pathURI.getPath(); + if (!suri.startsWith("/")) { + suri = '/' + suri; + } + + if (!suri.startsWith(contextPath)) { + suri = contextPath + suri; + } + + // In a webapp just use the given path and ignore the host and port + // as they are fixed by the Web container + servlets.put(suri, servlet); + + logger.info("Added Servlet mapping: " + suri); + } + + public Servlet removeServletMapping(String suri) throws ServletMappingException { + URI pathURI = URI.create(suri); + + // Make sure that the path starts with a / + suri = pathURI.getPath(); + if (!suri.startsWith("/")) { + suri = '/' + suri; + } + + if (!suri.startsWith(contextPath)) { + suri = contextPath + suri; + } + + // In a webapp just use the given path and ignore the host and port + // as they are fixed by the Web container + return servlets.remove(suri); + } + + public Servlet getServletMapping(String suri) throws ServletMappingException { + if (!suri.startsWith("/")) { + suri = '/' + suri; + } + + if (!suri.startsWith(contextPath)) { + suri = contextPath + suri; + } + + // Get the Servlet mapped to the given path + Servlet servlet = servlets.get(suri); + return servlet; + } + + public URL getURLMapping(String suri) throws ServletMappingException { + URI uri = URI.create(suri); + + // Get the URI scheme and port + String scheme = uri.getScheme(); + if (scheme == null) { + scheme = "http"; + } + int portNumber = uri.getPort(); + if (portNumber == -1) { + portNumber = defaultPort; + } + + // Get the host + String host; + try { + host = InetAddress.getLocalHost().getHostName(); + } catch (UnknownHostException e) { + host = "localhost"; + } + + // Construct the URL + String path = uri.getPath(); + if (!path.startsWith("/")) { + path = '/' + path; + } + + if (contextPath != null && !path.startsWith(contextPath)) { + path = contextPath + path; + } + + URL url; + try { + url = new URL(scheme, host, portNumber, path); + } catch (MalformedURLException e) { + throw new ServletMappingException(e); + } + return url; + } + + public RequestDispatcher getRequestDispatcher(String suri) throws ServletMappingException { + + // Make sure that the path starts with a / + if (!suri.startsWith("/")) { + suri = '/' + suri; + } + + suri = contextPath + suri; + + // Get the Servlet mapped to the given path + Servlet servlet = servlets.get(suri); + if (servlet != null) { + return new NodeWebAppRequestDispatcher(suri, servlet); + } + + for (Map.Entry<String, Servlet> entry : servlets.entrySet()) { + String servletPath = entry.getKey(); + if (servletPath.endsWith("*")) { + servletPath = servletPath.substring(0, servletPath.length() - 1); + if (suri.startsWith(servletPath)) { + return new NodeWebAppRequestDispatcher(entry.getKey(), entry.getValue()); + } else { + if ((suri + "/").startsWith(servletPath)) { + return new NodeWebAppRequestDispatcher(entry.getKey(), entry.getValue()); + } + } + } + } + + // No Servlet found + return null; + } + + /** + * Destroy the Servlet host. + * + * @throws ServletException + */ + public void destroy() { + + // Destroy the registered Servlets + for (Servlet servlet : servlets.values()) { + servlet.destroy(); + } + + // Stop the node + if (node != null) { + node.stop(); + } + } + + public void doFilter(ServletRequest request, ServletResponse response, javax.servlet.FilterChain chain) + throws IOException, ServletException { + + // Get the Servlet path + HttpServletRequest httpRequest = (HttpServletRequest)request; + String path = httpRequest.getPathInfo(); + if (path == null) { + path = httpRequest.getServletPath(); + } + if (path == null) { + path = "/"; + } + + // Get a request dispatcher for the Servlet mapped to that path + RequestDispatcher dispatcher = getRequestDispatcher(path); + if (dispatcher != null) { + + // Let the dispatcher forward the request to the Servlet + dispatcher.forward(request, response); + + } else { + + // Proceed down the filter chain + chain.doFilter(request, response); + } + } + + public void setDefaultPort(int port) { + defaultPort = port; + } + + public int getDefaultPort() { + return defaultPort; + } + + public String getContextPath() { + return contextPath; + } + + public void setContextPath(String path) { + //this.contextPath = path; + } + + /** + * Initializes the contextPath + * The 2.5 Servlet API has a getter for this, for pre 2.5 Servlet + * containers use an init parameter. + */ + private static String contextPath(ServletContext context) { + String contextPath = "/"; + + // The getContextPath() is introduced since Servlet 2.5 + Method m; + try { + // Try to get the method anyway since some ServletContext impl has this method even before 2.5 + m = context.getClass().getMethod("getContextPath", new Class[] {}); + contextPath = (String)m.invoke(context, new Object[] {}); + } catch (Exception e) { + contextPath = context.getInitParameter("contextPath"); + if (contextPath == null) { + logger.warning("Servlet level is: " + context.getMajorVersion() + "." + context.getMinorVersion()); + throw new IllegalStateException( + "'contextPath' init parameter must be set for pre-2.5 servlet container"); + } + } + + logger.info("ContextPath: " + contextPath); + return contextPath; + } + + /** + * Returns the Servlet host extension point used by the given node. + * + * @return + */ + private static ServletHostExtensionPoint servletHosts(SCANode2 node) { + //FIXME Need a clean way to get the extension point registry + // from the node + ExtensionPointRegistry registry; + try { + registry = (ExtensionPointRegistry)node.getClass().getMethod("getExtensionPointRegistry").invoke(node); + } catch (Exception e) { + throw new RuntimeException(e); + } + ServletHostExtensionPoint servletHosts = registry.getExtensionPoint(ServletHostExtensionPoint.class); + return servletHosts; + } + + /** + * Returns a Servlet config wrapping a filter config. + * + * @param filterConfig + * @return + */ + private static ServletConfig servletConfig(final FilterConfig filterConfig) { + ServletConfig servletConfig = new ServletConfig() { + public String getInitParameter(String name) { + return filterConfig.getInitParameter(name); + } + + public Enumeration getInitParameterNames() { + return filterConfig.getInitParameterNames(); + } + + public ServletContext getServletContext() { + return filterConfig.getServletContext(); + } + + public String getServletName() { + return filterConfig.getFilterName(); + } + }; + return servletConfig; + } +} diff --git a/java/sca/modules/implementation-node-osgi-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory b/java/sca/modules/implementation-node-osgi-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory new file mode 100644 index 0000000000..37af9b2fce --- /dev/null +++ b/java/sca/modules/implementation-node-osgi-runtime/src/main/resources/META-INF/services/org.apache.tuscany.sca.provider.ImplementationProviderFactory @@ -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.
+
+# Implementation class for the implementation extension
+org.apache.tuscany.sca.implementation.node.osgi.provider.NodeImplementationProviderFactory;model=org.apache.tuscany.sca.implementation.node.NodeImplementation
diff --git a/java/sca/modules/implementation-node-osgi-runtime/src/test/java/hello/HelloWorld.java b/java/sca/modules/implementation-node-osgi-runtime/src/test/java/hello/HelloWorld.java new file mode 100644 index 0000000000..2f519cb81d --- /dev/null +++ b/java/sca/modules/implementation-node-osgi-runtime/src/test/java/hello/HelloWorld.java @@ -0,0 +1,30 @@ +/* + * 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 hello; + +import org.osoa.sca.annotations.Remotable; + +/** + * HelloWorld interface + */ +@Remotable +public interface HelloWorld { + String hello(String name); +} diff --git a/java/sca/modules/implementation-node-osgi-runtime/src/test/java/hello/HelloWorldImpl.java b/java/sca/modules/implementation-node-osgi-runtime/src/test/java/hello/HelloWorldImpl.java new file mode 100644 index 0000000000..c9a7560b12 --- /dev/null +++ b/java/sca/modules/implementation-node-osgi-runtime/src/test/java/hello/HelloWorldImpl.java @@ -0,0 +1,30 @@ +/* + * 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 hello; + +/** + * HelloWorldImpl + */ +public class HelloWorldImpl implements HelloWorld { + public String hello(String name) { + System.out.println("Hello: " + name); + return "Hello, " + name; + } +} diff --git a/java/sca/modules/implementation-node-osgi-runtime/src/test/java/org/apache/tuscany/sca/implementation/node/osgi/LauncherBundleActivatorTestCase.java b/java/sca/modules/implementation-node-osgi-runtime/src/test/java/org/apache/tuscany/sca/implementation/node/osgi/LauncherBundleActivatorTestCase.java new file mode 100644 index 0000000000..eb6eac78dd --- /dev/null +++ b/java/sca/modules/implementation-node-osgi-runtime/src/test/java/org/apache/tuscany/sca/implementation/node/osgi/LauncherBundleActivatorTestCase.java @@ -0,0 +1,166 @@ +/* + * 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.implementation.node.osgi; + +import java.lang.reflect.Constructor; +import java.lang.reflect.Method; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import org.apache.felix.framework.Felix; +import org.apache.felix.framework.cache.BundleCache; +import org.apache.felix.framework.util.FelixConstants; +import org.apache.tuscany.sca.extensibility.ServiceDiscovery; +import org.apache.tuscany.sca.extensibility.osgi.OSGiServiceDiscoverer; +import org.apache.tuscany.sca.implementation.node.osgi.launcher.LauncherBundleActivator; +import org.apache.tuscany.sca.node.SCANode2Factory; +import org.junit.AfterClass; +import org.junit.BeforeClass; +import org.junit.Test; +import org.osgi.framework.Bundle; +import org.osgi.framework.BundleActivator; +import org.osgi.framework.BundleContext; +import org.osgi.framework.Constants; + +/** + * + */ +public class LauncherBundleActivatorTestCase { + private static Felix felix; + // private static OSGiServiceDiscoverer discoverer; + private static LauncherBundleActivator activator; + + 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, " + + "javax.xml.stream, " + + "javax.sql," + + "org.w3c.dom, " + + "org.xml.sax, " + + "org.xml.sax.ext, " + + "org.xml.sax.helpers, " + + "javax.security.auth, " + + "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.crypto, " + + "javax.rmi, " + + "javax.transaction, " + + "javax.transaction.xa"; + + /** + * @throws java.lang.Exception + */ + @BeforeClass + public static void setUpBeforeClass() throws Exception { + // Create a configuration property map. + Map<String, String> configMap = new HashMap<String, String>(); + // Configure the Felix instance to be embedded. + configMap.put(FelixConstants.EMBEDDED_EXECUTION_PROP, "true"); + // Add core OSGi packages to be exported from the class path + // via the system bundle. + configMap.put(Constants.FRAMEWORK_SYSTEMPACKAGES, systemPackages); + // Explicitly specify the directory to use for caching bundles. + configMap.put(BundleCache.CACHE_PROFILE_DIR_PROP, "target/.felix"); + List<BundleActivator> list = new ArrayList<BundleActivator>(); + + // Now create an instance of the framework with + // our configuration properties and activator. + felix = new Felix(configMap, list); + + // Now start Felix instance. + felix.start(); + BundleContext context = felix.getBundleContext(); +// discoverer = new OSGiServiceDiscoverer(context); +// ServiceDiscovery.setServiceDiscoverer(discoverer); + + System.setProperty("TUSCANY_HOME", "target"); + activator = new LauncherBundleActivator(); + activator.start(context); + } + + /** + * @throws java.lang.Exception + */ + @AfterClass + public static void tearDownAfterClass() throws Exception { + if (felix != null) { + // Uninstall the bundle to clean up the cache + activator.stop(felix.getBundleContext()); + felix.stop(); + } + } + + @Test + public void testLauncher() throws Exception { + String className = SCANode2Factory.class.getName(); + Map<String, Bundle> bundles = new HashMap<String, Bundle>(); + + for (Bundle b : felix.getBundleContext().getBundles()) { + bundles.put(b.getSymbolicName(), b); + // b.start(); + System.out.println(OSGiServiceDiscoverer.toString(b)); + } + Bundle b1 = bundles.get("org.apache.tuscany.sca.extensibility.osgi"); + Class<?> discovererClass = b1.loadClass(OSGiServiceDiscoverer.class.getName()); + Thread.currentThread().setContextClassLoader(discovererClass.getClassLoader()); + + Constructor<?> ctor = discovererClass.getConstructor(BundleContext.class); + Object discoverer = ctor.newInstance(felix.getBundleContext()); + + Class<?> serviceDiscoveryClass = b1.loadClass(ServiceDiscovery.class.getName()); + Method set = serviceDiscoveryClass.getMethod("setServiceDiscoverer", discovererClass.getInterfaces()[0]); + set.invoke(null, discoverer); + + Bundle b2 = bundles.get("org.apache.tuscany.sca.node2.api"); + // b2.start(); + Class<?> factory = b2.loadClass(className); + Method newInstance = factory.getMethod("newInstance"); + Object instance = newInstance.invoke(null); + Method create = instance.getClass().getMethod("createSCANodeFromClassLoader", String.class, ClassLoader.class); + Object node = create.invoke(instance, "HelloWorld.composite", getClass().getClassLoader()); + Method start = node.getClass().getMethod("start"); + start.invoke(node); + Method stop = node.getClass().getMethod("stop"); + stop.invoke(node); + + } + +} diff --git a/java/sca/modules/implementation-node-osgi-runtime/src/test/java/org/apache/tuscany/sca/implementation/node/osgi/NodeImplementationTestCase.java b/java/sca/modules/implementation-node-osgi-runtime/src/test/java/org/apache/tuscany/sca/implementation/node/osgi/NodeImplementationTestCase.java new file mode 100644 index 0000000000..bf6d660c09 --- /dev/null +++ b/java/sca/modules/implementation-node-osgi-runtime/src/test/java/org/apache/tuscany/sca/implementation/node/osgi/NodeImplementationTestCase.java @@ -0,0 +1,51 @@ +/* + * 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.implementation.node.osgi; + +import junit.framework.TestCase; + +import org.apache.tuscany.sca.node.SCANode2; +import org.apache.tuscany.sca.node.SCANode2Factory; + +/** + * Test case for node component implementations. + * + * @version $Rev$ $Date$ + */ +public class NodeImplementationTestCase extends TestCase { + + private SCANode2 node; + + @Override + protected void setUp() throws Exception { + node = SCANode2Factory.newInstance().createSCANodeFromClassLoader("TestNode.composite", null); + node.start(); + } + + @Override + protected void tearDown() throws Exception { + if (node != null) { + node.stop(); + } + } + + public void testNode() { + } + +} diff --git a/java/sca/modules/implementation-node-osgi-runtime/src/test/resources/HelloWorld.composite b/java/sca/modules/implementation-node-osgi-runtime/src/test/resources/HelloWorld.composite new file mode 100644 index 0000000000..9e3299d691 --- /dev/null +++ b/java/sca/modules/implementation-node-osgi-runtime/src/test/resources/HelloWorld.composite @@ -0,0 +1,30 @@ +<?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.
+-->
+<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+ xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
+ targetNamespace="http://sample/composite"
+ xmlns:sc="http://sample/composite"
+ name="HelloWorld">
+
+ <component name="HelloWorld">
+ <implementation.java class="hello.HelloWorldImpl"/>
+ </component>
+
+</composite>
diff --git a/java/sca/modules/implementation-node-osgi-runtime/src/test/resources/TestComposite.composite b/java/sca/modules/implementation-node-osgi-runtime/src/test/resources/TestComposite.composite new file mode 100644 index 0000000000..294728b959 --- /dev/null +++ b/java/sca/modules/implementation-node-osgi-runtime/src/test/resources/TestComposite.composite @@ -0,0 +1,29 @@ +<?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.
+-->
+<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+ xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
+ targetNamespace="http://sample/composite"
+ xmlns:sc="http://sample/composite"
+ name="TestComposite">
+
+ <component name="TestComponent">
+ </component>
+
+</composite>
diff --git a/java/sca/modules/implementation-node-osgi-runtime/src/test/resources/TestNode.composite b/java/sca/modules/implementation-node-osgi-runtime/src/test/resources/TestNode.composite new file mode 100644 index 0000000000..a628df6e67 --- /dev/null +++ b/java/sca/modules/implementation-node-osgi-runtime/src/test/resources/TestNode.composite @@ -0,0 +1,30 @@ +<?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.
+-->
+<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
+ xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
+ targetNamespace="http://sample/node"
+ xmlns:sc="http://sample/composite"
+ name="TestNode">
+
+ <component name="TestNode">
+ <tuscany:implementation.node uri="TestNode" composite="sc:TestComposite"/>
+ </component>
+
+</composite>
diff --git a/java/sca/modules/pom.xml b/java/sca/modules/pom.xml index ccafed82dd..d82d2e6881 100644 --- a/java/sca/modules/pom.xml +++ b/java/sca/modules/pom.xml @@ -136,6 +136,7 @@ <module>implementation-java-runtime</module> <module>implementation-node</module> <module>implementation-node-runtime</module> + <module>implementation-node-osgi-runtime</module> <module>implementation-notification</module> <module>implementation-osgi</module> <module>implementation-resource</module> |