Simplified the plugin build, now using a single common Maven assembly descriptor for all plugins.

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

11 files changed, 18 insertions, 357 deletions

diff --git a/java/sca/tools/eclipse34/plugins/core/src/main/assembly/jar.xml b/java/sca/tools/eclipse34/plugins/core/src/main/assembly/jar.xml
index 78328d2f81..7832ba5131 100644
--- a/java/sca/tools/eclipse34/plugins/core/src/main/assembly/jar.xml
+++ b/java/sca/tools/eclipse34/plugins/core/src/main/assembly/jar.xml
@@ -53,16 +53,27 @@
 
         <!-- Add the distributions -->
         <dependencySet>
+            <useTransitiveDependencies>false</useTransitiveDependencies>
             <unpack>true</unpack>
             <includes>
-                <include>org.apache.tuscany.sca:tuscany-distribution-core:zip</include>
+                <include>*:zip</include>
             </includes>
+            <excludes>
+                <exclude>*:zip:src</exclude>
+            </excludes>
+            <unpackOptions>
+                <excludes>
+                    <exclude>*/samples</exclude>
+                    <exclude>*/samples/**/*</exclude>
+                </excludes>
+            </unpackOptions>
         </dependencySet>
 
         <dependencySet>
+            <useTransitiveDependencies>false</useTransitiveDependencies>
             <unpack>false</unpack>
             <includes>
-                <include>org.apache.tuscany.sca:tuscany-distribution-core:zip:src</include>
+                <include>*:zip:src</include>
             </includes>
         </dependencySet>
     </dependencySets>
diff --git a/java/sca/tools/eclipse34/plugins/ejava/pom.xml b/java/sca/tools/eclipse34/plugins/ejava/pom.xml
index 3b8965e107..752d20f7c1 100644
--- a/java/sca/tools/eclipse34/plugins/ejava/pom.xml
+++ b/java/sca/tools/eclipse34/plugins/ejava/pom.xml
@@ -102,7 +102,7 @@
                         </goals>
                         <configuration>
                             <descriptors>
-                                <descriptor>src/main/assembly/jar.xml</descriptor>
+                                <descriptor>../core/src/main/assembly/jar.xml</descriptor>
                             </descriptors>
                             <tarLongFileMode>gnu</tarLongFileMode>
                             <appendAssemblyId>false</appendAssemblyId>
diff --git a/java/sca/tools/eclipse34/plugins/ejava/src/main/assembly/jar.xml b/java/sca/tools/eclipse34/plugins/ejava/src/main/assembly/jar.xml
deleted file mode 100644
index 3cbac63930..0000000000
--- a/java/sca/tools/eclipse34/plugins/ejava/src/main/assembly/jar.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?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.
--->
-<assembly>
-    <!-- id typically identifies the "type" (src vs bin etc) of the assembly -->
-    <id>plugin</id>
-    <includeBaseDirectory>false</includeBaseDirectory>
-    <formats>
-        <!--
-        <format>dir</format>
-        <format>tar.gz</format>
-        -->
-        <format>jar</format>
-    </formats>
-
-    <fileSets>
-
-        <!-- Add the classes -->
-        <fileSet>
-            <directory>target/classes</directory>
-            <outputDirectory></outputDirectory>
-            <excludes>
-                <!-- General file/folders to exclude -->
-                <exclude>**/.*</exclude>
-                <exclude>**/.*/**</exclude>
-                <exclude>**/*.log</exclude>
-
-                <!-- Sample specific files/folders to exclude -->
-                <exclude>pom.xml</exclude>
-                <exclude>src/</exclude>
-                <exclude>src/**/*</exclude>
-            </excludes>
-        </fileSet>
-    </fileSets>
-
-    <dependencySets>
-
-        <!-- Add the distributions -->
-        <dependencySet>
-            <unpack>true</unpack>
-            <includes>
-                <include>org.apache.tuscany.sca:tuscany-distribution-ejava:zip</include>
-            </includes>
-        </dependencySet>
-
-        <dependencySet>
-            <unpack>false</unpack>
-            <includes>
-                <include>org.apache.tuscany.sca:tuscany-distribution-ejava:zip:src</include>
-            </includes>
-        </dependencySet>
-    </dependencySets>
-
-</assembly>
diff --git a/java/sca/tools/eclipse34/plugins/manager/pom.xml b/java/sca/tools/eclipse34/plugins/manager/pom.xml
index 98bf3ef7e4..ae6b3516a2 100644
--- a/java/sca/tools/eclipse34/plugins/manager/pom.xml
+++ b/java/sca/tools/eclipse34/plugins/manager/pom.xml
@@ -102,7 +102,7 @@
                         </goals>
                         <configuration>
                             <descriptors>
-                                <descriptor>src/main/assembly/jar.xml</descriptor>
+                                <descriptor>../core/src/main/assembly/jar.xml</descriptor>
                             </descriptors>
                             <tarLongFileMode>gnu</tarLongFileMode>
                             <appendAssemblyId>false</appendAssemblyId>
