tuscany-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rf...@apache.org
Subject svn commit: r681580 [1/2] - in /tuscany/java/sca/modules/node2-launcher-osgi: ./ src/ src/main/ src/main/java/ src/main/java/org/ src/main/java/org/apache/ src/main/java/org/apache/tuscany/ src/main/java/org/apache/tuscany/sca/ src/main/java/org/apache...
Date Fri, 01 Aug 2008 01:42:30 GMT
Author: rfeng
Date: Thu Jul 31 18:42:29 2008
New Revision: 681580

URL: http://svn.apache.org/viewvc?rev=681580&view=rev
Log:
Replace implementation-node-osgi-runtime with node2-launcher-osgi

Added:
    tuscany/java/sca/modules/node2-launcher-osgi/   (with props)
    tuscany/java/sca/modules/node2-launcher-osgi/LICENSE
    tuscany/java/sca/modules/node2-launcher-osgi/NOTICE
    tuscany/java/sca/modules/node2-launcher-osgi/pom.xml   (with props)
    tuscany/java/sca/modules/node2-launcher-osgi/src/
    tuscany/java/sca/modules/node2-launcher-osgi/src/main/
    tuscany/java/sca/modules/node2-launcher-osgi/src/main/java/
    tuscany/java/sca/modules/node2-launcher-osgi/src/main/java/org/
    tuscany/java/sca/modules/node2-launcher-osgi/src/main/java/org/apache/
    tuscany/java/sca/modules/node2-launcher-osgi/src/main/java/org/apache/tuscany/
    tuscany/java/sca/modules/node2-launcher-osgi/src/main/java/org/apache/tuscany/sca/
    tuscany/java/sca/modules/node2-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/
    tuscany/java/sca/modules/node2-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/
    tuscany/java/sca/modules/node2-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/
    tuscany/java/sca/modules/node2-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/Contribution.java   (with props)
    tuscany/java/sca/modules/node2-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/DomainManagerLauncher.java   (with props)
    tuscany/java/sca/modules/node2-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/FelixOSGiHost.java   (with props)
    tuscany/java/sca/modules/node2-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/JarFileFinder.java   (with props)
    tuscany/java/sca/modules/node2-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/LauncherBundleActivator.java   (with props)
    tuscany/java/sca/modules/node2-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/LauncherException.java   (with props)
    tuscany/java/sca/modules/node2-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/NodeDaemonLauncher.java   (with props)
    tuscany/java/sca/modules/node2-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/NodeLauncher.java   (with props)
    tuscany/java/sca/modules/node2-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/NodeLauncherUtil.java   (with props)
    tuscany/java/sca/modules/node2-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/NodeMain.java   (with props)
    tuscany/java/sca/modules/node2-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/NodeServletFilter.java   (with props)
    tuscany/java/sca/modules/node2-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/OSGiHost.java   (with props)
    tuscany/java/sca/modules/node2-launcher-osgi/src/test/
    tuscany/java/sca/modules/node2-launcher-osgi/src/test/java/
    tuscany/java/sca/modules/node2-launcher-osgi/src/test/java/hello/
    tuscany/java/sca/modules/node2-launcher-osgi/src/test/java/hello/HelloWorld.java   (with props)
    tuscany/java/sca/modules/node2-launcher-osgi/src/test/java/hello/HelloWorldImpl.java   (with props)
    tuscany/java/sca/modules/node2-launcher-osgi/src/test/java/org/
    tuscany/java/sca/modules/node2-launcher-osgi/src/test/java/org/apache/
    tuscany/java/sca/modules/node2-launcher-osgi/src/test/java/org/apache/tuscany/
    tuscany/java/sca/modules/node2-launcher-osgi/src/test/java/org/apache/tuscany/sca/
    tuscany/java/sca/modules/node2-launcher-osgi/src/test/java/org/apache/tuscany/sca/node/
    tuscany/java/sca/modules/node2-launcher-osgi/src/test/java/org/apache/tuscany/sca/node/osgi/
    tuscany/java/sca/modules/node2-launcher-osgi/src/test/java/org/apache/tuscany/sca/node/osgi/launcher/
    tuscany/java/sca/modules/node2-launcher-osgi/src/test/java/org/apache/tuscany/sca/node/osgi/launcher/FelixOSGiHostTestCase.java   (with props)
    tuscany/java/sca/modules/node2-launcher-osgi/src/test/java/org/apache/tuscany/sca/node/osgi/launcher/NodeLauncherTestCase.java   (with props)
    tuscany/java/sca/modules/node2-launcher-osgi/src/test/resources/
    tuscany/java/sca/modules/node2-launcher-osgi/src/test/resources/HelloWorld.composite

