tuscany-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jsdelf...@apache.org
Subject svn commit: r688767 [2/2] - in /tuscany/java/sca/distribution/features: all/src/main/assembly/ core/ core/src/main/assembly/ core/src/main/components/ ejava/src/main/assembly/ ejava/src/main/components/ etc/ manager/ manager/src/main/assembly/ manager/...
Date Mon, 25 Aug 2008 15:55:16 GMT
Modified: tuscany/java/sca/distribution/features/manager/src/main/assembly/src.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/distribution/features/manager/src/main/assembly/src.xml?rev=688767&r1=688766&r2=688767&view=diff
==============================================================================
--- tuscany/java/sca/distribution/features/manager/src/main/assembly/src.xml (original)
+++ tuscany/java/sca/distribution/features/manager/src/main/assembly/src.xml Mon Aug 25 08:55:15 2008
@@ -30,113 +30,8 @@
         <format>zip</format>
     </formats>
 
-    <fileSets>
-        <fileSet>
-            <directory>src/main/release</directory>
-            <outputDirectory></outputDirectory>
-            <includes>
-                <include>CHANGES</include>
-                <include>DISCLAIMER</include>
-                <include>README</include>
-                <include>RELEASE_NOTES</include>
-            </includes>
-        </fileSet>
-        <fileSet>
-            <directory>src/main/release/src</directory>
-            <outputDirectory></outputDirectory>
-            <includes>
-                <include>BUILDING</include>
-                <include>LICENSE</include>
-                <include>NOTICE</include>
-            </includes>
-        </fileSet>
-
-        <!-- Add module sources to the modules directory -->
-        <fileSet>
-            <directory>../../../modules</directory>
-            <outputDirectory>modules</outputDirectory>
-            <includes>
-                <include>assembly/**/*</include>
-                <include>assembly-xml/**/*</include>
-                <include>assembly-xsd/**/*</include>
-                <include>binding-atom/**/*</include>
-                <include>binding-atom-abdera/**/*</include>
-                <include>binding-ejb/**/*</include>
-                <include>binding-http/**/*</include>
-                <include>binding-jsonrpc/**/*</include>
-                <include>binding-rss/**/*</include>
-                <include>binding-sca/**/*</include>
-                <include>binding-sca-xml/**/*</include>
-                <include>binding-ws/**/*</include>
-                <include>binding-ws-wsdlgen/**/*</include>
-                <include>binding-ws-xml/**/*</include>
-                <include>contribution/**/*</include>
-                <include>contribution-impl/**/*</include>
-                <include>contribution-java/**/*</include>
-                <include>contribution-namespace/**/*</include>
-                <include>contribution-resource/**/*</include>
-                <include>contribution-xml/**/*</include>
-                <include>core/**/*</include>
-                <include>core-databinding/**/*</include>
-                <include>core-spi/**/*</include>
-                <include>data-api/**/*</include>
-                <include>databinding/**/*</include>
-                <include>databinding-jaxb/**/*</include>
-                <include>definitions/**/*</include>
-                <include>definitions-xml/**/*</include>
-                <include>distribution-core/**/*</include>
-                <include>distribution-manager/**/*</include>
-                <include>domain-manager/**/*</include>
-                <include>endpoint/**/*</include>
-                <include>extensibility/**/*</include>
-                <include>host-embedded/**/*</include>
-                <include>host-http/**/*</include>
-                <include>host-jetty/**/*</include>
-                <include>implementation-bpel/**/*</include>
-                <include>implementation-ejb/**/*</include>
-                <include>implementation-java/**/*</include>
-                <include>implementation-java-runtime/**/*</include>
-                <include>implementation-java-xml/**/*</include>
-                <include>implementation-node/**/*</include>
-                <include>implementation-node-runtime/**/*</include>
-                <include>implementation-resource/**/*</include>
-                <include>implementation-widget/**/*</include>
-                <include>implementation-widget-runtime/**/*</include>
-                <include>interface/**/*</include>
-                <include>interface-java/**/*</include>
-                <include>interface-java-jaxws/**/*</include>
-                <include>interface-java-xml/**/*</include>
-                <include>interface-wsdl/**/*</include>
-                <include>interface-wsdl-xml/**/*</include>
-                <include>monitor/**/*</include>
-                <include>monitor-logging/**/*</include>
-                <include>node2-api/**/*</include>
-                <include>node2-impl/**/*</include>
-                <include>node2-launcher/**/*</include>
-                <include>node-manager/**/*</include>
-                <include>policy/**/*</include>
-                <include>policy-security/**/*</include>
-                <include>policy-security-ws/**/*</include>
-                <include>policy-xml/**/*</include>
-                <include>sca-api/**/*</include>
-                <include>workspace/**/*</include>
-                <include>workspace-impl/**/*</include>
-                <include>workspace-xml/**/*</include>
-                <include>xsd/**/*</include>
-                <include>xsd-xml/**/*</include>
-            </includes>
-            <excludes>
-                <!-- General file/folders to exclude -->
-                <exclude>**/.*</exclude>
-                <exclude>**/.*/**</exclude>
-                <exclude>**/*.log</exclude>
-
-                <!-- Specific files/folders to exclude -->
-                <exclude>pom.xml</exclude>
-                <exclude>**/target</exclude>
-                <exclude>**/target/**/*</exclude>
-            </excludes>
-        </fileSet>
-    </fileSets>
-
+    <componentDescriptors>
+        <componentDescriptor>../core/src/main/components/src-common.xml</componentDescriptor>
+        <componentDescriptor>src/main/components/src-modules.xml</componentDescriptor>
+    </componentDescriptors>
 </assembly>