diff --git a/java/sca/tools/eclipse34/plugins/manager/src/main/assembly/jar.xml b/java/sca/tools/eclipse34/plugins/manager/src/main/assembly/jar.xml
deleted file mode 100644
index d992ed227e..0000000000
--- a/java/sca/tools/eclipse34/plugins/manager/src/main/assembly/jar.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?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.
--->
-<assembly>
-    <!-- id typically identifies the "type" (src vs bin etc) of the assembly -->
-    <id>plugin</id>
-    <includeBaseDirectory>false</includeBaseDirectory>
-    <formats>
-        <!--
-        <format>dir</format>
-        <format>tar.gz</format>
-        -->
-        <format>jar</format>
-    </formats>
-
-    <fileSets>
-
-        <!-- Add the classes -->
-        <fileSet>
-            <directory>target/classes</directory>
-            <outputDirectory></outputDirectory>
-            <excludes>
-                <!-- General file/folders to exclude -->
-                <exclude>**/.*</exclude>
-                <exclude>**/.*/**</exclude>
-                <exclude>**/*.log</exclude>
-
-                <!-- Sample specific files/folders to exclude -->
-                <exclude>pom.xml</exclude>
-                <exclude>src/</exclude>
-                <exclude>src/**/*</exclude>
-            </excludes>
-        </fileSet>
-    </fileSets>
-
-    <dependencySets>
-
-        <!-- Add the distributions -->
-        <dependencySet>
-            <unpack>true</unpack>
-            <includes>
-                <include>org.apache.tuscany.sca:tuscany-distribution-manager:zip</include>
-            </includes>
-        </dependencySet>
-
-        <dependencySet>
-            <unpack>false</unpack>
-            <includes>
-                <include>org.apache.tuscany.sca:tuscany-distribution-manager:zip:src</include>
-            </includes>
-        </dependencySet>
-    </dependencySets>
-
-</assembly>
diff --git a/java/sca/tools/eclipse34/plugins/process/pom.xml b/java/sca/tools/eclipse34/plugins/process/pom.xml
index 6c55285a6c..5e7366c07b 100644
--- a/java/sca/tools/eclipse34/plugins/process/pom.xml
+++ b/java/sca/tools/eclipse34/plugins/process/pom.xml
@@ -102,7 +102,7 @@
                         </goals>
                         <configuration>
                             <descriptors>
-                                <descriptor>src/main/assembly/jar.xml</descriptor>
+                                <descriptor>../core/src/main/assembly/jar.xml</descriptor>
                             </descriptors>
                             <tarLongFileMode>gnu</tarLongFileMode>
                             <appendAssemblyId>false</appendAssemblyId>
diff --git a/java/sca/tools/eclipse34/plugins/process/src/main/assembly/jar.xml b/java/sca/tools/eclipse34/plugins/process/src/main/assembly/jar.xml
deleted file mode 100644
index c72de5f983..0000000000
--- a/java/sca/tools/eclipse34/plugins/process/src/main/assembly/jar.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?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.
--->
-<assembly>
-    <!-- id typically identifies the "type" (src vs bin etc) of the assembly -->
-    <id>plugin</id>
-    <includeBaseDirectory>false</includeBaseDirectory>
-    <formats>
-        <!--
-        <format>dir</format>
-        <format>tar.gz</format>
-        -->
-        <format>jar</format>
-    </formats>
-
-    <fileSets>
-
-        <!-- Add the classes -->
-        <fileSet>
-            <directory>target/classes</directory>
-            <outputDirectory></outputDirectory>
-            <excludes>
-                <!-- General file/folders to exclude -->
-                <exclude>**/.*</exclude>
-                <exclude>**/.*/**</exclude>
-                <exclude>**/*.log</exclude>
-
-                <!-- Sample specific files/folders to exclude -->
-                <exclude>pom.xml</exclude>
-                <exclude>src/</exclude>
-                <exclude>src/**/*</exclude>
-            </excludes>
-        </fileSet>
-    </fileSets>
-
-    <dependencySets>
-
-        <!-- Add the distributions -->
-        <dependencySet>
-            <unpack>true</unpack>
-            <includes>
-                <include>org.apache.tuscany.sca:tuscany-distribution-process:zip</include>
-            </includes>
-        </dependencySet>
-
-        <dependencySet>
-            <unpack>false</unpack>
-            <includes>
-                <include>org.apache.tuscany.sca:tuscany-distribution-process:zip:src</include>
-            </includes>
-        </dependencySet>
-    </dependencySets>
-
-</assembly>
diff --git a/java/sca/tools/eclipse34/plugins/web20/pom.xml b/java/sca/tools/eclipse34/plugins/web20/pom.xml
index 65c014a2f5..7c450e753e 100644
--- a/java/sca/tools/eclipse34/plugins/web20/pom.xml
+++ b/java/sca/tools/eclipse34/plugins/web20/pom.xml
@@ -102,7 +102,7 @@
                         </goals>
                         <configuration>
                             <descriptors>
