From ff6db9bd69f61c76be93f72e5dfc0b897705005c Mon Sep 17 00:00:00 2001
From: Robert Gemmell <robbie@apache.org>
Date: Thu, 22 Nov 2012 00:13:07 +0000
Subject: QPID-4458: remove the gentool/lib folder, retrieve the velocity
 dependencies using Ivy, remove seemingly unused common/protocol-version.xml
 file.

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1412380 13f79535-47bb-0310-9956-ffa450edef68
---
 qpid/java/build.deps                  |  2 +
 qpid/java/common/build.xml            |  7 +---
 qpid/java/common/protocol-version.xml | 70 -----------------------------------
 qpid/java/ivy.retrieve.xml            |  2 +
 qpid/java/module.xml                  |  4 +-
 5 files changed, 8 insertions(+), 77 deletions(-)
 delete mode 100644 qpid/java/common/protocol-version.xml

(limited to 'qpid/java')

diff --git a/qpid/java/build.deps b/qpid/java/build.deps
index 4775fcbf33..32f5e2f1e2 100644
--- a/qpid/java/build.deps
+++ b/qpid/java/build.deps
@@ -122,3 +122,5 @@ perftests-visualisation-jfc.test.libs=${test.libs}
 bnd=lib/required/bnd-0.0.384.jar
 jython=lib/required/jython-standalone-2.5.2.jar
 maven-ant-tasks=lib/required/maven-ant-tasks-2.1.1.jar
+velocity.jar=lib/required/velocity-1.4.jar
+velocity-dep.jar=lib/required/velocity-dep-1.4.jar
diff --git a/qpid/java/common/build.xml b/qpid/java/common/build.xml
index 9caf93c026..f5b71f9cca 100644
--- a/qpid/java/common/build.xml
+++ b/qpid/java/common/build.xml
@@ -68,11 +68,8 @@
       <arg line='-j -o "${framing.generated.dir}" -t "${project.root}/common/templates" ${xml.spec.list}'/>
       <classpath>
         <pathelement path="${gentools.home}/src" />
-        <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" />
+        <pathelement path="${project.root}/${velocity.jar}" />
+        <pathelement path="${project.root}/${velocity-dep.jar}" />
       </classpath>
     </java>
     <touch file="${gentools.timestamp}" />
diff --git a/qpid/java/common/protocol-version.xml b/qpid/java/common/protocol-version.xml
deleted file mode 100644
index 5435a0a582..0000000000
--- a/qpid/java/common/protocol-version.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<!--
- -
- - Licensed to the Apache Software Foundation (ASF) under one
- - or more contributor license agreements.  See the NOTICE file
- - distributed with this work for additional information
- - regarding copyright ownership.  The ASF licenses this file
- - to you under the Apache License, Version 2.0 (the
- - "License"); you may not use this file except in compliance
- - with the License.  You may obtain a copy of the License at
- - 
- -   http://www.apache.org/licenses/LICENSE-2.0
- - 
- - Unless required by applicable law or agreed to in writing,
- - software distributed under the License is distributed on an
- - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- - KIND, either express or implied.  See the License for the
- - specific language governing permissions and limitations
- - under the License.
- -
- -->
-<project name="Qpid Common Protocol Versions" default="generate">
-  <property name="topDirectoryLocation" location=".." />
-  <property name="project.build.directory" location="target" />
-  <property name="gentools.home" location="${topDirectoryLocation}/../gentools" />
-  <property name="generated.path" location="${project.build.directory}/generated-sources/gentools" />
-  <property name="generated.package" value="org/apache/qpid/framing" />
-  <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 amqp.0-9.xml amqp0-9-1.stripped.xml" />
-  <property name="xml.spec.list" value="${xml.spec.dir}/amqp.0-8.xml ${xml.spec.dir}/amqp.0-9.xml ${xml.spec.dir}/amqp0-9-1.stripped.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" 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 ${template.dir} ${xml.spec.list}" />
-        <classpath>
-          <pathelement path="${gentools.home}/src" />
-	  <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}" />
-  </target>
-
-  <target name="check_generate_deps">
-	<uptodate property="generation.notRequired" targetfile="${generated.timestamp}">
-  	  <srcfiles dir="${xml.spec.dir}" includes="${xml.spec.deps}" />
-      <srcfiles dir="${template.dir}" includes="**/*.vm **/*.tmpl" />
-    </uptodate>
-  </target>
-  
-  <target name="compile_generator">
-  	<ant dir="${gentools.home}" />
-  </target>
-
-  <target name="precompile" depends="generate"/>
-  
-  <target name="clean">
-  	<delete dir="${generated.path}" />
-  </target>
-
-</project>
-
diff --git a/qpid/java/ivy.retrieve.xml b/qpid/java/ivy.retrieve.xml
index 3ca38e39f8..5998a3e78e 100644
--- a/qpid/java/ivy.retrieve.xml
+++ b/qpid/java/ivy.retrieve.xml
@@ -69,6 +69,8 @@
     <dependency org="org.eclipse.jetty" name="jetty-util" rev="7.6.3.v20120416" transitive="false"/>
     <dependency org="org.dojotoolkit" name="dojo-war" rev="1.7.2" transitive="false"/>
     <dependency org="xalan" name="xalan" rev="2.7.0" transitive="false"/>
+    <dependency org="velocity" name="velocity" rev="1.4" transitive="false"/>
+    <dependency org="velocity" name="velocity-dep" rev="1.4" transitive="false"/>
 
     <!-- The following are optional dependencies, for modules providing optional functionlity or
     for use in optional build/test steps. Their optional status is usually indicative of licences
diff --git a/qpid/java/module.xml b/qpid/java/module.xml
index 26349fb41c..45d7e9b390 100644
--- a/qpid/java/module.xml
+++ b/qpid/java/module.xml
@@ -809,7 +809,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>
@@ -856,7 +856,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