Added: tuscany/java/sca/distribution/features/manager/src/main/components/bin-samples.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/distribution/features/manager/src/main/components/bin-samples.xml?rev=688767&view=auto
==============================================================================
--- tuscany/java/sca/distribution/features/manager/src/main/components/bin-samples.xml (added)
+++ tuscany/java/sca/distribution/features/manager/src/main/components/bin-samples.xml Mon Aug 25 08:55:15 2008
@@ -0,0 +1,42 @@
+<!--
+    * 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>
+    <fileSets>
+
+        <!-- Add samples to the samples directory -->
+        <fileSet>
+            <directory>../../../samples</directory>
+            <outputDirectory>samples</outputDirectory>
+            <includes>
+                <include>domain-management/**/*</include>
+            </includes>
+            <excludes>
+                <!-- General file/folders to exclude -->
+                <exclude>**/.*</exclude>
+                <exclude>**/.*/**</exclude>
+                <exclude>**/*.log</exclude>
+
+                <!-- Sample specific files/folders to exclude -->
+                <exclude>pom.xml</exclude>
+                <exclude>**/target</exclude>
+                <exclude>**/target/**/*</exclude>
+            </excludes>
+        </fileSet>
+    </fileSets>
+</component>

Copied: tuscany/java/sca/distribution/features/manager/src/main/components/src-modules.xml (from r688623, tuscany/java/sca/distribution/features/core/src/main/assembly/src.xml)
URL: http://svn.apache.org/viewvc/tuscany/java/sca/distribution/features/manager/src/main/components/src-modules.xml?p2=tuscany/java/sca/distribution/features/manager/src/main/components/src-modules.xml&p1=tuscany/java/sca/distribution/features/core/src/main/assembly/src.xml&r1=688623&r2=688767&rev=688767&view=diff
==============================================================================
--- tuscany/java/sca/distribution/features/core/src/main/assembly/src.xml (original)
+++ tuscany/java/sca/distribution/features/manager/src/main/components/src-modules.xml Mon Aug 25 08:55:15 2008
@@ -1,55 +1,23 @@
-<?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
+    * 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
+    * 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.
 -->
-<assembly>
-    <!-- id typically identifies the "type" (src vs bin etc) of the assembly -->
-    <id>src</id>
-    <includeBaseDirectory>true</includeBaseDirectory>
-    <baseDirectory>tuscany-sca-1.4-SNAPSHOT-src</baseDirectory>
-    <formats>
-        <!--
-        <format>dir</format>
-        <format>tar.gz</format>
-        -->
-        <format>zip</format>
-    </formats>
-
+<component>
     <fileSets>
-        <fileSet>
-            <directory>src/main/release</directory>
-            <outputDirectory></outputDirectory>
-            <includes>
-                <include>CHANGES</include>
-                <include>DISCLAIMER</include>
-                <include>README</include>
-                <include>RELEASE_NOTES</include>
-            </includes>
-        </fileSet>
-        <fileSet>
-            <directory>src/main/release/src</directory>
-            <outputDirectory></outputDirectory>
-            <includes>
-                <include>BUILDING</include>
-                <include>LICENSE</include>
-                <include>NOTICE</include>
-            </includes>
-        </fileSet>
 
         <!-- Add module sources to the modules directory -->
         <fileSet>
@@ -90,9 +58,11 @@
                 <include>interface-wsdl/**/*</include>
                 <include>interface-wsdl-xml/**/*</include>
                 <include>monitor/**/*</include>
-                <include>node2-api/**/*</include>
-                <include>node2-impl/**/*</include>
-                <include>node2-launcher/**/*</include>
+                <include>monitor-logging/**/*</include>
+                <include>node-api/**/*</include>
+                <include>node-impl/**/*</include>
+                <include>node-launcher/**/*</include>
+                <include>node-launcher-webapp/**/*</include>
                 <include>policy/**/*</include>
                 <include>policy-security/**/*</include>
                 <include>policy-xml/**/*</include>
@@ -113,5 +83,4 @@
             </excludes>
         </fileSet>
     </fileSets>
-
-</assembly>
+</component>

Modified: tuscany/java/sca/distribution/features/process/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/distribution/features/process/pom.xml?rev=688767&r1=688766&r2=688767&view=diff
==============================================================================
--- tuscany/java/sca/distribution/features/process/pom.xml (original)
+++ tuscany/java/sca/distribution/features/process/pom.xml Mon Aug 25 08:55:15 2008
@@ -40,14 +40,6 @@
             <version>1.4-SNAPSHOT</version>
         </dependency>
 
-        <!-- Web Service distribution -->
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-distribution-webservice</artifactId>
-            <type>jar</type>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-
         <!-- Implementations -->
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>

Modified: tuscany/java/sca/distribution/features/process/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/distribution/features/process/src/main/assembly/bin.xml?rev=688767&r1=688766&r2=688767&view=diff
==============================================================================
--- tuscany/java/sca/distribution/features/process/src/main/assembly/bin.xml (original)
+++ tuscany/java/sca/distribution/features/process/src/main/assembly/bin.xml Mon Aug 25 08:55:15 2008
@@ -30,79 +30,9 @@
         <format>zip</format>
     </formats>
 
