Updated the lists of modules and dependencies to match the latest state of trunk. Minor fixes to the build helper scripts.

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@688769 13f79535-47bb-0310-9956-ffa450edef68

5 files changed, 50 insertions, 6 deletions

diff --git a/java/sca/distribution/features/etc/generate-all-maven-files.sh b/java/sca/distribution/features/etc/generate-all-maven-files.sh
new file mode 100755
index 0000000000..d80368b90c
--- /dev/null
+++ b/java/sca/distribution/features/etc/generate-all-maven-files.sh
@@ -0,0 +1,41 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+# 
+#   http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License. 
+
+# This script can be used to generate Maven build POM and assembly files
+# for all the distributions
+
+echo "Generate Maven files: core"
+cd core; ../etc/generate-down-dependencies.sh > src/main/components/bin-down-dependencies.xml; ../etc/generate-maven-files.sh
+
+echo "Generate Maven files: ejava"
+cd ../ejava; ../etc/generate-maven-files.sh
+
+echo "Generate Maven files: manager"
+cd ../manager; ../etc/generate-maven-files.sh
+
+echo "Generate Maven files: process"
+cd ../process; ../etc/generate-maven-files.sh
+
+echo "Generate Maven files: web20"
+cd ../web20; ../etc/generate-maven-files.sh
+
+echo "Generate Maven files: webservice"
+cd ../webservice; ../etc/generate-maven-files.sh
+
+echo "Generate Maven files: all"
+cd ../all; ../etc/generate-maven-files.sh
+
diff --git a/java/sca/distribution/features/etc/generate-down-dependencies.sh b/java/sca/distribution/features/etc/generate-down-dependencies.sh
index 9898835c25..d8ad5b75f3 100755
--- a/java/sca/distribution/features/etc/generate-down-dependencies.sh
+++ b/java/sca/distribution/features/etc/generate-down-dependencies.sh
@@ -48,7 +48,9 @@ echo "            <includes>"
 echo "                <include>org.apache.tuscany.sca:*</include>"
 echo "            </includes>"
 echo "            <excludes>"
+
 mvn -o dependency:list | awk '/.INFO.    (.*.tuscany.sca):(tuscany-)(.*):(.*):(.*):(.*)/ { print gensub("(.INFO.    )(.*)(:)(.*)(:)(.*)(:)(.*)(:)(.*)", "\\2:\\4", "g") }' | sort | awk '{ printf "                <exclude>%s</exclude>\n", $1 }'
+
 echo "            </excludes>"
 echo "        </dependencySet>"
 echo ""
@@ -58,13 +60,12 @@ echo "            <outputDirectory>lib</outputDirectory>"
 echo "            <unpack>false</unpack>"
 echo "            <useTransitiveFiltering>true</useTransitiveFiltering>"
 echo "            <excludes>"
+
 mvn -o dependency:list | awk '/.INFO.    (.*):(.*):(.*):(.*):(.*)/ && !/(.*)(.tuscany.sca):(.*)/ { print gensub("(.INFO.    )(.*)(:)(.*)(:)(.*)(:)(.*)(:)(.*)", "\\2:\\4", "g") }' | sort | awk '{ printf "                <exclude>%s</exclude>\n", $1 }'
+
 echo "                <exclude>org.apache.tuscany.sca:*</exclude>"
 echo "            </excludes>"
 echo "        </dependencySet>"
 echo "    </dependencySets>"
-
-
 echo "</component>"
-echo ""
 
diff --git a/java/sca/distribution/features/etc/generate-maven-files.sh b/java/sca/distribution/features/etc/generate-maven-files.sh
index ecff6aeab0..adb190eabd 100755
--- a/java/sca/distribution/features/etc/generate-maven-files.sh
+++ b/java/sca/distribution/features/etc/generate-maven-files.sh
@@ -19,5 +19,7 @@
 # for a distribution
 
 ../etc/generate-src-modules.sh > src/main/components/src-modules.xml
-../etc/generate-pom.sh > pom.xml
+../etc/generate-pom.sh > pom.xml.tmp
+cp pom.xml.tmp pom.xml
+rm pom.xml.tmp
 
diff --git a/java/sca/distribution/features/etc/generate-pom.sh b/java/sca/distribution/features/etc/generate-pom.sh
index b901f8cffc..2a198eb3f2 100755
--- a/java/sca/distribution/features/etc/generate-pom.sh
+++ b/java/sca/distribution/features/etc/generate-pom.sh
@@ -20,6 +20,8 @@
 
 cat pom.xml | awk 'BEGIN { i=0 } /<profiles>/ { i=1; print } /.*/ { if (i==0) print } '
 
+echo ""
+echo "        <!-- Profile that can be used to build the modules included in the distro -->"
 echo "        <profile>"
 echo "            <id>modules</id>"
 echo "            <modules>"
@@ -28,7 +30,6 @@ mvn -o dependency:list | awk '/.INFO.    (.*.tuscany.sca):(tuscany-)(.*):(.*):(.
 
 echo "            </modules>"
 echo "        </profile>"
-echo ""
 
 cat pom.xml | awk 'BEGIN { i=0 } /<\/profiles>/ { i=1 } /.*/ { if (i==1) print } '
 
diff --git a/java/sca/distribution/features/etc/generate-src-modules.sh b/java/sca/distribution/features/etc/generate-src-modules.sh
index 198636993d..60dbbcd2d0 100755
--- a/java/sca/distribution/features/etc/generate-src-modules.sh
+++ b/java/sca/distribution/features/etc/generate-src-modules.sh
@@ -62,5 +62,4 @@ echo "            </excludes>"
 echo "        </fileSet>"
 echo "    </fileSets>"
 echo "</component>"
-echo ""