Propchange: tuscany/java/sca/modules/node2-launcher-osgi/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Jul 31 18:42:29 2008
@@ -0,0 +1,17 @@
+target
+work
+dojo
+*.iws
+*.ipr
+*.iml
+.project
+.classpath
+maven.log
+velocity.log*
+junit*.properties
+surefire*.properties
+.settings
+.deployables
+.wtpmodules
+.externalToolBuilders
+maven-eclipse.xml

Added: tuscany/java/sca/modules/node2-launcher-osgi/LICENSE
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/node2-launcher-osgi/LICENSE?rev=681580&view=auto
==============================================================================
--- tuscany/java/sca/modules/node2-launcher-osgi/LICENSE (added)
+++ tuscany/java/sca/modules/node2-launcher-osgi/LICENSE Thu Jul 31 18:42:29 2008
@@ -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.
+
+
+

Added: tuscany/java/sca/modules/node2-launcher-osgi/NOTICE
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/node2-launcher-osgi/NOTICE?rev=681580&view=auto
==============================================================================
--- tuscany/java/sca/modules/node2-launcher-osgi/NOTICE (added)
+++ tuscany/java/sca/modules/node2-launcher-osgi/NOTICE Thu Jul 31 18:42:29 2008
@@ -0,0 +1,6 @@
+${pom.name}
+Copyright (c) 2005 - 2008 The Apache Software Foundation
+
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).
+

Added: tuscany/java/sca/modules/node2-launcher-osgi/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/node2-launcher-osgi/pom.xml?rev=681580&view=auto
==============================================================================
--- tuscany/java/sca/modules/node2-launcher-osgi/pom.xml (added)
+++ tuscany/java/sca/modules/node2-launcher-osgi/pom.xml Thu Jul 31 18:42:29 2008
@@ -0,0 +1,150 @@
+<?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-node2-osgi-launcher</artifactId>
+    <name>Apache Tuscany SCA Node OSGi Launcher</name>
+
+    <dependencies>   
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>servlet-api</artifactId>
+            <version>2.5</version> <!-- To be compatible with Jetty 6 --> 
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.felix</groupId>
+            <artifactId>org.osgi.core</artifactId>
+            <version>1.0.1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.felix</groupId>
+            <artifactId>org.apache.felix.framework</artifactId>
+            <version>1.0.4</version>
+            <scope>compile</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-runtime</artifactId>
+            <version>1.4-SNAPSHOT</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-extensibility-osgi</artifactId>
+            <version>1.4-SNAPSHOT</version>
+            <scope>test</scope>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-contribution-osgi</artifactId>
+            <version>1.4-SNAPSHOT</version>
+            <scope>test</scope>
+        </dependency>        
+        
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-domain-manager</artifactId>
+            <version>1.4-SNAPSHOT</version>
+            <scope>test</scope>
+        </dependency>        
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-http-runtime</artifactId>
+            <version>1.4-SNAPSHOT</version>
+            <scope>test</scope>
+        </dependency>        
+                
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-java-runtime</artifactId>
+            <version>1.4-SNAPSHOT</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}/tuscany/modules</outputDirectory>
+                            <excludeArtifactIds></excludeArtifactIds>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>        
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <configuration>
+                    <archive>
+                        <manifest>
+                            <mainClass>org.apache.tuscany.sca.node.osgi.launcher.NodeMain</mainClass>
+                        </manifest>
+                    </archive>
+                </configuration>
+            </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.node2.launcher.osgi</Bundle-SymbolicName>
+                        <Bundle-Description>${pom.name}</Bundle-Description>
+                        <Export-Package>org.apache.tuscany.sca.node.osgi.launcher*</Export-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
+ -->            
+        </plugins>
+    </build>
+
+</project>

