summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--java/sca/distribution/pom.xml25
-rw-r--r--java/sca/distribution/tomcat/pom.xml1
-rw-r--r--java/sca/distribution/tomcat/testing/pom.xml1
-rw-r--r--java/sca/distribution/tomcat/tomcat-war/src/main/assembly/war.xml1
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>