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

2 files changed, 29 insertions, 4 deletions

diff --git a/java/sca/distribution/features/manager/pom.xml b/java/sca/distribution/features/manager/pom.xml
index 627f9e3902..fbe21edd6d 100644
--- a/java/sca/distribution/features/manager/pom.xml
+++ b/java/sca/distribution/features/manager/pom.xml
@@ -159,6 +159,7 @@
     </dependencies>
 
     <profiles>
+
         <!-- Profile that can be used to build the modules included in the distro -->
         <profile>
             <id>modules</id>
@@ -192,7 +193,6 @@
                 <module>../../../modules/definitions</module>
                 <module>../../../modules/definitions-xml</module>
                 <module>../../../modules/distribution-core</module>
-                <module>../../../modules/distribution-manager</module>
                 <module>../../../modules/domain-manager</module>
                 <module>../../../modules/endpoint</module>
                 <module>../../../modules/extensibility</module>
@@ -217,9 +217,10 @@
                 <module>../../../modules/interface-wsdl-xml</module>
                 <module>../../../modules/monitor</module>
                 <module>../../../modules/monitor-logging</module>
-                <module>../../../modules/node2-api</module>
-                <module>../../../modules/node2-impl</module>
-                <module>../../../modules/node2-launcher</module>
+                <module>../../../modules/node-api</module>
+                <module>../../../modules/node-impl</module>
+                <module>../../../modules/node-launcher</module>
+                <module>../../../modules/node-launcher-webapp</module>
                 <module>../../../modules/node-manager</module>
                 <module>../../../modules/policy</module>
                 <module>../../../modules/policy-security</module>
diff --git a/java/sca/distribution/features/manager/src/main/components/src-modules.xml b/java/sca/distribution/features/manager/src/main/components/src-modules.xml
index 2dc74ba335..55ab42eb59 100644
--- a/java/sca/distribution/features/manager/src/main/components/src-modules.xml
+++ b/java/sca/distribution/features/manager/src/main/components/src-modules.xml
@@ -27,12 +27,22 @@
                 <include>assembly/**/*</include>
                 <include>assembly-xml/**/*</include>
                 <include>assembly-xsd/**/*</include>
+                <include>binding-atom/**/*</include>
+                <include>binding-atom-abdera/**/*</include>
+                <include>binding-ejb/**/*</include>
+                <include>binding-http/**/*</include>
+                <include>binding-jsonrpc/**/*</include>
+                <include>binding-rss/**/*</include>
                 <include>binding-sca/**/*</include>
                 <include>binding-sca-xml/**/*</include>
+                <include>binding-ws/**/*</include>
+                <include>binding-ws-wsdlgen/**/*</include>
+                <include>binding-ws-xml/**/*</include>
                 <include>contribution/**/*</include>
                 <include>contribution-impl/**/*</include>
                 <include>contribution-java/**/*</include>
                 <include>contribution-namespace/**/*</include>
+                <include>contribution-resource/**/*</include>
                 <include>contribution-xml/**/*</include>
                 <include>core/**/*</include>
                 <include>core-databinding/**/*</include>
@@ -42,15 +52,23 @@
                 <include>databinding-jaxb/**/*</include>
                 <include>definitions/**/*</include>
                 <include>definitions-xml/**/*</include>
+                <include>distribution-core/**/*</include>
+                <include>domain-manager/**/*</include>
                 <include>endpoint/**/*</include>
                 <include>extensibility/**/*</include>
                 <include>host-embedded/**/*</include>
                 <include>host-http/**/*</include>
+                <include>host-jetty/**/*</include>
+                <include>implementation-bpel/**/*</include>
+                <include>implementation-ejb/**/*</include>
                 <include>implementation-java/**/*</include>
                 <include>implementation-java-runtime/**/*</include>
                 <include>implementation-java-xml/**/*</include>
                 <include>implementation-node/**/*</include>
                 <include>implementation-node-runtime/**/*</include>
+                <include>implementation-resource/**/*</include>
+                <include>implementation-widget/**/*</include>
+                <include>implementation-widget-runtime/**/*</include>
                 <include>interface/**/*</include>
                 <include>interface-java/**/*</include>
                 <include>interface-java-jaxws/**/*</include>
@@ -63,10 +81,15 @@
                 <include>node-impl/**/*</include>
                 <include>node-launcher/**/*</include>
                 <include>node-launcher-webapp/**/*</include>
+                <include>node-manager/**/*</include>
                 <include>policy/**/*</include>
                 <include>policy-security/**/*</include>
+                <include>policy-security-ws/**/*</include>
                 <include>policy-xml/**/*</include>
                 <include>sca-api/**/*</include>
+                <include>workspace/**/*</include>
+                <include>workspace-impl/**/*</include>
+                <include>workspace-xml/**/*</include>
                 <include>xsd/**/*</include>
                 <include>xsd-xml/**/*</include>
             </includes>
@@ -84,3 +107,4 @@
         </fileSet>
     </fileSets>
 </component>
+