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/12/18 23:58:17 UTC

svn commit: r1423705 - in /qpid/trunk/qpid: cpp/src/ gentools/ gentools/lib/ gentools/src/org/apache/qpid/gentools/ gentools/templ.cpp/method/ gentools/templ.cpp/model/ gentools/templ.java/ gentools/templ.java/method/version/ gentools/templ.java/model/...

Author: robbie
Date: Tue Dec 18 22:58:09 2012
New Revision: 1423705

URL: http://svn.apache.org/viewvc?rev=1423705&view=rev
Log:
QPID-4458: remove unused subdirs and files from gentools then move the remainder src to java/common/gentools.

- Integrate into the java common module build process
- Retrieve the Velocity dependencies using Ivy.
- Remove unused java/common/protocol-version.xml and cpp/src/generate.sh files.

Added:
    qpid/trunk/qpid/java/common/gentools/
    qpid/trunk/qpid/java/common/gentools/src/
    qpid/trunk/qpid/java/common/gentools/src/org/
    qpid/trunk/qpid/java/common/gentools/src/org/apache/
    qpid/trunk/qpid/java/common/gentools/src/org/apache/qpid/
    qpid/trunk/qpid/java/common/gentools/src/org/apache/qpid/gentools/
    qpid/trunk/qpid/java/common/gentools/src/org/apache/qpid/gentools/AmqpClass.java
      - copied, changed from r1423689, qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/AmqpClass.java
    qpid/trunk/qpid/java/common/gentools/src/org/apache/qpid/gentools/AmqpClassMap.java
      - copied, changed from r1423689, qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/AmqpClassMap.java
    qpid/trunk/qpid/java/common/gentools/src/org/apache/qpid/gentools/AmqpConstant.java
      - copied, changed from r1423689, qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/AmqpConstant.java
    qpid/trunk/qpid/java/common/gentools/src/org/apache/qpid/gentools/AmqpConstantSet.java
      - copied, changed from r1423689, qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/AmqpConstantSet.java
    qpid/trunk/qpid/java/common/gentools/src/org/apache/qpid/gentools/AmqpDomain.java
      - copied, changed from r1423689, qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/AmqpDomain.java
    qpid/trunk/qpid/java/common/gentools/src/org/apache/qpid/gentools/AmqpDomainMap.java
      - copied, changed from r1423689, qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/AmqpDomainMap.java
    qpid/trunk/qpid/java/common/gentools/src/org/apache/qpid/gentools/AmqpDomainVersionMap.java
      - copied, changed from r1423689, qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/AmqpDomainVersionMap.java
    qpid/trunk/qpid/java/common/gentools/src/org/apache/qpid/gentools/AmqpField.java
      - copied, changed from r1423689, qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/AmqpField.java
    qpid/trunk/qpid/java/common/gentools/src/org/apache/qpid/gentools/AmqpFieldMap.java
      - copied, changed from r1423689, qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/AmqpFieldMap.java
    qpid/trunk/qpid/java/common/gentools/src/org/apache/qpid/gentools/AmqpFlagMap.java
      - copied, changed from r1423689, qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/AmqpFlagMap.java
    qpid/trunk/qpid/java/common/gentools/src/org/apache/qpid/gentools/AmqpMethod.java
      - copied, changed from r1423689, qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/AmqpMethod.java
    qpid/trunk/qpid/java/common/gentools/src/org/apache/qpid/gentools/AmqpMethodMap.java
      - copied, changed from r1423689, qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/AmqpMethodMap.java
    qpid/trunk/qpid/java/common/gentools/src/org/apache/qpid/gentools/AmqpModel.java
      - copied, changed from r1423689, qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/AmqpModel.java
    qpid/trunk/qpid/java/common/gentools/src/org/apache/qpid/gentools/AmqpOrdinalFieldMap.java
      - copied, changed from r1423689, qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/AmqpOrdinalFieldMap.java
    qpid/trunk/qpid/java/common/gentools/src/org/apache/qpid/gentools/AmqpOrdinalVersionMap.java
      - copied, changed from r1423689, qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/AmqpOrdinalVersionMap.java
    qpid/trunk/qpid/java/common/gentools/src/org/apache/qpid/gentools/AmqpOverloadedParameterMap.java
      - copied, changed from r1423689, qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/AmqpOverloadedParameterMap.java
    qpid/trunk/qpid/java/common/gentools/src/org/apache/qpid/gentools/AmqpParseException.java
      - copied, changed from r1423689, qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/AmqpParseException.java
    qpid/trunk/qpid/java/common/gentools/src/org/apache/qpid/gentools/AmqpTemplateException.java
      - copied, changed from r1423689, qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/AmqpTemplateException.java
    qpid/trunk/qpid/java/common/gentools/src/org/apache/qpid/gentools/AmqpTypeMappingException.java
      - copied, changed from r1423689, qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/AmqpTypeMappingException.java
    qpid/trunk/qpid/java/common/gentools/src/org/apache/qpid/gentools/AmqpVersion.java
      - copied, changed from r1423689, qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/AmqpVersion.java
    qpid/trunk/qpid/java/common/gentools/src/org/apache/qpid/gentools/AmqpVersionSet.java
      - copied, changed from r1423689, qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/AmqpVersionSet.java
    qpid/trunk/qpid/java/common/gentools/src/org/apache/qpid/gentools/BitFieldGenerateMethod.java
      - copied, changed from r1423689, qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/BitFieldGenerateMethod.java
    qpid/trunk/qpid/java/common/gentools/src/org/apache/qpid/gentools/CommandGenerateMethod.java
      - copied, changed from r1423689, qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/CommandGenerateMethod.java
    qpid/trunk/qpid/java/common/gentools/src/org/apache/qpid/gentools/ConsolidatedField.java
      - copied, changed from r1423689, qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/ConsolidatedField.java
    qpid/trunk/qpid/java/common/gentools/src/org/apache/qpid/gentools/CppGenerator.java
      - copied, changed from r1423689, qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/CppGenerator.java
    qpid/trunk/qpid/java/common/gentools/src/org/apache/qpid/gentools/DotnetGenerator.java
      - copied, changed from r1423689, qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/DotnetGenerator.java
    qpid/trunk/qpid/java/common/gentools/src/org/apache/qpid/gentools/GenerateMethod.java
      - copied, changed from r1423689, qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/GenerateMethod.java
    qpid/trunk/qpid/java/common/gentools/src/org/apache/qpid/gentools/Generator.java
      - copied, changed from r1423689, qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/Generator.java
    qpid/trunk/qpid/java/common/gentools/src/org/apache/qpid/gentools/JavaGenerator.java
      - copied, changed from r1423689, qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/JavaGenerator.java
    qpid/trunk/qpid/java/common/gentools/src/org/apache/qpid/gentools/LanguageConverter.java
      - copied, changed from r1423689, qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/LanguageConverter.java
    qpid/trunk/qpid/java/common/gentools/src/org/apache/qpid/gentools/Main.java
      - copied, changed from r1423689, qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/Main.java
    qpid/trunk/qpid/java/common/gentools/src/org/apache/qpid/gentools/MangledGenerateMethod.java
      - copied, changed from r1423689, qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/MangledGenerateMethod.java
    qpid/trunk/qpid/java/common/gentools/src/org/apache/qpid/gentools/NodeAware.java
      - copied, changed from r1423689, qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/NodeAware.java
    qpid/trunk/qpid/java/common/gentools/src/org/apache/qpid/gentools/Printable.java
      - copied, changed from r1423689, qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/Printable.java
    qpid/trunk/qpid/java/common/gentools/src/org/apache/qpid/gentools/SingleVersionClass.java
      - copied, changed from r1423689, qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/SingleVersionClass.java
    qpid/trunk/qpid/java/common/gentools/src/org/apache/qpid/gentools/SingleVersionField.java
      - copied, changed from r1423689, qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/SingleVersionField.java
    qpid/trunk/qpid/java/common/gentools/src/org/apache/qpid/gentools/SingleVersionMethod.java
      - copied, changed from r1423689, qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/SingleVersionMethod.java
    qpid/trunk/qpid/java/common/gentools/src/org/apache/qpid/gentools/SingleVersionModel.java
      - copied, changed from r1423689, qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/SingleVersionModel.java
    qpid/trunk/qpid/java/common/gentools/src/org/apache/qpid/gentools/TargetDirectoryException.java
      - copied, changed from r1423689, qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/TargetDirectoryException.java
    qpid/trunk/qpid/java/common/gentools/src/org/apache/qpid/gentools/Utils.java
      - copied, changed from r1423689, qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/Utils.java
    qpid/trunk/qpid/java/common/gentools/src/org/apache/qpid/gentools/VersionConsistencyCheck.java
      - copied, changed from r1423689, qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/VersionConsistencyCheck.java