-    <fileSets>
-
-        <!-- Add the text files to the top-level directroy -->
-        <fileSet>
-            <directory>src/main/release</directory>
-            <outputDirectory></outputDirectory>
-            <includes>
-                <include>CHANGES</include>
-                <include>DISCLAIMER</include>
-                <include>README</include>
-                <include>RELEASE_NOTES</include>
-            </includes>
-        </fileSet>
-        <fileSet>
-            <directory>src/main/release/bin</directory>
-            <outputDirectory></outputDirectory>
-            <includes>
-                <include>INSTALL</include>
-                <include>LICENSE</include>
-                <include>NOTICE</include>
-            </includes>
-        </fileSet>
-
-        <!-- Add the node launcher webapp to the modules directory -->
-        <fileSet>
-            <directory>../../sca/modules/node2-launcher-webapp/target</directory>
-            <outputDirectory>modules</outputDirectory>
-            <includes>
-                <include>*.war</include>
-            </includes>
-        </fileSet>
-
-        <!-- Add samples to the samples directory -->
-        <fileSet>
-            <directory>../../sca/samples</directory>
-            <outputDirectory>samples</outputDirectory>
-            <includes>
-                <include>helloworld-bpel/**/*</include>
-                <include>helloworld-bpel-ws/**/*</include>
-                <include>quote-xquery/**/*</include>
-            </includes>
-            <excludes>
-                <!-- General file/folders to exclude -->
-                <exclude>**/.*</exclude>
-                <exclude>**/.*/**</exclude>
-                <exclude>**/*.log</exclude>
-
-                <!-- Sample specific files/folders to exclude -->
-                <exclude>pom.xml</exclude>
-            </excludes>
-        </fileSet>
-    </fileSets>
-
-    <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>
-        </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>
-
+    <componentDescriptors>
+        <componentDescriptor>../core/src/main/components/bin-common.xml</componentDescriptor>
+        <componentDescriptor>../core/src/main/components/bin-down-dependencies.xml</componentDescriptor>
+        <componentDescriptor>src/main/components/bin-samples.xml</componentDescriptor>
+    </componentDescriptors>
 </assembly>

Modified: tuscany/java/sca/distribution/features/process/src/main/assembly/src.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/distribution/features/process/src/main/assembly/src.xml?rev=688767&r1=688766&r2=688767&view=diff
==============================================================================
--- tuscany/java/sca/distribution/features/process/src/main/assembly/src.xml (original)
+++ tuscany/java/sca/distribution/features/process/src/main/assembly/src.xml Mon Aug 25 08:55:15 2008
@@ -30,106 +30,8 @@
         <format>zip</format>
     </formats>
 
-    <fileSets>
-        <fileSet>
-            <directory>src/main/release</directory>
-            <outputDirectory></outputDirectory>
-            <includes>
-                <include>CHANGES</include>
-                <include>DISCLAIMER</include>
-                <include>README</include>
-                <include>RELEASE_NOTES</include>
-            </includes>
-        </fileSet>
-        <fileSet>
-            <directory>src/main/release/src</directory>
-            <outputDirectory></outputDirectory>
-            <includes>
-                <include>BUILDING</include>
-                <include>LICENSE</include>
-                <include>NOTICE</include>
-            </includes>
-        </fileSet>
-
-        <!-- Add module sources to the modules directory -->
-        <fileSet>
-            <directory>../../../modules</directory>
-            <outputDirectory>modules</outputDirectory>
-            <includes>
-                <include>assembly/**/*</include>
-                <include>assembly-xml/**/*</include>
-                <include>assembly-xsd/**/*</include>
-                <include>binding-sca/**/*</include>
-                <include>binding-sca-axis2/**/*</include>
-                <include>binding-sca-xml/**/*</include>
-                <include>binding-ws/**/*</include>
-                <include>binding-ws-axis2/**/*</include>
-                <include>binding-ws-wsdlgen/**/*</include>
-                <include>binding-ws-xml/**/*</include>
-                <include>contribution/**/*</include>
-                <include>contribution-impl/**/*</include>
-                <include>contribution-java/**/*</include>
-                <include>contribution-namespace/**/*</include>
-                <include>contribution-xml/**/*</include>
-                <include>core/**/*</include>
-                <include>core-databinding/**/*</include>
-                <include>core-spi/**/*</include>
-                <include>data-api/**/*</include>
-                <include>databinding/**/*</include>
-                <include>databinding-axiom/**/*</include>
-                <include>databinding-jaxb/**/*</include>
-                <include>databinding-jaxb-axiom/**/*</include>
-                <include>databinding-saxon/**/*</include>
-                <include>databinding-sdo/**/*</include>
-                <include>definitions/**/*</include>
-                <include>definitions-xml/**/*</include>
-                <include>distribution-core/**/*</include>
-                <include>distribution-process/**/*</include>
-                <include>distribution-webservice/**/*</include>
-                <include>endpoint/**/*</include>
-                <include>extensibility/**/*</include>
-                <include>host-embedded/**/*</include>
-                <include>host-http/**/*</include>
-                <include>host-jetty/**/*</include>
-                <include>implementation-bpel/**/*</include>
-                <include>implementation-bpel-ode/**/*</include>
-                <include>implementation-java/**/*</include>
-                <include>implementation-java-runtime/**/*</include>
-                <include>implementation-java-xml/**/*</include>
-                <include>implementation-node/**/*</include>
-                <include>implementation-node-runtime/**/*</include>
-                <include>implementation-xquery/**/*</include>
-                <include>interface/**/*</include>
-                <include>interface-java/**/*</include>
-                <include>interface-java-jaxws/**/*</include>
-                <include>interface-java-xml/**/*</include>
-                <include>interface-wsdl/**/*</include>
-                <include>interface-wsdl-xml/**/*</include>
-                <include>monitor/**/*</include>
-                <include>node2-api/**/*</include>
-                <include>node2-impl/**/*</include>
-                <include>node2-launcher/**/*</include>
-                <include>policy/**/*</include>
-                <include>policy-security/**/*</include>
-                <include>policy-security-ws/**/*</include>
-                <include>policy-xml/**/*</include>
-                <include>policy-xml-ws/**/*</include>
-                <include>sca-api/**/*</include>
-                <include>xsd/**/*</include>
-                <include>xsd-xml/**/*</include>
-            </includes>
-            <excludes>
-                <!-- General file/folders to exclude -->
-                <exclude>**/.*</exclude>
-                <exclude>**/.*/**</exclude>
-                <exclude>**/*.log</exclude>
-
-                <!-- Specific files/folders to exclude -->
-                <exclude>pom.xml</exclude>
-                <exclude>**/target</exclude>
-                <exclude>**/target/**/*</exclude>
-            </excludes>
-        </fileSet>
-    </fileSets>
-
+    <componentDescriptors>
+        <componentDescriptor>../core/src/main/components/src-common.xml</componentDescriptor>
+        <componentDescriptor>src/main/components/src-modules.xml</componentDescriptor>
+    </componentDescriptors>
 </assembly>

