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 2012/06/05 17:59:35 UTC
svn commit: r1346446 - in
/qpid/branches/java-config-and-management/qpid/java: ./
amqp-1-0-client-jms/ amqp-1-0-client/ amqp-1-0-common/ broker/ broker/bin/
broker/src/main/java/org/apache/qpid/server/management/
broker/src/main/java/org/apache/qpid/se...
Author: robbie
Date: Tue Jun 5 15:59:31 2012
New Revision: 1346446
URL: http://svn.apache.org/viewvc?rev=1346446&view=rev
Log:
merge changes from trunk up to r1343220
Added:
qpid/branches/java-config-and-management/qpid/java/client/src/test/java/org/apache/qpid/client/AMQConnectionFactoryTest.java
- copied unchanged from r1343220, qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/client/AMQConnectionFactoryTest.java
qpid/branches/java-config-and-management/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/client/utils/
- copied from r1343220, qpid/trunk/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/client/utils/
qpid/branches/java-config-and-management/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/client/utils/ExecutorWithLimits.java
- copied unchanged from r1343220, qpid/trunk/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/client/utils/ExecutorWithLimits.java
qpid/branches/java-config-and-management/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/client/utils/ExecutorWithLimitsFactory.java
- copied unchanged from r1343220, qpid/trunk/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/client/utils/ExecutorWithLimitsFactory.java
qpid/branches/java-config-and-management/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/client/utils/ExecutorWithNoLimits.java
- copied unchanged from r1343220, qpid/trunk/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/client/utils/ExecutorWithNoLimits.java
qpid/branches/java-config-and-management/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/client/utils/ExecutorWithTimeLimit.java
- copied unchanged from r1343220, qpid/trunk/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/client/utils/ExecutorWithTimeLimit.java
qpid/branches/java-config-and-management/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/client/utils/
- copied from r1343220, qpid/trunk/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/client/utils/
qpid/branches/java-config-and-management/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/client/utils/ExecutorWithNoLimitsTest.java
- copied unchanged from r1343220, qpid/trunk/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/client/utils/ExecutorWithNoLimitsTest.java
qpid/branches/java-config-and-management/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/client/utils/ExecutorWithTimeLimitTest.java
- copied unchanged from r1343220, qpid/trunk/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/client/utils/ExecutorWithTimeLimitTest.java
Removed:
qpid/branches/java-config-and-management/qpid/java/client/src/test/java/org/apache/qpid/test/unit/jndi/ConnectionFactoryTest.java
Modified:
qpid/branches/java-config-and-management/qpid/java/ (props changed)
qpid/branches/java-config-and-management/qpid/java/amqp-1-0-client/ (props changed)
qpid/branches/java-config-and-management/qpid/java/amqp-1-0-client-jms/ (props changed)
qpid/branches/java-config-and-management/qpid/java/amqp-1-0-common/ (props changed)
qpid/branches/java-config-and-management/qpid/java/broker/ (props changed)
qpid/branches/java-config-and-management/qpid/java/broker/bin/ (props changed)
qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/management/ (props changed)
qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/message/MessageMetaData_1_0.java (props changed)
qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/ProtocolEngine_1_0_0.java (props changed)
qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/ProtocolEngine_1_0_0_SASL.java (props changed)
qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v1_0/ (props changed)
qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/ (props changed)
qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/registry/ApplicationRegistry.java
qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/manager/KerberosAuthenticationManager.java
qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/ (props changed)
qpid/branches/java-config-and-management/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnectionFactory.java
qpid/branches/java-config-and-management/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ConfigurationManagement.java (props changed)
qpid/branches/java-config-and-management/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/LoggingManagement.java (props changed)
qpid/branches/java-config-and-management/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedBroker.java (props changed)
qpid/branches/java-config-and-management/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedConnection.java (props changed)
qpid/branches/java-config-and-management/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedExchange.java (props changed)
qpid/branches/java-config-and-management/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedQueue.java (props changed)
qpid/branches/java-config-and-management/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/UserManagement.java (props changed)
qpid/branches/java-config-and-management/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanAttribute.java (props changed)
qpid/branches/java-config-and-management/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanConstructor.java (props changed)
qpid/branches/java-config-and-management/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanDescription.java (props changed)
qpid/branches/java-config-and-management/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanOperation.java (props changed)
qpid/branches/java-config-and-management/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanOperationParameter.java (props changed)
qpid/branches/java-config-and-management/qpid/java/management/eclipse-plugin/src/ (props changed)
qpid/branches/java-config-and-management/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/ConnectionTypeTabControl.java (props changed)
qpid/branches/java-config-and-management/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/ExchangeTypeTabControl.java (props changed)
qpid/branches/java-config-and-management/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/MBeanTypeTabControl.java (props changed)
qpid/branches/java-config-and-management/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/QueueTypeTabControl.java (props changed)
qpid/branches/java-config-and-management/qpid/java/management/eclipse-plugin/src/main/resources/macosx/Contents/MacOS/qpidmc (props changed)
qpid/branches/java-config-and-management/qpid/java/perftests/etc/testdefs/short/AcknowledgementModes.json
qpid/branches/java-config-and-management/qpid/java/perftests/etc/testdefs/short/MessageSize.json
qpid/branches/java-config-and-management/qpid/java/perftests/etc/testdefs/short/QueueTypes.json
qpid/branches/java-config-and-management/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/client/ProducerParticipant.java
qpid/branches/java-config-and-management/qpid/java/systests/src/main/java/org/apache/qpid/server/SupportedProtocolVersionsTest.java (props changed)
qpid/branches/java-config-and-management/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/connection/ConnectionFactoryTest.java
qpid/branches/java-config-and-management/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java (props changed)
qpid/branches/java-config-and-management/qpid/java/test-profiles/ (props changed)
qpid/branches/java-config-and-management/qpid/java/test-profiles/CPPExcludes (props changed)
qpid/branches/java-config-and-management/qpid/java/test-profiles/Excludes (props changed)
qpid/branches/java-config-and-management/qpid/java/test-profiles/JavaBDBExcludes (props changed)
qpid/branches/java-config-and-management/qpid/java/test-profiles/JavaExcludes (props changed)
qpid/branches/java-config-and-management/qpid/java/test-profiles/JavaPre010Excludes (props changed)
qpid/branches/java-config-and-management/qpid/java/test-profiles/JavaTransientExcludes (props changed)
qpid/branches/java-config-and-management/qpid/java/test-profiles/XAExcludes (props changed)
qpid/branches/java-config-and-management/qpid/java/test-profiles/cpp.async.testprofile (props changed)
qpid/branches/java-config-and-management/qpid/java/test-profiles/cpp.cluster.testprofile (props changed)
qpid/branches/java-config-and-management/qpid/java/test-profiles/cpp.noprefetch.testprofile (props changed)
qpid/branches/java-config-and-management/qpid/java/test-profiles/cpp.ssl.excludes (props changed)
qpid/branches/java-config-and-management/qpid/java/test-profiles/cpp.ssl.testprofile (props changed)
qpid/branches/java-config-and-management/qpid/java/test-profiles/cpp.testprofile (props changed)
qpid/branches/java-config-and-management/qpid/java/test-profiles/java-bdb-spawn.0-9-1.testprofile (props changed)
qpid/branches/java-config-and-management/qpid/java/test-profiles/java-bdb.0-9-1.testprofile (props changed)
qpid/branches/java-config-and-management/qpid/java/test-profiles/java-dby-spawn.0-9-1.testprofile (props changed)
qpid/branches/java-config-and-management/qpid/java/test-profiles/java-dby.0-9-1.testprofile (props changed)
qpid/branches/java-config-and-management/qpid/java/test-profiles/java-mms-spawn.0-10.testprofile (props changed)
qpid/branches/java-config-and-management/qpid/java/test-profiles/java-mms-spawn.0-9-1.testprofile (props changed)
qpid/branches/java-config-and-management/qpid/java/test-profiles/java-mms.0-9-1.testprofile (props changed)
qpid/branches/java-config-and-management/qpid/java/test-profiles/log4j-test.xml (props changed)
qpid/branches/java-config-and-management/qpid/java/test-profiles/test-provider.properties (props changed)
qpid/branches/java-config-and-management/qpid/java/test-profiles/test_resources/ (props changed)
qpid/branches/java-config-and-management/qpid/java/test-profiles/testprofile.defaults (props changed)
Propchange: qpid/branches/java-config-and-management/qpid/java/
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java:r1342713-1343220
Propchange: qpid/branches/java-config-and-management/qpid/java/amqp-1-0-client/
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/amqp-1-0-client:r1342713-1343220
Propchange: qpid/branches/java-config-and-management/qpid/java/amqp-1-0-client-jms/
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/amqp-1-0-client-jms:r1342713-1343220
Propchange: qpid/branches/java-config-and-management/qpid/java/amqp-1-0-common/
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/amqp-1-0-common:r1342713-1343220
Propchange: qpid/branches/java-config-and-management/qpid/java/broker/
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/broker:r1342713-1343220
Propchange: qpid/branches/java-config-and-management/qpid/java/broker/bin/
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/broker/bin:r1342713-1343220
Propchange: qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/management/
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/management:r1342713-1343220
Propchange: qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/message/MessageMetaData_1_0.java
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/message/MessageMetaData_1_0.java:r1342713-1343220
Propchange: qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/ProtocolEngine_1_0_0.java
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/ProtocolEngine_1_0_0.java:r1342713-1343220
Propchange: qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/ProtocolEngine_1_0_0_SASL.java
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/ProtocolEngine_1_0_0_SASL.java:r1342713-1343220
Propchange: qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v1_0/
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v1_0:r1342713-1343220
Propchange: qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/queue:r1342713-1343220
Modified: qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/registry/ApplicationRegistry.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/registry/ApplicationRegistry.java?rev=1346446&r1=1346445&r2=1346446&view=diff
==============================================================================
--- qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/registry/ApplicationRegistry.java (original)
+++ qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/registry/ApplicationRegistry.java Tue Jun 5 15:59:31 2012
@@ -121,11 +121,6 @@ public abstract class ApplicationRegistr
private LogRecorder _logRecorder;
- protected static Logger get_logger()
- {
- return _logger;
- }
-
public Map<InetSocketAddress, QpidAcceptor> getAcceptors()
{
synchronized (_acceptors)
@@ -134,11 +129,6 @@ public abstract class ApplicationRegistr
}
}
- private QpidAcceptor getAcceptor(SocketAddress address)
- {
- return _acceptors.get(address);
- }
-
protected void setManagedObjectRegistry(ManagedObjectRegistry managedObjectRegistry)
{
_managedObjectRegistry = managedObjectRegistry;
@@ -420,12 +410,15 @@ public abstract class ApplicationRegistr
}
else
{
+ for (AuthenticationManager authenticationManger : authManagersByClass.values())
+ {
+ authenticationManger.close();
+ }
throw new ConfigurationException("If more than one authentication manager is configured a default MUST be specified.");
}
Map<Integer,AuthenticationManager> authManagers = new HashMap<Integer, AuthenticationManager>();
authManagers .put(null, defaultAuthMgr);
- String host = _configuration.getBind();
for(Map.Entry<Integer,String> portMapping : _configuration.getPortAuthenticationMappings().entrySet())
{
Modified: qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/manager/KerberosAuthenticationManager.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/manager/KerberosAuthenticationManager.java?rev=1346446&r1=1346445&r2=1346446&view=diff
==============================================================================
--- qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/manager/KerberosAuthenticationManager.java (original)
+++ qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/manager/KerberosAuthenticationManager.java Tue Jun 5 15:59:31 2012
@@ -89,7 +89,7 @@ public class KerberosAuthenticationManag
// If there is no configuration for this plugin then don't load it.
if (configuration == null)
{
- _logger.info("No authentication-manager configuration found for AnonymousAuthenticationManager");
+ _logger.info("No authentication-manager configuration found for KerberosAuthenticationManager");
return null;
}
KerberosAuthenticationManager kerberosAuthenticationManager = new KerberosAuthenticationManager();
Propchange: qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost:r1342713-1343220
Modified: qpid/branches/java-config-and-management/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnectionFactory.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-config-and-management/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnectionFactory.java?rev=1346446&r1=1346445&r2=1346446&view=diff
==============================================================================
--- qpid/branches/java-config-and-management/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnectionFactory.java (original)
+++ qpid/branches/java-config-and-management/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnectionFactory.java Tue Jun 5 15:59:31 2012
@@ -55,12 +55,13 @@ public class AMQConnectionFactory implem
ObjectFactory, Referenceable, XATopicConnectionFactory,
XAQueueConnectionFactory, XAConnectionFactory
{
- private final ConnectionURL _connectionDetails;
+ protected static final String NO_URL_CONFIGURED = "The connection factory wasn't created with a proper URL, the connection details are empty";
+
+ private ConnectionURL _connectionDetails;
// The default constructor is necessary to allow AMQConnectionFactory to be deserialised from JNDI
public AMQConnectionFactory()
{
- _connectionDetails = null;
}
public AMQConnectionFactory(final String url) throws URLSyntaxException
@@ -106,6 +107,11 @@ public class AMQConnectionFactory implem
public Connection createConnection() throws JMSException
{
+ if(_connectionDetails == null)
+ {
+ throw new JMSException(NO_URL_CONFIGURED);
+ }
+
try
{
if (_connectionDetails.getClientName() == null || _connectionDetails.getClientName().equals(""))
@@ -158,7 +164,7 @@ public class AMQConnectionFactory implem
}
else
{
- throw new JMSException("The connection factory wasn't created with a proper URL, the connection details are empty");
+ throw new JMSException(NO_URL_CONFIGURED);
}
}
@@ -193,6 +199,12 @@ public class AMQConnectionFactory implem
return _connectionDetails.toString();
}
+ //setter necessary to use instances created with the default constructor (which we can't remove)
+ public final void setConnectionURLString(String url) throws URLSyntaxException
+ {
+ _connectionDetails = new AMQConnectionURL(url);
+ }
+
/**
* JNDI interface to create objects from References.
*
@@ -332,7 +344,7 @@ public class AMQConnectionFactory implem
}
else
{
- throw new JMSException("The connection factory wasn't created with a proper URL, the connection details are empty");
+ throw new JMSException(NO_URL_CONFIGURED);
}
}
Propchange: qpid/branches/java-config-and-management/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ConfigurationManagement.java
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ConfigurationManagement.java:r1342713-1343220
Propchange: qpid/branches/java-config-and-management/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/LoggingManagement.java
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/LoggingManagement.java:r1342713-1343220
Propchange: qpid/branches/java-config-and-management/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedBroker.java
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedBroker.java:r1342713-1343220
Propchange: qpid/branches/java-config-and-management/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedConnection.java
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedConnection.java:r1342713-1343220
Propchange: qpid/branches/java-config-and-management/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedExchange.java
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedExchange.java:r1342713-1343220
Propchange: qpid/branches/java-config-and-management/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedQueue.java
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedQueue.java:r1342713-1343220
Propchange: qpid/branches/java-config-and-management/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/UserManagement.java
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/UserManagement.java:r1342713-1343220
Propchange: qpid/branches/java-config-and-management/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanAttribute.java
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanAttribute.java:r1342713-1343220
Propchange: qpid/branches/java-config-and-management/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanConstructor.java
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanConstructor.java:r1342713-1343220
Propchange: qpid/branches/java-config-and-management/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanDescription.java
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanDescription.java:r1342713-1343220
Propchange: qpid/branches/java-config-and-management/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanOperation.java
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanOperation.java:r1342713-1343220
Propchange: qpid/branches/java-config-and-management/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanOperationParameter.java
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanOperationParameter.java:r1342713-1343220
Propchange: qpid/branches/java-config-and-management/qpid/java/management/eclipse-plugin/src/
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/management/eclipse-plugin/src:r1342713-1343220
Propchange: qpid/branches/java-config-and-management/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/ConnectionTypeTabControl.java
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/ConnectionTypeTabControl.java:r1342713-1343220
Propchange: qpid/branches/java-config-and-management/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/ExchangeTypeTabControl.java
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/ExchangeTypeTabControl.java:r1342713-1343220
Propchange: qpid/branches/java-config-and-management/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/MBeanTypeTabControl.java
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/MBeanTypeTabControl.java:r1342713-1343220
Propchange: qpid/branches/java-config-and-management/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/QueueTypeTabControl.java
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/QueueTypeTabControl.java:r1342713-1343220
Propchange: qpid/branches/java-config-and-management/qpid/java/management/eclipse-plugin/src/main/resources/macosx/Contents/MacOS/qpidmc
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/management/eclipse-plugin/src/main/resources/macosx/Contents/MacOS/qpidmc:r1342713-1343220
Modified: qpid/branches/java-config-and-management/qpid/java/perftests/etc/testdefs/short/AcknowledgementModes.json
URL: http://svn.apache.org/viewvc/qpid/branches/java-config-and-management/qpid/java/perftests/etc/testdefs/short/AcknowledgementModes.json?rev=1346446&r1=1346445&r2=1346446&view=diff
==============================================================================
--- qpid/branches/java-config-and-management/qpid/java/perftests/etc/testdefs/short/AcknowledgementModes.json (original)
+++ qpid/branches/java-config-and-management/qpid/java/perftests/etc/testdefs/short/AcknowledgementModes.json Tue Jun 5 15:59:31 2012
@@ -5,13 +5,13 @@
"_iterations":[
{
"_messageSize": 1024,
- "_numberOfMessages": 1000000,
+ "_maximumDuration": 30000,
"_acknowledgeMode": 1,
"_deliveryMode": 1
},
{
"_messageSize": 1024,
- "_numberOfMessages": 250000,
+ "_maximumDuration": 30000,
"_acknowledgeMode": 0,
"_deliveryMode": 1
}
@@ -74,13 +74,13 @@
"_iterations":[
{
"_messageSize": 1024,
- "_numberOfMessages": 100000,
+ "_maximumDuration": 30000,
"_acknowledgeMode": 1,
"_deliveryMode": 2
},
{
"_messageSize": 1024,
- "_numberOfMessages": 25000,
+ "_maximumDuration": 30000,
"_acknowledgeMode": 0,
"_deliveryMode": 2
}
Modified: qpid/branches/java-config-and-management/qpid/java/perftests/etc/testdefs/short/MessageSize.json
URL: http://svn.apache.org/viewvc/qpid/branches/java-config-and-management/qpid/java/perftests/etc/testdefs/short/MessageSize.json?rev=1346446&r1=1346445&r2=1346446&view=diff
==============================================================================
--- qpid/branches/java-config-and-management/qpid/java/perftests/etc/testdefs/short/MessageSize.json (original)
+++ qpid/branches/java-config-and-management/qpid/java/perftests/etc/testdefs/short/MessageSize.json Tue Jun 5 15:59:31 2012
@@ -5,47 +5,47 @@
"_iterations":[
{
"_messageSize": 256,
- "_numberOfMessages": 1000000
+ "_maximumDuration": 30000
},
{
"_messageSize": 512,
- "_numberOfMessages": 500000
+ "_maximumDuration": 30000
},
{
"_messageSize": 1024,
- "_numberOfMessages": "250000"
+ "_maximumDuration": 30000
},
{
"_messageSize": 2048,
- "_numberOfMessages": "125000"
+ "_maximumDuration": 30000
},
{
"_messageSize": 4096,
- "_numberOfMessages": "62500"
+ "_maximumDuration": 30000
},
{
"_messageSize": 8192,
- "_numberOfMessages": 31250
+ "_maximumDuration": 30000
},
{
"_messageSize": 16384,
- "_numberOfMessages": 15625
+ "_maximumDuration": 30000
},
{
"_messageSize": 32768,
- "_numberOfMessages": 7812
+ "_maximumDuration": 30000
},
{
"_messageSize": 65536,
- "_numberOfMessages": 3906
+ "_maximumDuration": 30000
},
{
"_messageSize": 131072,
- "_numberOfMessages": 195
+ "_maximumDuration": 30000
},
{
"_messageSize": 262144,
- "_numberOfMessages": 97
+ "_maximumDuration": 30000
}
],
"_queues":[
@@ -109,47 +109,47 @@
"_iterations":[
{
"_messageSize": 256,
- "_numberOfMessages": 20000
+ "_maximumDuration": 30000
},
{
"_messageSize": 512,
- "_numberOfMessages": 20000
+ "_maximumDuration": 30000
},
{
"_messageSize": 1024,
- "_numberOfMessages": 20000
+ "_maximumDuration": 30000
},
{
"_messageSize": 2048,
- "_numberOfMessages": 20000
+ "_maximumDuration": 30000
},
{
"_messageSize": 4096,
- "_numberOfMessages": 4000
+ "_maximumDuration": 30000
},
{
"_messageSize": 8192,
- "_numberOfMessages": 4000
+ "_maximumDuration": 30000
},
{
"_messageSize": 16384,
- "_numberOfMessages": 4000
+ "_maximumDuration": 30000
},
{
"_messageSize": 32768,
- "_numberOfMessages": 2000
+ "_maximumDuration": 30000
},
{
"_messageSize": 65536,
- "_numberOfMessages": 2000
+ "_maximumDuration": 30000
},
{
"_messageSize": 131072,
- "_numberOfMessages": 2000
+ "_maximumDuration": 30000
},
{
"_messageSize": 262144,
- "_numberOfMessages": 2000
+ "_maximumDuration": 30000
}
],
"_queues":[
Modified: qpid/branches/java-config-and-management/qpid/java/perftests/etc/testdefs/short/QueueTypes.json
URL: http://svn.apache.org/viewvc/qpid/branches/java-config-and-management/qpid/java/perftests/etc/testdefs/short/QueueTypes.json?rev=1346446&r1=1346445&r2=1346446&view=diff
==============================================================================
--- qpid/branches/java-config-and-management/qpid/java/perftests/etc/testdefs/short/QueueTypes.json (original)
+++ qpid/branches/java-config-and-management/qpid/java/perftests/etc/testdefs/short/QueueTypes.json Tue Jun 5 15:59:31 2012
@@ -16036,7 +16036,7 @@
"_destinationName": "direct://amq.direct//sorted-queue?durable='true'",
"_deliveryMode": 2,
"_messageSize": 1024,
- "_numberOfMessages": 20000,
+ "_maximumDuration": 30000,
"_messageProviderName": "messageProvider"
}
]
@@ -16059,7 +16059,7 @@
{
"_name": "Consumer1",
"_destinationName": "direct://amq.direct//sorted-queue?durable='true'",
- "_numberOfMessages": 20000
+ "_maximumDuration": 30000
}
]
}
@@ -16094,7 +16094,7 @@
"_destinationName": "direct://amq.direct//simple-queue?durable='true'",
"_deliveryMode": 2,
"_messageSize": 1024,
- "_numberOfMessages": 20000
+ "_maximumDuration": 30000
}
]
}
@@ -16116,7 +16116,7 @@
{
"_name": "Consumer1",
"_destinationName": "direct://amq.direct//simple-queue?durable='true'",
- "_numberOfMessages": 20000
+ "_maximumDuration": 30000
}
]
}
@@ -16161,7 +16161,7 @@
"_destinationName": "direct://amq.direct//priority-queue?durable='true'",
"_deliveryMode": 2,
"_messageSize": 1024,
- "_numberOfMessages": 20000,
+ "_maximumDuration": 30000,
"_messageProviderName": "messageProvider"
}
]
@@ -16184,7 +16184,7 @@
{
"_name": "Consumer1",
"_destinationName": "direct://amq.direct//priority-queue?durable='true'",
- "_numberOfMessages": 20000
+ "_maximumDuration": 30000
}
]
}
Modified: qpid/branches/java-config-and-management/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/client/ProducerParticipant.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-config-and-management/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/client/ProducerParticipant.java?rev=1346446&r1=1346445&r2=1346446&view=diff
==============================================================================
--- qpid/branches/java-config-and-management/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/client/ProducerParticipant.java (original)
+++ qpid/branches/java-config-and-management/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/client/ProducerParticipant.java Tue Jun 5 15:59:31 2012
@@ -22,10 +22,14 @@ package org.apache.qpid.disttest.client;
import java.util.Date;
import java.util.NavigableSet;
import java.util.TreeSet;
+import java.util.concurrent.Callable;
+import java.util.concurrent.CancellationException;
import javax.jms.Message;
import org.apache.qpid.disttest.DistributedTestException;
+import org.apache.qpid.disttest.client.utils.ExecutorWithLimits;
+import org.apache.qpid.disttest.client.utils.ExecutorWithLimitsFactory;
import org.apache.qpid.disttest.jms.ClientJmsDelegate;
import org.apache.qpid.disttest.message.CreateProducerCommand;
import org.apache.qpid.disttest.message.ParticipantResult;
@@ -40,7 +44,9 @@ public class ProducerParticipant impleme
private final CreateProducerCommand _command;
- private ParticipantResultFactory _resultFactory;
+ private final ParticipantResultFactory _resultFactory;
+
+ private ExecutorWithLimits _limiter;
public ProducerParticipant(final ClientJmsDelegate jmsDelegate, final CreateProducerCommand command)
{
@@ -59,10 +65,10 @@ public class ProducerParticipant impleme
int acknowledgeMode = _jmsDelegate.getAcknowledgeMode(_command.getSessionName());
- long expectedDuration = _command.getMaximumDuration() - _command.getStartDelay();
-
doSleepForStartDelay();
+ final long requiredDuration = _command.getMaximumDuration() - _command.getStartDelay();
+
final long startTime = System.currentTimeMillis();
Message lastPublishedMessage = null;
@@ -70,11 +76,28 @@ public class ProducerParticipant impleme
long totalPayloadSizeOfAllMessagesSent = 0;
NavigableSet<Integer> allProducedPayloadSizes = new TreeSet<Integer>();
+ _limiter = ExecutorWithLimitsFactory.createExecutorWithLimit(startTime, requiredDuration);
+
while (true)
{
- numberOfMessagesSent++;
+ try
+ {
+ lastPublishedMessage = _limiter.execute(new Callable<Message>()
+ {
+ @Override
+ public Message call() throws Exception
+ {
+ return _jmsDelegate.sendNextMessage(_command);
+ }
+ });
+ }
+ catch (CancellationException ce)
+ {
+ LOGGER.trace("Producer send was cancelled due to maximum duration {} ms", requiredDuration);
+ break;
+ }
- lastPublishedMessage = _jmsDelegate.sendNextMessage(_command);
+ numberOfMessagesSent++;
int lastPayloadSize = _jmsDelegate.calculatePayloadSizeFrom(lastPublishedMessage);
totalPayloadSizeOfAllMessagesSent += lastPayloadSize;
@@ -96,15 +119,11 @@ public class ProducerParticipant impleme
}
_jmsDelegate.commitOrAcknowledgeMessage(lastPublishedMessage, _command.getSessionName());
- if (_command.getInterval() > 0)
- {
- // sleep for given time
- Thread.sleep(_command.getInterval());
- }
+ doSleepForInterval();
}
if (_command.getNumberOfMessages() > 0 && numberOfMessagesSent >= _command.getNumberOfMessages()
- || expectedDuration > 0 && System.currentTimeMillis() - startTime >= expectedDuration)
+ || requiredDuration > 0 && System.currentTimeMillis() - startTime >= requiredDuration)
{
break;
}
@@ -140,23 +159,42 @@ public class ProducerParticipant impleme
private void doSleepForStartDelay()
{
- if (_command.getStartDelay() > 0)
+ long sleepTime = _command.getStartDelay();
+ if (sleepTime > 0)
{
// start delay is specified. Sleeping...
- try
- {
- Thread.sleep(_command.getStartDelay());
- }
- catch (final InterruptedException e)
- {
- Thread.currentThread().interrupt();
- }
+ doSleep(sleepTime);
+ }
+ }
+
+ private void doSleepForInterval() throws InterruptedException
+ {
+ long sleepTime = _command.getInterval();
+ if (sleepTime > 0)
+ {
+ doSleep(sleepTime);
+ }
+ }
+
+ private void doSleep(long sleepTime)
+ {
+ try
+ {
+ Thread.sleep(sleepTime);
+ }
+ catch (final InterruptedException e)
+ {
+ Thread.currentThread().interrupt();
}
}
@Override
public void releaseResources()
{
+ if (_limiter != null)
+ {
+ _limiter.shutdown();
+ }
_jmsDelegate.closeTestProducer(_command.getParticipantName());
}
@@ -171,4 +209,5 @@ public class ProducerParticipant impleme
{
return "ProducerParticipant [command=" + _command + "]";
}
+
}
Propchange: qpid/branches/java-config-and-management/qpid/java/systests/src/main/java/org/apache/qpid/server/SupportedProtocolVersionsTest.java
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/SupportedProtocolVersionsTest.java:r1342713-1343220
Modified: qpid/branches/java-config-and-management/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/connection/ConnectionFactoryTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-config-and-management/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/connection/ConnectionFactoryTest.java?rev=1346446&r1=1346445&r2=1346446&view=diff
==============================================================================
--- qpid/branches/java-config-and-management/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/connection/ConnectionFactoryTest.java (original)
+++ qpid/branches/java-config-and-management/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/connection/ConnectionFactoryTest.java Tue Jun 5 15:59:31 2012
@@ -20,6 +20,8 @@
*/
package org.apache.qpid.test.unit.client.connection;
+import javax.jms.Connection;
+
import org.apache.qpid.client.AMQConnection;
import org.apache.qpid.client.AMQConnectionFactory;
import org.apache.qpid.test.utils.QpidBrokerTestCase;
@@ -57,5 +59,20 @@ public class ConnectionFactoryTest exten
assertEquals("Usernames used is different from the one in URL","guest",con3.getConnectionURL().getUsername());
assertEquals("Password used is different from the one in URL","guest",con3.getConnectionURL().getPassword());
}
-
+
+ /**
+ * Verifies that a connection can be made using an instance of AMQConnectionFactory created with the
+ * default constructor and provided with the connection url via setter.
+ */
+ public void testCreatingConnectionWithInstanceMadeUsingDefaultConstructor() throws Exception
+ {
+ String broker = getBroker().toString();
+ String url = "amqp://guest:guest@clientID/test?brokerlist='" + broker + "'";
+
+ AMQConnectionFactory factory = new AMQConnectionFactory();
+ factory.setConnectionURLString(url);
+
+ Connection con = factory.createConnection();
+ con.close();
+ }
}
Propchange: qpid/branches/java-config-and-management/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java:r1342713-1343220
Propchange: qpid/branches/java-config-and-management/qpid/java/test-profiles/
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/test-profiles:r1342713-1343220
Propchange: qpid/branches/java-config-and-management/qpid/java/test-profiles/CPPExcludes
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/test-profiles/CPPExcludes:r1342713-1343220
Propchange: qpid/branches/java-config-and-management/qpid/java/test-profiles/Excludes
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/test-profiles/Excludes:r1342713-1343220
Propchange: qpid/branches/java-config-and-management/qpid/java/test-profiles/JavaBDBExcludes
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/test-profiles/JavaBDBExcludes:r1342713-1343220
Propchange: qpid/branches/java-config-and-management/qpid/java/test-profiles/JavaExcludes
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/test-profiles/JavaExcludes:r1342713-1343220
Propchange: qpid/branches/java-config-and-management/qpid/java/test-profiles/JavaPre010Excludes
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/test-profiles/JavaPre010Excludes:r1342713-1343220
Propchange: qpid/branches/java-config-and-management/qpid/java/test-profiles/JavaTransientExcludes
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/test-profiles/JavaTransientExcludes:r1342713-1343220
Propchange: qpid/branches/java-config-and-management/qpid/java/test-profiles/XAExcludes
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/test-profiles/XAExcludes:r1342713-1343220
Propchange: qpid/branches/java-config-and-management/qpid/java/test-profiles/cpp.async.testprofile
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/test-profiles/cpp.async.testprofile:r1342713-1343220
Propchange: qpid/branches/java-config-and-management/qpid/java/test-profiles/cpp.cluster.testprofile
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/test-profiles/cpp.cluster.testprofile:r1342713-1343220
Propchange: qpid/branches/java-config-and-management/qpid/java/test-profiles/cpp.noprefetch.testprofile
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/test-profiles/cpp.noprefetch.testprofile:r1342713-1343220
Propchange: qpid/branches/java-config-and-management/qpid/java/test-profiles/cpp.ssl.excludes
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/test-profiles/cpp.ssl.excludes:r1342713-1343220
Propchange: qpid/branches/java-config-and-management/qpid/java/test-profiles/cpp.ssl.testprofile
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/test-profiles/cpp.ssl.testprofile:r1342713-1343220
Propchange: qpid/branches/java-config-and-management/qpid/java/test-profiles/cpp.testprofile
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/test-profiles/cpp.testprofile:r1342713-1343220
Propchange: qpid/branches/java-config-and-management/qpid/java/test-profiles/java-bdb-spawn.0-9-1.testprofile
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/test-profiles/java-bdb-spawn.0-9-1.testprofile:r1342713-1343220
Propchange: qpid/branches/java-config-and-management/qpid/java/test-profiles/java-bdb.0-9-1.testprofile
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/test-profiles/java-bdb.0-9-1.testprofile:r1342713-1343220
Propchange: qpid/branches/java-config-and-management/qpid/java/test-profiles/java-dby-spawn.0-9-1.testprofile
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/test-profiles/java-dby-spawn.0-9-1.testprofile:r1342713-1343220
Propchange: qpid/branches/java-config-and-management/qpid/java/test-profiles/java-dby.0-9-1.testprofile
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/test-profiles/java-dby.0-9-1.testprofile:r1342713-1343220
Propchange: qpid/branches/java-config-and-management/qpid/java/test-profiles/java-mms-spawn.0-10.testprofile
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/test-profiles/java-mms-spawn.0-10.testprofile:r1342713-1343220
Propchange: qpid/branches/java-config-and-management/qpid/java/test-profiles/java-mms-spawn.0-9-1.testprofile
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/test-profiles/java-mms-spawn.0-9-1.testprofile:r1342713-1343220
Propchange: qpid/branches/java-config-and-management/qpid/java/test-profiles/java-mms.0-9-1.testprofile
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/test-profiles/java-mms.0-9-1.testprofile:r1342713-1343220
Propchange: qpid/branches/java-config-and-management/qpid/java/test-profiles/log4j-test.xml
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/test-profiles/log4j-test.xml:r1342713-1343220
Propchange: qpid/branches/java-config-and-management/qpid/java/test-profiles/test-provider.properties
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/test-profiles/test-provider.properties:r1342713-1343220
Propchange: qpid/branches/java-config-and-management/qpid/java/test-profiles/test_resources/
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/test-profiles/test_resources:r1342713-1343220
Propchange: qpid/branches/java-config-and-management/qpid/java/test-profiles/testprofile.defaults
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/test-profiles/testprofile.defaults:r1342713-1343220
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org