Removed:
    qpid/trunk/qpid/cpp/src/generate.sh
    qpid/trunk/qpid/gentools/LICENSE
    qpid/trunk/qpid/gentools/NOTICE
    qpid/trunk/qpid/gentools/README.txt
    qpid/trunk/qpid/gentools/build
    qpid/trunk/qpid/gentools/build.xml
    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/gentools/src/org/apache/qpid/gentools/AmqpClass.java
    qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/AmqpClassMap.java
    qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/AmqpConstant.java
    qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/AmqpConstantSet.java
    qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/AmqpDomain.java
    qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/AmqpDomainMap.java
    qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/AmqpDomainVersionMap.java
    qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/AmqpField.java
    qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/AmqpFieldMap.java
    qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/AmqpFlagMap.java
    qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/AmqpMethod.java
    qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/AmqpMethodMap.java
    qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/AmqpModel.java
    qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/AmqpOrdinalFieldMap.java
    qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/AmqpOrdinalVersionMap.java
    qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/AmqpOverloadedParameterMap.java
    qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/AmqpParseException.java
    qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/AmqpTemplateException.java
    qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/AmqpTypeMappingException.java
    qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/AmqpVersion.java
    qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/AmqpVersionSet.java
    qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/BitFieldGenerateMethod.java
    qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/CommandGenerateMethod.java
    qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/ConsolidatedField.java
    qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/CppGenerator.java
    qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/DotnetGenerator.java
    qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/GenerateMethod.java
    qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/Generator.java
    qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/JavaGenerator.java
    qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/LanguageConverter.java
    qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/Main.java
    qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/MangledGenerateMethod.java
    qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/NodeAware.java
    qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/Printable.java
    qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/SingleVersionClass.java
    qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/SingleVersionField.java
    qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/SingleVersionMethod.java
    qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/SingleVersionModel.java
    qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/TargetDirectoryException.java
    qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/Utils.java
    qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/VersionConsistencyCheck.java
    qpid/trunk/qpid/gentools/templ.cpp/method/MethodBodyClass.h.tmpl
    qpid/trunk/qpid/gentools/templ.cpp/model/AMQP_ClientOperations.h.tmpl
    qpid/trunk/qpid/gentools/templ.cpp/model/AMQP_ClientProxy.cpp.tmpl
    qpid/trunk/qpid/gentools/templ.cpp/model/AMQP_ClientProxy.h.tmpl
    qpid/trunk/qpid/gentools/templ.cpp/model/AMQP_Constants.h.tmpl
    qpid/trunk/qpid/gentools/templ.cpp/model/AMQP_HighestVersion.h.tmpl
    qpid/trunk/qpid/gentools/templ.cpp/model/AMQP_MethodVersionMap.cpp.tmpl
    qpid/trunk/qpid/gentools/templ.cpp/model/AMQP_MethodVersionMap.h.tmpl
    qpid/trunk/qpid/gentools/templ.cpp/model/AMQP_ServerOperations.h.tmpl
    qpid/trunk/qpid/gentools/templ.cpp/model/AMQP_ServerProxy.cpp.tmpl
    qpid/trunk/qpid/gentools/templ.cpp/model/AMQP_ServerProxy.h.tmpl
    qpid/trunk/qpid/gentools/templ.java/PropertyContentHeaderClass.tmpl
    qpid/trunk/qpid/gentools/templ.java/method/version/MethodBodyClass.vm
    qpid/trunk/qpid/gentools/templ.java/model/ProtocolVersionListClass.vm
    qpid/trunk/qpid/gentools/templ.java/model/version/AmqpConstantsClass.vm
    qpid/trunk/qpid/gentools/templ.java/model/version/MethodRegistryClass.vm
    qpid/trunk/qpid/gentools/xml-src/amqp-0.10.test.xml
    qpid/trunk/qpid/gentools/xml-src/amqp-0.8.test.xml
    qpid/trunk/qpid/gentools/xml-src/amqp-0.9.test.xml
    qpid/trunk/qpid/gentools/xml-src/cluster-0.9.test.xml
    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=1423705&r1=1423704&r2=1423705&view=diff
