Author: robbie
Date: Thu Nov 22 00:13:07 2012
New Revision: 1412380
URL: http://svn.apache.org/viewvc?rev=1412380&view=rev
Log:
QPID-4458: remove the gentool/lib folder, retrieve the velocity dependencies
using Ivy, remove seemingly unused common/protocol-version.xml file.
Removed:
qpid/trunk/qpid/gentools/lib/
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
Modified: qpid/trunk/qpid/java/build.deps
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/build.deps?rev=1412380&r1=1412379&r2=1412380&view=diff
==============================================================================
--- qpid/trunk/qpid/java/build.deps (original)
+++ qpid/trunk/qpid/java/build.deps Thu Nov 22 00:13:07 2012
@@ -122,3 +122,5 @@ 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=1412380&r1=1412379&r2=1412380&view=diff
==============================================================================
--- qpid/trunk/qpid/java/common/build.xml (original)
+++ qpid/trunk/qpid/java/common/build.xml Thu Nov 22 00:13:07 2012
@@ -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}" />
Modified: qpid/trunk/qpid/java/ivy.retrieve.xml
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/ivy.retrieve.xml?rev=1412380&r1=1412379&r2=1412380&view=diff
==============================================================================
--- qpid/trunk/qpid/java/ivy.retrieve.xml (original)
+++ qpid/trunk/qpid/java/ivy.retrieve.xml Thu Nov 22 00:13:07 2012
@@ -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
Modified: qpid/trunk/qpid/java/module.xml
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/module.xml?rev=1412380&r1=1412379&r2=1412380&view=diff
==============================================================================
--- qpid/trunk/qpid/java/module.xml (original)
+++ qpid/trunk/qpid/java/module.xml Thu Nov 22 00:13:07 2012
@@ -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}" />
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