Added: tuscany/java/sca/distribution/features/process/src/main/components/bin-samples.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/distribution/features/process/src/main/components/bin-samples.xml?rev=688767&view=auto
==============================================================================
--- tuscany/java/sca/distribution/features/process/src/main/components/bin-samples.xml (added)
+++ tuscany/java/sca/distribution/features/process/src/main/components/bin-samples.xml Mon Aug 25 08:55:15 2008
@@ -0,0 +1,44 @@
+<!--
+    * 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>
+    <fileSets>
+
+        <!-- Add samples to the samples directory -->
+        <fileSet>
+            <directory>../../../samples</directory>
+            <outputDirectory>samples</outputDirectory>
+            <includes>
+                <include>helloworld-bpel/**/*</include>
+                <include>helloworld-bpel-ws/**/*</include>
+                <include>quote-xquery/**/*</include>
+            </includes>
+            <excludes>
+                <!-- General file/folders to exclude -->
+                <exclude>**/.*</exclude>
+                <exclude>**/.*/**</exclude>
+                <exclude>**/*.log</exclude>
+
+                <!-- Sample specific files/folders to exclude -->
+                <exclude>pom.xml</exclude>
+                <exclude>**/target</exclude>
+                <exclude>**/target/**/*</exclude>
+            </excludes>
+        </fileSet>
+    </fileSets>
+</component>

Copied: tuscany/java/sca/distribution/features/process/src/main/components/src-modules.xml (from r688623, tuscany/java/sca/distribution/features/core/src/main/assembly/src.xml)
URL: http://svn.apache.org/viewvc/tuscany/java/sca/distribution/features/process/src/main/components/src-modules.xml?p2=tuscany/java/sca/distribution/features/process/src/main/components/src-modules.xml&p1=tuscany/java/sca/distribution/features/core/src/main/assembly/src.xml&r1=688623&r2=688767&rev=688767&view=diff
==============================================================================
--- tuscany/java/sca/distribution/features/core/src/main/assembly/src.xml (original)
+++ tuscany/java/sca/distribution/features/process/src/main/components/src-modules.xml Mon Aug 25 08:55:15 2008
@@ -1,55 +1,23 @@
-<?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
+    * 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
+    * 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.
 -->
-<assembly>
-    <!-- id typically identifies the "type" (src vs bin etc) of the assembly -->
-    <id>src</id>
-    <includeBaseDirectory>true</includeBaseDirectory>
-    <baseDirectory>tuscany-sca-1.4-SNAPSHOT-src</baseDirectory>
-    <formats>
-        <!--
-        <format>dir</format>
-        <format>tar.gz</format>
-        -->
-        <format>zip</format>
-    </formats>
-
+<component>
     <fileSets>
-        <fileSet>
-            <directory>src/main/release</directory>
-            <outputDirectory></outputDirectory>
-            <includes>
-                <include>CHANGES</include>
-                <include>DISCLAIMER</include>
-                <include>README</include>
-                <include>RELEASE_NOTES</include>
-            </includes>
-        </fileSet>
-        <fileSet>
-            <directory>src/main/release/src</directory>
-            <outputDirectory></outputDirectory>
-            <includes>
-                <include>BUILDING</include>
-                <include>LICENSE</include>
-                <include>NOTICE</include>
-            </includes>
-        </fileSet>
 
         <!-- Add module sources to the modules directory -->
         <fileSet>
@@ -90,9 +58,11 @@
                 <include>interface-wsdl/**/*</include>
                 <include>interface-wsdl-xml/**/*</include>
                 <include>monitor/**/*</include>
-                <include>node2-api/**/*</include>
-                <include>node2-impl/**/*</include>
-                <include>node2-launcher/**/*</include>
+                <include>monitor-logging/**/*</include>
+                <include>node-api/**/*</include>
+                <include>node-impl/**/*</include>
+                <include>node-launcher/**/*</include>
+                <include>node-launcher-webapp/**/*</include>
                 <include>policy/**/*</include>
                 <include>policy-security/**/*</include>
                 <include>policy-xml/**/*</include>
@@ -113,5 +83,4 @@
             </excludes>
         </fileSet>
     </fileSets>
-
-</assembly>
+</component>

Modified: tuscany/java/sca/distribution/features/web20/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/distribution/features/web20/src/main/assembly/bin.xml?rev=688767&r1=688766&r2=688767&view=diff
==============================================================================
--- tuscany/java/sca/distribution/features/web20/src/main/assembly/bin.xml (original)
+++ tuscany/java/sca/distribution/features/web20/src/main/assembly/bin.xml Mon Aug 25 08:55:15 2008
@@ -30,79 +30,9 @@
         <format>zip</format>
     </formats>
 
