1 files changed, 6 insertions, 7 deletions
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>