QPID-4458: revert changes in r1412380, a CI build failure after a clean checkout showed there is a usage path the changes didnt cover

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1412726 13f79535-47bb-0310-9956-ffa450edef68

10 files changed, 77 insertions, 8 deletions

diff --git a/gentools/lib/LICENSE b/gentools/lib/LICENSE
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/gentools/lib/LICENSE
diff --git a/gentools/lib/NOTICE b/gentools/lib/NOTICE
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/gentools/lib/NOTICE
diff --git a/gentools/lib/README.txt b/gentools/lib/README.txt
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/gentools/lib/README.txt
diff --git a/gentools/lib/velocity-1.4.jar b/gentools/lib/velocity-1.4.jar
new file mode 100644
index 0000000000..04ec9d2f85
--- /dev/null
+++ b/gentools/lib/velocity-1.4.jar
diff --git a/gentools/lib/velocity-dep-1.4.jar b/gentools/lib/velocity-dep-1.4.jar
new file mode 100644
index 0000000000..375712b0e8
--- /dev/null
+++ b/gentools/lib/velocity-dep-1.4.jar
diff --git a/java/build.deps b/java/build.deps
index 32f5e2f1e2..4775fcbf33 100644
--- a/java/build.deps
+++ b/java/build.deps
@@ -122,5 +122,3 @@ 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/java/common/build.xml b/java/common/build.xml
index f5b71f9cca..9caf93c026 100644
--- a/java/common/build.xml
+++ b/java/common/build.xml
@@ -68,8 +68,11 @@
       <arg line='-j -o "${framing.generated.dir}" -t "${project.root}/common/templates" ${xml.spec.list}'/>
       <classpath>
         <pathelement path="${gentools.home}/src" />
-        <pathelement path="${project.root}/${velocity.jar}" />
-        <pathelement path="${project.root}/${velocity-dep.jar}" />
+        <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="${gentools.timestamp}" />
diff --git a/java/common/protocol-version.xml b/java/common/protocol-version.xml
new file mode 100644
index 0000000000..5435a0a582
--- /dev/null
+++ b/java/common/protocol-version.xml
@@ -0,0 +1,70 @@
+<!--
+ -
+ - 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/java/ivy.retrieve.xml b/java/ivy.retrieve.xml
index 5998a3e78e..3ca38e39f8 100644
--- a/java/ivy.retrieve.xml
+++ b/java/ivy.retrieve.xml
@@ -69,8 +69,6 @@
     <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/java/module.xml b/java/module.xml
index 45d7e9b390..26349fb41c 100644
--- a/java/module.xml
+++ b/java/module.xml
@@ -809,7 +809,7 @@ qpid.name=${project.name}
                deprecation="${javac.deprecation}"
                srcdir="${project.root}/broker/src/velocity/java" >
           <classpath>
-            <pathelement path="${project.root}/${velocity.jar}" />
+            <pathelement path="${gentools.home}/lib/velocity-1.4.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="${project.root}/${velocity.jar}" />
+          <pathelement path="${gentools.home}/lib/velocity-1.4.jar" />
         </classpath>
       </java>
       <touch file="${velocity.timestamp}" />