Propchange: tuscany/java/sca/modules/node2-launcher-osgi/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: tuscany/java/sca/modules/node2-launcher-osgi/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: tuscany/java/sca/modules/node2-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/Contribution.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/node2-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/Contribution.java?rev=681580&view=auto
==============================================================================
--- tuscany/java/sca/modules/node2-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/Contribution.java (added)
+++ tuscany/java/sca/modules/node2-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/Contribution.java Thu Jul 31 18:42:29 2008
@@ -0,0 +1,48 @@
+/*
+ * 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.node.osgi.launcher;
+
+/**
+ * Represents an SCA contribution uri + location.
+ *
+ * @version $Rev$ $Date$
+ */
+public final class Contribution {
+    private String uri;
+    private String location;
+    
+    /**
+     * Constructs a new SCA contribution.
+     * 
+     * @param uri
+     * @param location
+     */
+    public Contribution(String uri, String location) {
+        this.uri = uri;
+        this.location = location;
+    }
+    
+    public String getURI() {
+        return uri;
+    }
+    
+    public String getLocation() {
+        return location;
+    }
+}
\ No newline at end of file

Propchange: tuscany/java/sca/modules/node2-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/Contribution.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: tuscany/java/sca/modules/node2-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/Contribution.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: tuscany/java/sca/modules/node2-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/DomainManagerLauncher.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/node2-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/DomainManagerLauncher.java?rev=681580&view=auto
==============================================================================
--- tuscany/java/sca/modules/node2-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/DomainManagerLauncher.java (added)
+++ tuscany/java/sca/modules/node2-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/DomainManagerLauncher.java Thu Jul 31 18:42:29 2008
@@ -0,0 +1,103 @@
+/*
+ * 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.node.osgi.launcher;
+
+import static org.apache.tuscany.sca.node.osgi.launcher.NodeLauncherUtil.domainManager;
+
+import java.io.IOException;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+/**
+ * Simple launcher for the SCA domain manager. 
+ *
+ * @version $Rev$ $Date$
+ */
+public class DomainManagerLauncher {
+    
+    private static final Logger logger = Logger.getLogger(DomainManagerLauncher.class.getName());    
+
+    /**
+     * Constructs a new DomainManagerLauncher.
+     */
+    private DomainManagerLauncher() {
+    }
+    
+    /**
+     * Returns a new launcher instance.
+     *  
+     * @return a new launcher instance
+     */
+    public static DomainManagerLauncher newInstance() {
+        return new DomainManagerLauncher();
+    }
+
+    /**
+     * Creates a new DomainManager.
+     * 
+     * @return a new DomainManager
+     * @throws LauncherException
+     */
+    public <T> T createDomainManager() throws LauncherException {
+        return (T)domainManager(".");
+    }
+    
+    /**
+     * Creates a new DomainManager.
+     * 
+     * @param rootDirectory the domain's root configuration directory 
+     * 
+     * @return a new DomainManager
+     * @throws LauncherException
+     */
+    public <T> T createDomainManager(String rootDirectory) throws LauncherException {
+        return (T)domainManager(rootDirectory);
+    }
+    
+    public static void main(String[] args) throws Exception {
+        logger.info("Apache Tuscany SCA Domain Manager starting...");
+
+        // Create a domain manager
+        DomainManagerLauncher launcher = newInstance();
+        Object domainManager = launcher.createDomainManager();
+        
+        // Start the domain manager
+        try {
+            domainManager.getClass().getMethod("start").invoke(domainManager);
+        } catch (Exception e) {
+            logger.log(Level.SEVERE, "SCA Domain Manager could not be started", e);
+            throw e;
+        }
+        logger.info("SCA Domain Manager started.");
+        
+        logger.info("Press enter to shutdown.");
+        try {
+            System.in.read();
+        } catch (IOException e) {}
+
+        // Stop the domain manager
+        try {
+            domainManager.getClass().getMethod("stop").invoke(domainManager);
+        } catch (Exception e) {
+            logger.log(Level.SEVERE, "SCA Domain Manager could not be stopped", e);
+            throw e;
+        }
+    }
+}

