diff options
| author | antelder <antelder@13f79535-47bb-0310-9956-ffa450edef68> | 2009-07-28 04:23:46 +0000 |
|---|---|---|
| committer | antelder <antelder@13f79535-47bb-0310-9956-ffa450edef68> | 2009-07-28 04:23:46 +0000 |
| commit | 8a311f0577d74e20703a66460ffa64bc305a5aea (patch) | |
| tree | 7cfa14f822c9894bf48482bd19b91a2bba0d6f11 | |
| parent | be3a6f0d155b7af4190ed121eb72c051d9b66e68 (diff) | |
Add tomcat integration into main build and add war legal checks test to be run with the build
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@798395 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | java/sca/distribution/pom.xml | 25 | ||||
| -rw-r--r-- | java/sca/distribution/tomcat/pom.xml | 1 | ||||
| -rw-r--r-- | java/sca/distribution/tomcat/testing/pom.xml | 1 | ||||
| -rw-r--r-- | java/sca/distribution/tomcat/tomcat-war/src/main/assembly/war.xml | 1 |
4 files changed, 7 insertions, 21 deletions
diff --git a/java/sca/distribution/pom.xml b/java/sca/distribution/pom.xml index 21005f4c2c..0058a99177 100644 --- a/java/sca/distribution/pom.xml +++ b/java/sca/distribution/pom.xml @@ -30,26 +30,9 @@ <packaging>pom</packaging> <name>Apache Tuscany SCA Distributions</name> - <profiles> - <profile> - <id>default</id> - <activation> - <activeByDefault>true</activeByDefault> - </activation> - <modules> - <module>all</module> - </modules> - </profile> - - <profile> - <id>distribution</id> - <modules> - <module>all</module> - <module>tomcat</module> - </modules> - </profile> - - </profiles> - + <modules> + <module>all</module> + <module>tomcat</module> + </modules> </project> diff --git a/java/sca/distribution/tomcat/pom.xml b/java/sca/distribution/tomcat/pom.xml index b06a0aea79..7164f45ac7 100644 --- a/java/sca/distribution/tomcat/pom.xml +++ b/java/sca/distribution/tomcat/pom.xml @@ -34,6 +34,7 @@ <module>tomcat-hook</module> <module>tomcat-servlet</module> <module>tomcat-war</module> + <module>testing</module> </modules> </project> diff --git a/java/sca/distribution/tomcat/testing/pom.xml b/java/sca/distribution/tomcat/testing/pom.xml index 732e7c292d..35a03da94a 100644 --- a/java/sca/distribution/tomcat/testing/pom.xml +++ b/java/sca/distribution/tomcat/testing/pom.xml @@ -33,6 +33,7 @@ <modules> <module>helloworld-service-contribution</module> <module>helloworld-client-webapp</module> + <module>legal-checks</module> </modules> </project> diff --git a/java/sca/distribution/tomcat/tomcat-war/src/main/assembly/war.xml b/java/sca/distribution/tomcat/tomcat-war/src/main/assembly/war.xml index 695acee3f0..2f1c6bc4d8 100644 --- a/java/sca/distribution/tomcat/tomcat-war/src/main/assembly/war.xml +++ b/java/sca/distribution/tomcat/tomcat-war/src/main/assembly/war.xml @@ -20,6 +20,7 @@ <id>war</id> <formats> <format>war</format> + <format>dir</format> </formats> <includeBaseDirectory>false</includeBaseDirectory> <fileSets> |