svn commit: r957908 - in /tuscany/sca-java-2.x/trunk/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher: EquinoxHost.java NodeLauncherUtil.java

[antelder]

Author: antelder
Date: Fri Jun 25 12:05:30 2010
New Revision: 957908

URL: http://svn.apache.org/viewvc?rev=957908&view=rev
Log:
Update to also support running OSGi with the agregated tuscany-base jar

Modified:
    
tuscany/sca-java-2.x/trunk/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/EquinoxHost.java
    
tuscany/sca-java-2.x/trunk/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeLauncherUtil.java

Modified: 
tuscany/sca-java-2.x/trunk/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/EquinoxHost.java
URL: 
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/EquinoxHost.java?rev=957908&r1=957907&r2=957908&view=diff
==============================================================================
--- 
tuscany/sca-java-2.x/trunk/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/EquinoxHost.java
 (original)
+++ 
tuscany/sca-java-2.x/trunk/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/EquinoxHost.java
 Fri Jun 25 12:05:30 2010
@@ -294,7 +294,7 @@ public class EquinoxHost {
             for (int i = 0, n = bundleFiles.size(); i < n; i++) {
                 URL bundleFile = bundleFiles.get(i);
                 String bundleName = bundleNames.get(i);
-                if (bundleName.contains("org.eclipse.jdt.junit")) {
+                if (bundleName.contains("org.eclipse.jdt.junit") || 
bundleName.contains("org.apache.tuscany.sca.base")) {
                     continue;
                 }
                 installBundle(bundleFile, bundleName);

Modified: 
tuscany/sca-java-2.x/trunk/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeLauncherUtil.java
URL: 
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeLauncherUtil.java?rev=957908&r1=957907&r2=957908&view=diff
==============================================================================
--- 
tuscany/sca-java-2.x/trunk/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeLauncherUtil.java
 (original)
+++ 
tuscany/sca-java-2.x/trunk/modules/node-launcher-equinox/src/main/java/org/apache/tuscany/sca/node/equinox/launcher/NodeLauncherUtil.java
 Fri Jun 25 12:05:30 2010
@@ -86,6 +86,7 @@ import org.osgi.framework.Constants;
  */
 final class NodeLauncherUtil {
     private static final String NODE_API_BUNDLE = 
"org.apache.tuscany.sca.node.api";
+    private static final String BASE_BUNDLE = "org.apache.tuscany.sca.base";
 
     private static final Logger logger = 
Logger.getLogger(NodeLauncherUtil.class.getName());
 
@@ -129,6 +130,10 @@ final class NodeLauncherUtil {
                     bundle = b;
                     break;
                 }
+                if (b.getSymbolicName().contains(BASE_BUNDLE)) {
+                    bundle = b;
+                    break;
+                }
             }
             if (bundle == null) {
                 throw new IllegalStateException("Bundle " + NODE_API_BUNDLE + 
" is not installed");