Author: kpvdr
Date: Thu Jan 4 08:51:05 2007
New Revision: 492634
URL: http://svn.apache.org/viewvc?view=rev&rev=492634
Log:
Changes to lick off the 0-9 generation. Note that the new spec file
specs/amqp-nogen.0-9.xml causes the classes basic, file and stream not to
generate. There are plenty of compile errors to sort through...
Added:
incubator/qpid/branches/qpid.0-9/specs/amqp-nogen.0-9.xml
Modified:
incubator/qpid/branches/qpid.0-9/cpp/gen/Makefile.am
incubator/qpid/branches/qpid.0-9/gentools/src/org/apache/qpid/gentools/JavaGenerator.java
incubator/qpid/branches/qpid.0-9/gentools/templ.java/MethodBodyClass.tmpl
incubator/qpid/branches/qpid.0-9/java/common/pom.xml
Modified: incubator/qpid/branches/qpid.0-9/cpp/gen/Makefile.am
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/qpid.0-9/cpp/gen/Makefile.am?view=diff&rev=492634&r1=492633&r2=492634
==============================================================================
--- incubator/qpid/branches/qpid.0-9/cpp/gen/Makefile.am (original)
+++ incubator/qpid/branches/qpid.0-9/cpp/gen/Makefile.am Thu Jan 4 08:51:05
2007
@@ -16,7 +16,7 @@
gentools_dir = $(srcdir)/../../gentools
spec_dir = $(srcdir)/../../specs
-spec = $(spec_dir)/amqp.0-8.xml
+spec = $(spec_dir)/amqp.0-9.xml $(spec_dir)/amqp-nogen.0-9.xml
gentools_srcdir = $(gentools_dir)/src/org/apache/qpid/gentools
$(BUILT_SOURCES) timestamp: $(spec) $(java_sources) $(cxx_templates)
Modified:
incubator/qpid/branches/qpid.0-9/gentools/src/org/apache/qpid/gentools/JavaGenerator.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/qpid.0-9/gentools/src/org/apache/qpid/gentools/JavaGenerator.java?view=diff&rev=492634&r1=492633&r2=492634
==============================================================================
---
incubator/qpid/branches/qpid.0-9/gentools/src/org/apache/qpid/gentools/JavaGenerator.java
(original)
+++
incubator/qpid/branches/qpid.0-9/gentools/src/org/apache/qpid/gentools/JavaGenerator.java
Thu Jan 4 08:51:05 2007
@@ -946,7 +946,7 @@
protected String generateMbBodyInit(String codeType, AmqpField field,
AmqpVersionSet versionSet, int indentSize, int tabSize, boolean
nextFlag)
{
- return Utils.createSpaces(indentSize) + "body." + field.name +
" = " + field.name +
+ return Utils.createSpaces(indentSize) + "bodyFrame." +
field.name + " = " + field.name +
";" + cr;
}
@@ -960,7 +960,7 @@
while (dItr.hasNext())
{
dItr.next();
- sb.append(Utils.createSpaces(indentSize) + "body." +
field.name + "_" + domainCntr +
+ sb.append(Utils.createSpaces(indentSize) + "bodyFrame."
+ field.name + "_" + domainCntr +
" = " + field.name + "_" +
(domainCntr++) + ";" + cr);
}
return sb.toString();
Modified:
incubator/qpid/branches/qpid.0-9/gentools/templ.java/MethodBodyClass.tmpl
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/qpid.0-9/gentools/templ.java/MethodBodyClass.tmpl?view=diff&rev=492634&r1=492633&r2=492634
==============================================================================
--- incubator/qpid/branches/qpid.0-9/gentools/templ.java/MethodBodyClass.tmpl
(original)
+++ incubator/qpid/branches/qpid.0-9/gentools/templ.java/MethodBodyClass.tmpl
Thu Jan 4 08:51:05 2007
@@ -84,16 +84,16 @@
return buf.toString();
}
- public static AMQFrame createAMQFrame(int channelId, byte major, byte minor
+ public static AMQFrame createAMQFrame(int _channelId, byte major, byte
minor
%{FLIST} ${mb_field_parameter_list}
)
{
- ${CLASS}${METHOD}Body body = new ${CLASS}${METHOD}Body(major, minor);
+ ${CLASS}${METHOD}Body bodyFrame = new ${CLASS}${METHOD}Body(major,
minor);
%{FLIST} ${mb_field_body_initialize}
AMQFrame frame = new AMQFrame();
- frame.channel = channelId;
- frame.bodyFrame = body;
+ frame.channel = _channelId;
+ frame.bodyFrame = bodyFrame;
return frame;
}
}
Modified: incubator/qpid/branches/qpid.0-9/java/common/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/qpid.0-9/java/common/pom.xml?view=diff&rev=492634&r1=492633&r2=492634
==============================================================================
--- incubator/qpid/branches/qpid.0-9/java/common/pom.xml (original)
+++ incubator/qpid/branches/qpid.0-9/java/common/pom.xml Thu Jan 4 08:51:05
2007
@@ -60,8 +60,8 @@
<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"/>
+ <property name="xml.spec.deps"
value="amqp.0-9.xml cluster.0-9.xml amqp-nogen.0-9.xml"/>
+ <property name="xml.spec.list"
value="${specs.dir}/amqp.0-9.xml ${specs.dir}/cluster.0-9.xml
${specs.dir}/amqp-nogen.0-9.xml"/>
</ant>
</tasks>
<sourceRoot>${generated.path}</sourceRoot>
Added: incubator/qpid/branches/qpid.0-9/specs/amqp-nogen.0-9.xml
URL:
http://svn.apache.org/viewvc/incubator/qpid/branches/qpid.0-9/specs/amqp-nogen.0-9.xml?view=auto&rev=492634
==============================================================================
--- incubator/qpid/branches/qpid.0-9/specs/amqp-nogen.0-9.xml (added)
+++ incubator/qpid/branches/qpid.0-9/specs/amqp-nogen.0-9.xml Thu Jan 4
08:51:05 2007
@@ -0,0 +1,42 @@
+<?xml version = "1.0"?>
+<!--
+ -
+ - Licensed to the Apache Software Foundation (ASF) under one
+ - or more contributor license agreements. See the NOTICE file
+ - distributed with this work for additional information
+ - regarding copyright ownership. The ASF licenses this file
+ - to you under the Apache License, Version 2.0 (the
+ - "License"); you may not use this file except in compliance
+ - with the License. You may obtain a copy of the License at
+ -
+ - http://www.apache.org/licenses/LICENSE-2.0
+ -
+ - Unless required by applicable law or agreed to in writing,
+ - software distributed under the License is distributed on an
+ - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ - KIND, either express or implied. See the License for the
+ - specific language governing permissions and limitations
+ - under the License.
+ -
+ -->
+<amqp major = "0" minor = "9" port = "5672" comment = "AMQ Protocol version
0-9">
+
+ <!-- == BASIC ============================================================
-->
+
+ <class name = "basic" index = "60">
+ <codegen value="no-gen" />
+ </class>
+
+ <!-- == FILE =============================================================
-->
+
+ <class name = "file" index = "70">
+ <codegen value="no-gen" />
+ </class>
+
+ <!-- == STREAM ===========================================================
-->
+
+ <class name = "stream" index = "80">
+ <codegen value="no-gen" />
+ </class>
+
+</amqp>
