tuscany-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rf...@apache.org
Subject svn commit: r740462 [1/2] - in /tuscany/java/sca/features: ./ all/ all/src/ api/ api/src/ compact/ compact/src/ core/ core/src/ ejava/ ejava/src/ etc/ host-webapp/ host-webapp/src/ manager/ manager/src/ process/ process/src/ repository/ repository/src/...
Date Tue, 03 Feb 2009 21:40:01 GMT
Author: rfeng
Date: Tue Feb  3 21:39:58 2009
New Revision: 740462

URL: http://svn.apache.org/viewvc?rev=740462&view=rev
Log:
Create a separate folder to hold the definitions of tuscany features 

Added:
    tuscany/java/sca/features/
      - copied from r740351, tuscany/java/sca/distribution/
Removed:
    tuscany/java/sca/features/all/src/
    tuscany/java/sca/features/api/src/
    tuscany/java/sca/features/compact/src/
    tuscany/java/sca/features/core/src/
    tuscany/java/sca/features/ejava/src/
    tuscany/java/sca/features/etc/
    tuscany/java/sca/features/host-webapp/src/
    tuscany/java/sca/features/manager/src/
    tuscany/java/sca/features/process/src/
    tuscany/java/sca/features/repository/src/
    tuscany/java/sca/features/web20/src/
    tuscany/java/sca/features/webservice/src/
Modified:
    tuscany/java/sca/features/all/pom.xml
    tuscany/java/sca/features/api/pom.xml
    tuscany/java/sca/features/compact/pom.xml
    tuscany/java/sca/features/core/pom.xml
    tuscany/java/sca/features/ejava/pom.xml
    tuscany/java/sca/features/host-webapp/pom.xml
    tuscany/java/sca/features/manager/pom.xml
    tuscany/java/sca/features/pom.xml
    tuscany/java/sca/features/process/pom.xml
    tuscany/java/sca/features/repository/pom.xml
    tuscany/java/sca/features/web20/pom.xml
    tuscany/java/sca/features/webservice/pom.xml

Modified: tuscany/java/sca/features/all/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/features/all/pom.xml?rev=740462&r1=740351&r2=740462&view=diff
==============================================================================
--- tuscany/java/sca/features/all/pom.xml (original)
+++ tuscany/java/sca/features/all/pom.xml Tue Feb  3 21:39:58 2009
@@ -21,48 +21,48 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-distribution</artifactId>
+        <artifactId>tuscany-feature</artifactId>
         <version>2.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
-    <artifactId>tuscany-distribution-all</artifactId>
-    <name>Apache Tuscany SCA All-in-one Distribution</name>
+    <artifactId>tuscany-feature-all</artifactId>
+    <name>Apache Tuscany SCA All-in-one Feature</name>
     <packaging>pom</packaging>
 
     <dependencies>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-distribution-api</artifactId>
+            <artifactId>tuscany-feature-api</artifactId>
             <type>pom</type>
             <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-distribution-core</artifactId>
+            <artifactId>tuscany-feature-core</artifactId>
             <type>pom</type>
             <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-distribution-webapp</artifactId>
+            <artifactId>tuscany-feature-webapp</artifactId>
             <type>pom</type>
             <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-distribution-webservice</artifactId>
+            <artifactId>tuscany-feature-webservice</artifactId>
             <type>pom</type>
             <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-distribution-ejava</artifactId>
+            <artifactId>tuscany-feature-ejava</artifactId>
             <type>pom</type>
             <version>2.0-SNAPSHOT</version>
         </dependency>
@@ -75,21 +75,21 @@
         <!--
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-distribution-manager</artifactId>
+            <artifactId>tuscany-feature-manager</artifactId>
             <type>pom</type>
             <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-distribution-process</artifactId>
+            <artifactId>tuscany-feature-process</artifactId>
             <type>pom</type>
             <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-distribution-web20</artifactId>
+            <artifactId>tuscany-feature-web20</artifactId>
             <type>pom</type>
             <version>2.0-SNAPSHOT</version>
         </dependency>
@@ -121,97 +121,4 @@
 
     </dependencies>
 
-    <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>
-                             <useDistributionName>false</useDistributionName>
-                             <generateManifestJar>true</generateManifestJar>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
-    <profiles>
-
-        <!-- Build profile that can be used to build and eclipse project to make -->
-        <!-- it easy to import the pde target into the workspace                 -->
-        <!--profile>
-            <id>eclipse</id>
-            <build>
-               <plugins>
-                   <plugin> 
-                       <groupId>org.apache.tuscany.sca</groupId> 
-                       <artifactId>tuscany-maven-bundle-plugin</artifactId> 
-                       <version>2.0-SNAPSHOT</version> 
-                       <extensions>true</extensions> 
-                       <executions> 
-                           <execution> 
-                               <id>generate-pde</id> 
-                               <phase>generate-resources</phase> 
-                               <goals> 
-                                   <goal>eclipse</goal> 
-                               </goals> 
-                               <configuration> 
-                               </configuration> 
-                           </execution>
-                       </executions>
-                   </plugin>
-               </plugins>
-            </build>
-        </profile-->
-    
-        <!-- Build profile that can be used to build the distro packages -->
-        <profile>
-            <id>distribution</id>
-            <activation>
-                <activeByDefault>false</activeByDefault>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-assembly-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>distribution-package</id>
-                                <phase>package</phase>
-                                <goals>
-                                    <goal>single</goal>
-                                </goals>
-                                <configuration>
-                                    <descriptors>
-                                        <descriptor>src/main/assembly/bin.xml</descriptor>
-                                        <!-- TUSCANY-2814 descriptor>src/main/assembly/src.xml</descriptor -->
-                                    </descriptors>
-                                    <tarLongFileMode>gnu</tarLongFileMode>
-                                    <finalName>apache-tuscany-sca-all-2.0-SNAPSHOT</finalName>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>    
-
-        <!-- Profile that can be used to build the modules included in the distro -->
-        <profile>
-            <id>modules</id>
-            <modules>
-            </modules>
-        </profile>
-    </profiles>
-
 </project>