-    <fileSets>
-
-        <!-- Add the text files to the top-level directroy -->
-        <fileSet>
-            <directory>src/main/release</directory>
-            <outputDirectory></outputDirectory>
-            <includes>
-                <include>CHANGES</include>
-                <include>DISCLAIMER</include>
-                <include>README</include>
-                <include>RELEASE_NOTES</include>
-            </includes>
-        </fileSet>
-        <fileSet>
-            <directory>src/main/release/bin</directory>
-            <outputDirectory></outputDirectory>
-            <includes>
-                <include>INSTALL</include>
-                <include>LICENSE</include>
-                <include>NOTICE</include>
-            </includes>
-        </fileSet>
-
-        <!-- Add the node launcher webapp to the modules directory -->
-        <fileSet>
-            <directory>../../sca/modules/node2-launcher-webapp/target</directory>
-            <outputDirectory>modules</outputDirectory>
-            <includes>
-                <include>*.war</include>
-            </includes>
-        </fileSet>
-
-        <!-- Add samples to the samples directory -->
-        <fileSet>
-            <directory>../../sca/samples</directory>
-            <outputDirectory>samples</outputDirectory>
-            <includes>
-                <include>feed-aggregator/**/*</include>
-                <include>store/**/*</include>
-                <include>web-resource/**/*</include>
-            </includes>
-            <excludes>
-                <!-- General file/folders to exclude -->
-                <exclude>**/.*</exclude>
-                <exclude>**/.*/**</exclude>
-                <exclude>**/*.log</exclude>
-
-                <!-- Sample specific files/folders to exclude -->
-                <exclude>pom.xml</exclude>
-            </excludes>
-        </fileSet>
-    </fileSets>
-
-    <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>
-        </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>
-
+    <componentDescriptors>
+        <componentDescriptor>../core/src/main/components/bin-common.xml</componentDescriptor>
+        <componentDescriptor>../core/src/main/components/bin-down-dependencies.xml</componentDescriptor>
+        <componentDescriptor>src/main/components/bin-samples.xml</componentDescriptor>
+    </componentDescriptors>
 </assembly>

Modified: tuscany/java/sca/distribution/features/web20/src/main/assembly/src.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/distribution/features/web20/src/main/assembly/src.xml?rev=688767&r1=688766&r2=688767&view=diff
==============================================================================
--- tuscany/java/sca/distribution/features/web20/src/main/assembly/src.xml (original)
+++ tuscany/java/sca/distribution/features/web20/src/main/assembly/src.xml Mon Aug 25 08:55:15 2008
@@ -30,105 +30,8 @@
         <format>zip</format>
     </formats>
 
-    <fileSets>
-        <fileSet>
-            <directory>src/main/release</directory>
-            <outputDirectory></outputDirectory>
-            <includes>
-                <include>CHANGES</include>
-                <include>DISCLAIMER</include>
-                <include>README</include>
-                <include>RELEASE_NOTES</include>
-            </includes>
-        </fileSet>
-        <fileSet>
-            <directory>src/main/release/src</directory>
-            <outputDirectory></outputDirectory>
-            <includes>
-                <include>BUILDING</include>
-                <include>LICENSE</include>
-                <include>NOTICE</include>
-            </includes>
-        </fileSet>
-
-        <!-- Add module sources to the modules directory -->
-        <fileSet>
-            <directory>../../../modules</directory>
-            <outputDirectory>modules</outputDirectory>
-            <includes>
-                <include>assembly/**/*</include>
-                <include>assembly-xml/**/*</include>
-                <include>assembly-xsd/**/*</include>
-                <include>binding-atom/**/*</include>
-                <include>binding-atom-abdera/**/*</include>
-                <include>binding-http/**/*</include>
-                <include>binding-http-runtime/**/*</include>
-                <include>binding-jsonrpc/**/*</include>
-                <include>binding-jsonrpc-runtime/**/*</include>
-                <include>binding-rss/**/*</include>
-                <include>binding-rss-rome/**/*</include>
-                <include>binding-sca/**/*</include>
-                <include>binding-sca-xml/**/*</include>
-                <include>contribution/**/*</include>
-                <include>contribution-impl/**/*</include>
-                <include>contribution-java/**/*</include>
-                <include>contribution-namespace/**/*</include>
-                <include>contribution-resource/**/*</include>
-                <include>contribution-xml/**/*</include>
-                <include>core/**/*</include>
-                <include>core-databinding/**/*</include>
-                <include>core-spi/**/*</include>
-                <include>data-api/**/*</include>
-                <include>databinding/**/*</include>
-                <include>databinding-jaxb/**/*</include>
-                <include>databinding-json/**/*</include>
-                <include>definitions/**/*</include>
-                <include>definitions-xml/**/*</include>
-                <include>distribution-core/**/*</include>
-                <include>distribution-web20/**/*</include>
-                <include>endpoint/**/*</include>
-                <include>extensibility/**/*</include>
-                <include>host-embedded/**/*</include>
-                <include>host-http/**/*</include>
-                <include>host-jetty/**/*</include>
-                <include>implementation-java/**/*</include>
-                <include>implementation-java-runtime/**/*</include>
-                <include>implementation-java-xml/**/*</include>
-                <include>implementation-node/**/*</include>
-                <include>implementation-node-runtime/**/*</include>
-                <include>implementation-resource/**/*</include>
-                <include>implementation-resource-runtime/**/*</include>
-                <include>implementation-widget/**/*</include>
-                <include>implementation-widget-runtime/**/*</include>
-                <include>interface/**/*</include>
-                <include>interface-java/**/*</include>
-                <include>interface-java-jaxws/**/*</include>
-                <include>interface-java-xml/**/*</include>
-                <include>interface-wsdl/**/*</include>
-                <include>interface-wsdl-xml/**/*</include>
-                <include>monitor/**/*</include>
-                <include>node2-api/**/*</include>
-                <include>node2-impl/**/*</include>
-                <include>node2-launcher/**/*</include>
-                <include>policy/**/*</include>
-                <include>policy-security/**/*</include>
-                <include>policy-xml/**/*</include>
-                <include>sca-api/**/*</include>
-                <include>xsd/**/*</include>
-                <include>xsd-xml/**/*</include>
-            </includes>
-            <excludes>
-                <!-- General file/folders to exclude -->
-                <exclude>**/.*</exclude>
-                <exclude>**/.*/**</exclude>
-                <exclude>**/*.log</exclude>
-
-                <!-- Specific files/folders to exclude -->
-                <exclude>pom.xml</exclude>
-                <exclude>**/target</exclude>
-                <exclude>**/target/**/*</exclude>
-            </excludes>
-        </fileSet>
-    </fileSets>
-
+    <componentDescriptors>
+        <componentDescriptor>../core/src/main/components/src-common.xml</componentDescriptor>
+        <componentDescriptor>src/main/components/src-modules.xml</componentDescriptor>
+    </componentDescriptors>
 </assembly>