==============================================================================
--- qpid/trunk/qpid/java/build.deps (original)
+++ qpid/trunk/qpid/java/build.deps Tue Dec 18 22:58:09 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=1423705&r1=1423704&r2=1423705&view=diff
==============================================================================
--- qpid/trunk/qpid/java/common/build.xml (original)
+++ qpid/trunk/qpid/java/common/build.xml Tue Dec 18 22:58:09 2012
@@ -53,7 +53,15 @@
   </target>
 
   <target name="compile_gentools">
-    <ant dir="${gentools.home}" />
+    <mkdir dir="${gentools.build}/classes"/>
+    <javac srcdir="${gentools.home}/src" destdir="${gentools.build}/classes" source="${java.source}" target="${java.target}" fork="true" includeantruntime="false">
+      <classpath>
+        <fileset dir="${project.root}">
+          <include name="${velocity.jar}"/>
+          <include name="${velocity-dep.jar}"/>
+        </fileset>
+      </classpath>
+    </javac>
   </target>
 
   <target name="check_gentool_deps">
@@ -64,15 +72,12 @@
 
   <target name="gentools" depends="compile_gentools,check_gentool_deps" unless="gentools.notRequired">
     <mkdir dir="${framing.generated.dir}"/>
-    <java classname="org.apache.qpid.gentools.Main" fork="true" dir="${gentools.home}/src" failonerror="true">
+    <java classname="org.apache.qpid.gentools.Main" fork="true" dir="${gentools.build}/classes" failonerror="true">
       <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="${gentools.build}/classes" />
