From 366b25ae136c83238e94ac6dfd670990fa1d8375 Mon Sep 17 00:00:00 2001
From: Kim van der Riet <kpvdr@apache.org>
Date: Mon, 8 Jan 2007 15:22:05 +0000
Subject: Fixed: [QPID-253] Existing classpath breaks codegen; [QPID-254] Build
 failure does not prevent timestamp from being generated. Also moved all
 required properties into ant build file, allowing the generation to be
 completed independently of Maven from the common directory.

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@494092 13f79535-47bb-0310-9956-ffa450edef68
---
 qpid/java/common/pom.xml | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

(limited to 'qpid/java/common/pom.xml')

diff --git a/qpid/java/common/pom.xml b/qpid/java/common/pom.xml
index 77f8cc9dff..dc0db7f954 100644
--- a/qpid/java/common/pom.xml
+++ b/qpid/java/common/pom.xml
@@ -36,12 +36,11 @@
     <properties>
         <topDirectoryLocation>..</topDirectoryLocation>
         <gentools.home>${topDirectoryLocation}/../gentools</gentools.home>
-        <generated.path>${project.build.directory}/generated-sources/xsl</generated.path>
+        <generated.path>${project.build.directory}/generated-sources/gentools</generated.path>
         <generated.package>org/apache/qpid/framing</generated.package>
         <generated.dir>${generated.path}/${generated.package}</generated.dir>
         <generated.timestamp>${generated.dir}/timestamp</generated.timestamp>
         <specs.dir>${topDirectoryLocation}/../specs</specs.dir>
-        <cluster.asl>${basedir}/src/main/xsl/cluster.asl</cluster.asl>
     </properties>
 
     <build>
@@ -55,14 +54,7 @@
                         <phase>generate-sources</phase>
                         <configuration>
                             <tasks>
-                                <ant antfile="protocol-version.xml">
-									<property name="gentools.home" value="${gentools.home}"/>
-                                    <property name="generated.dir" value="${generated.dir}"/>
-                                    <property name="generated.timestamp" value="${generated.timestamp}"/>
-                                    <property name="xml.spec.dir" value="${specs.dir}"/>
-                                    <property name="xml.spec.deps" value="amqp.0-8.xml cluster.0-8.xml"/>
-                                    <property name="xml.spec.list" value="${specs.dir}/amqp.0-8.xml ${specs.dir}/cluster.0-8.xml"/>
-                                </ant>
+                                <ant antfile="protocol-version.xml" />
                             </tasks>
                             <sourceRoot>${generated.path}</sourceRoot>
                         </configuration>
-- 
cgit v1.2.1