Added: tuscany/java/sca/distribution/features/web20/src/main/components/bin-samples.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/distribution/features/web20/src/main/components/bin-samples.xml?rev=688767&view=auto
==============================================================================
--- tuscany/java/sca/distribution/features/web20/src/main/components/bin-samples.xml (added)
+++ tuscany/java/sca/distribution/features/web20/src/main/components/bin-samples.xml Mon Aug 25 08:55:15 2008
@@ -0,0 +1,44 @@
+<!--
+    * 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>
+    <fileSets>
+
+        <!-- Add samples to the samples directory -->
+        <fileSet>
+            <directory>../../../samples</directory>
+            <outputDirectory>samples</outputDirectory>
+            <includes>
+                <include>feed-aggregator/**/*</include>
+                <include>store/**/*</include>
+                <include>web-resource/**/*</include>
+            </includes>
+            <excludes>
+                <!-- General file/folders to exclude -->
+                <exclude>**/.*</exclude>
+                <exclude>**/.*/**</exclude>
+                <exclude>**/*.log</exclude>
+
+                <!-- Sample specific files/folders to exclude -->
+                <exclude>pom.xml</exclude>
+                <exclude>**/target</exclude>
+                <exclude>**/target/**/*</exclude>
+            </excludes>
+        </fileSet>
+    </fileSets>
+</component>

Copied: tuscany/java/sca/distribution/features/web20/src/main/components/src-modules.xml (from r688623, tuscany/java/sca/distribution/features/core/src/main/assembly/src.xml)
URL: http://svn.apache.org/viewvc/tuscany/java/sca/distribution/features/web20/src/main/components/src-modules.xml?p2=tuscany/java/sca/distribution/features/web20/src/main/components/src-modules.xml&p1=tuscany/java/sca/distribution/features/core/src/main/assembly/src.xml&r1=688623&r2=688767&rev=688767&view=diff
==============================================================================
--- tuscany/java/sca/distribution/features/core/src/main/assembly/src.xml (original)
+++ tuscany/java/sca/distribution/features/web20/src/main/components/src-modules.xml Mon Aug 25 08:55:15 2008
@@ -1,55 +1,23 @@
-<?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
+    * 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
+    * 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.
 -->
-<assembly>
-    <!-- id typically identifies the "type" (src vs bin etc) of the assembly -->
-    <id>src</id>
-    <includeBaseDirectory>true</includeBaseDirectory>
-    <baseDirectory>tuscany-sca-1.4-SNAPSHOT-src</baseDirectory>
-    <formats>
-        <!--
-        <format>dir</format>
-        <format>tar.gz</format>
-        -->
-        <format>zip</format>
-    </formats>
-
+<component>
     <fileSets>
-        <fileSet>
-            <directory>src/main/release</directory>
-            <outputDirectory></outputDirectory>
-            <includes>
-                <include>CHANGES</include>
-                <include>DISCLAIMER</include>
-                <include>README</include>
-                <include>RELEASE_NOTES</include>
-            </includes>
-        </fileSet>
-        <fileSet>
-            <directory>src/main/release/src</directory>
-            <outputDirectory></outputDirectory>
-            <includes>
-                <include>BUILDING</include>
-                <include>LICENSE</include>
-                <include>NOTICE</include>
-            </includes>
-        </fileSet>
 
         <!-- Add module sources to the modules directory -->
         <fileSet>
@@ -90,9 +58,11 @@
                 <include>interface-wsdl/**/*</include>
                 <include>interface-wsdl-xml/**/*</include>
                 <include>monitor/**/*</include>
-                <include>node2-api/**/*</include>
-                <include>node2-impl/**/*</include>
-                <include>node2-launcher/**/*</include>
+                <include>monitor-logging/**/*</include>
+                <include>node-api/**/*</include>
+                <include>node-impl/**/*</include>
+                <include>node-launcher/**/*</include>
+                <include>node-launcher-webapp/**/*</include>
                 <include>policy/**/*</include>
                 <include>policy-security/**/*</include>
                 <include>policy-xml/**/*</include>
@@ -113,5 +83,4 @@
             </excludes>
         </fileSet>
     </fileSets>
-
-</assembly>
+</component>

Modified: tuscany/java/sca/distribution/features/webservice/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/distribution/features/webservice/src/main/assembly/bin.xml?rev=688767&r1=688766&r2=688767&view=diff
==============================================================================
--- tuscany/java/sca/distribution/features/webservice/src/main/assembly/bin.xml (original)
+++ tuscany/java/sca/distribution/features/webservice/src/main/assembly/bin.xml Mon Aug 25 08:55:15 2008
@@ -30,85 +30,9 @@
         <format>zip</format>
     </formats>
 
