summaryrefslogtreecommitdiffstats
path: root/sca-java-1.x/trunk/tutorials/travelsample/binaries
diff options
context:
space:
mode:
authornash <nash@13f79535-47bb-0310-9956-ffa450edef68>2010-04-16 21:20:04 +0000
committernash <nash@13f79535-47bb-0310-9956-ffa450edef68>2010-04-16 21:20:04 +0000
commit5d87ab048a5aa83a69fced8003ad44713ab1b759 (patch)
treebd8b40c7accde6200f9f1866b433958cd676019e /sca-java-1.x/trunk/tutorials/travelsample/binaries
parent78c5a77940374adc6d5ffc4b6c24944a1956618a (diff)
Add webapps to binaries build output
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@935081 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'sca-java-1.x/trunk/tutorials/travelsample/binaries')
-rw-r--r--sca-java-1.x/trunk/tutorials/travelsample/binaries/bundle/pom.xml9
-rw-r--r--sca-java-1.x/trunk/tutorials/travelsample/binaries/src/main/components/bin-modules.xml16
2 files changed, 19 insertions, 6 deletions
diff --git a/sca-java-1.x/trunk/tutorials/travelsample/binaries/bundle/pom.xml b/sca-java-1.x/trunk/tutorials/travelsample/binaries/bundle/pom.xml
index a6de175cb0..7dd0b3fc1a 100644
--- a/sca-java-1.x/trunk/tutorials/travelsample/binaries/bundle/pom.xml
+++ b/sca-java-1.x/trunk/tutorials/travelsample/binaries/bundle/pom.xml
@@ -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>
diff --git a/sca-java-1.x/trunk/tutorials/travelsample/binaries/src/main/components/bin-modules.xml b/sca-java-1.x/trunk/tutorials/travelsample/binaries/src/main/components/bin-modules.xml
index 41115063a7..57eee09c6d 100644
--- a/sca-java-1.x/trunk/tutorials/travelsample/binaries/src/main/components/bin-modules.xml
+++ b/sca-java-1.x/trunk/tutorials/travelsample/binaries/src/main/components/bin-modules.xml
@@ -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>