You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ro...@apache.org on 2012/11/23 01:43:37 UTC
svn commit: r1412726 - in /qpid/trunk/qpid: gentools/lib/ java/ java/common/
Author: robbie
Date: Fri Nov 23 00:43:36 2012
New Revision: 1412726
URL: http://svn.apache.org/viewvc?rev=1412726&view=rev
Log:
QPID-4458: revert changes in r1412380, a CI build failure after a clean checkout showed there is a usage path the changes didnt cover
Added:
qpid/trunk/qpid/gentools/lib/
qpid/trunk/qpid/gentools/lib/LICENSE
qpid/trunk/qpid/gentools/lib/NOTICE
qpid/trunk/qpid/gentools/lib/README.txt
qpid/trunk/qpid/gentools/lib/velocity-1.4.jar
qpid/trunk/qpid/gentools/lib/velocity-dep-1.4.jar
qpid/trunk/qpid/java/common/protocol-version.xml
Modified:
qpid/trunk/qpid/java/build.deps
qpid/trunk/qpid/java/common/build.xml
qpid/trunk/qpid/java/ivy.retrieve.xml
qpid/trunk/qpid/java/module.xml
Added: qpid/trunk/qpid/gentools/lib/LICENSE
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/gentools/lib/LICENSE?rev=1412726&view=auto
==============================================================================
(empty)
Added: qpid/trunk/qpid/gentools/lib/NOTICE
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/gentools/lib/NOTICE?rev=1412726&view=auto
==============================================================================
(empty)
Added: qpid/trunk/qpid/gentools/lib/README.txt
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/gentools/lib/README.txt?rev=1412726&view=auto
==============================================================================
(empty)
Added: qpid/trunk/qpid/gentools/lib/velocity-1.4.jar
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/gentools/lib/velocity-1.4.jar?rev=1412726&view=auto
==============================================================================
Files qpid/trunk/qpid/gentools/lib/velocity-1.4.jar (added) and qpid/trunk/qpid/gentools/lib/velocity-1.4.jar Fri Nov 23 00:43:36 2012 differ
Added: qpid/trunk/qpid/gentools/lib/velocity-dep-1.4.jar
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/gentools/lib/velocity-dep-1.4.jar?rev=1412726&view=auto
==============================================================================
Files qpid/trunk/qpid/gentools/lib/velocity-dep-1.4.jar (added) and qpid/trunk/qpid/gentools/lib/velocity-dep-1.4.jar Fri Nov 23 00:43:36 2012 differ
Modified: qpid/trunk/qpid/java/build.deps
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/build.deps?rev=1412726&r1=1412725&r2=1412726&view=diff
==============================================================================
--- qpid/trunk/qpid/java/build.deps (original)
+++ qpid/trunk/qpid/java/build.deps Fri Nov 23 00:43:36 2012
@@ -122,5 +122,3 @@ perftests-visualisation-jfc.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
Modified: qpid/trunk/qpid/java/common/build.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/common/build.xml?rev=1412726&r1=1412725&r2=1412726&view=diff
==============================================================================
--- qpid/trunk/qpid/java/common/build.xml (original)
+++ qpid/trunk/qpid/java/common/build.xml Fri Nov 23 00:43:36 2012
@@ -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}" />
Added: qpid/trunk/qpid/java/common/protocol-version.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/common/protocol-version.xml?rev=1412726&view=auto
==============================================================================
--- qpid/trunk/qpid/java/common/protocol-version.xml (added)
+++ qpid/trunk/qpid/java/common/protocol-version.xml Fri Nov 23 00:43:36 2012
@@ -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>
+
Modified: qpid/trunk/qpid/java/ivy.retrieve.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/ivy.retrieve.xml?rev=1412726&r1=1412725&r2=1412726&view=diff
==============================================================================
--- qpid/trunk/qpid/java/ivy.retrieve.xml (original)
+++ qpid/trunk/qpid/java/ivy.retrieve.xml Fri Nov 23 00:43:36 2012
@@ -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
Modified: qpid/trunk/qpid/java/module.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/module.xml?rev=1412726&r1=1412725&r2=1412726&view=diff
==============================================================================
--- qpid/trunk/qpid/java/module.xml (original)
+++ qpid/trunk/qpid/java/module.xml Fri Nov 23 00:43:36 2012
@@ -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}" />
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org