diff options
| author | Robert Gemmell <robbie@apache.org> | 2012-12-18 22:58:09 +0000 |
|---|---|---|
| committer | Robert Gemmell <robbie@apache.org> | 2012-12-18 22:58:09 +0000 |
| commit | db23b12c9aa268a0d4b8f727b452e59075f584d2 (patch) | |
| tree | 9180c2ed3127e3105c370205bf098e021af58990 /qpid/java/module.xml | |
| parent | a608c6ef4bc8acd119892bb82393da2f48daa638 (diff) | |
| download | qpid-python-db23b12c9aa268a0d4b8f727b452e59075f584d2.tar.gz | |
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@1423705 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/module.xml')
| -rw-r--r-- | qpid/java/module.xml | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/qpid/java/module.xml b/qpid/java/module.xml index 695e358d7a..a8dbf96ebc 100644 --- a/qpid/java/module.xml +++ b/qpid/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}" /> |