Author: rhs
Date: Fri Apr 18 11:35:51 2008
New Revision: 649648
URL: http://svn.apache.org/viewvc?rev=649648&view=rev
Log:
QPID-901: update pom to work with new codegen
Modified:
incubator/qpid/trunk/qpid/java/common/build.xml
incubator/qpid/trunk/qpid/java/common/codegen
incubator/qpid/trunk/qpid/java/common/pom.xml
Modified: incubator/qpid/trunk/qpid/java/common/build.xml
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/build.xml?rev=649648&r1=649647&r2=649648&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/common/build.xml (original)
+++ incubator/qpid/trunk/qpid/java/common/build.xml Fri Apr 18 11:35:51 2008
@@ -45,6 +45,7 @@
<arg value="${basedir}/codegen"/>
<arg value="${module.precompiled}"/>
<arg value="${xml.spec.dir}/amqp.0-10-qpid-errata.xml"/>
+ <arg value="${basedir}"/>
<classpath>
<pathelement location="jython-2.2-rc2.jar"/>
</classpath>
Modified: incubator/qpid/trunk/qpid/java/common/codegen
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/codegen?rev=649648&r1=649647&r2=649648&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/common/codegen (original)
+++ incubator/qpid/trunk/qpid/java/common/codegen Fri Apr 18 11:35:51 2008
@@ -6,6 +6,7 @@
out_dir = sys.argv[1]
spec_file = sys.argv[2]
+tpl_dir = sys.argv[3]
pkg_dir = os.path.join(out_dir, "org/apache/qpidity/transport")
if not os.path.exists(pkg_dir):
@@ -22,7 +23,7 @@
return True
def execute(output, template, **kwargs):
- f = open(template)
+ f = open(os.path.join(tpl_dir, template))
input = f.read()
f.close()
p = Parser(**kwargs)
Modified: incubator/qpid/trunk/qpid/java/common/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/common/pom.xml?rev=649648&r1=649647&r2=649648&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/common/pom.xml (original)
+++ incubator/qpid/trunk/qpid/java/common/pom.xml Fri Apr 18 11:35:51 2008
@@ -85,14 +85,14 @@
<params>
<param>-Dpython.cachedir.skip=true</param>
<param>-Dpython.path=${basedir}/jython-lib.jar/Lib${path.separator}${mllib.dir}</param>
- <param>${basedir}/generate</param>
+ <param>${basedir}/codegen</param>
<param>${generated.path}</param>
- <param>org.apache.qpidity.transport</param>
-
<param>${specs.dir}/amqp.0-10-preview.xml</param>
+
<param>${specs.dir}/amqp.0-10-qpid-errata.xml</param>
+ <param>${basedir}</param>
</params>
<sources>
-
<source>${specs.dir}/amqp.0-10-preview.xml</source>
- <source>${basedir}/generate</source>
+
<source>${specs.dir}/amqp.0-10-qpid-errata.xml</source>
+ <source>${basedir}/codegen</source>
</sources>
<timestamp>${generated.path}/generated.timestamp</timestamp>
</configuration>
