You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by rg...@apache.org on 2012/03/01 13:51:52 UTC
svn commit: r1295541 [1/10] - in
/qpid/branches/rg-amqp-1-0-sandbox/qpid/java: ./ bdbstore/bin/
bdbstore/etc/scripts/ bdbstore/src/main/java/ bdbstore/src/resources/
bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/
broker-plugins/access-...
Author: rgodfrey
Date: Thu Mar 1 12:51:40 2012
New Revision: 1295541
URL: http://svn.apache.org/viewvc?rev=1295541&view=rev
Log:
NO-JIRA: [AMQP 1-0 Sandbox] merging from trunk
Added:
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/bdbstore/src/main/java/backup-log4j.xml
- copied unchanged from r1225000, qpid/trunk/qpid/java/bdbstore/src/main/java/backup-log4j.xml
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/broker/etc/broker_example.acl
- copied unchanged from r1225000, qpid/trunk/qpid/java/broker/etc/broker_example.acl
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/broker/src/main/java/org/apache/qpid/server/management/AbstractAMQManagedConnectionObject.java
- copied unchanged from r1225000, qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/management/AbstractAMQManagedConnectionObject.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/OutOfOrderQueue.java
- copied unchanged from r1225000, qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/OutOfOrderQueue.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/SimpleQueueEntryImpl.java
- copied unchanged from r1225000, qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/SimpleQueueEntryImpl.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/SortedQueue.java
- copied unchanged from r1225000, qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/SortedQueue.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/SortedQueueEntryImpl.java
- copied unchanged from r1225000, qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/SortedQueueEntryImpl.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/SortedQueueEntryList.java
- copied unchanged from r1225000, qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/SortedQueueEntryList.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/SortedQueueEntryListFactory.java
- copied unchanged from r1225000, qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/SortedQueueEntryListFactory.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ServerConnectionMBean.java
- copied unchanged from r1225000, qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ServerConnectionMBean.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/MockConnectionConfig.java
- copied unchanged from r1225000, qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/MockConnectionConfig.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/broker/src/test/java/org/apache/qpid/server/flow/
- copied from r1225000, qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/flow/
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/broker/src/test/java/org/apache/qpid/server/flow/WindowCreditManagerTest.java
- copied unchanged from r1225000, qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/flow/WindowCreditManagerTest.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/QueueEntryImplTestBase.java
- copied unchanged from r1225000, qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/QueueEntryImplTestBase.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/QueueEntryListTestBase.java
- copied unchanged from r1225000, qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/QueueEntryListTestBase.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/SelfValidatingSortedQueueEntryList.java
- copied unchanged from r1225000, qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/SelfValidatingSortedQueueEntryList.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/SimpleQueueEntryImplTest.java
- copied unchanged from r1225000, qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/SimpleQueueEntryImplTest.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/SortedQueueEntryImplTest.java
- copied unchanged from r1225000, qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/SortedQueueEntryImplTest.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/SortedQueueEntryListTest.java
- copied unchanged from r1225000, qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/SortedQueueEntryListTest.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/broker/src/test/java/org/apache/qpid/server/transport/
- copied from r1225000, qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/transport/
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/broker/src/test/java/org/apache/qpid/server/transport/ServerConnectionMBeanTest.java
- copied unchanged from r1225000, qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/transport/ServerConnectionMBeanTest.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/client/src/main/java/org/apache/qpid/client/RejectBehaviour.java
- copied unchanged from r1225000, qpid/trunk/qpid/java/client/src/main/java/org/apache/qpid/client/RejectBehaviour.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/client/src/test/java/org/apache/qpid/client/AMQConnectionUnitTest.java
- copied unchanged from r1225000, qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/client/AMQConnectionUnitTest.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/client/src/test/java/org/apache/qpid/client/BasicMessageConsumer_0_8_Test.java
- copied unchanged from r1225000, qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/client/BasicMessageConsumer_0_8_Test.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/common/src/test/java/org/apache/qpid/transport/ConnectionSettingsTest.java
- copied unchanged from r1225000, qpid/trunk/qpid/java/common/src/test/java/org/apache/qpid/transport/ConnectionSettingsTest.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/jca/
- copied from r1225000, qpid/trunk/qpid/java/jca/
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/jca/README-GERONIMO.txt
- copied unchanged from r1225000, qpid/trunk/qpid/java/jca/README-GERONIMO.txt
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/jca/README-JBOSS.txt
- copied unchanged from r1225000, qpid/trunk/qpid/java/jca/README-JBOSS.txt
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/jca/README.txt
- copied unchanged from r1225000, qpid/trunk/qpid/java/jca/README.txt
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/jca/build.xml
- copied unchanged from r1225000, qpid/trunk/qpid/java/jca/build.xml
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/jca/example/
- copied from r1225000, qpid/trunk/qpid/java/jca/example/
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/jca/example/.gitignore
- copied unchanged from r1225000, qpid/trunk/qpid/java/jca/example/.gitignore
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/jca/example/README.txt
- copied unchanged from r1225000, qpid/trunk/qpid/java/jca/example/README.txt
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/jca/example/build-geronimo-properties.xml
- copied unchanged from r1225000, qpid/trunk/qpid/java/jca/example/build-geronimo-properties.xml
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/jca/example/build-jboss-properties.xml
- copied unchanged from r1225000, qpid/trunk/qpid/java/jca/example/build-jboss-properties.xml
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/jca/example/build-properties.xml.temp
- copied unchanged from r1225000, qpid/trunk/qpid/java/jca/example/build-properties.xml.temp
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/jca/example/build.xml
- copied unchanged from r1225000, qpid/trunk/qpid/java/jca/example/build.xml
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/jca/example/conf/
- copied from r1225000, qpid/trunk/qpid/java/jca/example/conf/
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/jca/example/conf/application.xml
- copied unchanged from r1225000, qpid/trunk/qpid/java/jca/example/conf/application.xml
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/jca/example/conf/ejb-jar.xml
- copied unchanged from r1225000, qpid/trunk/qpid/java/jca/example/conf/ejb-jar.xml
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/jca/example/conf/geronimo-application.xml
- copied unchanged from r1225000, qpid/trunk/qpid/java/jca/example/conf/geronimo-application.xml
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/jca/example/conf/geronimo-ra.xml
- copied unchanged from r1225000, qpid/trunk/qpid/java/jca/example/conf/geronimo-ra.xml
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/jca/example/conf/jboss-web.xml
- copied unchanged from r1225000, qpid/trunk/qpid/java/jca/example/conf/jboss-web.xml
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/jca/example/conf/jboss.xml
- copied unchanged from r1225000, qpid/trunk/qpid/java/jca/example/conf/jboss.xml
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/jca/example/conf/log4j.properties
- copied unchanged from r1225000, qpid/trunk/qpid/java/jca/example/conf/log4j.properties
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/jca/example/conf/qpid-jca-ds.xml
- copied unchanged from r1225000, qpid/trunk/qpid/java/jca/example/conf/qpid-jca-ds.xml
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/jca/example/conf/web.xml
- copied unchanged from r1225000, qpid/trunk/qpid/java/jca/example/conf/web.xml
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/jca/example/qpid-jca-example-properties.xml
- copied unchanged from r1225000, qpid/trunk/qpid/java/jca/example/qpid-jca-example-properties.xml
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/jca/example/src/
- copied from r1225000, qpid/trunk/qpid/java/jca/example/src/
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/jca/example/src/main/
- copied from r1225000, qpid/trunk/qpid/java/jca/example/src/main/
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/jca/example/src/main/java/
- copied from r1225000, qpid/trunk/qpid/java/jca/example/src/main/java/
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/jca/example/src/main/java/org/
- copied from r1225000, qpid/trunk/qpid/java/jca/example/src/main/java/org/
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/jca/example/src/main/java/org/apache/
- copied from r1225000, qpid/trunk/qpid/java/jca/example/src/main/java/org/apache/
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/jca/example/src/main/java/org/apache/qpid/
- copied from r1225000, qpid/trunk/qpid/java/jca/example/src/main/java/org/apache/qpid/
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/jca/example/src/main/java/org/apache/qpid/jca/
- copied from r1225000, qpid/trunk/qpid/java/jca/example/src/main/java/org/apache/qpid/jca/
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/jca/example/src/main/java/org/apache/qpid/jca/example/
- copied from r1225000, qpid/trunk/qpid/java/jca/example/src/main/java/org/apache/qpid/jca/example/
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/jca/example/src/main/java/org/apache/qpid/jca/example/client/
- copied from r1225000, qpid/trunk/qpid/java/jca/example/src/main/java/org/apache/qpid/jca/example/client/
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/jca/example/src/main/java/org/apache/qpid/jca/example/client/QpidRequestResponseClient.java
- copied unchanged from r1225000, qpid/trunk/qpid/java/jca/example/src/main/java/org/apache/qpid/jca/example/client/QpidRequestResponseClient.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/jca/example/src/main/java/org/apache/qpid/jca/example/client/QpidTestClient.java
- copied unchanged from r1225000, qpid/trunk/qpid/java/jca/example/src/main/java/org/apache/qpid/jca/example/client/QpidTestClient.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/jca/example/src/main/java/org/apache/qpid/jca/example/client/QpidTestUtil.java
- copied unchanged from r1225000, qpid/trunk/qpid/java/jca/example/src/main/java/org/apache/qpid/jca/example/client/QpidTestUtil.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/jca/example/src/main/java/org/apache/qpid/jca/example/ejb/
- copied from r1225000, qpid/trunk/qpid/java/jca/example/src/main/java/org/apache/qpid/jca/example/ejb/
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/jca/example/src/main/java/org/apache/qpid/jca/example/ejb/QpidGoodByeListenerBean.java
- copied unchanged from r1225000, qpid/trunk/qpid/java/jca/example/src/main/java/org/apache/qpid/jca/example/ejb/QpidGoodByeListenerBean.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/jca/example/src/main/java/org/apache/qpid/jca/example/ejb/QpidGoodByeSubscriberBean.java
- copied unchanged from r1225000, qpid/trunk/qpid/java/jca/example/src/main/java/org/apache/qpid/jca/example/ejb/QpidGoodByeSubscriberBean.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/jca/example/src/main/java/org/apache/qpid/jca/example/ejb/QpidHelloListenerBean.java
- copied unchanged from r1225000, qpid/trunk/qpid/java/jca/example/src/main/java/org/apache/qpid/jca/example/ejb/QpidHelloListenerBean.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/jca/example/src/main/java/org/apache/qpid/jca/example/ejb/QpidHelloSubscriberBean.java
- copied unchanged from r1225000, qpid/trunk/qpid/java/jca/example/src/main/java/org/apache/qpid/jca/example/ejb/QpidHelloSubscriberBean.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/jca/example/src/main/java/org/apache/qpid/jca/example/ejb/QpidJMSResponderBean.java
- copied unchanged from r1225000, qpid/trunk/qpid/java/jca/example/src/main/java/org/apache/qpid/jca/example/ejb/QpidJMSResponderBean.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/jca/example/src/main/java/org/apache/qpid/jca/example/ejb/QpidTest.java
- copied unchanged from r1225000, qpid/trunk/qpid/java/jca/example/src/main/java/org/apache/qpid/jca/example/ejb/QpidTest.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/jca/example/src/main/java/org/apache/qpid/jca/example/ejb/QpidTestBean.java
- copied unchanged from r1225000, qpid/trunk/qpid/java/jca/example/src/main/java/org/apache/qpid/jca/example/ejb/QpidTestBean.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/jca/example/src/main/java/org/apache/qpid/jca/example/ejb/QpidTestLocal.java
- copied unchanged from r1225000, qpid/trunk/qpid/java/jca/example/src/main/java/org/apache/qpid/jca/example/ejb/QpidTestLocal.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/jca/example/src/main/java/org/apache/qpid/jca/example/ejb/QpidTestRemote.java
- copied unchanged from r1225000, qpid/trunk/qpid/java/jca/example/src/main/java/org/apache/qpid/jca/example/ejb/QpidTestRemote.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/jca/example/src/main/java/org/apache/qpid/jca/example/ejb/QpidUtil.java
- copied unchanged from r1225000, qpid/trunk/qpid/java/jca/example/src/main/java/org/apache/qpid/jca/example/ejb/QpidUtil.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/jca/example/src/main/java/org/apache/qpid/jca/example/web/
- copied from r1225000, qpid/trunk/qpid/java/jca/example/src/main/java/org/apache/qpid/jca/example/web/
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/jca/example/src/main/java/org/apache/qpid/jca/example/web/QpidTestServlet.java
- copied unchanged from r1225000, qpid/trunk/qpid/java/jca/example/src/main/java/org/apache/qpid/jca/example/web/QpidTestServlet.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/jca/src/
- copied from r1225000, qpid/trunk/qpid/java/jca/src/
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/jca/src/main/
- copied from r1225000, qpid/trunk/qpid/java/jca/src/main/
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/jca/src/main/java/
- copied from r1225000, qpid/trunk/qpid/java/jca/src/main/java/
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/jca/src/main/java/org/
- copied from r1225000, qpid/trunk/qpid/java/jca/src/main/java/org/
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/jca/src/main/java/org/apache/
- copied from r1225000, qpid/trunk/qpid/java/jca/src/main/java/org/apache/
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/jca/src/main/java/org/apache/qpid/
- copied from r1225000, qpid/trunk/qpid/java/jca/src/main/java/org/apache/qpid/
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/jca/src/main/java/org/apache/qpid/ra/
- copied from r1225000, qpid/trunk/qpid/java/jca/src/main/java/org/apache/qpid/ra/
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/jca/src/main/java/org/apache/qpid/ra/ConnectionFactoryObjectFactory.java
- copied unchanged from r1225000, qpid/trunk/qpid/java/jca/src/main/java/org/apache/qpid/ra/ConnectionFactoryObjectFactory.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/jca/src/main/java/org/apache/qpid/ra/ConnectionFactoryProperties.java
- copied unchanged from r1225000, qpid/trunk/qpid/java/jca/src/main/java/org/apache/qpid/ra/ConnectionFactoryProperties.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/jca/src/main/java/org/apache/qpid/ra/QpidRABytesMessage.java
- copied unchanged from r1225000, qpid/trunk/qpid/java/jca/src/main/java/org/apache/qpid/ra/QpidRABytesMessage.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/jca/src/main/java/org/apache/qpid/ra/QpidRAConnectionFactory.java
- copied unchanged from r1225000, qpid/trunk/qpid/java/jca/src/main/java/org/apache/qpid/ra/QpidRAConnectionFactory.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/jca/src/main/java/org/apache/qpid/ra/QpidRAConnectionFactoryImpl.java
- copied unchanged from r1225000, qpid/trunk/qpid/java/jca/src/main/java/org/apache/qpid/ra/QpidRAConnectionFactoryImpl.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/jca/src/main/java/org/apache/qpid/ra/QpidRAConnectionManager.java
- copied unchanged from r1225000, qpid/trunk/qpid/java/jca/src/main/java/org/apache/qpid/ra/QpidRAConnectionManager.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/jca/src/main/java/org/apache/qpid/ra/QpidRAConnectionMetaData.java
- copied unchanged from r1225000, qpid/trunk/qpid/java/jca/src/main/java/org/apache/qpid/ra/QpidRAConnectionMetaData.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/jca/src/main/java/org/apache/qpid/ra/QpidRAConnectionRequestInfo.java
- copied unchanged from r1225000, qpid/trunk/qpid/java/jca/src/main/java/org/apache/qpid/ra/QpidRAConnectionRequestInfo.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/jca/src/main/java/org/apache/qpid/ra/QpidRACredential.java
- copied unchanged from r1225000, qpid/trunk/qpid/java/jca/src/main/java/org/apache/qpid/ra/QpidRACredential.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/jca/src/main/java/org/apache/qpid/ra/QpidRAException.java
- copied unchanged from r1225000, qpid/trunk/qpid/java/jca/src/main/java/org/apache/qpid/ra/QpidRAException.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/jca/src/main/java/org/apache/qpid/ra/QpidRALocalTransaction.java
- copied unchanged from r1225000, qpid/trunk/qpid/java/jca/src/main/java/org/apache/qpid/ra/QpidRALocalTransaction.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/jca/src/main/java/org/apache/qpid/ra/QpidRAMCFProperties.java
- copied unchanged from r1225000, qpid/trunk/qpid/java/jca/src/main/java/org/apache/qpid/ra/QpidRAMCFProperties.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/jca/src/main/java/org/apache/qpid/ra/QpidRAManagedConnection.java
- copied unchanged from r1225000, qpid/trunk/qpid/java/jca/src/main/java/org/apache/qpid/ra/QpidRAManagedConnection.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/jca/src/main/java/org/apache/qpid/ra/QpidRAManagedConnectionFactory.java
- copied unchanged from r1225000, qpid/trunk/qpid/java/jca/src/main/java/org/apache/qpid/ra/QpidRAManagedConnectionFactory.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/jca/src/main/java/org/apache/qpid/ra/QpidRAMapMessage.java
- copied unchanged from r1225000, qpid/trunk/qpid/java/jca/src/main/java/org/apache/qpid/ra/QpidRAMapMessage.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/jca/src/main/java/org/apache/qpid/ra/QpidRAMessage.java
- copied unchanged from r1225000, qpid/trunk/qpid/java/jca/src/main/java/org/apache/qpid/ra/QpidRAMessage.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/jca/src/main/java/org/apache/qpid/ra/QpidRAMessageConsumer.java
- copied unchanged from r1225000, qpid/trunk/qpid/java/jca/src/main/java/org/apache/qpid/ra/QpidRAMessageConsumer.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/jca/src/main/java/org/apache/qpid/ra/QpidRAMessageListener.java
- copied unchanged from r1225000, qpid/trunk/qpid/java/jca/src/main/java/org/apache/qpid/ra/QpidRAMessageListener.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/jca/src/main/java/org/apache/qpid/ra/QpidRAMessageProducer.java
- copied unchanged from r1225000, qpid/trunk/qpid/java/jca/src/main/java/org/apache/qpid/ra/QpidRAMessageProducer.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/jca/src/main/java/org/apache/qpid/ra/QpidRAMetaData.java
- copied unchanged from r1225000, qpid/trunk/qpid/java/jca/src/main/java/org/apache/qpid/ra/QpidRAMetaData.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/jca/src/main/java/org/apache/qpid/ra/QpidRAObjectMessage.java
- copied unchanged from r1225000, qpid/trunk/qpid/java/jca/src/main/java/org/apache/qpid/ra/QpidRAObjectMessage.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/jca/src/main/java/org/apache/qpid/ra/QpidRAProperties.java
- copied unchanged from r1225000, qpid/trunk/qpid/java/jca/src/main/java/org/apache/qpid/ra/QpidRAProperties.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/jca/src/main/java/org/apache/qpid/ra/QpidRAQueueBrowser.java
- copied unchanged from r1225000, qpid/trunk/qpid/java/jca/src/main/java/org/apache/qpid/ra/QpidRAQueueBrowser.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/jca/src/main/java/org/apache/qpid/ra/QpidRAQueueReceiver.java
- copied unchanged from r1225000, qpid/trunk/qpid/java/jca/src/main/java/org/apache/qpid/ra/QpidRAQueueReceiver.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/jca/src/main/java/org/apache/qpid/ra/QpidRAQueueSender.java
- copied unchanged from r1225000, qpid/trunk/qpid/java/jca/src/main/java/org/apache/qpid/ra/QpidRAQueueSender.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/jca/src/main/java/org/apache/qpid/ra/QpidRASession.java
- copied unchanged from r1225000, qpid/trunk/qpid/java/jca/src/main/java/org/apache/qpid/ra/QpidRASession.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/jca/src/main/java/org/apache/qpid/ra/QpidRASessionFactory.java
- copied unchanged from r1225000, qpid/trunk/qpid/java/jca/src/main/java/org/apache/qpid/ra/QpidRASessionFactory.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/jca/src/main/java/org/apache/qpid/ra/QpidRASessionFactoryImpl.java
- copied unchanged from r1225000, qpid/trunk/qpid/java/jca/src/main/java/org/apache/qpid/ra/QpidRASessionFactoryImpl.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/jca/src/main/java/org/apache/qpid/ra/QpidRASessionImpl.java
- copied unchanged from r1225000, qpid/trunk/qpid/java/jca/src/main/java/org/apache/qpid/ra/QpidRASessionImpl.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/jca/src/main/java/org/apache/qpid/ra/QpidRAStreamMessage.java
- copied unchanged from r1225000, qpid/trunk/qpid/java/jca/src/main/java/org/apache/qpid/ra/QpidRAStreamMessage.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/jca/src/main/java/org/apache/qpid/ra/QpidRATextMessage.java
- copied unchanged from r1225000, qpid/trunk/qpid/java/jca/src/main/java/org/apache/qpid/ra/QpidRATextMessage.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/jca/src/main/java/org/apache/qpid/ra/QpidRATopicPublisher.java
- copied unchanged from r1225000, qpid/trunk/qpid/java/jca/src/main/java/org/apache/qpid/ra/QpidRATopicPublisher.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/jca/src/main/java/org/apache/qpid/ra/QpidRATopicSubscriber.java
- copied unchanged from r1225000, qpid/trunk/qpid/java/jca/src/main/java/org/apache/qpid/ra/QpidRATopicSubscriber.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/jca/src/main/java/org/apache/qpid/ra/QpidRAXAResource.java
- copied unchanged from r1225000, qpid/trunk/qpid/java/jca/src/main/java/org/apache/qpid/ra/QpidRAXAResource.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/jca/src/main/java/org/apache/qpid/ra/QpidResourceAdapter.java
- copied unchanged from r1225000, qpid/trunk/qpid/java/jca/src/main/java/org/apache/qpid/ra/QpidResourceAdapter.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/jca/src/main/java/org/apache/qpid/ra/Util.java
- copied unchanged from r1225000, qpid/trunk/qpid/java/jca/src/main/java/org/apache/qpid/ra/Util.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/jca/src/main/java/org/apache/qpid/ra/admin/
- copied from r1225000, qpid/trunk/qpid/java/jca/src/main/java/org/apache/qpid/ra/admin/
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/jca/src/main/java/org/apache/qpid/ra/admin/AdminObjectFactory.java
- copied unchanged from r1225000, qpid/trunk/qpid/java/jca/src/main/java/org/apache/qpid/ra/admin/AdminObjectFactory.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/jca/src/main/java/org/apache/qpid/ra/admin/QpidBindingURL.java
- copied unchanged from r1225000, qpid/trunk/qpid/java/jca/src/main/java/org/apache/qpid/ra/admin/QpidBindingURL.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/jca/src/main/java/org/apache/qpid/ra/admin/QpidConnectionFactoryProxy.java
- copied unchanged from r1225000, qpid/trunk/qpid/java/jca/src/main/java/org/apache/qpid/ra/admin/QpidConnectionFactoryProxy.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/jca/src/main/java/org/apache/qpid/ra/admin/QpidDestinationProxy.java
- copied unchanged from r1225000, qpid/trunk/qpid/java/jca/src/main/java/org/apache/qpid/ra/admin/QpidDestinationProxy.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/jca/src/main/java/org/apache/qpid/ra/admin/QpidQueue.java
- copied unchanged from r1225000, qpid/trunk/qpid/java/jca/src/main/java/org/apache/qpid/ra/admin/QpidQueue.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/jca/src/main/java/org/apache/qpid/ra/admin/QpidTopic.java
- copied unchanged from r1225000, qpid/trunk/qpid/java/jca/src/main/java/org/apache/qpid/ra/admin/QpidTopic.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/jca/src/main/java/org/apache/qpid/ra/inflow/
- copied from r1225000, qpid/trunk/qpid/java/jca/src/main/java/org/apache/qpid/ra/inflow/
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/jca/src/main/java/org/apache/qpid/ra/inflow/QpidActivation.java
- copied unchanged from r1225000, qpid/trunk/qpid/java/jca/src/main/java/org/apache/qpid/ra/inflow/QpidActivation.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/jca/src/main/java/org/apache/qpid/ra/inflow/QpidActivationSpec.java
- copied unchanged from r1225000, qpid/trunk/qpid/java/jca/src/main/java/org/apache/qpid/ra/inflow/QpidActivationSpec.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/jca/src/main/java/org/apache/qpid/ra/inflow/QpidMessageHandler.java
- copied unchanged from r1225000, qpid/trunk/qpid/java/jca/src/main/java/org/apache/qpid/ra/inflow/QpidMessageHandler.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/jca/src/main/java/org/apache/qpid/ra/tm/
- copied from r1225000, qpid/trunk/qpid/java/jca/src/main/java/org/apache/qpid/ra/tm/
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/jca/src/main/java/org/apache/qpid/ra/tm/GeronimoTransactionManagerLocator.java
- copied unchanged from r1225000, qpid/trunk/qpid/java/jca/src/main/java/org/apache/qpid/ra/tm/GeronimoTransactionManagerLocator.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/jca/src/main/java/org/apache/qpid/ra/tm/JBoss7TransactionManagerLocator.java
- copied unchanged from r1225000, qpid/trunk/qpid/java/jca/src/main/java/org/apache/qpid/ra/tm/JBoss7TransactionManagerLocator.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/jca/src/main/java/org/apache/qpid/ra/tm/JBossTransactionManagerLocator.java
- copied unchanged from r1225000, qpid/trunk/qpid/java/jca/src/main/java/org/apache/qpid/ra/tm/JBossTransactionManagerLocator.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/jca/src/main/resources/
- copied from r1225000, qpid/trunk/qpid/java/jca/src/main/resources/
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/jca/src/main/resources/META-INF/
- copied from r1225000, qpid/trunk/qpid/java/jca/src/main/resources/META-INF/
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/jca/src/main/resources/META-INF/jboss-ra.xml
- copied unchanged from r1225000, qpid/trunk/qpid/java/jca/src/main/resources/META-INF/jboss-ra.xml
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/jca/src/main/resources/META-INF/ra.xml
- copied unchanged from r1225000, qpid/trunk/qpid/java/jca/src/main/resources/META-INF/ra.xml
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/lib/geronimo-ejb_3.0_spec-1.0.1.jar
- copied unchanged from r1225000, qpid/trunk/qpid/java/lib/geronimo-ejb_3.0_spec-1.0.1.jar
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/lib/geronimo-j2ee-connector_1.5_spec-2.0.0.jar
- copied unchanged from r1225000, qpid/trunk/qpid/java/lib/geronimo-j2ee-connector_1.5_spec-2.0.0.jar
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/lib/geronimo-jta_1.1_spec-1.1.1.jar
- copied unchanged from r1225000, qpid/trunk/qpid/java/lib/geronimo-jta_1.1_spec-1.1.1.jar
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/lib/geronimo-kernel-2.2.1.jar
- copied unchanged from r1225000, qpid/trunk/qpid/java/lib/geronimo-kernel-2.2.1.jar
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/systests/src/main/java/org/apache/qpid/client/redelivered/
- copied from r1225000, qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/client/redelivered/
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/systests/src/main/java/org/apache/qpid/client/redelivered/RedeliveredMessageTest.java
- copied unchanged from r1225000, qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/client/redelivered/RedeliveredMessageTest.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/systests/src/main/java/org/apache/qpid/management/jmx/ManagedBrokerMBeanTest.java
- copied unchanged from r1225000, qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/management/jmx/ManagedBrokerMBeanTest.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/systests/src/main/java/org/apache/qpid/management/jmx/ManagedConnectionMBeanTest.java
- copied unchanged from r1225000, qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/management/jmx/ManagedConnectionMBeanTest.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/systests/src/main/java/org/apache/qpid/management/jmx/ManagedQueueMBeanTest.java
- copied unchanged from r1225000, qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/management/jmx/ManagedQueueMBeanTest.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/PriorityQueueTest.java
- copied unchanged from r1225000, qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/PriorityQueueTest.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/SortedQueueTest.java
- copied unchanged from r1225000, qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/SortedQueueTest.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/MaxDeliveryCountTest.java
- copied unchanged from r1225000, qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/MaxDeliveryCountTest.java
Removed:
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/bdbstore/src/resources/backup-log4j.xml
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/broker/bin/msTool.sh
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/broker/etc/debug.log4j.xml
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/broker/etc/mstool-log4j.xml
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/broker/etc/qpid-server.conf
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/broker/etc/qpid-server.conf.jpp
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/broker/etc/qpid.passwd
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/broker/src/main/java/org/apache/qpid/tools/messagestore/MessageStoreTool.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/AbstractCommand.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/Clear.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/Command.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/Copy.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/Dump.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/Help.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/List.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/Load.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/Move.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/Purge.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/Quit.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/Select.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/broker/src/main/java/org/apache/qpid/tools/messagestore/commands/Show.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/broker/src/main/java/org/apache/qpid/tools/utils/CommandParser.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/broker/src/main/java/org/apache/qpid/tools/utils/Console.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/broker/src/main/java/org/apache/qpid/tools/utils/SimpleCommandParser.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/broker/src/main/java/org/apache/qpid/tools/utils/SimpleConsole.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/QueueEntryImplTest.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/QueueEntryTest.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/broker/src/test/java/org/apache/qpid/server/store/MessageStoreShutdownTest.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/systests/etc/config-systests-aclv2-settings.xml
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/systests/etc/config-systests-aclv2.xml
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/systests/etc/global-default.txt
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/systests/etc/global-externaladminacl-changeloggerleveldenied.txt
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/systests/etc/global-externaladminacl-getallloggerlevelsdenied.txt
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/systests/etc/test-default.txt
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/systests/etc/test-externalacljmx-deleteexchangefailure.txt
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/systests/etc/test-externalacljmx.txt
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/systests/etc/test-logging.txt
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/systests/etc/test2-default.txt
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/systests/etc/virtualhosts-systests-aclv2-settings.xml
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/systests/etc/virtualhosts-systests-aclv2.xml
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/systests/src/main/java/org/apache/qpid/server/failover/MessageDisappearWithIOExceptionTest.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/PriorityTest.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/SubscriptionTestHelper.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/systests/src/main/java/org/apache/qpid/server/security/acl/ExternalACLFileTest.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/systests/src/main/java/org/apache/qpid/server/security/acl/ExternalAdminACLTest.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/ack/AcknowledgeAfterFailoverOnMessageTest.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/ack/AcknowledgeAfterFailoverTest.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/ack/FailoverBeforeConsumingRecoverTest.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/ack/QuickAcking.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/connection/CloseAfterConnectionFailureTest.java
Modified:
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/ (props changed)
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/bdbstore/bin/backup.sh
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/bdbstore/bin/storeUpgrade.sh
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/bdbstore/etc/scripts/bdbbackuptest.sh
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/bdbstore/etc/scripts/bdbtest.sh
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBUpgradeTest.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/broker/ (props changed)
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/RuleSet.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/AccessControl.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/AccessControlConfiguration.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/plugins/PlainConfigurationTest.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/plugins/RuleSetTest.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/broker-plugins/experimental/shutdown/MANIFEST.MF
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/broker-plugins/experimental/shutdown/build.xml
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/broker-plugins/experimental/shutdown/src/main/java/org/apache/qpid/shutdown/Activator.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/broker-plugins/experimental/shutdown/src/main/java/org/apache/qpid/shutdown/Shutdown.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/broker-plugins/experimental/shutdown/src/main/java/org/apache/qpid/shutdown/ShutdownMBean.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/broker/bin/ (props changed)
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/broker/build.xml
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/broker/etc/config.xml
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/broker/etc/md5passwd
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/broker/src/main/java/org/apache/qpid/server/AMQBrokerManagerMBean.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/broker/src/main/java/org/apache/qpid/server/binding/BindingFactory.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/QueueConfiguration.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/VirtualHostConfiguration.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/plugins/SlowConsumerDetectionQueueConfiguration.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/DefaultExchangeFactory.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/DefaultExchangeRegistry.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/FanoutExchange.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/HeadersExchangeMBean.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/broker/src/main/java/org/apache/qpid/server/flow/BytesOnlyCreditManager.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/broker/src/main/java/org/apache/qpid/server/flow/CreditCreditManager.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/broker/src/main/java/org/apache/qpid/server/flow/FlowCreditManager.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/broker/src/main/java/org/apache/qpid/server/flow/LimitlessCreditManager.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/broker/src/main/java/org/apache/qpid/server/flow/MessageAndBytesCreditManager.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/broker/src/main/java/org/apache/qpid/server/flow/MessageOnlyCreditManager.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/broker/src/main/java/org/apache/qpid/server/flow/Pre0_10CreditManager.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/broker/src/main/java/org/apache/qpid/server/flow/WindowCreditManager.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/BasicGetMethodHandler.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/BasicRejectMethodHandler.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/QueueUnbindHandler.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/TxRollbackHandler.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/broker/src/main/java/org/apache/qpid/server/logging/messages/Channel_logmessages.properties
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/broker/src/main/java/org/apache/qpid/server/management/ (props changed)
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/broker/src/main/java/org/apache/qpid/server/management/AMQManagedObject.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/broker/src/main/java/org/apache/qpid/server/management/DefaultManagedObject.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/broker/src/main/java/org/apache/qpid/server/management/JMXManagedObjectRegistry.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/broker/src/main/java/org/apache/qpid/server/management/MBeanInvocationHandlerImpl.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/broker/src/main/java/org/apache/qpid/server/message/AMQMessage.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/broker/src/main/java/org/apache/qpid/server/message/AbstractServerMessageImpl.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/broker/src/main/java/org/apache/qpid/server/message/MessageTransferHeader.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/broker/src/main/java/org/apache/qpid/server/plugins/OsgiSystemPackages.properties
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolEngine.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolSession.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolSessionMBean.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/ProtocolEngine_0_10.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v1_0/SendingLink_1_0.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v1_0/Session_1_0.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v1_0/Subscription_1_0.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/ (props changed)
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/AMQPriorityQueue.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/AMQQueue.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/AMQQueueFactory.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/AMQQueueMBean.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/ConflationQueueList.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/InboundMessageAdapter.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/PriorityQueueList.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/QueueEntry.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/QueueEntryImpl.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/QueueEntryIterator.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/QueueEntryList.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/QueueRunner.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/SimpleQueueEntryList.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/SubFlushRunner.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/broker/src/main/java/org/apache/qpid/server/registry/ApplicationRegistry.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/broker/src/main/java/org/apache/qpid/server/security/AbstractProxyPlugin.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/broker/src/main/java/org/apache/qpid/server/security/SecurityManager.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/ObjectType.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/broker/src/main/java/org/apache/qpid/server/security/access/Operation.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/database/PlainPasswordFilePrincipalDatabase.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/broker/src/main/java/org/apache/qpid/server/store/DerbyMessageStore.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/broker/src/main/java/org/apache/qpid/server/subscription/ExplicitAcceptDispositionChangeListener.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/broker/src/main/java/org/apache/qpid/server/subscription/ImplicitAcceptDispositionChangeListener.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/broker/src/main/java/org/apache/qpid/server/subscription/Subscription.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/broker/src/main/java/org/apache/qpid/server/subscription/SubscriptionImpl.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/broker/src/main/java/org/apache/qpid/server/subscription/Subscription_0_10.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ServerConnection.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ServerConnectionDelegate.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ServerSession.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ServerSessionDelegate.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/ (props changed)
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/plugins/SlowConsumerDetection.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/broker/src/main/java/org/apache/qpid/tools/security/Passwd.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/broker/src/test/java/org/apache/qpid/server/AMQBrokerManagerMBeanTest.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/broker/src/test/java/org/apache/qpid/server/MainTest.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/QueueConfigurationTest.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/ServerConfigurationTest.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/VirtualHostConfigurationTest.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/AbstractHeadersExchangeTestBase.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/broker/src/test/java/org/apache/qpid/server/exchange/ExchangeMBeanTest.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/AMQProtocolSessionMBeanTest.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/broker/src/test/java/org/apache/qpid/server/protocol/InternalTestProtocolSession.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/AMQPriorityQueueTest.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/AMQQueueFactoryTest.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/AMQQueueMBeanTest.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/AckTest.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/MockAMQMessage.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/MockAMQQueue.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/MockQueueEntry.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/MockStoredMessage.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/SimpleAMQQueueTest.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/SimpleQueueEntryListTest.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/broker/src/test/java/org/apache/qpid/server/store/MessageStoreTest.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/broker/src/test/java/org/apache/qpid/server/subscription/MockSubscription.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/build.deps
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/build.xml
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/client-plugins/.gitignore
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/client/src/main/java/client.bnd
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/client/src/main/java/org/apache/qpid/client/AMQBrokerDetails.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnection.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnectionDelegate.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnectionDelegate_0_10.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnectionDelegate_8_0.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnectionFactory.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/client/src/main/java/org/apache/qpid/client/AMQConnectionURL.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/client/src/main/java/org/apache/qpid/client/AMQDestination.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/client/src/main/java/org/apache/qpid/client/AMQQueueBrowser.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession_0_10.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/client/src/main/java/org/apache/qpid/client/AMQSession_0_8.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer_0_10.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/client/src/main/java/org/apache/qpid/client/BasicMessageConsumer_0_8.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/client/src/main/java/org/apache/qpid/client/TopicPublisherAdapter.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/client/src/main/java/org/apache/qpid/client/XAConnectionImpl.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/client/src/main/java/org/apache/qpid/client/XASessionImpl.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/client/src/main/java/org/apache/qpid/client/security/CallbackHandlerRegistry.properties
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/client/src/main/java/org/apache/qpid/jms/ConnectionURL.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/client/src/test/java/org/apache/qpid/client/AMQSession_0_10Test.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/client/src/test/java/org/apache/qpid/client/MockAMQConnection.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/BrokerDetails/BrokerDetailsTest.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/connectionurl/ConnectionURLTest.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/client/src/test/java/org/apache/qpid/test/unit/client/destinationurl/DestinationURLTest.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/common/src/main/java/org/apache/qpid/configuration/ClientProperties.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/common/src/main/java/org/apache/qpid/transport/ConnectionSettings.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/IoNetworkTransport.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/IoReceiver.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/common/src/main/java/org/apache/qpid/transport/network/security/SecurityLayerFactory.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/common/src/main/java/org/apache/qpid/url/BindingURL.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/common/src/test/java/org/apache/qpid/util/default.properties
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/common/src/test/java/org/apache/qpid/util/mydefaults.properties
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ConfigurationManagement.java (props changed)
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/LoggingManagement.java (props changed)
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedBroker.java (contents, props changed)
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedConnection.java (contents, props changed)
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedExchange.java (props changed)
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedQueue.java (contents, props changed)
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ServerInformation.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/UserManagement.java (props changed)
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanAttribute.java (props changed)
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanConstructor.java (props changed)
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanDescription.java (props changed)
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanOperation.java (props changed)
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanOperationParameter.java (props changed)
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/management/common/src/test/java/org/apache/qpid/management/common/mbeans/ManagedQueueTest.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/management/eclipse-plugin/src/ (props changed)
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/ApplicationRegistry.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/NavigationView.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/ConnectionTypeTabControl.java (props changed)
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/ExchangeTypeTabControl.java (props changed)
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/MBeanTypeTabControl.java (props changed)
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/management/eclipse-plugin/src/main/java/org/apache/qpid/management/ui/views/type/QueueTypeTabControl.java (props changed)
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/management/eclipse-plugin/src/main/resources/macosx/Contents/MacOS/qpidmc (props changed)
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/maven-settings.xml
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/systests/src/main/java/org/apache/qpid/client/failover/AddressBasedFailoverBehaviourTest.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/systests/src/main/java/org/apache/qpid/client/failover/FailoverBehaviourTest.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/systests/src/main/java/org/apache/qpid/client/prefetch/PrefetchBehaviourTest.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/systests/src/main/java/org/apache/qpid/management/jmx/ManagementActorLoggingTest.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/AccessControlLoggingTest.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/ManagementLoggingTest.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/ModelTest.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/systests/src/main/java/org/apache/qpid/server/queue/ProducerFlowControlTest.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/systests/src/main/java/org/apache/qpid/server/security/acl/AbstractACLTestCase.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/systests/src/main/java/org/apache/qpid/server/security/acl/ExhaustiveACLTest.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/systests/src/main/java/org/apache/qpid/server/security/acl/ExternalACLJMXTest.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/systests/src/main/java/org/apache/qpid/server/security/acl/ExternalACLTest.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/systests/src/main/java/org/apache/qpid/test/client/QueueBrowserAutoAckTest.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/systests/src/main/java/org/apache/qpid/test/client/failover/FailoverTest.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/systests/src/main/java/org/apache/qpid/test/client/message/JMSDestinationTest.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/ack/AcknowledgeTest.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/ack/RecoverTest.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/AMQConnectionTest.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/connection/ConnectionFactoryTest.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/topic/DurableSubscriptionTest.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/transacted/CommitRollbackTest.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/transacted/TransactedTest.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/JMXTestUtils.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java (contents, props changed)
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/test-profiles/ (props changed)
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/test-profiles/CPPExcludes (contents, props changed)
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/test-profiles/CPPNoPrefetchExcludes
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/test-profiles/Excludes (contents, props changed)
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/test-profiles/Java010Excludes
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/test-profiles/JavaBDBExcludes (props changed)
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/test-profiles/JavaExcludes (contents, props changed)
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/test-profiles/JavaPre010Excludes (contents, props changed)
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/test-profiles/JavaTransientExcludes (props changed)
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/test-profiles/XAExcludes (props changed)
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/test-profiles/cpp.async.testprofile (props changed)
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/test-profiles/cpp.cluster.testprofile (props changed)
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/test-profiles/cpp.noprefetch.testprofile (props changed)
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/test-profiles/cpp.ssl.excludes (props changed)
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/test-profiles/cpp.ssl.testprofile (props changed)
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/test-profiles/cpp.testprofile (props changed)
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/test-profiles/java-bdb-spawn.0-9-1.testprofile (props changed)
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/test-profiles/java-bdb.0-9-1.testprofile (props changed)
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/test-profiles/java-dby-spawn.0-9-1.testprofile (props changed)
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/test-profiles/java-dby.0-9-1.testprofile (props changed)
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/test-profiles/java-mms-spawn.0-10.testprofile (props changed)
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/test-profiles/java-mms-spawn.0-9-1.testprofile (props changed)
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/test-profiles/java-mms.0-9-1.testprofile (props changed)
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/test-profiles/log4j-test.xml (props changed)
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/test-profiles/python_tests/Java010PythonExcludes
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/test-profiles/test-provider.properties (props changed)
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/test-profiles/test_resources/ (props changed)
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/test-profiles/test_resources/ssl/java_broker_keystore.jks
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/test-profiles/testprofile.defaults (props changed)
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/tools/etc/perf-report.gnu
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/tools/src/main/java/org/apache/qpid/tools/Clock.java
qpid/branches/rg-amqp-1-0-sandbox/qpid/java/tools/src/main/java/org/apache/qpid/tools/PerfTestController.java
Propchange: qpid/branches/rg-amqp-1-0-sandbox/qpid/java/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 1 12:51:40 2012
@@ -4,4 +4,4 @@
/qpid/branches/java-network-refactor/qpid/java:805429-821809
/qpid/branches/qpid-2935/qpid/java:1061302-1072333
/qpid/trunk/qpid:796646-796653,1080001-1085000
-/qpid/trunk/qpid/java:1073294-1157765,1160415-1162726,1162729-1166086,1166089-1200000
+/qpid/trunk/qpid/java:1073294-1157765,1160415-1162726,1162729-1166086,1166089-1225000
Modified: qpid/branches/rg-amqp-1-0-sandbox/qpid/java/bdbstore/bin/backup.sh
URL: http://svn.apache.org/viewvc/qpid/branches/rg-amqp-1-0-sandbox/qpid/java/bdbstore/bin/backup.sh?rev=1295541&r1=1295540&r2=1295541&view=diff
==============================================================================
--- qpid/branches/rg-amqp-1-0-sandbox/qpid/java/bdbstore/bin/backup.sh (original)
+++ qpid/branches/rg-amqp-1-0-sandbox/qpid/java/bdbstore/bin/backup.sh Thu Mar 1 12:51:40 2012
@@ -33,7 +33,7 @@ if [ -z "$QPID_HOME" ]; then
fi
VERSION=0.15
-LIBS=$QPID_HOME/lib/je-4.0.103.jar:$QPID_HOME/lib/qpid-bdbstore-$VERSION.jar:$QPID_HOME/lib/qpid-all.jar
+LIBS=$QPID_HOME/lib/opt/je-4.0.117.jar:$QPID_HOME/lib/qpid-bdbstore-$VERSION.jar:$QPID_HOME/lib/qpid-all.jar
echo "Starting Hot Backup Script"
Modified: qpid/branches/rg-amqp-1-0-sandbox/qpid/java/bdbstore/bin/storeUpgrade.sh
URL: http://svn.apache.org/viewvc/qpid/branches/rg-amqp-1-0-sandbox/qpid/java/bdbstore/bin/storeUpgrade.sh?rev=1295541&r1=1295540&r2=1295541&view=diff
==============================================================================
--- qpid/branches/rg-amqp-1-0-sandbox/qpid/java/bdbstore/bin/storeUpgrade.sh (original)
+++ qpid/branches/rg-amqp-1-0-sandbox/qpid/java/bdbstore/bin/storeUpgrade.sh Thu Mar 1 12:51:40 2012
@@ -32,12 +32,8 @@ if [ -z "$QPID_HOME" ]; then
export PATH=${PATH}:${QPID_HOME}/bin
fi
-if [ -z "$BDB_HOME" ]; then
- export BDB_HOME=$(dirname $(dirname $(readlink -f $0)))
-fi
-
VERSION=0.15
-LIBS=$BDB_HOME/lib/je-4.0.103.jar:$BDB_HOME/lib/qpid-bdbstore-$VERSION.jar:$QPID_HOME/lib/qpid-all.jar
+LIBS=$QPID_HOME/lib/opt/je-4.0.117.jar:$QPID_HOME/lib/qpid-bdbstore-$VERSION.jar:$QPID_HOME/lib/qpid-all.jar
java -Xms256m -Dlog4j.configuration=BDBStoreUpgrade.log4j.xml -Xmx256m -Damqj.logging.level=warn ${JAVA_OPTS} -cp $LIBS org.apache.qpid.server.store.berkeleydb.BDBStoreUpgrade ${ARGS}
Modified: qpid/branches/rg-amqp-1-0-sandbox/qpid/java/bdbstore/etc/scripts/bdbbackuptest.sh
URL: http://svn.apache.org/viewvc/qpid/branches/rg-amqp-1-0-sandbox/qpid/java/bdbstore/etc/scripts/bdbbackuptest.sh?rev=1295541&r1=1295540&r2=1295541&view=diff
==============================================================================
--- qpid/branches/rg-amqp-1-0-sandbox/qpid/java/bdbstore/etc/scripts/bdbbackuptest.sh (original)
+++ qpid/branches/rg-amqp-1-0-sandbox/qpid/java/bdbstore/etc/scripts/bdbbackuptest.sh Thu Mar 1 12:51:40 2012
@@ -32,10 +32,10 @@ for arg in "$@"; do
fi
done
-VERSION=0.5
+VERSION=0.15
# Set classpath to include Qpid jar with all required jars in manifest
-QPID_LIBS=$QPID_HOME/lib/qpid-all.jar:$QPID_HOME/lib/qpid-junit-toolkit-$VERSION.jar:$QPID_HOME/lib/junit-3.8.1.jar:$QPID_HOME/lib/log4j-1.2.12.jar:$QPID_HOME/lib/qpid-systests-$VERSION.jar:$QPID_HOME/lib/qpid-perftests-$VERSION.jar:$QPID_HOME/lib/slf4j-log4j12-1.4.0.jar:$QPID_HOME/lib/qpid-bdbstore-$VERSION.jar
+QPID_LIBS=$QPID_HOME/lib/qpid-all.jar:$QPID_HOME/lib/qpid-junit-toolkit-$VERSION.jar:$QPID_HOME/lib/junit-3.8.1.jar:$QPID_HOME/lib/log4j-1.2.12.jar:$QPID_HOME/lib/qpid-systests-$VERSION.jar:$QPID_HOME/lib/qpid-perftests-$VERSION.jar:$QPID_HOME/lib/slf4j-log4j12-1.6.1.jar:$QPID_HOME/lib/qpid-bdbstore-$VERSION.jar
# Set other variables used by the qpid-run script before calling
export JAVA=java JAVA_MEM=-Xmx256m QPID_CLASSPATH=$QPID_LIBS
Modified: qpid/branches/rg-amqp-1-0-sandbox/qpid/java/bdbstore/etc/scripts/bdbtest.sh
URL: http://svn.apache.org/viewvc/qpid/branches/rg-amqp-1-0-sandbox/qpid/java/bdbstore/etc/scripts/bdbtest.sh?rev=1295541&r1=1295540&r2=1295541&view=diff
==============================================================================
--- qpid/branches/rg-amqp-1-0-sandbox/qpid/java/bdbstore/etc/scripts/bdbtest.sh (original)
+++ qpid/branches/rg-amqp-1-0-sandbox/qpid/java/bdbstore/etc/scripts/bdbtest.sh Thu Mar 1 12:51:40 2012
@@ -32,10 +32,10 @@ for arg in "$@"; do
fi
done
-VERSION=0.5
+VERSION=0.15
# Set classpath to include Qpid jar with all required jars in manifest
-QPID_LIBS=$QPID_HOME/lib/qpid-all.jar:$QPID_HOME/lib/qpid-junit-toolkit-$VERSION.jar:$QPID_HOME/lib/junit-3.8.1.jar:$QPID_HOME/lib/log4j-1.2.12.jar:$QPID_HOME/lib/qpid-systests-$VERSION.jar:$QPID_HOME/lib/qpid-perftests-$VERSION.jar:$QPID_HOME/lib/slf4j-log4j12-1.4.0.jar
+QPID_LIBS=$QPID_HOME/lib/qpid-all.jar:$QPID_HOME/lib/qpid-junit-toolkit-$VERSION.jar:$QPID_HOME/lib/junit-3.8.1.jar:$QPID_HOME/lib/log4j-1.2.12.jar:$QPID_HOME/lib/qpid-systests-$VERSION.jar:$QPID_HOME/lib/qpid-perftests-$VERSION.jar:$QPID_HOME/lib/slf4j-log4j12-1.6.1.jar
# Set other variables used by the qpid-run script before calling
export JAVA=java JAVA_MEM=-Xmx256m QPID_CLASSPATH=$QPID_LIBS
Modified: qpid/branches/rg-amqp-1-0-sandbox/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBUpgradeTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/rg-amqp-1-0-sandbox/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBUpgradeTest.java?rev=1295541&r1=1295540&r2=1295541&view=diff
==============================================================================
--- qpid/branches/rg-amqp-1-0-sandbox/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBUpgradeTest.java (original)
+++ qpid/branches/rg-amqp-1-0-sandbox/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBUpgradeTest.java Thu Mar 1 12:51:40 2012
@@ -94,13 +94,6 @@ public class BDBUpgradeTest extends Qpid
assertNotNull("QPID_WORK must be set", QPID_WORK_ORIG);
assertNotNull("QPID_HOME must be set", QPID_HOME);
- if(! isExternalBroker())
- {
- //override QPID_WORK to add the InVM port used so the store
- //output from the upgrade tool can be found by the broker
- setSystemProperty("QPID_WORK", QPID_WORK_ORIG + "/" + getPort());
- }
-
_fromDir = QPID_HOME + "/bdbstore-to-upgrade/test-store";
_toDir = getWorkDirBaseDir() + "/bdbstore/test-store";
_toDirTwice = getWorkDirBaseDir() + "/bdbstore-upgraded-twice";
Propchange: qpid/branches/rg-amqp-1-0-sandbox/qpid/java/broker/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 1 12:51:40 2012
@@ -3,4 +3,4 @@
/qpid/branches/java-network-refactor/qpid/java/broker:805429-821809
/qpid/branches/jmx_mc_gsoc09/qpid/java/broker:787599
/qpid/branches/qpid-2935/qpid/java/broker:1061302-1072333
-/qpid/trunk/qpid/java/broker:742626,743015,743028-743029,743304,743306,743311,743357,744113,747363,747367,747369-747370,747376,747783,747868-747870,747875,748561,748591,748641,748680,748686,749149,749282,749285,749315,749340,749572,753219-753220,753253,754934,754958,755256,757258,757270,758730,759097,760919,761721,762365,762992,763959,764026,764109,764140,764790,1073294-1157765,1160415-1162726,1162729-1166086,1166089-1200000
+/qpid/trunk/qpid/java/broker:742626,743015,743028-743029,743304,743306,743311,743357,744113,747363,747367,747369-747370,747376,747783,747868-747870,747875,748561,748591,748641,748680,748686,749149,749282,749285,749315,749340,749572,753219-753220,753253,754934,754958,755256,757258,757270,758730,759097,760919,761721,762365,762992,763959,764026,764109,764140,764790,1073294-1157765,1160415-1162726,1162729-1166086,1166089-1225000
Modified: qpid/branches/rg-amqp-1-0-sandbox/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/RuleSet.java
URL: http://svn.apache.org/viewvc/qpid/branches/rg-amqp-1-0-sandbox/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/RuleSet.java?rev=1295541&r1=1295540&r2=1295541&view=diff
==============================================================================
--- qpid/branches/rg-amqp-1-0-sandbox/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/RuleSet.java (original)
+++ qpid/branches/rg-amqp-1-0-sandbox/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/config/RuleSet.java Thu Mar 1 12:51:40 2012
@@ -21,6 +21,7 @@ package org.apache.qpid.server.security.
import java.security.Principal;
import java.util.ArrayList;
import java.util.Arrays;
+import java.util.Collections;
import java.util.EnumMap;
import java.util.HashMap;
import java.util.Iterator;
@@ -36,7 +37,7 @@ import javax.security.auth.Subject;
import org.apache.commons.lang.BooleanUtils;
import org.apache.commons.lang.StringUtils;
-import org.apache.qpid.exchange.ExchangeDefaults;
+import org.apache.log4j.Logger;
import org.apache.qpid.server.logging.actors.CurrentActor;
import org.apache.qpid.server.security.Result;
import org.apache.qpid.server.security.access.ObjectProperties;
@@ -53,20 +54,15 @@ import org.apache.qpid.server.security.a
*/
public class RuleSet
{
+ public static final Logger _logger = Logger.getLogger(RuleSet.class);
+
private static final String AT = "@";
private static final String SLASH = "/";
public static final String DEFAULT_ALLOW = "defaultallow";
public static final String DEFAULT_DENY = "defaultdeny";
- public static final String TRANSITIVE = "transitive";
- public static final String EXPAND = "expand";
- public static final String AUTONUMBER = "autonumber";
- public static final String CONTROLLED = "controlled";
- public static final String VALIDATE = "validate";
-
- public static final List<String> CONFIG_PROPERTIES = Arrays.asList(
- DEFAULT_ALLOW, DEFAULT_DENY, TRANSITIVE, EXPAND, AUTONUMBER, CONTROLLED
- );
+
+ public static final List<String> CONFIG_PROPERTIES = Arrays.asList(DEFAULT_ALLOW, DEFAULT_DENY);
private static final Integer _increment = 10;
@@ -80,7 +76,6 @@ public class RuleSet
{
// set some default configuration properties
configure(DEFAULT_DENY, Boolean.TRUE);
- configure(TRANSITIVE, Boolean.TRUE);
}
/**
@@ -139,12 +134,21 @@ public class RuleSet
// Save the rules we selected
objects.put(objectType, filtered);
+ if(_logger.isDebugEnabled())
+ {
+ _logger.debug("Cached " + objectType + " RulesList: " + filtered);
+ }
}
// Return the cached rules
- return objects.get(objectType);
- }
+ List<Rule> rules = objects.get(objectType);
+ if(_logger.isDebugEnabled())
+ {
+ _logger.debug("Returning RuleList: " + rules);
+ }
+ return rules;
+ }
public boolean isValidNumber(Integer number)
{
@@ -175,20 +179,6 @@ public class RuleSet
return false;
}
- private Permission noLog(Permission permission)
- {
- switch (permission)
- {
- case ALLOW:
- case ALLOW_LOG:
- return Permission.ALLOW;
- case DENY:
- case DENY_LOG:
- default:
- return Permission.DENY;
- }
- }
-
// TODO make this work when group membership is not known at file parse time
public void addRule(Integer number, String identity, Permission permission, Action action)
{
@@ -196,63 +186,13 @@ public class RuleSet
if (!action.isAllowed())
{
- throw new IllegalArgumentException("Action is not allowd: " + action);
+ throw new IllegalArgumentException("Action is not allowed: " + action);
}
if (ruleExists(identity, action))
{
return;
}
- // expand actions - possibly multiply number by
- if (isSet(EXPAND))
- {
- if (action.getOperation() == Operation.CREATE && action.getObjectType() == ObjectType.TOPIC)
- {
- addRule(null, identity, noLog(permission), new Action(Operation.BIND, ObjectType.EXCHANGE,
- new ObjectProperties("amq.topic", action.getProperties().get(ObjectProperties.Property.NAME))));
- ObjectProperties topicProperties = new ObjectProperties();
- topicProperties.put(ObjectProperties.Property.DURABLE, true);
- addRule(null, identity, permission, new Action(Operation.CREATE, ObjectType.QUEUE, topicProperties));
- return;
- }
- if (action.getOperation() == Operation.DELETE && action.getObjectType() == ObjectType.TOPIC)
- {
- addRule(null, identity, noLog(permission), new Action(Operation.UNBIND, ObjectType.EXCHANGE,
- new ObjectProperties("amq.topic", action.getProperties().get(ObjectProperties.Property.NAME))));
- ObjectProperties topicProperties = new ObjectProperties();
- topicProperties.put(ObjectProperties.Property.DURABLE, true);
- addRule(null, identity, permission, new Action(Operation.DELETE, ObjectType.QUEUE, topicProperties));
- return;
- }
- }
-
- // transitive action dependencies
- if (isSet(TRANSITIVE))
- {
- if (action.getOperation() == Operation.CREATE && action.getObjectType() == ObjectType.QUEUE)
- {
- ObjectProperties exchProperties = new ObjectProperties(action.getProperties());
- exchProperties.setName(ExchangeDefaults.DEFAULT_EXCHANGE_NAME);
- exchProperties.put(ObjectProperties.Property.ROUTING_KEY, action.getProperties().get(ObjectProperties.Property.NAME));
- addRule(null, identity, noLog(permission), new Action(Operation.BIND, ObjectType.EXCHANGE, exchProperties));
- if (action.getProperties().isSet(ObjectProperties.Property.AUTO_DELETE))
- {
- addRule(null, identity, noLog(permission), new Action(Operation.DELETE, ObjectType.QUEUE, action.getProperties()));
- }
- }
- else if (action.getOperation() == Operation.DELETE && action.getObjectType() == ObjectType.QUEUE)
- {
- ObjectProperties exchProperties = new ObjectProperties(action.getProperties());
- exchProperties.setName(ExchangeDefaults.DEFAULT_EXCHANGE_NAME);
- exchProperties.put(ObjectProperties.Property.ROUTING_KEY, action.getProperties().get(ObjectProperties.Property.NAME));
- addRule(null, identity, noLog(permission), new Action(Operation.UNBIND, ObjectType.EXCHANGE, exchProperties));
- }
- else if (action.getOperation() != Operation.ACCESS && action.getObjectType() != ObjectType.VIRTUALHOST)
- {
- addRule(null, identity, noLog(permission), new Action(Operation.ACCESS, ObjectType.VIRTUALHOST));
- }
- }
-
// set rule number if needed
Rule rule = new Rule(number, identity, action, permission);
if (rule.getNumber() == null)
@@ -392,24 +332,29 @@ public class RuleSet
// Create the action to check
Action action = new Action(operation, objectType, properties);
+ if(_logger.isDebugEnabled())
+ {
+ _logger.debug("Checking action: " + action);
+ }
+
// get the list of rules relevant for this request
List<Rule> rules = getRules(subject, operation, objectType);
if (rules == null)
{
- if (isSet(CONTROLLED))
- {
- // Abstain if there are no rules for this operation
- return Result.ABSTAIN;
- }
- else
+ if(_logger.isDebugEnabled())
{
- return getDefault();
+ _logger.debug("No rules found, returning default result");
}
+ return getDefault();
}
// Iterate through a filtered set of rules dealing with this identity and operation
for (Rule current : rules)
{
+ if(_logger.isDebugEnabled())
+ {
+ _logger.debug("Checking against rule: " + current);
+ }
// Check if action matches
if (action.matches(current.getAction()))
{
@@ -480,6 +425,15 @@ public class RuleSet
_config.put(key, value);
}
+ /**
+ * Returns all rules in the {@link RuleSet}. Primarily intended to support unit-testing.
+ * @return map of rules
+ */
+ public Map<Integer, Rule> getAllRules()
+ {
+ return Collections.unmodifiableMap(_rules);
+ }
+
private boolean isRelevant(final Set<Principal> principals, final Rule rule)
{
if (rule.getIdentity().equalsIgnoreCase(Rule.ALL))
Modified: qpid/branches/rg-amqp-1-0-sandbox/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/AccessControl.java
URL: http://svn.apache.org/viewvc/qpid/branches/rg-amqp-1-0-sandbox/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/AccessControl.java?rev=1295541&r1=1295540&r2=1295541&view=diff
==============================================================================
--- qpid/branches/rg-amqp-1-0-sandbox/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/AccessControl.java (original)
+++ qpid/branches/rg-amqp-1-0-sandbox/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/AccessControl.java Thu Mar 1 12:51:40 2012
@@ -101,6 +101,7 @@ public class AccessControl extends Abstr
return Result.ABSTAIN;
}
+ _logger.debug("Checking " + operation + " " + objectType);
return _ruleSet.check(subject, operation, objectType, properties);
}
Modified: qpid/branches/rg-amqp-1-0-sandbox/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/AccessControlConfiguration.java
URL: http://svn.apache.org/viewvc/qpid/branches/rg-amqp-1-0-sandbox/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/AccessControlConfiguration.java?rev=1295541&r1=1295540&r2=1295541&view=diff
==============================================================================
--- qpid/branches/rg-amqp-1-0-sandbox/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/AccessControlConfiguration.java (original)
+++ qpid/branches/rg-amqp-1-0-sandbox/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/AccessControlConfiguration.java Thu Mar 1 12:51:40 2012
@@ -45,7 +45,7 @@ public class AccessControlConfiguration
public List<String> getParentPaths()
{
- return Arrays.asList("security.aclv2", "virtualhosts.virtualhost.security.aclv2");
+ return Arrays.asList("security.acl", "virtualhosts.virtualhost.security.acl");
}
};
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org