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
Author: robbie Date: Tue Jun 5 15:59:31 2012 New Revision: 1346446 URL: http://svn.apache.org/viewvc?rev=1346446view=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
svn commit: r1346454 [2/2] - 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/
Modified: qpid/branches/java-config-and-management/qpid/java/test-profiles/java-bdb-spawn.0-9-1.testprofile URL: http://svn.apache.org/viewvc/qpid/branches/java-config-and-management/qpid/java/test-profiles/java-bdb-spawn.0-9-1.testprofile?rev=1346454r1=1346453r2=1346454view=diff == --- qpid/branches/java-config-and-management/qpid/java/test-profiles/java-bdb-spawn.0-9-1.testprofile (original) +++ qpid/branches/java-config-and-management/qpid/java/test-profiles/java-bdb-spawn.0-9-1.testprofile Tue Jun 5 16:15:56 2012 @@ -19,7 +19,7 @@ broker.language=java broker.type=spawned -broker.command=build/bin/qpid-server -p @PORT -m @MPORT @EXCLUDES -c @CONFIG_FILE -l test-profiles/log4j-test.xml +broker.command=build/bin/qpid-server -p @PORT -m @MPORT @EXCLUDES @INCLUDES -c @CONFIG_FILE -l test-profiles/log4j-test.xml broker.ready=BRK-1004 broker.stopped=Exception broker.config=build/etc/config-systests-bdb.xml 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:r1343681-1344677 Modified: qpid/branches/java-config-and-management/qpid/java/test-profiles/java-bdb-spawn.0-9.testprofile URL: http://svn.apache.org/viewvc/qpid/branches/java-config-and-management/qpid/java/test-profiles/java-bdb-spawn.0-9.testprofile?rev=1346454r1=1346453r2=1346454view=diff == --- qpid/branches/java-config-and-management/qpid/java/test-profiles/java-bdb-spawn.0-9.testprofile (original) +++ qpid/branches/java-config-and-management/qpid/java/test-profiles/java-bdb-spawn.0-9.testprofile Tue Jun 5 16:15:56 2012 @@ -19,7 +19,7 @@ broker.language=java broker.type=spawned -broker.command=build/bin/qpid-server -p @PORT -m @MPORT @EXCLUDES -c @CONFIG_FILE -l test-profiles/log4j-test.xml +broker.command=build/bin/qpid-server -p @PORT -m @MPORT @EXCLUDES @INCLUDES -c @CONFIG_FILE -l test-profiles/log4j-test.xml broker.ready=BRK-1004 broker.stopped=Exception broker.config=build/etc/config-systests-bdb.xml Modified: qpid/branches/java-config-and-management/qpid/java/test-profiles/java-bdb.0-10.testprofile URL: http://svn.apache.org/viewvc/qpid/branches/java-config-and-management/qpid/java/test-profiles/java-bdb.0-10.testprofile?rev=1346454r1=1346453r2=1346454view=diff == --- qpid/branches/java-config-and-management/qpid/java/test-profiles/java-bdb.0-10.testprofile (original) +++ qpid/branches/java-config-and-management/qpid/java/test-profiles/java-bdb.0-10.testprofile Tue Jun 5 16:15:56 2012 @@ -20,9 +20,10 @@ broker.language=java broker.type=internal #broker.command only used for the second broker during failover tests in this profile -broker.command=build/bin/qpid-server -p @PORT -m @MPORT -c @CONFIG_FILE -l test-profiles/log4j-test.xml +broker.command=build/bin/qpid-server -p @PORT -m @MPORT @EXCLUDES @INCLUDES -c @CONFIG_FILE -l test-profiles/log4j-test.xml broker.ready=BRK-1004 broker.stopped=Exception +broker.protocol.excludes=--exclude-1-0 @PORT --exclude-1-0 @SSL_PORT broker.config=build/etc/config-systests-bdb.xml messagestore.class.name=org.apache.qpid.server.store.berkeleydb.BDBMessageStore profile.excludes=JavaExcludes JavaPersistentExcludes Java010Excludes JavaBDBExcludes Modified: qpid/branches/java-config-and-management/qpid/java/test-profiles/java-bdb.0-8.testprofile URL: http://svn.apache.org/viewvc/qpid/branches/java-config-and-management/qpid/java/test-profiles/java-bdb.0-8.testprofile?rev=1346454r1=1346453r2=1346454view=diff == --- qpid/branches/java-config-and-management/qpid/java/test-profiles/java-bdb.0-8.testprofile (original) +++ qpid/branches/java-config-and-management/qpid/java/test-profiles/java-bdb.0-8.testprofile Tue Jun 5 16:15:56 2012 @@ -1,4 +1,4 @@ -# +: # Licensed to the Apache Software Foundation (ASF) under one # or more contributor license agreements. See the NOTICE file # distributed with this work for additional information @@ -20,7 +20,7 @@ broker.language=java broker.type=internal #broker.command only used for the second broker during failover tests in this profile -broker.command=build/bin/qpid-server -p @PORT -m @MPORT @EXCLUDES -c @CONFIG_FILE -l test-profiles/log4j-test.xml +broker.command=build/bin/qpid-server -p @PORT -m @MPORT @EXCLUDES @INCLUDES -c @CONFIG_FILE -l test-profiles/log4j-test.xml broker.ready=BRK-1004 broker.stopped=Exception broker.config=build/etc/config-systests-bdb.xml Modified: qpid/branches/java-config-and-management/qpid/java/test-profiles/java-bdb.0-9-1.testprofile URL:
svn commit: r1347565 - in /qpid/branches/java-config-and-management/qpid/java: broker-plugins/jmx/src/main/java/org/apache/qpid/server/jmx/ broker-plugins/jmx/src/main/java/org/apache/qpid/server/jmx/
Author: robbie
Date: Thu Jun 7 10:51:19 2012
New Revision: 1347565
URL: http://svn.apache.org/viewvc?rev=1347565view=rev
Log:
Add unit test for ConnectionMBean, update ConnectionMBean system test, add
additional log statements in JMX registry, remove old management layers JMX
registry
Added:
qpid/branches/java-config-and-management/qpid/java/broker-plugins/jmx/src/test/
qpid/branches/java-config-and-management/qpid/java/broker-plugins/jmx/src/test/java/
qpid/branches/java-config-and-management/qpid/java/broker-plugins/jmx/src/test/java/org/
qpid/branches/java-config-and-management/qpid/java/broker-plugins/jmx/src/test/java/org/apache/
qpid/branches/java-config-and-management/qpid/java/broker-plugins/jmx/src/test/java/org/apache/qpid/
qpid/branches/java-config-and-management/qpid/java/broker-plugins/jmx/src/test/java/org/apache/qpid/server/
qpid/branches/java-config-and-management/qpid/java/broker-plugins/jmx/src/test/java/org/apache/qpid/server/jmx/
qpid/branches/java-config-and-management/qpid/java/broker-plugins/jmx/src/test/java/org/apache/qpid/server/jmx/mbeans/
qpid/branches/java-config-and-management/qpid/java/broker-plugins/jmx/src/test/java/org/apache/qpid/server/jmx/mbeans/ConnectionMBeanTest.java
Removed:
qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/management/JMXManagedObjectRegistry.java
Modified:
qpid/branches/java-config-and-management/qpid/java/broker-plugins/jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagedObjectRegistry.java
qpid/branches/java-config-and-management/qpid/java/broker-plugins/jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/ConnectionMBean.java
qpid/branches/java-config-and-management/qpid/java/broker-plugins/jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/VirtualHostMBean.java
qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/model/Statistics.java
qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/registry/ConfigurationFileApplicationRegistry.java
qpid/branches/java-config-and-management/qpid/java/systests/src/main/java/org/apache/qpid/management/jmx/ManagedConnectionMBeanTest.java
qpid/branches/java-config-and-management/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java
qpid/branches/java-config-and-management/qpid/java/test-profiles/Excludes
Modified:
qpid/branches/java-config-and-management/qpid/java/broker-plugins/jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagedObjectRegistry.java
URL:
http://svn.apache.org/viewvc/qpid/branches/java-config-and-management/qpid/java/broker-plugins/jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagedObjectRegistry.java?rev=1347565r1=1347564r2=1347565view=diff
==
---
qpid/branches/java-config-and-management/qpid/java/broker-plugins/jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagedObjectRegistry.java
(original)
+++
qpid/branches/java-config-and-management/qpid/java/broker-plugins/jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagedObjectRegistry.java
Thu Jun 7 10:51:19 2012
@@ -312,6 +312,8 @@ public class JMXManagedObjectRegistry im
}
catch (NotBoundException nbe)
{
+// TODO consider if we want to keep new logging
+_log.error(Failed to unbind jmxrmi, nbe);
//ignore
}
@@ -435,6 +437,8 @@ public class JMXManagedObjectRegistry im
//Stops the JMXConnectorServer and RMIRegistry, then unregisters any
remaining MBeans from the MBeanServer
public void close()
{
+_log.debug(close() called);
+
if (_cs != null)
{
// Stopping the JMX ConnectorServer
@@ -445,7 +449,7 @@ public class JMXManagedObjectRegistry im
}
catch (IOException e)
{
-_log.error(Exception while closing the JMX ConnectorServer:
+ e.getMessage());
+_log.error(Exception while closing the JMX ConnectorServer:
, e);
}
}
@@ -455,11 +459,15 @@ public class JMXManagedObjectRegistry im
CurrentActor.get().message(ManagementConsoleMessages.SHUTTING_DOWN(RMI
Registry, _jmxPortRegistryServer));
try
{
-UnicastRemoteObject.unexportObject(_rmiRegistry, false);
+boolean success =
UnicastRemoteObject.unexportObject(_rmiRegistry, false);
+if (!success)
+{
+_log.warn(Failed to unexport object + _rmiRegistry);
+}
}
catch (NoSuchObjectException e)
{
-_log.error(Exception while closing the RMI Registry: +
e.getMessage
svn commit: r1347579 - in /qpid/branches/java-config-and-management/qpid/java/broker/src: main/java/org/apache/qpid/server/management/ main/java/org/apache/qpid/server/protocol/ main/java/org/apache/q
Author: robbie
Date: Thu Jun 7 11:57:45 2012
New Revision: 1347579
URL: http://svn.apache.org/viewvc?rev=1347579view=rev
Log:
remove old connection mbeans/tests
Removed:
qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/management/AMQProtocolSessionMBean.java
qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/management/ServerConnectionMBean.java
qpid/branches/java-config-and-management/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/AMQProtocolSessionMBeanTest.java
qpid/branches/java-config-and-management/qpid/java/broker/src/test/java/org/apache/qpid/server/transport/ServerConnectionMBeanTest.java
Modified:
qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolEngine.java
qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ServerConnection.java
qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ServerConnectionDelegate.java
Modified:
qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolEngine.java
URL:
http://svn.apache.org/viewvc/qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolEngine.java?rev=1347579r1=1347578r2=1347579view=diff
==
---
qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolEngine.java
(original)
+++
qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolEngine.java
Thu Jun 7 11:57:45 2012
@@ -34,7 +34,6 @@ import java.util.concurrent.ConcurrentHa
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.concurrent.CopyOnWriteArraySet;
import java.util.concurrent.atomic.AtomicBoolean;
-import javax.management.JMException;
import javax.security.auth.Subject;
import javax.security.sasl.SaslServer;
import org.apache.log4j.Logger;
@@ -78,9 +77,6 @@ import org.apache.qpid.server.logging.ac
import org.apache.qpid.server.logging.actors.ManagementActor;
import org.apache.qpid.server.logging.messages.ConnectionMessages;
import org.apache.qpid.server.logging.subjects.ConnectionLogSubject;
-import org.apache.qpid.server.management.AMQProtocolSessionMBean;
-import org.apache.qpid.server.management.Managable;
-import org.apache.qpid.server.management.ManagedObject;
import org.apache.qpid.server.output.ProtocolOutputConverter;
import org.apache.qpid.server.output.ProtocolOutputConverterRegistry;
import org.apache.qpid.server.queue.QueueEntry;
@@ -99,7 +95,7 @@ import org.apache.qpid.transport.Transpo
import org.apache.qpid.transport.network.NetworkConnection;
import org.apache.qpid.util.BytesDataOutput;
-public class AMQProtocolEngine implements ServerProtocolEngine, Managable,
AMQProtocolSession, ConnectionConfig
+public class AMQProtocolEngine implements ServerProtocolEngine,
AMQProtocolSession, ConnectionConfig
{
private static final Logger _logger =
Logger.getLogger(AMQProtocolEngine.class);
@@ -124,8 +120,6 @@ public class AMQProtocolEngine implement
private AMQCodecFactory _codecFactory;
-private AMQProtocolSessionMBean _managedObject;
-
private SaslServer _saslServer;
private Object _lastReceived;
@@ -166,7 +160,6 @@ public class AMQProtocolEngine implement
private final ConfigStore _configStore;
private long _createTime = System.currentTimeMillis();
-private ApplicationRegistry _registry;
private StatisticsCounter _messagesDelivered, _dataDelivered,
_messagesReceived, _dataReceived;
private NetworkConnection _network;
@@ -176,11 +169,6 @@ public class AMQProtocolEngine implement
private long _lastReceivedTime;
private boolean _blocking;
-public ManagedObject getManagedObject()
-{
-return _managedObject;
-}
-
public AMQProtocolEngine(VirtualHostRegistry virtualHostRegistry,
NetworkConnection network, final long connectionId)
{
_stateManager = new AMQStateManager(virtualHostRegistry, this);
@@ -198,7 +186,6 @@ public class AMQProtocolEngine implement
_actor.message(ConnectionMessages.OPEN(null, null, null, false, false,
false));
-_registry = virtualHostRegistry.getApplicationRegistry();
initialiseStatistics();
}
@@ -214,11 +201,6 @@ public class AMQProtocolEngine implement
_sender = sender;
}
-private AMQProtocolSessionMBean createMBean() throws JMException
-{
-return new AMQProtocolSessionMBean(this);
-}
-
public long getSessionID()
{
return _connectionID;
@@ -667,17 +649,6 @@ public class AMQProtocolEngine implement
svn commit: r1347688 - in /qpid/trunk/qpid/java/broker-plugins/extras: ./ src/main/java/org/apache/qpid/extras/ src/main/java/org/apache/qpid/extras/exchanges/diagnostic/ src/main/java/org/apache/qpid
Author: robbie Date: Thu Jun 7 15:45:32 2012 New Revision: 1347688 URL: http://svn.apache.org/viewvc?rev=1347688view=rev Log: QPID-4045: remove the unused 'extras' plugin Removed: qpid/trunk/qpid/java/broker-plugins/extras/MANIFEST.MF qpid/trunk/qpid/java/broker-plugins/extras/build.xml qpid/trunk/qpid/java/broker-plugins/extras/src/main/java/org/apache/qpid/extras/Activator.java qpid/trunk/qpid/java/broker-plugins/extras/src/main/java/org/apache/qpid/extras/exchanges/diagnostic/DiagnosticExchange.java qpid/trunk/qpid/java/broker-plugins/extras/src/main/java/org/apache/qpid/extras/exchanges/diagnostic/DiagnosticExchangeType.java qpid/trunk/qpid/java/broker-plugins/extras/src/main/java/org/apache/qpid/extras/exchanges/example/TestExchange.java qpid/trunk/qpid/java/broker-plugins/extras/src/main/java/org/apache/qpid/extras/exchanges/example/TestExchangeType.java qpid/trunk/qpid/java/broker-plugins/extras/src/test/java/org/apache/qpid/server/plugins/ExtrasTest.java - To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
svn commit: r1347703 [2/2] - in /qpid/branches/java-config-and-management/qpid/java: ./ amqp-1-0-client-jms/ amqp-1-0-client/ amqp-1-0-common/ amqp-1-0-common/src/main/java/org/apache/qpid/amqp_1_0/tr
Modified:
qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/manager/SimpleLDAPAuthenticationManager.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/SimpleLDAPAuthenticationManager.java?rev=1347703r1=1347702r2=1347703view=diff
==
---
qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/manager/SimpleLDAPAuthenticationManager.java
(original)
+++
qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/manager/SimpleLDAPAuthenticationManager.java
Thu Jun 7 16:27:57 2012
@@ -20,6 +20,7 @@
package org.apache.qpid.server.security.auth.manager;
import java.io.IOException;
+import java.security.Principal;
import java.util.Arrays;
import java.util.HashMap;
import java.util.Hashtable;
@@ -180,7 +181,7 @@ public class SimpleLDAPAuthenticationMan
}
@Override
-public SaslServer createSaslServer(String mechanism, String localFQDN)
throws SaslException
+public SaslServer createSaslServer(String mechanism, String localFQDN,
Principal externalPrincipal) throws SaslException
{
if(PLAIN_MECHANISM.equals(mechanism))
{
@@ -254,19 +255,6 @@ public class SimpleLDAPAuthenticationMan
}
@Override
-public CallbackHandler getHandler(String mechanism)
-{
-if(PLAIN_MECHANISM.equals(mechanism))
-{
-return new PlainCallbackHandler();
-}
-else
-{
-return null;
-}
-}
-
-@Override
public void close()
{
}
Modified:
qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ServerConnection.java
URL:
http://svn.apache.org/viewvc/qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ServerConnection.java?rev=1347703r1=1347702r2=1347703view=diff
==
---
qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ServerConnection.java
(original)
+++
qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ServerConnection.java
Thu Jun 7 16:27:57 2012
@@ -20,6 +20,15 @@
*/
package org.apache.qpid.server.transport;
+import java.security.Principal;
+import java.text.MessageFormat;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.UUID;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicLong;
+import javax.management.JMException;
+import javax.security.auth.Subject;
import org.apache.qpid.AMQException;
import org.apache.qpid.protocol.AMQConstant;
import org.apache.qpid.server.configuration.ConnectionConfig;
@@ -31,7 +40,6 @@ import org.apache.qpid.server.logging.me
import org.apache.qpid.server.protocol.AMQConnectionModel;
import org.apache.qpid.server.protocol.AMQSessionModel;
import org.apache.qpid.server.security.AuthorizationHolder;
-import org.apache.qpid.server.security.auth.sasl.UsernamePrincipal;
import org.apache.qpid.server.stats.StatisticsCounter;
import org.apache.qpid.server.virtualhost.VirtualHost;
import org.apache.qpid.transport.Connection;
@@ -46,15 +54,6 @@ import static org.apache.qpid.server.log
import static
org.apache.qpid.server.logging.subjects.LogSubjectFormat.SOCKET_FORMAT;
import static
org.apache.qpid.server.logging.subjects.LogSubjectFormat.USER_FORMAT;
-import javax.security.auth.Subject;
-import java.security.Principal;
-import java.text.MessageFormat;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.UUID;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.atomic.AtomicLong;
-
public class ServerConnection extends Connection implements
AMQConnectionModel, LogSubject, AuthorizationHolder
{
private ConnectionConfig _config;
@@ -70,6 +69,7 @@ public class ServerConnection extends Co
private VirtualHost _virtualHost;
private AtomicLong _lastIoTime = new AtomicLong();
private boolean _blocking;
+private Principal _peerPrincipal;
public ServerConnection(final long connectionId)
{
@@ -402,7 +402,7 @@ public class ServerConnection extends Co
else
{
_authorizedSubject = authorizedSubject;
-_authorizedPrincipal =
UsernamePrincipal.getUsernamePrincipalFromSubject(_authorizedSubject);
+_authorizedPrincipal =
authorizedSubject.getPrincipals().iterator().next();
}
}
@@ -485,4 +485,14 @@ public class ServerConnection extends Co
{
return getChannelMax();
}
+
+public Principal
svn commit: r1347711 - in /qpid/branches/java-config-and-management/qpid/java: broker/src/main/java/org/apache/qpid/server/exchange/ broker/src/main/java/org/apache/qpid/server/management/ broker/src/
Author: robbie
Date: Thu Jun 7 16:57:39 2012
New Revision: 1347711
URL: http://svn.apache.org/viewvc?rev=1347711view=rev
Log:
remove the old exchange mbeans
Removed:
qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/management/AbstractExchangeMBean.java
qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/management/DirectExchangeMBean.java
qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/management/FanoutExchangeMBean.java
qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/management/HeadersExchangeMBean.java
qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/management/TopicExchangeMBean.java
qpid/branches/java-config-and-management/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/ExchangeMBeanTest.java
qpid/branches/java-config-and-management/qpid/java/management/eclipse-plugin/src/test/java/org/apache/qpid/management/ui/ManagementConsoleTest.java
Modified:
qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java
qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/DefaultExchangeRegistry.java
qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/DirectExchange.java
qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/FanoutExchange.java
qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/HeadersExchange.java
qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/TopicExchange.java
qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/DefaultQueueRegistry.java
Modified:
qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java
URL:
http://svn.apache.org/viewvc/qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java?rev=1347711r1=1347710r2=1347711view=diff
==
---
qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java
(original)
+++
qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java
Thu Jun 7 16:57:39 2012
@@ -30,16 +30,13 @@ import org.apache.qpid.server.logging.Lo
import org.apache.qpid.server.logging.actors.CurrentActor;
import org.apache.qpid.server.logging.messages.ExchangeMessages;
import org.apache.qpid.server.logging.subjects.ExchangeLogSubject;
-import org.apache.qpid.server.management.AbstractExchangeMBean;
import org.apache.qpid.server.management.Managable;
-import org.apache.qpid.server.management.ManagedObject;
import org.apache.qpid.server.message.InboundMessage;
import org.apache.qpid.server.queue.AMQQueue;
import org.apache.qpid.server.queue.BaseQueue;
import org.apache.qpid.server.queue.QueueRegistry;
import org.apache.qpid.server.virtualhost.VirtualHost;
-import javax.management.JMException;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
@@ -51,10 +48,8 @@ import java.util.concurrent.atomic.Atomi
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicLong;
-public abstract class AbstractExchange implements Exchange, Managable
+public abstract class AbstractExchange implements Exchange
{
-
-
private AMQShortString _name;
private final AtomicBoolean _closed = new AtomicBoolean();
@@ -67,9 +62,6 @@ public abstract class AbstractExchange i
private final ListExchange.Task _closeTaskList = new
CopyOnWriteArrayListExchange.Task();
-
-private AbstractExchangeMBean _exchangeMbean;
-
/**
* Whether the exchange is automatically deleted once all queues have
detached from it
*/
@@ -110,13 +102,6 @@ public abstract class AbstractExchange i
return _type.getName();
}
-/**
- * Concrete exchanges must implement this method in order to create the
managed representation. This is
- * called during initialisation (template method pattern).
- * @return the MBean
- */
-protected abstract AbstractExchangeMBean createMBean() throws JMException;
-
public void initialise(UUID id, VirtualHost host, AMQShortString name,
boolean durable, int ticket, boolean autoDelete)
throws AMQException
{
@@ -129,26 +114,12 @@ public abstract class AbstractExchange i
_id = id;
getConfigStore
svn commit: r1348629 - in /qpid/branches/java-config-and-management/qpid/java: broker-plugins/jmx/ broker-plugins/jmx/src/main/java/org/apache/qpid/server/jmx/ broker-plugins/jmx/src/main/java/org/apa
Author: robbie Date: Sun Jun 10 17:38:18 2012 New Revision: 1348629 URL: http://svn.apache.org/viewvc?rev=1348629view=rev Log: NO-JIRA: move processing of whether notifications are due into the queue itself, add listener to instruct the Queue MBean to emit any required JMX notifications, remove old Queue/VirtualHost and previously missed abstract Connection MBean code and associated tests Added: qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/model/QueueNotificationListener.java Removed: qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/management/AMQBrokerManagerMBean.java qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/management/AMQQueueMBean.java qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/management/AbstractAMQManagedConnectionObject.java qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/management/VirtualHostMBean.java qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/QueueNotificationListener.java qpid/branches/java-config-and-management/qpid/java/broker/src/test/java/org/apache/qpid/server/AMQBrokerManagerMBeanTest.java qpid/branches/java-config-and-management/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/AMQQueueAlertTest.java qpid/branches/java-config-and-management/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/AMQQueueMBeanTest.java Modified: qpid/branches/java-config-and-management/qpid/java/broker-plugins/jmx/MANIFEST.MF qpid/branches/java-config-and-management/qpid/java/broker-plugins/jmx/src/main/java/org/apache/qpid/server/jmx/AMQManagedObject.java qpid/branches/java-config-and-management/qpid/java/broker-plugins/jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/QueueMBean.java qpid/branches/java-config-and-management/qpid/java/broker-plugins/jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/VirtualHostMBean.java qpid/branches/java-config-and-management/qpid/java/broker-plugins/jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/VirtualHostManagerMBean.java qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/model/Queue.java qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/QueueAdapter.java qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/model/impl/QueueImpl.java qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/plugins/OsgiSystemPackages.properties qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/AMQQueue.java qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/DefaultQueueRegistry.java qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/NotificationCheck.java qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHost.java qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHostImpl.java qpid/branches/java-config-and-management/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/MockAMQQueue.java qpid/branches/java-config-and-management/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedQueue.java qpid/branches/java-config-and-management/qpid/java/systests/src/main/java/org/apache/qpid/management/jmx/ManagedQueueMBeanTest.java Modified: qpid/branches/java-config-and-management/qpid/java/broker-plugins/jmx/MANIFEST.MF URL: http://svn.apache.org/viewvc/qpid/branches/java-config-and-management/qpid/java/broker-plugins/jmx/MANIFEST.MF?rev=1348629r1=1348628r2=1348629view=diff == --- qpid/branches/java-config-and-management/qpid/java/broker-plugins/jmx/MANIFEST.MF (original) +++ qpid/branches/java-config-and-management/qpid/java/broker-plugins/jmx/MANIFEST.MF Sun Jun 10 17:38:18 2012 @@ -57,6 +57,7 @@ Import-Package: org.apache.qpid, javax.servlet, javax.servlet.http, javax.management;version=1.0.0, + javax.management.monitor;version=1.0.0, javax.management.openmbean;version=1.0.0, org.osgi.util.tracker;version=1.0.0, org.osgi.framework;version=1.3 Modified: qpid/branches/java-config-and-management/qpid/java/broker-plugins/jmx/src/main/java/org/apache/qpid/server/jmx/AMQManagedObject.java URL: http://svn.apache.org/viewvc
svn commit: r1348647 - /qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/ConflationQueueList.java
Author: robbie
Date: Sun Jun 10 19:10:11 2012
New Revision: 1348647
URL: http://svn.apache.org/viewvc?rev=1348647view=rev
Log:
QPID-4014: increase debug logging in ConflationQueueList
Applied patch from Phil Harvey p...@philharveyonline.com
Modified:
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/ConflationQueueList.java
Modified:
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/ConflationQueueList.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/ConflationQueueList.java?rev=1348647r1=1348646r2=1348647view=diff
==
---
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/ConflationQueueList.java
(original)
+++
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/ConflationQueueList.java
Sun Jun 10 19:10:11 2012
@@ -24,6 +24,8 @@ package org.apache.qpid.server.queue;
import org.apache.qpid.server.message.ServerMessage;
import org.apache.qpid.server.txn.AutoCommitTransaction;
import org.apache.qpid.server.txn.ServerTransaction;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import java.util.Collections;
import java.util.Map;
@@ -32,6 +34,7 @@ import java.util.concurrent.atomic.Atomi
public class ConflationQueueList extends SimpleQueueEntryList
{
+private static final Logger LOGGER =
LoggerFactory.getLogger(ConflationQueueList.class);
private final String _conflationKey;
private final ConcurrentHashMapObject, AtomicReferenceQueueEntry
_latestValuesMap =
@@ -68,6 +71,11 @@ public class ConflationQueueList extends
final Object keyValue =
message.getMessageHeader().getHeader(_conflationKey);
if (keyValue != null)
{
+if(LOGGER.isDebugEnabled())
+{
+LOGGER.debug(Adding entry + addedEntry + for message +
message.getMessageNumber() + with conflation key + keyValue);
+}
+
final AtomicReferenceQueueEntry referenceToEntry = new
AtomicReferenceQueueEntry(addedEntry);
AtomicReferenceQueueEntry entryReferenceFromMap = null;
QueueEntry entryFromMap;
@@ -100,12 +108,18 @@ public class ConflationQueueList extends
}
else if (entryFromMap.compareTo(addedEntry) 0)
{
-// A newer entry came along
+if(LOGGER.isDebugEnabled())
+{
+LOGGER.debug(New entry + addedEntry.getEntryId() +
for message + addedEntry.getMessage().getMessageNumber() + being
immediately discarded because a newer entry arrived. The newer entry is: +
entryFromMap + for message + entryFromMap.getMessage().getMessageNumber());
+}
discardEntry(addedEntry);
}
else if (entryFromMap.compareTo(addedEntry) 0)
{
-// We replaced some other entry to become the newest value
+if(LOGGER.isDebugEnabled())
+{
+LOGGER.debug(Entry + addedEntry + for message +
addedEntry.getMessage().getMessageNumber() + replacing older entry +
entryFromMap + for message + entryFromMap.getMessage().getMessageNumber());
+}
discardEntry(entryFromMap);
}
-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
svn commit: r1348669 - in /qpid/branches/java-config-and-management/qpid/java: broker-plugins/jmx/ broker-plugins/jmx/src/main/java/org/apache/qpid/server/jmx/ broker-plugins/jmx/src/main/java/org/apa
Author: robbie
Date: Sun Jun 10 22:09:13 2012
New Revision: 1348669
URL: http://svn.apache.org/viewvc?rev=1348669view=rev
Log:
NO-JIRA: move the UserManagementMBean and its test to the JMX plugin,
instantiate via the AuthenticationProvider listener instead of creating it
within the PDAM
Added:
qpid/branches/java-config-and-management/qpid/java/broker-plugins/jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/UserManagementMBean.java
qpid/branches/java-config-and-management/qpid/java/broker-plugins/jmx/src/test/java/org/apache/qpid/server/jmx/NoopManagedObjectRegistry.java
qpid/branches/java-config-and-management/qpid/java/broker-plugins/jmx/src/test/java/org/apache/qpid/server/jmx/mbeans/UserManagementMBeanTest.java
Removed:
qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/management/AMQUserManagementMBean.java
qpid/branches/java-config-and-management/qpid/java/broker/src/test/java/org/apache/qpid/server/management/AMQUserManagementMBeanTest.java
Modified:
qpid/branches/java-config-and-management/qpid/java/broker-plugins/jmx/MANIFEST.MF
qpid/branches/java-config-and-management/qpid/java/broker-plugins/jmx/src/main/java/org/apache/qpid/server/jmx/JMXService.java
qpid/branches/java-config-and-management/qpid/java/broker-plugins/jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/VirtualHostMBean.java
qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/model/PasswordCredentialManagingAuthenticationProvider.java
qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/AuthenticationProviderAdapter.java
qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/plugins/OsgiSystemPackages.properties
qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/manager/PrincipalDatabaseAuthenticationManager.java
Modified:
qpid/branches/java-config-and-management/qpid/java/broker-plugins/jmx/MANIFEST.MF
URL:
http://svn.apache.org/viewvc/qpid/branches/java-config-and-management/qpid/java/broker-plugins/jmx/MANIFEST.MF?rev=1348669r1=1348668r2=1348669view=diff
==
---
qpid/branches/java-config-and-management/qpid/java/broker-plugins/jmx/MANIFEST.MF
(original)
+++
qpid/branches/java-config-and-management/qpid/java/broker-plugins/jmx/MANIFEST.MF
Sun Jun 10 22:09:13 2012
@@ -59,6 +59,7 @@ Import-Package: org.apache.qpid,
javax.management;version=1.0.0,
javax.management.monitor;version=1.0.0,
javax.management.openmbean;version=1.0.0,
+ javax.security.auth.login;version=1.0.0,
org.osgi.util.tracker;version=1.0.0,
org.osgi.framework;version=1.3
Private-Package: org.apache.qpid.server.management.plugin.impl
Modified:
qpid/branches/java-config-and-management/qpid/java/broker-plugins/jmx/src/main/java/org/apache/qpid/server/jmx/JMXService.java
URL:
http://svn.apache.org/viewvc/qpid/branches/java-config-and-management/qpid/java/broker-plugins/jmx/src/main/java/org/apache/qpid/server/jmx/JMXService.java?rev=1348669r1=1348668r2=1348669view=diff
==
---
qpid/branches/java-config-and-management/qpid/java/broker-plugins/jmx/src/main/java/org/apache/qpid/server/jmx/JMXService.java
(original)
+++
qpid/branches/java-config-and-management/qpid/java/broker-plugins/jmx/src/main/java/org/apache/qpid/server/jmx/JMXService.java
Sun Jun 10 22:09:13 2012
@@ -29,6 +29,7 @@ import javax.management.JMException;
import org.apache.commons.configuration.ConfigurationException;
import org.apache.qpid.AMQException;
+import org.apache.qpid.server.jmx.mbeans.UserManagementMBean;
import org.apache.qpid.server.jmx.mbeans.ConfigurationManagementMBean;
import org.apache.qpid.server.jmx.mbeans.ServerInformationMBean;
import org.apache.qpid.server.jmx.mbeans.Shutdown;
@@ -36,9 +37,11 @@ import org.apache.qpid.server.jmx.mbeans
import org.apache.qpid.server.logging.SystemOutMessageLogger;
import org.apache.qpid.server.logging.actors.AbstractActor;
import org.apache.qpid.server.logging.actors.CurrentActor;
+import org.apache.qpid.server.model.AuthenticationProvider;
import org.apache.qpid.server.model.Broker;
import org.apache.qpid.server.model.ConfigurationChangeListener;
import org.apache.qpid.server.model.ConfiguredObject;
+import
org.apache.qpid.server.model.PasswordCredentialManagingAuthenticationProvider;
import org.apache.qpid.server.model.State;
import org.apache.qpid.server.model.VirtualHost;
import org.apache.qpid.server.registry.ApplicationRegistry;
@@ -107,22 +110,46 @@ public class JMXService implements Confi
{
synchronized (_children)
{
-if(child instanceof VirtualHost)
+try
{
-try
svn commit: r1353594 - /qpid/trunk/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/HATestClusterCreator.java
Author: robbie Date: Mon Jun 25 15:29:34 2012 New Revision: 1353594 URL: http://svn.apache.org/viewvc?rev=1353594view=rev Log: QPID-4080: restore connectdelay to previous value and increase retries Modified: qpid/trunk/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/HATestClusterCreator.java Modified: qpid/trunk/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/HATestClusterCreator.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/HATestClusterCreator.java?rev=1353594r1=1353593r2=1353594view=diff == --- qpid/trunk/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/HATestClusterCreator.java (original) +++ qpid/trunk/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/HATestClusterCreator.java Mon Jun 25 15:29:34 2012 @@ -60,8 +60,8 @@ public class HATestClusterCreator private static final String SINGLE_BROKER_URL_WITH_RETRY_FORMAT = amqp://guest:guest@/%s?brokerlist='tcp://localhost:%d?connectdelay='%d',retries='%d''; private static final String SINGLE_BROKER_URL_WITHOUT_RETRY_FORMAT = amqp://guest:guest@/%s?brokerlist='tcp://localhost:%d'; -private static final int RETRIES = 30; -private static final int CONNECTDELAY = 150; +private static final int RETRIES = 60; +private static final int CONNECTDELAY = 75; private final QpidBrokerTestCase _testcase; private final MapInteger, Integer _brokerPortToBdbPortMap = new HashMapInteger, Integer(); - To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
svn commit: r1354578 - 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
Author: robbie Date: Wed Jun 27 15:33:07 2012 New Revision: 1354578 URL: http://svn.apache.org/viewvc?rev=1354578view=rev Log: merge changes from trunk up to r1348603 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/configuration/ServerConfiguration.java 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/AuthenticationManagerRegistry.java qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/manager/IAuthenticationManagerRegistry.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/broker/src/test/java/org/apache/qpid/server/configuration/ServerConfigurationTest.java qpid/branches/java-config-and-management/qpid/java/broker/src/test/java/org/apache/qpid/server/security/auth/manager/AuthenticationManagerRegistryTest.java qpid/branches/java-config-and-management/qpid/java/broker/src/test/java/org/apache/qpid/server/util/TestApplicationRegistry.java qpid/branches/java-config-and-management/qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/IoNetworkTransport.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
svn commit: r1354583 - 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
Author: robbie Date: Wed Jun 27 15:39:00 2012 New Revision: 1354583 URL: http://svn.apache.org/viewvc?rev=1354583view=rev Log: merge changes from trunk up to r1349191 Added: qpid/branches/java-config-and-management/qpid/java/lib/poms/je-5.0.55.xml - copied unchanged from r1349191, qpid/trunk/qpid/java/lib/poms/je-5.0.55.xml Removed: qpid/branches/java-config-and-management/qpid/java/lib/poms/je-5.0.48.xml 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/queue/ConflationQueueList.java qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/txn/DtxRegistry.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/build.deps qpid/branches/java-config-and-management/qpid/java/client/src/main/java/org/apache/qpid/client/XASessionImpl.java qpid/branches/java-config-and-management/qpid/java/ivy.retrieve.xml 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
svn commit: r1354587 [2/2] - in /qpid/branches/java-config-and-management/qpid/java: ./ amqp-1-0-client-jms/ amqp-1-0-client/ amqp-1-0-common/ bdbstore/src/test/java/org/apache/qpid/server/store/berke
Propchange: qpid/branches/java-config-and-management/qpid/java/test-profiles/Excludes -- Merged /qpid/trunk/qpid/java/test-profiles/Excludes:r1349192-1349442,1349444-1349530,1349532-1350722 Propchange: qpid/branches/java-config-and-management/qpid/java/test-profiles/JavaBDBExcludes -- Merged /qpid/trunk/qpid/java/test-profiles/JavaBDBExcludes:r1349192-1349442,1349444-1349530,1349532-1350722 Propchange: qpid/branches/java-config-and-management/qpid/java/test-profiles/JavaExcludes -- Merged /qpid/trunk/qpid/java/test-profiles/JavaExcludes:r1349192-1349442,1349444-1349530,1349532-1350722 Propchange: qpid/branches/java-config-and-management/qpid/java/test-profiles/JavaPre010Excludes -- Merged /qpid/trunk/qpid/java/test-profiles/JavaPre010Excludes:r1349192-1349442,1349444-1349530,1349532-1350722 Propchange: qpid/branches/java-config-and-management/qpid/java/test-profiles/JavaTransientExcludes -- Merged /qpid/trunk/qpid/java/test-profiles/JavaTransientExcludes:r1349192-1349442,1349444-1349530,1349532-1350722 Propchange: qpid/branches/java-config-and-management/qpid/java/test-profiles/XAExcludes -- Merged /qpid/trunk/qpid/java/test-profiles/XAExcludes:r1349192-1349442,1349444-1349530,1349532-1350722 Propchange: qpid/branches/java-config-and-management/qpid/java/test-profiles/cpp.async.testprofile -- Merged /qpid/trunk/qpid/java/test-profiles/cpp.async.testprofile:r1349192-1349442,1349444-1349530,1349532-1350722 Propchange: qpid/branches/java-config-and-management/qpid/java/test-profiles/cpp.cluster.testprofile -- Merged /qpid/trunk/qpid/java/test-profiles/cpp.cluster.testprofile:r1349192-1349442,1349444-1349530,1349532-1350722 Propchange: qpid/branches/java-config-and-management/qpid/java/test-profiles/cpp.noprefetch.testprofile -- Merged /qpid/trunk/qpid/java/test-profiles/cpp.noprefetch.testprofile:r1349192-1349442,1349444-1349530,1349532-1350722 Propchange: qpid/branches/java-config-and-management/qpid/java/test-profiles/cpp.ssl.excludes -- Merged /qpid/trunk/qpid/java/test-profiles/cpp.ssl.excludes:r1349192-1349442,1349444-1349530,1349532-1350722 Propchange: qpid/branches/java-config-and-management/qpid/java/test-profiles/cpp.ssl.testprofile -- Merged /qpid/trunk/qpid/java/test-profiles/cpp.ssl.testprofile:r1349192-1349442,1349444-1349530,1349532-1350722 Propchange: qpid/branches/java-config-and-management/qpid/java/test-profiles/cpp.testprofile -- Merged /qpid/trunk/qpid/java/test-profiles/cpp.testprofile:r1349192-1349442,1349444-1349530,1349532-1350722 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:r1349192-1349442,1349444-1349530,1349532-1350722 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:r1349192-1349442,1349444-1349530,1349532-1350722 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:r1349192-1349442,1349444-1349530,1349532-1350722 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:r1349192-1349442,1349444-1349530,1349532-1350722 Propchange: qpid/branches/java-config-and-management/qpid/java/test-profiles/java-mms-spawn.0-10.testprofile -- Merged
svn commit: r1354590 - in /qpid/branches/java-config-and-management/qpid/java: ./ amqp-1-0-client-jms/ amqp-1-0-client/ amqp-1-0-common/ bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/
Author: robbie Date: Wed Jun 27 15:49:08 2012 New Revision: 1354590 URL: http://svn.apache.org/viewvc?rev=1354590view=rev Log: merge changes from trunk up to r1353860 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/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/HATestClusterCreator.java 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/virtualhost/ (props changed) 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/systests/src/main/java
svn commit: r1354874 [14/14] - in /qpid/branches/java-config-and-management: ./ qpid/ qpid/bin/ qpid/cpp/ qpid/cpp/bindings/ qpid/cpp/bindings/qmf/ruby/ qpid/cpp/bindings/qpid/python/ qpid/cpp/binding
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:r1339579-1339789 Propchange: qpid/branches/java-config-and-management/qpid/java/management/eclipse-plugin/src/ -- Merged /qpid/trunk/qpid/java/management/eclipse-plugin/src:r1339579-1339789 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:r1339579-1339789 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:r1339579-1339789 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:r1339579-1339789 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:r1339579-1339789 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:r1339579-1339789 Propchange: qpid/branches/java-config-and-management/qpid/packaging/windows/ -- Merged /qpid/trunk/qpid/packaging/windows:r1300143-1349442,1349444-1349530,1349532-1353860 Propchange: qpid/branches/java-config-and-management/qpid/python/ -- Merged /qpid/trunk/qpid/python:r1300143-1349442,1349444-1349530,1349532-1353860 Propchange: qpid/branches/java-config-and-management/qpid/python/examples/api/spout -- Merged /qpid/trunk/qpid/python/examples/api/spout:r1300143-1349442,1349444-1349530,1349532-1353860 Propchange: qpid/branches/java-config-and-management/qpid/python/qpid/concurrency.py -- Merged /qpid/trunk/qpid/python/qpid/concurrency.py:r1300143-1349442,1349444-1349530,1349532-1353860 Modified: qpid/branches/java-config-and-management/qpid/python/qpid/connection.py URL: http://svn.apache.org/viewvc/qpid/branches/java-config-and-management/qpid/python/qpid/connection.py?rev=1354874r1=1354873r2=1354874view=diff == --- qpid/branches/java-config-and-management/qpid/python/qpid/connection.py (original) +++ qpid/branches/java-config-and-management/qpid/python/qpid/connection.py Thu Jun 28 09:14:52 2012 @@ -170,6 +170,10 @@ class Connection(Framer): if not status: self.detach_all() break + # When we do not use SSL transport, we get periodic + # spurious timeout events on the socket. When using SSL, + # these events show up as timeout *errors*. Both should be + # ignored unless we have aborted. except socket.timeout: if self.aborted(): self.close_code = (None, connection timed out) @@ -178,9 +182,12 @@ class Connection(Framer): else: continue except socket.error, e: -self.close_code = (None, str(e)) -self.detach_all() -break +if self.aborted() or str(e) != The read operation timed out: + self.close_code = (None, str(e)) + self.detach_all() + break +
svn commit: r1354912 - /qpid/trunk/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/HAClusterWhiteboxTest.java
Author: robbie
Date: Thu Jun 28 11:00:08 2012
New Revision: 1354912
URL: http://svn.apache.org/viewvc?rev=1354912view=rev
Log:
QPID-4080: close initial connections after use rather than allowing them to
fail over after we no longer need them, which causes them to sporadically
expose QPID-4086 during teardown.
Modified:
qpid/trunk/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/HAClusterWhiteboxTest.java
Modified:
qpid/trunk/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/HAClusterWhiteboxTest.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/HAClusterWhiteboxTest.java?rev=1354912r1=1354911r2=1354912view=diff
==
---
qpid/trunk/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/HAClusterWhiteboxTest.java
(original)
+++
qpid/trunk/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/HAClusterWhiteboxTest.java
Thu Jun 28 11:00:08 2012
@@ -20,7 +20,6 @@
package org.apache.qpid.server.store.berkeleydb;
import java.io.File;
-import java.io.IOException;
import java.util.Set;
import javax.jms.Connection;
@@ -35,8 +34,6 @@ import org.apache.log4j.Logger;
import org.apache.qpid.test.utils.QpidBrokerTestCase;
import org.apache.qpid.url.URLSyntaxException;
-import com.sleepycat.je.rep.ReplicationConfig;
-
/**
* The HA white box tests test the BDB cluster where the test retains the
knowledge of the
* individual test nodes. It uses this knowledge to examine the nodes to
ensure that they
@@ -103,7 +100,7 @@ public class HAClusterWhiteboxTest exten
final Connection initialConnection = getConnectionToNodeInCluster();
assertNotNull(initialConnection);
-killConnectionBroker(initialConnection);
+closeConnectionAndKillBroker(initialConnection);
final Connection subsequentConnection = getConnectionToNodeInCluster();
assertNotNull(subsequentConnection);
@@ -119,7 +116,7 @@ public class HAClusterWhiteboxTest exten
final Connection initialConnection = getConnectionToNodeInCluster();
assertNotNull(initialConnection);
-killConnectionBroker(initialConnection);
+closeConnectionAndKillBroker(initialConnection);
final Connection subsequentConnection = getConnectionToNodeInCluster();
assertNotNull(subsequentConnection);
@@ -139,6 +136,7 @@ public class HAClusterWhiteboxTest exten
assertNotNull(connection);
final int brokerPortNumber =
_clusterCreator.getBrokerPortNumberFromConnection(connection);
+connection.close();
_clusterCreator.stopNode(brokerPortNumber);
_clusterCreator.startNode(brokerPortNumber);
@@ -157,7 +155,7 @@ public class HAClusterWhiteboxTest exten
populateBrokerWithData(initialConnection, inbuiltExchangeQueueUrl,
customExchangeQueueUrl);
-killConnectionBroker(initialConnection);
+closeConnectionAndKillBroker(initialConnection);
final Connection subsequentConnection = getConnectionToNodeInCluster();
@@ -229,10 +227,11 @@ public class HAClusterWhiteboxTest exten
return connection;
}
-private void killConnectionBroker(final Connection initialConnection)
throws IOException,
-InterruptedException
+private void closeConnectionAndKillBroker(final Connection
initialConnection) throws Exception
{
final int initialPortNumber =
_clusterCreator.getBrokerPortNumberFromConnection(initialConnection);
+initialConnection.close();
+
killBroker(initialPortNumber); // kill awaits the death of the child
}
-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
svn commit: r1354981 - in /qpid/branches/java-config-and-management: ./ qpid/ qpid/cpp/docs/api/ qpid/cpp/examples/old_api/tradedemo/ qpid/cpp/include/qmf/ qpid/cpp/include/qmf/engine/ qpid/cpp/src/ q
Author: robbie Date: Thu Jun 28 12:38:36 2012 New Revision: 1354981 URL: http://svn.apache.org/viewvc?rev=1354981view=rev Log: merge changes from trunk up to r1354912 Added: qpid/branches/java-config-and-management/qpid/cpp/include/qmf/BrokerImportExport.h - copied unchanged from r1354912, qpid/trunk/qpid/cpp/include/qmf/BrokerImportExport.h Removed: qpid/branches/java-config-and-management/qpid/cpp/src/qmf/BrokerImportExport.h Modified: qpid/branches/java-config-and-management/ (props changed) qpid/branches/java-config-and-management/qpid/ (props changed) qpid/branches/java-config-and-management/qpid/cpp/docs/api/ (props changed) qpid/branches/java-config-and-management/qpid/cpp/examples/old_api/tradedemo/tradedemo_topic_publisher.vcproj (props changed) qpid/branches/java-config-and-management/qpid/cpp/include/qmf/engine/Agent.h (props changed) qpid/branches/java-config-and-management/qpid/cpp/include/qmf/engine/Console.h (props changed) qpid/branches/java-config-and-management/qpid/cpp/src/ (props changed) qpid/branches/java-config-and-management/qpid/cpp/src/CMakeLists.txt (contents, props changed) qpid/branches/java-config-and-management/qpid/cpp/src/qmf.mk qpid/branches/java-config-and-management/qpid/cpp/src/qmf/engine/Agent.cpp (props changed) qpid/branches/java-config-and-management/qpid/cpp/src/qpid/acl/ (props changed) qpid/branches/java-config-and-management/qpid/cpp/src/qpid/broker/ (props changed) qpid/branches/java-config-and-management/qpid/cpp/src/qpid/broker/windows/SaslAuthenticator.cpp qpid/branches/java-config-and-management/qpid/cpp/src/qpid/cluster/UpdateClient.cpp (props changed) qpid/branches/java-config-and-management/qpid/cpp/src/qpid/cluster/UpdateClient.h (props changed) qpid/branches/java-config-and-management/qpid/cpp/src/qpid/management/ManagementAgent.cpp (props changed) qpid/branches/java-config-and-management/qpid/cpp/src/qpid/management/ManagementAgent.h (props changed) qpid/branches/java-config-and-management/qpid/cpp/src/tests/ (props changed) qpid/branches/java-config-and-management/qpid/cpp/src/tests/cluster_tests.py (props changed) qpid/branches/java-config-and-management/qpid/cpp/src/tests/ha_tests.py qpid/branches/java-config-and-management/qpid/cpp/src/tests/logging.cpp 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/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/HAClusterWhiteboxTest.java 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/transport/ServerSession.java qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/txn/DtxBranch.java qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/txn/DtxRegistry.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/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
svn commit: r1355039 - in /qpid/branches/java-config-and-management/qpid/java: build.deps ivy.retrieve.xml
Author: robbie Date: Thu Jun 28 15:10:47 2012 New Revision: 1355039 URL: http://svn.apache.org/viewvc?rev=1355039view=rev Log: NO-JIRA: remove unused dependency Modified: qpid/branches/java-config-and-management/qpid/java/build.deps qpid/branches/java-config-and-management/qpid/java/ivy.retrieve.xml Modified: qpid/branches/java-config-and-management/qpid/java/build.deps URL: http://svn.apache.org/viewvc/qpid/branches/java-config-and-management/qpid/java/build.deps?rev=1355039r1=1355038r2=1355039view=diff == --- qpid/branches/java-config-and-management/qpid/java/build.deps (original) +++ qpid/branches/java-config-and-management/qpid/java/build.deps Thu Jun 28 15:10:47 2012 @@ -34,7 +34,6 @@ geronimo-jta=lib/required/geronimo-jta_1 geronimo-kernel=lib/required/geronimo-kernel-2.2.1.jar geronimo-openejb=lib/required/geronimo-ejb_3.0_spec-1.0.1.jar geronimo-servlet=lib/required/geronimo-servlet_2.5_spec-1.2.jar -#servlet-api=lib/required/geronimo-servlet_3.0_spec-1.0.jar junit=lib/required/junit-3.8.1.jar mockito-all=lib/required/mockito-all-1.9.0.jar Modified: qpid/branches/java-config-and-management/qpid/java/ivy.retrieve.xml URL: http://svn.apache.org/viewvc/qpid/branches/java-config-and-management/qpid/java/ivy.retrieve.xml?rev=1355039r1=1355038r2=1355039view=diff == --- qpid/branches/java-config-and-management/qpid/java/ivy.retrieve.xml (original) +++ qpid/branches/java-config-and-management/qpid/java/ivy.retrieve.xml Thu Jun 28 15:10:47 2012 @@ -48,7 +48,6 @@ dependency org=org.apache.geronimo.specs name=geronimo-jms_1.1_spec rev=1.0 transitive=false/ dependency org=org.apache.geronimo.specs name=geronimo-jta_1.1_spec rev=1.1.1 transitive=false/ dependency org=org.apache.geronimo.specs name=geronimo-servlet_2.5_spec rev=1.2 transitive=false/ -dependency org=org.apache.geronimo.specs name=geronimo-servlet_3.0_spec rev=1.0 transitive=false/ dependency org=com.google.code.gson name=gson rev=2.0 transitive=false/ dependency org=org.codehaus.jackson name=jackson-core-asl rev=1.9.0 transitive=false/ dependency org=org.codehaus.jackson name=jackson-mapper-asl rev=1.9.0 transitive=false/ - To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
svn commit: r1355072 [16/16] - in /qpid/trunk/qpid/java: ./ bdbstore/ bdbstore/jmx/ bdbstore/jmx/src/ bdbstore/jmx/src/main/ bdbstore/jmx/src/main/java/ bdbstore/jmx/src/main/java/org/ bdbstore/jmx/sr
Modified: qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedQueue.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedQueue.java?rev=1355072r1=1355071r2=1355072view=diff == --- qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedQueue.java (original) +++ qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedQueue.java Thu Jun 28 16:46:12 2012 @@ -63,9 +63,14 @@ public interface ManagedQueue String ENCODING = Encoding; String CONTENT = Content; ListString VIEW_MSG_CONTENT_COMPOSITE_ITEM_NAMES_DESC = Collections.unmodifiableList(Arrays.asList(MSG_AMQ_ID, MIME, ENCODING, CONTENT)); - + +/** Date/time format used for message expiration and message timestamp formatting */ +String JMSTIMESTAMP_DATETIME_FORMAT = MM-dd-yy HH:mm:ss.SSS z; + //Individual attribute name constants static final String ATTR_NAME = Name; +static final String ATTR_DESCRIPTION = Description; +static final String ATTR_QUEUE_TYPE = QueueType; static final String ATTR_OWNER = Owner; static final String ATTR_MAX_MSG_AGE = MaximumMessageAge; static final String ATTR_MAX_MSG_COUNT = MaximumMessageCount; @@ -92,6 +97,8 @@ public interface ManagedQueue new HashSetString( Arrays.asList( ATTR_NAME, +ATTR_QUEUE_TYPE, +ATTR_DESCRIPTION, ATTR_OWNER, ATTR_MAX_MSG_AGE, ATTR_MAX_MSG_COUNT, @@ -235,7 +242,7 @@ public interface ManagedQueue * Tells the maximum number of messages that can be stored in the queue. * This is useful in setting the notifications or taking required * action is the number of message increase this limit. - * @return maximum muber of message allowed to be stored in the queue. + * @return maximum nuumber of message allowed to be stored in the queue. * @throws IOException */ Long getMaximumMessageCount() throws IOException; @@ -287,13 +294,33 @@ public interface ManagedQueue */ @MBeanAttribute(name=Capacity, description=The flow control Capacity (Bytes) of the queue) void setCapacity(Long value) throws IOException, IllegalArgumentException; + +/** + * Gets the free text queue description. + * @since Qpid JMX API 2.5 + */ +String getDescription(); + +/** + * Sets the free text queue description. + * @since Qpid JMX API 2.5 + */ +@MBeanAttribute(name=Description, description=Free text description of the queue) +void setDescription(String string); + +/** + * Gets the queue type + * @since Qpid JMX API 2.5 + */ +@MBeanAttribute(name=QueueType, description=Type of the queue e.g. standard, priority, etc) +String getQueueType(); /** * Returns the current flow control FlowResumeCapacity of the queue in bytes. * * @since Qpid JMX API 1.6 * @return Capacity below which flow resumes in bytes - * @throws IOException + * @throws IOExceptionm */ Long getFlowResumeCapacity() throws IOException; @@ -332,7 +359,7 @@ public interface ManagedQueue * @since Qpid JMX API 2.0 * @param exclusive the capacity in bytes * @throws IOException - * @throws JMException + * @throws JMException */ @MBeanAttribute(name=Exclusive, description=Whether the queue is Exclusive or not) void setExclusive(boolean exclusive) throws IOException, JMException; @@ -341,10 +368,13 @@ public interface ManagedQueue * Sets the Alternate Exchange for the queue, for use in dead letter queue functionality. * * @since Qpid JMX API 2.4 - * @param the name of the exchange to use. Specifying null or the empty string will clear the alternate exchange. + * @param exchangeName the name of the exchange to use. Specifying null or the empty string will clear the + * alternate exchange. * @throws IOException + * @throws JMException */ -void setAlternateExchange(String exchangeName) throws IOException; +@MBeanAttribute(name=AlternateExchange, description=Alternate exchange for the queue) +void setAlternateExchange(String exchangeName) throws IOException, JMException; /** * Returns the name of the Alternate Exchange for the queue, or null if there isn't one. @@ -353,7 +383,6 @@ public interface ManagedQueue * @return the name of the Alternate Exchange for the queue, or null if there isn't one * @throws IOException
svn commit: r1355130 - in /qpid/trunk/qpid/java: ./ bdbstore/jmx/src/main/resources/META-INF/ bdbstore/jmx/src/main/resources/META-INF/services/ bdbstore/jmx/src/main/resources/services/
Author: robbie
Date: Thu Jun 28 19:44:05 2012
New Revision: 1355130
URL: http://svn.apache.org/viewvc?rev=1355130view=rev
Log:
QPID-4093: work around ancient versions of Ant lacking 'erroronmissingdir' in
the metainf element of the jar task by using copying to compose the files for
addition to META-INF.
Also prevents general files in the modules resources dir that arent intended
for inclusion in META-INF from being included there.
Added:
qpid/trunk/qpid/java/bdbstore/jmx/src/main/resources/META-INF/
qpid/trunk/qpid/java/bdbstore/jmx/src/main/resources/META-INF/services/
qpid/trunk/qpid/java/bdbstore/jmx/src/main/resources/META-INF/services/org.apache.qpid.server.jmx.MBeanProvider
- copied, changed from r1355072,
qpid/trunk/qpid/java/bdbstore/jmx/src/main/resources/services/org.apache.qpid.server.jmx.MBeanProvider
Removed:
qpid/trunk/qpid/java/bdbstore/jmx/src/main/resources/services/org.apache.qpid.server.jmx.MBeanProvider
Modified:
qpid/trunk/qpid/java/module.xml
Copied:
qpid/trunk/qpid/java/bdbstore/jmx/src/main/resources/META-INF/services/org.apache.qpid.server.jmx.MBeanProvider
(from r1355072,
qpid/trunk/qpid/java/bdbstore/jmx/src/main/resources/services/org.apache.qpid.server.jmx.MBeanProvider)
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/bdbstore/jmx/src/main/resources/META-INF/services/org.apache.qpid.server.jmx.MBeanProvider?p2=qpid/trunk/qpid/java/bdbstore/jmx/src/main/resources/META-INF/services/org.apache.qpid.server.jmx.MBeanProviderp1=qpid/trunk/qpid/java/bdbstore/jmx/src/main/resources/services/org.apache.qpid.server.jmx.MBeanProviderr1=1355072r2=1355130rev=1355130view=diff
==
(empty)
Modified: qpid/trunk/qpid/java/module.xml
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/module.xml?rev=1355130r1=1355129r2=1355130view=diff
==
--- qpid/trunk/qpid/java/module.xml (original)
+++ qpid/trunk/qpid/java/module.xml Thu Jun 28 19:44:05 2012
@@ -52,10 +52,11 @@
property name=module.results location=${build.results}/${module}/
property name=module.failed location=${module.results}/FAILED/
property name=module.src location=src/main/java/
- property name=module.src.resources location=src/main/resources/
property name=module.test.src location=src/test/java/
property name=module.bin location=bin/
property name=module.etc location=etc/
+ property name=module.src.resources.metainf
location=src/main/resources/META-INF/
+ property name=module.metainf location=${module.build}/META-INF/
property name=module.namever
value=${project.name}-${module.name}-${project.version}/
property name=module.namever.osgi
value=${project.name}-${module.name}_${project.version}.0.osgi/
@@ -83,6 +84,7 @@
available property=module.test.src.exists file=${module.test.src}/
available property=module.etc.exists file=${module.etc}/
available property=module.bin.exists file=${module.bin}/
+ available property=module.src.resources.metainf.exists
file=${module.src.resources.metainf}/
property name=module.source.jar
location=${build.lib}/${project.name}-${module.name}-${project.version}-sources.jar/
@@ -443,21 +445,31 @@
target name=postbuild description=run after a build/
target name=build
depends=jar,jar-tests,jar-sources,libs,copy-bin,copy-etc,postbuild
description=compile and copy resources into build tree/
- target name=jar.manifest depends=compile if=module.manifest
+
+ target name=jar.manifest depends=compile, copy-module-metainf
if=module.manifest
jar destfile=${module.jar} basedir=${module.classes}
manifest=${module.manifest}
- metainf dir=${project.root}/resources/ /
- metainf dir=${module.src.resources} erroronmissingdir=false/
+ metainf dir=${module.metainf} /
/jar
/target
- target name=jar.nomanifest depends=compile unless=module.manifest
-
+ target name=jar.nomanifest depends=compile, copy-module-metainf
unless=module.manifest
jar destfile=${module.jar} basedir=${module.classes}
- metainf dir=${project.root}/resources/ /
- metainf dir=${module.src.resources} erroronmissingdir=false/
+ metainf dir=${module.metainf} /
/jar
/target
+ target name=copy-module-metainf depends=copy-metainf-resources
if=module.src.resources.metainf.exists
+copy todir=${module.metainf} failonerror=true
+fileset dir=${module.src.resources.metainf}/
+/copy
+ /target
+
+ target name=copy-metainf-resources
+copy todir=${module.metainf} failonerror=true
+fileset dir=${project.root}/resources//
+/copy
+ /target
+
target name=jar depends=jar.manifest,jar.nomanifest description=create
jar/
target name=jar-tests depends=compile-tests description=create unit
test jar
svn commit: r1355145 - /qpid/trunk/qpid/java/test-profiles/CPPExcludes
Author: robbie Date: Thu Jun 28 20:15:43 2012 New Revision: 1355145 URL: http://svn.apache.org/viewvc?rev=1355145view=rev Log: QPID-3998, QPID-3999, QPID-4093: exclude missed Java-only test class from the CPP profile Modified: qpid/trunk/qpid/java/test-profiles/CPPExcludes Modified: qpid/trunk/qpid/java/test-profiles/CPPExcludes URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/test-profiles/CPPExcludes?rev=1355145r1=1355144r2=1355145view=diff == --- qpid/trunk/qpid/java/test-profiles/CPPExcludes (original) +++ qpid/trunk/qpid/java/test-profiles/CPPExcludes Thu Jun 28 20:15:43 2012 @@ -157,7 +157,7 @@ org.apache.qpid.test.unit.transacted.Tra // Java broker only org.apache.qpid.server.SupportedProtocolVersionsTest#* - +org.apache.qpid.server.stats.StatisticsReportingTest#* // QPID-3133: On 0-10, the exception listener is currently not invoked when reconnection fails to occurs. org.apache.qpid.server.failover.FailoverMethodTest#* - To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
svn commit: r1355313 - in /qpid/trunk/qpid/java/broker-plugins/management/src/main/java/resources/images: ./ qpid-logo.png
Author: robbie Date: Fri Jun 29 11:09:43 2012 New Revision: 1355313 URL: http://svn.apache.org/viewvc?rev=1355313view=rev Log: QPID-3999: add logo image which was missed during previous commit Added: qpid/trunk/qpid/java/broker-plugins/management/src/main/java/resources/images/ qpid/trunk/qpid/java/broker-plugins/management/src/main/java/resources/images/qpid-logo.png Added: qpid/trunk/qpid/java/broker-plugins/management/src/main/java/resources/images/qpid-logo.png URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management/src/main/java/resources/images/qpid-logo.png?rev=1355313view=auto == Files qpid/trunk/qpid/java/broker-plugins/management/src/main/java/resources/images/qpid-logo.png (added) and qpid/trunk/qpid/java/broker-plugins/management/src/main/java/resources/images/qpid-logo.png Fri Jun 29 11:09:43 2012 differ - To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
svn commit: r1355314 - /qpid/trunk/qpid/java/lib/poms/
Author: robbie Date: Fri Jun 29 11:09:59 2012 New Revision: 1355314 URL: http://svn.apache.org/viewvc?rev=1355314view=rev Log: QPID-3998: add dependency stubs for jetty components to fix the POM generation, ensuring the same set of deps gets composed as those that end up in the broker binary package Added: qpid/trunk/qpid/java/lib/poms/geronimo-servlet_2.5_spec-1.2.xml qpid/trunk/qpid/java/lib/poms/jetty-continuation-7.6.3.v20120416.xml qpid/trunk/qpid/java/lib/poms/jetty-http-7.6.3.v20120416.xml qpid/trunk/qpid/java/lib/poms/jetty-io-7.6.3.v20120416.xml qpid/trunk/qpid/java/lib/poms/jetty-security-7.6.3.v20120416.xml qpid/trunk/qpid/java/lib/poms/jetty-server-7.6.3.v20120416.xml qpid/trunk/qpid/java/lib/poms/jetty-servlet-7.6.3.v20120416.xml qpid/trunk/qpid/java/lib/poms/jetty-util-7.6.3.v20120416.xml qpid/trunk/qpid/java/lib/poms/jetty-websocket-7.6.3.v20120416.xml Added: qpid/trunk/qpid/java/lib/poms/geronimo-servlet_2.5_spec-1.2.xml URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/lib/poms/geronimo-servlet_2.5_spec-1.2.xml?rev=1355314view=auto == --- qpid/trunk/qpid/java/lib/poms/geronimo-servlet_2.5_spec-1.2.xml (added) +++ qpid/trunk/qpid/java/lib/poms/geronimo-servlet_2.5_spec-1.2.xml Fri Jun 29 11:09:59 2012 @@ -0,0 +1,22 @@ +?xml version=1.0? +!-- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the License); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an AS IS BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +-- +dep + groupIdorg.apache.geronimo.specs/groupId + artifactIdgeronimo-servlet_2.5_spec/artifactId + version1.2/version +/dep Added: qpid/trunk/qpid/java/lib/poms/jetty-continuation-7.6.3.v20120416.xml URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/lib/poms/jetty-continuation-7.6.3.v20120416.xml?rev=1355314view=auto == --- qpid/trunk/qpid/java/lib/poms/jetty-continuation-7.6.3.v20120416.xml (added) +++ qpid/trunk/qpid/java/lib/poms/jetty-continuation-7.6.3.v20120416.xml Fri Jun 29 11:09:59 2012 @@ -0,0 +1,22 @@ +?xml version=1.0? +!-- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the License); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an AS IS BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +-- +dep + groupIdorg.eclipse.jetty/groupId + artifactIdjetty-continuation/artifactId + version7.6.3.v20120416/version +/dep Added: qpid/trunk/qpid/java/lib/poms/jetty-http-7.6.3.v20120416.xml URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/lib/poms/jetty-http-7.6.3.v20120416.xml?rev=1355314view=auto == --- qpid/trunk/qpid/java/lib/poms/jetty-http-7.6.3.v20120416.xml (added) +++ qpid/trunk/qpid/java/lib/poms/jetty-http-7.6.3.v20120416.xml Fri Jun 29 11:09:59 2012 @@ -0,0 +1,28 @@ +?xml version=1.0? +!-- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the License); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an AS IS BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions
svn commit: r1355390 - in /qpid/trunk/qpid/java: bdbstore/jmx/build.xml broker-plugins/access-control/build.xml broker-plugins/firewall/build.xml broker-plugins/jmx/build.xml broker-plugins/management
Author: robbie
Date: Fri Jun 29 13:53:50 2012
New Revision: 1355390
URL: http://svn.apache.org/viewvc?rev=1355390view=rev
Log:
QPID-4098: generate maven release artifacts for the broker plugins
Modified:
qpid/trunk/qpid/java/bdbstore/jmx/build.xml
qpid/trunk/qpid/java/broker-plugins/access-control/build.xml
qpid/trunk/qpid/java/broker-plugins/firewall/build.xml
qpid/trunk/qpid/java/broker-plugins/jmx/build.xml
qpid/trunk/qpid/java/broker-plugins/management/build.xml
Modified: qpid/trunk/qpid/java/bdbstore/jmx/build.xml
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/bdbstore/jmx/build.xml?rev=1355390r1=1355389r2=1355390view=diff
==
--- qpid/trunk/qpid/java/bdbstore/jmx/build.xml (original)
+++ qpid/trunk/qpid/java/bdbstore/jmx/build.xml Fri Jun 29 13:53:50 2012
@@ -17,11 +17,12 @@
- under the License.
--
project name=bdbstore-jmx default=build
-property name=module.depends value=common broker broker-plugins
broker-plugins/jmx management/common bdbstore /
+property name=module.depends value=common broker broker-plugins/jmx
management/common bdbstore /
property name=module.test.depends value=test broker/test common/test
management/common client systests bdbstore/test /
property name=module.manifest value=MANIFEST.MF /
property name=module.plugin value=true /
+property name=module.genpom value=true/
import file=../../module.xml /
Modified: qpid/trunk/qpid/java/broker-plugins/access-control/build.xml
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/access-control/build.xml?rev=1355390r1=1355389r2=1355390view=diff
==
--- qpid/trunk/qpid/java/broker-plugins/access-control/build.xml (original)
+++ qpid/trunk/qpid/java/broker-plugins/access-control/build.xml Fri Jun 29
13:53:50 2012
@@ -17,11 +17,14 @@
- under the License.
--
project name=Qpid Broker-Plugins Access Control default=build
-property name=module.depends value=common broker broker-plugins /
+property name=module.depends value=common broker /
property name=module.test.depends value=test common/test broker/test
management/common systests /
property name=module.manifest value=MANIFEST.MF /
property name=module.plugin value=true /
+property name=module.genpom value=true/
+
+property name=broker-plugins-access-control.libs value=/
import file=../../module.xml /
Modified: qpid/trunk/qpid/java/broker-plugins/firewall/build.xml
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/firewall/build.xml?rev=1355390r1=1355389r2=1355390view=diff
==
--- qpid/trunk/qpid/java/broker-plugins/firewall/build.xml (original)
+++ qpid/trunk/qpid/java/broker-plugins/firewall/build.xml Fri Jun 29 13:53:50
2012
@@ -17,11 +17,14 @@
- under the License.
--
project name=Qpid Broker-Plugins Firewall default=build
-property name=module.depends value=common broker broker-plugins /
+property name=module.depends value=common broker /
property name=module.test.depends value=test broker/test common/test
management/common /
property name=module.manifest value=MANIFEST.MF /
property name=module.plugin value=true /
+property name=module.genpom value=true/
+
+property name=broker-plugins-firewall.libs value=/
import file=../../module.xml /
Modified: qpid/trunk/qpid/java/broker-plugins/jmx/build.xml
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/jmx/build.xml?rev=1355390r1=1355389r2=1355390view=diff
==
--- qpid/trunk/qpid/java/broker-plugins/jmx/build.xml (original)
+++ qpid/trunk/qpid/java/broker-plugins/jmx/build.xml Fri Jun 29 13:53:50 2012
@@ -31,11 +31,14 @@
/or
/condition
-property name=module.depends value=common broker broker-plugins
broker-plugins-jmx management/common /
+property name=module.depends value=common broker management/common /
property name=module.test.depends value=systests test broker/test
common/test management/common client ${systests.optional.depends} /
property name=module.manifest value=MANIFEST.MF /
property name=module.plugin value=true /
+property name=module.genpom value=true/
+
+property name=broker-plugins-jmx.libs value=/
import file=../../module.xml /
Modified: qpid/trunk/qpid/java/broker-plugins/management/build.xml
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management/build.xml?rev=1355390r1=1355389r2=1355390view=diff
==
--- qpid/trunk/qpid/java/broker-plugins/management/build.xml (original)
+++ qpid/trunk/qpid/java/broker-plugins/management/build.xml
svn commit: r1355391 - in /qpid/trunk/qpid/java: bdbstore/jmx/build.xml broker-plugins/access-control/build.xml broker-plugins/firewall/build.xml broker-plugins/jmx/build.xml broker-plugins/management
Author: robbie Date: Fri Jun 29 13:54:07 2012 New Revision: 1355391 URL: http://svn.apache.org/viewvc?rev=1355391view=rev Log: QPID-4098: update POM generation for the plugins to mark the dependencies as being provided (by the broker itself) at runtime Modified: qpid/trunk/qpid/java/bdbstore/jmx/build.xml qpid/trunk/qpid/java/broker-plugins/access-control/build.xml qpid/trunk/qpid/java/broker-plugins/firewall/build.xml qpid/trunk/qpid/java/broker-plugins/jmx/build.xml qpid/trunk/qpid/java/broker-plugins/management/build.xml qpid/trunk/qpid/java/genpom Modified: qpid/trunk/qpid/java/bdbstore/jmx/build.xml URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/bdbstore/jmx/build.xml?rev=1355391r1=1355390r2=1355391view=diff == --- qpid/trunk/qpid/java/bdbstore/jmx/build.xml (original) +++ qpid/trunk/qpid/java/bdbstore/jmx/build.xml Fri Jun 29 13:54:07 2012 @@ -23,6 +23,7 @@ property name=module.manifest value=MANIFEST.MF / property name=module.plugin value=true / property name=module.genpom value=true/ +property name=module.genpom.args value=-Sqpid-common=provided -Sqpid-broker=provided -Sqpid-broker-plugins-jmx=provided -Sqpid-management-common=provided -Sqpid-bdbstore=provided -Sje=provided/ import file=../../module.xml / Modified: qpid/trunk/qpid/java/broker-plugins/access-control/build.xml URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/access-control/build.xml?rev=1355391r1=1355390r2=1355391view=diff == --- qpid/trunk/qpid/java/broker-plugins/access-control/build.xml (original) +++ qpid/trunk/qpid/java/broker-plugins/access-control/build.xml Fri Jun 29 13:54:07 2012 @@ -23,6 +23,7 @@ property name=module.manifest value=MANIFEST.MF / property name=module.plugin value=true / property name=module.genpom value=true/ +property name=module.genpom.args value=-Sqpid-common=provided -Sqpid-broker=provided/ property name=broker-plugins-access-control.libs value=/ Modified: qpid/trunk/qpid/java/broker-plugins/firewall/build.xml URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/firewall/build.xml?rev=1355391r1=1355390r2=1355391view=diff == --- qpid/trunk/qpid/java/broker-plugins/firewall/build.xml (original) +++ qpid/trunk/qpid/java/broker-plugins/firewall/build.xml Fri Jun 29 13:54:07 2012 @@ -23,6 +23,7 @@ property name=module.manifest value=MANIFEST.MF / property name=module.plugin value=true / property name=module.genpom value=true/ +property name=module.genpom.args value=-Sqpid-common=provided -Sqpid-broker=provided/ property name=broker-plugins-firewall.libs value=/ Modified: qpid/trunk/qpid/java/broker-plugins/jmx/build.xml URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/jmx/build.xml?rev=1355391r1=1355390r2=1355391view=diff == --- qpid/trunk/qpid/java/broker-plugins/jmx/build.xml (original) +++ qpid/trunk/qpid/java/broker-plugins/jmx/build.xml Fri Jun 29 13:54:07 2012 @@ -37,6 +37,7 @@ property name=module.manifest value=MANIFEST.MF / property name=module.plugin value=true / property name=module.genpom value=true/ +property name=module.genpom.args value=-Sqpid-common=provided -Sqpid-broker=provided -Sqpid-management-common=provided/ property name=broker-plugins-jmx.libs value=/ Modified: qpid/trunk/qpid/java/broker-plugins/management/build.xml URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management/build.xml?rev=1355391r1=1355390r2=1355391view=diff == --- qpid/trunk/qpid/java/broker-plugins/management/build.xml (original) +++ qpid/trunk/qpid/java/broker-plugins/management/build.xml Fri Jun 29 13:54:07 2012 @@ -23,6 +23,7 @@ property name=module.manifest value=MANIFEST.MF / property name=module.plugin value=true / property name=module.genpom value=true/ +property name=module.genpom.args value=-Sqpid-common=provided -Sqpid-broker=provided/ property name=broker-plugins-management.libs value=/ Modified: qpid/trunk/qpid/java/genpom URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/genpom?rev=1355391r1=1355390r2=1355391view=diff == --- qpid/trunk/qpid/java/genpom (original) +++ qpid/trunk/qpid/java/genpom Fri Jun 29 13:54:07 2012 @@ -111,8 +111,10 @@ for module in module_depends: groupId%s/groupId artifactId%s/artifactId version%s/version + scope%s/scope /dependency - % (opts.group, artifactId, opts.version)) + % (opts.group, artifactId, opts.version
svn commit: r1355994 - in /qpid/trunk/qpid/java: bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/ bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/upgrade/ broker/
Author: robbie
Date: Sun Jul 1 20:00:59 2012
New Revision: 1355994
URL: http://svn.apache.org/viewvc?rev=1355994view=rev
Log:
QPID-3923: update ID generation to be consistent across all
queues/exchanges/bindings as opposed to deterministic for some and not for
others
Added:
qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/model/
qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/model/UUIDGeneratorTest.java
Modified:
qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom5To6.java
qpid/trunk/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom5To6Test.java
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/binding/BindingFactory.java
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/QueueDeclareHandler.java
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/model/UUIDGenerator.java
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/ExchangeAdapter.java
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/VirtualHostAdapter.java
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v1_0/SendingLink_1_0.java
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v1_0/Session_1_0.java
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/AMQQueueFactory.java
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ServerSessionDelegate.java
Modified:
qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom5To6.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom5To6.java?rev=1355994r1=1355993r2=1355994view=diff
==
---
qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom5To6.java
(original)
+++
qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/upgrade/UpgradeFrom5To6.java
Sun Jul 1 20:00:59 2012
@@ -383,7 +383,7 @@ public class UpgradeFrom5To6 extends Abs
for (int i = 0; i newDequeues.length; i++)
{
OldRecordImpl dequeue = oldDequeues[i];
-UUID id =
UUIDGenerator.generateUUID(dequeue.getQueueName(), virtualHostName);
+UUID id =
UUIDGenerator.generateQueueUUID(dequeue.getQueueName(), virtualHostName);
newDequeues[i] = new NewRecordImpl(id,
dequeue.getMessageNumber());
}
}
@@ -393,7 +393,7 @@ public class UpgradeFrom5To6 extends Abs
for (int i = 0; i newEnqueues.length; i++)
{
OldRecordImpl enqueue = oldEnqueues[i];
-UUID id =
UUIDGenerator.generateUUID(enqueue.getQueueName(), virtualHostName);
+UUID id =
UUIDGenerator.generateQueueUUID(enqueue.getQueueName(), virtualHostName);
newEnqueues[i] = new NewRecordImpl(id,
enqueue.getMessageNumber());
}
}
@@ -423,7 +423,7 @@ public class UpgradeFrom5To6 extends Abs
Transaction transaction, DatabaseEntry key,
DatabaseEntry value)
{
OldQueueEntryKey oldEntryRecord =
oldBinding.entryToObject(key);
-UUID queueId =
UUIDGenerator.generateUUID(oldEntryRecord.getQueueName().asString(),
virtualHostName);
+UUID queueId =
UUIDGenerator.generateQueueUUID(oldEntryRecord.getQueueName().asString(),
virtualHostName);
NewQueueEntryKey newEntryRecord = new
NewQueueEntryKey(queueId, oldEntryRecord.getMessageId());
DatabaseEntry newKey = new DatabaseEntry();
@@ -458,7 +458,7 @@ public class UpgradeFrom5To6 extends Abs
String routingKey =
bindingRecord.getRoutingKey().asString();
FieldTable arguments = bindingRecord.getArguments();
-UUID bindingId = UUIDGenerator.generateUUID();
+UUID bindingId =
UUIDGenerator.generateBindingUUID(exchangeName, queueName, routingKey,
virtualHostName);
UpgradeConfiguredObjectRecord configuredObject =
createBindingConfiguredObjectRecord(exchangeName, queueName,
routingKey, arguments, virtualHostName);
storeConfiguredObjectEntry(configuredObjectsDatabase,
bindingId, configuredObject, transaction);
@@ -492,7 +492,7 @@ public class UpgradeFrom5To6 extends Abs
svn commit: r1358279 - in /qpid/trunk/qpid/java: build.deps perftests/build.xml
Author: robbie
Date: Fri Jul 6 15:50:09 2012
New Revision: 1358279
URL: http://svn.apache.org/viewvc?rev=1358279view=rev
Log:
QPID-4114: add a release-bin target to perftests so we can create a deployable
tar.gz file.
Applied patch from Philip Harvey p...@philharveyonline.com
Modified:
qpid/trunk/qpid/java/build.deps
qpid/trunk/qpid/java/perftests/build.xml
Modified: qpid/trunk/qpid/java/build.deps
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/build.deps?rev=1358279r1=1358278r2=1358279view=diff
==
--- qpid/trunk/qpid/java/build.deps (original)
+++ qpid/trunk/qpid/java/build.deps Fri Jul 6 15:50:09 2012
@@ -84,7 +84,7 @@ broker-plugins.libs=${felix.libs} ${log4
test.libs=${slf4j-log4j} ${log4j} ${junit} ${slf4j-api} ${mockito-all}
-perftests.libs=${geronimo-jms} ${slf4j-api} ${commons-collections}
${commons-beanutils-core} ${commons-lang} ${gson-all}
+perftests.libs=${geronimo-jms} ${slf4j-api} ${log4j} ${slf4j-log4j}
${commons-collections} ${commons-beanutils-core} ${commons-lang} ${gson-all}
ibm-icu=lib/com.ibm.icu_3.8.1.v20080530.jar
ecl-core-jface=lib/org.eclipse.jface_3.4.1.M20080827-2000.jar
Modified: qpid/trunk/qpid/java/perftests/build.xml
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/build.xml?rev=1358279r1=1358278r2=1358279view=diff
==
--- qpid/trunk/qpid/java/perftests/build.xml (original)
+++ qpid/trunk/qpid/java/perftests/build.xml Fri Jul 6 15:50:09 2012
@@ -43,4 +43,13 @@
property name=qpid.logging.level value=-Damqj.logging.level=warn/
property name=log4j.config
value=-Dlog4j.configuration=perftests.log4j/
property name=properties value=perftests.properties/
+
+target name=release-bin depends=release-bin-tasks/
+
+target name=copy-etc-release description=override target from
module.xml to set flatten=false
+copy todir=${module.release}/etc failonerror=false
flatten=false
+fileset dir=${module.etc}/
+/copy
+/target
+
/project
-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
svn commit: r1358281 - in /qpid/trunk/qpid/java/perftests/src: main/java/org/apache/qpid/disttest/controller/config/ParticipantConfig.java test/java/org/apache/qpid/disttest/controller/config/Particip
Author: robbie
Date: Fri Jul 6 15:52:42 2012
New Revision: 1358281
URL: http://svn.apache.org/viewvc?rev=1358281view=rev
Log:
QPID-4113: added support for a system property to override all participant
durations.
Applied patch from Philip Harvey p...@philharveyonline.com
Added:
qpid/trunk/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/controller/config/ParticipantConfigTest.java
Modified:
qpid/trunk/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/controller/config/ParticipantConfig.java
Modified:
qpid/trunk/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/controller/config/ParticipantConfig.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/controller/config/ParticipantConfig.java?rev=1358281r1=1358280r2=1358281view=diff
==
---
qpid/trunk/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/controller/config/ParticipantConfig.java
(original)
+++
qpid/trunk/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/controller/config/ParticipantConfig.java
Fri Jul 6 15:52:42 2012
@@ -18,10 +18,20 @@
*/
package org.apache.qpid.disttest.controller.config;
+import org.apache.commons.lang.ObjectUtils;
import org.apache.qpid.disttest.message.CreateParticpantCommand;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public abstract class ParticipantConfig
{
+private static final Logger LOGGER =
LoggerFactory.getLogger(ParticipantConfig.class);
+
+public static final String DURATION_OVERRIDE_SYSTEM_PROPERTY =
qpid.disttest.duration;
+
+/** we cache the overridden duration so that we only compute and - more
importantly - log it once */
+private static Long cachedOverriddenDuration;
+
private String _destinationName;
private long _numberOfMessages;
private String _name;
@@ -58,7 +68,34 @@ public abstract class ParticipantConfig
createParticipantCommand.setDestinationName(_destinationName);
createParticipantCommand.setNumberOfMessages(_numberOfMessages);
createParticipantCommand.setBatchSize(_batchSize);
-createParticipantCommand.setMaximumDuration(_maximumDuration);
+
+Long maximumDuration =
(Long)ObjectUtils.defaultIfNull(getOverriddenDuration(), _maximumDuration);
+createParticipantCommand.setMaximumDuration(maximumDuration);
}
+private Long getOverriddenDuration()
+{
+if(cachedOverriddenDuration != null)
+{
+return cachedOverriddenDuration;
+}
+
+String overriddenDurationString =
System.getProperty(DURATION_OVERRIDE_SYSTEM_PROPERTY);
+if(overriddenDurationString != null)
+{
+try
+{
+long overriddenDuration =
Long.valueOf(overriddenDurationString);
+LOGGER.info(Applied overridden maximum duration +
overriddenDuration);
+cachedOverriddenDuration = overriddenDuration;
+return overriddenDuration;
+}
+catch (NumberFormatException e)
+{
+LOGGER.error(Couldn't parse overridden duration +
overriddenDurationString, e);
+}
+}
+
+return null;
+}
}
\ No newline at end of file
Added:
qpid/trunk/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/controller/config/ParticipantConfigTest.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/controller/config/ParticipantConfigTest.java?rev=1358281view=auto
==
---
qpid/trunk/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/controller/config/ParticipantConfigTest.java
(added)
+++
qpid/trunk/qpid/java/perftests/src/test/java/org/apache/qpid/disttest/controller/config/ParticipantConfigTest.java
Fri Jul 6 15:52:42 2012
@@ -0,0 +1,43 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * License); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.qpid.disttest.controller.config;
+
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+
+import
svn commit: r1358395 - /qpid/trunk/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/controller/config/ParticipantConfig.java
Author: robbie
Date: Fri Jul 6 20:08:36 2012
New Revision: 1358395
URL: http://svn.apache.org/viewvc?rev=1358395view=rev
Log:
QPID-4113: no longer caching duration override because it broke inter-test
isolation.
Applied patch from Philip Harvey p...@philharveyonline.com
Modified:
qpid/trunk/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/controller/config/ParticipantConfig.java
Modified:
qpid/trunk/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/controller/config/ParticipantConfig.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/controller/config/ParticipantConfig.java?rev=1358395r1=1358394r2=1358395view=diff
==
---
qpid/trunk/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/controller/config/ParticipantConfig.java
(original)
+++
qpid/trunk/qpid/java/perftests/src/main/java/org/apache/qpid/disttest/controller/config/ParticipantConfig.java
Fri Jul 6 20:08:36 2012
@@ -29,8 +29,8 @@ public abstract class ParticipantConfig
public static final String DURATION_OVERRIDE_SYSTEM_PROPERTY =
qpid.disttest.duration;
-/** we cache the overridden duration so that we only compute and - more
importantly - log it once */
-private static Long cachedOverriddenDuration;
+/** used to ensure we only log about the overridden duration once */
+private boolean _alreadyLoggedAboutOverriddenDuration;
private String _destinationName;
private long _numberOfMessages;
@@ -75,19 +75,19 @@ public abstract class ParticipantConfig
private Long getOverriddenDuration()
{
-if(cachedOverriddenDuration != null)
-{
-return cachedOverriddenDuration;
-}
-
String overriddenDurationString =
System.getProperty(DURATION_OVERRIDE_SYSTEM_PROPERTY);
if(overriddenDurationString != null)
{
try
{
long overriddenDuration =
Long.valueOf(overriddenDurationString);
-LOGGER.info(Applied overridden maximum duration +
overriddenDuration);
-cachedOverriddenDuration = overriddenDuration;
+
+if(!_alreadyLoggedAboutOverriddenDuration)
+{
+LOGGER.info(Applied overridden maximum duration +
overriddenDuration);
+_alreadyLoggedAboutOverriddenDuration = true;
+}
+
return overriddenDuration;
}
catch (NumberFormatException e)
-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
svn commit: r1358758 - in /qpid/trunk/qpid/java/broker/src: main/java/org/apache/qpid/server/model/ main/java/org/apache/qpid/server/model/adapter/ main/java/org/apache/qpid/server/transport/ test/jav
Author: robbie
Date: Sun Jul 8 15:29:04 2012
New Revision: 1358758
URL: http://svn.apache.org/viewvc?rev=1358758view=rev
Log:
QPID-3923, QPID-3998: update the Adapter layer to either use UUIDGenerator
itself, or use the ID directly from the entity being adapted
Modified:
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/model/UUIDGenerator.java
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/AbstractAdapter.java
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/AuthenticationProviderAdapter.java
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/BindingAdapter.java
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/BrokerAdapter.java
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/ConnectionAdapter.java
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/ConsumerAdapter.java
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/ExchangeAdapter.java
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/HTTPPortAdapter.java
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/PortAdapter.java
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/QueueAdapter.java
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/SessionAdapter.java
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/VirtualHostAdapter.java
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/VirtualHostAliasAdapter.java
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ServerConnection.java
qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/model/UUIDGeneratorTest.java
Modified:
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/model/UUIDGenerator.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/model/UUIDGenerator.java?rev=1358758r1=1358757r2=1358758view=diff
==
---
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/model/UUIDGenerator.java
(original)
+++
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/model/UUIDGenerator.java
Sun Jul 8 15:29:04 2012
@@ -30,29 +30,51 @@ public class UUIDGenerator
return UUID.randomUUID();
}
+private static UUID createUUID(String objectType, String... names)
+{
+StringBuilder sb = new StringBuilder();
+sb.append(objectType);
+
+for(String name : names)
+{
+sb.append(/).append(name);
+}
+
+return UUID.nameUUIDFromBytes(sb.toString().getBytes());
+}
+
public static UUID generateExchangeUUID(String exchangeName, String
virtualHostName)
{
-return generateUUID(exchangeName, virtualHostName,
Exchange.class.getName());
+return createUUID(Exchange.class.getName(), virtualHostName,
exchangeName);
}
public static UUID generateQueueUUID(String queueName, String
virtualHostName)
{
-return generateUUID(queueName, virtualHostName, Queue.class.getName());
+return createUUID(Queue.class.getName(), virtualHostName, queueName);
}
-private static UUID generateUUID(String objectName, String
virtualHostName, String objectType)
+public static UUID generateBindingUUID(String exchangeName, String
queueName, String bindingKey, String virtualHostName)
{
-StringBuilder sb = new StringBuilder();
-sb.append(virtualHostName).append(objectName).append(objectType);
+return createUUID(Binding.class.getName(), virtualHostName,
exchangeName, queueName, bindingKey);
+}
-return UUID.nameUUIDFromBytes(sb.toString().getBytes());
+public static UUID generateUserUUID(String authenticationProviderName,
String userName)
+{
+return createUUID(User.class.getName(), authenticationProviderName,
userName);
}
-public static UUID generateBindingUUID(String exchangeName, String
queueName, String bindingKey, String virtualHostName)
+public static UUID generateVhostUUID(String virtualHostName)
{
-StringBuilder sb = new StringBuilder();
-
sb.append(exchangeName).append(queueName).append(bindingKey).append(virtualHostName).append(Binding.class.getName());
+return createUUID(VirtualHost.class.getName(), virtualHostName);
+}
-return UUID.nameUUIDFromBytes(sb.toString().getBytes());
+public static UUID generateVhostAliasUUID(String virtualHostName, String
portName)
+{
+return createUUID(VirtualHostAlias.class.getName(), virtualHostName,
portName);
+}
+
+public static UUID
svn commit: r1359916 - /qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/txn/DtxBranch.java
Author: robbie
Date: Tue Jul 10 21:48:32 2012
New Revision: 1359916
URL: http://svn.apache.org/viewvc?rev=1359916view=rev
Log:
NO-JIRA: add some logging around the DtxBranch timeout functionality to aid
debugging
Modified:
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/txn/DtxBranch.java
Modified:
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/txn/DtxBranch.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/txn/DtxBranch.java?rev=1359916r1=1359915r2=1359916view=diff
==
---
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/txn/DtxBranch.java
(original)
+++
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/txn/DtxBranch.java
Tue Jul 10 21:48:32 2012
@@ -98,10 +98,27 @@ public class DtxBranch
public void setTimeout(long timeout)
{
+if(_logger.isDebugEnabled())
+{
+_logger.debug(Setting timeout to + timeout + s for DtxBranch
+ _xid);
+}
+
if(_timeoutFuture != null)
{
-_timeoutFuture.cancel(false);
+if(_logger.isDebugEnabled())
+{
+_logger.debug(Attempting to cancel previous timeout task
future for DtxBranch + _xid);
+}
+
+boolean succeeded = _timeoutFuture.cancel(false);
+
+if(_logger.isDebugEnabled())
+{
+_logger.debug(Cancelling previous timeout task + (succeeded
? succeeded : failed)
+ + for DtxBranch + _xid);
+}
}
+
_timeout = timeout;
_expiration = timeout == 0 ? 0 : System.currentTimeMillis() + (1000 *
timeout);
@@ -111,10 +128,23 @@ public class DtxBranch
}
else
{
-_timeoutFuture = _vhost.scheduleTask(1000*_timeout, new Runnable()
+long delay = 1000*_timeout;
+
+if(_logger.isDebugEnabled())
+{
+_logger.debug(Scheduling timeout and rollback after +
delay/1000 +
+ s for DtxBranch + _xid);
+}
+
+_timeoutFuture = _vhost.scheduleTask(delay, new Runnable()
{
public void run()
{
+if(_logger.isDebugEnabled())
+{
+_logger.debug(Timing out DtxBranch + _xid);
+}
+
setState(State.TIMEDOUT);
try
{
@@ -122,8 +152,7 @@ public class DtxBranch
}
catch (AMQStoreException e)
{
-_logger.error(Unexpected error when attempting to
rollback XA transaction (+
- _xid + ) due to timeout, e);
+_logger.error(Unexpected error when attempting to
rollback DtxBranch + _xid + due to timeout, e);
throw new RuntimeException(e);
}
}
@@ -199,6 +228,10 @@ public class DtxBranch
public void prepare() throws AMQStoreException
{
+if(_logger.isDebugEnabled())
+{
+_logger.debug(Performing prepare for DtxBranch + _xid);
+}
Transaction txn = _store.newTransaction();
txn.recordXid(_xid.getFormat(),
@@ -213,12 +246,27 @@ public class DtxBranch
public synchronized void rollback() throws AMQStoreException
{
+if(_logger.isDebugEnabled())
+{
+_logger.debug(Performing rollback for DtxBranch + _xid);
+}
+
if(_timeoutFuture != null)
{
-_timeoutFuture.cancel(false);
+if(_logger.isDebugEnabled())
+{
+_logger.debug(Attempting to cancel previous timeout task
future for DtxBranch + _xid);
+}
+
+boolean succeeded = _timeoutFuture.cancel(false);
_timeoutFuture = null;
-}
+if(_logger.isDebugEnabled())
+{
+_logger.debug(Cancelling previous timeout task + (succeeded
? succeeded : failed)
+ + for DtxBranch + _xid);
+}
+}
if(_transaction != null)
{
@@ -240,10 +288,26 @@ public class DtxBranch
public void commit() throws AMQStoreException
{
+if(_logger.isDebugEnabled())
+{
+_logger.debug(Performing commit for DtxBranch + _xid);
+}
+
if(_timeoutFuture != null)
{
-_timeoutFuture.cancel(false);
+if(_logger.isDebugEnabled())
+{
+_logger.debug(Attempting to cancel previous timeout task
future for DtxBranch + _xid);
+}
+
+boolean succeeded = _timeoutFuture.cancel(false
svn commit: r1360120 - /qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/SaslServlet.java
Author: robbie
Date: Wed Jul 11 11:00:14 2012
New Revision: 1360120
URL: http://svn.apache.org/viewvc?rev=1360120view=rev
Log:
QPID-3998, QPID-3999: get the user name from HttpServletRequest#getRemoteUser()
in SaslServlet
Applied patch from Oleksandr Rudyy oru...@gmail.com
Modified:
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/SaslServlet.java
Modified:
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/SaslServlet.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/SaslServlet.java?rev=1360120r1=1360119r2=1360120view=diff
==
---
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/SaslServlet.java
(original)
+++
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/SaslServlet.java
Wed Jul 11 11:00:14 2012
@@ -91,6 +91,10 @@ public class SaslServlet extends Abstrac
final Principal principal =
subject.getPrincipals().iterator().next();
outputObject.put(user, principal.getName());
}
+else if (request.getRemoteUser() != null)
+{
+outputObject.put(user, request.getRemoteUser());
+}
outputObject.put(mechanisms, (Object) mechanisms);
-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
svn commit: r1361105 - in /qpid/branches/0.18/qpid/java: ./ broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/SaslServlet.java
Author: robbie
Date: Fri Jul 13 08:50:08 2012
New Revision: 1361105
URL: http://svn.apache.org/viewvc?rev=1361105view=rev
Log:
QPID-3998, QPID-3999: get the user name from HttpServletRequest#getRemoteUser()
in SaslServlet
Applied patch from Oleksandr Rudyy oru...@gmail.com
Merged from trunk r1360120
Modified:
qpid/branches/0.18/qpid/java/ (props changed)
qpid/branches/0.18/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/SaslServlet.java
Propchange: qpid/branches/0.18/qpid/java/
--
Merged /qpid/trunk/qpid/java:r1360120
Modified:
qpid/branches/0.18/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/SaslServlet.java
URL:
http://svn.apache.org/viewvc/qpid/branches/0.18/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/SaslServlet.java?rev=1361105r1=1361104r2=1361105view=diff
==
---
qpid/branches/0.18/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/SaslServlet.java
(original)
+++
qpid/branches/0.18/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/SaslServlet.java
Fri Jul 13 08:50:08 2012
@@ -91,6 +91,10 @@ public class SaslServlet extends Abstrac
final Principal principal =
subject.getPrincipals().iterator().next();
outputObject.put(user, principal.getName());
}
+else if (request.getRemoteUser() != null)
+{
+outputObject.put(user, request.getRemoteUser());
+}
outputObject.put(mechanisms, (Object) mechanisms);
-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
svn commit: r1361113 - in /qpid/branches/0.18/qpid/java: ./ broker-plugins/management-http/ broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/ broker-p
Author: robbie Date: Fri Jul 13 09:06:17 2012 New Revision: 1361113 URL: http://svn.apache.org/viewvc?rev=1361113view=rev Log: QPID-3998, QPID-3999: System tests for Rest API, small fixups for the adapters and web ui. Applied patch from Oleksandr Rudyy oru...@gmail.com Merged from trunk r1360121 Added: qpid/branches/0.18/qpid/java/broker-plugins/management-http/src/test/ - copied from r1360121, qpid/trunk/qpid/java/broker-plugins/management-http/src/test/ qpid/branches/0.18/qpid/java/broker-plugins/management-http/src/test/java/ - copied from r1360121, qpid/trunk/qpid/java/broker-plugins/management-http/src/test/java/ qpid/branches/0.18/qpid/java/broker-plugins/management-http/src/test/java/org/ - copied from r1360121, qpid/trunk/qpid/java/broker-plugins/management-http/src/test/java/org/ qpid/branches/0.18/qpid/java/broker-plugins/management-http/src/test/java/org/apache/ - copied from r1360121, qpid/trunk/qpid/java/broker-plugins/management-http/src/test/java/org/apache/ qpid/branches/0.18/qpid/java/broker-plugins/management-http/src/test/java/org/apache/qpid/ - copied from r1360121, qpid/trunk/qpid/java/broker-plugins/management-http/src/test/java/org/apache/qpid/ qpid/branches/0.18/qpid/java/broker-plugins/management-http/src/test/java/org/apache/qpid/server/ - copied from r1360121, qpid/trunk/qpid/java/broker-plugins/management-http/src/test/java/org/apache/qpid/server/ qpid/branches/0.18/qpid/java/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/ - copied from r1360121, qpid/trunk/qpid/java/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/ qpid/branches/0.18/qpid/java/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/ - copied from r1360121, qpid/trunk/qpid/java/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/ qpid/branches/0.18/qpid/java/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/servlet/ - copied from r1360121, qpid/trunk/qpid/java/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/servlet/ qpid/branches/0.18/qpid/java/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/servlet/rest/ - copied from r1360121, qpid/trunk/qpid/java/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/servlet/rest/ qpid/branches/0.18/qpid/java/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/servlet/rest/Asserts.java - copied unchanged from r1360121, qpid/trunk/qpid/java/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/servlet/rest/Asserts.java qpid/branches/0.18/qpid/java/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/servlet/rest/AuthenticationProviderRestTest.java - copied unchanged from r1360121, qpid/trunk/qpid/java/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/servlet/rest/AuthenticationProviderRestTest.java qpid/branches/0.18/qpid/java/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/servlet/rest/BindingRestTest.java - copied unchanged from r1360121, qpid/trunk/qpid/java/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/servlet/rest/BindingRestTest.java qpid/branches/0.18/qpid/java/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/servlet/rest/BrokerRestTest.java - copied unchanged from r1360121, qpid/trunk/qpid/java/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/servlet/rest/BrokerRestTest.java qpid/branches/0.18/qpid/java/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/servlet/rest/ConnectionRestTest.java - copied unchanged from r1360121, qpid/trunk/qpid/java/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/servlet/rest/ConnectionRestTest.java qpid/branches/0.18/qpid/java/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/servlet/rest/ExchangeRestTest.java - copied unchanged from r1360121, qpid/trunk/qpid/java/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/servlet/rest/ExchangeRestTest.java qpid/branches/0.18/qpid/java/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/servlet/rest/LogRecordsRestTest.java - copied unchanged from r1360121, qpid/trunk/qpid/java/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/servlet/rest/LogRecordsRestTest.java qpid/branches/0.18/qpid/java/broker-plugins/management-http/src/test/java
svn commit: r1361239 - in /qpid/trunk/qpid/java: broker-plugins/management-http/ broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/ broker-plugins/management-http/s
Author: robbie Date: Fri Jul 13 14:37:23 2012 New Revision: 1361239 URL: http://svn.apache.org/viewvc?rev=1361239view=rev Log: QPID-3998: Add HTTPS support for the REST management interface Applied patch from Oleksandr Rudyy oru...@gmail.com Modified: qpid/trunk/qpid/java/broker-plugins/management-http/MANIFEST.MF qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/Management.java qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/ManagementActivator.java qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/AbstractServlet.java qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/LogRecordsServlet.java qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/MessageContentServlet.java qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/MessageServlet.java qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/RestServlet.java qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/SaslServlet.java qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/StructureServlet.java qpid/trunk/qpid/java/broker/etc/config.xml qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/model/Protocol.java qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/BrokerAdapter.java qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/HTTPPortAdapter.java qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/plugins/OsgiSystemPackages.properties qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/registry/ApplicationRegistry.java qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/registry/IApplicationRegistry.java Modified: qpid/trunk/qpid/java/broker-plugins/management-http/MANIFEST.MF URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/MANIFEST.MF?rev=1361239r1=1361238r2=1361239view=diff == --- qpid/trunk/qpid/java/broker-plugins/management-http/MANIFEST.MF (original) +++ qpid/trunk/qpid/java/broker-plugins/management-http/MANIFEST.MF Fri Jul 13 14:37:23 2012 @@ -38,11 +38,14 @@ Import-Package: org.apache.qpid, org.apache.qpid.util, org.eclipse.jetty.server;version=7.6.3, org.eclipse.jetty.server.session;version=7.6.3, + org.eclipse.jetty.server.ssl;version=7.6.3, + org.eclipse.jetty.server.nio;version=7.6.3, org.eclipse.jetty.security;version=7.6.3, org.eclipse.jetty.http;version=7.6.3, org.eclipse.jetty.io;version=7.6.3, org.eclipse.jetty.io.nio;version=7.6.3, org.eclipse.jetty.servlet;version=7.6.3, + org.eclipse.jetty.util.ssl;version=7.6.3, org.apache.commons.codec;version=1.3.0, org.apache.commons.codec.binary;version=1.3.0, org.apache.commons.configuration;version=1.0.0, Modified: qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/Management.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/Management.java?rev=1361239r1=1361238r2=1361239view=diff == --- qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/Management.java (original) +++ qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/Management.java Fri Jul 13 14:37:23 2012 @@ -20,22 +20,46 @@ */ package org.apache.qpid.server.management.plugin; -import java.net.InetSocketAddress; -import java.net.SocketAddress; +import java.io.File; +import java.io.FileNotFoundException; +import java.io.IOException; import java.util.ArrayList; import java.util.Collection; + +import org.apache.commons.configuration.ConfigurationException; import org.apache.log4j.Logger; import org.apache.qpid.server.management.plugin.servlet.DefinedFileServlet; import org.apache.qpid.server.management.plugin.servlet.FileServlet; import org.apache.qpid.server.management.plugin.servlet.api.ExchangesServlet; import org.apache.qpid.server.management.plugin.servlet.api.VhostsServlet; -import org.apache.qpid.server.management.plugin.servlet.rest.*; -import
svn commit: r1363297 - in /qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources: js/qpid/management/Queue.js showQueue.html
Author: robbie
Date: Thu Jul 19 11:23:15 2012
New Revision: 1363297
URL: http://svn.apache.org/viewvc?rev=1363297view=rev
Log:
QPID-4150: Display the name of queue type key(sortKey,priorities,lvqKey) and
its value
Applied patch from Oleksandr Rudyy oru...@gmail.com
Modified:
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Queue.js
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/showQueue.html
Modified:
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Queue.js
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Queue.js?rev=1363297r1=1363296r2=1363297view=diff
==
---
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Queue.js
(original)
+++
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Queue.js
Thu Jul 19 11:23:15 2012
@@ -232,6 +232,18 @@ define([dojo/_base/xhr,
updater.remove( this.queueUpdater );
};
+ var queueTypeKeys = {
+ priority: priorities,
+ lvq: lvqKey,
+ sorted: sortKey
+ };
+
+ var queueTypeKeyNames = {
+ priority: Number of priorities,
+ lvq: LVQ key,
+ sorted: Sort key
+ };
+
function QueueUpdater(containerNode, queueObj, controller)
{
var that = this;
@@ -252,6 +264,8 @@ define([dojo/_base/xhr,
durable,
lifetimePolicy,
type,
+ keyName,
+ keyValue,
alertRepeatGap,
alertRepeatGapUnits,
alertThresholdMessageAge,
@@ -325,8 +339,17 @@ define([dojo/_base/xhr,
this.unacknowledgedMessages.innerHTML =
this.queueData[unacknowledgedMessages];
bytesDepth = formatter.formatBytes(
this.queueData[unacknowledgedBytes] );
this.unacknowledgedBytes.innerHTML = ( + bytesDepth.value;
- this.unacknowledgedBytesUnits.innerHTML = bytesDepth.units + )
-
+ this.unacknowledgedBytesUnits.innerHTML = bytesDepth.units +
);
+ if (this.queueData.type == standard)
+ {
+ this.keyName.style.display = none;
+ this.keyValue.style.display = none;
+ }
+ else
+ {
+ this.keyName.innerHTML =
queueTypeKeyNames[this.queueData.type] + :;
+ this.keyValue.innerHTML =
this.queueData[queueTypeKeys[this.queueData.type]];
+ }
};
Modified:
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/showQueue.html
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/showQueue.html?rev=1363297r1=1363296r2=1363297view=diff
==
---
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/showQueue.html
(original)
+++
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/showQueue.html
Thu Jul 19 11:23:15 2012
@@ -48,6 +48,8 @@
span class=bytesOutRateUnits style=position:absolute; right: 0em;
width: 3em/span
br/
span style=Type:/spanspan style=position:absolute; left:6em
class=type/span
+span style=position:absolute; left:26em class=keyName/span
+span style=position:absolute; right:1em class=keyValue/span
br/
br/
div data-dojo-type=dijit.TitlePane data-dojo-props=title: 'Bindings'
-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
svn commit: r1363298 - in /qpid/trunk/qpid/java: broker-plugins/management-http/src/main/java/resources/ broker-plugins/management-http/src/main/java/resources/js/qpid/common/ broker-plugins/managemen
Author: robbie
Date: Thu Jul 19 11:23:49 2012
New Revision: 1363298
URL: http://svn.apache.org/viewvc?rev=1363298view=rev
Log:
QPID-4149: Add REST functionality to delete exchanges, queues and bindings, add
queue/exchange/binding delete operations into web UI
Applied patch from Oleksandr Rudyy oru...@gmail.com and myself.
Modified:
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/common/util.js
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Exchange.js
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Queue.js
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/VirtualHost.js
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addExchange.js
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/showExchange.html
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/showQueue.html
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/showVirtualHost.html
qpid/trunk/qpid/java/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/servlet/rest/BindingRestTest.java
qpid/trunk/qpid/java/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/servlet/rest/VirtualHostRestTest.java
qpid/trunk/qpid/java/broker-plugins/management-jmx/src/test/java/org/apache/qpid/systest/management/jmx/BrokerManagementTest.java
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/DefaultExchangeRegistry.java
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/ExchangeRegistry.java
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/model/VirtualHost.java
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/BindingAdapter.java
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/ExchangeAdapter.java
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/QueueAdapter.java
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/VirtualHostAdapter.java
Modified:
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/common/util.js
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/common/util.js?rev=1363298r1=1363297r2=1363298view=diff
==
---
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/common/util.js
(original)
+++
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/common/util.js
Thu Jul 19 11:23:49 2012
@@ -18,8 +18,8 @@
* under the License.
*
*/
-define([],
- function () {
+define([dojo/_base/xhr],
+ function (xhr) {
var util = {};
if (Array.isArray) {
util.isArray = function (object) {
@@ -52,5 +52,69 @@ define([],
}
}
};
+
+ util.isReservedExchangeName = function(exchangeName)
+ {
+ return exchangeName == null || exchangeName == ||
default == exchangeName || exchangeName.indexOf(amq.) == 0 ||
exchangeName.indexOf(qpid.) == 0;
+ };
+
+ util.deleteGridSelections = function(updater, gridName, url,
confirmationMessageStart)
+ {
+ var grid = updater[gridName].grid;
+ var data = grid.selection.getSelected();
+ if(data.length)
+ {
+ var confirmationMessage = null;
+ if (data.length == 1)
+ {
+ confirmationMessage = confirmationMessageStart + ' +
data[0].name + '?;
+ }
+ else
+ {
+ var names = '';
+ for(var i = 0; idata.length; i++)
+ {
+ if (names)
+ {
+ names += ', ';
+ }
+ names += \+ data[i].name + \;
+ }
+ confirmationMessage = confirmationMessageStart + s +
names + ?;
+ }
+ if(confirm(confirmationMessage))
+ {
+ var i, queryParam;
+ for(i = 0; idata.length; i++)
+ {
+ if(queryParam)
+ {
+ queryParam += ;
+ }
+ else
svn commit: r1363307 - /qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/addExchange.html
Author: robbie Date: Thu Jul 19 11:57:53 2012 New Revision: 1363307 URL: http://svn.apache.org/viewvc?rev=1363307view=rev Log: QPID-4151: Add validation for reserved exchange names into addExchange dialog in web management UI Applied patch from Oleksandr Rudyy oru...@gmail.com Modified: qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/addExchange.html Modified: qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/addExchange.html URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/addExchange.html?rev=1363307r1=1363306r2=1363307view=diff == --- qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/addExchange.html (original) +++ qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/addExchange.html Thu Jul 19 11:57:53 2012 @@ -25,7 +25,8 @@ tr td valign=topstrongExchange Name*: /strong/td tdinput type=text required=true name=name id=formAddExchange.name placeholder=Exchange Name -dojoType=dijit.form.ValidationTextBox missingMessage=A name must be supplied //td +dojoType=dijit.form.ValidationTextBox missingMessage=A name must be supplied + data-dojo-props=regExp:'^(?!qpid\.|amq\.|\\default\\).*$', invalidMessage:'Reserved exchange name!'//td /tr tr td valign=topstrongDurable? /strong/td - To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
svn commit: r1363413 - in /qpid/trunk/qpid/java: broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/servlet/rest/ test-profiles/test_resources/ssl/
Author: robbie
Date: Thu Jul 19 16:22:02 2012
New Revision: 1363413
URL: http://svn.apache.org/viewvc?rev=1363413view=rev
Log:
QPID-3998: Add HTTPS test for REST interfaces
Applied patch from Oleksandr Rudyy oru...@gmail.com
Added:
qpid/trunk/qpid/java/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/servlet/rest/BrokerRestHttpsTest.java
Modified:
qpid/trunk/qpid/java/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/servlet/rest/QpidRestTestCase.java
qpid/trunk/qpid/java/test-profiles/test_resources/ssl/java_broker_keystore.jks
Added:
qpid/trunk/qpid/java/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/servlet/rest/BrokerRestHttpsTest.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/servlet/rest/BrokerRestHttpsTest.java?rev=1363413view=auto
==
---
qpid/trunk/qpid/java/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/servlet/rest/BrokerRestHttpsTest.java
(added)
+++
qpid/trunk/qpid/java/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/servlet/rest/BrokerRestHttpsTest.java
Thu Jul 19 16:22:02 2012
@@ -0,0 +1,86 @@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * License); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+package org.apache.qpid.server.management.plugin.servlet.rest;
+
+import java.io.IOException;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.util.Map;
+
+import javax.net.ssl.HttpsURLConnection;
+import javax.net.ssl.SSLSocketFactory;
+
+import org.apache.commons.configuration.ConfigurationException;
+import org.apache.qpid.server.model.Broker;
+
+public class BrokerRestHttpsTest extends QpidRestTestCase
+{
+private static final String TRUSTSTORE =
test-profiles/test_resources/ssl/java_client_truststore.jks;
+private static final String TRUSTSTORE_PASSWORD = password;
+
+@Override
+public void setUp() throws Exception
+{
+setSystemProperty(javax.net.debug, ssl);
+super.setUp();
+setSystemProperty(javax.net.ssl.trustStore, TRUSTSTORE);
+setSystemProperty(javax.net.ssl.trustStorePassword,
TRUSTSTORE_PASSWORD);
+}
+
+@Override
+protected void customizeConfiguration() throws ConfigurationException,
IOException
+{
+setConfigurationProperty(management.enabled, true);
+setConfigurationProperty(management.http.enabled, false);
+setConfigurationProperty(management.https.enabled, true);
+setConfigurationProperty(management.https.port,
Integer.toString(getHttpPort()));
+}
+
+@Override
+protected String getHostName()
+{
+return localhost;
+}
+
+@Override
+protected String getProtocol()
+{
+return https;
+}
+
+@Override
+protected HttpURLConnection openManagementConection(String path) throws
IOException
+{
+URL url = getManagementURL(path);
+HttpURLConnection httpCon = (HttpURLConnection) url.openConnection();
+((HttpsURLConnection) httpCon).setSSLSocketFactory((SSLSocketFactory)
SSLSocketFactory.getDefault());
+httpCon.setDoOutput(true);
+return httpCon;
+}
+
+public void testGetWithHttps() throws Exception
+{
+MapString, Object brokerDetails =
getJsonAsSingletonList(/rest/broker);
+
+Asserts.assertAttributesPresent(brokerDetails,
Broker.AVAILABLE_ATTRIBUTES, Broker.BYTES_RETAINED,
+Broker.PROCESS_PID, Broker.SUPPORTED_STORE_TYPES,
Broker.CREATED, Broker.TIME_TO_LIVE, Broker.UPDATED);
+}
+}
Modified:
qpid/trunk/qpid/java/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/servlet/rest/QpidRestTestCase.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/servlet/rest/QpidRestTestCase.java?rev=1363413r1=1363412r2=1363413view=diff
svn commit: r1363813 - in /qpid/branches/0.18/qpid/java: ./ amqp-1-0-client-jms/ amqp-1-0-client/ amqp-1-0-common/ broker-plugins/management-http/src/main/java/resources/ broker/ broker/bin/ broker/sr
Author: robbie Date: Fri Jul 20 14:50:57 2012 New Revision: 1363813 URL: http://svn.apache.org/viewvc?rev=1363813view=rev Log: QPID-4151: Add validation for reserved exchange names into addExchange dialog in web management UI Applied patch from Oleksandr Rudyy oru...@gmail.com merged from trunk r1363307 Modified: qpid/branches/0.18/qpid/java/ (props changed) qpid/branches/0.18/qpid/java/amqp-1-0-client/ (props changed) qpid/branches/0.18/qpid/java/amqp-1-0-client-jms/ (props changed) qpid/branches/0.18/qpid/java/amqp-1-0-common/ (props changed) qpid/branches/0.18/qpid/java/broker/ (props changed) qpid/branches/0.18/qpid/java/broker-plugins/management-http/src/main/java/resources/addExchange.html qpid/branches/0.18/qpid/java/broker/bin/ (props changed) qpid/branches/0.18/qpid/java/broker/src/main/java/org/apache/qpid/server/management/ (props changed) qpid/branches/0.18/qpid/java/broker/src/main/java/org/apache/qpid/server/message/MessageMetaData_1_0.java (props changed) qpid/branches/0.18/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/ProtocolEngine_1_0_0.java (props changed) qpid/branches/0.18/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/ProtocolEngine_1_0_0_SASL.java (props changed) qpid/branches/0.18/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v1_0/ (props changed) qpid/branches/0.18/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/ (props changed) qpid/branches/0.18/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/ (props changed) qpid/branches/0.18/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ConfigurationManagement.java (props changed) qpid/branches/0.18/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/LoggingManagement.java (props changed) qpid/branches/0.18/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedBroker.java (props changed) qpid/branches/0.18/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedConnection.java (props changed) qpid/branches/0.18/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedExchange.java (props changed) qpid/branches/0.18/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedQueue.java (props changed) qpid/branches/0.18/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/UserManagement.java (props changed) qpid/branches/0.18/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanAttribute.java (props changed) qpid/branches/0.18/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanConstructor.java (props changed) qpid/branches/0.18/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanDescription.java (props changed) qpid/branches/0.18/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanOperation.java (props changed) qpid/branches/0.18/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanOperationParameter.java (props changed) qpid/branches/0.18/qpid/java/management/eclipse-plugin/src/ (props changed) qpid/branches/0.18/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/ConnectionTypeTabControl.java (props changed) qpid/branches/0.18/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/ExchangeTypeTabControl.java (props changed) qpid/branches/0.18/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/MBeanTypeTabControl.java (props changed) qpid/branches/0.18/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/QueueTypeTabControl.java (props changed) qpid/branches/0.18/qpid/java/management/eclipse-plugin/src/main/resources/macosx/Contents/MacOS/qpidmc (props changed) qpid/branches/0.18/qpid/java/systests/src/main/java/org/apache/qpid/server/SupportedProtocolVersionsTest.java (props changed) qpid/branches/0.18/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java (props changed) qpid/branches/0.18/qpid/java/test-profiles/ (props changed) qpid/branches/0.18/qpid/java/test-profiles/CPPExcludes (props changed) qpid/branches/0.18/qpid/java/test-profiles/Excludes (props changed) qpid/branches/0.18/qpid/java/test-profiles/JavaBDBExcludes (props changed) qpid/branches/0.18/qpid/java/test-profiles/JavaExcludes (props changed) qpid/branches/0.18/qpid
svn commit: r1366339 - in /qpid/trunk/qpid/java: bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/AbstractBDBMessageStore.java broker/src/main/java/org/apache/qpid/server/store/derby/Der
Author: robbie
Date: Fri Jul 27 11:19:01 2012
New Revision: 1366339
URL: http://svn.apache.org/viewvc?rev=1366339view=rev
Log:
QPID-4164: only keep a hard reference to the meta data if it has yet to be
persisted
Modified:
qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/AbstractBDBMessageStore.java
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/store/derby/DerbyMessageStore.java
Modified:
qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/AbstractBDBMessageStore.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/AbstractBDBMessageStore.java?rev=1366339r1=1366338r2=1366339view=diff
==
---
qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/AbstractBDBMessageStore.java
(original)
+++
qpid/trunk/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/AbstractBDBMessageStore.java
Fri Jul 27 11:19:01 2012
@@ -1594,7 +1594,10 @@ public abstract class AbstractBDBMessage
_messageId = messageId;
_isRecovered = isRecovered;
-_metaData = metaData;
+if(!_isRecovered)
+{
+_metaData = metaData;
+}
_metaDataRef = new
SoftReferenceStorableMessageMetaData(metaData);
}
Modified:
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/store/derby/DerbyMessageStore.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/store/derby/DerbyMessageStore.java?rev=1366339r1=1366338r2=1366339view=diff
==
---
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/store/derby/DerbyMessageStore.java
(original)
+++
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/store/derby/DerbyMessageStore.java
Fri Jul 27 11:19:01 2012
@@ -2057,8 +2057,11 @@ public class DerbyMessageStore implement
_messageId = messageId;
_isRecovered = isRecovered;
+if(!_isRecovered)
+{
+_metaData = metaData;
+}
_metaDataRef = new
SoftReferenceStorableMessageMetaData(metaData);
-_metaData = metaData;
}
@Override
-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
svn commit: r1367084 - in /qpid/trunk/qpid/java/broker-plugins/management-jmx/src: main/java/org/apache/qpid/server/jmx/mbeans/QueueMBean.java test/java/org/apache/qpid/server/jmx/mbeans/QueueMBeanTes
Author: robbie
Date: Mon Jul 30 13:36:00 2012
New Revision: 1367084
URL: http://svn.apache.org/viewvc?rev=1367084view=rev
Log:
QPID-4170: prevent JMX threads from spinning in the Queue MBean if the content
retrieval fails, log an error if it does. Add unit tests to expose issue and
verify fix.
Modified:
qpid/trunk/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/QueueMBean.java
qpid/trunk/qpid/java/broker-plugins/management-jmx/src/test/java/org/apache/qpid/server/jmx/mbeans/QueueMBeanTest.java
Modified:
qpid/trunk/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/QueueMBean.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/QueueMBean.java?rev=1367084r1=1367083r2=1367084view=diff
==
---
qpid/trunk/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/QueueMBean.java
(original)
+++
qpid/trunk/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/QueueMBean.java
Mon Jul 30 13:36:00 2012
@@ -43,6 +43,7 @@ import javax.management.openmbean.Tabula
import javax.management.openmbean.TabularDataSupport;
import javax.management.openmbean.TabularType;
import org.apache.commons.lang.time.FastDateFormat;
+import org.apache.log4j.Logger;
import org.apache.qpid.management.common.mbeans.ManagedQueue;
import org.apache.qpid.server.jmx.AMQManagedObject;
import org.apache.qpid.server.jmx.ManagedObject;
@@ -59,6 +60,8 @@ import org.apache.qpid.server.queue.Queu
public class QueueMBean extends AMQManagedObject implements ManagedQueue,
QueueNotificationListener
{
+private static final Logger LOGGER = Logger.getLogger(QueueMBean.class);
+
private static final String[] VIEW_MSGS_COMPOSITE_ITEM_NAMES_DESC_ARRAY =
VIEW_MSGS_COMPOSITE_ITEM_NAMES_DESC.toArray(new
String[VIEW_MSGS_COMPOSITE_ITEM_NAMES_DESC.size()]);
@@ -370,12 +373,14 @@ public class QueueMBean extends AMQManag
byte[] msgContent = new byte[bodySize];
ByteBuffer buf = ByteBuffer.wrap(msgContent);
-int position = 0;
+int stored = serverMsg.getContent(buf, 0);
-while(position bodySize)
+if(bodySize != stored)
{
-position += serverMsg.getContent(buf, position);
-
+LOGGER.error(String.format(An unexpected amount of content was
retrieved +
+(expected %d, got %d bytes) when viewing content for
message with ID %d +
+on queue '%s' in virtual host '%s',
+bodySize, stored, messageId, _queue.getName(),
_vhostMBean.getName()));
}
AMQMessageHeader header = serverMsg.getMessageHeader();
@@ -591,7 +596,7 @@ public class QueueMBean extends AMQManag
}
-private static class GetMessageVisitor implements QueueEntryVisitor
+protected static class GetMessageVisitor implements QueueEntryVisitor
{
private final long _messageNumber;
Modified:
qpid/trunk/qpid/java/broker-plugins/management-jmx/src/test/java/org/apache/qpid/server/jmx/mbeans/QueueMBeanTest.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-jmx/src/test/java/org/apache/qpid/server/jmx/mbeans/QueueMBeanTest.java?rev=1367084r1=1367083r2=1367084view=diff
==
---
qpid/trunk/qpid/java/broker-plugins/management-jmx/src/test/java/org/apache/qpid/server/jmx/mbeans/QueueMBeanTest.java
(original)
+++
qpid/trunk/qpid/java/broker-plugins/management-jmx/src/test/java/org/apache/qpid/server/jmx/mbeans/QueueMBeanTest.java
Mon Jul 30 13:36:00 2012
@@ -18,12 +18,14 @@
*/
package org.apache.qpid.server.jmx.mbeans;
+import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import static org.mockito.Mockito.verify;
import static org.mockito.Matchers.isNull;
import static org.mockito.Matchers.argThat;
+import java.nio.ByteBuffer;
import java.util.Arrays;
import java.util.Collections;
@@ -31,19 +33,26 @@ import javax.management.ListenerNotFound
import javax.management.Notification;
import javax.management.NotificationListener;
import javax.management.OperationsException;
+import javax.management.openmbean.CompositeDataSupport;
+import org.apache.qpid.management.common.mbeans.ManagedQueue;
import org.apache.qpid.server.jmx.ManagedObjectRegistry;
+import org.apache.qpid.server.jmx.mbeans.QueueMBean.GetMessageVisitor;
+import org.apache.qpid.server.message.ServerMessage;
import org.apache.qpid.server.model.Exchange;
import org.apache.qpid.server.model.LifetimePolicy;
import org.apache.qpid.server.model.Queue;
import org.apache.qpid.server.model.Statistics;
import
svn commit: r1367522 - in /qpid/trunk/qpid/java: broker/src/main/java/org/apache/qpid/server/ broker/src/main/java/org/apache/qpid/server/transport/ broker/src/test/java/org/apache/qpid/server/ systes
Author: robbie
Date: Tue Jul 31 12:48:51 2012
New Revision: 1367522
URL: http://svn.apache.org/viewvc?rev=1367522view=rev
Log:
QPID-4124: Improved logging that is produced when the various transaction
timeouts are exceeded. Remove duplication of messages and reorder
logging/closing.
Work by myself, Keith Wall, Phil Harvey.
Added:
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/TransactionTimeoutHelper.java
qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/TransactionTimeoutHelperTest.java
Modified:
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ServerSession.java
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/transacted/TransactionTimeoutTest.java
Modified:
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java?rev=1367522r1=1367521r2=1367522view=diff
==
---
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java
(original)
+++
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java
Tue Jul 31 12:48:51 2012
@@ -176,6 +176,8 @@ public class AMQChannel implements Sessi
private final ClientDeliveryMethod _clientDeliveryMethod;
+private final TransactionTimeoutHelper _transactionTimeoutHelper;
+
public AMQChannel(AMQProtocolSession session, int channelId, MessageStore
messageStore)
throws AMQException
{
@@ -195,6 +197,8 @@ public class AMQChannel implements Sessi
_transaction = new AsyncAutoCommitTransaction(_messageStore, this);
_clientDeliveryMethod = session.createDeliveryMethod(_channelId);
+
+ _transactionTimeoutHelper = new TransactionTimeoutHelper(_logSubject);
}
public ConfigStore getConfigStore()
@@ -1407,7 +1411,7 @@ public class AMQChannel implements Sessi
}
}
}
-
+
public synchronized void block(AMQQueue queue)
{
if(_blockingEntities.add(queue))
@@ -1542,27 +1546,20 @@ public class AMQChannel implements Sessi
long openTime = currentTime -
_transaction.getTransactionStartTime();
long idleTime = currentTime - _txnUpdateTime.get();
-// Log a warning on idle or open transactions
-if (idleWarn 0L idleTime idleWarn)
-{
-CurrentActor.get().message(_logSubject,
ChannelMessages.IDLE_TXN(idleTime));
-_logger.warn(IDLE TRANSACTION ALERT +
_logSubject.toString() + + idleTime + ms);
-}
-else if (openWarn 0L openTime openWarn)
-{
-CurrentActor.get().message(_logSubject,
ChannelMessages.OPEN_TXN(openTime));
-_logger.warn(OPEN TRANSACTION ALERT +
_logSubject.toString() + + openTime + ms);
-}
-
-// Close _connection_ for idle or open transactions that have
timed out (this is different
-// than the 0-10 code path which closes the session).
-if (idleClose 0L idleTime idleClose)
+_transactionTimeoutHelper.logIfNecessary(idleTime, idleWarn,
ChannelMessages.IDLE_TXN(idleTime),
+
TransactionTimeoutHelper.IDLE_TRANSACTION_ALERT);
+if (_transactionTimeoutHelper.isTimedOut(idleTime, idleClose))
{
closeConnection(Idle transaction timed out);
+return;
}
-else if (openClose 0L openTime openClose)
+
+_transactionTimeoutHelper.logIfNecessary(openTime, openWarn,
ChannelMessages.OPEN_TXN(openTime),
+
TransactionTimeoutHelper.OPEN_TRANSACTION_ALERT);
+if (_transactionTimeoutHelper.isTimedOut(openTime, openClose))
{
closeConnection(Open transaction timed out);
+return;
}
}
}
Added:
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/TransactionTimeoutHelper.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/TransactionTimeoutHelper.java?rev=1367522view=auto
==
---
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/TransactionTimeoutHelper.java
(added)
+++
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/TransactionTimeoutHelper.java
Tue Jul 31 12:48:51 2012
@@ -0,0 +1,63 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work
svn commit: r1367531 - in /qpid/branches/0.18/qpid/java: ./ amqp-1-0-client-jms/ amqp-1-0-client/ amqp-1-0-common/ bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/ broker/ broker/bin/ b
Author: robbie Date: Tue Jul 31 13:14:44 2012 New Revision: 1367531 URL: http://svn.apache.org/viewvc?rev=1367531view=rev Log: QPID-4164: only keep a hard reference to the meta data if it has yet to be persisted merged from trunk r1366339 Modified: qpid/branches/0.18/qpid/java/ (props changed) qpid/branches/0.18/qpid/java/amqp-1-0-client/ (props changed) qpid/branches/0.18/qpid/java/amqp-1-0-client-jms/ (props changed) qpid/branches/0.18/qpid/java/amqp-1-0-common/ (props changed) qpid/branches/0.18/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/AbstractBDBMessageStore.java qpid/branches/0.18/qpid/java/broker/ (props changed) qpid/branches/0.18/qpid/java/broker/bin/ (props changed) qpid/branches/0.18/qpid/java/broker/src/main/java/org/apache/qpid/server/management/ (props changed) qpid/branches/0.18/qpid/java/broker/src/main/java/org/apache/qpid/server/message/MessageMetaData_1_0.java (props changed) qpid/branches/0.18/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/ProtocolEngine_1_0_0.java (props changed) qpid/branches/0.18/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/ProtocolEngine_1_0_0_SASL.java (props changed) qpid/branches/0.18/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v1_0/ (props changed) qpid/branches/0.18/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/ (props changed) qpid/branches/0.18/qpid/java/broker/src/main/java/org/apache/qpid/server/store/derby/DerbyMessageStore.java qpid/branches/0.18/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/ (props changed) qpid/branches/0.18/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ConfigurationManagement.java (props changed) qpid/branches/0.18/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/LoggingManagement.java (props changed) qpid/branches/0.18/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedBroker.java (props changed) qpid/branches/0.18/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedConnection.java (props changed) qpid/branches/0.18/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedExchange.java (props changed) qpid/branches/0.18/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedQueue.java (props changed) qpid/branches/0.18/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/UserManagement.java (props changed) qpid/branches/0.18/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanAttribute.java (props changed) qpid/branches/0.18/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanConstructor.java (props changed) qpid/branches/0.18/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanDescription.java (props changed) qpid/branches/0.18/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanOperation.java (props changed) qpid/branches/0.18/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanOperationParameter.java (props changed) qpid/branches/0.18/qpid/java/management/eclipse-plugin/src/ (props changed) qpid/branches/0.18/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/ConnectionTypeTabControl.java (props changed) qpid/branches/0.18/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/ExchangeTypeTabControl.java (props changed) qpid/branches/0.18/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/MBeanTypeTabControl.java (props changed) qpid/branches/0.18/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/QueueTypeTabControl.java (props changed) qpid/branches/0.18/qpid/java/management/eclipse-plugin/src/main/resources/macosx/Contents/MacOS/qpidmc (props changed) qpid/branches/0.18/qpid/java/systests/src/main/java/org/apache/qpid/server/SupportedProtocolVersionsTest.java (props changed) qpid/branches/0.18/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java (props changed) qpid/branches/0.18/qpid/java/test-profiles/ (props changed) qpid/branches/0.18/qpid/java/test-profiles/CPPExcludes (props changed) qpid/branches/0.18/qpid/java/test-profiles/Excludes (props changed) qpid/branches/0.18/qpid/java/test-profiles/JavaBDBExcludes (props changed) qpid/branches/0.18/qpid/java/test
svn commit: r1367534 - in /qpid/branches/0.18/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/sr
Author: robbie Date: Tue Jul 31 13:22:11 2012 New Revision: 1367534 URL: http://svn.apache.org/viewvc?rev=1367534view=rev Log: QPID-4164: Patch to extend MaxDeliveryCountTest to check for this bug Applied patch from Philip Harvey p...@philharveyonline.com merged from trunk r1367095 Modified: qpid/branches/0.18/qpid/java/ (props changed) qpid/branches/0.18/qpid/java/amqp-1-0-client/ (props changed) qpid/branches/0.18/qpid/java/amqp-1-0-client-jms/ (props changed) qpid/branches/0.18/qpid/java/amqp-1-0-common/ (props changed) qpid/branches/0.18/qpid/java/broker/ (props changed) qpid/branches/0.18/qpid/java/broker/bin/ (props changed) qpid/branches/0.18/qpid/java/broker/src/main/java/org/apache/qpid/server/management/ (props changed) qpid/branches/0.18/qpid/java/broker/src/main/java/org/apache/qpid/server/message/MessageMetaData_1_0.java (props changed) qpid/branches/0.18/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/ProtocolEngine_1_0_0.java (props changed) qpid/branches/0.18/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/ProtocolEngine_1_0_0_SASL.java (props changed) qpid/branches/0.18/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v1_0/ (props changed) qpid/branches/0.18/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/ (props changed) qpid/branches/0.18/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/ (props changed) qpid/branches/0.18/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ConfigurationManagement.java (props changed) qpid/branches/0.18/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/LoggingManagement.java (props changed) qpid/branches/0.18/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedBroker.java (props changed) qpid/branches/0.18/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedConnection.java (props changed) qpid/branches/0.18/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedExchange.java (props changed) qpid/branches/0.18/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedQueue.java (props changed) qpid/branches/0.18/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/UserManagement.java (props changed) qpid/branches/0.18/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanAttribute.java (props changed) qpid/branches/0.18/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanConstructor.java (props changed) qpid/branches/0.18/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanDescription.java (props changed) qpid/branches/0.18/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanOperation.java (props changed) qpid/branches/0.18/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanOperationParameter.java (props changed) qpid/branches/0.18/qpid/java/management/eclipse-plugin/src/ (props changed) qpid/branches/0.18/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/ConnectionTypeTabControl.java (props changed) qpid/branches/0.18/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/ExchangeTypeTabControl.java (props changed) qpid/branches/0.18/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/MBeanTypeTabControl.java (props changed) qpid/branches/0.18/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/QueueTypeTabControl.java (props changed) qpid/branches/0.18/qpid/java/management/eclipse-plugin/src/main/resources/macosx/Contents/MacOS/qpidmc (props changed) qpid/branches/0.18/qpid/java/systests/src/main/java/org/apache/qpid/server/SupportedProtocolVersionsTest.java (props changed) qpid/branches/0.18/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/MaxDeliveryCountTest.java qpid/branches/0.18/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java (props changed) qpid/branches/0.18/qpid/java/test-profiles/ (props changed) qpid/branches/0.18/qpid/java/test-profiles/CPPExcludes (props changed) qpid/branches/0.18/qpid/java/test-profiles/Excludes (props changed) qpid/branches/0.18/qpid/java/test-profiles/JavaBDBExcludes (props changed) qpid/branches/0.18/qpid/java/test-profiles/JavaExcludes (props changed) qpid/branches/0.18/qpid/java/test
svn commit: r1367796 - in /qpid/trunk/qpid/java: broker-plugins/management-http/ broker-plugins/management-http/src/main/java/resources/ broker-plugins/management-http/src/main/java/resources/js/qpid/
Author: robbie Date: Tue Jul 31 22:02:40 2012 New Revision: 1367796 URL: http://svn.apache.org/viewvc?rev=1367796view=rev Log: QPID-4167: Fix setting of queue attributes via web management console and rest interfaces. Also import Subscription into the bundle to resolve CDNFExcept ion when viewing a queue with Consumers. Work by Oleksandr Rudyy, Keith Wall and myself. Modified: qpid/trunk/qpid/java/broker-plugins/management-http/MANIFEST.MF qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/addQueue.html qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addQueue.js qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/showQueue.html qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/showVirtualHost.html qpid/trunk/qpid/java/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/servlet/rest/Asserts.java qpid/trunk/qpid/java/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/servlet/rest/VirtualHostRestTest.java qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/QueueAdapter.java qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/plugins/OsgiSystemPackages.properties Modified: qpid/trunk/qpid/java/broker-plugins/management-http/MANIFEST.MF URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/MANIFEST.MF?rev=1367796r1=1367795r2=1367796view=diff == --- qpid/trunk/qpid/java/broker-plugins/management-http/MANIFEST.MF (original) +++ qpid/trunk/qpid/java/broker-plugins/management-http/MANIFEST.MF Tue Jul 31 22:02:40 2012 @@ -30,6 +30,7 @@ Import-Package: org.apache.qpid, org.apache.qpid.server.plugins, org.apache.qpid.server.protocol, org.apache.qpid.server.queue, + org.apache.qpid.server.subscription, org.apache.qpid.server.registry, org.apache.qpid.server.security, org.apache.qpid.server.security.access, Modified: qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/addQueue.html URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/addQueue.html?rev=1367796r1=1367795r2=1367796view=diff == --- qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/addQueue.html (original) +++ qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/addQueue.html Tue Jul 31 22:02:40 2012 @@ -94,7 +94,7 @@ tdinput type=text required=false name=queueFlowControlSizeBytes id=formAddQueue.capacity placeholder=Size in bytes dojoType=dijit.form.ValidationTextBox trim=true -regexp=(^[0-9]+(b|K(b)?|M(b)?|G(b)?)?$) +regexp=[0-9]+ invalidMessage= Invalid value//td /tr !-- x-qpid-flow-resume-capacity -- @@ -103,7 +103,7 @@ tdinput type=text required=false name=queueFlowResumeSizeBytes id=formAddQueue.flowResumeCapacity placeholder=Size in bytes dojoType=dijit.form.ValidationTextBox trim=true -regexp=(^[0-9]+(b|K(b)?|M(b)?|G(b)?)?$) +regexp=[0-9]+ invalidMessage= Invalid value//td /tr /table @@ -111,27 +111,28 @@ br/ div data-dojo-type=dijit.TitlePane data-dojo-props=title: 'Alerting Settings', open: false table cellpadding=0 cellspacing=2 +!-- x-qpid-maximum-message-count -- tr -td valign=topstrongMaximum Message Age: /strong/td -tdinput type=text required=false name=alertThresholdMessageAge id=formAddQueue.maximumMessageAge placeholder=Time in ms +td valign=topstrongQueue Depth: /strong/td +tdinput type=text required=false name=alertThresholdQueueDepthMessages id=formAddQueue.maximumMessageCount placeholder=Count of messages dojoType=dijit.form.ValidationTextBox trim=true - regexp=(^[0-9]+(s(ec(ond(s)?)?)?|m(in(ute)?(s)?)?|h|d|w|M|y)?$) +regexp=[0-9]+ invalidMessage= Invalid value //td /tr -!-- x-qpid-maximum-message-size -- +!-- x-qpid-maximum-message-age -- tr -td valign=topstrongMaximum Message Size
svn commit: r1367797 - in /qpid/trunk/qpid/java/broker-plugins/management-http/src: main/java/org/apache/qpid/server/management/plugin/servlet/rest/ main/java/resources/ main/java/resources/js/qpid/ma
Author: robbie
Date: Tue Jul 31 22:03:12 2012
New Revision: 1367797
URL: http://svn.apache.org/viewvc?rev=1367797view=rev
Log:
QPID-4167: Fix a cycle in the JSON output of the AlternateExchange attribute
which would lead to massive/broken output that would cripple the webui. Add
REST test to validate the fix. Add checkbox to create a DLQ for the new queue,
and display the alternateExchange attribute.
Work by myself and Keith Wall.
Modified:
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/RestServlet.java
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/addQueue.html
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Queue.js
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addQueue.js
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/showQueue.html
qpid/trunk/qpid/java/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/servlet/rest/VirtualHostRestTest.java
Modified:
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/RestServlet.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/RestServlet.java?rev=1367797r1=1367796r2=1367797view=diff
==
---
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/RestServlet.java
(original)
+++
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/RestServlet.java
Tue Jul 31 22:03:12 2012
@@ -292,7 +292,11 @@ public class RestServlet extends Abstrac
for(String name : confObject.getAttributeNames())
{
Object value = confObject.getAttribute(name);
-if(value != null)
+if(value instanceof ConfiguredObject)
+{
+object.put(name, ((ConfiguredObject) value).getName());
+}
+else if(value != null)
{
object.put(name, value);
}
Modified:
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/addQueue.html
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/addQueue.html?rev=1367797r1=1367796r2=1367797view=diff
==
---
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/addQueue.html
(original)
+++
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/addQueue.html
Tue Jul 31 22:03:12 2012
@@ -162,8 +162,15 @@
regexp=[0-9]+
invalidMessage= Invalid value//td
/tr
-
-
+tr
+td valign=topstrongCreate DLQ? /strong/td
+tdinput type=checkbox name=dlqEnabled
id=formAddQueue.dlqEnabled value=dlqEnabled dojoType=dijit.form.CheckBox
//td
+/tr
+/table
+table cellpadding=0 cellspacing=2
+tr
+td valign=topNOTE: Configuring maximum delivery
retries on a queue which has no DLQ / AlternateExchange will result in messages
being discarded after the limit is reached./td
+/tr
/table
/div
br/
Modified:
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Queue.js
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Queue.js?rev=1367797r1=1367796r2=1367797view=diff
==
---
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Queue.js
(original)
+++
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Queue.js
Tue Jul 31 22:03:12 2012
@@ -270,8 +270,7 @@ define([dojo/_base/xhr,
durable,
lifetimePolicy,
type,
- keyName,
- keyValue,
+ typeQualifier,
alertRepeatGap,
alertRepeatGapUnits,
alertThresholdMessageAge,
@@ -281,6 +280,7 @@ define([dojo/_base/xhr,
alertThresholdQueueDepthBytes,
alertThresholdQueueDepthBytesUnits
svn commit: r1367967 - in /qpid/branches/0.18/qpid/java: ./ amqp-1-0-client-jms/ amqp-1-0-client/ amqp-1-0-common/ broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/ broker
Author: robbie Date: Wed Aug 1 12:51:51 2012 New Revision: 1367967 URL: http://svn.apache.org/viewvc?rev=1367967view=rev Log: QPID-4170: prevent JMX threads from spinning in the Queue MBean if the content retrieval fails, log an error if it does. Add unit tests to expose issue and verify fix. merged from trunk r1367084 Modified: qpid/branches/0.18/qpid/java/ (props changed) qpid/branches/0.18/qpid/java/amqp-1-0-client/ (props changed) qpid/branches/0.18/qpid/java/amqp-1-0-client-jms/ (props changed) qpid/branches/0.18/qpid/java/amqp-1-0-common/ (props changed) qpid/branches/0.18/qpid/java/broker/ (props changed) qpid/branches/0.18/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/QueueMBean.java qpid/branches/0.18/qpid/java/broker-plugins/management-jmx/src/test/java/org/apache/qpid/server/jmx/mbeans/QueueMBeanTest.java qpid/branches/0.18/qpid/java/broker/bin/ (props changed) qpid/branches/0.18/qpid/java/broker/src/main/java/org/apache/qpid/server/management/ (props changed) qpid/branches/0.18/qpid/java/broker/src/main/java/org/apache/qpid/server/message/MessageMetaData_1_0.java (props changed) qpid/branches/0.18/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/ProtocolEngine_1_0_0.java (props changed) qpid/branches/0.18/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/ProtocolEngine_1_0_0_SASL.java (props changed) qpid/branches/0.18/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v1_0/ (props changed) qpid/branches/0.18/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/ (props changed) qpid/branches/0.18/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/ (props changed) qpid/branches/0.18/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ConfigurationManagement.java (props changed) qpid/branches/0.18/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/LoggingManagement.java (props changed) qpid/branches/0.18/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedBroker.java (props changed) qpid/branches/0.18/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedConnection.java (props changed) qpid/branches/0.18/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedExchange.java (props changed) qpid/branches/0.18/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedQueue.java (props changed) qpid/branches/0.18/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/UserManagement.java (props changed) qpid/branches/0.18/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanAttribute.java (props changed) qpid/branches/0.18/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanConstructor.java (props changed) qpid/branches/0.18/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanDescription.java (props changed) qpid/branches/0.18/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanOperation.java (props changed) qpid/branches/0.18/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanOperationParameter.java (props changed) qpid/branches/0.18/qpid/java/management/eclipse-plugin/src/ (props changed) qpid/branches/0.18/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/ConnectionTypeTabControl.java (props changed) qpid/branches/0.18/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/ExchangeTypeTabControl.java (props changed) qpid/branches/0.18/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/MBeanTypeTabControl.java (props changed) qpid/branches/0.18/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/QueueTypeTabControl.java (props changed) qpid/branches/0.18/qpid/java/management/eclipse-plugin/src/main/resources/macosx/Contents/MacOS/qpidmc (props changed) qpid/branches/0.18/qpid/java/systests/src/main/java/org/apache/qpid/server/SupportedProtocolVersionsTest.java (props changed) qpid/branches/0.18/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java (props changed) qpid/branches/0.18/qpid/java/test-profiles/ (props changed) qpid/branches/0.18/qpid/java/test-profiles/CPPExcludes (props changed) qpid/branches/0.18/qpid/java/test-profiles/Excludes (props changed) qpid
svn commit: r1367973 - in /qpid/branches/0.18/qpid/java: ./ amqp-1-0-client-jms/ amqp-1-0-client/ amqp-1-0-common/ broker-plugins/management-http/ broker-plugins/management-http/src/main/java/resource
Author: robbie Date: Wed Aug 1 13:01:06 2012 New Revision: 1367973 URL: http://svn.apache.org/viewvc?rev=1367973view=rev Log: QPID-4167: Fix setting of queue attributes via web management console and rest interfaces. Also import Subscription into the bundle to resolve CDNFExcept ion when viewing a queue with Consumers. Work by Oleksandr Rudyy, Keith Wall and myself. merged from trunk r1367796 Modified: qpid/branches/0.18/qpid/java/ (props changed) qpid/branches/0.18/qpid/java/amqp-1-0-client/ (props changed) qpid/branches/0.18/qpid/java/amqp-1-0-client-jms/ (props changed) qpid/branches/0.18/qpid/java/amqp-1-0-common/ (props changed) qpid/branches/0.18/qpid/java/broker/ (props changed) qpid/branches/0.18/qpid/java/broker-plugins/management-http/MANIFEST.MF qpid/branches/0.18/qpid/java/broker-plugins/management-http/src/main/java/resources/addQueue.html qpid/branches/0.18/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addQueue.js qpid/branches/0.18/qpid/java/broker-plugins/management-http/src/main/java/resources/showQueue.html qpid/branches/0.18/qpid/java/broker-plugins/management-http/src/main/java/resources/showVirtualHost.html qpid/branches/0.18/qpid/java/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/servlet/rest/Asserts.java qpid/branches/0.18/qpid/java/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/servlet/rest/VirtualHostRestTest.java qpid/branches/0.18/qpid/java/broker/bin/ (props changed) qpid/branches/0.18/qpid/java/broker/src/main/java/org/apache/qpid/server/management/ (props changed) qpid/branches/0.18/qpid/java/broker/src/main/java/org/apache/qpid/server/message/MessageMetaData_1_0.java (props changed) qpid/branches/0.18/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/QueueAdapter.java qpid/branches/0.18/qpid/java/broker/src/main/java/org/apache/qpid/server/plugins/OsgiSystemPackages.properties qpid/branches/0.18/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/ProtocolEngine_1_0_0.java (props changed) qpid/branches/0.18/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/ProtocolEngine_1_0_0_SASL.java (props changed) qpid/branches/0.18/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v1_0/ (props changed) qpid/branches/0.18/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/ (props changed) qpid/branches/0.18/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/ (props changed) qpid/branches/0.18/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ConfigurationManagement.java (props changed) qpid/branches/0.18/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/LoggingManagement.java (props changed) qpid/branches/0.18/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedBroker.java (props changed) qpid/branches/0.18/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedConnection.java (props changed) qpid/branches/0.18/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedExchange.java (props changed) qpid/branches/0.18/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedQueue.java (props changed) qpid/branches/0.18/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/UserManagement.java (props changed) qpid/branches/0.18/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanAttribute.java (props changed) qpid/branches/0.18/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanConstructor.java (props changed) qpid/branches/0.18/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanDescription.java (props changed) qpid/branches/0.18/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanOperation.java (props changed) qpid/branches/0.18/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanOperationParameter.java (props changed) qpid/branches/0.18/qpid/java/management/eclipse-plugin/src/ (props changed) qpid/branches/0.18/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/ConnectionTypeTabControl.java (props changed) qpid/branches/0.18/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/ExchangeTypeTabControl.java (props changed) qpid/branches/0.18/qpid/java/management/eclipse-plugin/src/main/java/org
svn commit: r1367978 - in /qpid/branches/0.18/qpid/java: ./ amqp-1-0-client-jms/ amqp-1-0-client/ amqp-1-0-common/ broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin
Author: robbie Date: Wed Aug 1 13:11:29 2012 New Revision: 1367978 URL: http://svn.apache.org/viewvc?rev=1367978view=rev Log: QPID-4167: Fix a cycle in the JSON output of the AlternateExchange attribute which would lead to massive/broken output that would cripple the webui. Add checkbox to create a DLQ for the new queue, and display the alternateExchange attribute. Work by myself and Keith Wall. Modified: qpid/branches/0.18/qpid/java/ (props changed) qpid/branches/0.18/qpid/java/amqp-1-0-client/ (props changed) qpid/branches/0.18/qpid/java/amqp-1-0-client-jms/ (props changed) qpid/branches/0.18/qpid/java/amqp-1-0-common/ (props changed) qpid/branches/0.18/qpid/java/broker/ (props changed) qpid/branches/0.18/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/RestServlet.java qpid/branches/0.18/qpid/java/broker-plugins/management-http/src/main/java/resources/addQueue.html qpid/branches/0.18/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Queue.js qpid/branches/0.18/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addQueue.js qpid/branches/0.18/qpid/java/broker-plugins/management-http/src/main/java/resources/showQueue.html qpid/branches/0.18/qpid/java/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/servlet/rest/VirtualHostRestTest.java qpid/branches/0.18/qpid/java/broker/bin/ (props changed) qpid/branches/0.18/qpid/java/broker/src/main/java/org/apache/qpid/server/management/ (props changed) qpid/branches/0.18/qpid/java/broker/src/main/java/org/apache/qpid/server/message/MessageMetaData_1_0.java (props changed) qpid/branches/0.18/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/ProtocolEngine_1_0_0.java (props changed) qpid/branches/0.18/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/ProtocolEngine_1_0_0_SASL.java (props changed) qpid/branches/0.18/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v1_0/ (props changed) qpid/branches/0.18/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/ (props changed) qpid/branches/0.18/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/ (props changed) qpid/branches/0.18/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ConfigurationManagement.java (props changed) qpid/branches/0.18/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/LoggingManagement.java (props changed) qpid/branches/0.18/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedBroker.java (props changed) qpid/branches/0.18/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedConnection.java (props changed) qpid/branches/0.18/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedExchange.java (props changed) qpid/branches/0.18/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedQueue.java (props changed) qpid/branches/0.18/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/UserManagement.java (props changed) qpid/branches/0.18/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanAttribute.java (props changed) qpid/branches/0.18/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanConstructor.java (props changed) qpid/branches/0.18/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanDescription.java (props changed) qpid/branches/0.18/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanOperation.java (props changed) qpid/branches/0.18/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanOperationParameter.java (props changed) qpid/branches/0.18/qpid/java/management/eclipse-plugin/src/ (props changed) qpid/branches/0.18/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/ConnectionTypeTabControl.java (props changed) qpid/branches/0.18/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/ExchangeTypeTabControl.java (props changed) qpid/branches/0.18/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/MBeanTypeTabControl.java (props changed) qpid/branches/0.18/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/QueueTypeTabControl.java (props changed) qpid/branches/0.18/qpid/java/management
svn commit: r1368401 - in /qpid/branches/0.18/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/ broker/src/main/java
Author: robbie Date: Thu Aug 2 09:40:27 2012 New Revision: 1368401 URL: http://svn.apache.org/viewvc?rev=1368401view=rev Log: QPID-4171: Fix enqueue ordering for persistent messsages Applied patch from Philip Harvey p...@philharveyonline.com and Oleksandr Rudyy oru...@gmail.com merged from trunk r1367990 Added: qpid/branches/0.18/qpid/java/broker/src/test/java/org/apache/qpid/server/txn/AsyncAutoCommitTransactionTest.java - copied unchanged from r1367990, qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/txn/AsyncAutoCommitTransactionTest.java Modified: qpid/branches/0.18/qpid/java/ (props changed) qpid/branches/0.18/qpid/java/amqp-1-0-client/ (props changed) qpid/branches/0.18/qpid/java/amqp-1-0-client-jms/ (props changed) qpid/branches/0.18/qpid/java/amqp-1-0-common/ (props changed) qpid/branches/0.18/qpid/java/broker/ (props changed) qpid/branches/0.18/qpid/java/broker/bin/ (props changed) qpid/branches/0.18/qpid/java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java qpid/branches/0.18/qpid/java/broker/src/main/java/org/apache/qpid/server/management/ (props changed) qpid/branches/0.18/qpid/java/broker/src/main/java/org/apache/qpid/server/message/MessageMetaData_1_0.java (props changed) qpid/branches/0.18/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/ProtocolEngine_1_0_0.java (props changed) qpid/branches/0.18/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/ProtocolEngine_1_0_0_SASL.java (props changed) qpid/branches/0.18/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v1_0/ (props changed) qpid/branches/0.18/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/ (props changed) qpid/branches/0.18/qpid/java/broker/src/main/java/org/apache/qpid/server/txn/AsyncAutoCommitTransaction.java qpid/branches/0.18/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/ (props changed) qpid/branches/0.18/qpid/java/broker/src/test/java/org/apache/qpid/server/util/InternalBrokerBaseCase.java qpid/branches/0.18/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ConfigurationManagement.java (props changed) qpid/branches/0.18/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/LoggingManagement.java (props changed) qpid/branches/0.18/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedBroker.java (props changed) qpid/branches/0.18/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedConnection.java (props changed) qpid/branches/0.18/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedExchange.java (props changed) qpid/branches/0.18/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedQueue.java (props changed) qpid/branches/0.18/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/UserManagement.java (props changed) qpid/branches/0.18/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanAttribute.java (props changed) qpid/branches/0.18/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanConstructor.java (props changed) qpid/branches/0.18/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanDescription.java (props changed) qpid/branches/0.18/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanOperation.java (props changed) qpid/branches/0.18/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanOperationParameter.java (props changed) qpid/branches/0.18/qpid/java/management/eclipse-plugin/src/ (props changed) qpid/branches/0.18/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/ConnectionTypeTabControl.java (props changed) qpid/branches/0.18/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/ExchangeTypeTabControl.java (props changed) qpid/branches/0.18/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/MBeanTypeTabControl.java (props changed) qpid/branches/0.18/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/QueueTypeTabControl.java (props changed) qpid/branches/0.18/qpid/java/management/eclipse-plugin/src/main/resources/macosx/Contents/MacOS/qpidmc (props changed) qpid/branches/0.18/qpid/java/systests/src/main/java/org/apache/qpid/server/SupportedProtocolVersionsTest.java (props changed) qpid/branches/0.18/qpid/java/systests
svn commit: r1368506 - in /qpid/trunk/qpid/java/broker/src: main/java/org/apache/qpid/server/configuration/ test/java/org/apache/qpid/server/configuration/
Author: robbie
Date: Thu Aug 2 15:03:25 2012
New Revision: 1368506
URL: http://svn.apache.org/viewvc?rev=1368506view=rev
Log:
QPID-4182: Set the default minimumAlertRepeatGap value to 30 seconds
Applied patch from Philip Harvey p...@philharveyonline.com and Oleksandr
Rudyyoru...@gmail.com
Modified:
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/VirtualHostConfiguration.java
qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/QueueConfigurationTest.java
qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/ServerConfigurationTest.java
Modified:
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java?rev=1368506r1=1368505r2=1368506view=diff
==
---
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java
(original)
+++
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java
Thu Aug 2 15:03:25 2012
@@ -66,6 +66,7 @@ public class ServerConfiguration extends
public static final int JMXPORT_CONNECTORSERVER_OFFSET = 100;
public static final int DEFAULT_HTTP_MANAGEMENT_PORT = 8080;
public static final int DEFAULT_HTTPS_MANAGEMENT_PORT = 8443;
+public static final long DEFAULT_MINIMUM_ALERT_REPEAT_GAP = 3l;
public static final String QPID_HOME = QPID_HOME;
public static final String QPID_WORK = QPID_WORK;
@@ -713,7 +714,7 @@ public class ServerConfiguration extends
public long getMinimumAlertRepeatGap()
{
-return getLongValue(minimumAlertRepeatGap);
+return getLongValue(minimumAlertRepeatGap,
DEFAULT_MINIMUM_ALERT_REPEAT_GAP);
}
public long getCapacity()
Modified:
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/VirtualHostConfiguration.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/VirtualHostConfiguration.java?rev=1368506r1=1368505r2=1368506view=diff
==
---
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/VirtualHostConfiguration.java
(original)
+++
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/VirtualHostConfiguration.java
Thu Aug 2 15:03:25 2012
@@ -270,7 +270,7 @@ public class VirtualHostConfiguration ex
public Long getMinimumAlertRepeatGap()
{
-return getLongValue(queues.minimumAlertRepeatGap);
+return getLongValue(queues.minimumAlertRepeatGap,
ApplicationRegistry.getInstance().getConfiguration().getMinimumAlertRepeatGap());
}
public long getCapacity()
Modified:
qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/QueueConfigurationTest.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/QueueConfigurationTest.java?rev=1368506r1=1368505r2=1368506view=diff
==
---
qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/QueueConfigurationTest.java
(original)
+++
qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/QueueConfigurationTest.java
Thu Aug 2 15:03:25 2012
@@ -176,20 +176,29 @@ public class QueueConfigurationTest exte
assertEquals(1, qConf.getMaximumMessageCount());
}
-public void testGetMinimumAlertRepeatGap() throws ConfigurationException
+public void testGetMinimumAlertRepeatGap() throws Exception
{
-// Check default value
-QueueConfiguration qConf = new QueueConfiguration(test, _emptyConf);
-assertEquals(0, qConf.getMinimumAlertRepeatGap());
-
-// Check explicit value
-VirtualHostConfiguration vhostConfig =
overrideConfiguration(minimumAlertRepeatGap, 2);
-qConf = new QueueConfiguration(test, vhostConfig);
-assertEquals(2, qConf.getMinimumAlertRepeatGap());
-
-// Check inherited value
-qConf = new QueueConfiguration(test, _fullHostConf);
-assertEquals(1, qConf.getMinimumAlertRepeatGap());
+try
+{
+ApplicationRegistry registry = new TestApplicationRegistry(new
ServerConfiguration(_env));
+ApplicationRegistry.initialise(registry);
+// Check default value
+QueueConfiguration qConf = new QueueConfiguration(test,
_emptyConf);
+assertEquals
svn commit: r1368597 - /qpid/trunk/qpid/java/broker/etc/log4j.xml
Author: robbie Date: Thu Aug 2 16:57:52 2012 New Revision: 1368597 URL: http://svn.apache.org/viewvc?rev=1368597view=rev Log: QPID-4184: enable the notifications beign logged by configuring the associated logger Modified: qpid/trunk/qpid/java/broker/etc/log4j.xml Modified: qpid/trunk/qpid/java/broker/etc/log4j.xml URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/etc/log4j.xml?rev=1368597r1=1368596r2=1368597view=diff == --- qpid/trunk/qpid/java/broker/etc/log4j.xml (original) +++ qpid/trunk/qpid/java/broker/etc/log4j.xml Thu Aug 2 16:57:52 2012 @@ -103,6 +103,11 @@ level value=off/ /logger +!-- Enable log messages for the queue notifications -- +logger additivity=true name=org.apache.qpid.server.queue.NotificationCheck + level value=info/ +/logger + !-- Examples of additional logging settings -- !-- Used to generate extra debug. See debug.log4j.xml -- - To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
svn commit: r1368844 - in /qpid/branches/0.18/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/configuration/ broker
Author: robbie Date: Fri Aug 3 09:25:06 2012 New Revision: 1368844 URL: http://svn.apache.org/viewvc?rev=1368844view=rev Log: QPID-4182: Set the default minimumAlertRepeatGap value to 30 seconds Applied patch from Philip Harvey p...@philharveyonline.com and Oleksandr Rudyyoru...@gmail.com merged from trunk r1368506 Modified: qpid/branches/0.18/qpid/java/ (props changed) qpid/branches/0.18/qpid/java/amqp-1-0-client/ (props changed) qpid/branches/0.18/qpid/java/amqp-1-0-client-jms/ (props changed) qpid/branches/0.18/qpid/java/amqp-1-0-common/ (props changed) qpid/branches/0.18/qpid/java/broker/ (props changed) qpid/branches/0.18/qpid/java/broker/bin/ (props changed) qpid/branches/0.18/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java qpid/branches/0.18/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/VirtualHostConfiguration.java qpid/branches/0.18/qpid/java/broker/src/main/java/org/apache/qpid/server/management/ (props changed) qpid/branches/0.18/qpid/java/broker/src/main/java/org/apache/qpid/server/message/MessageMetaData_1_0.java (props changed) qpid/branches/0.18/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/ProtocolEngine_1_0_0.java (props changed) qpid/branches/0.18/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/ProtocolEngine_1_0_0_SASL.java (props changed) qpid/branches/0.18/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v1_0/ (props changed) qpid/branches/0.18/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/ (props changed) qpid/branches/0.18/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/ (props changed) qpid/branches/0.18/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/QueueConfigurationTest.java qpid/branches/0.18/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/ServerConfigurationTest.java qpid/branches/0.18/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ConfigurationManagement.java (props changed) qpid/branches/0.18/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/LoggingManagement.java (props changed) qpid/branches/0.18/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedBroker.java (props changed) qpid/branches/0.18/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedConnection.java (props changed) qpid/branches/0.18/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedExchange.java (props changed) qpid/branches/0.18/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedQueue.java (props changed) qpid/branches/0.18/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/UserManagement.java (props changed) qpid/branches/0.18/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanAttribute.java (props changed) qpid/branches/0.18/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanConstructor.java (props changed) qpid/branches/0.18/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanDescription.java (props changed) qpid/branches/0.18/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanOperation.java (props changed) qpid/branches/0.18/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanOperationParameter.java (props changed) qpid/branches/0.18/qpid/java/management/eclipse-plugin/src/ (props changed) qpid/branches/0.18/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/ConnectionTypeTabControl.java (props changed) qpid/branches/0.18/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/ExchangeTypeTabControl.java (props changed) qpid/branches/0.18/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/MBeanTypeTabControl.java (props changed) qpid/branches/0.18/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/QueueTypeTabControl.java (props changed) qpid/branches/0.18/qpid/java/management/eclipse-plugin/src/main/resources/macosx/Contents/MacOS/qpidmc (props changed) qpid/branches/0.18/qpid/java/systests/src/main/java/org/apache/qpid/server/SupportedProtocolVersionsTest.java (props changed) qpid/branches/0.18/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java (props changed) qpid
svn commit: r1368846 - in /qpid/branches/0.18/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/sr
Author: robbie Date: Fri Aug 3 09:31:58 2012 New Revision: 1368846 URL: http://svn.apache.org/viewvc?rev=1368846view=rev Log: QPID-4172: HouseKeepingTask now reverts thread name before exiting to reduce confusion when inspecting thread dumps. Applied patch from Philip Harvey p...@philharveyonline.com and Oleksandr Rudyyoru...@gmail.com merged from trunk r1368519 Modified: qpid/branches/0.18/qpid/java/ (props changed) qpid/branches/0.18/qpid/java/amqp-1-0-client/ (props changed) qpid/branches/0.18/qpid/java/amqp-1-0-client-jms/ (props changed) qpid/branches/0.18/qpid/java/amqp-1-0-common/ (props changed) qpid/branches/0.18/qpid/java/broker/ (props changed) qpid/branches/0.18/qpid/java/broker/bin/ (props changed) qpid/branches/0.18/qpid/java/broker/src/main/java/org/apache/qpid/server/management/ (props changed) qpid/branches/0.18/qpid/java/broker/src/main/java/org/apache/qpid/server/message/MessageMetaData_1_0.java (props changed) qpid/branches/0.18/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/ProtocolEngine_1_0_0.java (props changed) qpid/branches/0.18/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/ProtocolEngine_1_0_0_SASL.java (props changed) qpid/branches/0.18/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v1_0/ (props changed) qpid/branches/0.18/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/ (props changed) qpid/branches/0.18/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/ (props changed) qpid/branches/0.18/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/HouseKeepingTask.java qpid/branches/0.18/qpid/java/broker/src/test/java/org/apache/qpid/server/virtualhost/HouseKeepingTaskTest.java qpid/branches/0.18/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ConfigurationManagement.java (props changed) qpid/branches/0.18/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/LoggingManagement.java (props changed) qpid/branches/0.18/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedBroker.java (props changed) qpid/branches/0.18/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedConnection.java (props changed) qpid/branches/0.18/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedExchange.java (props changed) qpid/branches/0.18/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedQueue.java (props changed) qpid/branches/0.18/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/UserManagement.java (props changed) qpid/branches/0.18/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanAttribute.java (props changed) qpid/branches/0.18/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanConstructor.java (props changed) qpid/branches/0.18/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanDescription.java (props changed) qpid/branches/0.18/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanOperation.java (props changed) qpid/branches/0.18/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanOperationParameter.java (props changed) qpid/branches/0.18/qpid/java/management/eclipse-plugin/src/ (props changed) qpid/branches/0.18/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/ConnectionTypeTabControl.java (props changed) qpid/branches/0.18/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/ExchangeTypeTabControl.java (props changed) qpid/branches/0.18/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/MBeanTypeTabControl.java (props changed) qpid/branches/0.18/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/QueueTypeTabControl.java (props changed) qpid/branches/0.18/qpid/java/management/eclipse-plugin/src/main/resources/macosx/Contents/MacOS/qpidmc (props changed) qpid/branches/0.18/qpid/java/systests/src/main/java/org/apache/qpid/server/SupportedProtocolVersionsTest.java (props changed) qpid/branches/0.18/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java (props changed) qpid/branches/0.18/qpid/java/test-profiles/ (props changed) qpid/branches/0.18/qpid/java/test-profiles/CPPExcludes (props changed) qpid/branches/0.18/qpid/java/test-profiles/Excludes (props changed
svn commit: r1368857 - in /qpid/branches/0.18/qpid/java: ./ amqp-1-0-client-jms/ amqp-1-0-client/ amqp-1-0-common/ broker/ broker/bin/ broker/etc/ broker/src/main/java/org/apache/qpid/server/managemen
Author: robbie Date: Fri Aug 3 09:53:53 2012 New Revision: 1368857 URL: http://svn.apache.org/viewvc?rev=1368857view=rev Log: QPID-4184: enable the notifications beign logged by configuring the associated logger merge from trunk r1368597 Modified: qpid/branches/0.18/qpid/java/ (props changed) qpid/branches/0.18/qpid/java/amqp-1-0-client/ (props changed) qpid/branches/0.18/qpid/java/amqp-1-0-client-jms/ (props changed) qpid/branches/0.18/qpid/java/amqp-1-0-common/ (props changed) qpid/branches/0.18/qpid/java/broker/ (props changed) qpid/branches/0.18/qpid/java/broker/bin/ (props changed) qpid/branches/0.18/qpid/java/broker/etc/log4j.xml qpid/branches/0.18/qpid/java/broker/src/main/java/org/apache/qpid/server/management/ (props changed) qpid/branches/0.18/qpid/java/broker/src/main/java/org/apache/qpid/server/message/MessageMetaData_1_0.java (props changed) qpid/branches/0.18/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/ProtocolEngine_1_0_0.java (props changed) qpid/branches/0.18/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/ProtocolEngine_1_0_0_SASL.java (props changed) qpid/branches/0.18/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v1_0/ (props changed) qpid/branches/0.18/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/ (props changed) qpid/branches/0.18/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/ (props changed) qpid/branches/0.18/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ConfigurationManagement.java (props changed) qpid/branches/0.18/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/LoggingManagement.java (props changed) qpid/branches/0.18/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedBroker.java (props changed) qpid/branches/0.18/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedConnection.java (props changed) qpid/branches/0.18/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedExchange.java (props changed) qpid/branches/0.18/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedQueue.java (props changed) qpid/branches/0.18/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/UserManagement.java (props changed) qpid/branches/0.18/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanAttribute.java (props changed) qpid/branches/0.18/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanConstructor.java (props changed) qpid/branches/0.18/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanDescription.java (props changed) qpid/branches/0.18/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanOperation.java (props changed) qpid/branches/0.18/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanOperationParameter.java (props changed) qpid/branches/0.18/qpid/java/management/eclipse-plugin/src/ (props changed) qpid/branches/0.18/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/ConnectionTypeTabControl.java (props changed) qpid/branches/0.18/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/ExchangeTypeTabControl.java (props changed) qpid/branches/0.18/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/MBeanTypeTabControl.java (props changed) qpid/branches/0.18/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/QueueTypeTabControl.java (props changed) qpid/branches/0.18/qpid/java/management/eclipse-plugin/src/main/resources/macosx/Contents/MacOS/qpidmc (props changed) qpid/branches/0.18/qpid/java/systests/src/main/java/org/apache/qpid/server/SupportedProtocolVersionsTest.java (props changed) qpid/branches/0.18/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java (props changed) qpid/branches/0.18/qpid/java/test-profiles/ (props changed) qpid/branches/0.18/qpid/java/test-profiles/CPPExcludes (props changed) qpid/branches/0.18/qpid/java/test-profiles/Excludes (props changed) qpid/branches/0.18/qpid/java/test-profiles/JavaBDBExcludes (props changed) qpid/branches/0.18/qpid/java/test-profiles/JavaExcludes (props changed) qpid/branches/0.18/qpid/java/test-profiles/JavaPre010Excludes (props changed) qpid/branches/0.18/qpid/java/test-profiles
svn commit: r1368906 - in /qpid/trunk/qpid/java/broker-plugins/management-jmx/src: main/java/org/apache/qpid/server/jmx/MBeanInvocationHandlerImpl.java test/java/org/apache/qpid/server/jmx/ManagementL
Author: robbie
Date: Fri Aug 3 12:00:48 2012
New Revision: 1368906
URL: http://svn.apache.org/viewvc?rev=1368906view=rev
Log:
QPID-4186: MBeanInvocationHandler now sets log actor before performing
authorisation, so that authorisation logging now includes principal name.
Applied patch from Philip Harvey p...@philharveyonline.com and Oleksandr
Rudyyoru...@gmail.com
Added:
qpid/trunk/qpid/java/broker-plugins/management-jmx/src/test/java/org/apache/qpid/server/jmx/ManagementLogActorTest.java
Modified:
qpid/trunk/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/MBeanInvocationHandlerImpl.java
Modified:
qpid/trunk/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/MBeanInvocationHandlerImpl.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/MBeanInvocationHandlerImpl.java?rev=1368906r1=1368905r2=1368906view=diff
==
---
qpid/trunk/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/MBeanInvocationHandlerImpl.java
(original)
+++
qpid/trunk/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/MBeanInvocationHandlerImpl.java
Fri Aug 3 12:00:48 2012
@@ -157,77 +157,75 @@ public class MBeanInvocationHandlerImpl
// Save the subject
SecurityManager.setThreadSubject(subject);
-
-// Get the component, type and impact, which may be null
-String type = getType(method, args);
-String vhost = getVirtualHost(method, args);
-int impact = getImpact(method, args);
-
-// Get the security manager for the virtual host (if set)
-SecurityManager security;
-if (vhost == null)
+CurrentActor.set(_logActor);
+try
{
-security = _appRegistry.getSecurityManager();
+return authoriseAndInvoke(method, args);
}
-else
+finally
{
-security =
_appRegistry.getVirtualHostRegistry().getVirtualHost(vhost).getSecurityManager();
+CurrentActor.remove();
}
+}
+catch (InvocationTargetException e)
+{
+throw e.getTargetException();
+}
+}
-methodName = getMethodName(method, args);
-if (isAccessMethod(methodName) || impact ==
MBeanOperationInfo.INFO)
-{
-// Check for read-only method invocation permission
-if (!security.authoriseMethod(Operation.ACCESS, type,
methodName))
-{
-throw new SecurityException(Permission denied: Access +
methodName);
-}
-}
-else
-{
-// Check for setting properties permission
-if (!security.authoriseMethod(Operation.UPDATE, type,
methodName))
-{
-throw new SecurityException(Permission denied: Update +
methodName);
-}
-}
+private Object authoriseAndInvoke(Method method, Object[] args) throws
IllegalAccessException, InvocationTargetException
+{
+String methodName;
+// Get the component, type and impact, which may be null
+String type = getType(method, args);
+String vhost = getVirtualHost(method, args);
+int impact = getImpact(method, args);
-boolean oldAccessChecksDisabled = false;
-if(_managementRightsInferAllAccess)
-{
-oldAccessChecksDisabled =
SecurityManager.setAccessChecksDisabled(true);
-}
+// Get the security manager for the virtual host (if set)
+SecurityManager security;
+if (vhost == null)
+{
+security = _appRegistry.getSecurityManager();
+}
+else
+{
+security =
_appRegistry.getVirtualHostRegistry().getVirtualHost(vhost).getSecurityManager();
+}
-try
+methodName = getMethodName(method, args);
+if (isAccessMethod(methodName) || impact == MBeanOperationInfo.INFO)
+{
+// Check for read-only method invocation permission
+if (!security.authoriseMethod(Operation.ACCESS, type, methodName))
{
-return doInvokeWrappingWithManagementActor(method, args);
+throw new SecurityException(Permission denied: Access +
methodName);
}
-finally
+}
+else
+{
+// Check for setting properties permission
+if (!security.authoriseMethod(Operation.UPDATE, type, methodName))
{
-if(_managementRightsInferAllAccess
svn commit: r1368979 - in /qpid/trunk/qpid/java: broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/ broker/src/main/java/org/apache/qpid/server/logging/actors/ broker/src/test/jav
Author: robbie
Date: Fri Aug 3 14:23:56 2012
New Revision: 1368979
URL: http://svn.apache.org/viewvc?rev=1368979view=rev
Log:
QPID-4187: Improve operational management logging: - make ManagementActor
thread-safe, stop caching of log string without context principal set, use
separate instance of ManagementActor with pre-set principal for opening and
closing notifications for JMX connections
Applied patch from Philip Harvey p...@philharveyonline.com and Oleksandr
Rudyyoru...@gmail.com
Modified:
qpid/trunk/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/MBeanInvocationHandlerImpl.java
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/actors/ManagementActor.java
qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/actors/ManagementActorTest.java
Modified:
qpid/trunk/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/MBeanInvocationHandlerImpl.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/MBeanInvocationHandlerImpl.java?rev=1368979r1=1368978r2=1368979view=diff
==
---
qpid/trunk/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/MBeanInvocationHandlerImpl.java
(original)
+++
qpid/trunk/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/MBeanInvocationHandlerImpl.java
Fri Aug 3 14:23:56 2012
@@ -22,6 +22,7 @@ package org.apache.qpid.server.jmx;
import org.apache.log4j.Logger;
+import org.apache.qpid.server.logging.LogActor;
import org.apache.qpid.server.logging.actors.CurrentActor;
import org.apache.qpid.server.logging.actors.ManagementActor;
import org.apache.qpid.server.logging.messages.ManagementConsoleMessages;
@@ -366,14 +367,17 @@ public class MBeanInvocationHandlerImpl
user = splitConnectionId[1];
}
+// use a separate instance of actor as subject is not set on
connect/disconnect
+// we need to pass principal name explicitly into log actor
+LogActor logActor = new
ManagementActor(_appRegistry.getRootMessageLogger(), user);
if (JMXConnectionNotification.OPENED.equals(type))
{
-_logActor.message(ManagementConsoleMessages.OPEN(user));
+logActor.message(ManagementConsoleMessages.OPEN(user));
}
else if (JMXConnectionNotification.CLOSED.equals(type) ||
JMXConnectionNotification.FAILED.equals(type))
{
-_logActor.message(ManagementConsoleMessages.CLOSE(user));
+logActor.message(ManagementConsoleMessages.CLOSE(user));
}
}
}
Modified:
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/actors/ManagementActor.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/actors/ManagementActor.java?rev=1368979r1=1368978r2=1368979view=diff
==
---
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/actors/ManagementActor.java
(original)
+++
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/actors/ManagementActor.java
Fri Aug 3 14:23:56 2012
@@ -30,16 +30,7 @@ import java.text.MessageFormat;
import java.util.Set;
/**
- * NOTE: This actor is not thread safe.
- *
- * Sharing of a ManagementActor instance between threads may result in an
- * incorrect actor value being logged.
- *
- * This is due to the fact that calls to message will dynamically query the
- * thread name and use that to set the log format during each message() call.
- *
- * This is currently not an issue as each MBean operation creates a new Actor
- * that is unique for each operation.
+ * Management actor to use in {@link MBeanInvocationHandlerImpl} to log all
management operational logging.
*/
public class ManagementActor extends AbstractActor
{
@@ -66,38 +57,45 @@ public class ManagementActor extends Abs
/**
* The logString to be used for logging
*/
-private String _logString;
+private String _logStringContainingPrincipal;
+
+/** used when the principal name cannot be discovered from the Subject */
+private final String _fallbackPrincipalName;
/** @param rootLogger The RootLogger to use for this Actor */
public ManagementActor(RootMessageLogger rootLogger)
{
super(rootLogger);
+_fallbackPrincipalName = UNKNOWN_PRINCIPAL;
+}
+
+public ManagementActor(RootMessageLogger rootLogger, String principalName)
+{
+super(rootLogger);
+_fallbackPrincipalName = principalName;
}
-private void updateLogString()
+private synchronized String getAndCacheLogString()
{
String currentName = Thread.currentThread
svn commit: r1369046 - /qpid/trunk/qpid/java/broker/etc/broker_example.acl
Author: robbie Date: Fri Aug 3 15:38:44 2012 New Revision: 1369046 URL: http://svn.apache.org/viewvc?rev=1369046view=rev Log: QPID-4185: improve broker_example.acl to give more reasonable settings, replacing some ALLOW-LOG with ALLOW for read only operations and removing 'dead rule' example. Applied patch from Philip Harvey p...@philharveyonline.com , Oleksandr Rudyyoru...@gmail.com and myself. Modified: qpid/trunk/qpid/java/broker/etc/broker_example.acl Modified: qpid/trunk/qpid/java/broker/etc/broker_example.acl URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/etc/broker_example.acl?rev=1369046r1=1369045r2=1369046view=diff == --- qpid/trunk/qpid/java/broker/etc/broker_example.acl (original) +++ qpid/trunk/qpid/java/broker/etc/broker_example.acl Fri Aug 3 15:38:44 2012 @@ -18,6 +18,7 @@ # ### EXAMPLE ACL V2 FILE +### NOTE: Rules are considered from top to bottom, and the first matching rule governs the decision. ### DEFINE GROUPS ### @@ -27,30 +28,30 @@ GROUP messaging-users client server #Define a group for management web console users GROUP webadmins webadmin -### MANAGEMENT +### JMX MANAGEMENT # Allow everyone to perform read operations on the ServerInformation mbean # This is used for items such as querying the management API and broker release versions. -ACL ALLOW-LOG ALL ACCESS METHOD component=ServerInformation +ACL ALLOW ALL ACCESS METHOD component=ServerInformation -# Allow 'admin' all management operations +# Allow 'admin' all management operations. To reduce log file noise, only non-read-only operations are logged. +ACL ALLOW admin ACCESS METHOD ACL ALLOW-LOG admin ALL METHOD +# Allow 'guest' to view logger levels, and use getter methods on LoggingManagement +ACL ALLOW guest ACCESS METHOD component=LoggingManagement name=viewEffectiveRuntimeLoggerLevels +ACL ALLOW guest ACCESS METHOD component=LoggingManagement name=get* + # Deny access to Shutdown, UserManagement, ConfigurationManagement and LoggingManagement for all other users -# You could grant specific users access to these beans by adding ALLOW-LOG rules above for them +# You could grant specific users access to these beans by adding rules above to allow them ACL DENY-LOG ALL ACCESS METHOD component=Shutdown ACL DENY-LOG ALL ACCESS METHOD component=UserManagement ACL DENY-LOG ALL ACCESS METHOD component=ConfigurationManagement ACL DENY-LOG ALL ACCESS METHOD component=LoggingManagement -# Allow 'guest' to view logger levels, and use getter methods on LoggingManagement -# These are examples of redundant rules! The DENY-LOG rule above will be invoked -# first and will deny the access to all methods of LoggingManagement for guest -ACL ALLOW-LOG guest ACCESS METHOD component=LoggingManagement name=viewEffectiveRuntimeLoggerLevels -ACL ALLOW-LOG guest ACCESS METHOD component=LoggingManagement name=get* - -# Allow everyone to perform all read operations on the mbeans not listened in the DENY-LOG rules above -ACL ALLOW-LOG ALL ACCESS METHOD +# Allow everyone to perform all read operations (using ALLOW rather than ALLOW-LOG to reduce log file noise) +# on the mbeans not listed in the DENY rules above +ACL ALLOW ALL ACCESS METHOD ### MESSAGING ### - To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
svn commit: r1369065 - /qpid/trunk/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/MBeanInvocationHandlerImpl.java
Author: robbie
Date: Fri Aug 3 16:01:01 2012
New Revision: 1369065
URL: http://svn.apache.org/viewvc?rev=1369065view=rev
Log:
QPID-4188: add fallback exception/error logging to MBeanInvocationHandlerImpl
Applied patch from Philip Harvey p...@philharveyonline.com and Oleksandr
Rudyyoru...@gmail.com
Modified:
qpid/trunk/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/MBeanInvocationHandlerImpl.java
Modified:
qpid/trunk/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/MBeanInvocationHandlerImpl.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/MBeanInvocationHandlerImpl.java?rev=1369065r1=1369064r2=1369065view=diff
==
---
qpid/trunk/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/MBeanInvocationHandlerImpl.java
(original)
+++
qpid/trunk/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/MBeanInvocationHandlerImpl.java
Fri Aug 3 16:01:01 2012
@@ -39,6 +39,7 @@ import javax.management.MBeanServer;
import javax.management.Notification;
import javax.management.NotificationListener;
import javax.management.ObjectName;
+import javax.management.RuntimeErrorException;
import javax.management.remote.JMXConnectionNotification;
import javax.management.remote.JMXPrincipal;
import javax.management.remote.MBeanServerForwarder;
@@ -49,6 +50,7 @@ import java.lang.reflect.Method;
import java.lang.reflect.Proxy;
import java.security.AccessControlContext;
import java.security.AccessController;
+import java.util.Arrays;
import java.util.Map;
import java.util.Set;
@@ -170,7 +172,30 @@ public class MBeanInvocationHandlerImpl
}
catch (InvocationTargetException e)
{
-throw e.getTargetException();
+Throwable targetException = e.getCause();
+logTargetException(method, args, targetException);
+throw targetException;
+}
+}
+
+private void logTargetException(Method method, Object[] args, Throwable
targetException)
+{
+Throwable error = null;
+if (targetException instanceof RuntimeErrorException)
+{
+error = ((RuntimeErrorException)targetException).getCause();
+}
+else if (targetException instanceof Error)
+{
+error = targetException;
+}
+if (error == null)
+{
+_logger.debug(Exception was thrown on invoking of + method +
with arguments + Arrays.toString(args), targetException);
+}
+else
+{
+_logger.error(Unexpected error occured on invoking of + method
+ with arguments + Arrays.toString(args), targetException);
}
}
-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
svn commit: r1370651 - /qpid/site/docs/proton/mailing_lists.html
Author: robbie Date: Wed Aug 8 02:58:05 2012 New Revision: 1370651 URL: http://svn.apache.org/viewvc?rev=1370651view=rev Log: NO-JIRA: add a Nabble archive/forum for the Proton mailing list Modified: qpid/site/docs/proton/mailing_lists.html Modified: qpid/site/docs/proton/mailing_lists.html URL: http://svn.apache.org/viewvc/qpid/site/docs/proton/mailing_lists.html?rev=1370651r1=1370650r2=1370651view=diff == --- qpid/site/docs/proton/mailing_lists.html (original) +++ qpid/site/docs/proton/mailing_lists.html Wed Aug 8 02:58:05 2012 @@ -63,6 +63,7 @@ liThe proton mailing list is archived. You can view the archive at: ul liApache: a href=http://mail-archives.apache.org/mod_mbox/qpid-proton/;http://mail-archives.apache.org/mod_mbox/qpid-proton//abr//li + liNabble: a href=http://qpid.2158936.n2.nabble.com/Apache-Qpid-Proton-f7580687.html;http://qpid.2158936.n2.nabble.com/Apache-Qpid-Proton-f7580687.html/abr//li /ul /li /ul - To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
svn commit: r1372147 - in /qpid/trunk/qpid/java: client/src/main/java/org/apache/qpid/client/ client/src/main/java/org/apache/qpid/jms/ client/src/test/java/org/apache/qpid/test/unit/client/BrokerDeta
Author: robbie
Date: Sun Aug 12 16:44:50 2012
New Revision: 1372147
URL: http://svn.apache.org/viewvc?rev=1372147view=rev
Log:
QPID-4051: use the connecttimeout option value from the BrokerDetails object to
control the connect() timeout via the produced ConnectionSettings object
Modified:
qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQBrokerDetails.java
qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/jms/BrokerDetails.java
qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/BrokerDetails/BrokerDetailsTest.java
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/ConnectionSettings.java
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/IoNetworkTransport.java
Modified:
qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQBrokerDetails.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQBrokerDetails.java?rev=1372147r1=1372146r2=1372147view=diff
==
---
qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQBrokerDetails.java
(original)
+++
qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQBrokerDetails.java
Sun Aug 12 16:44:50 2012
@@ -245,13 +245,13 @@ public class AMQBrokerDetails implements
_options.put(key, value);
}
-public long getTimeout()
+private int lookupConnectTimeout()
{
if (_options.containsKey(OPTIONS_CONNECT_TIMEOUT))
{
try
{
-return Long.parseLong(_options.get(OPTIONS_CONNECT_TIMEOUT));
+return Integer.parseInt(_options.get(OPTIONS_CONNECT_TIMEOUT));
}
catch (NumberFormatException nfe)
{
@@ -290,11 +290,6 @@ public class AMQBrokerDetails implements
}
}
-public void setTimeout(long timeout)
-{
-setProperty(OPTIONS_CONNECT_TIMEOUT, Long.toString(timeout));
-}
-
public String toString()
{
StringBuffer sb = new StringBuffer();
@@ -460,6 +455,8 @@ public class AMQBrokerDetails implements
getBooleanProperty(BrokerDetails.OPTIONS_TCP_NO_DELAY,true));
}
+conSettings.setConnectTimeout(lookupConnectTimeout());
+
return conSettings;
}
}
Modified:
qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/jms/BrokerDetails.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/jms/BrokerDetails.java?rev=1372147r1=1372146r2=1372147view=diff
==
---
qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/jms/BrokerDetails.java
(original)
+++
qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/jms/BrokerDetails.java
Sun Aug 12 16:44:50 2012
@@ -59,7 +59,7 @@ public interface BrokerDetails
public static final String URL_FORMAT_EXAMPLE =
transport://hostname[:port Default=\ + DEFAULT_PORT +
\][?option='value'[,option='value']];
-public static final long DEFAULT_CONNECT_TIMEOUT = 3L;
+public static final int DEFAULT_CONNECT_TIMEOUT = 3;
public static final boolean USE_SSL_DEFAULT = false;
// pulled these properties from the new BrokerDetails class in the qpid
package
@@ -101,10 +101,6 @@ public interface BrokerDetails
*/
public void setProperties(MapString,String props);
-long getTimeout();
-
-void setTimeout(long timeout);
-
boolean getBooleanProperty(String propName);
String toString();
Modified:
qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/BrokerDetails/BrokerDetailsTest.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/BrokerDetails/BrokerDetailsTest.java?rev=1372147r1=1372146r2=1372147view=diff
==
---
qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/BrokerDetails/BrokerDetailsTest.java
(original)
+++
qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/BrokerDetails/BrokerDetailsTest.java
Sun Aug 12 16:44:50 2012
@@ -24,6 +24,7 @@ import junit.framework.TestCase;
import org.apache.qpid.client.AMQBrokerDetails;
import org.apache.qpid.jms.BrokerDetails;
+import org.apache.qpid.transport.ConnectionSettings;
import org.apache.qpid.url.URLSyntaxException;
public class BrokerDetailsTest extends TestCase
@@ -49,6 +50,29 @@ public class BrokerDetailsTest extends T
assertFalse(value should be false,
Boolean.valueOf(broker.getProperty(BrokerDetails.OPTIONS_TCP_NO_DELAY)));
}
+public void testDefaultConnectTimeout() throws URLSyntaxException
+{
+String brokerURL = tcp://localhost
svn commit: r1372148 - in /qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid: configuration/ClientProperties.java configuration/CommonProperties.java transport/ConnectionSettings.java transpor
Author: robbie
Date: Sun Aug 12 16:45:13 2012
New Revision: 1372148
URL: http://svn.apache.org/viewvc?rev=1372148view=rev
Log:
NO-JIRA: add a system property for configuring the historically hard coded
timeout value in IoNetworkTransport, remove dead code in ConnectionSettings
Added:
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/configuration/CommonProperties.java
Modified:
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/configuration/ClientProperties.java
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/ConnectionSettings.java
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/IoNetworkTransport.java
Modified:
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/configuration/ClientProperties.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/configuration/ClientProperties.java?rev=1372148r1=1372147r2=1372148view=diff
==
---
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/configuration/ClientProperties.java
(original)
+++
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/configuration/ClientProperties.java
Sun Aug 12 16:45:13 2012
@@ -20,10 +20,11 @@ package org.apache.qpid.configuration;
/**
* This class centralized the Qpid client properties.
+ *
+ * @see CommonProperties
*/
public class ClientProperties
{
-
/**
* Currently with Qpid it is not possible to change the client ID.
* If one is not specified upon connection construction, an id is
generated automatically.
@@ -118,10 +119,6 @@ public class ClientProperties
*/
public static final String REJECT_BEHAVIOUR_PROP_NAME =
qpid.reject.behaviour;
-private ClientProperties()
-{
-}
-
/**
* System property used to set the key manager factory algorithm.
*
@@ -192,4 +189,10 @@ public class ClientProperties
* waiting because the client was flow controlled by the broker.
*/
public static final long DEFAULT_FLOW_CONTROL_WAIT_NOTIFY_PERIOD = 5000L;
+
+
+private ClientProperties()
+{
+//No instances
+}
}
Added:
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/configuration/CommonProperties.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/configuration/CommonProperties.java?rev=1372148view=auto
==
---
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/configuration/CommonProperties.java
(added)
+++
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/configuration/CommonProperties.java
Sun Aug 12 16:45:13 2012
@@ -0,0 +1,41 @@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * License); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+package org.apache.qpid.configuration;
+
+/**
+ * Centralised record of Qpid common properties.
+ *
+ * @see ClientProperties
+ */
+public class CommonProperties
+{
+/**
+ * The timeout used by the IO layer for timeouts such as send timeout in
IoSender, and the close timeout for IoSender and IoReceiver
+ */
+public static final String IO_NETWORK_TRANSPORT_TIMEOUT_PROP_NAME =
qpid.io_network_transport_timeout;
+public static final int IO_NETWORK_TRANSPORT_TIMEOUT_DEFAULT = 6;
+
+
+private CommonProperties()
+{
+//no instances
+}
+}
Modified:
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/ConnectionSettings.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/ConnectionSettings.java?rev=1372148r1=1372147r2=1372148view=diff
==
---
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/ConnectionSettings.java
(original)
+++
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/transport/ConnectionSettings.java
Sun Aug 12 16:45:13 2012
@@ -63,7 +63,6 @@ public class ConnectionSettings
private int connectTimeout = 3;
private int readBufferSize = QpidProperty.intProperty(65535,
RECEIVE_BUFFER_SIZE_PROP_NAME
svn commit: r1372172 - /qpid/trunk/qpid/doc/book/src/java-broker/HA-Guide.xml
Author: robbie Date: Sun Aug 12 18:46:21 2012 New Revision: 1372172 URL: http://svn.apache.org/viewvc?rev=1372172view=rev Log: QPID-4111: fix issue in the docbook markup to get the PDF generation working again Modified: qpid/trunk/qpid/doc/book/src/java-broker/HA-Guide.xml Modified: qpid/trunk/qpid/doc/book/src/java-broker/HA-Guide.xml URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/doc/book/src/java-broker/HA-Guide.xml?rev=1372172r1=1372171r2=1372172view=diff == --- qpid/trunk/qpid/doc/book/src/java-broker/HA-Guide.xml (original) +++ qpid/trunk/qpid/doc/book/src/java-broker/HA-Guide.xml Sun Aug 12 18:46:21 2012 @@ -26,8 +26,9 @@ under the License. -- -section +section id=High-Availability titleHigh Availability/title + section role=h3 id=HAGeneralIntroduction titleGeneral Introduction/title paraThe term High Availability (HA) usually refers to having a number of instances of a service such as a Message Broker @@ -40,6 +41,7 @@ some kind of standby state, awaiting to quickly step-in in the event the active node becomes unavailable. /para /section + section role=h3 id=HAOfferingsOfJavaBroker titleHA offerings of the Java Broker/title paraThe Java Broker's HA offering became available at release emphasis role=bold0.18/emphasis. HA is provided by way of the HA @@ -60,6 +62,7 @@ paraHA is not currently available for those using the the emphasis role=boldDerby Store/emphasis or emphasis role=boldMemory Message Store/emphasis./para /section + section role=h3 id=HATwoNodeCluster titleTwo Node Cluster/title section role=h4 @@ -283,11 +286,13 @@ /section /section /section + section role=h3 id=HAMultiNodeCluster titleMulti Node Cluster/title paraMulti node clusters, that is clusters where the number of nodes is three or more, are not yet ready for use./para /section + section role=h3 id=HAConfiguration titleConfiguring a Virtual Host to be a node/title paraTo configure a virtualhost as a cluster node, configure the virtualhost.xml in the following manner:/para @@ -385,6 +390,7 @@ /store]]/programlisting /section /section + section role=h3 id=HADurabilityGuarantee titleDurability Guarantees/title paraThe term ulink url=http://en.wikipedia.org/wiki/ACID#Durability;durability/ulink is used to mean that once a @@ -480,6 +486,7 @@ /para /section /section + section id=HAClientFailover titleClient failover configuration/title paraThe details about format of Qpid connection URLs can be found at section @@ -495,6 +502,8 @@ amqp://guest:guest@clientid/test?brokerlist='tcp://localhost:5672?connectdelay='2000'retries='3';tcp://localhost:5671?connectdelay='2000'retries='3';tcp://localhost:5673?connectdelay='2000'retries='3''failover='roundrobin?cyclecount='30'' ]]/example /section + + section role=h3 id=HAJMXAPI titleQpid JMX API for HA/title paraQpid exposes the BDB HA store information via its JMX interface and provides APIs to remove a Node from @@ -569,6 +578,7 @@ amqp://guest:guest@clientid/test?brokerl /tr /tbody /table + table border=1 titleMbean classnameBDBHAMessageStore/classname operations/title thead @@ -592,15 +602,15 @@ amqp://guest:guest@clientid/test?brokerl tdupdateAddress/td td itemizedlist - itemizedlist + listitem paraemphasisnodeName/emphasis, name of node, string/para - /itemizedlist - itemizedlist + /listitem + listitem paraemphasisnewHostName/emphasis, new host name, string/para - /itemizedlist - itemizedlist + /listitem + listitem paraemphasisnewPort/emphasis, new port number, int/para - /itemizedlist + /listitem /itemizedlist /td tdvoid/td @@ -632,6 +642,7 @@ System.out.println(Node state: + state screen![CDATA[Node state:MASTER]]/screen /example /section + section id=BDB-HA-Monitoring-cluster titleMonitoring cluster/title paraIn order to discover potential issues with HA Cluster early, all nodes in the Cluster should be monitored on regular basis @@ -704,6 +715,7 @@ Current state of node: Node-5001 from gr /listitem /itemizedlist /section + section id=HADiskSpace titleDisk space requirements/title paraDisk space is a critical resource for the HA Qpid broker./para @@ -717,6 +729,7 @@ Current state of node: Node-5001 from gr Please, make sure to allocate enough space on your disk to avoid this from happening. /para /section + section id=BDB-HA-Network-Requirements titleNetwork Requirements/title paraThe
svn commit: r1372176 - in /qpid/branches/0.18/qpid/doc/book: ./ src/java-broker/HA-Guide.xml
Author: robbie Date: Sun Aug 12 18:54:13 2012 New Revision: 1372176 URL: http://svn.apache.org/viewvc?rev=1372176view=rev Log: QPID-4111: fix issue in the docbook markup to get the PDF generation working again merged change from trunk r1372172 Modified: qpid/branches/0.18/qpid/doc/book/ (props changed) qpid/branches/0.18/qpid/doc/book/src/java-broker/HA-Guide.xml Propchange: qpid/branches/0.18/qpid/doc/book/ -- --- svn:mergeinfo (added) +++ svn:mergeinfo Sun Aug 12 18:54:13 2012 @@ -0,0 +1,7 @@ +/qpid/branches/0.5.x-dev/qpid/doc/book:892761,894875 +/qpid/branches/0.6-release-windows-installer/doc/book:926803 +/qpid/branches/0.6-release-windows-installer/qpid/doc/book:926803,927233 +/qpid/branches/java-network-refactor/qpid/doc/book:805429-825319 +/qpid/branches/qpid-2935/qpid/doc/book:1061302-1072333 +/qpid/branches/qpid-3346/qpid/doc/book:1144319-1179855 +/qpid/trunk/qpid/doc/book:1359595,1363498,1363520,1372172 Modified: qpid/branches/0.18/qpid/doc/book/src/java-broker/HA-Guide.xml URL: http://svn.apache.org/viewvc/qpid/branches/0.18/qpid/doc/book/src/java-broker/HA-Guide.xml?rev=1372176r1=1372175r2=1372176view=diff == --- qpid/branches/0.18/qpid/doc/book/src/java-broker/HA-Guide.xml (original) +++ qpid/branches/0.18/qpid/doc/book/src/java-broker/HA-Guide.xml Sun Aug 12 18:54:13 2012 @@ -26,8 +26,9 @@ under the License. -- -section +section id=High-Availability titleHigh Availability/title + section role=h3 id=HAGeneralIntroduction titleGeneral Introduction/title paraThe term High Availability (HA) usually refers to having a number of instances of a service such as a Message Broker @@ -40,6 +41,7 @@ some kind of standby state, awaiting to quickly step-in in the event the active node becomes unavailable. /para /section + section role=h3 id=HAOfferingsOfJavaBroker titleHA offerings of the Java Broker/title paraThe Java Broker's HA offering became available at release emphasis role=bold0.18/emphasis. HA is provided by way of the HA @@ -60,6 +62,7 @@ paraHA is not currently available for those using the the emphasis role=boldDerby Store/emphasis or emphasis role=boldMemory Message Store/emphasis./para /section + section role=h3 id=HATwoNodeCluster titleTwo Node Cluster/title section role=h4 @@ -283,11 +286,13 @@ /section /section /section + section role=h3 id=HAMultiNodeCluster titleMulti Node Cluster/title paraMulti node clusters, that is clusters where the number of nodes is three or more, are not yet ready for use./para /section + section role=h3 id=HAConfiguration titleConfiguring a Virtual Host to be a node/title paraTo configure a virtualhost as a cluster node, configure the virtualhost.xml in the following manner:/para @@ -385,6 +390,7 @@ /store]]/programlisting /section /section + section role=h3 id=HADurabilityGuarantee titleDurability Guarantees/title paraThe term ulink url=http://en.wikipedia.org/wiki/ACID#Durability;durability/ulink is used to mean that once a @@ -480,6 +486,7 @@ /para /section /section + section id=HAClientFailover titleClient failover configuration/title paraThe details about format of Qpid connection URLs can be found at section @@ -495,6 +502,8 @@ amqp://guest:guest@clientid/test?brokerlist='tcp://localhost:5672?connectdelay='2000'retries='3';tcp://localhost:5671?connectdelay='2000'retries='3';tcp://localhost:5673?connectdelay='2000'retries='3''failover='roundrobin?cyclecount='30'' ]]/example /section + + section role=h3 id=HAJMXAPI titleQpid JMX API for HA/title paraQpid exposes the BDB HA store information via its JMX interface and provides APIs to remove a Node from @@ -569,6 +578,7 @@ amqp://guest:guest@clientid/test?brokerl /tr /tbody /table + table border=1 titleMbean classnameBDBHAMessageStore/classname operations/title thead @@ -592,15 +602,15 @@ amqp://guest:guest@clientid/test?brokerl tdupdateAddress/td td itemizedlist - itemizedlist + listitem paraemphasisnodeName/emphasis, name of node, string/para - /itemizedlist - itemizedlist + /listitem + listitem paraemphasisnewHostName/emphasis, new host name, string/para - /itemizedlist - itemizedlist + /listitem + listitem paraemphasisnewPort/emphasis, new port number, int/para - /itemizedlist + /listitem /itemizedlist /td tdvoid/td @@ -632,6 +642,7 @@ System.out.println(Node state: + state screen![CDATA[Node
svn commit: r1372179 [7/18] - in /qpid/site/docs/books/0.18: ./ AMQP-Messaging-Broker-CPP-Book/ AMQP-Messaging-Broker-CPP-Book/html/ AMQP-Messaging-Broker-CPP-Book/html/css/ AMQP-Messaging-Broker-CPP-
Added: qpid/site/docs/books/0.18/AMQP-Messaging-Broker-CPP-Book/html/queue-state-replication.html URL: http://svn.apache.org/viewvc/qpid/site/docs/books/0.18/AMQP-Messaging-Broker-CPP-Book/html/queue-state-replication.html?rev=1372179view=auto == --- qpid/site/docs/books/0.18/AMQP-Messaging-Broker-CPP-Book/html/queue-state-replication.html (added) +++ qpid/site/docs/books/0.18/AMQP-Messaging-Broker-CPP-Book/html/queue-state-replication.html Sun Aug 12 19:03:49 2012 @@ -0,0 +1,227 @@ +htmlheadmeta http-equiv=Content-Type content=text/html; charset=UTF-8title1.7. Queue State Replication/titlelink rel=stylesheet href=css/style.css type=text/cssmeta name=generator content=DocBook XSL Stylesheets V1.73.2link rel=start href=index.html title=AMQP Messaging Broker (Implemented in C++)link rel=up href=ch01.html title=Chapter 1. Running the AMQP Messaging Brokerlink rel=prev href=ch01s06.html title=1.6. LVQ - Last Value Queuelink rel=next href=chap-Messaging_User_Guide-Active_Active_Cluster.html title=1.8. Active-active Messaging Clusters/headbodydiv class=container bgcolor=white text=black link=#FF vlink=#840084 alink=#FFDIV class=headerDIV class=logoH1Apache Qpidâ¢/H1H2Open Source AMQP Messaging/H2/DIV/DIVDIV class=menu_boxDIV class=menu_box_top/DIVDIV class=menu_box_bodyH3Apache Qpid/H3ULLIA href=http://qpid.apac he.org/index.htmlHome/A/LILIA href=http://qpid.apache.org/download.html;Download/A/LILIA href=http://qpid.apache.org/getting_started.html;Getting Started/A/LILIA href=http://www.apache.org/licenses/;License/A/LILIA href=https://cwiki.apache.org/qpid/faq.html;FAQ/A/LI/UL/DIVDIV class=menu_box_bottom/DIVDIV class=menu_box_top/DIVDIV class=menu_box_bodyH3Documentation/H3ULLIA href=http://qpid.apache.org/documentation.html#doc-release;0.14 Release/A/LILIA href=http://qpid.apache.org/documentation.html#doc-trunk;Trunk/A/LILIA href=http://qpid.apache.org/documentation.html#doc-archives;Archive/A/LI/UL/DIVDIV class=menu_box_bottom/DIVDIV class=menu_box_top/DIVDIV class=menu_box_bodyH3Community/H3ULLIA href=http://qpid.apache.org/getting_involved.html;Getting Involved/A/LILIA href=http://qpid.apache.org/source_repository.html;Source Repository/A/L ILIA href=http://qpid.apache.org/mailing_lists.html;Mailing Lists/A/LILIA href=https://cwiki.apache.org/qpid/;Wiki/A/LILIA href=https://issues.apache.org/jira/browse/qpid;Issue Reporting/A/LILIA href=http://qpid.apache.org/people.html;People/A/LILIA href=http://qpid.apache.org/acknowledgements.html;Acknowledgements/A/LI/UL/DIVDIV class=menu_box_bottom/DIVDIV class=menu_box_top/DIVDIV class=menu_box_bodyH3Developers/H3ULLIA href=https://cwiki.apache.org/qpid/building.html;Building Qpid/A/LILIA href=https://cwiki.apache.org/qpid/developer-pages.html;Developer Pages/A/LI/UL/DIVDIV class=menu_box_bottom/DIVDIV class=menu_box_top/DIVDIV class=menu_box_bodyH3About AMQP/H3ULLIA href=http://qpid.apache.org/amqp.html;What is AMQP?/A/LI/UL/DIVDIV class=menu_box_bottom/DIVDIV class=menu_box_top/DIVDIV class=menu_box_bodyH3About Apache/H3U LLIA href=http://www.apache.org;Home/A/LILIA href=http://www.apache.org/foundation/sponsorship.html;Sponsorship/A/LILIA href=http://www.apache.org/foundation/thanks.html;Thanks/A/LILIA href=http://www.apache.org/security/;Security/A/LI/UL/DIVDIV class=menu_box_bottom/DIV/DIVdiv class=main_text_areadiv class=main_text_area_top/divdiv class=main_text_area_bodyDIV class=breadcrumbsspan class=breadcrumb-linka href=index.htmlAMQP Messaging Broker (Implemented in C++)/a/span gt; span class=breadcrumb-linka href=ch01.html + Running the AMQP Messaging Broker +/a/span gt; span class=breadcrumb-node +Queue State Replication + /span/DIVdiv class=section lang=endiv class=titlepagedivdivh2 class=titlea name=queue-state-replication/a1.7. +Queue State Replication + /h2/div/div/divdiv class=section lang=endiv class=titlepagedivdivh3 class=titlea name=queuestatereplication-AsynchronousReplicationofQueueState/a1.7.1. + Asynchronous + Replication of Queue State +/h3/div/div/divdiv class=section lang=endiv class=titlepagedivdivh4 class=titlea name=queuestatereplication-Overview/a1.7.1.1. + Overview + /h4/div/div/divp + There is support in qpidd for selective asynchronous replication + of queue state. This is achieved by: + /pp + (a) enabling event generation for the queues in question + /pp + (b) loading a plugin on the 'source' broker to encode those + events as messages on a replication queue (this plugin is + called + replicating_listener.so) + /pp + (c) loading a custom exchange plugin on the 'backup' broker (this + plugin is called replication_exchange.so) + /pp + (d) creating an instance of the replication exchange type on the + backup broker + /pp + (e)
svn commit: r1372179 [11/18] - in /qpid/site/docs/books/0.18: ./ AMQP-Messaging-Broker-CPP-Book/ AMQP-Messaging-Broker-CPP-Book/html/ AMQP-Messaging-Broker-CPP-Book/html/css/ AMQP-Messaging-Broker-CPP
Added: qpid/site/docs/books/0.18/AMQP-Messaging-Broker-Java-Book/html/Qpid-Java-Broker-HowTos.html URL: http://svn.apache.org/viewvc/qpid/site/docs/books/0.18/AMQP-Messaging-Broker-Java-Book/html/Qpid-Java-Broker-HowTos.html?rev=1372179view=auto == --- qpid/site/docs/books/0.18/AMQP-Messaging-Broker-Java-Book/html/Qpid-Java-Broker-HowTos.html (added) +++ qpid/site/docs/books/0.18/AMQP-Messaging-Broker-Java-Book/html/Qpid-Java-Broker-HowTos.html Sun Aug 12 19:03:49 2012 @@ -0,0 +1,243 @@ +htmlheadmeta http-equiv=Content-Type content=text/html; charset=UTF-8titleChapter 2. How Tos/titlelink rel=stylesheet href=css/style.css type=text/cssmeta name=generator content=DocBook XSL Stylesheets V1.73.2link rel=start href=index.html title=AMQP Messaging Broker (Implemented in Java)link rel=up href=index.html title=AMQP Messaging Broker (Implemented in Java)link rel=prev href=High-Availability.html title=1.6. High Availabilitylink rel=next href=Configuring-ACLS.html title=2.2. Configuring ACLs/headbodydiv class=container bgcolor=white text=black link=#FF vlink=#840084 alink=#FFDIV class=headerDIV class=logoH1Apache Qpidâ¢/H1H2Open Source AMQP Messaging/H2/DIV/DIVDIV class=menu_boxDIV class=menu_box_top/DIVDIV class=menu_box_bodyH3Apache Qpid/H3ULLIA href=http://qpid.apache.org/index.html;Home/A/LILIA href=http://qpi d.apache.org/download.htmlDownload/A/LILIA href=http://qpid.apache.org/getting_started.html;Getting Started/A/LILIA href=http://www.apache.org/licenses/;License/A/LILIA href=https://cwiki.apache.org/qpid/faq.html;FAQ/A/LI/UL/DIVDIV class=menu_box_bottom/DIVDIV class=menu_box_top/DIVDIV class=menu_box_bodyH3Documentation/H3ULLIA href=http://qpid.apache.org/documentation.html#doc-release;0.14 Release/A/LILIA href=http://qpid.apache.org/documentation.html#doc-trunk;Trunk/A/LILIA href=http://qpid.apache.org/documentation.html#doc-archives;Archive/A/LI/UL/DIVDIV class=menu_box_bottom/DIVDIV class=menu_box_top/DIVDIV class=menu_box_bodyH3Community/H3ULLIA href=http://qpid.apache.org/getting_involved.html;Getting Involved/A/LILIA href=http://qpid.apache.org/source_repository.html;Source Repository/A/LILIA href=http://qpid.apache.org/mailing_lists.htm lMailing Lists/A/LILIA href=https://cwiki.apache.org/qpid/;Wiki/A/LILIA href=https://issues.apache.org/jira/browse/qpid;Issue Reporting/A/LILIA href=http://qpid.apache.org/people.html;People/A/LILIA href=http://qpid.apache.org/acknowledgements.html;Acknowledgements/A/LI/UL/DIVDIV class=menu_box_bottom/DIVDIV class=menu_box_top/DIVDIV class=menu_box_bodyH3Developers/H3ULLIA href=https://cwiki.apache.org/qpid/building.html;Building Qpid/A/LILIA href=https://cwiki.apache.org/qpid/developer-pages.html;Developer Pages/A/LI/UL/DIVDIV class=menu_box_bottom/DIVDIV class=menu_box_top/DIVDIV class=menu_box_bodyH3About AMQP/H3ULLIA href=http://qpid.apache.org/amqp.html;What is AMQP?/A/LI/UL/DIVDIV class=menu_box_bottom/DIVDIV class=menu_box_top/DIVDIV class=menu_box_bodyH3About Apache/H3ULLIA href=http://www.apache.org;Home/A/LILI A href=http://www.apache.org/foundation/sponsorship.html;Sponsorship/A/LILIA href=http://www.apache.org/foundation/thanks.html;Thanks/A/LILIA href=http://www.apache.org/security/;Security/A/LI/UL/DIVDIV class=menu_box_bottom/DIV/DIVdiv class=main_text_areadiv class=main_text_area_top/divdiv class=main_text_area_bodyDIV class=breadcrumbsspan class=breadcrumb-linka href=index.htmlAMQP Messaging Broker (Implemented in Java)/a/span gt; span class=breadcrumb-nodeHow Tos/span/DIVdiv class=chapter lang=endiv class=titlepagedivdivh2 class=titlea name=Qpid-Java-Broker-HowTos/aChapter 2. How Tos/h2/div/div/divdiv class=tocpbTable of Contents/b/pdldtspan class=sectiona href=Qpid-Java-Broker-HowTos.html#id24952142.1. + Add New Users +/a/span/dtdddldtspan class=sectiona href=Qpid-Java-Broker-HowTos.html#AddNewUsers-AvailablePasswordfileformats2.1.1. +Available +Password file formats + /a/span/dtdtspan class=sectiona href=Qpid-Java-Broker-HowTos.html#AddNewUsers-Dynamicchangestopasswordfiles.2.1.2. +Dynamic +changes to password files. + /a/span/dtdtspan class=sectiona href=Qpid-Java-Broker-HowTos.html#AddNewUsers-HowpasswordfilesandPrincipalDatabasesrelatetoauthenticationmechanisms2.1.3. +How password files and PrincipalDatabases relate to +authentication mechanisms + /a/span/dt/dl/dddtspan class=sectiona href=Configuring-ACLS.html2.2. + Configuring ACLs + /a/span/dtdddldtspan class=sectiona href=Configuring-ACLS.html#ConfigureACLs-EnablingACL2.2.1. + Enabling ACLs +/a/span/dtdtspan class=sectiona href=Configuring-ACLS.html#ConfigureACLs-WriteACL2.2.2. + Writing .acl files +/a/span/dtdtspan class=sectiona href=Configuring-ACLS.html#ConfigureACLs-Syntax2.2.3.
svn commit: r1372179 [18/18] - in /qpid/site/docs/books/0.18: ./ AMQP-Messaging-Broker-CPP-Book/ AMQP-Messaging-Broker-CPP-Book/html/ AMQP-Messaging-Broker-CPP-Book/html/css/ AMQP-Messaging-Broker-CPP
Added: qpid/site/docs/books/0.18/Programming-In-Apache-Qpid-Book/html/section-amqp0-10-mapping.html URL: http://svn.apache.org/viewvc/qpid/site/docs/books/0.18/Programming-In-Apache-Qpid-Book/html/section-amqp0-10-mapping.html?rev=1372179view=auto == --- qpid/site/docs/books/0.18/Programming-In-Apache-Qpid-Book/html/section-amqp0-10-mapping.html (added) +++ qpid/site/docs/books/0.18/Programming-In-Apache-Qpid-Book/html/section-amqp0-10-mapping.html Sun Aug 12 19:03:49 2012 @@ -0,0 +1,164 @@ +htmlheadmeta http-equiv=Content-Type content=text/html; charset=UTF-8title2.16. The AMQP 0-10 mapping/titlelink rel=stylesheet href=css/style.css type=text/cssmeta name=generator content=DocBook XSL Stylesheets V1.73.2link rel=start href=index.html title=Programming in Apache Qpidlink rel=up href=ch02.html title=Chapter 2. Using the Qpid Messaging APIlink rel=prev href=ch02s15.html title=2.15. Logginglink rel=next href=Message-Groups-Guide.html title=2.17. Using Message Groups/headbodydiv class=container bgcolor=white text=black link=#FF vlink=#840084 alink=#FFDIV class=headerDIV class=logoH1Apache Qpidâ¢/H1H2Open Source AMQP Messaging/H2/DIV/DIVDIV class=menu_boxDIV class=menu_box_top/DIVDIV class=menu_box_bodyH3Apache Qpid/H3ULLIA href=http://qpid.apache.org/index.html;Home/A/LILIA href=http://qpid.apache.org/download .htmlDownload/A/LILIA href=http://qpid.apache.org/getting_started.html;Getting Started/A/LILIA href=http://www.apache.org/licenses/;License/A/LILIA href=https://cwiki.apache.org/qpid/faq.html;FAQ/A/LI/UL/DIVDIV class=menu_box_bottom/DIVDIV class=menu_box_top/DIVDIV class=menu_box_bodyH3Documentation/H3ULLIA href=http://qpid.apache.org/documentation.html#doc-release;0.14 Release/A/LILIA href=http://qpid.apache.org/documentation.html#doc-trunk;Trunk/A/LILIA href=http://qpid.apache.org/documentation.html#doc-archives;Archive/A/LI/UL/DIVDIV class=menu_box_bottom/DIVDIV class=menu_box_top/DIVDIV class=menu_box_bodyH3Community/H3ULLIA href=http://qpid.apache.org/getting_involved.html;Getting Involved/A/LILIA href=http://qpid.apache.org/source_repository.html;Source Repository/A/LILIA href=http://qpid.apache.org/mailing_lists.html;Mailing Lists/A /LILIA href=https://cwiki.apache.org/qpid/;Wiki/A/LILIA href=https://issues.apache.org/jira/browse/qpid;Issue Reporting/A/LILIA href=http://qpid.apache.org/people.html;People/A/LILIA href=http://qpid.apache.org/acknowledgements.html;Acknowledgements/A/LI/UL/DIVDIV class=menu_box_bottom/DIVDIV class=menu_box_top/DIVDIV class=menu_box_bodyH3Developers/H3ULLIA href=https://cwiki.apache.org/qpid/building.html;Building Qpid/A/LILIA href=https://cwiki.apache.org/qpid/developer-pages.html;Developer Pages/A/LI/UL/DIVDIV class=menu_box_bottom/DIVDIV class=menu_box_top/DIVDIV class=menu_box_bodyH3About AMQP/H3ULLIA href=http://qpid.apache.org/amqp.html;What is AMQP?/A/LI/UL/DIVDIV class=menu_box_bottom/DIVDIV class=menu_box_top/DIVDIV class=menu_box_bodyH3About Apache/H3ULLIA href=http://www.apache.org;Home/A/LILIA href=http://www.a pache.org/foundation/sponsorship.htmlSponsorship/A/LILIA href=http://www.apache.org/foundation/thanks.html;Thanks/A/LILIA href=http://www.apache.org/security/;Security/A/LI/UL/DIVDIV class=menu_box_bottom/DIV/DIVdiv class=main_text_areadiv class=main_text_area_top/divdiv class=main_text_area_bodyDIV class=breadcrumbsspan class=breadcrumb-linka href=index.htmlProgramming in Apache Qpid/a/span gt; span class=breadcrumb-linka href=ch02.htmlUsing the Qpid Messaging API/a/span gt; span class=breadcrumb-nodeThe AMQP 0-10 mapping/span/DIVdiv class=section lang=endiv class=titlepagedivdivh2 class=titlea name=section-amqp0-10-mapping/a2.16. The AMQP 0-10 mapping/h2/div/div/divp + This section describes the AMQP 0-10 mapping for the Qpid + Messaging API. + /pp +The interaction with the broker triggered by creating a sender +or receiver depends on what the specified address resolves +to. Where the node type is not specified in the address, the +client queries the broker to determine whether it refers to a +queue or an exchange. + /pp +When sending to a queue, the queue's name is set as the +routing key and the message is transfered to the default (or +nameless) exchange. When sending to an exchange, the message +is transfered to that exchange and the routing key is set to +the message subject if one is specified. A default subject may +be specified in the target address. The subject may also be +set on each message individually to override the default if +required. In each case any specified subject is also added as +a qpid.subject entry in the application-headers field of the +message-properties. + /pp +When receiving from a queue, any subject in the
svn commit: r1372183 [7/19] - in /qpid/site/docs/books/trunk_new: ./ AMQP-Messaging-Broker-CPP-Book/ AMQP-Messaging-Broker-CPP-Book/html/ AMQP-Messaging-Broker-CPP-Book/html/css/ AMQP-Messaging-Broker
Added: qpid/site/docs/books/trunk_new/AMQP-Messaging-Broker-CPP-Book/html/queue-state-replication.html URL: http://svn.apache.org/viewvc/qpid/site/docs/books/trunk_new/AMQP-Messaging-Broker-CPP-Book/html/queue-state-replication.html?rev=1372183view=auto == --- qpid/site/docs/books/trunk_new/AMQP-Messaging-Broker-CPP-Book/html/queue-state-replication.html (added) +++ qpid/site/docs/books/trunk_new/AMQP-Messaging-Broker-CPP-Book/html/queue-state-replication.html Sun Aug 12 19:19:49 2012 @@ -0,0 +1,227 @@ +htmlheadmeta http-equiv=Content-Type content=text/html; charset=UTF-8title1.7. Queue State Replication/titlelink rel=stylesheet href=css/style.css type=text/cssmeta name=generator content=DocBook XSL Stylesheets V1.73.2link rel=start href=index.html title=AMQP Messaging Broker (Implemented in C++)link rel=up href=ch01.html title=Chapter 1. Running the AMQP Messaging Brokerlink rel=prev href=ch01s06.html title=1.6. LVQ - Last Value Queuelink rel=next href=chap-Messaging_User_Guide-Active_Active_Cluster.html title=1.8. Active-active Messaging Clusters/headbodydiv class=container bgcolor=white text=black link=#FF vlink=#840084 alink=#FFDIV class=headerDIV class=logoH1Apache Qpidâ¢/H1H2Open Source AMQP Messaging/H2/DIV/DIVDIV class=menu_boxDIV class=menu_box_top/DIVDIV class=menu_box_bodyH3Apache Qpid/H3ULLIA href=http://qpid.apac he.org/index.htmlHome/A/LILIA href=http://qpid.apache.org/download.html;Download/A/LILIA href=http://qpid.apache.org/getting_started.html;Getting Started/A/LILIA href=http://www.apache.org/licenses/;License/A/LILIA href=https://cwiki.apache.org/qpid/faq.html;FAQ/A/LI/UL/DIVDIV class=menu_box_bottom/DIVDIV class=menu_box_top/DIVDIV class=menu_box_bodyH3Documentation/H3ULLIA href=http://qpid.apache.org/documentation.html#doc-release;0.14 Release/A/LILIA href=http://qpid.apache.org/documentation.html#doc-trunk;Trunk/A/LILIA href=http://qpid.apache.org/documentation.html#doc-archives;Archive/A/LI/UL/DIVDIV class=menu_box_bottom/DIVDIV class=menu_box_top/DIVDIV class=menu_box_bodyH3Community/H3ULLIA href=http://qpid.apache.org/getting_involved.html;Getting Involved/A/LILIA href=http://qpid.apache.org/source_repository.html;Source Repository/A/L ILIA href=http://qpid.apache.org/mailing_lists.html;Mailing Lists/A/LILIA href=https://cwiki.apache.org/qpid/;Wiki/A/LILIA href=https://issues.apache.org/jira/browse/qpid;Issue Reporting/A/LILIA href=http://qpid.apache.org/people.html;People/A/LILIA href=http://qpid.apache.org/acknowledgements.html;Acknowledgements/A/LI/UL/DIVDIV class=menu_box_bottom/DIVDIV class=menu_box_top/DIVDIV class=menu_box_bodyH3Developers/H3ULLIA href=https://cwiki.apache.org/qpid/building.html;Building Qpid/A/LILIA href=https://cwiki.apache.org/qpid/developer-pages.html;Developer Pages/A/LI/UL/DIVDIV class=menu_box_bottom/DIVDIV class=menu_box_top/DIVDIV class=menu_box_bodyH3About AMQP/H3ULLIA href=http://qpid.apache.org/amqp.html;What is AMQP?/A/LI/UL/DIVDIV class=menu_box_bottom/DIVDIV class=menu_box_top/DIVDIV class=menu_box_bodyH3About Apache/H3U LLIA href=http://www.apache.org;Home/A/LILIA href=http://www.apache.org/foundation/sponsorship.html;Sponsorship/A/LILIA href=http://www.apache.org/foundation/thanks.html;Thanks/A/LILIA href=http://www.apache.org/security/;Security/A/LI/UL/DIVDIV class=menu_box_bottom/DIV/DIVdiv class=main_text_areadiv class=main_text_area_top/divdiv class=main_text_area_bodyDIV class=breadcrumbsspan class=breadcrumb-linka href=index.htmlAMQP Messaging Broker (Implemented in C++)/a/span gt; span class=breadcrumb-linka href=ch01.html + Running the AMQP Messaging Broker +/a/span gt; span class=breadcrumb-node +Queue State Replication + /span/DIVdiv class=section lang=endiv class=titlepagedivdivh2 class=titlea name=queue-state-replication/a1.7. +Queue State Replication + /h2/div/div/divdiv class=section lang=endiv class=titlepagedivdivh3 class=titlea name=queuestatereplication-AsynchronousReplicationofQueueState/a1.7.1. + Asynchronous + Replication of Queue State +/h3/div/div/divdiv class=section lang=endiv class=titlepagedivdivh4 class=titlea name=queuestatereplication-Overview/a1.7.1.1. + Overview + /h4/div/div/divp + There is support in qpidd for selective asynchronous replication + of queue state. This is achieved by: + /pp + (a) enabling event generation for the queues in question + /pp + (b) loading a plugin on the 'source' broker to encode those + events as messages on a replication queue (this plugin is + called + replicating_listener.so) + /pp + (c) loading a custom exchange plugin on the 'backup' broker (this + plugin is called replication_exchange.so) + /pp + (d) creating an instance of the replication exchange type on the + backup broker +
svn commit: r1372183 [12/19] - in /qpid/site/docs/books/trunk_new: ./ AMQP-Messaging-Broker-CPP-Book/ AMQP-Messaging-Broker-CPP-Book/html/ AMQP-Messaging-Broker-CPP-Book/html/css/ AMQP-Messaging-Broke
Added: qpid/site/docs/books/trunk_new/AMQP-Messaging-Broker-Java-Book/html/Qpid-Java-Broker-HowTos.html URL: http://svn.apache.org/viewvc/qpid/site/docs/books/trunk_new/AMQP-Messaging-Broker-Java-Book/html/Qpid-Java-Broker-HowTos.html?rev=1372183view=auto == --- qpid/site/docs/books/trunk_new/AMQP-Messaging-Broker-Java-Book/html/Qpid-Java-Broker-HowTos.html (added) +++ qpid/site/docs/books/trunk_new/AMQP-Messaging-Broker-Java-Book/html/Qpid-Java-Broker-HowTos.html Sun Aug 12 19:19:49 2012 @@ -0,0 +1,233 @@ +htmlheadmeta http-equiv=Content-Type content=text/html; charset=UTF-8titleChapter 2. How Tos/titlelink rel=stylesheet href=css/style.css type=text/cssmeta name=generator content=DocBook XSL Stylesheets V1.73.2link rel=start href=index.html title=AMQP Messaging Broker (Implemented in Java)link rel=up href=index.html title=AMQP Messaging Broker (Implemented in Java)link rel=prev href=High-Availability.html title=1.6. High Availabilitylink rel=next href=Configuring-ACLS.html title=2.2. Configuring ACLs/headbodydiv class=container bgcolor=white text=black link=#FF vlink=#840084 alink=#FFDIV class=headerDIV class=logoH1Apache Qpidâ¢/H1H2Open Source AMQP Messaging/H2/DIV/DIVDIV class=menu_boxDIV class=menu_box_top/DIVDIV class=menu_box_bodyH3Apache Qpid/H3ULLIA href=http://qpid.apache.org/index.html;Home/A/LILIA href=http://qpi d.apache.org/download.htmlDownload/A/LILIA href=http://qpid.apache.org/getting_started.html;Getting Started/A/LILIA href=http://www.apache.org/licenses/;License/A/LILIA href=https://cwiki.apache.org/qpid/faq.html;FAQ/A/LI/UL/DIVDIV class=menu_box_bottom/DIVDIV class=menu_box_top/DIVDIV class=menu_box_bodyH3Documentation/H3ULLIA href=http://qpid.apache.org/documentation.html#doc-release;0.14 Release/A/LILIA href=http://qpid.apache.org/documentation.html#doc-trunk;Trunk/A/LILIA href=http://qpid.apache.org/documentation.html#doc-archives;Archive/A/LI/UL/DIVDIV class=menu_box_bottom/DIVDIV class=menu_box_top/DIVDIV class=menu_box_bodyH3Community/H3ULLIA href=http://qpid.apache.org/getting_involved.html;Getting Involved/A/LILIA href=http://qpid.apache.org/source_repository.html;Source Repository/A/LILIA href=http://qpid.apache.org/mailing_lists.htm lMailing Lists/A/LILIA href=https://cwiki.apache.org/qpid/;Wiki/A/LILIA href=https://issues.apache.org/jira/browse/qpid;Issue Reporting/A/LILIA href=http://qpid.apache.org/people.html;People/A/LILIA href=http://qpid.apache.org/acknowledgements.html;Acknowledgements/A/LI/UL/DIVDIV class=menu_box_bottom/DIVDIV class=menu_box_top/DIVDIV class=menu_box_bodyH3Developers/H3ULLIA href=https://cwiki.apache.org/qpid/building.html;Building Qpid/A/LILIA href=https://cwiki.apache.org/qpid/developer-pages.html;Developer Pages/A/LI/UL/DIVDIV class=menu_box_bottom/DIVDIV class=menu_box_top/DIVDIV class=menu_box_bodyH3About AMQP/H3ULLIA href=http://qpid.apache.org/amqp.html;What is AMQP?/A/LI/UL/DIVDIV class=menu_box_bottom/DIVDIV class=menu_box_top/DIVDIV class=menu_box_bodyH3About Apache/H3ULLIA href=http://www.apache.org;Home/A/LILI A href=http://www.apache.org/foundation/sponsorship.html;Sponsorship/A/LILIA href=http://www.apache.org/foundation/thanks.html;Thanks/A/LILIA href=http://www.apache.org/security/;Security/A/LI/UL/DIVDIV class=menu_box_bottom/DIV/DIVdiv class=main_text_areadiv class=main_text_area_top/divdiv class=main_text_area_bodyDIV class=breadcrumbsspan class=breadcrumb-linka href=index.htmlAMQP Messaging Broker (Implemented in Java)/a/span gt; span class=breadcrumb-nodeHow Tos/span/DIVdiv class=chapter lang=endiv class=titlepagedivdivh2 class=titlea name=Qpid-Java-Broker-HowTos/aChapter 2. How Tos/h2/div/div/divdiv class=tocpbTable of Contents/b/pdldtspan class=sectiona href=Qpid-Java-Broker-HowTos.html#id24924032.1. + Add New Users +/a/span/dtdddldtspan class=sectiona href=Qpid-Java-Broker-HowTos.html#AddNewUsers-AvailablePasswordfileformats2.1.1. +Available +Password file formats + /a/span/dtdtspan class=sectiona href=Qpid-Java-Broker-HowTos.html#AddNewUsers-Dynamicchangestopasswordfiles.2.1.2. +Dynamic +changes to password files. + /a/span/dtdtspan class=sectiona href=Qpid-Java-Broker-HowTos.html#AddNewUsers-HowpasswordfilesandPrincipalDatabasesrelatetoauthenticationmechanisms2.1.3. +How password files and PrincipalDatabases relate to +authentication mechanisms + /a/span/dt/dl/dddtspan class=sectiona href=Configuring-ACLS.html2.2. + Configuring ACLs + /a/span/dtdddldtspan class=sectiona href=Configuring-ACLS.html#ConfigureACLs-EnablingACL2.2.1. + Enabling ACLs +/a/span/dtdtspan class=sectiona href=Configuring-ACLS.html#ConfigureACLs-WriteACL2.2.2. + Writing .acl files +/a/span/dtdtspan class=sectiona
svn commit: r1372184 - /qpid/site/docs/books/trunk/
Author: robbie Date: Sun Aug 12 19:21:26 2012 New Revision: 1372184 URL: http://svn.apache.org/viewvc?rev=1372184view=rev Log: NO-JIRA: remove trunk dir, which contains numerous stale files, to be replaced by a fresh publication of the docs Removed: qpid/site/docs/books/trunk/ - To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
svn commit: r1372185 - in /qpid/site/docs/books: trunk/ trunk_new/
Author: robbie Date: Sun Aug 12 19:22:15 2012 New Revision: 1372185 URL: http://svn.apache.org/viewvc?rev=1372185view=rev Log: NO-JIRA: fresh publication of the trunk docs Added: qpid/site/docs/books/trunk/ (props changed) - copied from r1372183, qpid/site/docs/books/trunk_new/ Removed: qpid/site/docs/books/trunk_new/ Propchange: qpid/site/docs/books/trunk/ -- svn:mergeinfo = - To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
svn commit: r1372768 - /qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/PersistentTestManual.java
Author: robbie Date: Tue Aug 14 08:30:25 2012 New Revision: 1372768 URL: http://svn.apache.org/viewvc?rev=1372768view=rev Log: NO-JIRA: remove unused manual test class Removed: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/PersistentTestManual.java - To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
svn commit: r1372769 - /qpid/trunk/qpid/java/client/test/
Author: robbie Date: Tue Aug 14 08:30:45 2012 New Revision: 1372769 URL: http://svn.apache.org/viewvc?rev=1372769view=rev Log: NO-JIRA: remove unused client/test folder Removed: qpid/trunk/qpid/java/client/test/ - To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
svn commit: r1373596 - /qpid/trunk/qpid/doc/book/src/programming/Programming-In-Apache-Qpid-Book.xml
Author: robbie Date: Wed Aug 15 19:35:12 2012 New Revision: 1373596 URL: http://svn.apache.org/viewvc?rev=1373596view=rev Log: QPID-4051: document the effect of setting connecttimeout to 0 Modified: qpid/trunk/qpid/doc/book/src/programming/Programming-In-Apache-Qpid-Book.xml Modified: qpid/trunk/qpid/doc/book/src/programming/Programming-In-Apache-Qpid-Book.xml URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/doc/book/src/programming/Programming-In-Apache-Qpid-Book.xml?rev=1373596r1=1373595r2=1373596view=diff == --- qpid/trunk/qpid/doc/book/src/programming/Programming-In-Apache-Qpid-Book.xml (original) +++ qpid/trunk/qpid/doc/book/src/programming/Programming-In-Apache-Qpid-Book.xml Wed Aug 15 19:35:12 2012 @@ -3317,7 +3317,7 @@ spout - -content $(cat rdu.xml | sed -e integer /entry entry - Length of time to wait before attempting to reconnect (in milliseconds). Defaults to 0. + Length of time (in milliseconds) to wait before attempting to reconnect. Defaults to 0. /entry /row row @@ -3328,7 +3328,7 @@ spout - -content $(cat rdu.xml | sed -e integer /entry entry - Length of time to wait for the connection to succeed (in milliseconds). Defaults to 3. + Length of time (in milliseconds) to wait for the socket connection to succeed. A value of 0 represents an infinite timeout, i.e. the connection attempt will block until established or an error occurs. Defaults to 3. /entry /row row - To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
svn commit: r1376981 - /qpid/trunk/qpid/java/test-profiles/CPPExcludes
Author: robbie Date: Fri Aug 24 16:10:56 2012 New Revision: 1376981 URL: http://svn.apache.org/viewvc?rev=1376981view=rev Log: QPID-4236, QPID-4237, QPID-4245: exclude new systest package from CPP test profiles Modified: qpid/trunk/qpid/java/test-profiles/CPPExcludes Modified: qpid/trunk/qpid/java/test-profiles/CPPExcludes URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/test-profiles/CPPExcludes?rev=1376981r1=1376980r2=1376981view=diff == --- qpid/trunk/qpid/java/test-profiles/CPPExcludes (original) +++ qpid/trunk/qpid/java/test-profiles/CPPExcludes Fri Aug 24 16:10:56 2012 @@ -183,3 +183,4 @@ org.apache.qpid.disttest.* // Exclude java broker REST API tests org.apache.qpid.server.management.plugin.servlet.rest.* +org.apache.qpid.systest.rest.acl.* - To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
svn commit: r1377521 - in /qpid/trunk/qpid/java: client/src/main/java/org/apache/qpid/client/ common/src/main/java/org/apache/qpid/configuration/ systests/src/main/java/org/apache/qpid/test/unit/clien
Author: robbie
Date: Sun Aug 26 21:25:08 2012
New Revision: 1377521
URL: http://svn.apache.org/viewvc?rev=1377521view=rev
Log:
QPID-4250: ensure producer creation on 0-8/0-9/0-9-1 connections respects the
qpid.declare_exchanges system property. Add systest to highlight the issue and
verify the fix. Add constants for the system properties.
Modified:
qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession.java
qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageProducer_0_8.java
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/configuration/ClientProperties.java
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/DynamicQueueExchangeCreateTest.java
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/JMXTestUtils.java
Modified:
qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession.java?rev=1377521r1=1377520r2=1377521view=diff
==
---
qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession.java
(original)
+++
qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession.java
Sun Aug 26 21:25:08 2012
@@ -136,10 +136,10 @@ public abstract class AMQSessionC exten
DEFAULT_FLOW_CONTROL_WAIT_FAILURE);
private final boolean _delareQueues =
-Boolean.parseBoolean(System.getProperty(qpid.declare_queues,
true));
+
Boolean.parseBoolean(System.getProperty(ClientProperties.QPID_DECLARE_QUEUES_PROP_NAME,
true));
private final boolean _declareExchanges =
-Boolean.parseBoolean(System.getProperty(qpid.declare_exchanges,
true));
+
Boolean.parseBoolean(System.getProperty(ClientProperties.QPID_DECLARE_EXCHANGES_PROP_NAME,
true));
private final boolean _useAMQPEncodedMapMessage;
Modified:
qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageProducer_0_8.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageProducer_0_8.java?rev=1377521r1=1377520r2=1377521view=diff
==
---
qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageProducer_0_8.java
(original)
+++
qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageProducer_0_8.java
Sun Aug 26 21:25:08 2012
@@ -55,9 +55,10 @@ public class BasicMessageProducer_0_8 ex
void declareDestination(AMQDestination destination)
{
-
-final MethodRegistry methodRegistry = getSession().getMethodRegistry();
-ExchangeDeclareBody body =
+if(getSession().isDeclareExchanges())
+{
+final MethodRegistry methodRegistry =
getSession().getMethodRegistry();
+ExchangeDeclareBody body =
methodRegistry.createExchangeDeclareBody(getSession().getTicket(),
destination.getExchangeName(),
destination.getExchangeClass(),
@@ -67,12 +68,10 @@ public class BasicMessageProducer_0_8 ex
false,
true,
null);
-// Declare the exchange
-// Note that the durable and internal arguments are ignored since
passive is set to false
+AMQFrame declare = body.generateFrame(getChannelId());
-AMQFrame declare = body.generateFrame(getChannelId());
-
-getProtocolHandler().writeFrame(declare);
+getProtocolHandler().writeFrame(declare);
+}
}
void sendMessage(AMQDestination destination, Message origMessage,
AbstractJMSMessage message,
Modified:
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/configuration/ClientProperties.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/configuration/ClientProperties.java?rev=1377521r1=1377520r2=1377521view=diff
==
---
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/configuration/ClientProperties.java
(original)
+++
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/configuration/ClientProperties.java
Sun Aug 26 21:25:08 2012
@@ -190,6 +190,18 @@ public class ClientProperties
*/
public static final long DEFAULT_FLOW_CONTROL_WAIT_NOTIFY_PERIOD = 5000L;
+/**
+ * System property to control whether the client will declare queues during
+ * consumer creation when using BindingURLs
svn commit: r1377541 - /qpid/trunk/qpid/java/ivy.nexus.xml
Author: robbie Date: Sun Aug 26 22:53:03 2012 New Revision: 1377541 URL: http://svn.apache.org/viewvc?rev=1377541view=rev Log: NO-JIRA: add ivy config for new modules for use in uploading the maven artifacts to nexus Modified: qpid/trunk/qpid/java/ivy.nexus.xml Modified: qpid/trunk/qpid/java/ivy.nexus.xml URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/ivy.nexus.xml?rev=1377541r1=1377540r2=1377541view=diff == --- qpid/trunk/qpid/java/ivy.nexus.xml (original) +++ qpid/trunk/qpid/java/ivy.nexus.xml Sun Aug 26 22:53:03 2012 @@ -39,6 +39,48 @@ artifact name=qpid-broker type=jar.asc ext=jar.asc/ artifact name=qpid-broker type=source ext=jar e:classifier=sources/ artifact name=qpid-broker type=source.asc ext=jar.asc e:classifier=sources/ +artifact name=qpid-broker-plugins-access-control type=pom ext=pom/ +artifact name=qpid-broker-plugins-access-control type=pom.asc ext=pom.asc/ +artifact name=qpid-broker-plugins-access-control type=jar ext=jar/ +artifact name=qpid-broker-plugins-access-control type=jar.asc ext=jar.asc/ +artifact name=qpid-broker-plugins-access-control type=source ext=jar e:classifier=sources/ +artifact name=qpid-broker-plugins-access-control type=source.asc ext=jar.asc e:classifier=sources/ +artifact name=qpid-broker-plugins-firewall type=pom ext=pom/ +artifact name=qpid-broker-plugins-firewall type=pom.asc ext=pom.asc/ +artifact name=qpid-broker-plugins-firewall type=jar ext=jar/ +artifact name=qpid-broker-plugins-firewall type=jar.asc ext=jar.asc/ +artifact name=qpid-broker-plugins-firewall type=source ext=jar e:classifier=sources/ +artifact name=qpid-broker-plugins-firewall type=source.asc ext=jar.asc e:classifier=sources/ +artifact name=qpid-broker-plugins-management-http type=pom ext=pom/ +artifact name=qpid-broker-plugins-management-http type=pom.asc ext=pom.asc/ +artifact name=qpid-broker-plugins-management-http type=jar ext=jar/ +artifact name=qpid-broker-plugins-management-http type=jar.asc ext=jar.asc/ +artifact name=qpid-broker-plugins-management-http type=source ext=jar e:classifier=sources/ +artifact name=qpid-broker-plugins-management-http type=source.asc ext=jar.asc e:classifier=sources/ +artifact name=qpid-broker-plugins-management-jmx type=pom ext=pom/ +artifact name=qpid-broker-plugins-management-jmx type=pom.asc ext=pom.asc/ +artifact name=qpid-broker-plugins-management-jmx type=jar ext=jar/ +artifact name=qpid-broker-plugins-management-jmx type=jar.asc ext=jar.asc/ +artifact name=qpid-broker-plugins-management-jmx type=source ext=jar e:classifier=sources/ +artifact name=qpid-broker-plugins-management-jmx type=source.asc ext=jar.asc e:classifier=sources/ +artifact name=qpid-amqp-1-0-common type=pom ext=pom/ +artifact name=qpid-amqp-1-0-common type=pom.asc ext=pom.asc/ +artifact name=qpid-amqp-1-0-common type=jar ext=jar/ +artifact name=qpid-amqp-1-0-common type=jar.asc ext=jar.asc/ +artifact name=qpid-amqp-1-0-common type=source ext=jar e:classifier=sources/ +artifact name=qpid-amqp-1-0-common type=source.asc ext=jar.asc e:classifier=sources/ +artifact name=qpid-amqp-1-0-client type=pom ext=pom/ +artifact name=qpid-amqp-1-0-client type=pom.asc ext=pom.asc/ +artifact name=qpid-amqp-1-0-client type=jar ext=jar/ +artifact name=qpid-amqp-1-0-client type=jar.asc ext=jar.asc/ +artifact name=qpid-amqp-1-0-client type=source ext=jar e:classifier=sources/ +artifact name=qpid-amqp-1-0-client type=source.asc ext=jar.asc e:classifier=sources/ +artifact name=qpid-amqp-1-0-client-jms type=pom ext=pom/ +artifact name=qpid-amqp-1-0-client-jms type=pom.asc ext=pom.asc/ +artifact name=qpid-amqp-1-0-client-jms type=jar ext=jar/ +artifact name=qpid-amqp-1-0-client-jms type=jar.asc ext=jar.asc/ +artifact name=qpid-amqp-1-0-client-jms type=source ext=jar e:classifier=sources/ +artifact name=qpid-amqp-1-0-client-jms type=source.asc ext=jar.asc e:classifier=sources/ artifact name=qpid-management-common type=pom ext=pom/ artifact name=qpid-management-common type=pom.asc ext=pom.asc/ artifact name=qpid-management-common type=jar ext=jar/ @@ -51,6 +93,12 @@ artifact name=qpid-bdbstore type=jar.asc ext=jar.asc/ artifact name=qpid-bdbstore type=source ext=jar e:classifier=sources/ artifact name=qpid-bdbstore type=source.asc ext=jar.asc e:classifier=sources/ +artifact name=qpid-bdbstore-jmx type=pom ext=pom/ +artifact name=qpid-bdbstore-jmx type=pom.asc ext=pom.asc/ +artifact name=qpid-bdbstore-jmx type=jar ext=jar/ +artifact name=qpid-bdbstore-jmx type=jar.asc ext=jar.asc/ +artifact name=qpid-bdbstore-jmx type=source ext=jar e:classifier=sources/ +artifact name=qpid-bdbstore-jmx type=source.asc ext=jar.asc e:classifier=sources/ /publications
svn commit: r1377641 - /qpid/trunk/qpid/java/ivysettings.retrieve.xml
Author: robbie
Date: Mon Aug 27 10:54:51 2012
New Revision: 1377641
URL: http://svn.apache.org/viewvc?rev=1377641view=rev
Log:
NO-JIRA: make the default location the 'localfs' ivy resolver uses be a
subdirectory of the lib dir
Modified:
qpid/trunk/qpid/java/ivysettings.retrieve.xml
Modified: qpid/trunk/qpid/java/ivysettings.retrieve.xml
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/ivysettings.retrieve.xml?rev=1377641r1=1377640r2=1377641view=diff
==
--- qpid/trunk/qpid/java/ivysettings.retrieve.xml (original)
+++ qpid/trunk/qpid/java/ivysettings.retrieve.xml Mon Aug 27 10:54:51 2012
@@ -16,7 +16,7 @@
--
ivysettings
property name=ivy.default.resolver value=chain override=false/
- property name=ivy.localfs.root value=${project.root}/localfs_repo
override=false/
+ property name=ivy.localfs.root value=${project.root}/lib/localfs_repo
override=false/
property name=ivy.localfs.pattern
value=[artifact]-[revision](-[classifier]).[ext] override=false/
settings defaultResolver=${ivy.default.resolver}/
-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
svn commit: r1377723 - /qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/AuthenticationResult.java
Author: robbie
Date: Mon Aug 27 15:56:23 2012
New Revision: 1377723
URL: http://svn.apache.org/viewvc?rev=1377723view=rev
Log:
QPID-4237: added convenience method to AuthenticatedResult to facilitate
implementation of third party authentication managers.
Applied patch from Philip Harvey p...@philharveyonline.com
Modified:
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/AuthenticationResult.java
Modified:
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/AuthenticationResult.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/AuthenticationResult.java?rev=1377723r1=1377722r2=1377723view=diff
==
---
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/AuthenticationResult.java
(original)
+++
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/AuthenticationResult.java
Mon Aug 27 15:56:23 2012
@@ -64,6 +64,7 @@ public class AuthenticationResult
private final byte[] _challenge;
private final Exception _cause;
private final SetPrincipal _principals = new HashSetPrincipal();
+private final Principal _mainPrincipal;
public AuthenticationResult(final AuthenticationStatus status)
{
@@ -81,6 +82,7 @@ public class AuthenticationResult
_principals.addAll(otherPrincipals);
_principals.remove(mainPrincipal);
_principals.add(specialQpidAuthenticatedPrincipal);
+_mainPrincipal = mainPrincipal;
_status = AuthenticationStatus.SUCCESS;
_challenge = null;
@@ -92,6 +94,7 @@ public class AuthenticationResult
_challenge = challenge;
_status = status;
_cause = null;
+_mainPrincipal = null;
}
public AuthenticationResult(final AuthenticationStatus error, final
Exception cause)
@@ -99,6 +102,7 @@ public class AuthenticationResult
_status = error;
_challenge = null;
_cause = cause;
+_mainPrincipal = null;
}
public AuthenticationResult(final byte[] challenge, final
AuthenticationStatus status, final Exception cause)
@@ -108,9 +112,10 @@ public class AuthenticationResult
throw new IllegalArgumentException(Successful authentication
requires at least one principal);
}
-this._status = status;
-this._challenge = challenge;
-this._cause = cause;
+_status = status;
+_challenge = challenge;
+_cause = cause;
+_mainPrincipal = null;
}
public Exception getCause()
@@ -132,4 +137,9 @@ public class AuthenticationResult
{
return _principals;
}
+
+public Principal getMainPrincipal()
+{
+return _mainPrincipal;
+}
}
-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
svn commit: r1377724 - /qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/group/FileGroupDatabase.java
Author: robbie
Date: Mon Aug 27 15:56:36 2012
New Revision: 1377724
URL: http://svn.apache.org/viewvc?rev=1377724view=rev
Log:
QPID-4237: modified FileGroupDatabase to ensure that it always closes its file
input/output streams.
Applied patch from Philip Harvey p...@philharveyonline.com
Modified:
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/group/FileGroupDatabase.java
Modified:
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/group/FileGroupDatabase.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/group/FileGroupDatabase.java?rev=1377724r1=1377723r2=1377724view=diff
==
---
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/group/FileGroupDatabase.java
(original)
+++
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/group/FileGroupDatabase.java
Mon Aug 27 15:56:36 2012
@@ -192,7 +192,18 @@ public class FileGroupDatabase implement
_groupToUserMap.clear();
_userToGroupMap.clear();
Properties propertiesFile = new Properties();
-propertiesFile.load(new FileInputStream(groupFile));
+FileInputStream fileInputStream = new FileInputStream(groupFile);
+try
+{
+propertiesFile.load(fileInputStream);
+}
+finally
+{
+if(fileInputStream != null)
+{
+fileInputStream.close();
+}
+}
for (String propertyName : propertiesFile.stringPropertyNames())
{
@@ -233,7 +244,18 @@ public class FileGroupDatabase implement
}
String comment = Written + new Date();
-propertiesFile.store(new FileOutputStream(groupFile), comment);
+FileOutputStream fileOutputStream = new FileOutputStream(groupFile);
+try
+{
+propertiesFile.store(fileOutputStream, comment);
+}
+finally
+{
+if(fileOutputStream != null)
+{
+fileOutputStream.close();
+}
+}
}
private void validatePropertyNameIsGroupName(String propertyName)
-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
svn commit: r1377869 - in /qpid/trunk/qpid/java: bdbstore/jmx/src/main/resources/services/ bdbstore/src/resources/ bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/testclient/ bdbstore/s
Author: robbie Date: Mon Aug 27 21:16:55 2012 New Revision: 1377869 URL: http://svn.apache.org/viewvc?rev=1377869view=rev Log: QPID-4258: remove a bunch of empty directories from the java tree Removed: qpid/trunk/qpid/java/bdbstore/jmx/src/main/resources/services/ qpid/trunk/qpid/java/bdbstore/src/resources/ qpid/trunk/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/testclient/ qpid/trunk/qpid/java/bdbstore/src/test/resources/upgrade/bdbstore-to-upgrade/ qpid/trunk/qpid/java/broker-plugins/experimental/ qpid/trunk/qpid/java/broker-plugins/extras/ qpid/trunk/qpid/java/broker-plugins/jmx/ qpid/trunk/qpid/java/broker-plugins/management/ qpid/trunk/qpid/java/broker/src/main/java/org/apache/log4j/xml/ qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/qmf/schema/ qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/management/ qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/information/management/ qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/management/ qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/management/ qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/management/ qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/plugin/logging/ qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/plugin/policies/ qpid/trunk/qpid/java/broker/src/test/java/org/apache/log4j/xml/ qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/management/ qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/rawloggers/ qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/management/ qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/security/access/management/ qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/security/access/plugins/network/ qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/virtualhost/plugin/policies/ qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/util/ qpid/trunk/qpid/java/client/example/src/main/java/org/apache/qpid/example/transport/ qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/configuration/ qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/njms/ qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/ack/ qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/basic/close/ qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/connection/ qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/forwardall/ qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/protocol/ qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/temporaryqueue/ qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/close/ qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/ct/ qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/jndi/ qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/topic/ qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/transacted/ qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/test/unit/xa/ qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/testutil/ qpid/trunk/qpid/java/common/src/main/java/org/apache/configuration/ qpid/trunk/qpid/java/common/src/test/java/org/apache/mina/SocketIOTest/ qpid/trunk/qpid/java/common/src/test/java/org/apache/qpid/session/ qpid/trunk/qpid/java/common/src/test/java/org/apache/qpidity/ qpid/trunk/qpid/java/common/stylesheets/ qpid/trunk/qpid/java/common/templates/class/ qpid/trunk/qpid/java/common/templates/field/ qpid/trunk/qpid/java/perftests/etc/suite/ qpid/trunk/qpid/java/perftests/etc/testdefs/short/ qpid/trunk/qpid/java/perftests/etc/testdefs/standard/ qpid/trunk/qpid/java/resources/META-INF/ qpid/trunk/qpid/java/systests/src/main/java/org/apache/mina/transport/vmpipe/support/ qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/management/jmx/ qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/forwardall/ qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/publish/ qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/protocol/ qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/testutil/ - To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
svn commit: r1377873 - in /qpid/trunk/qpid/java: broker/src/main/java/org/apache/qpid/server/information/ broker/src/main/java/org/apache/qpid/server/virtualhost/plugin/ broker/src/test/java/org/apach
Author: robbie Date: Mon Aug 27 21:21:14 2012 New Revision: 1377873 URL: http://svn.apache.org/viewvc?rev=1377873view=rev Log: QPID-4258: remove some other empty directories from the java tree Removed: qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/information/ qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/plugin/ qpid/trunk/qpid/java/broker/src/test/java/org/apache/log4j/ qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/security/access/plugins/ qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/virtualhost/plugin/ qpid/trunk/qpid/java/common/src/test/java/org/apache/mina/ qpid/trunk/qpid/java/systests/src/main/java/org/apache/mina/transport/vmpipe/ qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/management/ - To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
svn commit: r1379773 - in /qpid/trunk/qpid/doc/book/src: Makefile.inc programming/Programming-In-Apache-Qpid-Book.xml programming/Programming-In-Apache-Qpid.xml
Author: robbie Date: Sat Sep 1 15:46:52 2012 New Revision: 1379773 URL: http://svn.apache.org/viewvc?rev=1379773view=rev Log: QPID-4111: restore the Programming In Apache Qpid to its old output location Added: qpid/trunk/qpid/doc/book/src/programming/Programming-In-Apache-Qpid.xml - copied, changed from r1379748, qpid/trunk/qpid/doc/book/src/programming/Programming-In-Apache-Qpid-Book.xml Removed: qpid/trunk/qpid/doc/book/src/programming/Programming-In-Apache-Qpid-Book.xml Modified: qpid/trunk/qpid/doc/book/src/Makefile.inc Modified: qpid/trunk/qpid/doc/book/src/Makefile.inc URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/doc/book/src/Makefile.inc?rev=1379773r1=1379772r2=1379773view=diff == --- qpid/trunk/qpid/doc/book/src/Makefile.inc (original) +++ qpid/trunk/qpid/doc/book/src/Makefile.inc Sat Sep 1 15:46:52 2012 @@ -17,7 +17,7 @@ # under the License. # -BOOK=$(wildcard *Book.xml) +BOOK=$(wildcard *Book.xml Programming-In-Apache-Qpid.xml) XML=$(wildcard *.xml) $(wildcard ../common/*.xml) IMAGES=$(wildcard images/*.png) CSS=$(wilcard ../common/css/*.css) Copied: qpid/trunk/qpid/doc/book/src/programming/Programming-In-Apache-Qpid.xml (from r1379748, qpid/trunk/qpid/doc/book/src/programming/Programming-In-Apache-Qpid-Book.xml) URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/doc/book/src/programming/Programming-In-Apache-Qpid.xml?p2=qpid/trunk/qpid/doc/book/src/programming/Programming-In-Apache-Qpid.xmlp1=qpid/trunk/qpid/doc/book/src/programming/Programming-In-Apache-Qpid-Book.xmlr1=1379748r2=1379773rev=1379773view=diff == (empty) - To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
svn commit: r1379775 - in /qpid/site/docs: ./ books/0.18/Programming-In-Apache-Qpid-Book/ books/0.18/Programming-In-Apache-Qpid/ books/0.18/Programming-In-Apache-Qpid/pdf/ books/trunk/Programming-In-A
Author: robbie Date: Sat Sep 1 15:51:49 2012 New Revision: 1379775 URL: http://svn.apache.org/viewvc?rev=1379775view=rev Log: QPID-4111: move the 0.18 Programming In Apache Qpid docs to match the historic locations for consistency, also move trunk verison and redirect the alternative URLs Added: qpid/site/docs/books/0.18/Programming-In-Apache-Qpid/ - copied from r1379768, qpid/site/docs/books/0.18/Programming-In-Apache-Qpid-Book/ qpid/site/docs/books/0.18/Programming-In-Apache-Qpid/pdf/Programming-In-Apache-Qpid.pdf - copied unchanged from r1379768, qpid/site/docs/books/0.18/Programming-In-Apache-Qpid-Book/pdf/Programming-In-Apache-Qpid-Book.pdf qpid/site/docs/books/trunk/Programming-In-Apache-Qpid/ - copied from r1379768, qpid/site/docs/books/trunk/Programming-In-Apache-Qpid-Book/ qpid/site/docs/books/trunk/Programming-In-Apache-Qpid/pdf/Programming-In-Apache-Qpid.pdf - copied unchanged from r1379768, qpid/site/docs/books/trunk/Programming-In-Apache-Qpid-Book/pdf/Programming-In-Apache-Qpid-Book.pdf Removed: qpid/site/docs/books/0.18/Programming-In-Apache-Qpid-Book/ qpid/site/docs/books/0.18/Programming-In-Apache-Qpid/pdf/Programming-In-Apache-Qpid-Book.pdf qpid/site/docs/books/trunk/Programming-In-Apache-Qpid-Book/ qpid/site/docs/books/trunk/Programming-In-Apache-Qpid/pdf/Programming-In-Apache-Qpid-Book.pdf Modified: qpid/site/docs/.htaccess Modified: qpid/site/docs/.htaccess URL: http://svn.apache.org/viewvc/qpid/site/docs/.htaccess?rev=1379775r1=1379774r2=1379775view=diff == --- qpid/site/docs/.htaccess (original) +++ qpid/site/docs/.htaccess Sat Sep 1 15:51:49 2012 @@ -20,3 +20,9 @@ Options +Includes XBitHack On Redirect /download.cgi http://qpid.apache.org/download.html Redirect /licence.html http://www.apache.org/licenses/ + +RewriteEngine on +RewriteBase / +RewriteRule ^books/trunk/Programming-In-Apache-Qpid-Book/pdf/Programming-In-Apache-Qpid-Book.pdf /books/trunk/Programming-In-Apache-Qpid/pdf/Programming-In-Apache-Qpid.pdf [R=301,L] +RewriteRule ^books/trunk/Programming-In-Apache-Qpid-Book/(.*)$ /books/trunk/Programming-In-Apache-Qpid/$1 [R=301,L] + - To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
svn commit: r1379779 - /qpid/site/docs/documentation.html
Author: robbie Date: Sat Sep 1 15:56:30 2012 New Revision: 1379779 URL: http://svn.apache.org/viewvc?rev=1379779view=rev Log: QPID-4111: also update the trunk links for Programming In Apache Qpid on the documentation page Modified: qpid/site/docs/documentation.html Modified: qpid/site/docs/documentation.html URL: http://svn.apache.org/viewvc/qpid/site/docs/documentation.html?rev=1379779r1=1379778r2=1379779view=diff == --- qpid/site/docs/documentation.html (original) +++ qpid/site/docs/documentation.html Sat Sep 1 15:56:30 2012 @@ -89,9 +89,9 @@ a href=books/trunk/AMQP-Messaging-Broker-Java-Book/html/index.htmlHTML/a/p/li lipProgramming in Apache Qpid: Cross-Platform AMQP Messaging in Java JMS, .NET, C++, and Python/p p - a href=books/trunk/Programming-In-Apache-Qpid-Book/pdf/Programming-In-Apache-Qpid-Book.pdf + a href=books/trunk/Programming-In-Apache-Qpid/pdf/Programming-In-Apache-Qpid.pdf name=Cross-Platform AMQP Messaging in Java JMS, .NET, C++, and PythonPDF/a | - a href=books/trunk/Programming-In-Apache-Qpid-Book/html/index.html + a href=books/trunk/Programming-In-Apache-Qpid/html/index.html name=Cross-Platform AMQP Messaging in Java JMS, .NET, C++, and PythonHTML/a/p/li /ul - To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
svn commit: r1379881 - /qpid/trunk/qpid/doc/book/xsl/html-custom.xsl
Author: robbie Date: Sat Sep 1 22:28:59 2012 New Revision: 1379881 URL: http://svn.apache.org/viewvc?rev=1379881view=rev Log: QPID-4111: make menu link text more generic to stop it going stale as new releases occur Modified: qpid/trunk/qpid/doc/book/xsl/html-custom.xsl Modified: qpid/trunk/qpid/doc/book/xsl/html-custom.xsl URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/doc/book/xsl/html-custom.xsl?rev=1379881r1=1379880r2=1379881view=diff == --- qpid/trunk/qpid/doc/book/xsl/html-custom.xsl (original) +++ qpid/trunk/qpid/doc/book/xsl/html-custom.xsl Sat Sep 1 22:28:59 2012 @@ -125,7 +125,7 @@ DIV class=menu_box_body H3Documentation/H3 UL - LIA href=http://qpid.apache.org/documentation.html#doc-release;0.14 Release/A/LI + LIA href=http://qpid.apache.org/documentation.html#doc-release;Latest Release/A/LI LIA href=http://qpid.apache.org/documentation.html#doc-trunk;Trunk/A/LI LIA href=http://qpid.apache.org/documentation.html#doc-archives;Archive/A/LI /UL - To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
svn commit: r1379885 [10/27] - in /qpid/site/docs: ./ books/0.18/AMQP-Messaging-Broker-CPP-Book/html/ books/0.18/AMQP-Messaging-Broker-CPP-Book/pdf/ books/0.18/AMQP-Messaging-Broker-Java-Book/html/ bo
Modified: qpid/site/docs/books/0.18/Programming-In-Apache-Qpid/html/ch04s05.html URL: http://svn.apache.org/viewvc/qpid/site/docs/books/0.18/Programming-In-Apache-Qpid/html/ch04s05.html?rev=1379885r1=1379884r2=1379885view=diff == --- qpid/site/docs/books/0.18/Programming-In-Apache-Qpid/html/ch04s05.html (original) +++ qpid/site/docs/books/0.18/Programming-In-Apache-Qpid/html/ch04s05.html Sat Sep 1 22:32:47 2012 @@ -1,4 +1,4 @@ -htmlheadmeta http-equiv=Content-Type content=text/html; charset=UTF-8title4.5. Transactions/titlelink rel=stylesheet href=css/style.css type=text/cssmeta name=generator content=DocBook XSL Stylesheets V1.73.2link rel=start href=index.html title=Programming in Apache Qpidlink rel=up href=QpidWCF.html title=Chapter 4. Using the Qpid WCF clientlink rel=prev href=ch04s04.html title=4.4. Securitylink rel=next href=ch05.html title=Chapter 5. The .NET Binding for the C++ Messaging Client/headbodydiv class=container bgcolor=white text=black link=#FF vlink=#840084 alink=#FFDIV class=headerDIV class=logoH1Apache Qpidâ¢/H1H2Open Source AMQP Messaging/H2/DIV/DIVDIV class=menu_boxDIV class=menu_box_top/DIVDIV class=menu_box_bodyH3Apache Qpid/H3ULLIA href=http://qpid.apache.org/index.html;Home/A/LILIA href=http://qpid.apache.org/d ownload.htmlDownload/A/LILIA href=http://qpid.apache.org/getting_started.html;Getting Started/A/LILIA href=http://www.apache.org/licenses/;License/A/LILIA href=https://cwiki.apache.org/qpid/faq.html;FAQ/A/LI/UL/DIVDIV class=menu_box_bottom/DIVDIV class=menu_box_top/DIVDIV class=menu_box_bodyH3Documentation/H3ULLIA href=http://qpid.apache.org/documentation.html#doc-release;0.14 Release/A/LILIA href=http://qpid.apache.org/documentation.html#doc-trunk;Trunk/A/LILIA href=http://qpid.apache.org/documentation.html#doc-archives;Archive/A/LI/UL/DIVDIV class=menu_box_bottom/DIVDIV class=menu_box_top/DIVDIV class=menu_box_bodyH3Community/H3ULLIA href=http://qpid.apache.org/getting_involved.html;Getting Involved/A/LILIA href=http://qpid.apache.org/source_repository.html;Source Repository/A/LILIA href=http://qpid.apache.org/mailing_lists.html;Mailing Lis ts/A/LILIA href=https://cwiki.apache.org/qpid/;Wiki/A/LILIA href=https://issues.apache.org/jira/browse/qpid;Issue Reporting/A/LILIA href=http://qpid.apache.org/people.html;People/A/LILIA href=http://qpid.apache.org/acknowledgements.html;Acknowledgements/A/LI/UL/DIVDIV class=menu_box_bottom/DIVDIV class=menu_box_top/DIVDIV class=menu_box_bodyH3Developers/H3ULLIA href=https://cwiki.apache.org/qpid/building.html;Building Qpid/A/LILIA href=https://cwiki.apache.org/qpid/developer-pages.html;Developer Pages/A/LI/UL/DIVDIV class=menu_box_bottom/DIVDIV class=menu_box_top/DIVDIV class=menu_box_bodyH3About AMQP/H3ULLIA href=http://qpid.apache.org/amqp.html;What is AMQP?/A/LI/UL/DIVDIV class=menu_box_bottom/DIVDIV class=menu_box_top/DIVDIV class=menu_box_bodyH3About Apache/H3ULLIA href=http://www.apache.org;Home/A/LILIA href=http: //www.apache.org/foundation/sponsorship.htmlSponsorship/A/LILIA href=http://www.apache.org/foundation/thanks.html;Thanks/A/LILIA href=http://www.apache.org/security/;Security/A/LI/UL/DIVDIV class=menu_box_bottom/DIV/DIVdiv class=main_text_areadiv class=main_text_area_top/divdiv class=main_text_area_bodyDIV class=breadcrumbsspan class=breadcrumb-linka href=index.htmlProgramming in Apache Qpid/a/span gt; span class=breadcrumb-linka href=QpidWCF.htmlUsing the Qpid WCF client/a/span gt; span class=breadcrumb-nodeTransactions/span/DIVdiv class=section lang=endiv class=titlepagedivdivh2 class=titlea name=id2556796/a4.5. Transactions/h2/div/div/divpThe WCF channel provides a transaction resource manager +htmlheadmeta http-equiv=Content-Type content=text/html; charset=UTF-8title4.5. Transactions/titlelink rel=stylesheet href=css/style.css type=text/cssmeta name=generator content=DocBook XSL Stylesheets V1.73.2link rel=start href=index.html title=Programming in Apache Qpidlink rel=up href=QpidWCF.html title=Chapter 4. Using the Qpid WCF clientlink rel=prev href=ch04s04.html title=4.4. Securitylink rel=next href=ch05.html title=Chapter 5. The .NET Binding for the C++ Messaging Client/headbodydiv class=container bgcolor=white text=black link=#FF vlink=#840084 alink=#FFDIV class=headerDIV class=logoH1Apache Qpidâ¢/H1H2Open Source AMQP Messaging/H2/DIV/DIVDIV class=menu_boxDIV class=menu_box_top/DIVDIV class=menu_box_bodyH3Apache Qpid/H3ULLIA href=http://qpid.apache.org/index.html;Home/A/LILIA href=http://qpid.apache.org/d ownload.htmlDownload/A/LILIA href=http://qpid.apache.org/getting_started.html;Getting Started/A/LILIA href=http://www.apache.org/licenses/;License/A/LILIA href=https://cwiki.apache.org/qpid/faq.html;FAQ/A/LI/UL/DIVDIV class=menu_box_bottom/DIVDIV class=menu_box_top/DIVDIV class=menu_box_bodyH3Documentation/H3ULLIA
svn commit: r1379885 [16/27] - in /qpid/site/docs: ./ books/0.18/AMQP-Messaging-Broker-CPP-Book/html/ books/0.18/AMQP-Messaging-Broker-CPP-Book/pdf/ books/0.18/AMQP-Messaging-Broker-Java-Book/html/ bo
Modified: qpid/site/docs/books/trunk/AMQP-Messaging-Broker-CPP-Book/html/pr01.html URL: http://svn.apache.org/viewvc/qpid/site/docs/books/trunk/AMQP-Messaging-Broker-CPP-Book/html/pr01.html?rev=1379885r1=1379884r2=1379885view=diff == --- qpid/site/docs/books/trunk/AMQP-Messaging-Broker-CPP-Book/html/pr01.html (original) +++ qpid/site/docs/books/trunk/AMQP-Messaging-Broker-CPP-Book/html/pr01.html Sat Sep 1 22:32:47 2012 @@ -1,4 +1,4 @@ -htmlheadmeta http-equiv=Content-Type content=text/html; charset=UTF-8titleIntroduction/titlelink rel=stylesheet href=css/style.css type=text/cssmeta name=generator content=DocBook XSL Stylesheets V1.73.2link rel=start href=index.html title=AMQP Messaging Broker (Implemented in C++)link rel=up href=index.html title=AMQP Messaging Broker (Implemented in C++)link rel=prev href=index.html title=AMQP Messaging Broker (Implemented in C++)link rel=next href=ch01.html title=Chapter 1. Running the AMQP Messaging Broker/headbodydiv class=container bgcolor=white text=black link=#FF vlink=#840084 alink=#FFDIV class=headerDIV class=logoH1Apache Qpidâ¢/H1H2Open Source AMQP Messaging/H2/DIV/DIVDIV class=menu_boxDIV class=menu_box_top/DIVDIV class=menu_box_bodyH3Apache Qpid/H3ULLIA href=http://qpid.apache.org/index.html;Home/A/LILIA href=http: //qpid.apache.org/download.htmlDownload/A/LILIA href=http://qpid.apache.org/getting_started.html;Getting Started/A/LILIA href=http://www.apache.org/licenses/;License/A/LILIA href=https://cwiki.apache.org/qpid/faq.html;FAQ/A/LI/UL/DIVDIV class=menu_box_bottom/DIVDIV class=menu_box_top/DIVDIV class=menu_box_bodyH3Documentation/H3ULLIA href=http://qpid.apache.org/documentation.html#doc-release;0.14 Release/A/LILIA href=http://qpid.apache.org/documentation.html#doc-trunk;Trunk/A/LILIA href=http://qpid.apache.org/documentation.html#doc-archives;Archive/A/LI/UL/DIVDIV class=menu_box_bottom/DIVDIV class=menu_box_top/DIVDIV class=menu_box_bodyH3Community/H3ULLIA href=http://qpid.apache.org/getting_involved.html;Getting Involved/A/LILIA href=http://qpid.apache.org/source_repository.html;Source Repository/A/LILIA href=http://qpid.apache.org/mailing_list s.htmlMailing Lists/A/LILIA href=https://cwiki.apache.org/qpid/;Wiki/A/LILIA href=https://issues.apache.org/jira/browse/qpid;Issue Reporting/A/LILIA href=http://qpid.apache.org/people.html;People/A/LILIA href=http://qpid.apache.org/acknowledgements.html;Acknowledgements/A/LI/UL/DIVDIV class=menu_box_bottom/DIVDIV class=menu_box_top/DIVDIV class=menu_box_bodyH3Developers/H3ULLIA href=https://cwiki.apache.org/qpid/building.html;Building Qpid/A/LILIA href=https://cwiki.apache.org/qpid/developer-pages.html;Developer Pages/A/LI/UL/DIVDIV class=menu_box_bottom/DIVDIV class=menu_box_top/DIVDIV class=menu_box_bodyH3About AMQP/H3ULLIA href=http://qpid.apache.org/amqp.html;What is AMQP?/A/LI/UL/DIVDIV class=menu_box_bottom/DIVDIV class=menu_box_top/DIVDIV class=menu_box_bodyH3About Apache/H3ULLIA href=http://www.apache.org;Home/A/LI LIA href=http://www.apache.org/foundation/sponsorship.html;Sponsorship/A/LILIA href=http://www.apache.org/foundation/thanks.html;Thanks/A/LILIA href=http://www.apache.org/security/;Security/A/LI/UL/DIVDIV class=menu_box_bottom/DIV/DIVdiv class=main_text_areadiv class=main_text_area_top/divdiv class=main_text_area_bodyDIV class=breadcrumbsspan class=breadcrumb-linka href=index.htmlAMQP Messaging Broker (Implemented in C++)/a/span gt; span class=breadcrumb-nodeIntroduction/span/DIVdiv class=preface lang=endiv class=titlepagedivdivh2 class=titlea name=id2425795/aIntroduction/h2/div/div/divpQpid provides two AMQP messaging brokers:/pdiv class=itemizedlistullipImplemented in C++ - high performance, low latency, and RDMA support./p/lilipImplemented in Java - Fully JMS compliant, runs on any Java platform./p/li/ul/divpBoth AMQP messaging bro kers support clients in multiple +htmlheadmeta http-equiv=Content-Type content=text/html; charset=UTF-8titleIntroduction/titlelink rel=stylesheet href=css/style.css type=text/cssmeta name=generator content=DocBook XSL Stylesheets V1.73.2link rel=start href=index.html title=AMQP Messaging Broker (Implemented in C++)link rel=up href=index.html title=AMQP Messaging Broker (Implemented in C++)link rel=prev href=index.html title=AMQP Messaging Broker (Implemented in C++)link rel=next href=ch01.html title=Chapter 1. Running the AMQP Messaging Broker/headbodydiv class=container bgcolor=white text=black link=#FF vlink=#840084 alink=#FFDIV class=headerDIV class=logoH1Apache Qpidâ¢/H1H2Open Source AMQP Messaging/H2/DIV/DIVDIV class=menu_boxDIV class=menu_box_top/DIVDIV class=menu_box_bodyH3Apache Qpid/H3ULLIA href=http://qpid.apache.org/index.html;Home/A/LILIA href=http: //qpid.apache.org/download.htmlDownload/A/LILIA href=http://qpid.apache.org/getting_started.html;Getting
svn commit: r1379885 [24/27] - in /qpid/site/docs: ./ books/0.18/AMQP-Messaging-Broker-CPP-Book/html/ books/0.18/AMQP-Messaging-Broker-CPP-Book/pdf/ books/0.18/AMQP-Messaging-Broker-Java-Book/html/ bo
Modified: qpid/site/docs/books/trunk/Programming-In-Apache-Qpid/html/ch04s05.html URL: http://svn.apache.org/viewvc/qpid/site/docs/books/trunk/Programming-In-Apache-Qpid/html/ch04s05.html?rev=1379885r1=1379884r2=1379885view=diff == --- qpid/site/docs/books/trunk/Programming-In-Apache-Qpid/html/ch04s05.html (original) +++ qpid/site/docs/books/trunk/Programming-In-Apache-Qpid/html/ch04s05.html Sat Sep 1 22:32:47 2012 @@ -1,4 +1,4 @@ -htmlheadmeta http-equiv=Content-Type content=text/html; charset=UTF-8title4.5. Transactions/titlelink rel=stylesheet href=css/style.css type=text/cssmeta name=generator content=DocBook XSL Stylesheets V1.73.2link rel=start href=index.html title=Programming in Apache Qpidlink rel=up href=QpidWCF.html title=Chapter 4. Using the Qpid WCF clientlink rel=prev href=ch04s04.html title=4.4. Securitylink rel=next href=ch05.html title=Chapter 5. The .NET Binding for the C++ Messaging Client/headbodydiv class=container bgcolor=white text=black link=#FF vlink=#840084 alink=#FFDIV class=headerDIV class=logoH1Apache Qpidâ¢/H1H2Open Source AMQP Messaging/H2/DIV/DIVDIV class=menu_boxDIV class=menu_box_top/DIVDIV class=menu_box_bodyH3Apache Qpid/H3ULLIA href=http://qpid.apache.org/index.html;Home/A/LILIA href=http://qpid.apache.org/d ownload.htmlDownload/A/LILIA href=http://qpid.apache.org/getting_started.html;Getting Started/A/LILIA href=http://www.apache.org/licenses/;License/A/LILIA href=https://cwiki.apache.org/qpid/faq.html;FAQ/A/LI/UL/DIVDIV class=menu_box_bottom/DIVDIV class=menu_box_top/DIVDIV class=menu_box_bodyH3Documentation/H3ULLIA href=http://qpid.apache.org/documentation.html#doc-release;0.14 Release/A/LILIA href=http://qpid.apache.org/documentation.html#doc-trunk;Trunk/A/LILIA href=http://qpid.apache.org/documentation.html#doc-archives;Archive/A/LI/UL/DIVDIV class=menu_box_bottom/DIVDIV class=menu_box_top/DIVDIV class=menu_box_bodyH3Community/H3ULLIA href=http://qpid.apache.org/getting_involved.html;Getting Involved/A/LILIA href=http://qpid.apache.org/source_repository.html;Source Repository/A/LILIA href=http://qpid.apache.org/mailing_lists.html;Mailing Lis ts/A/LILIA href=https://cwiki.apache.org/qpid/;Wiki/A/LILIA href=https://issues.apache.org/jira/browse/qpid;Issue Reporting/A/LILIA href=http://qpid.apache.org/people.html;People/A/LILIA href=http://qpid.apache.org/acknowledgements.html;Acknowledgements/A/LI/UL/DIVDIV class=menu_box_bottom/DIVDIV class=menu_box_top/DIVDIV class=menu_box_bodyH3Developers/H3ULLIA href=https://cwiki.apache.org/qpid/building.html;Building Qpid/A/LILIA href=https://cwiki.apache.org/qpid/developer-pages.html;Developer Pages/A/LI/UL/DIVDIV class=menu_box_bottom/DIVDIV class=menu_box_top/DIVDIV class=menu_box_bodyH3About AMQP/H3ULLIA href=http://qpid.apache.org/amqp.html;What is AMQP?/A/LI/UL/DIVDIV class=menu_box_bottom/DIVDIV class=menu_box_top/DIVDIV class=menu_box_bodyH3About Apache/H3ULLIA href=http://www.apache.org;Home/A/LILIA href=http: //www.apache.org/foundation/sponsorship.htmlSponsorship/A/LILIA href=http://www.apache.org/foundation/thanks.html;Thanks/A/LILIA href=http://www.apache.org/security/;Security/A/LI/UL/DIVDIV class=menu_box_bottom/DIV/DIVdiv class=main_text_areadiv class=main_text_area_top/divdiv class=main_text_area_bodyDIV class=breadcrumbsspan class=breadcrumb-linka href=index.htmlProgramming in Apache Qpid/a/span gt; span class=breadcrumb-linka href=QpidWCF.htmlUsing the Qpid WCF client/a/span gt; span class=breadcrumb-nodeTransactions/span/DIVdiv class=section lang=endiv class=titlepagedivdivh2 class=titlea name=id2556796/a4.5. Transactions/h2/div/div/divpThe WCF channel provides a transaction resource manager +htmlheadmeta http-equiv=Content-Type content=text/html; charset=UTF-8title4.5. Transactions/titlelink rel=stylesheet href=css/style.css type=text/cssmeta name=generator content=DocBook XSL Stylesheets V1.73.2link rel=start href=index.html title=Programming in Apache Qpidlink rel=up href=QpidWCF.html title=Chapter 4. Using the Qpid WCF clientlink rel=prev href=ch04s04.html title=4.4. Securitylink rel=next href=ch05.html title=Chapter 5. The .NET Binding for the C++ Messaging Client/headbodydiv class=container bgcolor=white text=black link=#FF vlink=#840084 alink=#FFDIV class=headerDIV class=logoH1Apache Qpidâ¢/H1H2Open Source AMQP Messaging/H2/DIV/DIVDIV class=menu_boxDIV class=menu_box_top/DIVDIV class=menu_box_bodyH3Apache Qpid/H3ULLIA href=http://qpid.apache.org/index.html;Home/A/LILIA href=http://qpid.apache.org/d ownload.htmlDownload/A/LILIA href=http://qpid.apache.org/getting_started.html;Getting Started/A/LILIA href=http://www.apache.org/licenses/;License/A/LILIA href=https://cwiki.apache.org/qpid/faq.html;FAQ/A/LI/UL/DIVDIV class=menu_box_bottom/DIVDIV class=menu_box_top/DIVDIV
svn commit: r1379891 - /qpid/doap_qpid.rdf
Author: robbie Date: Sat Sep 1 22:54:16 2012 New Revision: 1379891 URL: http://svn.apache.org/viewvc?rev=1379891view=rev Log: QPID-4111: update the DOAP file for http://projects.apache.org with the new release details Modified: qpid/doap_qpid.rdf Modified: qpid/doap_qpid.rdf URL: http://svn.apache.org/viewvc/qpid/doap_qpid.rdf?rev=1379891r1=1379890r2=1379891view=diff == --- qpid/doap_qpid.rdf (original) +++ qpid/doap_qpid.rdf Sat Sep 1 22:54:16 2012 @@ -41,6 +41,13 @@ category rdf:resource=http://projects.apache.org/category/network-client; / release Version +nameApache Qpid 0.18/name +created2012-08-30/created +revision0.18/revision + /Version +/release +release + Version nameApache Qpid 0.16/name created2012-05-19/created revision0.16/revision - To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
svn commit: r1379980 - in /qpid/trunk/qpid/doc/book/src/java-broker: AMQP-Messaging-Broker-Java-Book.xml Configure-ACLs.xml Configure-AuthenticationProviders.xml Configure-Group-Providers.xml
Author: robbie
Date: Sun Sep 2 14:34:48 2012
New Revision: 1379980
URL: http://svn.apache.org/viewvc?rev=1379980view=rev
Log:
QPID-4236,QPID-4237: add some documentation for the FileGroupManager and update
the ACL documentation to link that instead, removing the previous group info.
Added:
qpid/trunk/qpid/doc/book/src/java-broker/Configure-Group-Providers.xml
Modified:
qpid/trunk/qpid/doc/book/src/java-broker/AMQP-Messaging-Broker-Java-Book.xml
qpid/trunk/qpid/doc/book/src/java-broker/Configure-ACLs.xml
qpid/trunk/qpid/doc/book/src/java-broker/Configure-AuthenticationProviders.xml
Modified:
qpid/trunk/qpid/doc/book/src/java-broker/AMQP-Messaging-Broker-Java-Book.xml
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/doc/book/src/java-broker/AMQP-Messaging-Broker-Java-Book.xml?rev=1379980r1=1379979r2=1379980view=diff
==
---
qpid/trunk/qpid/doc/book/src/java-broker/AMQP-Messaging-Broker-Java-Book.xml
(original)
+++
qpid/trunk/qpid/doc/book/src/java-broker/AMQP-Messaging-Broker-Java-Book.xml
Sun Sep 2 14:34:48 2012
@@ -52,6 +52,7 @@
xi:include xmlns:xi=http://www.w3.org/2001/XInclude;
href=Add-New-Users.xml/
xi:include xmlns:xi=http://www.w3.org/2001/XInclude;
href=Configure-ACLs.xml/
+xi:include xmlns:xi=http://www.w3.org/2001/XInclude;
href=Configure-Group-Providers.xml/
xi:include xmlns:xi=http://www.w3.org/2001/XInclude;
href=Configure-Java-Qpid-to-use-a-SSL-connection.xml/
xi:include xmlns:xi=http://www.w3.org/2001/XInclude;
href=Configure-Log4j-CompositeRolling-Appender.xml/
xi:include xmlns:xi=http://www.w3.org/2001/XInclude;
href=Configure-the-Broker-via-config.xml.xml/
Modified: qpid/trunk/qpid/doc/book/src/java-broker/Configure-ACLs.xml
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/doc/book/src/java-broker/Configure-ACLs.xml?rev=1379980r1=1379979r2=1379980view=diff
==
--- qpid/trunk/qpid/doc/book/src/java-broker/Configure-ACLs.xml (original)
+++ qpid/trunk/qpid/doc/book/src/java-broker/Configure-ACLs.xml Sun Sep 2
14:34:48 2012
@@ -79,11 +79,10 @@
/title
para
- The ACL file consists of a series of rules and group definitions. Each
rule grants or denies specific rights to a user or group. Group
- definitions declare groups of users and serve to make the ACL file more
concise.
+ The ACL file consists of a series of rules associating behaviour for a
user or group. Use of groups can serve to make the ACL file more concise. See
link linkend=Configuring-Group-ProvidersConfiguring Group Providers/link
for more information on defining groups.
/para
para
- Each ACL rule grants (or denies) a particular action on a object to a
user. The rule may be augmented with one or more properties, restricting
+ Each ACL rule grants (or denies) a particular action on a object to a
user/group. The rule may be augmented with one or more properties, restricting
the rule's applicability.
/para
programlisting
@@ -136,13 +135,6 @@
/programlisting
para
- GROUP definitions must follow this syntax:
-/para
-programlisting
- GROUP {group name} {username 1}..{username n} # Where username is a
username, or a groupname.
-/programlisting
-
-para
Comments may be introduced with the hash (#) character and are ignored.
Long lines can be broken with the slash (\) character.
/para
programlisting
@@ -150,8 +142,6 @@
ACL ALLOW admin CREATE ALL # Also a comment
ACL DENY guest \
ALL ALL # A broken line
- GROUP securegroup bob \
- alice # Another broker line
/programlisting
/section
table id=tabl-ConfigureACLs-Syntax_permissions
@@ -385,13 +375,10 @@
Worked example 2 - User maintainer group
/title
para
- Suppose you wish to restrict User Management operations to users
belonging to a group 'usermaint'. No other user
- is allowed to perform user maintainence This example illustrates the
permissioning of a individual component
- and a group definition.
+ Suppose you wish to restrict User Management operations to users
belonging to a link linkend=Configuring-Group-Providersgroup/link
'usermaint'. No other user
+ is allowed to perform user maintainence This example illustrates the
permissioning of an individual component.
/para
programlisting
-# Create a group usermaint with members bob and alice
-GROUP usermaint bob alice
# Give operator permission to execute all JMX Methods
ACL ALLOW usermaint ALL METHOD component=UserManagement
ACL DENY ALL ALL METHOD component=UserManagement
Modified:
qpid/trunk/qpid/doc/book/src/java-broker/Configure-AuthenticationProviders.xml
URL:
http://svn.apache.org/viewvc
svn commit: r1379981 - /qpid/trunk/qpid/doc/book/src/java-broker/Configure-ACLs.xml
Author: robbie Date: Sun Sep 2 14:35:00 2012 New Revision: 1379981 URL: http://svn.apache.org/viewvc?rev=1379981view=rev Log: QPID-4236,QPID-4237: update the ACL examples to reflect permissioning of the new USER objects and actions via the HTTP management interface Modified: qpid/trunk/qpid/doc/book/src/java-broker/Configure-ACLs.xml Modified: qpid/trunk/qpid/doc/book/src/java-broker/Configure-ACLs.xml URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/doc/book/src/java-broker/Configure-ACLs.xml?rev=1379981r1=1379980r2=1379981view=diff == --- qpid/trunk/qpid/doc/book/src/java-broker/Configure-ACLs.xml (original) +++ qpid/trunk/qpid/doc/book/src/java-broker/Configure-ACLs.xml Sun Sep 2 14:35:00 2012 @@ -227,6 +227,14 @@ entry para A virtualhost (Java Broker only)/para /entry /row row + entry commandUSER/command /entry + entry para A user (Java Broker only)/para /entry +/row +row + entry commandGROUP/command /entry + entry para A group (Java Broker only)/para /entry +/row +row entry commandMETHOD/command /entry entry para Management or agent or broker method (Java Broker only)/para /entry /row @@ -353,16 +361,16 @@ para Suppose you wish to permission two users: a user 'operator' must be able to perform all Management operations, and a user 'readonly' must be enable to perform only read-only functions. Neither 'operator' nor 'readonly' - should be allow to connect for messaging. + should be allowed to connect clients for messaging. /para programlisting -# Give operator permission to execute all JMX Methods -ACL ALLOW operator ALL METHOD -# Give operator permission to execute only read-only JMX Methods -ACL ALLOW readonly ACCESS METHOD -# Deny operator/readonly permission to perform messaging. -ACL DENY operator ACCESS VIRTUALHOST -ACL DENY readonly ACCESS VIRTUALHOST +# Deny (loggged) operator/readonly permission to connect messaging clients. +ACL DENY-LOG operator ACCESS VIRTUALHOST +ACL DENY-LOG readonly ACCESS VIRTUALHOST +# Give operator permission to perfom all other actions +ACL ALLOW operator ALL ALL +# Give readonly permission to execute only read-only actions +ACL ALLOW readonly ACCESS ALL ... ... rules for other users ... @@ -379,9 +387,12 @@ is allowed to perform user maintainence This example illustrates the permissioning of an individual component. /para programlisting -# Give operator permission to execute all JMX Methods +# Give usermaint permission to execute all JMX Methods on the +# UserManagement MBean and perform all actions for USER objects ACL ALLOW usermaint ALL METHOD component=UserManagement +ACL ALLOW usermaint ALL USER ACL DENY ALL ALL METHOD component=UserManagement +ACL DENY ALL ALL USER ... ... rules for other users ... - To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
svn commit: r1379984 [1/5] - in /qpid/site/docs/books/trunk/AMQP-Messaging-Broker-Java-Book: html/ pdf/
Author: robbie Date: Sun Sep 2 14:36:07 2012 New Revision: 1379984 URL: http://svn.apache.org/viewvc?rev=1379984view=rev Log: NO-JIRA: publish latest java documentation for trunk Added: qpid/site/docs/books/trunk/AMQP-Messaging-Broker-Java-Book/html/Configuring-Authentication-Mechanisms.html qpid/site/docs/books/trunk/AMQP-Messaging-Broker-Java-Book/html/Configuring-Group-Providers.html Removed: qpid/site/docs/books/trunk/AMQP-Messaging-Broker-Java-Book/html/ch02s07.html Modified: qpid/site/docs/books/trunk/AMQP-Messaging-Broker-Java-Book/html/Configuring-ACLS.html qpid/site/docs/books/trunk/AMQP-Messaging-Broker-Java-Book/html/High-Availability.html qpid/site/docs/books/trunk/AMQP-Messaging-Broker-Java-Book/html/How-to-Tune-M3-Java-Broker-Performance.html qpid/site/docs/books/trunk/AMQP-Messaging-Broker-Java-Book/html/Java-Broker-Configuration-Guide.html qpid/site/docs/books/trunk/AMQP-Messaging-Broker-Java-Book/html/Java-Broker-Debug-Logging.html qpid/site/docs/books/trunk/AMQP-Messaging-Broker-Java-Book/html/Java-Broker-Slow-Consumer-Disconnect.html qpid/site/docs/books/trunk/AMQP-Messaging-Broker-Java-Book/html/Java-General-User-Guides.html qpid/site/docs/books/trunk/AMQP-Messaging-Broker-Java-Book/html/OtherQueueTypes.html qpid/site/docs/books/trunk/AMQP-Messaging-Broker-Java-Book/html/Qpid-JMX-Management-Console.html qpid/site/docs/books/trunk/AMQP-Messaging-Broker-Java-Book/html/Qpid-Java-Broker-Config-File.html qpid/site/docs/books/trunk/AMQP-Messaging-Broker-Java-Book/html/Qpid-Java-Broker-HowTos.html qpid/site/docs/books/trunk/AMQP-Messaging-Broker-Java-Book/html/Qpid-Java-Broker-Virtualhosts-Config.html qpid/site/docs/books/trunk/AMQP-Messaging-Broker-Java-Book/html/Qpid-Java-Build-HowTo.html qpid/site/docs/books/trunk/AMQP-Messaging-Broker-Java-Book/html/Qpid-Java-FAQ.html qpid/site/docs/books/trunk/AMQP-Messaging-Broker-Java-Book/html/Qpid-Java-Log4j.html qpid/site/docs/books/trunk/AMQP-Messaging-Broker-Java-Book/html/Qpid-Java-SSL.html qpid/site/docs/books/trunk/AMQP-Messaging-Broker-Java-Book/html/index.html qpid/site/docs/books/trunk/AMQP-Messaging-Broker-Java-Book/pdf/AMQP-Messaging-Broker-Java-Book.pdf Modified: qpid/site/docs/books/trunk/AMQP-Messaging-Broker-Java-Book/html/Configuring-ACLS.html URL: http://svn.apache.org/viewvc/qpid/site/docs/books/trunk/AMQP-Messaging-Broker-Java-Book/html/Configuring-ACLS.html?rev=1379984r1=1379983r2=1379984view=diff == --- qpid/site/docs/books/trunk/AMQP-Messaging-Broker-Java-Book/html/Configuring-ACLS.html (original) +++ qpid/site/docs/books/trunk/AMQP-Messaging-Broker-Java-Book/html/Configuring-ACLS.html Sun Sep 2 14:36:07 2012 @@ -1,4 +1,4 @@ -htmlheadmeta http-equiv=Content-Type content=text/html; charset=UTF-8title2.2. Configuring ACLs/titlelink rel=stylesheet href=css/style.css type=text/cssmeta name=generator content=DocBook XSL Stylesheets V1.73.2link rel=start href=index.html title=AMQP Messaging Broker (Implemented in Java)link rel=up href=Qpid-Java-Broker-HowTos.html title=Chapter 2. How Toslink rel=prev href=Qpid-Java-Broker-HowTos.html title=Chapter 2. How Toslink rel=next href=Qpid-Java-SSL.html title=2.3. Configure Java Qpid to use a SSL connection./headbodydiv class=container bgcolor=white text=black link=#FF vlink=#840084 alink=#FFDIV class=headerDIV class=logoH1Apache Qpidâ¢/H1H2Open Source AMQP Messaging/H2/DIV/DIVDIV class=menu_boxDIV class=menu_box_top/DIVDIV class=menu_box_bodyH3Apache Qpid/H3ULLIA href=http://qpid.apache.org/index.html;Home/ A/LILIA href=http://qpid.apache.org/download.html;Download/A/LILIA href=http://qpid.apache.org/getting_started.html;Getting Started/A/LILIA href=http://www.apache.org/licenses/;License/A/LILIA href=https://cwiki.apache.org/qpid/faq.html;FAQ/A/LI/UL/DIVDIV class=menu_box_bottom/DIVDIV class=menu_box_top/DIVDIV class=menu_box_bodyH3Documentation/H3ULLIA href=http://qpid.apache.org/documentation.html#doc-release;Latest Release/A/LILIA href=http://qpid.apache.org/documentation.html#doc-trunk;Trunk/A/LILIA href=http://qpid.apache.org/documentation.html#doc-archives;Archive/A/LI/UL/DIVDIV class=menu_box_bottom/DIVDIV class=menu_box_top/DIVDIV class=menu_box_bodyH3Community/H3ULLIA href=http://qpid.apache.org/getting_involved.html;Getting Involved/A/LILIA href=http://qpid.apache.org/source_repository.html;Source Repository/A/LILIA href=http://q pid.apache.org/mailing_lists.htmlMailing Lists/A/LILIA href=https://cwiki.apache.org/qpid/;Wiki/A/LILIA href=https://issues.apache.org/jira/browse/qpid;Issue Reporting/A/LILIA href=http://qpid.apache.org/people.html;People/A/LILIA href=http://qpid.apache.org/acknowledgements.html;Acknowledgements/A/LI/UL/DIVDIV class=menu_box_bottom/DIVDIV class=menu_box_top/DIVDIV class=menu_box_bodyH3Developers/H3ULLIA href
svn commit: r1379984 [5/5] - in /qpid/site/docs/books/trunk/AMQP-Messaging-Broker-Java-Book: html/ pdf/
Modified: qpid/site/docs/books/trunk/AMQP-Messaging-Broker-Java-Book/html/index.html URL: http://svn.apache.org/viewvc/qpid/site/docs/books/trunk/AMQP-Messaging-Broker-Java-Book/html/index.html?rev=1379984r1=1379983r2=1379984view=diff == --- qpid/site/docs/books/trunk/AMQP-Messaging-Broker-Java-Book/html/index.html (original) +++ qpid/site/docs/books/trunk/AMQP-Messaging-Broker-Java-Book/html/index.html Sun Sep 2 14:36:07 2012 @@ -1,4 +1,4 @@ -htmlheadmeta http-equiv=Content-Type content=text/html; charset=UTF-8titleAMQP Messaging Broker (Implemented in Java)/titlelink rel=stylesheet href=css/style.css type=text/cssmeta name=generator content=DocBook XSL Stylesheets V1.73.2link rel=start href=index.html title=AMQP Messaging Broker (Implemented in Java)link rel=next href=pr01.html title=Introduction/headbodydiv class=container bgcolor=white text=black link=#FF vlink=#840084 alink=#FFDIV class=headerDIV class=logoH1Apache Qpidâ¢/H1H2Open Source AMQP Messaging/H2/DIV/DIVDIV class=menu_boxDIV class=menu_box_top/DIVDIV class=menu_box_bodyH3Apache Qpid/H3ULLIA href=http://qpid.apache.org/index.html;Home/A/LILIA href=http://qpid.apache.org/download.html;Download/A/LILIA href=http://qpid.apache.org/getting_started.html;Getting Started/A/LILIA href=http://www.apache.org/licenses/; License/A/LILIA href=https://cwiki.apache.org/qpid/faq.html;FAQ/A/LI/UL/DIVDIV class=menu_box_bottom/DIVDIV class=menu_box_top/DIVDIV class=menu_box_bodyH3Documentation/H3ULLIA href=http://qpid.apache.org/documentation.html#doc-release;Latest Release/A/LILIA href=http://qpid.apache.org/documentation.html#doc-trunk;Trunk/A/LILIA href=http://qpid.apache.org/documentation.html#doc-archives;Archive/A/LI/UL/DIVDIV class=menu_box_bottom/DIVDIV class=menu_box_top/DIVDIV class=menu_box_bodyH3Community/H3ULLIA href=http://qpid.apache.org/getting_involved.html;Getting Involved/A/LILIA href=http://qpid.apache.org/source_repository.html;Source Repository/A/LILIA href=http://qpid.apache.org/mailing_lists.html;Mailing Lists/A/LILIA href=https://cwiki.apache.org/qpid/;Wiki/A/LILIA href=https://issues.apache.org/jira/browse/qpid;Issue Reporting/A/LILIA href=http://qpid.apache.org/people.html;People/A/LILIA href=http://qpid.apache.org/acknowledgements.html;Acknowledgements/A/LI/UL/DIVDIV class=menu_box_bottom/DIVDIV class=menu_box_top/DIVDIV class=menu_box_bodyH3Developers/H3ULLIA href=https://cwiki.apache.org/qpid/building.html;Building Qpid/A/LILIA href=https://cwiki.apache.org/qpid/developer-pages.html;Developer Pages/A/LI/UL/DIVDIV class=menu_box_bottom/DIVDIV class=menu_box_top/DIVDIV class=menu_box_bodyH3About AMQP/H3ULLIA href=http://qpid.apache.org/amqp.html;What is AMQP?/A/LI/UL/DIVDIV class=menu_box_bottom/DIVDIV class=menu_box_top/DIVDIV class=menu_box_bodyH3About Apache/H3ULLIA href=http://www.apache.org;Home/A/LILIA href=http://www.apache.org/foundation/sponsorship.html;Sponsorship/A/LILIA href=http://www.apache.org/foundation/thanks.html;Thanks/A/LILIA href=htt p://www.apache.org/security/Security/A/LI/UL/DIVDIV class=menu_box_bottom/DIV/DIVdiv class=main_text_areadiv class=main_text_area_top/divdiv class=main_text_area_bodyDIV class=breadcrumbsspan class=breadcrumb-nodeAMQP Messaging Broker (Implemented in Java)/span/DIVdiv class=book lang=endiv class=titlepagedivdivh1 class=titlea name=id2426353/aAMQP Messaging Broker (Implemented in Java)/h1/div/divhr/divdiv class=tocpbTable of Contents/b/pdldtspan class=prefacea href=pr01.htmlIntroduction/a/span/dtdtspan class=chaptera href=Java-General-User-Guides.html1. General User Guides/a/span/dtdddldtspan class=sectiona href=Java-General-User-Guides.html#id24924411.1. +htmlheadmeta http-equiv=Content-Type content=text/html; charset=UTF-8titleAMQP Messaging Broker (Implemented in Java)/titlelink rel=stylesheet href=css/style.css type=text/cssmeta name=generator content=DocBook XSL Stylesheets V1.73.2link rel=start href=index.html title=AMQP Messaging Broker (Implemented in Java)link rel=next href=pr01.html title=Introduction/headbodydiv class=container bgcolor=white text=black link=#FF vlink=#840084 alink=#FFDIV class=headerDIV class=logoH1Apache Qpidâ¢/H1H2Open Source AMQP Messaging/H2/DIV/DIVDIV class=menu_boxDIV class=menu_box_top/DIVDIV class=menu_box_bodyH3Apache Qpid/H3ULLIA href=http://qpid.apache.org/index.html;Home/A/LILIA href=http://qpid.apache.org/download.html;Download/A/LILIA href=http://qpid.apache.org/getting_started.html;Getting Started/A/LILIA href=http://www.apache.org/licenses/; License/A/LILIA href=https://cwiki.apache.org/qpid/faq.html;FAQ/A/LI/UL/DIVDIV class=menu_box_bottom/DIVDIV class=menu_box_top/DIVDIV class=menu_box_bodyH3Documentation/H3ULLIA href=http://qpid.apache.org/documentation.html#doc-release;Latest Release/A/LILIA
svn commit: r1380016 - in /qpid/trunk/qpid/java: broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/ broker-plugins/management-http/src/test/java/org/ap
Author: robbie
Date: Sun Sep 2 18:26:40 2012
New Revision: 1380016
URL: http://svn.apache.org/viewvc?rev=1380016view=rev
Log:
QPID-4253: add configuration for basic-auth on http / https management and set
to disabled / enabled respectively by default
Added:
qpid/trunk/qpid/java/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/servlet/rest/BasicAuthRestTest.java
Modified:
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/AbstractServlet.java
qpid/trunk/qpid/java/broker-plugins/management-http/src/test/java/org/apache/qpid/systest/rest/acl/GroupRestACLTest.java
qpid/trunk/qpid/java/broker-plugins/management-http/src/test/java/org/apache/qpid/systest/rest/acl/UserRestACLTest.java
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java
Modified:
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/AbstractServlet.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/AbstractServlet.java?rev=1380016r1=1380015r2=1380016view=diff
==
---
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/AbstractServlet.java
(original)
+++
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/AbstractServlet.java
Sun Sep 2 18:26:40 2012
@@ -255,17 +255,18 @@ public abstract class AbstractServlet ex
{
String header = request.getHeader(Authorization);
-/*
- * TODO - Should configure whether basic authentication is
allowed... and in particular whether it
- * should be allowed over non-ssl connections
- * */
-
if (header != null)
{
String[] tokens = header.split(\\s);
if(tokens.length = 2
BASIC.equalsIgnoreCase(tokens[0]))
{
+if(!isBasicAuthSupported(request))
+{
+//TODO: write a return response indicating failure?
+throw new IllegalArgumentException(BASIC
Authorization is not enabled.);
+}
+
String[] credentials = (new
String(Base64.decodeBase64(tokens[1].getBytes(.split(:,2);
if(credentials.length == 2)
{
@@ -299,6 +300,12 @@ public abstract class AbstractServlet ex
return subject;
}
+private boolean isBasicAuthSupported(HttpServletRequest req)
+{
+return req.isSecure() ?
ApplicationRegistry.getInstance().getConfiguration().getHTTPSManagementBasicAuth()
+ :
ApplicationRegistry.getInstance().getConfiguration().getHTTPManagementBasicAuth();
+}
+
private HttpManagementActor
getLogActorAndCacheInSession(HttpServletRequest req)
{
HttpSession session = req.getSession();
Added:
qpid/trunk/qpid/java/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/servlet/rest/BasicAuthRestTest.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/servlet/rest/BasicAuthRestTest.java?rev=1380016view=auto
==
---
qpid/trunk/qpid/java/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/servlet/rest/BasicAuthRestTest.java
(added)
+++
qpid/trunk/qpid/java/broker-plugins/management-http/src/test/java/org/apache/qpid/server/management/plugin/servlet/rest/BasicAuthRestTest.java
Sun Sep 2 18:26:40 2012
@@ -0,0 +1,115 @@
+/*
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * License); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+package org.apache.qpid.server.management.plugin.servlet.rest;
+
+import java.io.IOException
svn commit: r1380037 - in /qpid/trunk/qpid/java/broker/src: main/java/org/apache/qpid/server/configuration/ main/java/org/apache/qpid/server/configuration/plugins/ test/java/org/apache/qpid/server/con
Author: robbie
Date: Sun Sep 2 19:26:05 2012
New Revision: 1380037
URL: http://svn.apache.org/viewvc?rev=1380037view=rev
Log:
QPID-4238: escape tags for queue and virtualhost names with dots in them when
accessing the XML configuration, works around CommonsConfiguration behaviour
with element names containing dots
Applied patch from Jakub Scholz
Modified:
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/QueueConfiguration.java
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/plugins/ConfigurationPlugin.java
qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/VirtualHostConfigurationTest.java
Modified:
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/QueueConfiguration.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/QueueConfiguration.java?rev=1380037r1=1380036r2=1380037view=diff
==
---
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/QueueConfiguration.java
(original)
+++
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/QueueConfiguration.java
Sun Sep 2 19:26:05 2012
@@ -39,7 +39,7 @@ public class QueueConfiguration extends
_name = name;
CompositeConfiguration mungedConf = new CompositeConfiguration();
-
mungedConf.addConfiguration(_vHostConfig.getConfig().subset(queues.queue. +
name));
+
mungedConf.addConfiguration(_vHostConfig.getConfig().subset(queues.queue. +
escapeTagName(name)));
mungedConf.addConfiguration(_vHostConfig.getConfig().subset(queues));
setConfiguration(virtualhosts.virtualhost.queues.queue, mungedConf);
Modified:
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java?rev=1380037r1=1380036r2=1380037view=diff
==
---
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java
(original)
+++
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java
Sun Sep 2 19:26:05 2012
@@ -349,7 +349,7 @@ public class ServerConfiguration extends
String name = (String) hosts.get(j);
// Add the virtual hosts to the server configuration
-VirtualHostConfiguration virtualhost = new
VirtualHostConfiguration(name, vhostConfiguration.subset(virtualhost. +
name));
+VirtualHostConfiguration virtualhost = new
VirtualHostConfiguration(name, vhostConfiguration.subset(virtualhost. +
escapeTagName(name)));
_virtualHosts.put(virtualhost.getName(), virtualhost);
}
}
@@ -506,7 +506,7 @@ public class ServerConfiguration extends
for (String hostName : _virtualHosts.keySet())
{
VirtualHost vhost = vhostRegistry.getVirtualHost(hostName);
-Configuration vhostConfig = newVhosts.subset(virtualhost. +
hostName);
+Configuration vhostConfig = newVhosts.subset(virtualhost. +
escapeTagName(hostName));
vhost.getConfiguration().setConfiguration(virtualhosts.virtualhost,
vhostConfig);
vhost.getSecurityManager().configureGlobalPlugins(this);
vhost.getSecurityManager().configureHostPlugins(vhost.getConfiguration());
Modified:
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/plugins/ConfigurationPlugin.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/plugins/ConfigurationPlugin.java?rev=1380037r1=1380036r2=1380037view=diff
==
---
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/plugins/ConfigurationPlugin.java
(original)
+++
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/plugins/ConfigurationPlugin.java
Sun Sep 2 19:26:05 2012
@@ -479,6 +479,11 @@ public abstract class ConfigurationPlugi
return super.toString();
}
+public String escapeTagName(String name)
+{
+return name.replaceAll(\\., \\.\\.);
+}
+
protected void setConfig(Configuration config)
{
_config = config;
Modified:
qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/VirtualHostConfigurationTest.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/test/java/org
svn commit: r1380291 - /qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/group/Group.js
Author: robbie
Date: Mon Sep 3 16:43:51 2012
New Revision: 1380291
URL: http://svn.apache.org/viewvc?rev=1380291view=rev
Log:
QPID-4282: Remove debug logging from web management console
Applied patch from Oleksandr Rudyyoru...@gmail.com
Modified:
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/group/Group.js
Modified:
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/group/Group.js
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/group/Group.js?rev=1380291r1=1380290r2=1380291view=diff
==
---
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/group/Group.js
(original)
+++
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/group/Group.js
Mon Sep 3 16:43:51 2012
@@ -171,25 +171,14 @@ define([dojo/_base/xhr,
{
var that = this;
-
- console.log(updater called );
- console.dir(that);
-
xhr.get({url: this.query, sync: properties.useSyncGet,
handleAs: json})
.then(function(data) {
that.groupMemberData = data;
- console.log(updater data );
- console.dir(that.groupMemberData);
-
-
util.flattenStatistics( that.groupMemberData );
that.groupMembersUpdatableStore.update(that.groupMemberData);
-
- console.log(updated grid);
-
console.dir(that.groupMembersUpdatableStore.grid);
});
};
-
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
svn commit: r1380383 - in /qpid/trunk/qpid/doc/book/src/java-broker: ./ images/
Author: robbie Date: Mon Sep 3 22:08:25 2012 New Revision: 1380383 URL: http://svn.apache.org/viewvc?rev=1380383view=rev Log: QPID-4160: remove old documentation for management components that have previously been deleted Removed: qpid/trunk/qpid/doc/book/src/java-broker/Configuring-Management-Users.xml qpid/trunk/qpid/doc/book/src/java-broker/Configuring-Qpid-JMX-Management-Console.xml qpid/trunk/qpid/doc/book/src/java-broker/Management-Console-Security.xml qpid/trunk/qpid/doc/book/src/java-broker/Qpid-JMX-Management-Console-FAQ.xml qpid/trunk/qpid/doc/book/src/java-broker/Qpid-JMX-Management-Console-User-Guide.xml qpid/trunk/qpid/doc/book/src/java-broker/Qpid-JMX-Management-Console.xml qpid/trunk/qpid/doc/book/src/java-broker/Qpid-Java-Broker-Management-CLI.xml qpid/trunk/qpid/doc/book/src/java-broker/Qpid-Management-Features.xml qpid/trunk/qpid/doc/book/src/java-broker/images/3113098.png qpid/trunk/qpid/doc/book/src/java-broker/images/3113099.png qpid/trunk/qpid/doc/book/src/java-broker/images/3113100.png qpid/trunk/qpid/doc/book/src/java-broker/images/3113101.png qpid/trunk/qpid/doc/book/src/java-broker/images/3113102.png qpid/trunk/qpid/doc/book/src/java-broker/images/3113103.png qpid/trunk/qpid/doc/book/src/java-broker/images/3113104.png qpid/trunk/qpid/doc/book/src/java-broker/images/3113105.png qpid/trunk/qpid/doc/book/src/java-broker/images/3113106.png qpid/trunk/qpid/doc/book/src/java-broker/images/3113107.png qpid/trunk/qpid/doc/book/src/java-broker/images/3113108.png qpid/trunk/qpid/doc/book/src/java-broker/images/3113109.png qpid/trunk/qpid/doc/book/src/java-broker/images/3113110.png qpid/trunk/qpid/doc/book/src/java-broker/images/3113111.png qpid/trunk/qpid/doc/book/src/java-broker/images/3113112.png qpid/trunk/qpid/doc/book/src/java-broker/images/3113113.png qpid/trunk/qpid/doc/book/src/java-broker/images/3113114.png qpid/trunk/qpid/doc/book/src/java-broker/images/3113115.png qpid/trunk/qpid/doc/book/src/java-broker/images/3113116.png qpid/trunk/qpid/doc/book/src/java-broker/images/3113117.png qpid/trunk/qpid/doc/book/src/java-broker/images/3113118.png qpid/trunk/qpid/doc/book/src/java-broker/images/3113119.png Modified: qpid/trunk/qpid/doc/book/src/java-broker/AMQP-Messaging-Broker-Java-Book.xml Modified: qpid/trunk/qpid/doc/book/src/java-broker/AMQP-Messaging-Broker-Java-Book.xml URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/doc/book/src/java-broker/AMQP-Messaging-Broker-Java-Book.xml?rev=1380383r1=1380382r2=1380383view=diff == --- qpid/trunk/qpid/doc/book/src/java-broker/AMQP-Messaging-Broker-Java-Book.xml (original) +++ qpid/trunk/qpid/doc/book/src/java-broker/AMQP-Messaging-Broker-Java-Book.xml Mon Sep 3 22:08:25 2012 @@ -65,11 +65,4 @@ xi:include xmlns:xi=http://www.w3.org/2001/XInclude; href=How-to-Use-SlowConsumerDisconnect.xml/ /chapter - -xi:include xmlns:xi=http://www.w3.org/2001/XInclude; href=Qpid-JMX-Management-Console.xml/ - -chapter id=QpidJavaBroker-ManagementTools -titleManagement Tools/title -xi:include xmlns:xi=http://www.w3.org/2001/XInclude; href=Qpid-Java-Broker-Management-CLI.xml/ -/chapter /book - To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org