Modified: tuscany/java/sca/features/api/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/features/api/pom.xml?rev=740462&r1=740351&r2=740462&view=diff
==============================================================================
--- tuscany/java/sca/features/api/pom.xml (original)
+++ tuscany/java/sca/features/api/pom.xml Tue Feb  3 21:39:58 2009
@@ -21,13 +21,13 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-distribution</artifactId>
+        <artifactId>tuscany-feature</artifactId>
         <version>2.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
-    <artifactId>tuscany-distribution-api</artifactId>
-    <name>Apache Tuscany SCA API Distribution</name>
+    <artifactId>tuscany-feature-api</artifactId>
+    <name>Apache Tuscany SCA API Feature</name>
     <packaging>pom</packaging>
 
     <dependencies>
@@ -48,68 +48,4 @@
 
     </dependencies>
 
-    <profiles>
-
-        <!-- Build profile that can be used to build the distro packages -->
-        <profile>
-            <id>distribution</id>
-            <activation>
-                <activeByDefault>false</activeByDefault>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.tuscany.sca</groupId>
-                        <artifactId>tuscany-maven-bundle-plugin</artifactId>
-                        <version>2.0-SNAPSHOT</version>
-                        <executions>
-                            <execution>
-                                <id>distribution-modules</id>
-                                <phase>generate-resources</phase>
-                                <goals>
-                                    <goal>generate-modules</goal>
-                                </goals>
-                                <configuration>
-                                    <targetDirectory>target/modules</targetDirectory>
-                                    <generateManifestJar>true</generateManifestJar>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-assembly-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>distribution-package</id>
-                                <phase>package</phase>
-                                <goals>
-                                    <goal>single</goal>
-                                </goals>
-                                <configuration>
-                                    <descriptors>
-                                        <descriptor>src/main/assembly/bin.xml</descriptor>
-                                        <descriptor>src/main/assembly/src.xml</descriptor>
-                                    </descriptors>
-                                    <tarLongFileMode>gnu</tarLongFileMode>
-                                    <finalName>apache-tuscany-sca-api-2.0-SNAPSHOT</finalName>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        
-        <!-- Profile that can be used to build the modules included in the distro -->
-        <profile>
-            <id>modules</id>
-            <modules>
-                <module>../../../modules/node-api</module>
-                <module>../../../modules/sca-api</module>
-            </modules>
-        </profile>
-    </profiles>
-
 </project>

Modified: tuscany/java/sca/features/compact/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/features/compact/pom.xml?rev=740462&r1=740351&r2=740462&view=diff
==============================================================================
--- tuscany/java/sca/features/compact/pom.xml (original)
+++ tuscany/java/sca/features/compact/pom.xml Tue Feb  3 21:39:58 2009
@@ -27,7 +27,7 @@
     </parent>
 
     <artifactId>tuscany-compact-distribution</artifactId>
-    <name>Apache Tuscany SCA Compact Distribution</name>
+    <name>Apache Tuscany SCA Compact Feature</name>
     <packaging>pom</packaging>
 
     <dependencies>
@@ -218,104 +218,4 @@
         </dependency>    
     </dependencies>
 
-    <profiles>
-
-        <!-- Build profile that can be used to build the distro packages -->
-        <profile>
-            <id>distribution</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.tuscany.sca</groupId>
-                        <artifactId>tuscany-maven-bundle-plugin</artifactId>
-                        <version>2.0-SNAPSHOT</version>
-                        <executions>
-                            <execution>
-                                <id>distribution-modules</id>
-                                <phase>generate-resources</phase>
-                                <goals>
-                                    <goal>generate-modules</goal>
-                                </goals>
-                                <configuration>
-                                    <targetDirectory>target/modules</targetDirectory>
-                                    <generateManifestJar>true</generateManifestJar>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-assembly-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>distribution-package</id>
-                                <phase>package</phase>
-                                <goals>
-                                    <goal>single</goal>
-                                </goals>
-                                <configuration>
-                                    <descriptors>
-                                        <descriptor>src/main/assembly/bin.xml</descriptor>
-                                        <descriptor>src/main/assembly/src.xml</descriptor>
-                                    </descriptors>
-                                    <tarLongFileMode>gnu</tarLongFileMode>
-                                    <finalName>apache-tuscany-sca-compact-2.0-SNAPSHOT</finalName>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-
-                </plugins>
-            </build>
-        </profile>
-        
-        <!-- Profile that can be used to build the modules included in the distro -->
-        <profile>
-            <id>modules</id>
-            <modules>
-                <module>../../modules/assembly</module>
-                <module>../../modules/assembly-xml</module>
-                <module>../../modules/assembly-xsd</module>
-                <module>../../modules/binding-sca</module>
-                <module>../../modules/binding-sca-xml</module>
-                <module>../../modules/contribution</module>
-                <module>../../modules/contribution-java</module>
-                <module>../../modules/contribution-namespace</module>
-                <module>../../modules/contribution-xml</module>
-                <module>../../modules/core</module>
-                <module>../../modules/core-databinding</module>
-                <module>../../modules/core-spi</module>
-                <module>../../modules/databinding</module>
-                <module>../../modules/databinding-jaxb</module>
-                <module>../../modules/definitions</module>
-                <module>../../modules/definitions-xml</module>
-                <module>../../modules/endpoint</module>
-                <module>../../modules/extensibility</module>
-                <module>../../modules/host-http</module>
-                <module>../../modules/host-webapp</module>
-                <module>../../modules/implementation-java</module>
-                <module>../../modules/implementation-java-runtime</module>
-                <module>../../modules/implementation-java-xml</module>
-                <module>../../modules/implementation-node</module>
-                <module>../../modules/interface</module>
-                <module>../../modules/interface-java</module>
-                <module>../../modules/interface-java-jaxws</module>
-                <module>../../modules/interface-java-xml</module>
-                <module>../../modules/monitor</module>
-                <module>../../modules/node-api</module>
-                <module>../../modules/node-impl</module>
-                <module>../../modules/policy</module>
-                <module>../../modules/policy-xml</module>
-                <module>../../modules/sca-api</module>
-                <module>../../modules/workspace</module>
-                <module>../../modules/workspace-impl</module>
-                <module>../../modules/workspace-xml</module>
-                <module>../../modules/xsd</module>
-            </modules>
-        </profile>
-    </profiles>
 </project>

