You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ro...@apache.org on 2014/08/08 18:39:34 UTC
svn commit: r1616823 [3/3] - in /qpid/branches/0.30/qpid/java:
amqp-1-0-client-jms/src/main/java/org/apache/qpid/amqp_1_0/jms/jndi/
bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/
bdbstore/src/main/java/org/apache/qpid/server/store/berk...
Modified: qpid/branches/0.30/qpid/java/common/src/main/java/org/apache/qpid/protocol/AMQMethodEvent.java
URL: http://svn.apache.org/viewvc/qpid/branches/0.30/qpid/java/common/src/main/java/org/apache/qpid/protocol/AMQMethodEvent.java?rev=1616823&r1=1616822&r2=1616823&view=diff
==============================================================================
--- qpid/branches/0.30/qpid/java/common/src/main/java/org/apache/qpid/protocol/AMQMethodEvent.java (original)
+++ qpid/branches/0.30/qpid/java/common/src/main/java/org/apache/qpid/protocol/AMQMethodEvent.java Fri Aug 8 16:39:32 2014
@@ -25,19 +25,14 @@ import org.apache.qpid.framing.AMQMethod
/**
* AMQMethodEvent encapsulates an AMQP method call, and the channel on which that method call occurred.
*
- * <p/>Supplies the:
+ * <p>Supplies the:
* <ul>
* <li>channel id</li>
* <li>protocol method</li>
* </ul>
*
- * <p/>As the event contains the context in which it occurred, event listeners do not need to be statefull.
+ * <p>As the event contains the context in which it occurred, event listeners do not need to be statefull.
* to listeners. Events are often handled by {@link AMQMethodListener}s.
- *
- * <p/><table id="crc"><caption>CRC Card</caption>
- * <tr><th> Responsibilities <th> Collaborations
- * <tr><td> Encapsulate an AMQP method call and the channel as the context for the method call.
- * </table>
*/
public class AMQMethodEvent<M extends AMQMethodBody>
{
Modified: qpid/branches/0.30/qpid/java/common/src/main/java/org/apache/qpid/protocol/AMQMethodListener.java
URL: http://svn.apache.org/viewvc/qpid/branches/0.30/qpid/java/common/src/main/java/org/apache/qpid/protocol/AMQMethodListener.java?rev=1616823&r1=1616822&r2=1616823&view=diff
==============================================================================
--- qpid/branches/0.30/qpid/java/common/src/main/java/org/apache/qpid/protocol/AMQMethodListener.java (original)
+++ qpid/branches/0.30/qpid/java/common/src/main/java/org/apache/qpid/protocol/AMQMethodListener.java Fri Aug 8 16:39:32 2014
@@ -27,17 +27,11 @@ import org.apache.qpid.framing.AMQMethod
* AMQMethodListener is a listener that receives notifications of AMQP methods. The methods are packaged as events in
* {@link AMQMethodEvent}.
*
- * <p/>An event listener may be associated with a particular context, usually an AMQP channel, and in addition to
+ * <p>An event listener may be associated with a particular context, usually an AMQP channel, and in addition to
* receiving method events will be notified of errors on that context. This enables listeners to perform any clean
* up that they need to do before the context is closed or retried.
- *
- * <p/><table id="crc"><caption>CRC Card</caption>
- * <tr><th> Responsibilities
- * <tr><td> Accept notification of AMQP method events. <td> {@link AMQMethodEvent}
- * <tr><td> Accept notification of errors on the event context.
- * </table>
- *
- * @todo Document why the exception is passed to the error method. Is it so that the exception can be passed
+ * <p>
+ * TODO Document why the exception is passed to the error method. Is it so that the exception can be passed
* from the event handling thread to another thread and rethown from there? It is unusual to pass exceptions as
* method arguments, because they have their own mechanism for propagating through the call stack, so some
* explanation ought to be provided.
@@ -49,14 +43,14 @@ public interface AMQMethodListener
*
* @param evt The AMQP method event (contains the method and channel).
*
- * @return <tt>true</tt> if the handler processes the method frame, <tt>false<tt> otherwise. Note that this does
+ * @return true if the handler processes the method frame, false otherwise. Note that this does
* not prohibit the method event being delivered to subsequent listeners but can be used to determine if
* nobody has dealt with an incoming method frame.
*
- * @throws Exception if an error has occurred. This exception may be delivered to all registered listeners using
+ * @throws AMQException if an error has occurred. This exception may be delivered to all registered listeners using
* the error() method (see below) allowing them to perform cleanup if necessary.
- *
- * @todo Consider narrowing the exception.
+ * <p>
+ * TODO Consider narrowing the exception.
*/
<B extends AMQMethodBody> boolean methodReceived(AMQMethodEvent<B> evt) throws AMQException;
Modified: qpid/branches/0.30/qpid/java/common/src/main/java/org/apache/qpid/protocol/AMQProtocolWriter.java
URL: http://svn.apache.org/viewvc/qpid/branches/0.30/qpid/java/common/src/main/java/org/apache/qpid/protocol/AMQProtocolWriter.java?rev=1616823&r1=1616822&r2=1616823&view=diff
==============================================================================
--- qpid/branches/0.30/qpid/java/common/src/main/java/org/apache/qpid/protocol/AMQProtocolWriter.java (original)
+++ qpid/branches/0.30/qpid/java/common/src/main/java/org/apache/qpid/protocol/AMQProtocolWriter.java Fri Aug 8 16:39:32 2014
@@ -26,11 +26,6 @@ import org.apache.qpid.framing.AMQDataBl
* AMQProtocolWriter provides a method to write a frame of data 'to the wire', in the context of the object
* that implements the method, usually some sort of session. The block of data, encapsulated by {@link AMQDataBlock},
* will be encoded as it is written.
- *
- * <p/><table id="crc"><caption>CRC Card</caption>
- * <tr><th> Responsibilities
- * <tr><td> Write an encoded block of data to the write, in the context of a session.
- * </table>
*/
public interface AMQProtocolWriter
{
Modified: qpid/branches/0.30/qpid/java/common/src/main/java/org/apache/qpid/protocol/AMQVersionAwareProtocolSession.java
URL: http://svn.apache.org/viewvc/qpid/branches/0.30/qpid/java/common/src/main/java/org/apache/qpid/protocol/AMQVersionAwareProtocolSession.java?rev=1616823&r1=1616822&r2=1616823&view=diff
==============================================================================
--- qpid/branches/0.30/qpid/java/common/src/main/java/org/apache/qpid/protocol/AMQVersionAwareProtocolSession.java (original)
+++ qpid/branches/0.30/qpid/java/common/src/main/java/org/apache/qpid/protocol/AMQVersionAwareProtocolSession.java Fri Aug 8 16:39:32 2014
@@ -34,13 +34,8 @@ import java.nio.ByteBuffer;
/**
* AMQVersionAwareProtocolSession is implemented by all AMQP session classes, that need to provide an awareness to
* callers of the version of the AMQP protocol that they are able to work with.
- *
- * <p/><table id="crc"><caption>CRC Card</caption>
- * <tr><th> Responsibilities
- * <tr><td> Provide the method registry for a specific version of the AMQP.
- * </table>
- *
- * @todo Why is this a seperate interface to {@link ProtocolVersionAware}, could they be combined into a single
+ * <p>
+ * TODO Why is this a seperate interface to {@link ProtocolVersionAware}, could they be combined into a single
* interface and one of them eliminated? Move getRegistry method to ProtocolVersionAware, make the sessions
* implement AMQProtocolWriter directly and drop this interface.
*/
Modified: qpid/branches/0.30/qpid/java/common/src/main/java/org/apache/qpid/protocol/ProtocolVersionAware.java
URL: http://svn.apache.org/viewvc/qpid/branches/0.30/qpid/java/common/src/main/java/org/apache/qpid/protocol/ProtocolVersionAware.java?rev=1616823&r1=1616822&r2=1616823&view=diff
==============================================================================
--- qpid/branches/0.30/qpid/java/common/src/main/java/org/apache/qpid/protocol/ProtocolVersionAware.java (original)
+++ qpid/branches/0.30/qpid/java/common/src/main/java/org/apache/qpid/protocol/ProtocolVersionAware.java Fri Aug 8 16:39:32 2014
@@ -25,11 +25,6 @@ import org.apache.qpid.framing.ProtocolV
/**
* ProtocolVersionAware is implemented by all AMQP handling classes, that need to provide an awareness to callers of
* the version of the AMQP protocol that they are able to handle.
- *
- * <p/><table id="crc"><caption>CRC Card</caption>
- * <tr><th> Responsibilities
- * <tr><td> Report the major and minor AMQP version handled.
- * </table>
*/
public interface ProtocolVersionAware
{
Modified: qpid/branches/0.30/qpid/java/common/src/main/java/org/apache/qpid/transport/Connection.java
URL: http://svn.apache.org/viewvc/qpid/branches/0.30/qpid/java/common/src/main/java/org/apache/qpid/transport/Connection.java?rev=1616823&r1=1616822&r2=1616823&view=diff
==============================================================================
--- qpid/branches/0.30/qpid/java/common/src/main/java/org/apache/qpid/transport/Connection.java (original)
+++ qpid/branches/0.30/qpid/java/common/src/main/java/org/apache/qpid/transport/Connection.java Fri Aug 8 16:39:32 2014
@@ -54,7 +54,7 @@ import java.util.concurrent.atomic.Atomi
*
* @author Rafael H. Schloming
*
- * @todo the channels map should probably be replaced with something
+ * TODO the channels map should probably be replaced with something
* more efficient, e.g. an array or a map implementation that can use
* short instead of Short
*/
Modified: qpid/branches/0.30/qpid/java/common/src/main/java/org/apache/qpid/transport/ConnectionSettings.java
URL: http://svn.apache.org/viewvc/qpid/branches/0.30/qpid/java/common/src/main/java/org/apache/qpid/transport/ConnectionSettings.java?rev=1616823&r1=1616822&r2=1616823&view=diff
==============================================================================
--- qpid/branches/0.30/qpid/java/common/src/main/java/org/apache/qpid/transport/ConnectionSettings.java (original)
+++ qpid/branches/0.30/qpid/java/common/src/main/java/org/apache/qpid/transport/ConnectionSettings.java Fri Aug 8 16:39:32 2014
@@ -109,6 +109,7 @@ public class ConnectionSettings
* Gets the heartbeat interval (seconds) for 0-8/9/9-1 protocols.
* 0 means heartbeating is disabled.
* null means use the broker-supplied value.
+ * @return the heartbeat interval
*/
public Integer getHeartbeatInterval08()
{
@@ -129,6 +130,7 @@ public class ConnectionSettings
/**
* Gets the heartbeat interval (seconds) for the 0-10 protocol.
* 0 means heartbeating is disabled.
+ * @return the heartbeat interval
*/
public int getHeartbeatInterval010()
{
Modified: qpid/branches/0.30/qpid/java/common/src/main/java/org/apache/qpid/transport/Session.java
URL: http://svn.apache.org/viewvc/qpid/branches/0.30/qpid/java/common/src/main/java/org/apache/qpid/transport/Session.java?rev=1616823&r1=1616822&r2=1616823&view=diff
==============================================================================
--- qpid/branches/0.30/qpid/java/common/src/main/java/org/apache/qpid/transport/Session.java (original)
+++ qpid/branches/0.30/qpid/java/common/src/main/java/org/apache/qpid/transport/Session.java Fri Aug 8 16:39:32 2014
@@ -1206,6 +1206,7 @@ public class Session extends SessionInvo
/**
* An auxiliary method for test purposes only
+ * @return true if flow is blocked
*/
public boolean isFlowBlocked()
{
Modified: qpid/branches/0.30/qpid/java/common/src/main/java/org/apache/qpid/transport/codec/Decoder.java
URL: http://svn.apache.org/viewvc/qpid/branches/0.30/qpid/java/common/src/main/java/org/apache/qpid/transport/codec/Decoder.java?rev=1616823&r1=1616822&r2=1616823&view=diff
==============================================================================
--- qpid/branches/0.30/qpid/java/common/src/main/java/org/apache/qpid/transport/codec/Decoder.java (original)
+++ qpid/branches/0.30/qpid/java/common/src/main/java/org/apache/qpid/transport/codec/Decoder.java Fri Aug 8 16:39:32 2014
@@ -82,7 +82,7 @@ public interface Decoder
* The uuid type encodes a universally unique id as defined by RFC-4122.
* The format and operations for this type can be found in section 4.1.2 of RFC-4122.
*
- * return a universally unique id as defined by RFC-4122.
+ * @return a universally unique id as defined by RFC-4122.
*/
UUID readUuid();
@@ -114,14 +114,14 @@ public interface Decoder
* Note that the encoded size refers to the number of octets of unicode, not necessarily the number of unicode
* characters since the UTF-8 unicode may include multi-byte character sequences.
*
- * return a string.
+ * @return a string.
*/
String readStr16();
/**
* The vbin8 type encodes up to 255 octets of opaque binary data.
*
- * return a byte array.
+ * @return a byte array.
*/
byte[] readVbin8();
Modified: qpid/branches/0.30/qpid/java/common/src/main/java/org/apache/qpid/transport/codec/Encoder.java
URL: http://svn.apache.org/viewvc/qpid/branches/0.30/qpid/java/common/src/main/java/org/apache/qpid/transport/codec/Encoder.java?rev=1616823&r1=1616822&r2=1616823&view=diff
==============================================================================
--- qpid/branches/0.30/qpid/java/common/src/main/java/org/apache/qpid/transport/codec/Encoder.java (original)
+++ qpid/branches/0.30/qpid/java/common/src/main/java/org/apache/qpid/transport/codec/Encoder.java Fri Aug 8 16:39:32 2014
@@ -60,7 +60,7 @@ public interface Encoder
/**
* The uint64 type is a 64-bit unsigned integral value encoded in network byte order.
*
- * @param b the unsigned integer to be encoded.
+ * @param l the unsigned integer to be encoded.
*/
void writeUint64(long l);
Modified: qpid/branches/0.30/qpid/java/common/src/main/java/org/apache/qpid/transport/network/NetworkConnection.java
URL: http://svn.apache.org/viewvc/qpid/branches/0.30/qpid/java/common/src/main/java/org/apache/qpid/transport/network/NetworkConnection.java?rev=1616823&r1=1616822&r2=1616823&view=diff
==============================================================================
--- qpid/branches/0.30/qpid/java/common/src/main/java/org/apache/qpid/transport/network/NetworkConnection.java (original)
+++ qpid/branches/0.30/qpid/java/common/src/main/java/org/apache/qpid/transport/network/NetworkConnection.java Fri Aug 8 16:39:32 2014
@@ -34,12 +34,12 @@ public interface NetworkConnection
void close();
/**
- * Returns the remote address of the underlying socket.
+ * @return the remote address of the underlying socket.
*/
SocketAddress getRemoteAddress();
/**
- * Returns the local address of the underlying socket.
+ * @return the local address of the underlying socket.
*/
SocketAddress getLocalAddress();
Modified: qpid/branches/0.30/qpid/java/common/src/main/java/org/apache/qpid/typedmessage/TypedBytesContentReader.java
URL: http://svn.apache.org/viewvc/qpid/branches/0.30/qpid/java/common/src/main/java/org/apache/qpid/typedmessage/TypedBytesContentReader.java?rev=1616823&r1=1616822&r2=1616823&view=diff
==============================================================================
--- qpid/branches/0.30/qpid/java/common/src/main/java/org/apache/qpid/typedmessage/TypedBytesContentReader.java (original)
+++ qpid/branches/0.30/qpid/java/common/src/main/java/org/apache/qpid/typedmessage/TypedBytesContentReader.java Fri Aug 8 16:39:32 2014
@@ -54,7 +54,7 @@ public class TypedBytesContentReader imp
* Check that there is at least a certain number of bytes available to read
*
* @param len the number of bytes
- * @throws javax.jms.MessageEOFException if there are less than len bytes available to read
+ * @throws EOFException if there are less than len bytes available to read
*/
public void checkAvailable(int len) throws EOFException
{
@@ -183,7 +183,8 @@ public class TypedBytesContentReader imp
* Note that this method reads a unicode character as two bytes from the stream
*
* @return the character read from the stream
- * @throws javax.jms.JMSException
+ * @throws EOFException if there are less than the required bytes available to read
+ * @throws TypedBytesFormatException if the current write type is not compatible
*/
public char readChar() throws EOFException, TypedBytesFormatException
{
Modified: qpid/branches/0.30/qpid/java/common/src/main/java/org/apache/qpid/util/CommandLineParser.java
URL: http://svn.apache.org/viewvc/qpid/branches/0.30/qpid/java/common/src/main/java/org/apache/qpid/util/CommandLineParser.java?rev=1616823&r1=1616822&r2=1616823&view=diff
==============================================================================
--- qpid/branches/0.30/qpid/java/common/src/main/java/org/apache/qpid/util/CommandLineParser.java (original)
+++ qpid/branches/0.30/qpid/java/common/src/main/java/org/apache/qpid/util/CommandLineParser.java Fri Aug 8 16:39:32 2014
@@ -31,13 +31,13 @@ import java.util.regex.Pattern;
/**
* CommandLineParser provides a utility for specifying the format of a command line and parsing command lines to ensure
- * that they fit their specified format. A command line is made up of flags and options, both may be refered to as
+ * that they fit their specified format. A command line is made up of flags and options, both may be referred to as
* options. A flag is an option that does not take an argument (specifying it means it has the value 'true' and not
* specifying it means it has the value 'false'). Options must take arguments but they can be set up with defaults so
- * that they take a default value when not set. Options may be mandatory in wich case it is an error not to specify
+ * that they take a default value when not set. Options may be mandatory in which case it is an error not to specify
* them on the command line. Flags are never mandatory because they are implicitly set to false when not specified.
*
- * <p/>Some example command lines are:
+ * <p>Some example command lines are:
*
* <ul>
* <li>This one has two options that expect arguments:
@@ -52,14 +52,15 @@ import java.util.regex.Pattern;
* <pre>
* jar -tvf mytar.tar
* </pre>
+ * </ul>
*
- * <p/>The parsing rules are:
+ * <p>The parsing rules are:
*
* <ol>
* <li>Flags may be combined after a single '-' because they never take arguments. Normally such flags are single letter
* flags but this is only a convention and not enforced. Flags of more than one letter are usually specified on their own.
* <li>Options expecting arguments must always be on their own.
- * <li>The argument to an option may be seperated from it by whitespace or appended directly onto the option.
+ * <li>The argument to an option may be separated from it by whitespace or appended directly onto the option.
* <li>The argument to an option may never begin with a '-' character.
* <li>All other arguments not beginning with a '-' character are free arguments that do not belong to any option.
* <li>The second or later of a set of duplicate or repeated flags are ignored.
@@ -70,18 +71,8 @@ import java.util.regex.Pattern;
* the "bar" argument.
* </ol>
*
- * <p/>By default, unknown options are simply ignored if specified on the command line. This behaviour may be changed
+ * <p>By default, unknown options are simply ignored if specified on the command line. This behaviour may be changed
* so that the parser reports all unknowns as errors by using the {@link #setErrorsOnUnknowns} method.
- *
- * <p><table id="crc"><caption>CRC Card</caption>
- * <tr><th> Responsibilities <th> Collaborations
- * <tr><td> Accept a command line specification.
- * <tr><td> Parse a command line into properties, validating it against its specification.
- * <tr><td> Report all errors between a command line and its specification.
- * <tr><td> Provide a formatted usage string for a command line.
- * <tr><td> Provide a formatted options in force string for a command line.
- * <tr><td> Allow errors on unknowns behaviour to be turned on or off.
- * </table>
*/
public class CommandLineParser
{
@@ -106,7 +97,7 @@ public class CommandLineParser
* array may therefore easily be used to configure the command line parser in a single method call with an easily
* readable format.
*
- * <p/>Each array of strings must be 2, 3, 4 or 5 elements long. If any of the last three elements are missing they
+ * <p>Each array of strings must be 2, 3, 4 or 5 elements long. If any of the last three elements are missing they
* are assumed to be null. The elements specify the following parameters:
* <ol>
* <li>The name of the option without the leading '-'. For example, "file". To specify the format of the 'free'
@@ -121,7 +112,7 @@ public class CommandLineParser
* this is ignored for flags.
* <li>A regular expression describing the format that the argument must take. Ignored if null.
* </ol>
- * <p/>An example call to this constructor is:
+ * <p>An example call to this constructor is:
*
* <pre>
* CommandLineParser commandLine = new CommandLineParser(
@@ -234,7 +225,7 @@ public class CommandLineParser
* Parses a set of command line arguments into a set of properties, keyed by the argument flag. The free arguments
* are keyed by integers as strings starting at "1" and then "2", ... and so on.
*
- * <p/>See the class level comment for a description of the parsing rules.
+ * <p>See the class level comment for a description of the parsing rules.
*
* @param args The command line arguments.
*
@@ -488,6 +479,7 @@ public class CommandLineParser
/**
* If a command line has been parsed, calling this method sets all of its parsed options into the specified properties.
+ * @param properties properties
*/
public void addCommandLineToProperties(Properties properties)
{
@@ -508,7 +500,7 @@ public class CommandLineParser
* to be called to use this parser a second time which is not likely seeing as a command line is usually only
* specified once. However, it is exposed as a public method for the rare case where this may be done.
*
- * <p/>Cleans the internal state of this parser, removing all stored errors and information about the options in
+ * <p>Cleans the internal state of this parser, removing all stored errors and information about the options in
* force.
*/
public void reset()
@@ -643,11 +635,6 @@ public class CommandLineParser
* Holds information about a command line options. This includes what its name is, whether or not it is a flag,
* whether or not it is mandatory, what its user comment is, what its argument reminder text is and what its
* regular expression format is.
- *
- * <p><table id="crc"><caption>CRC Card</caption>
- * <tr><th> Responsibilities <th> Collaborations
- * <tr><td> Hold details of a command line option.
- * </table>
*/
protected static class CommandLineOption
{
Modified: qpid/branches/0.30/qpid/java/common/src/main/java/org/apache/qpid/util/FileUtils.java
URL: http://svn.apache.org/viewvc/qpid/branches/0.30/qpid/java/common/src/main/java/org/apache/qpid/util/FileUtils.java?rev=1616823&r1=1616822&r2=1616823&view=diff
==============================================================================
--- qpid/branches/0.30/qpid/java/common/src/main/java/org/apache/qpid/util/FileUtils.java (original)
+++ qpid/branches/0.30/qpid/java/common/src/main/java/org/apache/qpid/util/FileUtils.java Fri Aug 8 16:39:32 2014
@@ -37,12 +37,6 @@ import java.util.List;
* FileUtils provides some simple helper methods for working with files. It follows the convention of wrapping all
* checked exceptions as runtimes, so code using these methods is free of try-catch blocks but does not expect to
* recover from errors.
- *
- * <p/><table id="crc"><caption>CRC Card</caption>
- * <tr><th> Responsibilities <th> Collaborations
- * <tr><td> Read a text file as a string.
- * <tr><td> Open a file or default resource as an input stream.
- * </table>
*/
public class FileUtils
{
@@ -214,7 +208,7 @@ public class FileUtils
*
* @param src The source file name.
* @param dst The destination file name.
- * @throws IOException
+ * @throws IOException if there is an issue copying the file
*/
public static void copyCheckedEx(File src, File dst) throws IOException
{
@@ -228,7 +222,7 @@ public class FileUtils
*
* @param in The InputStream
* @param dst The destination file name.
- * @throws IOException
+ * @throws IOException if there is an issue copying the stream
*/
public static void copy(InputStream in, File dst) throws IOException
{
@@ -383,7 +377,7 @@ public class FileUtils
* @param file the file to search
* @param search the search String
*
- * @throws java.io.IOException
+ * @throws java.io.IOException if there is an issue searching the file
* @return the list of matching entries
*/
public static List<String> searchFile(File file, String search)
Modified: qpid/branches/0.30/qpid/java/jca/src/main/java/org/apache/qpid/ra/QpidRASessionImpl.java
URL: http://svn.apache.org/viewvc/qpid/branches/0.30/qpid/java/jca/src/main/java/org/apache/qpid/ra/QpidRASessionImpl.java?rev=1616823&r1=1616822&r2=1616823&view=diff
==============================================================================
--- qpid/branches/0.30/qpid/java/jca/src/main/java/org/apache/qpid/ra/QpidRASessionImpl.java (original)
+++ qpid/branches/0.30/qpid/java/jca/src/main/java/org/apache/qpid/ra/QpidRASessionImpl.java Fri Aug 8 16:39:32 2014
@@ -1230,7 +1230,6 @@ public class QpidRASessionImpl implement
/**
* Get the XA resource
* @return The XA resource
- * @exception IllegalStateException If non XA connection
*/
public XAResource getXAResource()
{
@@ -1713,8 +1712,8 @@ public class QpidRASessionImpl implement
}
/**
- * @throws SystemException
- * @throws RollbackException
+ * throws SystemException
+ * throws RollbackException
*
*/
public void checkState() throws JMSException
Modified: qpid/branches/0.30/qpid/java/jca/src/main/java/org/apache/qpid/ra/inflow/QpidActivationSpec.java
URL: http://svn.apache.org/viewvc/qpid/branches/0.30/qpid/java/jca/src/main/java/org/apache/qpid/ra/inflow/QpidActivationSpec.java?rev=1616823&r1=1616822&r2=1616823&view=diff
==============================================================================
--- qpid/branches/0.30/qpid/java/jca/src/main/java/org/apache/qpid/ra/inflow/QpidActivationSpec.java (original)
+++ qpid/branches/0.30/qpid/java/jca/src/main/java/org/apache/qpid/ra/inflow/QpidActivationSpec.java Fri Aug 8 16:39:32 2014
@@ -452,7 +452,7 @@ public class QpidActivationSpec extends
/**
* Set the prefetch low
- * @param value The value
+ * @param prefetchLow The value
*/
public void setPrefetchLow(final Integer prefetchLow)
{
@@ -480,7 +480,7 @@ public class QpidActivationSpec extends
/**
* Set the prefetch high
- * @param value The value
+ * @param prefetchHigh The value
*/
public void setPrefetchHigh(final Integer prefetchHigh)
{
Modified: qpid/branches/0.30/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedExchange.java
URL: http://svn.apache.org/viewvc/qpid/branches/0.30/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedExchange.java?rev=1616823&r1=1616822&r2=1616823&view=diff
==============================================================================
--- qpid/branches/0.30/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedExchange.java (original)
+++ qpid/branches/0.30/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedExchange.java Fri Aug 8 16:39:32 2014
@@ -134,8 +134,8 @@ public interface ManagedExchange
/**
* Removes an exchange binding from a queue.
*
- * @param exchangeName the Exchange name
- * @param routingKey the routing key
+ * @param queueName the Queue name
+ * @param binding the binding key
* @throws IOException
* @throws JMException
* @since Qpid JMX API 1.8
Modified: qpid/branches/0.30/qpid/java/management/example/src/main/java/org/apache/qpid/example/jmxexample/QueueInformation.java
URL: http://svn.apache.org/viewvc/qpid/branches/0.30/qpid/java/management/example/src/main/java/org/apache/qpid/example/jmxexample/QueueInformation.java?rev=1616823&r1=1616822&r2=1616823&view=diff
==============================================================================
--- qpid/branches/0.30/qpid/java/management/example/src/main/java/org/apache/qpid/example/jmxexample/QueueInformation.java (original)
+++ qpid/branches/0.30/qpid/java/management/example/src/main/java/org/apache/qpid/example/jmxexample/QueueInformation.java Fri Aug 8 16:39:32 2014
@@ -64,13 +64,15 @@ public class QueueInformation
/**
* Params:
- * 0: host, e.g. eqd-myserver.mydomain.com
- * 1: port, e.g. 8999
- * 2: vhost e.g. dev-only
- * 3: username, e.g. guest
- * 4: pwd, e.g. guest
- * 5: loop pause, no value indicates one-off, any other value is millisecs
- * ..: attributes=<csv attribute list> , queue=<csv queue list>
+ * <p>
+ * <p>0: host, e.g. eqd-myserver.mydomain.com
+ * <p>1: port, e.g. 8999
+ * <p>2: vhost e.g. dev-only
+ * <p>3: username, e.g. guest
+ * <p>4: pwd, e.g. guest
+ * <p>5: loop pause, no value indicates one-off, any other value is millisecs
+ * <p>..: {@literal attributes=<csv attribute list> , queue=<csv queue list>}
+ * <p>
* The queue list can use wildcards such as * and ?. Basically any value
* that JMX will accept in the query string for t name='' value of the queue.
*/
Modified: qpid/branches/0.30/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/ConfigFileHelper.java
URL: http://svn.apache.org/viewvc/qpid/branches/0.30/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/ConfigFileHelper.java?rev=1616823&r1=1616822&r2=1616823&view=diff
==============================================================================
--- qpid/branches/0.30/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/ConfigFileHelper.java (original)
+++ qpid/branches/0.30/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/ConfigFileHelper.java Fri Aug 8 16:39:32 2014
@@ -27,7 +27,7 @@ public class ConfigFileHelper
{
/**
* Returns absolute paths to the config file(s).
- * <p/>
+ * <p>
* If testConfigPath is a directory, its .js and .json files are returned.
* Otherwise, the returned list just contains testConfigPath.
*/
Modified: qpid/branches/0.30/qpid/java/qpid-systests-parent/pom.xml
URL: http://svn.apache.org/viewvc/qpid/branches/0.30/qpid/java/qpid-systests-parent/pom.xml?rev=1616823&r1=1616822&r2=1616823&view=diff
==============================================================================
--- qpid/branches/0.30/qpid/java/qpid-systests-parent/pom.xml (original)
+++ qpid/branches/0.30/qpid/java/qpid-systests-parent/pom.xml Fri Aug 8 16:39:32 2014
@@ -229,6 +229,13 @@
</configuration>
</plugin>
+ <plugin>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <!--The systests arent currently deployed, and their javadoc is rather broken anyway -->
+ <skip>true</skip>
+ </configuration>
+ </plugin>
</plugins>
</build>
Modified: qpid/branches/0.30/qpid/java/tools/src/main/java/org/apache/qpid/testkit/TestLauncher.java
URL: http://svn.apache.org/viewvc/qpid/branches/0.30/qpid/java/tools/src/main/java/org/apache/qpid/testkit/TestLauncher.java?rev=1616823&r1=1616822&r2=1616823&view=diff
==============================================================================
--- qpid/branches/0.30/qpid/java/tools/src/main/java/org/apache/qpid/testkit/TestLauncher.java (original)
+++ qpid/branches/0.30/qpid/java/tools/src/main/java/org/apache/qpid/testkit/TestLauncher.java Fri Aug 8 16:39:32 2014
@@ -56,7 +56,7 @@ import org.apache.qpid.thread.Threading;
* or both, each on it's own separate thread.
*
* If con_count == ssn_count, then each entity created will have
- * it's own Connection. Else if con_count < ssn_count, then
+ * it's own Connection. Else if con_count {@literal <} ssn_count, then
* a connection will be shared by ssn_count/con_count # of entities.
*
* The if both sender and receiver options are set, it will
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org