From 72197a8f0b5b39c7931d0a85fdd2426115456acb Mon Sep 17 00:00:00 2001 From: Rupert Smith Date: Mon, 14 May 2007 11:47:13 +0000 Subject: Merged revisions 536571-536583,536586-536823,536825-537014,537016-537018,537020-537025,537027-537028,537030-537160,537162-537170,537172-537672,537674-537782 via svnmerge from https://svn.apache.org/repos/asf/incubator/qpid/branches/M2 ........ r536571 | ritchiem | 2007-05-09 16:46:57 +0100 (Wed, 09 May 2007) | 1 line QPID-484 Provided default GC and easy customisation.. via setting QPID_JAVA_QC. ........ r536573 | rgreig | 2007-05-09 16:48:11 +0100 (Wed, 09 May 2007) | 1 line Corrected mistaked in test parameters. ........ r537782 | rupertlssmith | 2007-05-14 12:37:41 +0100 (Mon, 14 May 2007) | 1 line Added to the Javadoc. ........ git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@537789 13f79535-47bb-0310-9956-ffa450edef68 --- java/common/bin/qpid-run | 11 +- .../java/org/apache/qpid/protocol/AMQConstant.java | 179 +++++++++++++++++---- .../org/apache/qpid/protocol/AMQMethodEvent.java | 48 ++++-- .../apache/qpid/protocol/AMQMethodListener.java | 53 ++++-- .../apache/qpid/protocol/AMQProtocolWriter.java | 17 +- .../protocol/AMQVersionAwareProtocolSession.java | 18 +++ .../apache/qpid/protocol/ProtocolVersionAware.java | 19 +++ .../java/org/apache/qpid/util/MessageQueue.java | 21 ++- 8 files changed, 298 insertions(+), 68 deletions(-) (limited to 'java/common') diff --git a/java/common/bin/qpid-run b/java/common/bin/qpid-run index fc607529ee..c9e37b21a1 100644 --- a/java/common/bin/qpid-run +++ b/java/common/bin/qpid-run @@ -114,6 +114,15 @@ else echo "Warning: Qpid classpath not set. CLASSPATH must include qpid jars." fi +#Use QPID_JAVA_GC if set +if [ -n "$QPID_JAVA_GC" ]; then + export JAVA_GC=$QPID_JAVA_GC + echo "Using QPID_JAVA_GC setting" $QPID_JAVA_GC +else + echo "Info: QPID_JAVA_GC not set. Defaulting to JAVA_GC" $JAVA_GC +fi + + #Use QPID_JAVA_MEM if set if [ -n "$QPID_JAVA_MEM" ]; then export JAVA_MEM=$QPID_JAVA_MEM @@ -224,6 +233,6 @@ if $cygwin; then JAVA=$(cygpath -u $JAVA) fi -COMMAND=($JAVA $JAVA_VM $JAVA_MEM $SYSTEM_PROPS $JAVA_OPTS $QPID_OPTS "${JAVA_ARGS[@]}") +COMMAND=($JAVA $JAVA_VM $JAVA_GC $JAVA_MEM $SYSTEM_PROPS $JAVA_OPTS $QPID_OPTS "${JAVA_ARGS[@]}") DISPATCH diff --git a/java/common/src/main/java/org/apache/qpid/protocol/AMQConstant.java b/java/common/src/main/java/org/apache/qpid/protocol/AMQConstant.java index 379f7feb4f..fa75bd5fb3 100644 --- a/java/common/src/main/java/org/apache/qpid/protocol/AMQConstant.java +++ b/java/common/src/main/java/org/apache/qpid/protocol/AMQConstant.java @@ -7,9 +7,9 @@ * 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 @@ -25,87 +25,165 @@ import java.util.Map; import org.apache.qpid.framing.AMQShortString; +/** + * Defines constants for AMQP codes and also acts as a factory for creating such constants from the raw codes. Each + * constant also defines a short human readable description of the constant. + * + * @todo Why would a constant be defined that is not in the map? Seems more natural that getConstant should raise an + * exception for an unknown constant. Or else provide an explanation of why this is so. Also their is no way for + * callers to determine the unknown status of a code except by comparing its name to "unknown code", which would + * seem to render this scheme a little bit pointless? + * + * @todo Java has a nice enum construct for doing this sort of thing. Maybe this is done in the old style for Java 1.4 + * backward compatability? Now that is handled through retrotranslater it may be time to use enum. + * + *

