From 6ec4eafe0cda08a7b3fb862aa4027e8ac280f832 Mon Sep 17 00:00:00 2001
From: slaws <slaws@13f79535-47bb-0310-9956-ffa450edef68>
Date: Thu, 19 Nov 2009 10:42:06 +0000
Subject: Sort out the 1.x bundles and launcher manifests and the relationships
 between them. Step closer to getting 1.x and 2.x up together. Still getting
 NPE in 1.x on start.

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@882097 13f79535-47bb-0310-9956-ffa450edef68
---
 sandbox/slaws/runtimecompat/1xlauncher/pom.xml          | 17 +++++++++++++++++
 .../1xlauncher/src/main/java/launcher/OneXLauncher.java |  6 +++++-
 2 files changed, 22 insertions(+), 1 deletion(-)

(limited to 'sandbox/slaws/runtimecompat/1xlauncher')

diff --git a/sandbox/slaws/runtimecompat/1xlauncher/pom.xml b/sandbox/slaws/runtimecompat/1xlauncher/pom.xml
index ba1cd04311..4f7efb592f 100644
--- a/sandbox/slaws/runtimecompat/1xlauncher/pom.xml
+++ b/sandbox/slaws/runtimecompat/1xlauncher/pom.xml
@@ -26,6 +26,7 @@
     </parent><version>1.0-SNAPSHOT</version>
     <artifactId>1x-launcher</artifactId>
     <name>Apache Tuscany SCA 1.x Launcher</name>
+    <packaging>bundle</packaging> 
 
     <dependencies>
         <dependency>
@@ -58,5 +59,21 @@
     
     <build>
        <finalName>${artifactId}</finalName>
+        <plugins> 
+            
+            <plugin>    
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <extensions>true</extensions>
+		        <configuration>
+		          <instructions>
+		            <Import-Package>org.apache.tuscany.sca.node;version="[1.6.0,1.6.0]"</Import-Package>
+		            <Export-Package>launcher</Export-Package>
+		            <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+		          </instructions>
+		        </configuration>
+           </plugin> 
+
+        </plugins>       
     </build>
 </project>
diff --git a/sandbox/slaws/runtimecompat/1xlauncher/src/main/java/launcher/OneXLauncher.java b/sandbox/slaws/runtimecompat/1xlauncher/src/main/java/launcher/OneXLauncher.java
index 251e5f1ff6..215b211d13 100644
--- a/sandbox/slaws/runtimecompat/1xlauncher/src/main/java/launcher/OneXLauncher.java
+++ b/sandbox/slaws/runtimecompat/1xlauncher/src/main/java/launcher/OneXLauncher.java
@@ -26,8 +26,12 @@ import org.apache.tuscany.sca.node.SCANodeFactory;
 public class OneXLauncher {
 
     public static void main(String[] args) throws Exception {
+    	OneXLauncher.launchNode();
+    }
+    
+    public static void launchNode(){
         SCANode node = SCANodeFactory.newInstance().createSCANode("Calculator.composite", 
-            new SCAContribution("calculator", "../1xcalculator.jar"));
+                new SCAContribution("calculator", "../1xcalculator.jar"));
 
         node.start();
         
-- 
cgit v1.2.3