-    <fileSets>
-
-        <!-- Add the text files to the top-level directroy -->
-        <fileSet>
-            <directory>src/main/release</directory>
-            <outputDirectory></outputDirectory>
-            <includes>
-                <include>CHANGES</include>
-                <include>DISCLAIMER</include>
-                <include>README</include>
-                <include>RELEASE_NOTES</include>
-            </includes>
-        </fileSet>
-        <fileSet>
-            <directory>src/main/release/bin</directory>
-            <outputDirectory></outputDirectory>
-            <includes>
-                <include>INSTALL</include>
-                <include>LICENSE</include>
-                <include>NOTICE</include>
-            </includes>
-        </fileSet>
-
-        <!-- Add the node launcher webapp to the modules directory -->
-        <fileSet>
-            <directory>../../sca/modules/node2-launcher-webapp/target</directory>
-            <outputDirectory>modules</outputDirectory>
-            <includes>
-                <include>*.war</include>
-            </includes>
-        </fileSet>
-
-        <!-- Add samples to the samples directory -->
-        <fileSet>
-            <directory>../../sca/samples</directory>
-            <outputDirectory>samples</outputDirectory>
-            <includes>
-                <include>callback-ws-client/**/*</include>
-                <include>callback-ws-service/**/*</include>
-                <include>helloworld-ws-reference/**/*</include>
-                <include>helloworld-ws-service/**/*</include>
-                <include>helloworld-ws-reference-secure/**/*</include>
-                <include>helloworld-ws-service-secure/**/*</include>
-                <include>helloworld-ws-service-webapp/**/*</include>
-                <include>simple-callback-ws/**/*</include>
-                <include>zipcode-jaxws/**/*</include>
-            </includes>
-            <excludes>
-                <!-- General file/folders to exclude -->
-                <exclude>**/.*</exclude>
-                <exclude>**/.*/**</exclude>
-                <exclude>**/*.log</exclude>
-
-                <!-- Sample specific files/folders to exclude -->
-                <exclude>pom.xml</exclude>
-            </excludes>
-        </fileSet>
-    </fileSets>
-
-    <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>
-        </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>
-
+    <componentDescriptors>
+        <componentDescriptor>../core/src/main/components/bin-common.xml</componentDescriptor>
+        <componentDescriptor>../core/src/main/components/bin-down-dependencies.xml</componentDescriptor>
+        <componentDescriptor>src/main/components/bin-samples.xml</componentDescriptor>
+    </componentDescriptors>
 </assembly>

Modified: tuscany/java/sca/distribution/features/webservice/src/main/assembly/src.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/distribution/features/webservice/src/main/assembly/src.xml?rev=688767&r1=688766&r2=688767&view=diff
==============================================================================
--- tuscany/java/sca/distribution/features/webservice/src/main/assembly/src.xml (original)
+++ tuscany/java/sca/distribution/features/webservice/src/main/assembly/src.xml Mon Aug 25 08:55:15 2008
@@ -30,100 +30,8 @@
         <format>zip</format>
     </formats>
 
-    <fileSets>
-        <fileSet>
-            <directory>src/main/release</directory>
-            <outputDirectory></outputDirectory>
-            <includes>
-                <include>CHANGES</include>
-                <include>DISCLAIMER</include>
-                <include>README</include>
-                <include>RELEASE_NOTES</include>
-            </includes>
-        </fileSet>
-        <fileSet>
-            <directory>src/main/release/src</directory>
-            <outputDirectory></outputDirectory>
-            <includes>
-                <include>BUILDING</include>
-                <include>LICENSE</include>
-                <include>NOTICE</include>
-            </includes>
-        </fileSet>
-
-        <!-- Add module sources to the modules directory -->
-        <fileSet>
-            <directory>../../../modules</directory>
-            <outputDirectory>modules</outputDirectory>
-            <includes>
-                <include>assembly/**/*</include>
-                <include>assembly-xml/**/*</include>
-                <include>assembly-xsd/**/*</include>
-                <include>binding-sca/**/*</include>
-                <include>binding-sca-axis2/**/*</include>
-                <include>binding-sca-xml/**/*</include>
-                <include>binding-ws/**/*</include>
-                <include>binding-ws-axis2/**/*</include>
-                <include>binding-ws-wsdlgen/**/*</include>
-                <include>binding-ws-xml/**/*</include>
-                <include>contribution/**/*</include>
-                <include>contribution-impl/**/*</include>
-                <include>contribution-java/**/*</include>
-                <include>contribution-namespace/**/*</include>
-                <include>contribution-xml/**/*</include>
-                <include>core/**/*</include>
-                <include>core-databinding/**/*</include>
-                <include>core-spi/**/*</include>
-                <include>data-api/**/*</include>
-                <include>databinding/**/*</include>
-                <include>databinding-axiom/**/*</include>
-                <include>databinding-jaxb/**/*</include>
-                <include>databinding-jaxb-axiom/**/*</include>
-                <include>definitions/**/*</include>
-                <include>definitions-xml/**/*</include>
-                <include>distribution-core/**/*</include>
-                <include>distribution-webservice/**/*</include>
-                <include>endpoint/**/*</include>
-                <include>extensibility/**/*</include>
-                <include>host-embedded/**/*</include>
-                <include>host-http/**/*</include>
-                <include>host-jetty/**/*</include>
-                <include>implementation-java/**/*</include>
-                <include>implementation-java-runtime/**/*</include>
-                <include>implementation-java-xml/**/*</include>
-                <include>implementation-node/**/*</include>
-                <include>implementation-node-runtime/**/*</include>
-                <include>interface/**/*</include>
-                <include>interface-java/**/*</include>
-                <include>interface-java-jaxws/**/*</include>
-                <include>interface-java-xml/**/*</include>
-                <include>interface-wsdl/**/*</include>
-                <include>interface-wsdl-xml/**/*</include>
-                <include>monitor/**/*</include>
-                <include>node2-api/**/*</include>
-                <include>node2-impl/**/*</include>
-                <include>node2-launcher/**/*</include>
-                <include>policy/**/*</include>
-                <include>policy-security/**/*</include>
-                <include>policy-security-ws/**/*</include>
-                <include>policy-xml/**/*</include>
-                <include>policy-xml-ws/**/*</include>
-                <include>sca-api/**/*</include>
-                <include>xsd/**/*</include>
-                <include>xsd-xml/**/*</include>
-            </includes>
-            <excludes>
-                <!-- General file/folders to exclude -->
-                <exclude>**/.*</exclude>
-                <exclude>**/.*/**</exclude>
-                <exclude>**/*.log</exclude>
-
-                <!-- Specific files/folders to exclude -->
-                <exclude>pom.xml</exclude>
-                <exclude>**/target</exclude>
-                <exclude>**/target/**/*</exclude>
-            </excludes>
-        </fileSet>
-    </fileSets>
-
+    <componentDescriptors>
+        <componentDescriptor>../core/src/main/components/src-common.xml</componentDescriptor>
+        <componentDescriptor>src/main/components/src-modules.xml</componentDescriptor>
+    </componentDescriptors>
 </assembly>