+        <pathelement path="${project.root}/${velocity.jar}" />
+        <pathelement path="${project.root}/${velocity-dep.jar}" />
       </classpath>
     </java>
     <touch file="${gentools.timestamp}" />

Copied: qpid/trunk/qpid/java/common/gentools/src/org/apache/qpid/gentools/AmqpClass.java (from r1423689, qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/AmqpClass.java)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/common/gentools/src/org/apache/qpid/gentools/AmqpClass.java?p2=qpid/trunk/qpid/java/common/gentools/src/org/apache/qpid/gentools/AmqpClass.java&p1=qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/AmqpClass.java&r1=1423689&r2=1423705&rev=1423705&view=diff
==============================================================================
    (empty)

Copied: qpid/trunk/qpid/java/common/gentools/src/org/apache/qpid/gentools/AmqpClassMap.java (from r1423689, qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/AmqpClassMap.java)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/common/gentools/src/org/apache/qpid/gentools/AmqpClassMap.java?p2=qpid/trunk/qpid/java/common/gentools/src/org/apache/qpid/gentools/AmqpClassMap.java&p1=qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/AmqpClassMap.java&r1=1423689&r2=1423705&rev=1423705&view=diff
==============================================================================
    (empty)

Copied: qpid/trunk/qpid/java/common/gentools/src/org/apache/qpid/gentools/AmqpConstant.java (from r1423689, qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/AmqpConstant.java)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/common/gentools/src/org/apache/qpid/gentools/AmqpConstant.java?p2=qpid/trunk/qpid/java/common/gentools/src/org/apache/qpid/gentools/AmqpConstant.java&p1=qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/AmqpConstant.java&r1=1423689&r2=1423705&rev=1423705&view=diff
==============================================================================
    (empty)

Copied: qpid/trunk/qpid/java/common/gentools/src/org/apache/qpid/gentools/AmqpConstantSet.java (from r1423689, qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/AmqpConstantSet.java)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/common/gentools/src/org/apache/qpid/gentools/AmqpConstantSet.java?p2=qpid/trunk/qpid/java/common/gentools/src/org/apache/qpid/gentools/AmqpConstantSet.java&p1=qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/AmqpConstantSet.java&r1=1423689&r2=1423705&rev=1423705&view=diff
==============================================================================
    (empty)

Copied: qpid/trunk/qpid/java/common/gentools/src/org/apache/qpid/gentools/AmqpDomain.java (from r1423689, qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/AmqpDomain.java)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/common/gentools/src/org/apache/qpid/gentools/AmqpDomain.java?p2=qpid/trunk/qpid/java/common/gentools/src/org/apache/qpid/gentools/AmqpDomain.java&p1=qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/AmqpDomain.java&r1=1423689&r2=1423705&rev=1423705&view=diff
==============================================================================
    (empty)

Copied: qpid/trunk/qpid/java/common/gentools/src/org/apache/qpid/gentools/AmqpDomainMap.java (from r1423689, qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/AmqpDomainMap.java)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/common/gentools/src/org/apache/qpid/gentools/AmqpDomainMap.java?p2=qpid/trunk/qpid/java/common/gentools/src/org/apache/qpid/gentools/AmqpDomainMap.java&p1=qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/AmqpDomainMap.java&r1=1423689&r2=1423705&rev=1423705&view=diff
==============================================================================
    (empty)

Copied: qpid/trunk/qpid/java/common/gentools/src/org/apache/qpid/gentools/AmqpDomainVersionMap.java (from r1423689, qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/AmqpDomainVersionMap.java)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/common/gentools/src/org/apache/qpid/gentools/AmqpDomainVersionMap.java?p2=qpid/trunk/qpid/java/common/gentools/src/org/apache/qpid/gentools/AmqpDomainVersionMap.java&p1=qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/AmqpDomainVersionMap.java&r1=1423689&r2=1423705&rev=1423705&view=diff
==============================================================================
    (empty)

Copied: qpid/trunk/qpid/java/common/gentools/src/org/apache/qpid/gentools/AmqpField.java (from r1423689, qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/AmqpField.java)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/common/gentools/src/org/apache/qpid/gentools/AmqpField.java?p2=qpid/trunk/qpid/java/common/gentools/src/org/apache/qpid/gentools/AmqpField.java&p1=qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/AmqpField.java&r1=1423689&r2=1423705&rev=1423705&view=diff
==============================================================================
    (empty)

