From bdd743ac2ebf854fa1ce55e492d0618bf137dfb0 Mon Sep 17 00:00:00 2001
From: Robert Gemmell <robbie@apache.org>
Date: Mon, 9 May 2011 10:54:58 +0000
Subject: NO-JIRA: add settings file to allow specifying qpid specific
 settings, allow configuring 'remote' repo location, tidy up some use of
 literal values

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

(limited to 'java/module.xml')

diff --git a/java/module.xml b/java/module.xml
index 602d5cf17d..8c6a05e035 100644
--- a/java/module.xml
+++ b/java/module.xml
@@ -66,6 +66,8 @@
   <property name="module.release.bz2"  location="${module.release}/${module.namever}.tar.bz2"/>
 
   <property name="module.genpom.args"  value=""/>
+  <property name="maven.remote.repo"     value="file://${module.release.base}/maven"/>
+
   <property name="broker.log.prefix" value="BROKER: "/> 
   <property name="broker.log.interleave" value="true"/>
 
@@ -221,8 +223,8 @@
         <arg line='"${project.root}/genpom"'/>
         <arg line='-s "${project.root}/lib/poms"'/>
         <arg line='-o "${build.scratch}/qpid-${module.name}.pom"'/>
-        <arg line="-u http://qpid.apache.org"/>
-        <arg line="-g org.apache.qpid"/>
+        <arg line="-u ${project.url}"/>
+        <arg line="-g ${project.groupid}"/>
         <arg line="-v ${project.version}${maven.version.suffix}"/>
         <arg line="-p qpid"/>
         <arg line='-m "${module.depends}"'/>
@@ -238,14 +240,14 @@
 
     <artifact:pom id="module.pom" file="${build.scratch}/qpid-${module.name}.pom"/>
 
-    <artifact:install file="${module.jar}" pomRefId="module.pom">
+    <artifact:install file="${module.jar}" pomRefId="module.pom" settingsFile="${maven.settings.xml}">
         <localRepository path="${maven.local.repo}"/>
     </artifact:install>
 
-    <artifact:deploy file="${module.jar}" pomRefId="module.pom" uniqueVersion="${maven.unique.version}">
+    <artifact:deploy file="${module.jar}" pomRefId="module.pom" uniqueVersion="${maven.unique.version}" settingsFile="${maven.settings.xml}">
       <attach file="${module.source.jar}" classifier="sources"/>
       <localRepository path="${maven.local.repo}"/>
-      <remoteRepository url="file://${module.release.base}/maven"/>
+      <remoteRepository url="${maven.remote.repo}"/>
     </artifact:deploy>
   </target>
 
-- 
cgit v1.2.1