You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by kp...@apache.org on 2006/12/22 19:26:41 UTC
svn commit: r489715 [1/3] - in /incubator/qpid/trunk/qpid: cpp/gen/
java/common/ java/common/src/main/versions/ java/common/src/main/xsl/
python/ python/qpid/ specs/
Author: kpvdr
Date: Fri Dec 22 10:26:40 2006
New Revision: 489715
URL: http://svn.apache.org/viewvc?view=rev&rev=489715
Log:
File tidy-up for AMQP version code: Removed old XSLT files; moved cluster.asl into spec directory; renamed spec files to better reflect version notation; updated java, c++ and python files to reference new names.
Added:
incubator/qpid/trunk/qpid/specs/amqp.0-8.xml
- copied unchanged from r489705, incubator/qpid/trunk/qpid/specs/amqp-8.0.xml
incubator/qpid/trunk/qpid/specs/amqp.0-9.xml
incubator/qpid/trunk/qpid/specs/cluster.0-8.xml
- copied unchanged from r489705, incubator/qpid/trunk/qpid/java/common/src/main/xsl/cluster.asl
incubator/qpid/trunk/qpid/specs/cluster.0-9.xml
Removed:
incubator/qpid/trunk/qpid/java/common/src/main/versions/
incubator/qpid/trunk/qpid/java/common/src/main/xsl/
incubator/qpid/trunk/qpid/specs/amqp-8.0.xml
Modified:
incubator/qpid/trunk/qpid/cpp/gen/Makefile.am
incubator/qpid/trunk/qpid/java/common/pom.xml
incubator/qpid/trunk/qpid/java/common/protocol-version.xml
incubator/qpid/trunk/qpid/python/amqp-doc
incubator/qpid/trunk/qpid/python/qpid/testlib.py
Modified: incubator/qpid/trunk/qpid/cpp/gen/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/gen/Makefile.am?view=diff&rev=489715&r1=489714&r2=489715
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/gen/Makefile.am (original)
+++ incubator/qpid/trunk/qpid/cpp/gen/Makefile.am Fri Dec 22 10:26:40 2006
@@ -16,7 +16,7 @@
gentools_dir = $(srcdir)/../../gentools
spec_dir = $(srcdir)/../../specs
-spec = $(spec_dir)/amqp-8.0.xml
+spec = $(spec_dir)/amqp.0-8.xml
gentools_srcdir = $(gentools_dir)/src/org/apache/qpid/gentools
$(BUILT_SOURCES) timestamp: $(spec) $(java_sources) $(cxx_templates)
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=489715&r1=489714&r2=489715
==============================================================================
--- incubator/qpid/trunk/qpid/java/common/pom.xml (original)
+++ incubator/qpid/trunk/qpid/java/common/pom.xml Fri Dec 22 10:26:40 2006
@@ -57,8 +57,7 @@
<ant antfile="protocol-version.xml">
<property name="gentools.home" value="${gentools.home}"/>
<property name="generated.dir" value="${generated.dir}"/>
- <property name="cluster.asl" value="${cluster.asl}"/>
- <property name="xml.spec.list" value="${specs.dir}/amqp-8.0.xml ${cluster.asl}"/>
+ <property name="xml.spec.list" value="${specs.dir}/amqp.0-8.xml ${specs.dir}/cluster.0-8.xml"/>
</ant>
</tasks>
<sourceRoot>${generated.path}</sourceRoot>
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=489715&r1=489714&r2=489715
==============================================================================
--- incubator/qpid/trunk/qpid/java/common/protocol-version.xml (original)
+++ incubator/qpid/trunk/qpid/java/common/protocol-version.xml Fri Dec 22 10:26:40 2006
@@ -20,14 +20,6 @@
-->
<project name="Qpid Common Protocol Versions" default="generate">
-<!--
- <property name="specs.dir" value="../../specs"/>
- <property name="gentools.home" value="../../gentools"/>
- <property name="generated.dir" value="target/generated-sources/xsl/org/apache/qpid/framing"/>
- <property name="cluster.asl" value="src/main/xsl/cluster.asl"/>
- <property name="xml.spec.list" value="${specs.dir}/amqp-8.0.xml ${cluster.asl}"/>
--->
-
<target name="generate">
<mkdir dir="${generated.dir}"/>
<exec dir="${gentools.home}/src" executable="pwd" />
Modified: incubator/qpid/trunk/qpid/python/amqp-doc
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/python/amqp-doc?view=diff&rev=489715&r1=489714&r2=489715
==============================================================================
--- incubator/qpid/trunk/qpid/python/amqp-doc (original)
+++ incubator/qpid/trunk/qpid/python/amqp-doc Fri Dec 22 10:26:40 2006
@@ -42,7 +42,7 @@
die(str(e))
regexp = False
-spec = "../specs/amqp-8.0.xml"
+spec = "../specs/amqp.0-8.xml"
for k, v in opts:
if k == "-e" or k == "--regexp": regexp = True
if k == "-s" or k == "--spec": spec = v
Modified: incubator/qpid/trunk/qpid/python/qpid/testlib.py
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/python/qpid/testlib.py?view=diff&rev=489715&r1=489714&r2=489715
==============================================================================
--- incubator/qpid/trunk/qpid/python/qpid/testlib.py (original)
+++ incubator/qpid/trunk/qpid/python/qpid/testlib.py Fri Dec 22 10:26:40 2006
@@ -80,7 +80,7 @@
def __init__(self):
# Defaults
self.setBroker("localhost")
- self.spec = "../specs/amqp-8.0.xml"
+ self.spec = "../specs/amqp.0-8.xml"
self.verbose = 1
self.ignore = []