Copied: qpid/trunk/qpid/java/common/gentools/src/org/apache/qpid/gentools/AmqpFieldMap.java (from r1423689, qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/AmqpFieldMap.java)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/common/gentools/src/org/apache/qpid/gentools/AmqpFieldMap.java?p2=qpid/trunk/qpid/java/common/gentools/src/org/apache/qpid/gentools/AmqpFieldMap.java&p1=qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/AmqpFieldMap.java&r1=1423689&r2=1423705&rev=1423705&view=diff
==============================================================================
    (empty)

Copied: qpid/trunk/qpid/java/common/gentools/src/org/apache/qpid/gentools/AmqpFlagMap.java (from r1423689, qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/AmqpFlagMap.java)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/common/gentools/src/org/apache/qpid/gentools/AmqpFlagMap.java?p2=qpid/trunk/qpid/java/common/gentools/src/org/apache/qpid/gentools/AmqpFlagMap.java&p1=qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/AmqpFlagMap.java&r1=1423689&r2=1423705&rev=1423705&view=diff
==============================================================================
    (empty)

Copied: qpid/trunk/qpid/java/common/gentools/src/org/apache/qpid/gentools/AmqpMethod.java (from r1423689, qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/AmqpMethod.java)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/common/gentools/src/org/apache/qpid/gentools/AmqpMethod.java?p2=qpid/trunk/qpid/java/common/gentools/src/org/apache/qpid/gentools/AmqpMethod.java&p1=qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/AmqpMethod.java&r1=1423689&r2=1423705&rev=1423705&view=diff
==============================================================================
    (empty)

Copied: qpid/trunk/qpid/java/common/gentools/src/org/apache/qpid/gentools/AmqpMethodMap.java (from r1423689, qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/AmqpMethodMap.java)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/common/gentools/src/org/apache/qpid/gentools/AmqpMethodMap.java?p2=qpid/trunk/qpid/java/common/gentools/src/org/apache/qpid/gentools/AmqpMethodMap.java&p1=qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/AmqpMethodMap.java&r1=1423689&r2=1423705&rev=1423705&view=diff
==============================================================================
    (empty)

Copied: qpid/trunk/qpid/java/common/gentools/src/org/apache/qpid/gentools/AmqpModel.java (from r1423689, qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/AmqpModel.java)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/common/gentools/src/org/apache/qpid/gentools/AmqpModel.java?p2=qpid/trunk/qpid/java/common/gentools/src/org/apache/qpid/gentools/AmqpModel.java&p1=qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/AmqpModel.java&r1=1423689&r2=1423705&rev=1423705&view=diff
==============================================================================
    (empty)

Copied: qpid/trunk/qpid/java/common/gentools/src/org/apache/qpid/gentools/AmqpOrdinalFieldMap.java (from r1423689, qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/AmqpOrdinalFieldMap.java)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/common/gentools/src/org/apache/qpid/gentools/AmqpOrdinalFieldMap.java?p2=qpid/trunk/qpid/java/common/gentools/src/org/apache/qpid/gentools/AmqpOrdinalFieldMap.java&p1=qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/AmqpOrdinalFieldMap.java&r1=1423689&r2=1423705&rev=1423705&view=diff
==============================================================================
    (empty)

Copied: qpid/trunk/qpid/java/common/gentools/src/org/apache/qpid/gentools/AmqpOrdinalVersionMap.java (from r1423689, qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/AmqpOrdinalVersionMap.java)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/common/gentools/src/org/apache/qpid/gentools/AmqpOrdinalVersionMap.java?p2=qpid/trunk/qpid/java/common/gentools/src/org/apache/qpid/gentools/AmqpOrdinalVersionMap.java&p1=qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/AmqpOrdinalVersionMap.java&r1=1423689&r2=1423705&rev=1423705&view=diff
==============================================================================
    (empty)

Copied: qpid/trunk/qpid/java/common/gentools/src/org/apache/qpid/gentools/AmqpOverloadedParameterMap.java (from r1423689, qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/AmqpOverloadedParameterMap.java)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/common/gentools/src/org/apache/qpid/gentools/AmqpOverloadedParameterMap.java?p2=qpid/trunk/qpid/java/common/gentools/src/org/apache/qpid/gentools/AmqpOverloadedParameterMap.java&p1=qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/AmqpOverloadedParameterMap.java&r1=1423689&r2=1423705&rev=1423705&view=diff
==============================================================================
    (empty)

Copied: qpid/trunk/qpid/java/common/gentools/src/org/apache/qpid/gentools/AmqpParseException.java (from r1423689, qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/AmqpParseException.java)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/common/gentools/src/org/apache/qpid/gentools/AmqpParseException.java?p2=qpid/trunk/qpid/java/common/gentools/src/org/apache/qpid/gentools/AmqpParseException.java&p1=qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/AmqpParseException.java&r1=1423689&r2=1423705&rev=1423705&view=diff
==============================================================================
    (empty)

