From 559e9702d5a7c26dddee708e267f2f685d4de89e Mon Sep 17 00:00:00 2001
From: Aidan Skinner <aidan@apache.org>
Date: Thu, 24 Apr 2008 01:54:20 +0000
Subject: QPID-832 merge M2.x

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@651133 13f79535-47bb-0310-9956-ffa450edef68
---
 java/common/protocol-version.xml | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

(limited to 'java/common/protocol-version.xml')

diff --git a/java/common/protocol-version.xml b/java/common/protocol-version.xml
index 2ed7dbff23..ee9db6049b 100644
--- a/java/common/protocol-version.xml
+++ b/java/common/protocol-version.xml
@@ -27,18 +27,23 @@
   <property name="generated.dir" location="${generated.path}/${generated.package}" />
   <property name="generated.timestamp" location="${generated.dir}/timestamp" />
   <property name="xml.spec.dir" location="${topDirectoryLocation}/../specs" />
-  <property name="xml.spec.deps" value="amqp.0-8.xml cluster.0-8.xml" />
-  <property name="xml.spec.list" value="${xml.spec.dir}/amqp.0-8.xml ${xml.spec.dir}/cluster.0-8.xml" />
+  <property name="xml.spec.deps" value="amqp.0-8.xml amqp.0-9.xml" />
+  <property name="xml.spec.list" value="${xml.spec.dir}/amqp.0-8.xml ${xml.spec.dir}/amqp.0-9.xml" />
+  <property name="template.dir" value="${topDirectoryLocation}/common/templates" />
+
   	
-  <target name="generate" depends="compile_generator,check_generate_deps" unless="generation.notRequired">
+  <!--<target name="generate" depends="compile_generator,check_generate_deps" unless="generation.notRequired">-->
+  <target name="generate" depends="compile_generator" unless="generation.notRequired">
     <mkdir dir="${generated.dir}"/>
     <java classname="org.apache.qpid.gentools.Main" fork="true" dir="${gentools.home}/src" failonerror="true">
-    	<arg line="-j -o ${generated.dir} -t ${topDirectoryLocation}/common/templates ${xml.spec.list}" />
+    	<arg line="-j -o ${generated.dir} -t ${template.dir} ${xml.spec.list}" />
         <classpath>
           <pathelement path="${gentools.home}/src" />
-			    <fileset dir="${gentools.home}/lib">
-					<include name="**/*.jar"/>
-				</fileset>
+	  <fileset dir="${gentools.home}/lib">
+	     <include name="**/*.jar"/>
+          </fileset>
+          <pathelement path="${gentools.home}/lib/velocity-1.4.jar" />
+          <pathelement path="${gentools.home}/lib/velocity-dep-1.4.jar" />
         </classpath>
     </java>
     <touch file="${generated.timestamp}" />
@@ -47,7 +52,8 @@
   <target name="check_generate_deps">
 	<uptodate property="generation.notRequired" targetfile="${generated.timestamp}">
   	  <srcfiles dir="${xml.spec.dir}" includes="${xml.spec.deps}" />
-	</uptodate>
+      <srcfiles dir="${template.dir}" includes="**/*.vm **/*.tmpl" />
+    </uptodate>
   </target>
   
   <target name="compile_generator">
-- 
cgit v1.2.1