Author: robbie
Date: Mon May 16 10:15:06 2016
New Revision: 1744013
URL: http://svn.apache.org/viewvc?rev=1744013&view=rev
Log:
QPID-7260: get javadoc build working when using Java 8
Modified:
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObject.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/PrincipalDatabaseAuthenticationManager.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/oauth2/facebook/package-info.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/oauth2/github/package-info.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/oauth2/google/package-info.java
qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java
qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/UnacknowledgedMessageMap.java
qpid/java/trunk/client/src/main/java/org/apache/qpid/client/AMQConnectionFactory.java
qpid/java/trunk/client/src/main/java/org/apache/qpid/client/message/MessageFactoryRegistry.java
qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/ContentHeaderBody.java
qpid/java/trunk/perftests/src/main/java/org/apache/qpid/disttest/jms/QpidQueueCreator.java
Modified:
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObject.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObject.java?rev=1744013&r1=1744012&r2=1744013&view=diff
==============================================================================
---
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObject.java
(original)
+++
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObject.java
Mon May 16 10:15:06 2016
@@ -869,7 +869,7 @@ public abstract class AbstractConfigured
/**
* Callback method to perform ConfiguredObject specific exception handling
on exception in open.
- * <p/>
+ * <p>
* The method is not expected to throw any runtime exception.
* @param e open exception
*/
Modified:
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/PrincipalDatabaseAuthenticationManager.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/PrincipalDatabaseAuthenticationManager.java?rev=1744013&r1=1744012&r2=1744013&view=diff
==============================================================================
---
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/PrincipalDatabaseAuthenticationManager.java
(original)
+++
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/PrincipalDatabaseAuthenticationManager.java
Mon May 16 10:15:06 2016
@@ -230,7 +230,7 @@ public abstract class PrincipalDatabaseA
}
/**
- * @see
org.apache.qpid.server.model.AuthenticationProvider#authenticate(String, String)
+ * @see
org.apache.qpid.server.security.auth.manager.UsernamePasswordAuthenticationProvider#authenticate(String,
String)
*/
public AuthenticationResult authenticate(final String username, final
String password)
{
Modified:
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/oauth2/facebook/package-info.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/oauth2/facebook/package-info.java?rev=1744013&r1=1744012&r2=1744013&view=diff
==============================================================================
---
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/oauth2/facebook/package-info.java
(original)
+++
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/oauth2/facebook/package-info.java
Mon May 16 10:15:06 2016
@@ -35,7 +35,5 @@
* "clientId" : "......",
* "clientSecret" : "....",
* </pre>
- *
- * </p>
*/
package org.apache.qpid.server.security.auth.manager.oauth2.facebook;
Modified:
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/oauth2/github/package-info.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/oauth2/github/package-info.java?rev=1744013&r1=1744012&r2=1744013&view=diff
==============================================================================
---
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/oauth2/github/package-info.java
(original)
+++
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/oauth2/github/package-info.java
Mon May 16 10:15:06 2016
@@ -36,7 +36,5 @@
* "clientSecret" : "....",
* "scope" : "user"
* </pre>
- *
- * </p>
*/
package org.apache.qpid.server.security.auth.manager.oauth2.github;
Modified:
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/oauth2/google/package-info.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/oauth2/google/package-info.java?rev=1744013&r1=1744012&r2=1744013&view=diff
==============================================================================
---
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/oauth2/google/package-info.java
(original)
+++
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/oauth2/google/package-info.java
Mon May 16 10:15:06 2016
@@ -39,6 +39,5 @@
*
* Note that when configuring the Authorized redirect URIs in the Google
Developer Console
* include the trailing slash e.g. https://localhost:8080/.
- * </p>
*/
package org.apache.qpid.server.security.auth.manager.oauth2.google;
Modified:
qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java?rev=1744013&r1=1744012&r2=1744013&view=diff
==============================================================================
---
qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java
(original)
+++
qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java
Mon May 16 10:15:06 2016
@@ -696,8 +696,6 @@ public class AMQChannel
*
* @param exclusive Flag requesting exclusive access to the queue
* @return the consumer tag. This is returned to the subscriber and used
in subsequent unsubscribe requests
- *
- * @throws QpidException if something goes wrong
*/
public AMQShortString consumeFromSource(AMQShortString tag,
Collection<MessageSource> sources, boolean acks,
FieldTable arguments, boolean
exclusive, boolean noLocal)
Modified:
qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/UnacknowledgedMessageMap.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/UnacknowledgedMessageMap.java?rev=1744013&r1=1744012&r2=1744013&view=diff
==============================================================================
---
qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/UnacknowledgedMessageMap.java
(original)
+++
qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/UnacknowledgedMessageMap.java
Mon May 16 10:15:06 2016
@@ -34,8 +34,7 @@ public interface UnacknowledgedMessageMa
{
/**
* @param deliveryTag
- *@param message the message being iterated over @return true to stop
iteration, false to continue
- * @throws QpidException
+ * @param message the message being iterated over @return true to stop
iteration, false to continue
*/
boolean callback(final long deliveryTag, MessageInstance message);
Modified:
qpid/java/trunk/client/src/main/java/org/apache/qpid/client/AMQConnectionFactory.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/client/src/main/java/org/apache/qpid/client/AMQConnectionFactory.java?rev=1744013&r1=1744012&r2=1744013&view=diff
==============================================================================
---
qpid/java/trunk/client/src/main/java/org/apache/qpid/client/AMQConnectionFactory.java
(original)
+++
qpid/java/trunk/client/src/main/java/org/apache/qpid/client/AMQConnectionFactory.java
Mon May 16 10:15:06 2016
@@ -222,7 +222,7 @@ public class AMQConnectionFactory implem
*
* @throws Exception
*
- * @Deprecated Use {@link ObjectFactory} instead
+ * @deprecated Use {@link ObjectFactory} instead
*/
@Deprecated
public Object getObjectInstance(Object obj, Name name, Context ctx,
Hashtable env) throws Exception
Modified:
qpid/java/trunk/client/src/main/java/org/apache/qpid/client/message/MessageFactoryRegistry.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/client/src/main/java/org/apache/qpid/client/message/MessageFactoryRegistry.java?rev=1744013&r1=1744012&r2=1744013&view=diff
==============================================================================
---
qpid/java/trunk/client/src/main/java/org/apache/qpid/client/message/MessageFactoryRegistry.java
(original)
+++
qpid/java/trunk/client/src/main/java/org/apache/qpid/client/message/MessageFactoryRegistry.java
Mon May 16 10:15:06 2016
@@ -98,9 +98,10 @@ public class MessageFactoryRegistry
* @param contentHeader the content header that was received
* @param bodies a list of ContentBody instances @return the
message.
* @param queueDestinationCache
- * @param topicDestinationCache @throws AMQException
+ * @param topicDestinationCache
* @param addressType
* @throws JMSException
+ * @throws QpidException
*/
public AbstractJMSMessage createMessage(long deliveryTag,
boolean redelivered,
Modified:
qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/ContentHeaderBody.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/ContentHeaderBody.java?rev=1744013&r1=1744012&r2=1744013&view=diff
==============================================================================
---
qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/ContentHeaderBody.java
(original)
+++
qpid/java/trunk/common/src/main/java/org/apache/qpid/framing/ContentHeaderBody.java
Mon May 16 10:15:06 2016
@@ -74,7 +74,6 @@ public class ContentHeaderBody implement
* @return the decoded header body
* @throws AMQFrameDecodingException if there is a decoding issue
* @throws AMQProtocolVersionException if there is a version issue
- * @throws IOException if there is an IO issue
*/
public static ContentHeaderBody createFromBuffer(QpidByteBuffer buffer,
long size)
throws AMQFrameDecodingException, AMQProtocolVersionException
Modified:
qpid/java/trunk/perftests/src/main/java/org/apache/qpid/disttest/jms/QpidQueueCreator.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/perftests/src/main/java/org/apache/qpid/disttest/jms/QpidQueueCreator.java?rev=1744013&r1=1744012&r2=1744013&view=diff
==============================================================================
---
qpid/java/trunk/perftests/src/main/java/org/apache/qpid/disttest/jms/QpidQueueCreator.java
(original)
+++
qpid/java/trunk/perftests/src/main/java/org/apache/qpid/disttest/jms/QpidQueueCreator.java
Mon May 16 10:15:06 2016
@@ -52,7 +52,7 @@ import org.slf4j.LoggerFactory;
/**
* Qpid 0-8..0-10 specific class for creating/deleting queues using a non-JMS
API.
- * Uses reflection to invoke methods to retain compatibility with Qpid
versions <= 0.32.
+ * Uses reflection to invoke methods to retain compatibility with Qpid
versions {@literal <= 0.32}.
*/
public class QpidQueueCreator implements QueueCreator
{
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