Copied: qpid/trunk/qpid/java/common/gentools/src/org/apache/qpid/gentools/AmqpTemplateException.java (from r1423689, qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/AmqpTemplateException.java)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/common/gentools/src/org/apache/qpid/gentools/AmqpTemplateException.java?p2=qpid/trunk/qpid/java/common/gentools/src/org/apache/qpid/gentools/AmqpTemplateException.java&p1=qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/AmqpTemplateException.java&r1=1423689&r2=1423705&rev=1423705&view=diff
==============================================================================
    (empty)

Copied: qpid/trunk/qpid/java/common/gentools/src/org/apache/qpid/gentools/AmqpTypeMappingException.java (from r1423689, qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/AmqpTypeMappingException.java)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/common/gentools/src/org/apache/qpid/gentools/AmqpTypeMappingException.java?p2=qpid/trunk/qpid/java/common/gentools/src/org/apache/qpid/gentools/AmqpTypeMappingException.java&p1=qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/AmqpTypeMappingException.java&r1=1423689&r2=1423705&rev=1423705&view=diff
==============================================================================
    (empty)

Copied: qpid/trunk/qpid/java/common/gentools/src/org/apache/qpid/gentools/AmqpVersion.java (from r1423689, qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/AmqpVersion.java)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/common/gentools/src/org/apache/qpid/gentools/AmqpVersion.java?p2=qpid/trunk/qpid/java/common/gentools/src/org/apache/qpid/gentools/AmqpVersion.java&p1=qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/AmqpVersion.java&r1=1423689&r2=1423705&rev=1423705&view=diff
==============================================================================
    (empty)

Copied: qpid/trunk/qpid/java/common/gentools/src/org/apache/qpid/gentools/AmqpVersionSet.java (from r1423689, qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/AmqpVersionSet.java)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/common/gentools/src/org/apache/qpid/gentools/AmqpVersionSet.java?p2=qpid/trunk/qpid/java/common/gentools/src/org/apache/qpid/gentools/AmqpVersionSet.java&p1=qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/AmqpVersionSet.java&r1=1423689&r2=1423705&rev=1423705&view=diff
==============================================================================
    (empty)

Copied: qpid/trunk/qpid/java/common/gentools/src/org/apache/qpid/gentools/BitFieldGenerateMethod.java (from r1423689, qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/BitFieldGenerateMethod.java)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/common/gentools/src/org/apache/qpid/gentools/BitFieldGenerateMethod.java?p2=qpid/trunk/qpid/java/common/gentools/src/org/apache/qpid/gentools/BitFieldGenerateMethod.java&p1=qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/BitFieldGenerateMethod.java&r1=1423689&r2=1423705&rev=1423705&view=diff
==============================================================================
    (empty)

Copied: qpid/trunk/qpid/java/common/gentools/src/org/apache/qpid/gentools/CommandGenerateMethod.java (from r1423689, qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/CommandGenerateMethod.java)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/common/gentools/src/org/apache/qpid/gentools/CommandGenerateMethod.java?p2=qpid/trunk/qpid/java/common/gentools/src/org/apache/qpid/gentools/CommandGenerateMethod.java&p1=qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/CommandGenerateMethod.java&r1=1423689&r2=1423705&rev=1423705&view=diff
==============================================================================
    (empty)

Copied: qpid/trunk/qpid/java/common/gentools/src/org/apache/qpid/gentools/ConsolidatedField.java (from r1423689, qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/ConsolidatedField.java)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/common/gentools/src/org/apache/qpid/gentools/ConsolidatedField.java?p2=qpid/trunk/qpid/java/common/gentools/src/org/apache/qpid/gentools/ConsolidatedField.java&p1=qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/ConsolidatedField.java&r1=1423689&r2=1423705&rev=1423705&view=diff
==============================================================================
    (empty)

Copied: qpid/trunk/qpid/java/common/gentools/src/org/apache/qpid/gentools/CppGenerator.java (from r1423689, qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/CppGenerator.java)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/common/gentools/src/org/apache/qpid/gentools/CppGenerator.java?p2=qpid/trunk/qpid/java/common/gentools/src/org/apache/qpid/gentools/CppGenerator.java&p1=qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/CppGenerator.java&r1=1423689&r2=1423705&rev=1423705&view=diff
==============================================================================
    (empty)

Copied: qpid/trunk/qpid/java/common/gentools/src/org/apache/qpid/gentools/DotnetGenerator.java (from r1423689, qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/DotnetGenerator.java)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/common/gentools/src/org/apache/qpid/gentools/DotnetGenerator.java?p2=qpid/trunk/qpid/java/common/gentools/src/org/apache/qpid/gentools/DotnetGenerator.java&p1=qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/DotnetGenerator.java&r1=1423689&r2=1423705&rev=1423705&view=diff
==============================================================================
    (empty)