Propchange: tuscany/java/sca/modules/node2-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/DomainManagerLauncher.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: tuscany/java/sca/modules/node2-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/DomainManagerLauncher.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: tuscany/java/sca/modules/node2-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/FelixOSGiHost.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/node2-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/FelixOSGiHost.java?rev=681580&view=auto
==============================================================================
--- tuscany/java/sca/modules/node2-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/FelixOSGiHost.java (added)
+++ tuscany/java/sca/modules/node2-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/FelixOSGiHost.java Thu Jul 31 18:42:29 2008
@@ -0,0 +1,160 @@
+/*
+ * 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.node.osgi.launcher;
+
+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.osgi.framework.Bundle;
+import org.osgi.framework.BundleActivator;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.BundleException;
+import org.osgi.framework.Constants;
+
+/**
+ * 
+ */
+public class FelixOSGiHost implements OSGiHost {
+
+    private Felix felix;
+    private ClassLoader tccl;
+
+    private final static String systemPackages =
+        "org.osgi.framework; version=1.3.0," + "org.osgi.service.packageadmin; version=1.2.0, "
+            + "org.osgi.service.startlevel; version=1.0.0, "
+            + "org.osgi.service.url; version=1.0.0, "
+            + "org.osgi.util.tracker; version=1.3.2, "
+            + "javax.xml, "
+            + "javax.xml.datatype, "
+            + "javax.xml.namespace, "
+            + "javax.xml.parsers, "
+            + "javax.xml.transform, "
+            + "javax.xml.transform.dom, "
+            + "javax.xml.transform.sax, "
+            + "javax.xml.transform.stream, "
+            + "javax.xml.validation, "
+            + "javax.xml.xpath, "
+            // Force the classes to be imported from the system bundle
+            + "javax.xml.stream, "
+            + "javax.xml.stream.util, "
+            + "javax.sql,"
+            + "org.w3c.dom, "
+            + "org.xml.sax, "
+            + "org.xml.sax.ext, "
+            + "org.xml.sax.helpers, "
+            + "javax.security.auth, "
+            + "javax.security.cert, "
+            + "javax.security.auth.login, "
+            + "javax.security.auth.callback, "
+            + "javax.naming, "
+            + "javax.naming.spi, "
+            + "javax.naming.directory, "
+            + "javax.management, "
+            + "javax.imageio, "
+            + "sun.misc, "
+            + "javax.net, "
+            + "javax.net.ssl, "
+            + "javax.crypto, "
+            + "javax.rmi, "
+            + "javax.transaction, "
+            + "javax.transaction.xa";
+
+    public BundleContext start() {
+        try {
+            startup();
+        } catch (Exception e) {
+            throw new IllegalStateException(e);
+        }
+        BundleContext bundleContext = felix.getBundleContext();
+        return bundleContext;
+    }
+
+    public void stop() {
+        try {
+            shutdown();
+        } catch (Exception e) {
+            throw new IllegalStateException(e);
+        }
+    }
+
+    private void startup() throws BundleException {
+        if (felix != null) {
+            throw new IllegalStateException("Felix is already running.");
+        }
+
+        // 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>();
+
+        list.add(new LauncherBundleActivator());
+
+        // Now create an instance of the framework with
+        // our configuration properties and activator.
+        felix = new Felix(configMap, list);
+
+        // Now start Felix instance.
+        felix.start();
+
+        tccl = Thread.currentThread().getContextClassLoader();
+        Thread.currentThread().setContextClassLoader(getContextClassLoader(felix.getBundleContext()));
+
+    }
+
+    private ClassLoader getContextClassLoader(BundleContext bundleContext) {
+        for (Bundle b : bundleContext.getBundles()) {
+            if ("org.apache.tuscany.sca.extensibility.osgi".equals(b.getSymbolicName())) {
+                try {
+                    b.start();
+                    Class<?> discovererClass = b.loadClass("org.apache.tuscany.sca.extensibility.ServiceDiscovery");
+                    Method getter = discovererClass.getMethod("getServiceDiscoverer");
+                    Object discoverer = getter.invoke(null);
+
+                    Method getCL = discoverer.getClass().getMethod("getClassLoader");
+                    ClassLoader cl = (ClassLoader)getCL.invoke(discoverer);
+                    return cl;
+                } catch (Exception e) {
+                    throw new IllegalStateException(e);
+                }
+            }
+        }
+        return null;
+    }
+
+    private void shutdown() throws BundleException {
+        if (felix != null) {
+            felix.stop();
+        }
+        Thread.currentThread().setContextClassLoader(tccl);
+    }
+
+}