CRC Card + * Responsibilities Collaborations + * Define the set of AMQP status codes. + * Provide a factory to lookup constants by their code. + * + */ public final class AMQConstant { - private int _code; - - private AMQShortString _name; - + /** Defines a map from codes to constants. */ private static Map _codeMap = new HashMap(); - private AMQConstant(int code, String name, boolean map) - { - _code = code; - _name = new AMQShortString(name); - if (map) - { - _codeMap.put(new Integer(code), this); - } - } - - public String toString() - { - return _code + ": " + _name; - } - - public int getCode() - { - return _code; - } - - public AMQShortString getName() - { - return _name; - } - - public static final AMQConstant FRAME_MIN_SIZE = new AMQConstant(4096, "frame min size", true); + /** Indicates that the method completed successfully. */ + public static final AMQConstant REPLY_SUCCESS = new AMQConstant(200, "reply success", true); public static final AMQConstant FRAME_END = new AMQConstant(206, "frame end", true); - public static final AMQConstant REPLY_SUCCESS = new AMQConstant(200, "reply success", true); - + /** + * The client asked for a specific message that is no longer available. The message was delivered to another + * client, or was purged from the queue for some other reason. + */ public static final AMQConstant NOT_DELIVERED = new AMQConstant(310, "not delivered", true); + /** + * The client attempted to transfer content larger than the server could accept at the present time. The client + * may retry at a later time. + */ public static final AMQConstant MESSAGE_TOO_LARGE = new AMQConstant(311, "message too large", true); + /** + * When the exchange cannot route the result of a .Publish, most likely due to an invalid routing key. Only when + * the mandatory flag is set. + */ public static final AMQConstant NO_ROUTE = new AMQConstant(312, "no route", true); + /** + * When the exchange cannot deliver to a consumer when the immediate flag is set. As a result of pending data on + * the queue or the absence of any consumers of the queue. + */ public static final AMQConstant NO_CONSUMERS = new AMQConstant(313, "no consumers", true); + /** + * An operator intervened to close the connection for some reason. The client may retry at some later date. + */ public static final AMQConstant CONTEXT_IN_USE = new AMQConstant(320, "context in use", true); + /** The client tried to work with an unknown virtual host or cluster. */ public static final AMQConstant INVALID_PATH = new AMQConstant(402, "invalid path", true); + /** The client attempted to work with a server entity to which it has no access due to security settings. */ public static final AMQConstant ACCESS_REFUSED = new AMQConstant(403, "access refused", true); + /** The client attempted to work with a server entity that does not exist. */ public static final AMQConstant NOT_FOUND = new AMQConstant(404, "not found", true); + /** + * The client attempted to work with a server entity to which it has no access because another client is + * working with it. + */ public static final AMQConstant ALREADY_EXISTS = new AMQConstant(405, "Already exists", true); + /** The client requested a method that was not allowed because some precondition failed. */ public static final AMQConstant IN_USE = new AMQConstant(406, "In use", true); public static final AMQConstant INVALID_ROUTING_KEY = new AMQConstant(407, "routing key invalid", true); public static final AMQConstant REQUEST_TIMEOUT = new AMQConstant(408, "Request Timeout", true); - public static final AMQConstant INVALID_ARGUMENT = new AMQConstant(409, "argument invalid", true); + public static final AMQConstant INVALID_ARGUMENT = new AMQConstant(409, "argument invalid", true); + /** + * The client sent a malformed frame that the server could not decode. This strongly implies a programming error + * in the client. + */ public static final AMQConstant FRAME_ERROR = new AMQConstant(501, "frame error", true); + /** + * The client sent a frame that contained illegal values for one or more fields. This strongly implies a + * programming error in the client. + */ public static final AMQConstant SYNTAX_ERROR = new AMQConstant(502, "syntax error", true); + /** + * The client sent an invalid sequence of frames, attempting to perform an operation that was considered invalid + * by the server. This usually implies a programming error in the client. + */ public static final AMQConstant COMMAND_INVALID = new AMQConstant(503, "command invalid", true); + /** + * The client attempted to work with a channel that had not been correctly opened. This most likely indicates a + * fault in the client layer. + */ public static final AMQConstant CHANNEL_ERROR = new AMQConstant(504, "channel error", true); + /** + * The server could not complete the method because it lacked sufficient resources. This may be due to the client + * creating too many of some type of entity. + */ public static final AMQConstant RESOURCE_ERROR = new AMQConstant(506, "resource error", true); + /** + * The client tried to work with some entity in a manner that is prohibited by the server, due to security settings + * or by some other criteria. + */ public static final AMQConstant NOT_ALLOWED = new AMQConstant(530, "not allowed", true); + /** The client tried to use functionality that is not implemented in the server. */ public static final AMQConstant NOT_IMPLEMENTED = new AMQConstant(540, "not implemented", true); + /** + * The server could not complete the method because of an internal error. The server may require intervention by + * an operator in order to resume normal operations. + */ public static final AMQConstant INTERNAL_ERROR = new AMQConstant(541, "internal error", true); + public static final AMQConstant FRAME_MIN_SIZE = new AMQConstant(4096, "frame min size", true); + + /** The AMQP status code. */ + private int _code; + + /** A short description of the status code. */ + private AMQShortString _name; + + /** + * Creates a new AMQP status code. + * + * @param code The code. + * @param name A short description of the code. + * @param map true to register the code as a known code, false otherwise. + */ + private AMQConstant(int code, String name, boolean map) + { + _code = code; + _name = new AMQShortString(name); + if (map) + { + _codeMap.put(new Integer(code), this); + } + } + + /** + * Creates a constant for a status code by looking up the code in the map of known codes. If the code is not known + * a constant is still created for it, but it is marked as unknown. + * + * @param code The AMQP status code. + * + * @return The AMQP status code encapsulated as a constant. + */ public static AMQConstant getConstant(int code) { AMQConstant c = (AMQConstant) _codeMap.get(new Integer(code)); @@ -113,6 +191,37 @@ public final class AMQConstant { c = new AMQConstant(code, "unknown code", false); } + return c; } + + /** + * Gets the underlying AMQP status code. + * + * @return The AMQP status code. + */ + public int getCode() + { + return _code; + } + + /** + * Gets a short description of the status code. + * + * @return A short description of the status code. + */ + public AMQShortString getName() + { + return _name; + } + + /** + * Renders the constant as a string, mainly for debugging purposes. + * + * @return The status code and its description. + */ + public String toString() + { + return _code + ": " + _name; + } } diff --git a/java/common/src/main/java/org/apache/qpid/protocol/AMQMethodEvent.java b/java/common/src/main/java/org/apache/qpid/protocol/AMQMethodEvent.java index ab36041cb8..fd6907a152 100644 --- a/java/common/src/main/java/org/apache/qpid/protocol/AMQMethodEvent.java +++ b/java/common/src/main/java/org/apache/qpid/protocol/AMQMethodEvent.java @@ -7,9 +7,9 @@ * 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 @@ -23,43 +23,73 @@ package org.apache.qpid.protocol; import org.apache.qpid.framing.AMQMethodBody; /** - * An event that is passed to AMQMethodListeners describing a particular method. - * It supplies the: - *