Modified: tuscany/java/sca/features/core/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/features/core/pom.xml?rev=740462&r1=740351&r2=740462&view=diff
==============================================================================
--- tuscany/java/sca/features/core/pom.xml (original)
+++ tuscany/java/sca/features/core/pom.xml Tue Feb  3 21:39:58 2009
@@ -21,16 +21,37 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-distribution</artifactId>
+        <artifactId>tuscany-feature</artifactId>
         <version>2.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
-    <artifactId>tuscany-distribution-core</artifactId>
-    <name>Apache Tuscany SCA Core Distribution</name>
+    <artifactId>tuscany-feature-core</artifactId>
+    <name>Apache Tuscany SCA Core Feature</name>
     <packaging>pom</packaging>
 
     <dependencies>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-feature-api</artifactId>
+            <type>pom</type>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+
+        <!-- SCA API -->
+<!--
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-sca-api</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-node-api</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+-->
 
         <!-- Assembly model -->
         <dependency>
@@ -181,11 +202,6 @@
         <!-- Node runtime -->
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node-api</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-node-impl</artifactId>
             <version>2.0-SNAPSHOT</version>
         </dependency>
@@ -238,13 +254,6 @@
             <version>2.0-SNAPSHOT</version>
         </dependency>
 
-        <!-- SCA API -->
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-sca-api</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
         <!-- XMLSchema support -->
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
@@ -258,112 +267,4 @@
         </dependency>
     </dependencies>
 
-    <profiles>
-
-        <!-- Build profile that can be used to build the distro packages -->
-        <profile>
-            <id>distribution</id>
-            <activation>
-                <activeByDefault>false</activeByDefault>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.tuscany.sca</groupId>
-                        <artifactId>tuscany-maven-bundle-plugin</artifactId>
-                        <version>2.0-SNAPSHOT</version>
-                        <executions>
-                            <execution>
-                                <id>distribution-modules</id>
-                                <phase>generate-resources</phase>
-                                <goals>
-                                    <goal>generate-modules</goal>
-                                </goals>
-                                <configuration>
-                                    <targetDirectory>target/modules</targetDirectory>
-                                    <generateManifestJar>true</generateManifestJar>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-assembly-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>distribution-package</id>
-                                <phase>package</phase>
-                                <goals>
-                                    <goal>single</goal>
-                                </goals>
-                                <configuration>
-                                    <descriptors>
-                                        <descriptor>src/main/assembly/bin.xml</descriptor>
-                                        <descriptor>src/main/assembly/src.xml</descriptor>
-                                    </descriptors>
-                                    <tarLongFileMode>gnu</tarLongFileMode>
-                                    <finalName>apache-tuscany-sca-core-2.0-SNAPSHOT</finalName>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-
-                </plugins>
-            </build>
-        </profile>
-        
-        <!-- Profile that can be used to build the modules included in the distro -->
-        <profile>
-            <id>modules</id>
-            <modules>
-                <module>../../modules/assembly</module>
-                <module>../../modules/assembly-xml</module>
-                <module>../../modules/assembly-xsd</module>
-                <module>../../modules/binding-sca</module>
-                <module>../../modules/binding-sca-xml</module>
-                <module>../../modules/contribution</module>
-                <module>../../modules/contribution-java</module>
-                <module>../../modules/contribution-namespace</module>
-                <module>../../modules/contribution-xml</module>
-                <module>../../modules/core</module>
-                <module>../../modules/core-databinding</module>
-                <module>../../modules/core-spi</module>
-                <module>../../modules/databinding</module>
-                <module>../../modules/databinding-jaxb</module>
-                <module>../../modules/definitions</module>
-                <module>../../modules/definitions-xml</module>
-                <module>../../modules/endpoint</module>
-                <module>../../modules/extensibility</module>
-                <module>../../modules/extensibility-equinox</module>
-                <module>../../modules/host-http</module>
-                <module>../../modules/implementation-java</module>
-                <module>../../modules/implementation-java-runtime</module>
-                <module>../../modules/implementation-java-xml</module>
-                <module>../../modules/implementation-node</module>
-                <module>../../modules/implementation-node-runtime</module>
-                <module>../../modules/interface</module>
-                <module>../../modules/interface-java</module>
-                <module>../../modules/interface-java-jaxws</module>
-                <module>../../modules/interface-java-xml</module>
-                <module>../../modules/interface-wsdl</module>
-                <module>../../modules/interface-wsdl-xml</module>
-                <module>../../modules/monitor</module>
-                <module>../../modules/node-api</module>
-                <module>../../modules/node-impl</module>
-                <module>../../modules/node-launcher</module>
-                <module>../../modules/node-launcher-equinox</module>
-                <module>../../modules/policy</module>
-                <module>../../modules/policy-security</module>
-                <module>../../modules/policy-xml</module>
-                <module>../../modules/sca-api</module>
-                <module>../../modules/workspace</module>
-                <module>../../modules/workspace-impl</module>
-                <module>../../modules/workspace-xml</module>
-                <module>../../modules/xsd</module>
-                <module>../../modules/xsd-xml</module>
-            </modules>
-        </profile>
-    </profiles>
-
 </project>

