From e769aed97fa119033e38d829be25135a4ea08a52 Mon Sep 17 00:00:00 2001
From: Robert Gemmell <robbie@apache.org>
Date: Thu, 3 Dec 2009 23:08:33 +0000
Subject: QPID-2232: rename the RCP application release artifacts to include
 jmx-management-console instead of management-eclipse-plugin

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@886976 13f79535-47bb-0310-9956-ffa450edef68
---
 .../management/eclipse-plugin/build-release-common.properties  |  2 ++
 .../eclipse-plugin/build-release-linux-gtk-x86.properties      |  2 +-
 .../eclipse-plugin/build-release-linux-gtk-x86_64.properties   |  2 +-
 .../management/eclipse-plugin/build-release-macosx.properties  |  4 ++--
 .../eclipse-plugin/build-release-solaris-gtk-sparc.properties  |  2 +-
 .../eclipse-plugin/build-release-win32-win32-x86.properties    |  2 +-
 qpid/java/management/eclipse-plugin/build.xml                  | 10 +++++-----
 7 files changed, 13 insertions(+), 11 deletions(-)

(limited to 'qpid/java/management/eclipse-plugin')

diff --git a/qpid/java/management/eclipse-plugin/build-release-common.properties b/qpid/java/management/eclipse-plugin/build-release-common.properties
index 4c5ebecc41..e4d75d7d56 100644
--- a/qpid/java/management/eclipse-plugin/build-release-common.properties
+++ b/qpid/java/management/eclipse-plugin/build-release-common.properties
@@ -19,6 +19,8 @@
 # 
 #
 
+app.namever=jmx-management-console-${project.version}
+
 artifact.id=org.apache.qpid.management.ui
 mcplugin.version=0.2.0-${project.version}
 mcplugin.filename=${artifact.id}_${mcplugin.version}
diff --git a/qpid/java/management/eclipse-plugin/build-release-linux-gtk-x86.properties b/qpid/java/management/eclipse-plugin/build-release-linux-gtk-x86.properties
index 3c5eb8f3cb..51c4bfa8d0 100644
--- a/qpid/java/management/eclipse-plugin/build-release-linux-gtk-x86.properties
+++ b/qpid/java/management/eclipse-plugin/build-release-linux-gtk-x86.properties
@@ -19,7 +19,7 @@
 # 
 #
 
-release.name=${module.namever}-linux-gtk-x86
+release.name=${project.name}-${app.namever}-linux-gtk-x86
 
 release.subdir=${module.release.base}/${release.name}
 
diff --git a/qpid/java/management/eclipse-plugin/build-release-linux-gtk-x86_64.properties b/qpid/java/management/eclipse-plugin/build-release-linux-gtk-x86_64.properties
index f1c35c82e8..bf58d9c08e 100644
--- a/qpid/java/management/eclipse-plugin/build-release-linux-gtk-x86_64.properties
+++ b/qpid/java/management/eclipse-plugin/build-release-linux-gtk-x86_64.properties
@@ -19,7 +19,7 @@
 # 
 #
 
-release.name=${module.namever}-linux-gtk-x86_64
+release.name=${project.name}-${app.namever}-linux-gtk-x86_64
 
 release.subdir=${module.release.base}/${release.name}
 
diff --git a/qpid/java/management/eclipse-plugin/build-release-macosx.properties b/qpid/java/management/eclipse-plugin/build-release-macosx.properties
index 4dd0b4e569..bdb2f0d7da 100644
--- a/qpid/java/management/eclipse-plugin/build-release-macosx.properties
+++ b/qpid/java/management/eclipse-plugin/build-release-macosx.properties
@@ -19,11 +19,11 @@
 # 
 #
 
-application.name=Qpid Management Console
+application.name=Qpid JMX Management Console
 
 application.dir=${application.name}.app
 
-release.name=${module.namever}-macosx
+release.name=${project.name}-${app.namever}-macosx
 
 release.subdir=${module.release.base}/${release.name}
 
diff --git a/qpid/java/management/eclipse-plugin/build-release-solaris-gtk-sparc.properties b/qpid/java/management/eclipse-plugin/build-release-solaris-gtk-sparc.properties
index 7d5b613e06..d58d0c9ac0 100644
--- a/qpid/java/management/eclipse-plugin/build-release-solaris-gtk-sparc.properties
+++ b/qpid/java/management/eclipse-plugin/build-release-solaris-gtk-sparc.properties
@@ -19,7 +19,7 @@
 # 
 #
 
-release.name=${module.namever}-solaris-gtk-sparc
+release.name=${project.name}-${app.namever}-solaris-gtk-sparc
 
 release.subdir=${module.release.base}/${release.name}
 
diff --git a/qpid/java/management/eclipse-plugin/build-release-win32-win32-x86.properties b/qpid/java/management/eclipse-plugin/build-release-win32-win32-x86.properties
index f4d3c48420..ee678a92c9 100644
--- a/qpid/java/management/eclipse-plugin/build-release-win32-win32-x86.properties
+++ b/qpid/java/management/eclipse-plugin/build-release-win32-win32-x86.properties
@@ -19,7 +19,7 @@
 # 
 #
 
-release.name=${module.namever}-win32-win32-x86
+release.name=${project.name}-${app.namever}-win32-win32-x86
 
 release.subdir=${module.release.base}/${release.name}
 
diff --git a/qpid/java/management/eclipse-plugin/build.xml b/qpid/java/management/eclipse-plugin/build.xml
index 9952ff66e3..51587c7984 100644
--- a/qpid/java/management/eclipse-plugin/build.xml
+++ b/qpid/java/management/eclipse-plugin/build.xml
@@ -72,32 +72,32 @@
     <target name="release-bin" depends="build">
         <!-- linux gtk x86 -->
         <ant antfile="build-release.xml">
-            <property file="build-release-linux-gtk-x86.properties"/>
             <property file="build-release-common.properties"/>
+            <property file="build-release-linux-gtk-x86.properties"/>
         </ant>
 
         <!-- linux gtk x86_64 -->
         <ant antfile="build-release.xml">
-            <property file="build-release-linux-gtk-x86_64.properties"/>
             <property file="build-release-common.properties"/>
+            <property file="build-release-linux-gtk-x86_64.properties"/>
         </ant>
 
         <!-- solaris gtk sparc -->
         <ant antfile="build-release.xml">
-            <property file="build-release-solaris-gtk-sparc.properties"/>
             <property file="build-release-common.properties"/>
+            <property file="build-release-solaris-gtk-sparc.properties"/>
         </ant>
 
         <!-- mac os x -->
         <ant antfile="build-release-macosx.xml">
-            <property file="build-release-macosx.properties"/>
             <property file="build-release-common.properties"/>
+            <property file="build-release-macosx.properties"/>
         </ant>
 
         <!-- win32 win32 x86 -->
         <ant antfile="build-release.xml">
-            <property file="build-release-win32-win32-x86.properties"/>
             <property file="build-release-common.properties"/>
+            <property file="build-release-win32-win32-x86.properties"/>
         </ant>
     </target>
 
-- 
cgit v1.2.1