-                                <descriptor>src/main/assembly/jar.xml</descriptor>
+                                <descriptor>../core/src/main/assembly/jar.xml</descriptor>
                             </descriptors>
                             <tarLongFileMode>gnu</tarLongFileMode>
                             <appendAssemblyId>false</appendAssemblyId>
diff --git a/java/sca/tools/eclipse34/plugins/web20/src/main/assembly/jar.xml b/java/sca/tools/eclipse34/plugins/web20/src/main/assembly/jar.xml
deleted file mode 100644
index b4fde9179c..0000000000
--- a/java/sca/tools/eclipse34/plugins/web20/src/main/assembly/jar.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?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.
--->
-<assembly>
-    <!-- id typically identifies the "type" (src vs bin etc) of the assembly -->
-    <id>plugin</id>
-    <includeBaseDirectory>false</includeBaseDirectory>
-    <formats>
-        <!--
-        <format>dir</format>
-        <format>tar.gz</format>
-        -->
-        <format>jar</format>
-    </formats>
-
-    <fileSets>
-
-        <!-- Add the classes -->
-        <fileSet>
-            <directory>target/classes</directory>
-            <outputDirectory></outputDirectory>
-            <excludes>
-                <!-- General file/folders to exclude -->
-                <exclude>**/.*</exclude>
-                <exclude>**/.*/**</exclude>
-                <exclude>**/*.log</exclude>
-
-                <!-- Sample specific files/folders to exclude -->
-                <exclude>pom.xml</exclude>
-                <exclude>src/</exclude>
-                <exclude>src/**/*</exclude>
-            </excludes>
-        </fileSet>
-    </fileSets>
-
-    <dependencySets>
-
-        <!-- Add the distributions -->
-        <dependencySet>
-            <unpack>true</unpack>
-            <includes>
-                <include>org.apache.tuscany.sca:tuscany-distribution-web20:zip</include>
-            </includes>
-        </dependencySet>
-
-        <dependencySet>
-            <unpack>false</unpack>
-            <includes>
-                <include>org.apache.tuscany.sca:tuscany-distribution-web20:zip:src</include>
-            </includes>
-        </dependencySet>
-    </dependencySets>
-
-</assembly>
diff --git a/java/sca/tools/eclipse34/plugins/webservice/pom.xml b/java/sca/tools/eclipse34/plugins/webservice/pom.xml
index e1ac4db47d..64fb36a15d 100644
--- a/java/sca/tools/eclipse34/plugins/webservice/pom.xml
+++ b/java/sca/tools/eclipse34/plugins/webservice/pom.xml
@@ -102,7 +102,7 @@
                         </goals>
                         <configuration>
                             <descriptors>
-                                <descriptor>src/main/assembly/jar.xml</descriptor>
+                                <descriptor>../core/src/main/assembly/jar.xml</descriptor>
                             </descriptors>
                             <tarLongFileMode>gnu</tarLongFileMode>
                             <appendAssemblyId>false</appendAssemblyId>
diff --git a/java/sca/tools/eclipse34/plugins/webservice/src/main/assembly/jar.xml b/java/sca/tools/eclipse34/plugins/webservice/src/main/assembly/jar.xml
deleted file mode 100644
index 1defb2a258..0000000000
--- a/java/sca/tools/eclipse34/plugins/webservice/src/main/assembly/jar.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?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.
--->
-<assembly>
-    <!-- id typically identifies the "type" (src vs bin etc) of the assembly -->
-    <id>plugin</id>
-    <includeBaseDirectory>false</includeBaseDirectory>
-    <formats>
-        <!--
-        <format>dir</format>
-        <format>tar.gz</format>
-        -->
-        <format>jar</format>
-    </formats>
-
-    <fileSets>
-
-        <!-- Add the classes -->
-        <fileSet>
-            <directory>target/classes</directory>
-            <outputDirectory></outputDirectory>
-            <excludes>
-                <!-- General file/folders to exclude -->
-                <exclude>**/.*</exclude>
-                <exclude>**/.*/**</exclude>
-                <exclude>**/*.log</exclude>
-
-                <!-- Sample specific files/folders to exclude -->
-                <exclude>pom.xml</exclude>
-                <exclude>src/</exclude>
-                <exclude>src/**/*</exclude>
-            </excludes>
-        </fileSet>
-    </fileSets>
-
-    <dependencySets>
-
-        <!-- Add the distributions -->
-        <dependencySet>
-            <unpack>true</unpack>
-            <includes>
-                <include>org.apache.tuscany.sca:tuscany-distribution-webservice:zip</include>
-            </includes>
-        </dependencySet>
-
-        <dependencySet>
-            <unpack>false</unpack>
-            <includes>
-                <include>org.apache.tuscany.sca:tuscany-distribution-webservice:zip:src</include>
-            </includes>
-        </dependencySet>
-    </dependencySets>
-
-</assembly>