From a71fc76d0f605d1faa76f8aec7b4498c168aec46 Mon Sep 17 00:00:00 2001 From: Kim van der Riet Date: Fri, 22 Dec 2006 18:26:40 +0000 Subject: 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. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@489715 13f79535-47bb-0310-9956-ffa450edef68 --- java/common/pom.xml | 3 +- java/common/protocol-version.xml | 8 - .../main/versions/ProtocolVersionList.java.tmpl | 40 ---- java/common/src/main/xsl/cluster.asl | 59 ----- java/common/src/main/xsl/framing.xsl | 64 ------ java/common/src/main/xsl/java.xsl | 248 --------------------- java/common/src/main/xsl/prepare1.xsl | 114 ---------- java/common/src/main/xsl/prepare2.xsl | 69 ------ java/common/src/main/xsl/prepare3.xsl | 65 ------ java/common/src/main/xsl/readme.txt | 52 ----- java/common/src/main/xsl/registry.template | 25 --- java/common/src/main/xsl/registry.xsl | 32 --- java/common/src/main/xsl/utils.xsl | 207 ----------------- 13 files changed, 1 insertion(+), 985 deletions(-) delete mode 100644 java/common/src/main/versions/ProtocolVersionList.java.tmpl delete mode 100644 java/common/src/main/xsl/cluster.asl delete mode 100644 java/common/src/main/xsl/framing.xsl delete mode 100644 java/common/src/main/xsl/java.xsl delete mode 100644 java/common/src/main/xsl/prepare1.xsl delete mode 100644 java/common/src/main/xsl/prepare2.xsl delete mode 100644 java/common/src/main/xsl/prepare3.xsl delete mode 100644 java/common/src/main/xsl/readme.txt delete mode 100644 java/common/src/main/xsl/registry.template delete mode 100644 java/common/src/main/xsl/registry.xsl delete mode 100644 java/common/src/main/xsl/utils.xsl (limited to 'java') diff --git a/java/common/pom.xml b/java/common/pom.xml index 053fb5fafb..f30d81f739 100644 --- a/java/common/pom.xml +++ b/java/common/pom.xml @@ -57,8 +57,7 @@ - - + ${generated.path} diff --git a/java/common/protocol-version.xml b/java/common/protocol-version.xml index 6a92dfbe2b..ff5e8b0f70 100644 --- a/java/common/protocol-version.xml +++ b/java/common/protocol-version.xml @@ -20,14 +20,6 @@ --> - - diff --git a/java/common/src/main/versions/ProtocolVersionList.java.tmpl b/java/common/src/main/versions/ProtocolVersionList.java.tmpl deleted file mode 100644 index f0e202dac9..0000000000 --- a/java/common/src/main/versions/ProtocolVersionList.java.tmpl +++ /dev/null @@ -1,40 +0,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. - * - */ - -/** - * This class is autogenerated, do not modify. - */ - -package org.apache.qpid.framing; - -/** - * NOTE: Don't remove the line containing the token VER or VER1 - these are - * markers for code generation. - */ - -public interface ProtocolVersionList -{ - public final int PROTOCOL_MAJOR = 0; - public final int PROTOCOL_MINOR = 1; - public final byte pv[][] = { - // !VER1! - }; -} diff --git a/java/common/src/main/xsl/cluster.asl b/java/common/src/main/xsl/cluster.asl deleted file mode 100644 index 09e8ca0787..0000000000 --- a/java/common/src/main/xsl/cluster.asl +++ /dev/null @@ -1,59 +0,0 @@ - - - - - - - - - An extension that allows brokers to communicate in order to - provide a clustered service to clients. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/java/common/src/main/xsl/framing.xsl b/java/common/src/main/xsl/framing.xsl deleted file mode 100644 index b8ae20aaf5..0000000000 --- a/java/common/src/main/xsl/framing.xsl +++ /dev/null @@ -1,64 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/java/common/src/main/xsl/java.xsl b/java/common/src/main/xsl/java.xsl deleted file mode 100644 index 948415fc18..0000000000 --- a/java/common/src/main/xsl/java.xsl +++ /dev/null @@ -1,248 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - wrote - - - - - - - - - - - - -package org.apache.qpid.framing; - -import org.apache.mina.common.ByteBuffer; -import org.apache.qpid.framing.AMQFrame; -import org.apache.qpid.framing.AMQFrameDecodingException; -import org.apache.qpid.framing.AMQMethodBody; -import org.apache.qpid.framing.EncodableAMQDataBlock; - -/** - * This class is autogenerated, do not modify. [From ] - */ -public class extends AMQMethodBody implements EncodableAMQDataBlock -{ - public static final int CLASS_ID = ; - public static final int METHOD_ID = ; - - - public - - ; - - - protected int getClazz() - { - return ; - } - - protected int getMethod() - { - return ; - } - - protected int getBodySize() - { - - - return - - + - - - - ; - - return 0; - - } - - protected void writeMethodPayload(ByteBuffer buffer) - { - - - ; - - - EncodingUtils.writeBooleans(buffer, new boolean[]{ - }); - - - } - - public void populateMethodBodyFromBuffer(ByteBuffer buffer) throws AMQFrameDecodingException - { - - ; - - } - - public String toString() - { - StringBuffer buf = new StringBuffer(super.toString()); - - buf.append(" : ").append(); - - return buf.toString(); - } - - public static AMQFrame createAMQFrame(int channelId, ) - { - body = new (); - - ; - - AMQFrame frame = new AMQFrame(); - frame.channel = channelId; - frame.bodyFrame = body; - return frame; - } -} - - - - Matching root for registry mode! - - - - - -Wrote MethodBodyDecoderRegistry.java - - - -package org.apache.qpid.framing; - -import java.util.Map; -import java.util.HashMap; -import org.apache.log4j.Logger; -import org.apache.qpid.AMQException; -import org.apache.qpid.framing.AMQFrameDecodingException; -import org.apache.qpid.framing.AMQMethodBody; - -/** - * This class is autogenerated, do not modify. - */ -public final class MethodBodyDecoderRegistry -{ - private static final Logger _log = Logger.getLogger(MethodBodyDecoderRegistry.class); - - private static final Map _classMethodProductToMethodBodyMap = new HashMap(); - - static - { - - ; - - } - - public static AMQMethodBody get(int clazz, int method) throws AMQFrameDecodingException - { - Class bodyClass = (Class) _classMethodProductToMethodBodyMap.get(new Integer(clazz * 1000 + method)); - if (bodyClass != null) - { - try - { - return (AMQMethodBody) bodyClass.newInstance(); - } - catch (Exception e) - { - throw new AMQFrameDecodingException(_log, - "Unable to instantiate body class for class " + clazz + " and method " + method + ": " + e, e); - } - } - else - { - throw new AMQFrameDecodingException(_log, - "Unable to find a suitable decoder for class " + clazz + " and method " + method); - } - } -} - - - - - - - - wrote - - - -package org.apache.qpid.framing; - -import java.util.Map; - -/** - * This class is autogenerated, do not modify. [From ] - */ -class -{ - static void register(Map map) - { - - map.put(new Integer( - - * 1000 + - - ), - ); - - } -} - - - - - - diff --git a/java/common/src/main/xsl/prepare1.xsl b/java/common/src/main/xsl/prepare1.xsl deleted file mode 100644 index 03e1fa7634..0000000000 --- a/java/common/src/main/xsl/prepare1.xsl +++ /dev/null @@ -1,114 +0,0 @@ - - - - - - - - - - - - - - - - - - - - ( - major= - , minor= - ) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Could not inherit from ; file not found. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/java/common/src/main/xsl/prepare2.xsl b/java/common/src/main/xsl/prepare2.xsl deleted file mode 100644 index 14f4f33841..0000000000 --- a/java/common/src/main/xsl/prepare2.xsl +++ /dev/null @@ -1,69 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/java/common/src/main/xsl/prepare3.xsl b/java/common/src/main/xsl/prepare3.xsl deleted file mode 100644 index f8cf0c8932..0000000000 --- a/java/common/src/main/xsl/prepare3.xsl +++ /dev/null @@ -1,65 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - true - - - - - - - - - - - - - - - - - - - diff --git a/java/common/src/main/xsl/readme.txt b/java/common/src/main/xsl/readme.txt deleted file mode 100644 index b373055df9..0000000000 --- a/java/common/src/main/xsl/readme.txt +++ /dev/null @@ -1,52 +0,0 @@ -This directory contains the xsl stylesheets used to generate the code from the -AMQP protocol specification. They require an XSLT2.0 processor, currently -Saxon 8 is used. - -The generation process is controlled by the framing.xsl stylesheet. This performs -several phases of transformation, using the other stylesheets. The transformation -in each phase is defined in a separate file, and these are designed to also allow -then to be run individually. - -The generation takes the amq.asl as input, it also requires that the path to the -directory where the base asl definitions reside (those definitions that the main -amq.asl defintion inherits from) be passed in via a paramter called asl_base. - -The files involved are as follows: - - framing.xsl The control file for the entire generation process - - prepare1.xsl Resolves the separate files that make up the protocol - definition, building a single tree containing all the - information as a set of 'frame' elements, each of which - has attributes for its name, and ids for the class and - method it refers to and contains zero or more field - elements. - - A method id is generated based on the order of the - method elements within the class elements in the original - specification. The class id is taken from the enclosing - class element. - - prepare2.xsl Resolves domains into their corresponding types. (This is - much easier when all the information is in a single tree, - hence the separate frame). - - prepare3.xsl Converts names into valid java names and augments the - tree to include information that makes the subsequent - generation phase simpler e.g. the index of boolean - fields as several boolean flags are combined into a - single byte. (This is easier once the domains have been - resolved, hence the separate phase). - - java.xsl Generates java classes for each frame, and a registry of - all the frames to a 'magic' number generated from their - class and method id. - - utils.xsl Contains some utility methods for e.g. producing valid - java names. - -For debugging the framing.xsl can output the intermediary files. This can be -enabled by uncommenting the relevant lines (a comment explaining this is -provided inline). - - \ No newline at end of file diff --git a/java/common/src/main/xsl/registry.template b/java/common/src/main/xsl/registry.template deleted file mode 100644 index 87c5afcb7b..0000000000 --- a/java/common/src/main/xsl/registry.template +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - diff --git a/java/common/src/main/xsl/registry.xsl b/java/common/src/main/xsl/registry.xsl deleted file mode 100644 index c70dbe21a5..0000000000 --- a/java/common/src/main/xsl/registry.xsl +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - - - - - diff --git a/java/common/src/main/xsl/utils.xsl b/java/common/src/main/xsl/utils.xsl deleted file mode 100644 index 95e15c6e38..0000000000 --- a/java/common/src/main/xsl/utils.xsl +++ /dev/null @@ -1,207 +0,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. -* -*/ - - - - - - - char - short - int - String - byte[] - boolean - long - long - FieldTable - Object /*WARNING: undefined type*/ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - /* WARNING: COULD NOT DETERMINE FIELD SIZE */ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - /* WARNING: COULD NOT DETERMINE ENCODER */ - - - - - - - - - - boolean[] bools = EncodingUtils.readBooleans(buffer); - - - - - - - - - - - - - - - - - - - - - - - - - - - - /* WARNING: COULD NOT DETERMINE DECODER */ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -- cgit v1.2.1