From 57e05151e165824a3be21ad83164a5686664d8aa Mon Sep 17 00:00:00 2001
From: antelder <antelder@13f79535-47bb-0310-9956-ffa450edef68>
Date: Fri, 27 Nov 2009 10:29:05 +0000
Subject: Change helloworld sample to be a zip contribution

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@884824 13f79535-47bb-0310-9956-ffa450edef68
---
 .../helloworld/HelloworldDomainNodeTestCase.java   |  2 +-
 .../itest/helloworld/HelloworldNodeTestCase.java   |  2 +-
 sca-java-2.x/trunk/samples/helloworld/pom.xml      | 35 +++++++++++++++++++---
 3 files changed, 33 insertions(+), 6 deletions(-)

(limited to 'sca-java-2.x/trunk')

diff --git a/sca-java-2.x/trunk/itest/samples/helloworld/src/test/java/itest/helloworld/HelloworldDomainNodeTestCase.java b/sca-java-2.x/trunk/itest/samples/helloworld/src/test/java/itest/helloworld/HelloworldDomainNodeTestCase.java
index e8c8e197af..f6bb6df659 100644
--- a/sca-java-2.x/trunk/itest/samples/helloworld/src/test/java/itest/helloworld/HelloworldDomainNodeTestCase.java
+++ b/sca-java-2.x/trunk/itest/samples/helloworld/src/test/java/itest/helloworld/HelloworldDomainNodeTestCase.java
@@ -15,7 +15,7 @@ public class HelloworldDomainNodeTestCase {
     
     @Before
     public void setUp() throws Exception {
-        node = new DomainNode("../../../samples/helloworld/target/sample-helloworld.jar");
+        node = new DomainNode("../../../samples/helloworld/target/sample-helloworld.zip");
     }
 
     @Test
diff --git a/sca-java-2.x/trunk/itest/samples/helloworld/src/test/java/itest/helloworld/HelloworldNodeTestCase.java b/sca-java-2.x/trunk/itest/samples/helloworld/src/test/java/itest/helloworld/HelloworldNodeTestCase.java
index f4048e0ccc..66c757b44d 100644
--- a/sca-java-2.x/trunk/itest/samples/helloworld/src/test/java/itest/helloworld/HelloworldNodeTestCase.java
+++ b/sca-java-2.x/trunk/itest/samples/helloworld/src/test/java/itest/helloworld/HelloworldNodeTestCase.java
@@ -15,7 +15,7 @@ public class HelloworldNodeTestCase {
     
     @Before
     public void setUp() throws Exception {
-        node = NodeFactory.newInstance().createNode(null, new String[]{"../../../samples/helloworld/target/sample-helloworld.jar"}).start();
+        node = NodeFactory.newInstance().createNode(null, new String[]{"../../../samples/helloworld/target/sample-helloworld.zip"}).start();
     }
 
     @Test
diff --git a/sca-java-2.x/trunk/samples/helloworld/pom.xml b/sca-java-2.x/trunk/samples/helloworld/pom.xml
index f829695b33..d7621b50fa 100644
--- a/sca-java-2.x/trunk/samples/helloworld/pom.xml
+++ b/sca-java-2.x/trunk/samples/helloworld/pom.xml
@@ -47,10 +47,37 @@
     <build>
         <finalName>${artifactId}</finalName>
         <plugins>
-            <plugin>
-                <groupId>org.apache.tuscany.maven.plugins</groupId>
-                <artifactId>maven-tuscany-plugin</artifactId>
-            </plugin>
+           <plugin>
+               <artifactId>maven-assembly-plugin</artifactId>
+               <version>2.2-beta-3</version>
+               <dependencies>
+                   <dependency>
+                       <groupId>org.apache.tuscany.sca</groupId>
+                       <artifactId>tuscany-zip-contribution-descriptor</artifactId>
+                       <version>2.0-M4</version>
+                   </dependency>
+               </dependencies>
+               <executions>
+                   <execution>
+                       <id>make-assembly</id>
+                       <phase>package</phase>
+                       <goals>
+                           <goal>single</goal>
+                       </goals>
+                       <configuration>
+                           <appendAssemblyId>false</appendAssemblyId>
+                           <!-- This is where we use our shared assembly descriptor -->
+                           <descriptors>
+                               <descriptor>tuscany-zip-contribution.xml</descriptor>
+                           </descriptors>
+                       </configuration>
+                   </execution>
+               </executions>
+           </plugin>
+           <plugin>
+               <groupId>org.apache.tuscany.maven.plugins</groupId>
+               <artifactId>maven-tuscany-plugin</artifactId>
+           </plugin>
         </plugins>
     </build>
 </project>
-- 
cgit v1.2.3