Propchange: tuscany/java/sca/modules/node2-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/FelixOSGiHost.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: tuscany/java/sca/modules/node2-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/FelixOSGiHost.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: tuscany/java/sca/modules/node2-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/JarFileFinder.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/node2-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/JarFileFinder.java?rev=681580&view=auto
==============================================================================
--- tuscany/java/sca/modules/node2-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/JarFileFinder.java (added)
+++ tuscany/java/sca/modules/node2-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/JarFileFinder.java Thu Jul 31 18:42:29 2008
@@ -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.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;
+    }
+
+}

Propchange: tuscany/java/sca/modules/node2-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/JarFileFinder.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: tuscany/java/sca/modules/node2-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/JarFileFinder.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: tuscany/java/sca/modules/node2-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/LauncherBundleActivator.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/node2-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/LauncherBundleActivator.java?rev=681580&view=auto
==============================================================================
--- tuscany/java/sca/modules/node2-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/LauncherBundleActivator.java (added)
+++ tuscany/java/sca/modules/node2-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/LauncherBundleActivator.java Thu Jul 31 18:42:29 2008
@@ -0,0 +1,435 @@
+package org.apache.tuscany.sca.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.BundleEvent;
+import org.osgi.framework.BundleListener;
+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, BundleListener {
+    private static Logger logger = Logger.getLogger(LauncherBundleActivator.class.getName());
+    private static final String[] immutableJars = {"bcprov"};
+
+    private BundleContext bundleContext;
+    private List<Bundle> tuscanyBundles = new ArrayList<Bundle>();
+
+    public static String toString(Bundle b, boolean verbose) {
+        StringBuffer sb = new StringBuffer();
+        sb.append(b.getBundleId()).append(" ").append(b.getSymbolicName());
+        int s = b.getState();
+        if ((s & Bundle.UNINSTALLED) != 0) {
+            sb.append(" UNINSTALLED");
+        }
+        if ((s & Bundle.INSTALLED) != 0) {
+            sb.append(" INSTALLED");
+        }
+        if ((s & Bundle.RESOLVED) != 0) {
+            sb.append(" RESOLVED");
+        }
+        if ((s & Bundle.STARTING) != 0) {
+            sb.append(" STARTING");
+        }
+        if ((s & Bundle.STOPPING) != 0) {
+            sb.append(" STOPPING");
+        }
+        if ((s & Bundle.ACTIVE) != 0) {
+            sb.append(" ACTIVE");
+        }
+
+        if (verbose) {
+            sb.append(" ").append(b.getLocation());
+            sb.append(" ").append(b.getHeaders());
+        }
+        return sb.toString();
+    }
+
+    public void start(BundleContext bundleContext) throws Exception {
+        this.bundleContext = bundleContext;
+        this.bundleContext.addBundleListener(this);
+        installTuscany(bundleContext);
+
+        for (Bundle b : bundleContext.getBundles()) {
+            try {
+                if ("org.apache.tuscany.sca.contribution.osgi".equals(b.getSymbolicName())) {
+                    b.start();
+                    logger.info(toString(b, false) + " " + b.getState());
+                    break;
+                }
+            } catch (Exception e) {
+                logger.log(Level.SEVERE, e.getMessage(), e);
+            }
+        }
+    }
+
+    public void stop(BundleContext bundleContext) throws Exception {
+        /*
+        for (Bundle bundle : tuscanyBundles) {
+            try {
+                bundle.stop();
+            } catch (Exception e) {
+                logger.log(Level.SEVERE, e.getMessage(), e);
+            }
+        }
+        */
+
+        for (Bundle bundle : tuscanyBundles) {
+            try {
+                logger.info("Uninstalling bundle: " + toString(bundle, false));
+                bundle.uninstall();
+            } catch (Exception e) {
+                logger.log(Level.SEVERE, e.getMessage(), e);
+            }
+        }
+        this.bundleContext.removeBundleListener(this);
+        tuscanyBundles.clear();
+        this.bundleContext = null;
+    }
+
+    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);
+                } 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();
+
+        Manifest manifest = readManifest(bundleFile);
+        boolean isOSGiBundle = manifest != null && manifest.getMainAttributes().getValue(BUNDLE_SYMBOLICNAME) != null;
+
+        if (!isOSGiBundle) {
+            manifest = updateBundleManifest(bundleFile, manifest);
+        }
+
+        String symbolicName = manifest.getMainAttributes().getValue(BUNDLE_SYMBOLICNAME);
+        String version = manifest.getMainAttributes().getValue(BUNDLE_VERSION);
+        Bundle bundle = findBundle(bundleContext, symbolicName, version);
+        if (bundle != null) {
+            logger.info("Bundle is already installed: " + symbolicName);
+            return bundle;
+        }
+
+        String bundleLocation = bundleFile.toURI().toString();
+        InputStream inStream = null;
+        if (!isOSGiBundle) {
+            // 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 = bundleContext.installBundle(bundleLocation, inStream);
+            logger.info("Bundle installed in " + (System.currentTimeMillis() - start) + " ms: " + bundleLocation);
+            tuscanyBundles.add(bundle);
+            return bundle;
+        } finally {
+            inStream.close();
+        }
+
+    }
+
+    private Bundle findBundle(BundleContext bundleContext, String symbolicName, String version) {
+        Bundle[] bundles = bundleContext.getBundles();
+        if (version == null) {
+            version = "0.0.0";
+        }
+        for (Bundle b : bundles) {
+            String v = (String)b.getHeaders().get(BUNDLE_VERSION);
+            if (v == null) {
+                v = "0.0.0";
+            }
+            if (b.getSymbolicName().equals(symbolicName) && (version.equals("0.0.0") || v.equals(version))) {
+                return b;
+            }
+        }
+        return null;
+    }
+
+    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 readManifest(File jarFile) throws IOException {
+        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();
+        }
+        return manifest;
+    }
+
+    private Manifest updateBundleManifest(File jarFile, Manifest manifest) throws Exception {
+
+        if (!jarFile.exists()) {
+            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);
+        }
+
+        JarInputStream 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;
+    }
+
+    public BundleContext getBundleContext() {
+        return bundleContext;
+    }
+
+    public void bundleChanged(BundleEvent event) {
+    }
+
+}