Copied: qpid/trunk/qpid/java/common/gentools/src/org/apache/qpid/gentools/GenerateMethod.java (from r1423689, qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/GenerateMethod.java)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/common/gentools/src/org/apache/qpid/gentools/GenerateMethod.java?p2=qpid/trunk/qpid/java/common/gentools/src/org/apache/qpid/gentools/GenerateMethod.java&p1=qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/GenerateMethod.java&r1=1423689&r2=1423705&rev=1423705&view=diff
==============================================================================
    (empty)

Copied: qpid/trunk/qpid/java/common/gentools/src/org/apache/qpid/gentools/Generator.java (from r1423689, qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/Generator.java)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/common/gentools/src/org/apache/qpid/gentools/Generator.java?p2=qpid/trunk/qpid/java/common/gentools/src/org/apache/qpid/gentools/Generator.java&p1=qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/Generator.java&r1=1423689&r2=1423705&rev=1423705&view=diff
==============================================================================
    (empty)

Copied: qpid/trunk/qpid/java/common/gentools/src/org/apache/qpid/gentools/JavaGenerator.java (from r1423689, qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/JavaGenerator.java)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/common/gentools/src/org/apache/qpid/gentools/JavaGenerator.java?p2=qpid/trunk/qpid/java/common/gentools/src/org/apache/qpid/gentools/JavaGenerator.java&p1=qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/JavaGenerator.java&r1=1423689&r2=1423705&rev=1423705&view=diff
==============================================================================
    (empty)

Copied: qpid/trunk/qpid/java/common/gentools/src/org/apache/qpid/gentools/LanguageConverter.java (from r1423689, qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/LanguageConverter.java)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/common/gentools/src/org/apache/qpid/gentools/LanguageConverter.java?p2=qpid/trunk/qpid/java/common/gentools/src/org/apache/qpid/gentools/LanguageConverter.java&p1=qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/LanguageConverter.java&r1=1423689&r2=1423705&rev=1423705&view=diff
==============================================================================
    (empty)

Copied: qpid/trunk/qpid/java/common/gentools/src/org/apache/qpid/gentools/Main.java (from r1423689, qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/Main.java)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/common/gentools/src/org/apache/qpid/gentools/Main.java?p2=qpid/trunk/qpid/java/common/gentools/src/org/apache/qpid/gentools/Main.java&p1=qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/Main.java&r1=1423689&r2=1423705&rev=1423705&view=diff
==============================================================================
    (empty)

Copied: qpid/trunk/qpid/java/common/gentools/src/org/apache/qpid/gentools/MangledGenerateMethod.java (from r1423689, qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/MangledGenerateMethod.java)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/common/gentools/src/org/apache/qpid/gentools/MangledGenerateMethod.java?p2=qpid/trunk/qpid/java/common/gentools/src/org/apache/qpid/gentools/MangledGenerateMethod.java&p1=qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/MangledGenerateMethod.java&r1=1423689&r2=1423705&rev=1423705&view=diff
==============================================================================
    (empty)

Copied: qpid/trunk/qpid/java/common/gentools/src/org/apache/qpid/gentools/NodeAware.java (from r1423689, qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/NodeAware.java)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/common/gentools/src/org/apache/qpid/gentools/NodeAware.java?p2=qpid/trunk/qpid/java/common/gentools/src/org/apache/qpid/gentools/NodeAware.java&p1=qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/NodeAware.java&r1=1423689&r2=1423705&rev=1423705&view=diff
==============================================================================
    (empty)

Copied: qpid/trunk/qpid/java/common/gentools/src/org/apache/qpid/gentools/Printable.java (from r1423689, qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/Printable.java)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/common/gentools/src/org/apache/qpid/gentools/Printable.java?p2=qpid/trunk/qpid/java/common/gentools/src/org/apache/qpid/gentools/Printable.java&p1=qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/Printable.java&r1=1423689&r2=1423705&rev=1423705&view=diff
==============================================================================
    (empty)

Copied: qpid/trunk/qpid/java/common/gentools/src/org/apache/qpid/gentools/SingleVersionClass.java (from r1423689, qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/SingleVersionClass.java)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/common/gentools/src/org/apache/qpid/gentools/SingleVersionClass.java?p2=qpid/trunk/qpid/java/common/gentools/src/org/apache/qpid/gentools/SingleVersionClass.java&p1=qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/SingleVersionClass.java&r1=1423689&r2=1423705&rev=1423705&view=diff
==============================================================================
    (empty)