Modified: tuscany/java/sca/features/ejava/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/features/ejava/pom.xml?rev=740462&r1=740351&r2=740462&view=diff
==============================================================================
--- tuscany/java/sca/features/ejava/pom.xml (original)
+++ tuscany/java/sca/features/ejava/pom.xml Tue Feb  3 21:39:58 2009
@@ -21,13 +21,13 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-distribution</artifactId>
+        <artifactId>tuscany-feature</artifactId>
         <version>2.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
-    <artifactId>tuscany-distribution-ejava</artifactId>
-    <name>Apache Tuscany SCA JEE Distribution</name>
+    <artifactId>tuscany-feature-ejava</artifactId>
+    <name>Apache Tuscany SCA JEE Feature</name>
     <packaging>pom</packaging>
 
     <dependencies>
@@ -35,7 +35,7 @@
         <!-- Core distribution -->
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-distribution-core</artifactId>
+            <artifactId>tuscany-feature-core</artifactId>
             <type>pom</type>
             <version>2.0-SNAPSHOT</version>
         </dependency>
@@ -97,115 +97,4 @@
 -->
     </dependencies>
 
-    <profiles>
-
-        <!-- Build profile that can be used to build the distro packages -->
-        <profile>
-            <id>distribution</id>
-            <activation>
-                <activeByDefault>false</activeByDefault>
-            </activation>
-            <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>
-                            <execution>
-                                <id>distribution-package</id>
-                                <phase>package</phase>
-                                <goals>
-                                    <goal>single</goal>
-                                </goals>
-                                <configuration>
-                                    <descriptors>
-                                        <descriptor>src/main/assembly/bin.xml</descriptor>
-                                        <descriptor>src/main/assembly/src.xml</descriptor>
-                                    </descriptors>
-                                    <tarLongFileMode>gnu</tarLongFileMode>
-                                    <finalName>apache-tuscany-sca-ejava-2.0-SNAPSHOT</finalName>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        
-        <!-- Profile that can be used to build the modules included in the distro -->
-        <profile>
-            <id>modules</id>
-            <modules>
-                <module>../../modules/assembly</module>
-                <module>../../modules/assembly-xml</module>
-                <module>../../modules/assembly-xsd</module>
-                <module>../../modules/binding-rmi</module>
-                <module>../../modules/binding-rmi-runtime</module>
-                <module>../../modules/binding-sca</module>
-                <module>../../modules/binding-sca-xml</module>
-                <module>../../modules/contribution</module>
-                <module>../../modules/contribution-java</module>
-                <module>../../modules/contribution-namespace</module>
-                <module>../../modules/contribution-xml</module>
-                <module>../../modules/core</module>
-                <module>../../modules/core-databinding</module>
-                <module>../../modules/core-spi</module>
-                <module>../../modules/databinding</module>
-                <module>../../modules/databinding-jaxb</module>
-                <module>../../modules/definitions</module>
-                <module>../../modules/definitions-xml</module>
-                <module>../../modules/endpoint</module>
-                <module>../../modules/extensibility</module>
-                <module>../../modules/extensibility-equinox</module>
-                <module>../../modules/host-http</module>
-                <module>../../modules/host-rmi</module>
-                <module>../../modules/implementation-java</module>
-                <module>../../modules/implementation-java-runtime</module>
-                <module>../../modules/implementation-java-xml</module>
-                <module>../../modules/implementation-node</module>
-                <module>../../modules/implementation-node-runtime</module>
-                <module>../../modules/interface</module>
-                <module>../../modules/interface-java</module>
-                <module>../../modules/interface-java-jaxws</module>
-                <module>../../modules/interface-java-xml</module>
-                <module>../../modules/interface-wsdl</module>
-                <module>../../modules/interface-wsdl-xml</module>
-                <module>../../modules/monitor</module>
-                <module>../../modules/node-api</module>
-                <module>../../modules/node-impl</module>
-                <module>../../modules/node-launcher</module>
-                <module>../../modules/node-launcher-equinox</module>
-                <module>../../modules/policy</module>
-                <module>../../modules/policy-security</module>
-                <module>../../modules/policy-xml</module>
-                <module>../../modules/sca-api</module>
-                <module>../../modules/workspace</module>
-                <module>../../modules/workspace-impl</module>
-                <module>../../modules/workspace-xml</module>
-                <module>../../modules/xsd</module>
-                <module>../../modules/xsd-xml</module>
-            </modules>
-        </profile>
-    </profiles>
-
 </project>

Modified: tuscany/java/sca/features/host-webapp/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/features/host-webapp/pom.xml?rev=740462&r1=740351&r2=740462&view=diff
==============================================================================
--- tuscany/java/sca/features/host-webapp/pom.xml (original)
+++ tuscany/java/sca/features/host-webapp/pom.xml Tue Feb  3 21:39:58 2009
@@ -21,21 +21,21 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-distribution</artifactId>
+        <artifactId>tuscany-feature</artifactId>
         <version>2.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
-    <artifactId>tuscany-distribution-webapp</artifactId>
-    <name>Apache Tuscany SCA Webapp Distribution</name>
+    <artifactId>tuscany-feature-webapp</artifactId>
+    <name>Apache Tuscany SCA Webapp Feature</name>
     <packaging>pom</packaging>
 
     <dependencies>
 
-        <!-- Core distribution -->
+        <!-- Core feature -->
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-distribution-core</artifactId>
+            <artifactId>tuscany-feature-core</artifactId>
             <type>pom</type>
             <version>2.0-SNAPSHOT</version>
         </dependency>
