Changed distro builds to build OSGi friendly distributions. Added an Eclipse build profile to build an Eclipse PDE target which can be used to configure an Eclipse workspace.

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

19 files changed, 192 insertions, 182 deletions

diff --git a/branches/sca-equinox/distribution/features/all/pom.xml b/branches/sca-equinox/distribution/features/all/pom.xml
index 061a4659b7..7fbc5f0730 100644
--- a/branches/sca-equinox/distribution/features/all/pom.xml
+++ b/branches/sca-equinox/distribution/features/all/pom.xml
@@ -108,15 +108,29 @@
 
     <profiles>
     
-        <!-- Default build profile that can be used to build the distro packages -->
+        <!-- Build profile that can be used to build the distro packages -->
         <profile>
-            <id>default</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
+            <id>distribution</id>
             <build>
                 <plugins>
                     <plugin>
+                        <groupId>org.apache.tuscany.sca</groupId>
+                        <artifactId>tuscany-maven-bundle-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>distribution-modules</id>
+                                <phase>generate-resources</phase>
+                                <goals>
+                                    <goal>generate-modules</goal>
+                                </goals>
+                                <configuration>
+                                    <targetDirectory>target/modules</targetDirectory>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+
+                    <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-assembly-plugin</artifactId>
                         <executions>
@@ -141,6 +155,34 @@
             </build>
         </profile>    
 
+        <!-- Build profile that can be used to configure your Eclipse environment -->
+        <profile>
+            <id>eclipse</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.tuscany.sca</groupId>
+                        <artifactId>tuscany-maven-bundle-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>distribution-modules</id>
+                                <phase>generate-resources</phase>
+                                <goals>
+                                    <goal>generate-modules</goal>
+                                </goals>
+                                <configuration>
+                                    <targetDirectory>target/pdetarget</targetDirectory>
+                                    <excludeGroupIds>
+                                        <excludeGroupId>org.apache.tuscany.sca</excludeGroupId>
+                                    </excludeGroupIds>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+
         <!-- Profile that can be used to build the modules included in the distro -->
         <profile>
             <id>modules</id>
diff --git a/branches/sca-equinox/distribution/features/all/src/main/assembly/bin.xml b/branches/sca-equinox/distribution/features/all/src/main/assembly/bin.xml
index 5e21cc7a0f..0ae0aaa615 100644
--- a/branches/sca-equinox/distribution/features/all/src/main/assembly/bin.xml
+++ b/branches/sca-equinox/distribution/features/all/src/main/assembly/bin.xml
@@ -32,7 +32,7 @@
 
     <componentDescriptors>
         <componentDescriptor>../core/src/main/components/bin-common.xml</componentDescriptor>
-        <componentDescriptor>../core/src/main/components/bin-dependencies.xml</componentDescriptor>
+        <componentDescriptor>../core/src/main/components/bin-modules.xml</componentDescriptor>
         <componentDescriptor>../core/src/main/components/bin-samples.xml</componentDescriptor>
         <componentDescriptor>../ejava/src/main/components/bin-samples.xml</componentDescriptor>
         <componentDescriptor>../manager/src/main/components/bin-samples.xml</componentDescriptor>
diff --git a/branches/sca-equinox/distribution/features/core/pom.xml b/branches/sca-equinox/distribution/features/core/pom.xml
index a6d0af7bee..b5a2d7d8af 100644
--- a/branches/sca-equinox/distribution/features/core/pom.xml
+++ b/branches/sca-equinox/distribution/features/core/pom.xml
@@ -245,15 +245,29 @@
 
     <profiles>
 
-        <!-- Default build profile that can be used to build the distro packages -->
+        <!-- Build profile that can be used to build the distro packages -->
         <profile>
-            <id>default</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
+            <id>distribution</id>
             <build>
                 <plugins>
                     <plugin>
+                        <groupId>org.apache.tuscany.sca</groupId>
+                        <artifactId>tuscany-maven-bundle-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>distribution-modules</id>
+                                <phase>generate-resources</phase>
+                                <goals>
+                                    <goal>generate-modules</goal>
+                                </goals>
+                                <configuration>
+                                    <targetDirectory>target/modules</targetDirectory>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+
+                    <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-assembly-plugin</artifactId>
                         <executions>
