Minor simplifications of pom.xml and bin.xml.

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

14 files changed, 7 insertions, 112 deletions

diff --git a/sandbox/sebastien/distribution/all/pom.xml b/sandbox/sebastien/distribution/all/pom.xml
index a2d6347bc5..266fa72bb3 100644
--- a/sandbox/sebastien/distribution/all/pom.xml
+++ b/sandbox/sebastien/distribution/all/pom.xml
@@ -72,21 +72,6 @@
     </dependencies>
 
     <build>
-        <resources>
-            <resource>
-                <directory>src/main/java</directory>
-                <includes>
-                    <include>**/*</include>
-                </includes>
-            </resource>
-            <resource>
-                <directory>src/main/resources</directory>
-                <includes>
-                    <include>**/*</include>
-                </includes>
-            </resource>
-        </resources>
-
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
diff --git a/sandbox/sebastien/distribution/all/src/main/assembly/bin.xml b/sandbox/sebastien/distribution/all/src/main/assembly/bin.xml
index 0a92354045..933f897e47 100644
--- a/sandbox/sebastien/distribution/all/src/main/assembly/bin.xml
+++ b/sandbox/sebastien/distribution/all/src/main/assembly/bin.xml
@@ -129,7 +129,7 @@
                 <include>org.apache.tuscany.sca:*</include>
             </includes>
             <excludes>
-                <exclude>*:pom:*</exclude>
+                <exclude>org.apache.tuscany.sca:tuscany-distribution-*</exclude>
             </excludes>
         </dependencySet>
 
diff --git a/sandbox/sebastien/distribution/base/pom.xml b/sandbox/sebastien/distribution/base/pom.xml
index e10e1b49e7..f9730f9956 100644
--- a/sandbox/sebastien/distribution/base/pom.xml
+++ b/sandbox/sebastien/distribution/base/pom.xml
@@ -202,21 +202,6 @@
     </dependencies>
 
     <build>
-        <resources>
-            <resource>
-                <directory>src/main/java</directory>
-                <includes>
-                    <include>**/*</include>
-                </includes>
-            </resource>
-            <resource>
-                <directory>src/main/resources</directory>
-                <includes>
-                    <include>**/*</include>
-                </includes>
-            </resource>
-        </resources>
-
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
diff --git a/sandbox/sebastien/distribution/base/src/main/assembly/bin.xml b/sandbox/sebastien/distribution/base/src/main/assembly/bin.xml
index a0100e984c..bdcaec0632 100644
--- a/sandbox/sebastien/distribution/base/src/main/assembly/bin.xml
+++ b/sandbox/sebastien/distribution/base/src/main/assembly/bin.xml
@@ -98,7 +98,7 @@
                 <include>org.apache.tuscany.sca:*</include>
             </includes>
             <excludes>
-                <exclude>*:pom:*</exclude>
+                <exclude>org.apache.tuscany.sca:tuscany-distribution-*</exclude>
             </excludes>
         </dependencySet>
 
diff --git a/sandbox/sebastien/distribution/ejava/pom.xml b/sandbox/sebastien/distribution/ejava/pom.xml
index 32ad7f9df8..bf9b9e6c55 100644
--- a/sandbox/sebastien/distribution/ejava/pom.xml
+++ b/sandbox/sebastien/distribution/ejava/pom.xml
@@ -83,21 +83,6 @@
     </dependencies>
 
     <build>
-        <resources>
-            <resource>
-                <directory>src/main/java</directory>
-                <includes>
-                    <include>**/*</include>
-                </includes>
-            </resource>
-            <resource>
-                <directory>src/main/resources</directory>
-                <includes>
-                    <include>**/*</include>
-                </includes>
-            </resource>
-        </resources>
-
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
diff --git a/sandbox/sebastien/distribution/ejava/src/main/assembly/bin.xml b/sandbox/sebastien/distribution/ejava/src/main/assembly/bin.xml
index 599e40e07e..2bc7787128 100644
--- a/sandbox/sebastien/distribution/ejava/src/main/assembly/bin.xml
+++ b/sandbox/sebastien/distribution/ejava/src/main/assembly/bin.xml
@@ -91,7 +91,7 @@
                 <include>org.apache.tuscany.sca:*</include>
             </includes>
             <excludes>
-                <exclude>*:pom:*</exclude>
+                <exclude>org.apache.tuscany.sca:tuscany-distribution-*</exclude>
             </excludes>
         </dependencySet>
 
diff --git a/sandbox/sebastien/distribution/manager/pom.xml b/sandbox/sebastien/distribution/manager/pom.xml
index 54f73e71d0..337e1ead94 100644
--- a/sandbox/sebastien/distribution/manager/pom.xml
+++ b/sandbox/sebastien/distribution/manager/pom.xml
@@ -140,21 +140,6 @@
     </dependencies>
 
     <build>
