included the eclipse-plugin assembly file for unix

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@486624 13f79535-47bb-0310-9956-ffa450edef68

3 files changed, 119 insertions, 7 deletions

diff --git a/java/distribution/pom.xml b/java/distribution/pom.xml
index 24bc819beb..ca91c222ee 100644
--- a/java/distribution/pom.xml
+++ b/java/distribution/pom.xml
@@ -130,6 +130,7 @@
                                 <descriptor>src/main/assembly/client-bin.xml</descriptor>
                                 <descriptor>src/main/assembly/src.xml</descriptor>
                                 <descriptor>src/main/assembly/management-eclipse-plugin.xml</descriptor>
+                                <descriptor>src/main/assembly/management-eclipse-plugin-unix.xml</descriptor>
                             </descriptors>
                             <finalName>qpid-${pom.version}</finalName>
                         </configuration>
diff --git a/java/distribution/src/main/assembly/management-eclipse-plugin-unix.xml b/java/distribution/src/main/assembly/management-eclipse-plugin-unix.xml
new file mode 100644
index 0000000000..5ac131b12b
--- /dev/null
+++ b/java/distribution/src/main/assembly/management-eclipse-plugin-unix.xml
@@ -0,0 +1,112 @@
+<?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>eclipse-plugin-unix</id>
+  <includeBaseDirectory>false</includeBaseDirectory>
+  <formats>
+    <format>tar.gz</format>
+    <format>zip</format>
+  </formats>
+<!--
+  <moduleSets>
+      <moduleSet>
+          <includes>
+              <include>org.apache.qpid.management:org.apache.qpid.management.ui</include>
+          </includes>
+          <binaries>
+              <includeDependencies>true</includeDependencies>
+              <unpack>false</unpack>
+          </binaries>
+      </moduleSet>
+  </moduleSets>
+ -->
+  <fileSets>
+    <fileSet>
+      <directory>src/main/release</directory>
+      <outputDirectory>qpidmc</outputDirectory>
+      <includes>
+        <include>DISCLAIMER</include>
+      </includes>
+    </fileSet>
+    <fileSet>
+      <directory>..</directory>
+      <outputDirectory>qpidmc</outputDirectory>
+      <includes>
+        <include>*.txt</include>
+      </includes>
+    </fileSet>
+    <fileSet>
+      <directory>src/main/release/docs</directory>
+      <outputDirectory>qpidmc/docs</outputDirectory>
+      <includes>
+        <include>RELEASE_NOTES.txt</include>
+      </includes>
+    </fileSet>
+    <fileSet>
+      <directory>../management/eclipse-plugin/src/main/resources/unix/configuration</directory>
+      <outputDirectory>qpidmc/configuration</outputDirectory>
+      <includes>
+        <include>**</include>
+      </includes>
+    </fileSet>
+    <fileSet>
+      <directory>../management/eclipse-plugin/src/main/resources</directory>
+      <outputDirectory>qpidmc</outputDirectory>
+      <includes>
+        <include>license.eclipse.txt</include>
+      </includes>
+    </fileSet>
+    <fileSet>
+      <directory>../management/eclipse-plugin/bin</directory>
+      <outputDirectory>qpidmc/bin</outputDirectory>
+      <includes>
+        <include>qpidmc.sh</include>
+      </includes>
+      <fileMode>777</fileMode>
+    </fileSet>
+  </fileSets>
+
+  <dependencySets>
+    <dependencySet>
+      <outputDirectory>qpidmc/eclipse/plugins/org.eclipse.core.runtime.compatibility.registry_3.2.0</outputDirectory>
+      <outputFileNameMapping>${artifactId}_${version}/</outputFileNameMapping>
+      <unpack>true</unpack>
+      <includes>
+        <include>org.eclipse.core:org.eclipse.core.runtime.compatibility.registry</include>
+      </includes>
+      <scope>runtime</scope>
+    </dependencySet>
+  
+  <dependencySet>
+        <outputDirectory>qpidmc/eclipse/plugins</outputDirectory>
+        <outputFileNameMapping>${artifactId}_${version}.${extension}</outputFileNameMapping>
+        <unpack>false</unpack>
+        <excludes>
+            <exclude>org.apache.qpid:qpid-distribution</exclude>
+        </excludes>
+        <includes>
+          <include>org.eclipse.ui:org.eclipse.ui.forms</include>
+          <include>org.apache.qpid.management:org.apache.qpid.management.ui</include>
+        </includes>
+        <scope>runtime</scope>
+    </dependencySet>
+</dependencySets>
+</assembly>
diff --git a/java/distribution/src/main/assembly/management-eclipse-plugin.xml b/java/distribution/src/main/assembly/management-eclipse-plugin.xml
index 12eb6bc478..945d4fa5d8 100644
--- a/java/distribution/src/main/assembly/management-eclipse-plugin.xml
+++ b/java/distribution/src/main/assembly/management-eclipse-plugin.xml
@@ -22,7 +22,6 @@
   <id>eclipse-plugin</id>
   <includeBaseDirectory>false</includeBaseDirectory>
   <formats>
-    <format>tar.gz</format>
     <format>zip</format>
   </formats>
 <!--
@@ -61,7 +60,7 @@
       </includes>
     </fileSet>
     <fileSet>
-      <directory>../management/eclipse-plugin/configuration</directory>
+      <directory>../management/eclipse-plugin/src/main/resources/win32/configuration</directory>
       <outputDirectory>qpidmc/configuration</outputDirectory>
       <includes>
         <include>**</include>
@@ -69,10 +68,10 @@
     </fileSet>
     <fileSet>
       <directory>../management/eclipse-plugin/src/main/resources</directory>
-      <outputDirectory>qpidmc</outputDirectory>
+      <outputDirectory>qpidmc/eclipse</outputDirectory>
       <includes>
-        <include>**</include>
-      </includes>
+        <include>*.*</include>
+      </includes>      
     </fileSet>
     <fileSet>
       <directory>../management/eclipse-plugin/bin</directory>
@@ -86,7 +85,7 @@
 
   <dependencySets>
     <dependencySet>
-      <outputDirectory>qpidmc/plugins</outputDirectory>
+      <outputDirectory>qpidmc/eclipse/plugins</outputDirectory>
       <outputFileNameMapping>${artifactId}_${version}.${extension}</outputFileNameMapping>
       <unpack>false</unpack>
       <excludes>
@@ -130,7 +129,7 @@
       <scope>runtime</scope>
     </dependencySet>
     <dependencySet>
-      <outputDirectory>qpidmc/plugins/org.eclipse.core.runtime.compatibility.registry_3.2.0</outputDirectory>
+      <outputDirectory>qpidmc/eclipse/plugins/org.eclipse.core.runtime.compatibility.registry_3.2.0</outputDirectory>
       <outputFileNameMapping>${artifactId}_${version}/</outputFileNameMapping>
       <unpack>true</unpack>
       <includes>