diff --git a/branches/sca-equinox/distribution/features/core/src/main/assembly/bin.xml b/branches/sca-equinox/distribution/features/core/src/main/assembly/bin.xml
index 200cc91080..d054e5696c 100644
--- a/branches/sca-equinox/distribution/features/core/src/main/assembly/bin.xml
+++ b/branches/sca-equinox/distribution/features/core/src/main/assembly/bin.xml
@@ -32,7 +32,7 @@
 
     <componentDescriptors>
         <componentDescriptor>src/main/components/bin-common.xml</componentDescriptor>
-        <componentDescriptor>src/main/components/bin-dependencies.xml</componentDescriptor>
+        <componentDescriptor>src/main/components/bin-modules.xml</componentDescriptor>
         <componentDescriptor>src/main/components/bin-samples.xml</componentDescriptor>
     </componentDescriptors>
 </assembly>
diff --git a/branches/sca-equinox/distribution/features/core/src/main/components/bin-filtered-dependencies.xml b/branches/sca-equinox/distribution/features/core/src/main/components/bin-filtered-dependencies.xml
deleted file mode 100644
index 39d74059ef..0000000000
--- a/branches/sca-equinox/distribution/features/core/src/main/components/bin-filtered-dependencies.xml
+++ /dev/null
@@ -1,118 +0,0 @@
-<!--
-    * 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.
--->
-<component>
-    <dependencySets>
-
-        <!-- Add all the Tuscany modules to the modules directory -->
-        <dependencySet>
-            <outputDirectory>modules</outputDirectory>
-            <unpack>false</unpack>
-            <includes>
-                <include>org.apache.tuscany.sca:*</include>
-            </includes>
-            <excludes>
-                <exclude>org.apache.tuscany.sca:tuscany-assembly</exclude>
-                <exclude>org.apache.tuscany.sca:tuscany-assembly-xml</exclude>
-                <exclude>org.apache.tuscany.sca:tuscany-assembly-xsd</exclude>
-                <exclude>org.apache.tuscany.sca:tuscany-binding-corba</exclude>
-                <exclude>org.apache.tuscany.sca:tuscany-binding-corba-runtime</exclude>
-                <exclude>org.apache.tuscany.sca:tuscany-binding-sca</exclude>
-                <exclude>org.apache.tuscany.sca:tuscany-binding-sca-xml</exclude>
-                <exclude>org.apache.tuscany.sca:tuscany-contribution</exclude>
-                <exclude>org.apache.tuscany.sca:tuscany-contribution-impl</exclude>
-                <exclude>org.apache.tuscany.sca:tuscany-contribution-java</exclude>
-                <exclude>org.apache.tuscany.sca:tuscany-contribution-namespace</exclude>
-                <exclude>org.apache.tuscany.sca:tuscany-contribution-xml</exclude>
-                <exclude>org.apache.tuscany.sca:tuscany-core</exclude>
-                <exclude>org.apache.tuscany.sca:tuscany-core-databinding</exclude>
-                <exclude>org.apache.tuscany.sca:tuscany-core-spi</exclude>
-                <exclude>org.apache.tuscany.sca:tuscany-data-api</exclude>
-                <exclude>org.apache.tuscany.sca:tuscany-databinding</exclude>
-                <exclude>org.apache.tuscany.sca:tuscany-databinding-jaxb</exclude>
-                <exclude>org.apache.tuscany.sca:tuscany-definitions</exclude>
-                <exclude>org.apache.tuscany.sca:tuscany-definitions-xml</exclude>
-                <exclude>org.apache.tuscany.sca:tuscany-endpoint</exclude>
-                <exclude>org.apache.tuscany.sca:tuscany-extensibility</exclude>
-                <exclude>org.apache.tuscany.sca:tuscany-extensibility-equinox</exclude>
-                <exclude>org.apache.tuscany.sca:tuscany-host-corba</exclude>
-                <exclude>org.apache.tuscany.sca:tuscany-host-corba-jse</exclude>
-                <exclude>org.apache.tuscany.sca:tuscany-host-http</exclude>
-                <exclude>org.apache.tuscany.sca:tuscany-implementation-java</exclude>
-                <exclude>org.apache.tuscany.sca:tuscany-implementation-java-runtime</exclude>
-                <exclude>org.apache.tuscany.sca:tuscany-implementation-java-xml</exclude>
-                <exclude>org.apache.tuscany.sca:tuscany-implementation-node</exclude>
-                <exclude>org.apache.tuscany.sca:tuscany-implementation-node-runtime</exclude>
-                <exclude>org.apache.tuscany.sca:tuscany-interface</exclude>
-                <exclude>org.apache.tuscany.sca:tuscany-interface-java</exclude>
-                <exclude>org.apache.tuscany.sca:tuscany-interface-java-jaxws</exclude>
-                <exclude>org.apache.tuscany.sca:tuscany-interface-java-xml</exclude>
-                <exclude>org.apache.tuscany.sca:tuscany-interface-wsdl</exclude>
-                <exclude>org.apache.tuscany.sca:tuscany-interface-wsdl-xml</exclude>
-                <exclude>org.apache.tuscany.sca:tuscany-monitor</exclude>
-                <exclude>org.apache.tuscany.sca:tuscany-node-api</exclude>
-                <exclude>org.apache.tuscany.sca:tuscany-node-impl</exclude>
-                <exclude>org.apache.tuscany.sca:tuscany-node-launcher</exclude>
-                <exclude>org.apache.tuscany.sca:tuscany-node-launcher-equinox</exclude>
-                <exclude>org.apache.tuscany.sca:tuscany-node-launcher-webapp</exclude>
-                <exclude>org.apache.tuscany.sca:tuscany-policy</exclude>
-                <exclude>org.apache.tuscany.sca:tuscany-policy-security</exclude>
-                <exclude>org.apache.tuscany.sca:tuscany-policy-security-jsr250</exclude>
-                <exclude>org.apache.tuscany.sca:tuscany-policy-xml</exclude>
-                <exclude>org.apache.tuscany.sca:tuscany-sca-api</exclude>
-                <exclude>org.apache.tuscany.sca:tuscany-workspace</exclude>
-                <exclude>org.apache.tuscany.sca:tuscany-workspace-impl</exclude>
-                <exclude>org.apache.tuscany.sca:tuscany-workspace-xml</exclude>
-                <exclude>org.apache.tuscany.sca:tuscany-xsd</exclude>
-                <exclude>org.apache.tuscany.sca:tuscany-xsd-xml</exclude>
-            </excludes>
-        </dependencySet>
-
-        <!-- Add all the dependent jars to the lib directory -->
-        <dependencySet>
-            <outputDirectory>lib</outputDirectory>
-            <unpack>false</unpack>
-            <excludes>
-                <exclude>asm:asm-all</exclude>
-                <exclude>cglib:cglib-nodep</exclude>
-                <exclude>com.sun:tools</exclude>
-                <exclude>com.sun.xml.bind:jaxb-impl</exclude>
-                <exclude>javax.activation:activation</exclude>
-                <exclude>javax.annotation:jsr250-api</exclude>
-                <exclude>javax.jws:jsr181-api</exclude>
-                <exclude>javax.servlet:servlet-api</exclude>
-                <exclude>javax.xml.bind:jaxb-api</exclude>
-                <exclude>javax.xml.stream:stax-api</exclude>
-                <exclude>javax.xml.ws:jaxws-api</exclude>
-                <exclude>org.apache.geronimo.specs:geronimo-commonj_1.1_spec</exclude>
-                <exclude>org.apache.ws.commons.schema:XmlSchema</exclude>
-                <exclude>org.codehaus.woodstox:wstx-asl</exclude>
-                <exclude>org.eclipse.core:contenttype</exclude>
-                <exclude>org.eclipse.core:jobs</exclude>
-                <exclude>org.eclipse.core:runtime</exclude>
-                <exclude>org.eclipse.equinox:app</exclude>
-                <exclude>org.eclipse.equinox:common</exclude>
-                <exclude>org.eclipse.equinox:preferences</exclude>
-                <exclude>org.eclipse.equinox:registry</exclude>
-                <exclude>org.eclipse:osgi</exclude>
-                <exclude>wsdl4j:wsdl4j</exclude>
-                <exclude>org.apache.tuscany.sca:*</exclude>
-            </excludes>
-        </dependencySet>
-    </dependencySets>
-</component>
diff --git a/branches/sca-equinox/distribution/features/core/src/main/components/bin-dependencies.xml b/branches/sca-equinox/distribution/features/core/src/main/components/bin-modules.xml
index a1bde3932b..5e1c5ec5d6 100644
--- a/branches/sca-equinox/distribution/features/core/src/main/components/bin-dependencies.xml
+++ b/branches/sca-equinox/distribution/features/core/src/main/components/bin-modules.xml
@@ -17,25 +17,16 @@
     * under the License.
 -->
 <component>
