Author: antelder
Date: Fri Nov 27 10:29:05 2009
New Revision: 884824
URL: http://svn.apache.org/viewvc?rev=884824&view=rev
Log:
Change helloworld sample to be a zip contribution
Modified:
tuscany/sca-java-2.x/trunk/itest/samples/helloworld/src/test/java/itest/helloworld/HelloworldDomainNodeTestCase.java
tuscany/sca-java-2.x/trunk/itest/samples/helloworld/src/test/java/itest/helloworld/HelloworldNodeTestCase.java
tuscany/sca-java-2.x/trunk/samples/helloworld/pom.xml
Modified:
tuscany/sca-java-2.x/trunk/itest/samples/helloworld/src/test/java/itest/helloworld/HelloworldDomainNodeTestCase.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/itest/samples/helloworld/src/test/java/itest/helloworld/HelloworldDomainNodeTestCase.java?rev=884824&r1=884823&r2=884824&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/itest/samples/helloworld/src/test/java/itest/helloworld/HelloworldDomainNodeTestCase.java
(original)
+++
tuscany/sca-java-2.x/trunk/itest/samples/helloworld/src/test/java/itest/helloworld/HelloworldDomainNodeTestCase.java
Fri Nov 27 10:29:05 2009
@@ -15,7 +15,7 @@
@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
Modified:
tuscany/sca-java-2.x/trunk/itest/samples/helloworld/src/test/java/itest/helloworld/HelloworldNodeTestCase.java
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/itest/samples/helloworld/src/test/java/itest/helloworld/HelloworldNodeTestCase.java?rev=884824&r1=884823&r2=884824&view=diff
==============================================================================
---
tuscany/sca-java-2.x/trunk/itest/samples/helloworld/src/test/java/itest/helloworld/HelloworldNodeTestCase.java
(original)
+++
tuscany/sca-java-2.x/trunk/itest/samples/helloworld/src/test/java/itest/helloworld/HelloworldNodeTestCase.java
Fri Nov 27 10:29:05 2009
@@ -15,7 +15,7 @@
@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
Modified: tuscany/sca-java-2.x/trunk/samples/helloworld/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/helloworld/pom.xml?rev=884824&r1=884823&r2=884824&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/helloworld/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/samples/helloworld/pom.xml Fri Nov 27 10:29:05
2009
@@ -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>
