From cfb3fb5f092c67c961903a0ed295f7e5d464fb5c Mon Sep 17 00:00:00 2001
From: Jonathan Anstey <janstey@gmail.com>
Date: Thu, 28 Mar 2013 11:14:07 -0400
Subject: [PATCH] AMQ-4414 - Combine windows and unix distros

---
 assembly/pom.xml                              | 18 +----
 .../descriptors/{unix-bin.xml => bin.xml}     | 29 ++++++-
 assembly/src/main/descriptors/windows-bin.xml | 80 -------------------
 3 files changed, 30 insertions(+), 97 deletions(-)
 rename assembly/src/main/descriptors/{unix-bin.xml => bin.xml} (81%)
 delete mode 100644 assembly/src/main/descriptors/windows-bin.xml

diff --git a/assembly/pom.xml b/assembly/pom.xml
index 31e01b7fe1b..ef2e373ac6d 100755
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -426,28 +426,14 @@
         <artifactId>maven-assembly-plugin</artifactId>
         <executions>
           <execution>
-            <id>unix-bin</id>
+            <id>bin</id>
             <phase>package</phase>
             <goals>
               <goal>attached</goal>
             </goals>
             <configuration>
               <descriptors>
-                 <descriptor>src/main/descriptors/unix-bin.xml</descriptor>
-              </descriptors>
-              <!--<finalName>${pom.artifactId}-${project.version}</finalName>-->
-              <!--<appendAssemblyId>false</appendAssemblyId>-->
-            </configuration>
-          </execution>
-          <execution>
-            <id>windows-bin</id>
-            <phase>package</phase>
-            <goals>
-              <goal>attached</goal>
-            </goals>
-            <configuration>
-              <descriptors>
-                 <descriptor>src/main/descriptors/windows-bin.xml</descriptor>
+                 <descriptor>src/main/descriptors/bin.xml</descriptor>
               </descriptors>
               <!--<finalName>${pom.artifactId}-${project.version}</finalName>-->
               <!--<appendAssemblyId>false</appendAssemblyId>-->
diff --git a/assembly/src/main/descriptors/unix-bin.xml b/assembly/src/main/descriptors/bin.xml
similarity index 81%
rename from assembly/src/main/descriptors/unix-bin.xml
rename to assembly/src/main/descriptors/bin.xml
index 0afef1b0292..384048e5203 100644
--- a/assembly/src/main/descriptors/unix-bin.xml
+++ b/assembly/src/main/descriptors/bin.xml
@@ -19,7 +19,8 @@
 
   <id>bin</id>
   <formats>
-    <format>tar.gz</format>
+    <format>zip</format>
+    <format>tar.gz</format>    
   </formats>
 
   <fileSets>
@@ -40,6 +41,7 @@
       <directoryMode>0755</directoryMode>
       <lineEnding>unix</lineEnding>
     </fileSet>
+    
     <fileSet>
       <directory>src/release</directory>
       <outputDirectory>/</outputDirectory>
@@ -97,6 +99,31 @@
       <filtered>true</filtered>
     </fileSet>
 
+    <fileSet>
+      <directory>src/release</directory>
+      <outputDirectory>/</outputDirectory>
+      <includes>
+        <include>bin/*.bat</include>
+        <include>bin/win32/*.bat</include>
+        <include>bin/win32/*.conf</include>
+        <include>bin/win64/*.bat</include>
+        <include>bin/win64/*.conf</include>
+      </includes>
+      <lineEnding>dos</lineEnding>
+    </fileSet>
+
+    <!-- Copy over files that should not get the line endings converted -->
+    <fileSet>
+      <directory>src/release</directory>
+      <outputDirectory>/</outputDirectory>
+      <includes>
+        <include>bin/win32/*.exe</include>
+        <include>bin/win32/*.dll</include>
+        <include>bin/win64/*.exe</include>
+        <include>bin/win64/*.dll</include>
+      </includes>
+    </fileSet>
+
   </fileSets>
 
   <componentDescriptors>
diff --git a/assembly/src/main/descriptors/windows-bin.xml b/assembly/src/main/descriptors/windows-bin.xml
deleted file mode 100644
index 43d2e72c918..00000000000
--- a/assembly/src/main/descriptors/windows-bin.xml
+++ /dev/null
@@ -1,80 +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>bin</id>
-  <formats>
-    <format>zip</format>
-  </formats>
-
-  <fileSets>
-
-    <!-- Copy over everything that needs to get dos line endings -->
-    <fileSet>
-      <directory>src/release</directory>
-      <outputDirectory>/</outputDirectory>
-      <excludes>
-        <exclude>bin/**</exclude>
-        <exclude>conf/*.ts</exclude>
-        <exclude>conf/*.ks</exclude>
-        <exclude>conf/*.cert</exclude>
-      </excludes>
-      <lineEnding>dos</lineEnding>
-    </fileSet>
-
-    <fileSet>
-      <directory>src/release</directory>
-      <outputDirectory>/</outputDirectory>
-      <includes>
-        <include>bin/*.bat</include>
-        <include>bin/win32/*.bat</include>
-        <include>bin/win32/*.conf</include>
-        <include>bin/win64/*.bat</include>
-        <include>bin/win64/*.conf</include>
-      </includes>
-      <lineEnding>dos</lineEnding>
-    </fileSet>
-
-    <fileSet>
-      <directory>src/release</directory>
-      <outputDirectory>/</outputDirectory>
-      <includes>
-        <include>bin/activemq</include>
-        <include>bin/activemq-admin</include>
-      </includes>
-      <lineEnding>unix</lineEnding>
-    </fileSet>
-
-    <!-- Copy over files that should not get the line endings converted -->
-    <fileSet>
-      <directory>src/release</directory>
-      <outputDirectory>/</outputDirectory>
-      <includes>
-        <include>bin/win32/*.exe</include>
-        <include>bin/win32/*.dll</include>
-        <include>bin/win64/*.exe</include>
-        <include>bin/win64/*.dll</include>
-      </includes>
-    </fileSet>
-
-   </fileSets>
-
-  <componentDescriptors>
-    <componentDescriptor>src/main/descriptors/common-bin.xml</componentDescriptor>
-  </componentDescriptors>
-
-</assembly>