-        <resources>
-            <resource>
-                <directory>src/main/java</directory>
-                <includes>
-                    <include>**/*</include>
-                </includes>
-            </resource>
-            <resource>
-                <directory>src/main/resources</directory>
-                <includes>
-                    <include>**/*</include>
-                </includes>
-            </resource>
-        </resources>
-
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
diff --git a/sandbox/sebastien/distribution/manager/src/main/assembly/bin.xml b/sandbox/sebastien/distribution/manager/src/main/assembly/bin.xml
index 7ca0937caf..659aaac790 100644
--- a/sandbox/sebastien/distribution/manager/src/main/assembly/bin.xml
+++ b/sandbox/sebastien/distribution/manager/src/main/assembly/bin.xml
@@ -87,7 +87,7 @@
                 <include>org.apache.tuscany.sca:*</include>
             </includes>
             <excludes>
-                <exclude>*:pom:*</exclude>
+                <exclude>org.apache.tuscany.sca:tuscany-distribution-*</exclude>
             </excludes>
         </dependencySet>
 
diff --git a/sandbox/sebastien/distribution/process/pom.xml b/sandbox/sebastien/distribution/process/pom.xml
index 8bea4593d4..cba9bfb8c3 100644
--- a/sandbox/sebastien/distribution/process/pom.xml
+++ b/sandbox/sebastien/distribution/process/pom.xml
@@ -62,21 +62,6 @@
     </dependencies>
 
     <build>
-        <resources>
-            <resource>
-                <directory>src/main/java</directory>
-                <includes>
-                    <include>**/*</include>
-                </includes>
-            </resource>
-            <resource>
-                <directory>src/main/resources</directory>
-                <includes>
-                    <include>**/*</include>
-                </includes>
-            </resource>
-        </resources>
-
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
diff --git a/sandbox/sebastien/distribution/process/src/main/assembly/bin.xml b/sandbox/sebastien/distribution/process/src/main/assembly/bin.xml
index ef13074213..70f173f387 100644
--- a/sandbox/sebastien/distribution/process/src/main/assembly/bin.xml
+++ b/sandbox/sebastien/distribution/process/src/main/assembly/bin.xml
@@ -89,7 +89,7 @@
                 <include>org.apache.tuscany.sca:*</include>
             </includes>
             <excludes>
-                <exclude>*:pom:*</exclude>
+                <exclude>org.apache.tuscany.sca:tuscany-distribution-*</exclude>
             </excludes>
         </dependencySet>
 
diff --git a/sandbox/sebastien/distribution/web20/pom.xml b/sandbox/sebastien/distribution/web20/pom.xml
index a986162ee6..846e40f968 100644
--- a/sandbox/sebastien/distribution/web20/pom.xml
+++ b/sandbox/sebastien/distribution/web20/pom.xml
@@ -97,21 +97,6 @@
     </dependencies>
 
     <build>
-        <resources>
-            <resource>
-                <directory>src/main/java</directory>
-                <includes>
-                    <include>**/*</include>
-                </includes>
-            </resource>
-            <resource>
-                <directory>src/main/resources</directory>
-                <includes>
-                    <include>**/*</include>
-                </includes>
-            </resource>
-        </resources>
-
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
diff --git a/sandbox/sebastien/distribution/web20/src/main/assembly/bin.xml b/sandbox/sebastien/distribution/web20/src/main/assembly/bin.xml
index 0b8c3dc95b..a2dfa41fa7 100644
--- a/sandbox/sebastien/distribution/web20/src/main/assembly/bin.xml
+++ b/sandbox/sebastien/distribution/web20/src/main/assembly/bin.xml
@@ -89,7 +89,7 @@
                 <include>org.apache.tuscany.sca:*</include>
             </includes>
             <excludes>
-                <exclude>*:pom:*</exclude>
+                <exclude>org.apache.tuscany.sca:tuscany-distribution-*</exclude>
             </excludes>
         </dependencySet>
 
diff --git a/sandbox/sebastien/distribution/webservice/pom.xml b/sandbox/sebastien/distribution/webservice/pom.xml
index 5609e41783..95aa137cd9 100644
--- a/sandbox/sebastien/distribution/webservice/pom.xml
+++ b/sandbox/sebastien/distribution/webservice/pom.xml
@@ -111,21 +111,6 @@
     </dependencies>
 
     <build>
-        <resources>
-            <resource>
-                <directory>src/main/java</directory>
-                <includes>
-                    <include>**/*</include>
-                </includes>
-            </resource>
-            <resource>
-                <directory>src/main/resources</directory>
-                <includes>
-                    <include>**/*</include>
-                </includes>
-            </resource>
-        </resources>
-
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
diff --git a/sandbox/sebastien/distribution/webservice/src/main/assembly/bin.xml b/sandbox/sebastien/distribution/webservice/src/main/assembly/bin.xml
index 46dc17334a..7ff2369863 100644
--- a/sandbox/sebastien/distribution/webservice/src/main/assembly/bin.xml
+++ b/sandbox/sebastien/distribution/webservice/src/main/assembly/bin.xml
@@ -95,7 +95,7 @@
                 <include>org.apache.tuscany.sca:*</include>
             </includes>
             <excludes>
-                <exclude>*:pom:*</exclude>
+                <exclude>org.apache.tuscany.sca:tuscany-distribution-*</exclude>
             </excludes>
         </dependencySet>