Author: nash
Date: Fri Apr 16 21:20:04 2010
New Revision: 935081
URL: http://svn.apache.org/viewvc?rev=935081&view=rev
Log:
Add webapps to binaries build output
Modified:
tuscany/sca-java-1.x/trunk/tutorials/travelsample/binaries/bundle/pom.xml
tuscany/sca-java-1.x/trunk/tutorials/travelsample/binaries/src/main/components/bin-modules.xml
Modified:
tuscany/sca-java-1.x/trunk/tutorials/travelsample/binaries/bundle/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tutorials/travelsample/binaries/bundle/pom.xml?rev=935081&r1=935080&r2=935081&view=diff
==============================================================================
--- tuscany/sca-java-1.x/trunk/tutorials/travelsample/binaries/bundle/pom.xml
(original)
+++ tuscany/sca-java-1.x/trunk/tutorials/travelsample/binaries/bundle/pom.xml
Fri Apr 16 21:20:04 2010
@@ -97,13 +97,12 @@
<artifactId>scatours-contribution-creditcard-payment-sdo</artifactId>
<version>${pom.version}</version>
</dependency>
-<!--
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>scatours-contribution-creditcard-payment-webapp</artifactId>
+ <type>war</type>
<version>${pom.version}</version>
</dependency>
--->
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>scatours-contribution-currency</artifactId>
@@ -119,25 +118,23 @@
<artifactId>scatours-contribution-currency-jms</artifactId>
<version>${pom.version}</version>
</dependency>
-<!--
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>scatours-contribution-currency-jsp</artifactId>
+ <type>war</type>
<version>${pom.version}</version>
</dependency>
--->
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>scatours-contribution-currency-rmi</artifactId>
<version>${pom.version}</version>
</dependency>
-<!--
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>scatours-contribution-currency-servlet</artifactId>
+ <type>war</type>
<version>${pom.version}</version>
</dependency>
--->
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>scatours-contribution-currency-ws</artifactId>
Modified:
tuscany/sca-java-1.x/trunk/tutorials/travelsample/binaries/src/main/components/bin-modules.xml
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tutorials/travelsample/binaries/src/main/components/bin-modules.xml?rev=935081&r1=935080&r2=935081&view=diff
==============================================================================
---
tuscany/sca-java-1.x/trunk/tutorials/travelsample/binaries/src/main/components/bin-modules.xml
(original)
+++
tuscany/sca-java-1.x/trunk/tutorials/travelsample/binaries/src/main/components/bin-modules.xml
Fri Apr 16 21:20:04 2010
@@ -57,6 +57,9 @@
<include>org.apache.tuscany.sca:scatours-contribution-*</include>
</includes>
<excludes>
+
<exclude>org.apache.tuscany.sca:scatours-contribution-creditcard-payment-webapp</exclude>
+
<exclude>org.apache.tuscany.sca:scatours-contribution-currency-jsp</exclude>
+
<exclude>org.apache.tuscany.sca:scatours-contribution-currency-servlet</exclude>
<exclude>org.apache.tuscany.sca:scatours-contribution-payment-bpel-process</exclude>
</excludes>
<scope>runtime</scope>
@@ -107,6 +110,19 @@
<dependencySet>
<useProjectArtifact>false</useProjectArtifact>
+ <outputDirectory>webapps</outputDirectory>
+
<outputFileNameMapping>${artifact.artifactId}.${artifact.extension}</outputFileNameMapping>
+ <unpack>false</unpack>
+ <includes>
+
<include>org.apache.tuscany.sca:scatours-contribution-creditcard-payment-webapp</include>
+
<include>org.apache.tuscany.sca:scatours-contribution-currency-jsp</include>
+
<include>org.apache.tuscany.sca:scatours-contribution-currency-servlet</include>
+ </includes>
+ <scope>runtime</scope>
+ </dependencySet>
+
+ <dependencySet>
+ <useProjectArtifact>false</useProjectArtifact>
<outputDirectory>domainconfig</outputDirectory>
<unpack>true</unpack>
<includes>