@@ -50,67 +50,4 @@
 
     </dependencies>
 
-    <profiles>
-
-        <!-- Build profile that can be used to build the distro packages -->
-        <profile>
-            <id>distribution</id>
-            <activation>
-                <activeByDefault>false</activeByDefault>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.tuscany.sca</groupId>
-                        <artifactId>tuscany-maven-bundle-plugin</artifactId>
-                        <version>2.0-SNAPSHOT</version>
-                        <executions>
-                            <execution>
-                                <id>distribution-modules</id>
-                                <phase>generate-resources</phase>
-                                <goals>
-                                    <goal>generate-modules</goal>
-                                </goals>
-                                <configuration>
-                                    <targetDirectory>target/modules</targetDirectory>
-                                    <generateManifestJar>true</generateManifestJar>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-assembly-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>distribution-package</id>
-                                <phase>package</phase>
-                                <goals>
-                                    <goal>single</goal>
-                                </goals>
-                                <configuration>
-                                    <descriptors>
-                                        <descriptor>src/main/assembly/bin.xml</descriptor>
-                                        <descriptor>src/main/assembly/src.xml</descriptor>
-                                    </descriptors>
-                                    <tarLongFileMode>gnu</tarLongFileMode>
-                                    <finalName>apache-tuscany-sca-webapp-2.0-SNAPSHOT</finalName>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        
-        <!-- Profile that can be used to build the modules included in the distro -->
-        <profile>
-            <id>modules</id>
-            <modules>
-                <module>../../../modules/host-webapp</module>
-            </modules>
-        </profile>
-    </profiles>
-
 </project>

Modified: tuscany/java/sca/features/manager/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/features/manager/pom.xml?rev=740462&r1=740351&r2=740462&view=diff
==============================================================================
--- tuscany/java/sca/features/manager/pom.xml (original)
+++ tuscany/java/sca/features/manager/pom.xml Tue Feb  3 21:39:58 2009
@@ -1,280 +1,147 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * 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.    
--->
-<project>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-distribution</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>tuscany-distribution-manager</artifactId>
-    <name>Apache Tuscany SCA Domain Manager Distribution</name>
-    <packaging>pom</packaging>
-
-    <dependencies>
-    
-        <!-- Core distribution -->
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-distribution-core</artifactId>
-            <type>pom</type>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <!-- Binding Models -->
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-atom</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ejb</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-http</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-jsonrpc</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-rmi</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-rss</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-sca-xml</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-ws-xml</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <!-- Contribution models -->
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-contribution-java</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-contribution-namespace</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-contribution-resource</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <!-- Domain support -->
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-domain-manager</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-node-manager</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <!-- Implementation Models -->
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-bpel</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-ejb</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-java-xml</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-node</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-resource</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-widget</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-    </dependencies>
-
-    <profiles>
-
-        <!-- Build profile that can be used to build the distro packages -->
-        <profile>
-            <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>
-                            <execution>
-                                <id>distribution-package</id>
-                                <phase>package</phase>
-                                <goals>
-                                    <goal>single</goal>
-                                </goals>
-                                <configuration>
-                                    <descriptors>
-                                        <descriptor>src/main/assembly/bin.xml</descriptor>
-                                        <descriptor>src/main/assembly/src.xml</descriptor>
-                                    </descriptors>
-                                    <tarLongFileMode>gnu</tarLongFileMode>
-                                    <finalName>apache-tuscany-sca-manager-2.0-SNAPSHOT</finalName>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        
-        <!-- Profile that can be used to build the modules included in the distro -->
-        <profile>
-            <id>modules</id>
-            <modules>
-                <module>../../../modules/assembly</module>
-                <module>../../../modules/assembly-xml</module>
-                <module>../../../modules/assembly-xsd</module>
-                <module>../../../modules/binding-atom</module>
-                <module>../../../modules/binding-atom-abdera</module>
-                <module>../../../modules/binding-corba</module>
-                <module>../../../modules/binding-corba-runtime</module>
-                <module>../../../modules/binding-ejb</module>
-                <module>../../../modules/binding-http</module>
-                <module>../../../modules/binding-http-runtime</module>
-                <module>../../../modules/binding-jsonrpc</module>
-                <module>../../../modules/binding-rmi</module>
-                <module>../../../modules/binding-rss</module>
-                <module>../../../modules/binding-sca</module>
-                <module>../../../modules/binding-sca-xml</module>
-                <module>../../../modules/binding-ws</module>
-                <module>../../../modules/binding-ws-wsdlgen</module>
-                <module>../../../modules/binding-ws-xml</module>
-                <module>../../../modules/contribution</module>
-                <module>../../../modules/contribution-java</module>
-                <module>../../../modules/contribution-namespace</module>
-                <module>../../../modules/contribution-resource</module>
-                <module>../../../modules/contribution-xml</module>
-                <module>../../../modules/core</module>
-                <module>../../../modules/core-databinding</module>
-                <module>../../../modules/core-spi</module>
-                <module>../../../modules/data-api</module>
-                <module>../../../modules/databinding</module>
-                <module>../../../modules/databinding-jaxb</module>
-                <module>../../../modules/definitions</module>
-                <module>../../../modules/definitions-xml</module>
-                <module>../../../modules/domain-manager</module>
-                <module>../../../modules/endpoint</module>
-                <module>../../../modules/extensibility</module>
-                <module>../../../modules/extensibility-equinox</module>
-                <module>../../../modules/host-corba</module>
-                <module>../../../modules/host-corba-jse</module>
-                <module>../../../modules/host-http</module>
-                <module>../../../modules/host-jetty</module>
-                <module>../../../modules/implementation-bpel</module>
-                <module>../../../modules/implementation-ejb</module>
-                <module>../../../modules/implementation-java</module>
-                <module>../../../modules/implementation-java-runtime</module>
-                <module>../../../modules/implementation-java-xml</module>
-                <module>../../../modules/implementation-node</module>
-                <module>../../../modules/implementation-node-runtime</module>
-                <module>../../../modules/implementation-resource</module>
-                <module>../../../modules/implementation-widget</module>
-                <module>../../../modules/implementation-widget-runtime</module>
-                <module>../../../modules/interface</module>
-                <module>../../../modules/interface-java</module>
-                <module>../../../modules/interface-java-jaxws</module>
-                <module>../../../modules/interface-java-xml</module>
-                <module>../../../modules/interface-wsdl</module>
-                <module>../../../modules/interface-wsdl-xml</module>
-                <module>../../../modules/monitor</module>
-                <module>../../../modules/node-api</module>
-                <module>../../../modules/node-impl</module>
-                <module>../../../modules/node-launcher</module>
-                <module>../../../modules/node-launcher-equinox</module>
-                <module>../../../modules/node-launcher-webapp</module>
-                <module>../../../modules/node-manager</module>
-                <module>../../../modules/policy</module>
-                <module>../../../modules/policy-security</module>
-                <module>../../../modules/policy-security-jsr250</module>
-                <module>../../../modules/policy-security-ws</module>
-                <module>../../../modules/policy-xml</module>
-                <module>../../../modules/sca-api</module>
-                <module>../../../modules/workspace</module>
-                <module>../../../modules/workspace-impl</module>
-                <module>../../../modules/workspace-xml</module>
-                <module>../../../modules/xsd</module>
-                <module>../../../modules/xsd-xml</module>
-            </modules>
-        </profile>
-    </profiles>
-
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * 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.    
+-->
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.tuscany.sca</groupId>
+        <artifactId>tuscany-feature</artifactId>
+        <version>2.0-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>tuscany-feature-manager</artifactId>
+    <name>Apache Tuscany SCA Domain Manager Feature</name>
+    <packaging>pom</packaging>
+
+    <dependencies>
+    
+        <!-- Core feature -->
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-feature-core</artifactId>
+            <type>pom</type>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+
+        <!-- Binding Models -->
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-atom</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-ejb</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-http</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-jsonrpc</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-rmi</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-rss</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-sca-xml</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-binding-ws-xml</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+
+        <!-- Contribution models -->
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-contribution-java</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-contribution-namespace</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-contribution-resource</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+
+        <!-- Domain support -->
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-domain-manager</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-node-manager</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+
+        <!-- Implementation Models -->
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-bpel</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-ejb</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-java-xml</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-node</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-resource</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-widget</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+    </dependencies>
+
+</project>

