From d5642bb6d16fc8d6dc8ef4d48c384b428812cc2e Mon Sep 17 00:00:00 2001
From: Robert Gemmell <robbie@apache.org>
Date: Mon, 11 Aug 2014 10:54:40 +0000
Subject: QPID-5610: update qpid-qmf2-tools assembly descriptor filename to
 match its output like all the others do

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1617250 13f79535-47bb-0310-9956-ffa450edef68
---
 qpid/tools/src/java/qpid-qmf2-tools/pom.xml        |  2 +-
 .../src/main/assembly/qpid-qmf-tools-bin.xml       | 62 ----------------------
 .../src/main/assembly/qpid-qmf2-tools-bin.xml      | 62 ++++++++++++++++++++++
 3 files changed, 63 insertions(+), 63 deletions(-)
 delete mode 100644 qpid/tools/src/java/qpid-qmf2-tools/src/main/assembly/qpid-qmf-tools-bin.xml
 create mode 100644 qpid/tools/src/java/qpid-qmf2-tools/src/main/assembly/qpid-qmf2-tools-bin.xml

diff --git a/qpid/tools/src/java/qpid-qmf2-tools/pom.xml b/qpid/tools/src/java/qpid-qmf2-tools/pom.xml
index 4344489c14..a83cae1cf5 100644
--- a/qpid/tools/src/java/qpid-qmf2-tools/pom.xml
+++ b/qpid/tools/src/java/qpid-qmf2-tools/pom.xml
@@ -76,7 +76,7 @@
         <!--version specified in qpid-parent pluginManagement -->
         <configuration>
           <descriptors>
-            <descriptor>src/main/assembly/qpid-qmf-tools-bin.xml</descriptor>
+            <descriptor>src/main/assembly/qpid-qmf2-tools-bin.xml</descriptor>
           </descriptors>
         </configuration>
         <executions>
diff --git a/qpid/tools/src/java/qpid-qmf2-tools/src/main/assembly/qpid-qmf-tools-bin.xml b/qpid/tools/src/java/qpid-qmf2-tools/src/main/assembly/qpid-qmf-tools-bin.xml
deleted file mode 100644
index cce56c0725..0000000000
--- a/qpid/tools/src/java/qpid-qmf2-tools/src/main/assembly/qpid-qmf-tools-bin.xml
+++ /dev/null
@@ -1,62 +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 xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
-  <id>bin</id>
-  <formats>
-    <format>tar.gz</format>
-  </formats>
-  <baseDirectory>qpid-qmf2-tools/${project.version}</baseDirectory>
-  <fileSets>
-    <fileSet>
-      <outputDirectory>/</outputDirectory>
-      <includes>
-        <include>README.txt</include>
-      </includes>
-      <fileMode>0644</fileMode>
-      <directoryMode>0755</directoryMode>
-    </fileSet>
-    <fileSet>
-      <directory>${basedir}/src/main/assembly/</directory>
-      <outputDirectory>/</outputDirectory>
-      <includes>
-        <include>LICENSE</include>
-        <include>NOTICE</include>
-      </includes>
-      <fileMode>0644</fileMode>
-      <directoryMode>0755</directoryMode>
-    </fileSet>
-    <fileSet>
-      <directory>${project.basedir}</directory>
-      <outputDirectory>/</outputDirectory>
-      <includes>
-        <include>bin/</include>
-      </includes>
-      <fileMode>0755</fileMode>
-      <directoryMode>0755</directoryMode>
-    </fileSet>
-  </fileSets>
-  <dependencySets>
-    <dependencySet>
-      <outputDirectory>/lib</outputDirectory>
-      <useProjectArtifact>true</useProjectArtifact>
-    </dependencySet>
-  </dependencySets>
-</assembly>
-
diff --git a/qpid/tools/src/java/qpid-qmf2-tools/src/main/assembly/qpid-qmf2-tools-bin.xml b/qpid/tools/src/java/qpid-qmf2-tools/src/main/assembly/qpid-qmf2-tools-bin.xml
new file mode 100644
index 0000000000..cce56c0725
--- /dev/null
+++ b/qpid/tools/src/java/qpid-qmf2-tools/src/main/assembly/qpid-qmf2-tools-bin.xml
@@ -0,0 +1,62 @@
+<?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 xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
+  <id>bin</id>
+  <formats>
+    <format>tar.gz</format>
+  </formats>
+  <baseDirectory>qpid-qmf2-tools/${project.version}</baseDirectory>
+  <fileSets>
+    <fileSet>
+      <outputDirectory>/</outputDirectory>
+      <includes>
+        <include>README.txt</include>
+      </includes>
+      <fileMode>0644</fileMode>
+      <directoryMode>0755</directoryMode>
+    </fileSet>
+    <fileSet>
+      <directory>${basedir}/src/main/assembly/</directory>
+      <outputDirectory>/</outputDirectory>
+      <includes>
+        <include>LICENSE</include>
+        <include>NOTICE</include>
+      </includes>
+      <fileMode>0644</fileMode>
+      <directoryMode>0755</directoryMode>
+    </fileSet>
+    <fileSet>
+      <directory>${project.basedir}</directory>
+      <outputDirectory>/</outputDirectory>
+      <includes>
+        <include>bin/</include>
+      </includes>
+      <fileMode>0755</fileMode>
+      <directoryMode>0755</directoryMode>
+    </fileSet>
+  </fileSets>
+  <dependencySets>
+    <dependencySet>
+      <outputDirectory>/lib</outputDirectory>
+      <useProjectArtifact>true</useProjectArtifact>
+    </dependencySet>
+  </dependencySets>
+</assembly>
+
-- 
cgit v1.2.1