Copied: qpid/trunk/qpid/java/common/gentools/src/org/apache/qpid/gentools/SingleVersionField.java (from r1423689, qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/SingleVersionField.java)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/common/gentools/src/org/apache/qpid/gentools/SingleVersionField.java?p2=qpid/trunk/qpid/java/common/gentools/src/org/apache/qpid/gentools/SingleVersionField.java&p1=qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/SingleVersionField.java&r1=1423689&r2=1423705&rev=1423705&view=diff
==============================================================================
    (empty)

Copied: qpid/trunk/qpid/java/common/gentools/src/org/apache/qpid/gentools/SingleVersionMethod.java (from r1423689, qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/SingleVersionMethod.java)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/common/gentools/src/org/apache/qpid/gentools/SingleVersionMethod.java?p2=qpid/trunk/qpid/java/common/gentools/src/org/apache/qpid/gentools/SingleVersionMethod.java&p1=qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/SingleVersionMethod.java&r1=1423689&r2=1423705&rev=1423705&view=diff
==============================================================================
    (empty)

Copied: qpid/trunk/qpid/java/common/gentools/src/org/apache/qpid/gentools/SingleVersionModel.java (from r1423689, qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/SingleVersionModel.java)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/common/gentools/src/org/apache/qpid/gentools/SingleVersionModel.java?p2=qpid/trunk/qpid/java/common/gentools/src/org/apache/qpid/gentools/SingleVersionModel.java&p1=qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/SingleVersionModel.java&r1=1423689&r2=1423705&rev=1423705&view=diff
==============================================================================
    (empty)

Copied: qpid/trunk/qpid/java/common/gentools/src/org/apache/qpid/gentools/TargetDirectoryException.java (from r1423689, qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/TargetDirectoryException.java)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/common/gentools/src/org/apache/qpid/gentools/TargetDirectoryException.java?p2=qpid/trunk/qpid/java/common/gentools/src/org/apache/qpid/gentools/TargetDirectoryException.java&p1=qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/TargetDirectoryException.java&r1=1423689&r2=1423705&rev=1423705&view=diff
==============================================================================
    (empty)

Copied: qpid/trunk/qpid/java/common/gentools/src/org/apache/qpid/gentools/Utils.java (from r1423689, qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/Utils.java)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/common/gentools/src/org/apache/qpid/gentools/Utils.java?p2=qpid/trunk/qpid/java/common/gentools/src/org/apache/qpid/gentools/Utils.java&p1=qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/Utils.java&r1=1423689&r2=1423705&rev=1423705&view=diff
==============================================================================
    (empty)

Copied: qpid/trunk/qpid/java/common/gentools/src/org/apache/qpid/gentools/VersionConsistencyCheck.java (from r1423689, qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/VersionConsistencyCheck.java)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/common/gentools/src/org/apache/qpid/gentools/VersionConsistencyCheck.java?p2=qpid/trunk/qpid/java/common/gentools/src/org/apache/qpid/gentools/VersionConsistencyCheck.java&p1=qpid/trunk/qpid/gentools/src/org/apache/qpid/gentools/VersionConsistencyCheck.java&r1=1423689&r2=1423705&rev=1423705&view=diff
==============================================================================
    (empty)

Modified: qpid/trunk/qpid/java/ivy.retrieve.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/ivy.retrieve.xml?rev=1423705&r1=1423704&r2=1423705&view=diff
==============================================================================
--- qpid/trunk/qpid/java/ivy.retrieve.xml (original)
+++ qpid/trunk/qpid/java/ivy.retrieve.xml Tue Dec 18 22:58:09 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=1423705&r1=1423704&r2=1423705&view=diff
==============================================================================
--- qpid/trunk/qpid/java/module.xml (original)
+++ qpid/trunk/qpid/java/module.xml Tue Dec 18 22:58:09 2012
@@ -796,7 +796,8 @@ qpid.name=${project.name}
 
    -->
 
-    <property name="gentools.home" location="${project.root}/../gentools" />
+    <property name="gentools.home" location="${project.root}/common/gentools" />
+    <property name="gentools.build" location="${build.scratch}/common/gentools" />
     <property name="generated.dir" location="${module.precompiled}" />
     <property name="velocity.compile.dir" value="${build.scratch}/broker/velocity"/>
     <property name="velocity.timestamp" location="${generated.dir}/velocity.timestamp" />
@@ -809,7 +810,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>
@@ -839,7 +840,7 @@ qpid.name=${project.name}
 
       <echo message="logmessages is ${logmessages}"/>
 
-      <java classname="org.apache.qpid.server.logging.GenerateLogMessages" fork="true" dir="${gentools.home}/src" failonerror="true">
+      <java classname="org.apache.qpid.server.logging.GenerateLogMessages" fork="true" dir="${gentools.build}/classes" failonerror="true">
         <arg line="'${logmessages}'"/>
           <arg value="-j"/>
           <arg value="-o"/>
@@ -856,7 +857,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: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org