Modified: tuscany/java/sca/features/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/features/pom.xml?rev=740462&r1=740351&r2=740462&view=diff
==============================================================================
--- tuscany/java/sca/features/pom.xml (original)
+++ tuscany/java/sca/features/pom.xml Tue Feb  3 21:39:58 2009
@@ -26,9 +26,9 @@
         <version>2.0-SNAPSHOT</version>
     </parent>
     <groupId>org.apache.tuscany.sca</groupId>
-    <artifactId>tuscany-distribution</artifactId>
+    <artifactId>tuscany-feature</artifactId>
     <packaging>pom</packaging>
-    <name>Apache Tuscany SCA Distributions</name>
+    <name>Apache Tuscany SCA Features</name>
 
     <modules>
         <module>all</module>
@@ -38,7 +38,6 @@
         <module>host-webapp</module>
         <module>webservice</module>
 <!--
-        <module>webservice</module>
         <module>manager</module>
         <module>process</module>
         <module>repository</module>

Modified: tuscany/java/sca/features/process/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/features/process/pom.xml?rev=740462&r1=740351&r2=740462&view=diff
==============================================================================
--- tuscany/java/sca/features/process/pom.xml (original)
+++ tuscany/java/sca/features/process/pom.xml Tue Feb  3 21:39:58 2009
@@ -1,173 +1,56 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * 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.    
--->
-<project>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-distribution</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>tuscany-distribution-process</artifactId>
-    <name>Apache Tuscany SCA Business Process Distribution</name>
-    <packaging>pom</packaging>
-
-    <dependencies>
-
-        <!-- Core distribution -->
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-distribution-core</artifactId>
-            <type>pom</type>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <!-- Implementations -->
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-bpel-ode</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-xquery</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-    </dependencies>
-
-    <profiles>
-
-        <!-- Build profile that can be used to build the distro packages -->
-        <profile>
-            <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>
-                            <execution>
-                                <id>distribution-package</id>
-                                <phase>package</phase>
-                                <goals>
-                                    <goal>single</goal>
-                                </goals>
-                                <configuration>
-                                    <descriptors>
-                                        <descriptor>src/main/assembly/bin.xml</descriptor>
-                                        <descriptor>src/main/assembly/src.xml</descriptor>
-                                    </descriptors>
-                                    <tarLongFileMode>gnu</tarLongFileMode>
-                                    <finalName>apache-tuscany-sca-process-2.0-SNAPSHOT</finalName>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        
-        <!-- Profile that can be used to build the modules included in the distro -->
-        <profile>
-            <id>modules</id>
-            <modules>
-                <module>../../../modules/assembly</module>
-                <module>../../../modules/assembly-xml</module>
-                <module>../../../modules/assembly-xsd</module>
-                <module>../../../modules/binding-corba</module>
-                <module>../../../modules/binding-corba-runtime</module>
-                <module>../../../modules/binding-sca</module>
-                <module>../../../modules/binding-sca-xml</module>
-                <module>../../../modules/contribution</module>
-                <module>../../../modules/contribution-java</module>
-                <module>../../../modules/contribution-namespace</module>
-                <module>../../../modules/contribution-xml</module>
-                <module>../../../modules/core</module>
-                <module>../../../modules/core-databinding</module>
-                <module>../../../modules/core-spi</module>
-                <module>../../../modules/data-api</module>
-                <module>../../../modules/databinding</module>
-                <module>../../../modules/databinding-jaxb</module>
-                <module>../../../modules/databinding-saxon</module>
-                <module>../../../modules/databinding-sdo</module>
-                <module>../../../modules/definitions</module>
-                <module>../../../modules/definitions-xml</module>
-                <module>../../../modules/endpoint</module>
-                <module>../../../modules/extensibility</module>
-                <module>../../../modules/extensibility-equinox</module>
-                <module>../../../modules/host-corba</module>
-                <module>../../../modules/host-corba-jse</module>
-                <module>../../../modules/host-http</module>
-                <module>../../../modules/implementation-bpel</module>
-                <module>../../../modules/implementation-bpel-ode</module>
-                <module>../../../modules/implementation-java</module>
-                <module>../../../modules/implementation-java-runtime</module>
-                <module>../../../modules/implementation-java-xml</module>
-                <module>../../../modules/implementation-node</module>
-                <module>../../../modules/implementation-node-runtime</module>
-                <module>../../../modules/implementation-xquery</module>
-                <module>../../../modules/interface</module>
-                <module>../../../modules/interface-java</module>
-                <module>../../../modules/interface-java-jaxws</module>
-                <module>../../../modules/interface-java-xml</module>
-                <module>../../../modules/interface-wsdl</module>
-                <module>../../../modules/interface-wsdl-xml</module>
-                <module>../../../modules/monitor</module>
-                <module>../../../modules/node-api</module>
-                <module>../../../modules/node-impl</module>
-                <module>../../../modules/node-launcher</module>
-                <module>../../../modules/node-launcher-equinox</module>
-                <module>../../../modules/node-launcher-webapp</module>
-                <module>../../../modules/policy</module>
-                <module>../../../modules/policy-security</module>
-                <module>../../../modules/policy-security-jsr250</module>
-                <module>../../../modules/policy-xml</module>
-                <module>../../../modules/sca-api</module>
-                <module>../../../modules/workspace</module>
-                <module>../../../modules/workspace-impl</module>
-                <module>../../../modules/workspace-xml</module>
-                <module>../../../modules/xsd</module>
-                <module>../../../modules/xsd-xml</module>
-            </modules>
-        </profile>
-    </profiles>
-
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * 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.    
+-->
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.tuscany.sca</groupId>
+        <artifactId>tuscany-feature</artifactId>
+        <version>2.0-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>tuscany-feature-process</artifactId>
+    <name>Apache Tuscany SCA Business Process Feature</name>
+    <packaging>pom</packaging>
+
+    <dependencies>
+
+        <!-- Core distribution -->
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-feature-core</artifactId>
+            <type>pom</type>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+
+        <!-- Implementations -->
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-bpel-ode</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-implementation-xquery</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+    </dependencies>
+
+</project>