Propchange: tuscany/java/sca/modules/node2-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/LauncherBundleActivator.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: tuscany/java/sca/modules/node2-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/LauncherBundleActivator.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: tuscany/java/sca/modules/node2-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/LauncherException.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/node2-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/LauncherException.java?rev=681580&view=auto
==============================================================================
--- tuscany/java/sca/modules/node2-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/LauncherException.java (added)
+++ tuscany/java/sca/modules/node2-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/LauncherException.java Thu Jul 31 18:42:29 2008
@@ -0,0 +1,55 @@
+/*
+ * 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.node.osgi.launcher;
+
+
+/**
+ * Denotes an error launching an SCA domain manager or node.
+ *
+ * @version $Rev$ $Date$
+ */
+public class LauncherException extends Exception {
+    private static final long serialVersionUID = 4581189418849190567L;
+
+    public LauncherException() {
+        super();
+    }
+
+    /**
+     * @param message
+     * @param cause
+     */
+    public LauncherException(String message, Throwable cause) {
+        super(message, cause);
+    }
+
+    /**
+     * @param message
+     */
+    public LauncherException(String message) {
+        super(message);
+    }
+
+    /**
+     * @param cause
+     */
+    public LauncherException(Throwable cause) {
+        super(cause);
+    }
+}

Propchange: tuscany/java/sca/modules/node2-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/LauncherException.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: tuscany/java/sca/modules/node2-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/LauncherException.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: tuscany/java/sca/modules/node2-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/NodeDaemonLauncher.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/node2-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/NodeDaemonLauncher.java?rev=681580&view=auto
==============================================================================
--- tuscany/java/sca/modules/node2-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/NodeDaemonLauncher.java (added)
+++ tuscany/java/sca/modules/node2-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/NodeDaemonLauncher.java Thu Jul 31 18:42:29 2008
@@ -0,0 +1,100 @@
+/*
+ * 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.node.osgi.launcher;
+
+import static org.apache.tuscany.sca.node.osgi.launcher.NodeLauncherUtil.nodeDaemon;
+
+import java.io.IOException;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+/**
+ * A launcher for the SCA Node daemon.
+ *  
+ * @version $Rev$ $Date$
+ */
+public class NodeDaemonLauncher {
+
+    private static final Logger logger = Logger.getLogger(NodeDaemonLauncher.class.getName());
+
+    /**
+     * Constructs a new node daemon launcher.
+     */
+    private NodeDaemonLauncher() {
+    }
+
+    /**
+     * Returns a new launcher instance.
+     *  
+     * @return a new launcher instance
+     */
+    public static NodeDaemonLauncher newInstance() {
+        return new NodeDaemonLauncher();
+    }
+
+    /**
+     * Creates a new node daemon.
+     * 
+     * @param
+     * @return a new node daemon
+     * @throws LauncherException
+     */
+    public <T> T createNodeDaemon() throws LauncherException {
+        return (T)nodeDaemon();
+    }
+
+    public static void main(String[] args) throws Exception {
+        logger.info("Apache Tuscany SCA Node Daemon starting...");
+
+        // Create a node daemon
+        NodeDaemonLauncher launcher = newInstance();
+        OSGiHost host = NodeLauncherUtil.startOSGi();
+
+        try {
+            Object daemon = launcher.createNodeDaemon();
+
+            // Start the node daemon
+            try {
+                daemon.getClass().getMethod("start").invoke(daemon);
+            } catch (Exception e) {
+                logger.log(Level.SEVERE, "SCA Node Daemon could not be started", e);
+                throw e;
+            }
+            logger.info("SCA Node Daemon started.");
+
+            logger.info("Press enter to shutdown.");
+            try {
+                System.in.read();
+            } catch (IOException e) {
+            }
+
+            // Stop the node daemon
+            try {
+                daemon.getClass().getMethod("stop").invoke(daemon);
+            } catch (Exception e) {
+                logger.log(Level.SEVERE, "SCA Node Daemon could not be stopped", e);
+                throw e;
+            }
+        } finally {
+            NodeLauncherUtil.stopOSGi(host);
+        }
+    }
+
+}