Added: tuscany/java/sca/distribution/features/webservice/src/main/components/bin-samples.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/distribution/features/webservice/src/main/components/bin-samples.xml?rev=688767&view=auto
==============================================================================
--- tuscany/java/sca/distribution/features/webservice/src/main/components/bin-samples.xml (added)
+++ tuscany/java/sca/distribution/features/webservice/src/main/components/bin-samples.xml Mon Aug 25 08:55:15 2008
@@ -0,0 +1,50 @@
+<!--
+    * 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>
+    <fileSets>
+
+        <!-- Add samples to the samples directory -->
+        <fileSet>
+            <directory>../../../samples</directory>
+            <outputDirectory>samples</outputDirectory>
+            <includes>
+                <include>callback-ws-client/**/*</include>
+                <include>callback-ws-service/**/*</include>
+                <include>helloworld-ws-reference/**/*</include>
+                <include>helloworld-ws-service/**/*</include>
+                <include>helloworld-ws-reference-secure/**/*</include>
+                <include>helloworld-ws-service-secure/**/*</include>
+                <include>helloworld-ws-service-webapp/**/*</include>
+                <include>simple-callback-ws/**/*</include>
+                <include>zipcode-jaxws/**/*</include>
+            </includes>
+            <excludes>
+                <!-- General file/folders to exclude -->
+                <exclude>**/.*</exclude>
+                <exclude>**/.*/**</exclude>
+                <exclude>**/*.log</exclude>
+
+                <!-- Sample specific files/folders to exclude -->
+                <exclude>pom.xml</exclude>
+                <exclude>**/target</exclude>
+                <exclude>**/target/**/*</exclude>
+            </excludes>
+        </fileSet>
+    </fileSets>
+</component>

Copied: tuscany/java/sca/distribution/features/webservice/src/main/components/src-modules.xml (from r688623, tuscany/java/sca/distribution/features/core/src/main/assembly/src.xml)
URL: http://svn.apache.org/viewvc/tuscany/java/sca/distribution/features/webservice/src/main/components/src-modules.xml?p2=tuscany/java/sca/distribution/features/webservice/src/main/components/src-modules.xml&p1=tuscany/java/sca/distribution/features/core/src/main/assembly/src.xml&r1=688623&r2=688767&rev=688767&view=diff
==============================================================================
--- tuscany/java/sca/distribution/features/core/src/main/assembly/src.xml (original)
+++ tuscany/java/sca/distribution/features/webservice/src/main/components/src-modules.xml Mon Aug 25 08:55:15 2008
@@ -1,55 +1,23 @@
-<?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
+    * 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
+    * 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.
 -->
-<assembly>
-    <!-- id typically identifies the "type" (src vs bin etc) of the assembly -->
-    <id>src</id>
-    <includeBaseDirectory>true</includeBaseDirectory>
-    <baseDirectory>tuscany-sca-1.4-SNAPSHOT-src</baseDirectory>
-    <formats>
-        <!--
-        <format>dir</format>
-        <format>tar.gz</format>
-        -->
-        <format>zip</format>
-    </formats>
-
+<component>
     <fileSets>
-        <fileSet>
-            <directory>src/main/release</directory>
-            <outputDirectory></outputDirectory>
-            <includes>
-                <include>CHANGES</include>
-                <include>DISCLAIMER</include>
-                <include>README</include>
-                <include>RELEASE_NOTES</include>
-            </includes>
-        </fileSet>
-        <fileSet>
-            <directory>src/main/release/src</directory>
-            <outputDirectory></outputDirectory>
-            <includes>
-                <include>BUILDING</include>
-                <include>LICENSE</include>
-                <include>NOTICE</include>
-            </includes>
-        </fileSet>
 
         <!-- Add module sources to the modules directory -->
         <fileSet>
@@ -90,9 +58,11 @@
                 <include>interface-wsdl/**/*</include>
                 <include>interface-wsdl-xml/**/*</include>
                 <include>monitor/**/*</include>
-                <include>node2-api/**/*</include>
-                <include>node2-impl/**/*</include>
-                <include>node2-launcher/**/*</include>
+                <include>monitor-logging/**/*</include>
+                <include>node-api/**/*</include>
+                <include>node-impl/**/*</include>
+                <include>node-launcher/**/*</include>
+                <include>node-launcher-webapp/**/*</include>
                 <include>policy/**/*</include>
                 <include>policy-security/**/*</include>
                 <include>policy-xml/**/*</include>
@@ -113,5 +83,4 @@
             </excludes>
         </fileSet>
     </fileSets>
-
-</assembly>
+</component>



Mime
View raw message