From 28f3d7d87951ed4f3be5c90d117ab62b731096bf Mon Sep 17 00:00:00 2001
From: Martin Ritchie <ritchiem@apache.org>
Date: Fri, 10 Nov 2006 13:38:29 +0000
Subject: QPID-77 QPID-81

Set name of launcher back to <module>-launcher.jar to make the bin scripts easier to handle

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@473336 13f79535-47bb-0310-9956-ffa450edef68
---
 qpid/java/module.xml | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

(limited to 'qpid/java/module.xml')

diff --git a/qpid/java/module.xml b/qpid/java/module.xml
index 2af973970d..844c6987dd 100644
--- a/qpid/java/module.xml
+++ b/qpid/java/module.xml
@@ -40,16 +40,15 @@
         <filtermapper>
             <replacestring from="${file.separator}" to="-"/>
         </filtermapper>
-        <globmapper from="*" to="${prefix}*"/>
-        <globmapper from="*" to="*${suffix}"/>
     </map>
 
-
-    <property name="module.jar" location="${module.dir}/${module.name}.jar"/>
+    <property name="dist.module.name" value="${prefix}${module.name}${suffix}" />
+      
+    <property name="module.jar" location="${module.dir}/${dist.module.name}.jar"/>
     <property name="module.launcher"
               location="${module.dir}/${module.name}${launcher.sfx}"/>
     <property name="module.manifest"
-              location="${module.dir}/${module.name}.mf"/>
+              location="${module.dir}/${dist.module.name}.mf"/>
     <property name="module.doc" location="${module.dir}/${doc.dir}"/>
     <property name="module.src" location="${src.dir}"/>
     <property name="module.lib" location="${lib.dir}"/>
@@ -101,7 +100,7 @@
     </map>
 
     <property name="module.manifest.classpath"
-              value="${module.name}.jar ${module.manifest.jars} ${module.manifest.deps}"/>
+              value="${dist.module.name}.jar ${module.manifest.jars} ${module.manifest.deps}"/>
 
     <property name="module.test.reports" value="${module.dir}/reports/junit"/>
 
-- 
cgit v1.2.1