From acbc9230d2dbe48fea152fc08ec1bf4187acd364 Mon Sep 17 00:00:00 2001
From: Robert Gemmell <robbie@apache.org>
Date: Tue, 18 Dec 2012 22:58:09 +0000
Subject: QPID-4458: remove unused subdirs and files from gentools then move
 the remainder src to java/common/gentools.

- Integrate into the java common module build process
- Retrieve the Velocity dependencies using Ivy.
- Remove unused java/common/protocol-version.xml and cpp/src/generate.sh files.


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

(limited to 'java/module.xml')

diff --git a/java/module.xml b/java/module.xml
index 695e358d7a..a8dbf96ebc 100644
--- a/java/module.xml
+++ b/java/module.xml
@@ -796,7 +796,8 @@ qpid.name=${project.name}
 
    -->
 
-    <property name="gentools.home" location="${project.root}/../gentools" />
+    <property name="gentools.home" location="${project.root}/common/gentools" />
+    <property name="gentools.build" location="${build.scratch}/common/gentools" />
     <property name="generated.dir" location="${module.precompiled}" />
     <property name="velocity.compile.dir" value="${build.scratch}/broker/velocity"/>
     <property name="velocity.timestamp" location="${generated.dir}/velocity.timestamp" />
@@ -809,7 +810,7 @@ qpid.name=${project.name}
                deprecation="${javac.deprecation}"
                srcdir="${project.root}/broker/src/velocity/java" >
           <classpath>
-            <pathelement path="${gentools.home}/lib/velocity-1.4.jar" />
+            <pathelement path="${project.root}/${velocity.jar}" />
           </classpath>
           <compilerarg line="${javac.compiler.args}"/>
         </javac>
@@ -839,7 +840,7 @@ qpid.name=${project.name}
 
       <echo message="logmessages is ${logmessages}"/>
 
-      <java classname="org.apache.qpid.server.logging.GenerateLogMessages" fork="true" dir="${gentools.home}/src" failonerror="true">
+      <java classname="org.apache.qpid.server.logging.GenerateLogMessages" fork="true" dir="${gentools.build}/classes" failonerror="true">
         <arg line="'${logmessages}'"/>
           <arg value="-j"/>
           <arg value="-o"/>
@@ -856,7 +857,7 @@ qpid.name=${project.name}
           <fileset dir="${project.root}/lib/required">
             <include name="**/*.jar"/>
           </fileset>
-          <pathelement path="${gentools.home}/lib/velocity-1.4.jar" />
+          <pathelement path="${project.root}/${velocity.jar}" />
         </classpath>
       </java>
       <touch file="${velocity.timestamp}" />
-- 
cgit v1.2.1