-    <dependencySets>
+    <fileSets>
 
-        <!-- Add all the Tuscany modules to the modules directory -->
-        <dependencySet>
+        <!-- Add modules to the modules directory -->
+        <fileSet>
+            <directory>target/modules</directory>
             <outputDirectory>modules</outputDirectory>
-            <unpack>false</unpack>
             <includes>
-                <include>org.apache.tuscany.sca:*</include>
+                <include>**/*</include>
             </includes>
-        </dependencySet>
-
-        <!-- Add all the dependent jars to the lib directory -->
-        <dependencySet>
-            <outputDirectory>lib</outputDirectory>
-            <unpack>false</unpack>
-            <excludes>
-                <exclude>org.apache.tuscany.sca:*</exclude>
-            </excludes>
-        </dependencySet>
-    </dependencySets>
+        </fileSet>
+    </fileSets>
 
 </component>
diff --git a/branches/sca-equinox/distribution/features/ejava/pom.xml b/branches/sca-equinox/distribution/features/ejava/pom.xml
index eb77ac425e..b4a27f7dca 100644
--- a/branches/sca-equinox/distribution/features/ejava/pom.xml
+++ b/branches/sca-equinox/distribution/features/ejava/pom.xml
@@ -103,15 +103,32 @@
 
     <profiles>
 
-        <!-- Default build profile that can be used to build the distro packages -->
+        <!-- Build profile that can be used to build the distro packages -->
         <profile>
-            <id>default</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
+            <id>distribution</id>
             <build>
                 <plugins>
                     <plugin>
+                        <groupId>org.apache.tuscany.sca</groupId>
+                        <artifactId>tuscany-maven-bundle-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>distribution-modules</id>
+                                <phase>generate-resources</phase>
+                                <goals>
+                                    <goal>generate-modules</goal>
+                                </goals>
+                                <configuration>
+                                    <targetDirectory>target/modules</targetDirectory>
+                                    <excludeDirectories>
+                                        <excludeDirectory>../core/target/modules</excludeDirectory>
+                                    </excludeDirectories>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+
+                    <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-assembly-plugin</artifactId>
                         <executions>
diff --git a/branches/sca-equinox/distribution/features/ejava/src/main/assembly/bin.xml b/branches/sca-equinox/distribution/features/ejava/src/main/assembly/bin.xml
index fd49912e91..7413fde78f 100644
--- a/branches/sca-equinox/distribution/features/ejava/src/main/assembly/bin.xml
+++ b/branches/sca-equinox/distribution/features/ejava/src/main/assembly/bin.xml
@@ -32,7 +32,7 @@
 
     <componentDescriptors>
         <componentDescriptor>../core/src/main/components/bin-common.xml</componentDescriptor>
-        <componentDescriptor>../core/src/main/components/bin-filtered-dependencies.xml</componentDescriptor>
+        <componentDescriptor>../core/src/main/components/bin-modules.xml</componentDescriptor>
         <componentDescriptor>src/main/components/bin-samples.xml</componentDescriptor>
     </componentDescriptors>
 </assembly>
diff --git a/branches/sca-equinox/distribution/features/manager/pom.xml b/branches/sca-equinox/distribution/features/manager/pom.xml
index f73004e5cd..219bdd4a11 100644
--- a/branches/sca-equinox/distribution/features/manager/pom.xml
+++ b/branches/sca-equinox/distribution/features/manager/pom.xml
@@ -146,15 +146,32 @@
 
     <profiles>
 
-        <!-- Default build profile that can be used to build the distro packages -->
+        <!-- Build profile that can be used to build the distro packages -->
         <profile>
-            <id>default</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
+            <id>distribution</id>
             <build>
                 <plugins>
                     <plugin>
+                        <groupId>org.apache.tuscany.sca</groupId>
+                        <artifactId>tuscany-maven-bundle-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>distribution-modules</id>
+                                <phase>generate-resources</phase>
+                                <goals>
+                                    <goal>generate-modules</goal>
+                                </goals>
+                                <configuration>
+                                    <targetDirectory>target/modules</targetDirectory>
+                                    <excludeDirectories>
+                                        <excludeDirectory>../core/target/modules</excludeDirectory>
+                                    </excludeDirectories>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+
+                    <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-assembly-plugin</artifactId>
                         <executions>
diff --git a/branches/sca-equinox/distribution/features/manager/src/main/assembly/bin.xml b/branches/sca-equinox/distribution/features/manager/src/main/assembly/bin.xml
index fd49912e91..7413fde78f 100644
--- a/branches/sca-equinox/distribution/features/manager/src/main/assembly/bin.xml
+++ b/branches/sca-equinox/distribution/features/manager/src/main/assembly/bin.xml
@@ -32,7 +32,7 @@
 
     <componentDescriptors>
         <componentDescriptor>../core/src/main/components/bin-common.xml</componentDescriptor>
-        <componentDescriptor>../core/src/main/components/bin-filtered-dependencies.xml</componentDescriptor>
+        <componentDescriptor>../core/src/main/components/bin-modules.xml</componentDescriptor>
         <componentDescriptor>src/main/components/bin-samples.xml</componentDescriptor>
     </componentDescriptors>
 </assembly>
diff --git a/branches/sca-equinox/distribution/features/pom.xml b/branches/sca-equinox/distribution/features/pom.xml
index 15cb996980..cba199833a 100644
--- a/branches/sca-equinox/distribution/features/pom.xml
+++ b/branches/sca-equinox/distribution/features/pom.xml
@@ -34,9 +34,9 @@
         <module>all</module>
         <module>core</module>
         <module>ejava</module>
-        <module>repository</module>
         <module>manager</module>
         <module>process</module>
+        <module>repository</module>
         <module>web20</module>
         <module>webservice</module>
     </modules>
diff --git a/branches/sca-equinox/distribution/features/process/pom.xml b/branches/sca-equinox/distribution/features/process/pom.xml
index b088e474be..50f33a0e8c 100644
--- a/branches/sca-equinox/distribution/features/process/pom.xml
+++ b/branches/sca-equinox/distribution/features/process/pom.xml
@@ -55,15 +55,32 @@
 
     <profiles>
 
-        <!-- Default build profile that can be used to build the distro packages -->
+        <!-- Build profile that can be used to build the distro packages -->
         <profile>
-            <id>default</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
+            <id>distribution</id>
             <build>
                 <plugins>
                     <plugin>
+                        <groupId>org.apache.tuscany.sca</groupId>
+                        <artifactId>tuscany-maven-bundle-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>distribution-modules</id>
+                                <phase>generate-resources</phase>
+                                <goals>
+                                    <goal>generate-modules</goal>
+                                </goals>
+                                <configuration>
+                                    <targetDirectory>target/modules</targetDirectory>
+                                    <excludeDirectories>
+                                        <excludeDirectory>../core/target/modules</excludeDirectory>
+                                    </excludeDirectories>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+
+                    <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-assembly-plugin</artifactId>
                         <executions>
diff --git a/branches/sca-equinox/distribution/features/process/src/main/assembly/bin.xml b/branches/sca-equinox/distribution/features/process/src/main/assembly/bin.xml
index fd49912e91..7413fde78f 100644
--- a/branches/sca-equinox/distribution/features/process/src/main/assembly/bin.xml
+++ b/branches/sca-equinox/distribution/features/process/src/main/assembly/bin.xml
@@ -32,7 +32,7 @@
 
     <componentDescriptors>
         <componentDescriptor>../core/src/main/components/bin-common.xml</componentDescriptor>
-        <componentDescriptor>../core/src/main/components/bin-filtered-dependencies.xml</componentDescriptor>
+        <componentDescriptor>../core/src/main/components/bin-modules.xml</componentDescriptor>
         <componentDescriptor>src/main/components/bin-samples.xml</componentDescriptor>
     </componentDescriptors>
 </assembly>
diff --git a/branches/sca-equinox/distribution/features/repository/pom.xml b/branches/sca-equinox/distribution/features/repository/pom.xml
index 88b0950b73..ee1cb85df6 100644
--- a/branches/sca-equinox/distribution/features/repository/pom.xml
+++ b/branches/sca-equinox/distribution/features/repository/pom.xml
@@ -80,10 +80,7 @@
     
         <!-- Default build profile that can be used to build the distro packages -->
         <profile>
-            <id>default</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
+            <id>distribution</id>
             <build>
                 <plugins>
                     <plugin>
diff --git a/branches/sca-equinox/distribution/features/web20/pom.xml b/branches/sca-equinox/distribution/features/web20/pom.xml
index b1959aabe2..b1f0d587f0 100644
--- a/branches/sca-equinox/distribution/features/web20/pom.xml
+++ b/branches/sca-equinox/distribution/features/web20/pom.xml
@@ -103,15 +103,32 @@
 
     <profiles>
 
-        <!-- Default build profile that can be used to build the distro packages -->
+        <!-- Build profile that can be used to build the distro packages -->
         <profile>
-            <id>default</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
+            <id>distribution</id>
             <build>
                 <plugins>
                     <plugin>
+                        <groupId>org.apache.tuscany.sca</groupId>
+                        <artifactId>tuscany-maven-bundle-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>distribution-modules</id>
+                                <phase>generate-resources</phase>
+                                <goals>
+                                    <goal>generate-modules</goal>
+                                </goals>
+                                <configuration>
+                                    <targetDirectory>target/modules</targetDirectory>
+                                    <excludeDirectories>
+                                        <excludeDirectory>../core/target/modules</excludeDirectory>
+                                    </excludeDirectories>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+
+                    <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-assembly-plugin</artifactId>
                         <executions>
diff --git a/branches/sca-equinox/distribution/features/web20/src/main/assembly/bin.xml b/branches/sca-equinox/distribution/features/web20/src/main/assembly/bin.xml
index fd49912e91..7413fde78f 100644
--- a/branches/sca-equinox/distribution/features/web20/src/main/assembly/bin.xml
+++ b/branches/sca-equinox/distribution/features/web20/src/main/assembly/bin.xml
@@ -32,7 +32,7 @@
 
     <componentDescriptors>
         <componentDescriptor>../core/src/main/components/bin-common.xml</componentDescriptor>
-        <componentDescriptor>../core/src/main/components/bin-filtered-dependencies.xml</componentDescriptor>
+        <componentDescriptor>../core/src/main/components/bin-modules.xml</componentDescriptor>
         <componentDescriptor>src/main/components/bin-samples.xml</componentDescriptor>
     </componentDescriptors>
 </assembly>
diff --git a/branches/sca-equinox/distribution/features/webservice/pom.xml b/branches/sca-equinox/distribution/features/webservice/pom.xml
index d53eff2e70..be9329716e 100644
--- a/branches/sca-equinox/distribution/features/webservice/pom.xml
+++ b/branches/sca-equinox/distribution/features/webservice/pom.xml
@@ -117,15 +117,32 @@
 
     <profiles>
 
-        <!-- Default build profile that can be used to build the distro packages -->
+        <!-- Build profile that can be used to build the distro packages -->
         <profile>
-            <id>default</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
+            <id>distribution</id>
             <build>
                 <plugins>
                     <plugin>
+                        <groupId>org.apache.tuscany.sca</groupId>
+                        <artifactId>tuscany-maven-bundle-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>distribution-modules</id>
+                                <phase>generate-resources</phase>
+                                <goals>
+                                    <goal>generate-modules</goal>
+                                </goals>
+                                <configuration>
+                                    <targetDirectory>target/modules</targetDirectory>
+                                    <excludeDirectories>
+                                        <excludeDirectory>../core/target/modules</excludeDirectory>
+                                    </excludeDirectories>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+
+                    <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-assembly-plugin</artifactId>
                         <executions>
diff --git a/branches/sca-equinox/distribution/features/webservice/src/main/assembly/bin.xml b/branches/sca-equinox/distribution/features/webservice/src/main/assembly/bin.xml
index fd49912e91..7413fde78f 100644
--- a/branches/sca-equinox/distribution/features/webservice/src/main/assembly/bin.xml
+++ b/branches/sca-equinox/distribution/features/webservice/src/main/assembly/bin.xml
@@ -32,7 +32,7 @@
 
     <componentDescriptors>
         <componentDescriptor>../core/src/main/components/bin-common.xml</componentDescriptor>
-        <componentDescriptor>../core/src/main/components/bin-filtered-dependencies.xml</componentDescriptor>
+        <componentDescriptor>../core/src/main/components/bin-modules.xml</componentDescriptor>
         <componentDescriptor>src/main/components/bin-samples.xml</componentDescriptor>
     </componentDescriptors>
 </assembly>
diff --git a/branches/sca-equinox/modules/pom.xml b/branches/sca-equinox/modules/pom.xml
index 70d251c087..3871f5d13b 100644
--- a/branches/sca-equinox/modules/pom.xml
+++ b/branches/sca-equinox/modules/pom.xml
@@ -142,7 +142,6 @@
                 <module>node-impl</module>
                 <module>node-launcher</module>
                 <module>node-launcher-equinox</module>
-                <module>thirdparty-library</module>
                 <module>node-launcher-webapp</module>
                 <module>node-manager</module>
                 <module>policy</module>