svn commit: r484848 - in /incubator/qpid/trunk/qpid/java/common: pom.xml protocol-version.xml

[vi...@apache.org]

Author: vinoski
Date: Fri Dec  8 15:37:45 2006
New Revision: 484848

URL: http://svn.apache.org/viewvc?view=rev&rev=484848
Log:
minor client build changes

* changed the name of the output directory for generated sources
* temporary workaround to restore build avoidance wrt code generation

Modified:
    incubator/qpid/trunk/qpid/java/common/pom.xml
    incubator/qpid/trunk/qpid/java/common/protocol-version.xml

Modified: incubator/qpid/trunk/qpid/java/common/pom.xml
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/pom.xml?view=diff&rev=484848&r1=484847&r2=484848
==============================================================================
--- incubator/qpid/trunk/qpid/java/common/pom.xml (original)
+++ incubator/qpid/trunk/qpid/java/common/pom.xml Fri Dec  8 15:37:45 2006
@@ -39,7 +39,7 @@
         <spec.stylesheet>${basedir}/src/main/xsl/framing.xsl</spec.stylesheet>
         <registry.stylesheet>${basedir}/src/main/xsl/registry.xsl</registry.stylesheet>
         <registry.template>${basedir}/src/main/xsl/registry.template</registry.template>
-        <generated.path>${project.build.directory}/generated/xsl</generated.path>
+        <generated.path>${project.build.directory}/generated-sources/xsl</generated.path>
         <generated.package>org/apache/qpid/framing</generated.package>
         <generated.dir>${generated.path}/${generated.package}</generated.dir>
         <specs.dir>${topDirectoryLocation}/../specs</specs.dir>

Modified: incubator/qpid/trunk/qpid/java/common/protocol-version.xml
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/protocol-version.xml?view=diff&rev=484848&r1=484847&r2=484848
==============================================================================
--- incubator/qpid/trunk/qpid/java/common/protocol-version.xml (original)
+++ incubator/qpid/trunk/qpid/java/common/protocol-version.xml Fri Dec  8 15:37:45 2006
@@ -21,6 +21,8 @@
 <project name="Qpid Common Protocol Versions" default="generate">
 
   <property name="saxon.jar" value="lib/saxon/saxon8.jar"/>
+  <!-- temporarily hard-wired XML spec version for build avoidance -->
+  <property name="amqp.xml" value="${specs.dir}/amqp-8.0.xml"/>
   
   <macrodef name="saxon">
     <attribute name="out"/>
@@ -85,11 +87,10 @@
     </sequential>
   </macrodef>
 
-<!--  <uptodate property="generated" targetfile="${generated.dir}/results.out"
-            srcfile="${amqp.xml}"/> -->
+  <uptodate property="generated" targetfile="${generated.dir}/results.out"
+            srcfile="${amqp.xml}"/>
 
-<!--  <target name="generate" unless="generated"> -->
-  <target name="generate">
+  <target name="generate" unless="generated">
     <mkdir dir="${generated.dir}"/>
     <copy file="src/main/versions/ProtocolVersionList.java.tmpl" tofile="${proto_version}"
             overwrite="true"/>