Propchange: tuscany/java/sca/modules/node2-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/NodeDaemonLauncher.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: tuscany/java/sca/modules/node2-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/NodeDaemonLauncher.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Added: tuscany/java/sca/modules/node2-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/NodeLauncher.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/node2-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/NodeLauncher.java?rev=681580&view=auto
==============================================================================
--- tuscany/java/sca/modules/node2-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/NodeLauncher.java (added)
+++ tuscany/java/sca/modules/node2-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/NodeLauncher.java Thu Jul 31 18:42:29 2008
@@ -0,0 +1,143 @@
+/*
+ * 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.node.osgi.launcher;
+
+import static org.apache.tuscany.sca.node.osgi.launcher.NodeLauncherUtil.node;
+
+import java.io.IOException;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+/**
+ * A launcher for SCA nodes.
+ *  
+ * @version $Rev$ $Date$
+ */
+public class NodeLauncher {
+
+    static final Logger logger = Logger.getLogger(NodeLauncher.class.getName());
+
+    /**
+     * Constructs a new node launcher.
+     */
+    private NodeLauncher() {
+    }
+    
+    /**
+     * Returns a new launcher instance.
+     *  
+     * @return a new launcher instance
+     */
+    public static NodeLauncher newInstance() {
+        return new NodeLauncher();
+    }
+
+    /**
+     * Creates a new SCA node from the configuration URL
+     * 
+     * @param configurationURL the URL of the node configuration which is the ATOM feed
+     * that contains the URI of the composite and a collection of URLs for the contributions
+     *  
+     * @return a new SCA node.
+     * @throws LauncherException
+     */
+    public <T> T createNodeFromURL(String configurationURL) throws LauncherException {
+        return (T)node(configurationURL, null, null, null, null);
+    }
+    
+    /**
+     * Creates a new SCA Node.
+     * 
+     * @param compositeURI the URI of the composite to use 
+     * @param contributions the URI of the contributions that provides the composites and related 
+     * artifacts. If the list is empty, then we will use the thread context classloader to discover
+     * the contribution on the classpath
+     *   
+     * @return a new SCA node.
+     * @throws LauncherException
+     */
+    public <T> T createNode(String compositeURI, Contribution...contributions) throws LauncherException {
+        return (T)node(null, compositeURI, null, contributions, null);
+    }
+    
+    /**
+     * Creates a new SCA Node.
+     * 
+     * @param compositeURI the URI of the composite to use 
+     * @param compositeContent the XML content of the composite to use 
+     * @param contributions the URI of the contributions that provides the composites and related artifacts 
+     * @return a new SCA node.
+     * @throws LauncherException
+     */
+    public <T> T createNode(String compositeURI, String compositeContent, Contribution...contributions) throws LauncherException {
+        return (T)node(null, compositeURI, compositeContent, contributions, null);
+    }
+    
+    /**
+     * Create a SCA node based on the discovery of the contribution on the classpath for the 
+     * given classloader. This method should be treated a convenient shortcut with the following
+     * assumptions:
+     * <ul>
+     * <li>This is a standalone application and there is a deployable composite file on the classpath.
+     * <li>There is only one contribution which contains the deployable composite file physically in its packaging hierarchy.
+     * </ul> 
+     * 
+     * @param compositeURI The URI of the composite file relative to the root of the enclosing contribution
+     * @param classLoader The ClassLoader used to load the composite file as a resource. If the value is null,
+     * then thread context classloader will be used
+     * @return A newly created SCA node
+     */
+    public <T> T createNodeFromClassLoader(String compositeURI, ClassLoader classLoader) throws LauncherException {
+        return (T)node(null, compositeURI, null, null, classLoader);
+    }
+    
+    public static void main(String[] args) throws Exception {
+        logger.info("Apache Tuscany SCA Node starting...");
+
+        // Create a node
+        NodeLauncher launcher = newInstance();
+        String configurationURI = args[0];
+        logger.info("SCA Node configuration: " + configurationURI);
+        Object node = launcher.createNodeFromURL(configurationURI);
+        
+        // Start the node
+        try {
+            node.getClass().getMethod("start").invoke(node);
+        } catch (Exception e) {
+            logger.log(Level.SEVERE, "SCA Node could not be started", e);
+            throw e;
+        }
+        logger.info("SCA Node started.");
+        
+        logger.info("Press enter to shutdown.");
+        try {
+            System.in.read();
+        } catch (IOException e) {}
+
+        // Stop the node
+        try {
+            node.getClass().getMethod("stop").invoke(node);
+        } catch (Exception e) {
+            logger.log(Level.SEVERE, "SCA Node could not be stopped", e);
+            throw e;
+        }
+    }
+
+}

Propchange: tuscany/java/sca/modules/node2-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/NodeLauncher.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: tuscany/java/sca/modules/node2-launcher-osgi/src/main/java/org/apache/tuscany/sca/node/osgi/launcher/NodeLauncher.java
------------------------------------------------------------------------------
    svn:keywords = Rev Date



Mime
View raw message