Modified: tuscany/java/sca/features/repository/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/features/repository/pom.xml?rev=740462&r1=740351&r2=740462&view=diff
==============================================================================
--- tuscany/java/sca/features/repository/pom.xml (original)
+++ tuscany/java/sca/features/repository/pom.xml Tue Feb  3 21:39:58 2009
@@ -1,228 +1,84 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * 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.    
--->
-<project>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-distribution</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>tuscany-distribution-repository</artifactId>
-    <name>Apache Tuscany SCA Maven Repository Distribution</name>
-    <packaging>pom</packaging>
-
-    <dependencies>
-
-        <!-- All distribution -->
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-distribution-all</artifactId>
-            <type>pom</type>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <!-- Eclipse update site -->
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>org.apache.tuscany.sca.updatesite</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <!-- Maven plugins -->
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-maven-ant-generator</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-maven-bundle-plugin</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-maven-eclipse-compiler</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-maven-incremental-build</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-maven-wsdl2java</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-maven-java2wsdl</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-        
-    </dependencies>
-
-    <profiles>
-    
-        <!-- Default build profile that can be used to build the distro packages -->
-        <profile>
-            <id>distribution</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-assembly-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>distribution-package</id>
-                                <phase>package</phase>
-                                <goals>
-                                    <goal>single</goal>
-                                </goals>
-                                <configuration>
-                                    <descriptors>
-                                        <descriptor>src/main/assembly/repository.xml</descriptor>
-                                    </descriptors>
-                                    <tarLongFileMode>gnu</tarLongFileMode>
-                                    <finalName>apache-tuscany-sca-repository-2.0-SNAPSHOT</finalName>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>    
-
-        <!-- Profile that can be used to build the modules included in the distro -->
-        <profile>
-            <id>modules</id>
-            <modules>
-                <module>../../../modules/assembly</module>
-                <module>../../../modules/assembly-xml</module>
-                <module>../../../modules/assembly-xsd</module>
-                <module>../../../modules/binding-atom</module>
-                <module>../../../modules/binding-atom-abdera</module>
-                <module>../../../modules/binding-corba</module>
-                <module>../../../modules/binding-corba-runtime</module>
-                <module>../../../modules/binding-ejb</module>
-                <module>../../../modules/binding-ejb-runtime</module>
-                <module>../../../modules/binding-gdata</module>
-                <module>../../../modules/binding-gdata-gsoc</module>
-                <module>../../../modules/binding-gdata-runtime</module>
-                <module>../../../modules/binding-gdata-runtime-gsoc</module>
-                <module>../../../modules/binding-http</module>
-                <module>../../../modules/binding-http-runtime</module>
-                <module>../../../modules/binding-jms</module>
-                <module>../../../modules/binding-jms-runtime</module>
-                <module>../../../modules/binding-jsonrpc</module>
-                <module>../../../modules/binding-jsonrpc-runtime</module>
-                <module>../../../modules/binding-rmi</module>
-                <module>../../../modules/binding-rmi-runtime</module>
-                <module>../../../modules/binding-rss</module>
-                <module>../../../modules/binding-rss-rome</module>
-                <module>../../../modules/binding-sca</module>
-                <module>../../../modules/binding-sca-axis2</module>
-                <module>../../../modules/binding-sca-xml</module>
-                <module>../../../modules/binding-ws</module>
-                <module>../../../modules/binding-ws-axis2</module>
-                <module>../../../modules/binding-ws-axis2-policy</module>
-                <module>../../../modules/binding-ws-wsdlgen</module>
-                <module>../../../modules/binding-ws-xml</module>
-                <module>../../../modules/contribution</module>
-                <module>../../../modules/contribution-java</module>
-                <module>../../../modules/contribution-namespace</module>
-                <module>../../../modules/contribution-resource</module>
-                <module>../../../modules/contribution-xml</module>
-                <module>../../../modules/core</module>
-                <module>../../../modules/core-databinding</module>
-                <module>../../../modules/core-spi</module>
-                <module>../../../modules/data-api</module>
-                <module>../../../modules/databinding</module>
-                <module>../../../modules/databinding-axiom</module>
-                <module>../../../modules/databinding-fastinfoset</module>
-                <module>../../../modules/databinding-jaxb</module>
-                <module>../../../modules/databinding-jaxb-axiom</module>
-                <module>../../../modules/databinding-json</module>
-                <module>../../../modules/databinding-saxon</module>
-                <module>../../../modules/databinding-sdo</module>
-                <module>../../../modules/databinding-sdo-axiom</module>
-                <module>../../../modules/databinding-xmlbeans</module>
-                <module>../../../modules/definitions</module>
-                <module>../../../modules/definitions-xml</module>
-                <module>../../../modules/domain-manager</module>
-                <module>../../../modules/endpoint</module>
-                <module>../../../modules/extensibility</module>
-                <module>../../../modules/extensibility-equinox</module>
-                <module>../../../modules/host-corba</module>
-                <module>../../../modules/host-corba-jee</module>
-                <module>../../../modules/host-corba-jse</module>
-                <module>../../../modules/host-http</module>
-                <module>../../../modules/host-jetty</module>
-                <module>../../../modules/host-rmi</module>
-                <module>../../../modules/implementation-bpel</module>
-                <module>../../../modules/implementation-bpel-ode</module>
-                <module>../../../modules/implementation-ejb</module>
-                <module>../../../modules/implementation-java</module>
-                <module>../../../modules/implementation-java-runtime</module>
-                <module>../../../modules/implementation-java-xml</module>
-                <module>../../../modules/implementation-node</module>
-                <module>../../../modules/implementation-node-runtime</module>
-                <module>../../../modules/implementation-resource</module>
-                <module>../../../modules/implementation-resource-runtime</module>
-                <module>../../../modules/implementation-script</module>
-                <module>../../../modules/implementation-script-runtime</module>
-                <module>../../../modules/implementation-spring</module>
-                <module>../../../modules/implementation-widget</module>
-                <module>../../../modules/implementation-widget-runtime</module>
-                <module>../../../modules/implementation-xquery</module>
-                <module>../../../modules/interface</module>
-                <module>../../../modules/interface-java</module>
-                <module>../../../modules/interface-java-jaxws</module>
-                <module>../../../modules/interface-java-xml</module>
-                <module>../../../modules/interface-wsdl</module>
-                <module>../../../modules/interface-wsdl-xml</module>
-                <module>../../../modules/monitor</module>
-                <module>../../../modules/node-api</module>
-                <module>../../../modules/node-impl</module>
-                <module>../../../modules/node-launcher</module>
-                <module>../../../modules/node-launcher-equinox</module>
-                <module>../../../modules/node-launcher-webapp</module>
-                <module>../../../modules/node-manager</module>
-                <module>../../../modules/policy</module>
-                <module>../../../modules/policy-security</module>
-                <module>../../../modules/policy-security-jsr250</module>
-                <module>../../../modules/policy-security-ws</module>
-                <module>../../../modules/policy-transaction</module>
-                <module>../../../modules/policy-xml</module>
-                <module>../../../modules/policy-xml-ws</module>
-                <module>../../../modules/sca-api</module>
-                <module>../../../modules/tracing-aspectj</module>
-                <module>../../../modules/workspace</module>
-                <module>../../../modules/workspace-impl</module>
-                <module>../../../modules/workspace-xml</module>
-                <module>../../../modules/xsd</module>
-                <module>../../../modules/xsd-xml</module>
-            </modules>
-        </profile>
-    </profiles>
-
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * 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.    
+-->
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.tuscany.sca</groupId>
+        <artifactId>tuscany-feature</artifactId>
+        <version>2.0-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>tuscany-feature-repository</artifactId>
+    <name>Apache Tuscany SCA Maven Repository Feature</name>
+    <packaging>pom</packaging>
+
+    <dependencies>
+
+        <!-- All distribution -->
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-feature-all</artifactId>
+            <type>pom</type>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+
+        <!-- Eclipse update site -->
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>org.apache.tuscany.sca.updatesite</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+
+        <!-- Maven plugins -->
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-maven-ant-generator</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-maven-bundle-plugin</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-maven-eclipse-compiler</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-maven-incremental-build</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-maven-wsdl2java</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-maven-java2wsdl</artifactId>
+            <version>2.0-SNAPSHOT</version>
+        </dependency>
+        
+    </dependencies>
+
+</project>



Mime
View raw message