Modified: qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/model/adapter/FileSystemPreferencesProviderTest.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/model/adapter/FileSystemPreferencesProviderTest.java?rev=1592030&r1=1592029&r2=1592030&view=diff ============================================================================== --- qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/model/adapter/FileSystemPreferencesProviderTest.java (original) +++ qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/model/adapter/FileSystemPreferencesProviderTest.java Fri May 2 20:32:16 2014 @@ -80,7 +80,7 @@ public class FileSystemPreferencesProvid { if (_preferencesProvider != null) { - _preferencesProvider.setDesiredState(_preferencesProvider.getState(), State.DELETED); + _preferencesProvider.setDesiredState(State.DELETED); } BrokerTestHelper.tearDown(); _preferencesFile.delete(); @@ -144,7 +144,7 @@ public class FileSystemPreferencesProvid public void testActivate() { _preferencesProvider = createPreferencesProvider(); - _preferencesProvider.setDesiredState(State.INITIALISING, State.ACTIVE); + _preferencesProvider.setDesiredState(State.ACTIVE); assertEquals("Unexpected state", State.ACTIVE, _preferencesProvider.getState()); } @@ -152,7 +152,7 @@ public class FileSystemPreferencesProvid public void testChangeAttributes() { _preferencesProvider = createPreferencesProvider(); - _preferencesProvider.setDesiredState(State.INITIALISING, State.ACTIVE); + _preferencesProvider.setDesiredState(State.ACTIVE); File newPrefsFile = TestFileUtils.createTempFile(this, ".prefs.json", "{\"user3\":{\"pref1\":\"pref1User3Value\", \"pref3\": 2.0}}"); try @@ -181,7 +181,7 @@ public class FileSystemPreferencesProvid public void testGetPreferences() { _preferencesProvider = createPreferencesProvider(); - _preferencesProvider.setDesiredState(State.INITIALISING, State.ACTIVE); + _preferencesProvider.setDesiredState(State.ACTIVE); Map<String, Object> preferences1 = _preferencesProvider.getPreferences(_user1); assertUser1Preferences(preferences1); @@ -197,7 +197,7 @@ public class FileSystemPreferencesProvid public void testSetPreferences() { _preferencesProvider = createPreferencesProvider(); - _preferencesProvider.setDesiredState(State.INITIALISING, State.ACTIVE); + _preferencesProvider.setDesiredState(State.ACTIVE); Map<String, Object> newPreferences = new HashMap<String, Object>(); newPreferences.put("pref2", false); @@ -208,10 +208,10 @@ public class FileSystemPreferencesProvid newPreferences.put("pref5", pref5); _preferencesProvider.setPreferences(_user1, newPreferences); - _preferencesProvider.setDesiredState(State.ACTIVE, State.STOPPED); + _preferencesProvider.setDesiredState(State.STOPPED); _preferencesProvider = createPreferencesProvider(); - _preferencesProvider.setDesiredState(State.INITIALISING, State.ACTIVE); + _preferencesProvider.setDesiredState(State.ACTIVE); Map<String, Object> preferences1 = _preferencesProvider.getPreferences(_user1); assertNotNull("Preferences should not be null for user 1", preferences1); assertEquals("Unexpected preference 1 for user 1", "pref1User1Value", preferences1.get("pref1")); @@ -232,16 +232,16 @@ public class FileSystemPreferencesProvid public void testDeletePreferences() { _preferencesProvider = createPreferencesProvider(); - _preferencesProvider.setDesiredState(State.INITIALISING, State.ACTIVE); + _preferencesProvider.setDesiredState(State.ACTIVE); assertUser1Preferences(_preferencesProvider.getPreferences(_user1)); assertUser2Preferences(_preferencesProvider.getPreferences(_user2)); _preferencesProvider.deletePreferences(_user1); - _preferencesProvider.setDesiredState(State.ACTIVE, State.STOPPED); + _preferencesProvider.setDesiredState(State.STOPPED); _preferencesProvider = createPreferencesProvider(); - _preferencesProvider.setDesiredState(State.INITIALISING, State.ACTIVE); + _preferencesProvider.setDesiredState(State.ACTIVE); Map<String, Object> preferences1 = _preferencesProvider.getPreferences(_user1); assertTrue("Preferences should not be set for user 1", preferences1.isEmpty()); @@ -256,16 +256,16 @@ public class FileSystemPreferencesProvid public void testDeleteMultipleUsersPreferences() { _preferencesProvider = createPreferencesProvider(); - _preferencesProvider.setDesiredState(State.INITIALISING, State.ACTIVE); + _preferencesProvider.setDesiredState(State.ACTIVE); assertUser1Preferences(_preferencesProvider.getPreferences(_user1)); assertUser2Preferences(_preferencesProvider.getPreferences(_user2)); _preferencesProvider.deletePreferences(_user1, _user2); - _preferencesProvider.setDesiredState(State.ACTIVE, State.STOPPED); + _preferencesProvider.setDesiredState(State.STOPPED); _preferencesProvider = createPreferencesProvider(); - _preferencesProvider.setDesiredState(State.INITIALISING, State.ACTIVE); + _preferencesProvider.setDesiredState(State.ACTIVE); Map<String, Object> preferences1 = _preferencesProvider.getPreferences(_user1); assertTrue("Preferences should not be set for user 1", preferences1.isEmpty()); @@ -280,7 +280,7 @@ public class FileSystemPreferencesProvid public void testListUserNames() { _preferencesProvider = createPreferencesProvider(); - _preferencesProvider.setDesiredState(State.INITIALISING, State.ACTIVE); + _preferencesProvider.setDesiredState(State.ACTIVE); Set<String> userNames = _preferencesProvider.listUserIDs();
Modified: qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/model/adapter/PortFactoryTest.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/model/adapter/PortFactoryTest.java?rev=1592030&r1=1592029&r2=1592030&view=diff ============================================================================== --- qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/model/adapter/PortFactoryTest.java (original) +++ qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/model/adapter/PortFactoryTest.java Fri May 2 20:32:16 2014 @@ -99,8 +99,8 @@ public class PortFactoryTest extends Qpi _attributes.put(Port.TRANSPORTS, _tcpStringSet); _attributes.put(Port.AUTHENTICATION_PROVIDER, _authProviderName); _attributes.put(Port.TCP_NO_DELAY, "true"); - _attributes.put(Port.RECEIVE_BUFFER_SIZE, "1"); - _attributes.put(Port.SEND_BUFFER_SIZE, "2"); + _attributes.put(AmqpPort.RECEIVE_BUFFER_SIZE, "1"); + _attributes.put(AmqpPort.SEND_BUFFER_SIZE, "2"); _attributes.put(Port.BINDING_ADDRESS, "127.0.0.1"); } @@ -172,9 +172,9 @@ public class PortFactoryTest extends Qpi assertEquals("Unexpected protocols", EnumSet.of(Protocol.AMQP_0_8, Protocol.AMQP_0_9, Protocol.AMQP_0_9_1, Protocol.AMQP_0_10, Protocol.AMQP_1_0), port.getAvailableProtocols()); assertEquals("Unexpected send buffer size", PortFactory.DEFAULT_AMQP_SEND_BUFFER_SIZE, - port.getAttribute(Port.SEND_BUFFER_SIZE)); + port.getAttribute(AmqpPort.SEND_BUFFER_SIZE)); assertEquals("Unexpected receive buffer size", PortFactory.DEFAULT_AMQP_RECEIVE_BUFFER_SIZE, - port.getAttribute(Port.RECEIVE_BUFFER_SIZE)); + port.getAttribute(AmqpPort.RECEIVE_BUFFER_SIZE)); assertEquals("Unexpected need client auth", PortFactory.DEFAULT_AMQP_NEED_CLIENT_AUTH, port.getAttribute(Port.NEED_CLIENT_AUTH)); assertEquals("Unexpected want client auth", PortFactory.DEFAULT_AMQP_WANT_CLIENT_AUTH, @@ -317,8 +317,8 @@ public class PortFactoryTest extends Qpi assertEquals(_tcpTransports, port.getTransports()); } assertEquals(amqp010ProtocolSet, port.getAvailableProtocols()); - assertEquals("Unexpected send buffer size", 2, port.getAttribute(Port.SEND_BUFFER_SIZE)); - assertEquals("Unexpected receive buffer size", 1, port.getAttribute(Port.RECEIVE_BUFFER_SIZE)); + assertEquals("Unexpected send buffer size", 2, port.getAttribute(AmqpPort.SEND_BUFFER_SIZE)); + assertEquals("Unexpected receive buffer size", 1, port.getAttribute(AmqpPort.RECEIVE_BUFFER_SIZE)); assertEquals("Unexpected need client auth", needClientAuth, port.getAttribute(Port.NEED_CLIENT_AUTH)); assertEquals("Unexpected want client auth", wantClientAuth, port.getAttribute(Port.WANT_CLIENT_AUTH)); assertEquals("Unexpected tcp no delay", true, port.getAttribute(Port.TCP_NO_DELAY)); @@ -345,11 +345,6 @@ public class PortFactoryTest extends Qpi assertEquals(_portNumber, port.getPort()); assertEquals(_tcpTransports, port.getTransports()); assertEquals(nonAmqpProtocolSet, port.getAvailableProtocols()); - assertNull("Unexpected send buffer size", port.getAttribute(Port.SEND_BUFFER_SIZE)); - assertNull("Unexpected receive buffer size", port.getAttribute(Port.RECEIVE_BUFFER_SIZE)); - assertNull("Unexpected need client auth", port.getAttribute(Port.NEED_CLIENT_AUTH)); - assertNull("Unexpected want client auth", port.getAttribute(Port.WANT_CLIENT_AUTH)); - assertNull("Unexpected tcp no delay", port.getAttribute(Port.TCP_NO_DELAY)); } public void testCreateNonAmqpPortWithPartiallySetAttributes() @@ -371,11 +366,7 @@ public class PortFactoryTest extends Qpi assertEquals(_portNumber, port.getPort()); assertEquals(Collections.singleton(PortFactory.DEFAULT_TRANSPORT), port.getTransports()); assertEquals(nonAmqpProtocolSet, port.getAvailableProtocols()); - assertNull("Unexpected send buffer size", port.getAttribute(Port.SEND_BUFFER_SIZE)); - assertNull("Unexpected receive buffer size", port.getAttribute(Port.RECEIVE_BUFFER_SIZE)); - assertNull("Unexpected need client auth", port.getAttribute(Port.NEED_CLIENT_AUTH)); - assertNull("Unexpected want client auth", port.getAttribute(Port.WANT_CLIENT_AUTH)); - assertNull("Unexpected tcp no delay", port.getAttribute(Port.TCP_NO_DELAY)); + } public void testCreateMixedAmqpAndNonAmqpThrowsException() Modified: qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/model/testmodel/TestRootCategory.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/model/testmodel/TestRootCategory.java?rev=1592030&r1=1592029&r2=1592030&view=diff ============================================================================== --- qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/model/testmodel/TestRootCategory.java (original) +++ qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/model/testmodel/TestRootCategory.java Fri May 2 20:32:16 2014 @@ -30,9 +30,9 @@ public interface TestRootCategory<X exte String AUTOMATED_PERSISTED_VALUE = "automatedPersistedValue"; String AUTOMATED_NONPERSISTED_VALUE = "automatedNonPersistedValue"; - @ManagedAttribute( automate = true ) + @ManagedAttribute String getAutomatedPersistedValue(); - @ManagedAttribute( automate = true, persist = false ) + @ManagedAttribute( persist = false ) String getAutomatedNonPersistedValue(); } Modified: qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/model/testmodel/TestRootCategoryImpl.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/model/testmodel/TestRootCategoryImpl.java?rev=1592030&r1=1592029&r2=1592030&view=diff ============================================================================== --- qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/model/testmodel/TestRootCategoryImpl.java (original) +++ qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/model/testmodel/TestRootCategoryImpl.java Fri May 2 20:32:16 2014 @@ -60,7 +60,7 @@ public class TestRootCategoryImpl extend } @Override - protected boolean setState(final State currentState, final State desiredState) + protected boolean setState(final State desiredState) { return false; } Modified: qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/security/auth/manager/ScramSHA1AuthenticationManagerTest.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/security/auth/manager/ScramSHA1AuthenticationManagerTest.java?rev=1592030&r1=1592029&r2=1592030&view=diff ============================================================================== --- qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/security/auth/manager/ScramSHA1AuthenticationManagerTest.java (original) +++ qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/security/auth/manager/ScramSHA1AuthenticationManagerTest.java Fri May 2 20:32:16 2014 @@ -96,7 +96,7 @@ public class ScramSHA1AuthenticationMana assertEquals("Manager should have exactly one user child",1, _authManager.getUsers().size()); - user.setDesiredState(State.ACTIVE, State.DELETED); + user.setDesiredState(State.DELETED); assertEquals("No users should be present after child deletion", 0, _authManager.getChildren(User.class).size()); Modified: qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/store/AbstractDurableConfigurationStoreTestCase.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/store/AbstractDurableConfigurationStoreTestCase.java?rev=1592030&r1=1592029&r2=1592030&view=diff ============================================================================== --- qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/store/AbstractDurableConfigurationStoreTestCase.java (original) +++ qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/store/AbstractDurableConfigurationStoreTestCase.java Fri May 2 20:32:16 2014 @@ -248,6 +248,8 @@ public abstract class AbstractDurableCon Map<String,Object> arg = new HashMap<String, Object>(binding.getAttributes()); arg.remove("createdBy"); arg.remove("createdTime"); + arg.remove("lastUpdatedTime"); + arg.remove("lastUpdatedBy"); return (_id == ANY_UUID || _id.equals(binding.getId())) && _name.equals(binding.getType()) && (_matchingMap == ANY_MAP || arg.equals(_matchingMap)) Modified: qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/util/BrokerTestHelper.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/util/BrokerTestHelper.java?rev=1592030&r1=1592029&r2=1592030&view=diff ============================================================================== --- qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/util/BrokerTestHelper.java (original) +++ qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/util/BrokerTestHelper.java Fri May 2 20:32:16 2014 @@ -127,7 +127,7 @@ public class BrokerTestHelper when(virtualHostNode.getObjectFactory()).thenReturn(objectFactory); when(virtualHostNode.getCategoryClass()).thenReturn(VirtualHostNode.class); AbstractVirtualHost host = (AbstractVirtualHost) objectFactory.create(VirtualHost.class, attributes, virtualHostNode ); - host.setDesiredState(host.getState(), State.ACTIVE); + host.setDesiredState(State.ACTIVE); return host; } Modified: qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/virtualhost/MockVirtualHost.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/virtualhost/MockVirtualHost.java?rev=1592030&r1=1592029&r2=1592030&view=diff ============================================================================== --- qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/virtualhost/MockVirtualHost.java (original) +++ qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/virtualhost/MockVirtualHost.java Fri May 2 20:32:16 2014 @@ -155,7 +155,7 @@ public class MockVirtualHost implements } @Override - public State setDesiredState(final State currentState, final State desiredState) + public State setDesiredState(final State desiredState) throws IllegalStateTransitionException, AccessControlException { return null; @@ -545,12 +545,6 @@ public class MockVirtualHost implements } - @Override - public void validate() - { - - } - public StatisticsCounter getDataDeliveryStatistics() { return null; Modified: qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/virtualhost/VirtualHostQueueCreationTest.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/virtualhost/VirtualHostQueueCreationTest.java?rev=1592030&r1=1592029&r2=1592030&view=diff ============================================================================== --- qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/virtualhost/VirtualHostQueueCreationTest.java (original) +++ qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/virtualhost/VirtualHostQueueCreationTest.java Fri May 2 20:32:16 2014 @@ -119,7 +119,7 @@ public class VirtualHostQueueCreationTes attributes.put(VirtualHost.ID, UUID.randomUUID()); StandardVirtualHost host = new StandardVirtualHost(attributes, _virtualHostNode); host.create(); - host.setDesiredState(host.getState(), State.ACTIVE); + host.setDesiredState(State.ACTIVE); return host; } Modified: qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/virtualhostnode/AbstractStandardVirtualHostNodeTest.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/virtualhostnode/AbstractStandardVirtualHostNodeTest.java?rev=1592030&r1=1592029&r2=1592030&view=diff ============================================================================== --- qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/virtualhostnode/AbstractStandardVirtualHostNodeTest.java (original) +++ qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/virtualhostnode/AbstractStandardVirtualHostNodeTest.java Fri May 2 20:32:16 2014 @@ -110,7 +110,7 @@ public class AbstractStandardVirtualHost VirtualHostNode<?> node = new TestVirtualHostNode(_broker, nodeAttributes, _configStore); node.open(); - node.setDesiredState(node.getState(), State.ACTIVE); + node.setDesiredState(State.ACTIVE); VirtualHost<?, ?, ?> virtualHost = node.getVirtualHost(); assertNotNull("Virtual host was not recovered", virtualHost); @@ -140,7 +140,7 @@ public class AbstractStandardVirtualHost VirtualHostNode<?> node = new TestVirtualHostNode(_broker, nodeAttributes, _configStore); node.open(); - node.setDesiredState(node.getState(), State.ACTIVE); + node.setDesiredState(State.ACTIVE); VirtualHost<?, ?, ?> virtualHost = node.getVirtualHost(); assertNotNull("Virtual host was not recovered", virtualHost); Modified: qpid/trunk/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/ACLFileAccessControlProvider.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/ACLFileAccessControlProvider.java?rev=1592030&r1=1592029&r2=1592030&view=diff ============================================================================== --- qpid/trunk/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/ACLFileAccessControlProvider.java (original) +++ qpid/trunk/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/ACLFileAccessControlProvider.java Fri May 2 20:32:16 2014 @@ -27,6 +27,6 @@ import org.apache.qpid.server.model.Mana @ManagedObject( category = false, type="AclFile" ) public interface ACLFileAccessControlProvider<X extends ACLFileAccessControlProvider<X>> extends AccessControlProvider<X> { - @ManagedAttribute( automate = true, mandatory = true, description = "File location" ) + @ManagedAttribute( mandatory = true, description = "File location" ) String getPath(); } Modified: qpid/trunk/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/ACLFileAccessControlProviderImpl.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/ACLFileAccessControlProviderImpl.java?rev=1592030&r1=1592029&r2=1592030&view=diff ============================================================================== --- qpid/trunk/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/ACLFileAccessControlProviderImpl.java (original) +++ qpid/trunk/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/ACLFileAccessControlProviderImpl.java Fri May 2 20:32:16 2014 @@ -69,9 +69,9 @@ public class ACLFileAccessControlProvide } @Override - public void validate() + public void onValidate() { - super.validate(); + super.onValidate(); if(!isDurable()) { throw new IllegalArgumentException(getClass().getSimpleName() + " must be durable"); @@ -124,7 +124,7 @@ public class ACLFileAccessControlProvide } @Override - public boolean setState(State currentState, State desiredState) + public boolean setState(State desiredState) throws IllegalStateTransitionException, AccessControlException { State state = _state.get(); @@ -186,7 +186,7 @@ public class ACLFileAccessControlProvide } @Override - protected void authoriseSetDesiredState(State currentState, State desiredState) throws AccessControlException + protected void authoriseSetDesiredState(State desiredState) throws AccessControlException { if(desiredState == State.DELETED) { Modified: qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/virtualhostnode/jdbc/JDBCVirtualHostNode.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/virtualhostnode/jdbc/JDBCVirtualHostNode.java?rev=1592030&r1=1592029&r2=1592030&view=diff ============================================================================== --- qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/virtualhostnode/jdbc/JDBCVirtualHostNode.java (original) +++ qpid/trunk/qpid/java/broker-plugins/jdbc-store/src/main/java/org/apache/qpid/server/virtualhostnode/jdbc/JDBCVirtualHostNode.java Fri May 2 20:32:16 2014 @@ -27,22 +27,22 @@ import org.apache.qpid.server.store.jdbc public interface JDBCVirtualHostNode { //TODO: Split this attribute into connectionUrl, username and password. Make the password attribute secure. - @ManagedAttribute(automate=true, mandatory=true) + @ManagedAttribute(mandatory=true) String getConnectionUrl(); - @ManagedAttribute(automate=true, defaultValue=DefaultConnectionProviderFactory.TYPE) + @ManagedAttribute(defaultValue=DefaultConnectionProviderFactory.TYPE) String getConnectionPoolType(); - @ManagedAttribute(automate=true) + @ManagedAttribute String getBigIntType(); - @ManagedAttribute(automate=true) + @ManagedAttribute boolean isBytesForBlob(); - @ManagedAttribute(automate=true) + @ManagedAttribute String getVarBinaryType(); - @ManagedAttribute(automate=true) + @ManagedAttribute String getBlobType(); -} \ No newline at end of file +} Modified: qpid/trunk/qpid/java/broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ManagementNode.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ManagementNode.java?rev=1592030&r1=1592029&r2=1592030&view=diff ============================================================================== --- qpid/trunk/qpid/java/broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ManagementNode.java (original) +++ qpid/trunk/qpid/java/broker-plugins/management-amqp/src/main/java/org/apache/qpid/server/management/amqp/ManagementNode.java Fri May 2 20:32:16 2014 @@ -496,7 +496,7 @@ class ManagementNode implements MessageS responseHeader.setHeader(TYPE_ATTRIBUTE, type); try { - entity.setDesiredState(entity.getState(),State.DELETED); + entity.setDesiredState(State.DELETED); responseHeader.setHeader(STATUS_CODE_HEADER, STATUS_CODE_NO_CONTENT); } catch(AccessControlException e) Modified: qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java?rev=1592030&r1=1592029&r2=1592030&view=diff ============================================================================== --- qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java (original) +++ qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java Fri May 2 20:32:16 2014 @@ -113,7 +113,7 @@ public class HttpManagement extends Abst } @Override - protected boolean setState(State currentState, State desiredState) + protected boolean setState(State desiredState) { if(desiredState == State.ACTIVE) { Modified: qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagementConfiguration.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagementConfiguration.java?rev=1592030&r1=1592029&r2=1592030&view=diff ============================================================================== --- qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagementConfiguration.java (original) +++ qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagementConfiguration.java Fri May 2 20:32:16 2014 @@ -28,19 +28,19 @@ import org.apache.qpid.server.model.Plug public interface HttpManagementConfiguration<X extends HttpManagementConfiguration<X>> extends Plugin<X> { - @ManagedAttribute( automate = true, defaultValue = "true" ) + @ManagedAttribute( defaultValue = "true" ) boolean isHttpsSaslAuthenticationEnabled(); - @ManagedAttribute( automate = true, defaultValue = "true" ) + @ManagedAttribute( defaultValue = "true" ) boolean isHttpSaslAuthenticationEnabled(); - @ManagedAttribute( automate = true, defaultValue = "true" ) + @ManagedAttribute( defaultValue = "true" ) boolean isHttpsBasicAuthenticationEnabled(); - @ManagedAttribute( automate = true, defaultValue = "false" ) + @ManagedAttribute( defaultValue = "false" ) boolean isHttpBasicAuthenticationEnabled(); - @ManagedAttribute( automate = true, defaultValue = "600" ) + @ManagedAttribute( defaultValue = "600" ) public int getSessionTimeout(); AuthenticationProvider getAuthenticationProvider(SocketAddress localAddress); 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=1592030&r1=1592029&r2=1592030&view=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 Fri May 2 20:32:16 2014 @@ -541,7 +541,7 @@ public class RestServlet extends Abstrac Collection<ConfiguredObject<?>> allObjects = getObjects(request); for(ConfiguredObject o : allObjects) { - o.setDesiredState(o.getState(), State.DELETED); + o.setDesiredState(State.DELETED); } response.setStatus(HttpServletResponse.SC_OK); Modified: qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/action/AbstractSpecialisedAttributeLister.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/action/AbstractSpecialisedAttributeLister.java?rev=1592030&r1=1592029&r2=1592030&view=diff ============================================================================== --- qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/action/AbstractSpecialisedAttributeLister.java (original) +++ qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/action/AbstractSpecialisedAttributeLister.java Fri May 2 20:32:16 2014 @@ -59,9 +59,9 @@ abstract class AbstractSpecialisedAttrib for(ConfiguredObjectAttribute<?, ?> attr : typeSpecificAttributes) { attributeNames.add(attr.getName()); - if(!"".equals(attr.getAnnotation().description())) + if(!"".equals(attr.getDescription())) { - descriptions.put(attr.getName(), attr.getAnnotation().description()); + descriptions.put(attr.getName(), attr.getDescription()); } } data.put(ATTRIBUTES, attributeNames); Modified: qpid/trunk/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagementPlugin.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagementPlugin.java?rev=1592030&r1=1592029&r2=1592030&view=diff ============================================================================== --- qpid/trunk/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagementPlugin.java (original) +++ qpid/trunk/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagementPlugin.java Fri May 2 20:32:16 2014 @@ -30,6 +30,6 @@ public interface JMXManagementPlugin<X e String USE_PLATFORM_MBEAN_SERVER = "usePlatformMBeanServer"; String DEFAULT_USE_PLATFORM_MBEAN_SERVER = "true"; - @ManagedAttribute( automate = true, defaultValue = DEFAULT_USE_PLATFORM_MBEAN_SERVER ) + @ManagedAttribute( defaultValue = DEFAULT_USE_PLATFORM_MBEAN_SERVER ) boolean getUsePlatformMBeanServer(); } Modified: qpid/trunk/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagementPluginImpl.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagementPluginImpl.java?rev=1592030&r1=1592029&r2=1592030&view=diff ============================================================================== --- qpid/trunk/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagementPluginImpl.java (original) +++ qpid/trunk/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagementPluginImpl.java Fri May 2 20:32:16 2014 @@ -88,7 +88,7 @@ public class JMXManagementPluginImpl } @Override - protected boolean setState(State currentState, State desiredState) + protected boolean setState(State desiredState) { if(desiredState == State.ACTIVE) { Modified: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/store/VirtualHostMessageStoreTest.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/store/VirtualHostMessageStoreTest.java?rev=1592030&r1=1592029&r2=1592030&view=diff ============================================================================== --- qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/store/VirtualHostMessageStoreTest.java (original) +++ qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/store/VirtualHostMessageStoreTest.java Fri May 2 20:32:16 2014 @@ -20,15 +20,20 @@ */ package org.apache.qpid.server.store; +import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; import java.io.File; +import java.security.PrivilegedAction; import java.util.ArrayList; import java.util.Collection; +import java.util.Collections; import java.util.HashMap; import java.util.Map; import java.util.UUID; +import javax.security.auth.Subject; + import org.apache.qpid.common.AMQPFilterTypes; import org.apache.qpid.exchange.ExchangeDefaults; import org.apache.qpid.framing.AMQShortString; @@ -39,6 +44,7 @@ import org.apache.qpid.framing.abstracti import org.apache.qpid.framing.amqp_8_0.BasicConsumeBodyImpl; import org.apache.qpid.server.configuration.updater.TaskExecutor; import org.apache.qpid.server.configuration.updater.TaskExecutorImpl; +import org.apache.qpid.server.connection.SessionPrincipal; import org.apache.qpid.server.exchange.ExchangeImpl; import org.apache.qpid.server.message.InstanceProperties; import org.apache.qpid.server.message.MessageSource; @@ -52,6 +58,8 @@ import org.apache.qpid.server.model.Queu import org.apache.qpid.server.model.State; import org.apache.qpid.server.model.UUIDGenerator; import org.apache.qpid.server.model.VirtualHostNode; +import org.apache.qpid.server.protocol.AMQConnectionModel; +import org.apache.qpid.server.protocol.AMQSessionModel; import org.apache.qpid.server.protocol.v0_8.AMQMessage; import org.apache.qpid.server.protocol.v0_8.MessageMetaData; import org.apache.qpid.server.queue.AMQQueue; @@ -130,7 +138,7 @@ public class VirtualHostMessageStoreTest nodeAttributes.put(VirtualHostNode.NAME, hostName); nodeAttributes.put(VirtualHostNode.ID, UUID.randomUUID()); _node = factory.create(VirtualHostNode.class, nodeAttributes, broker); - _node.setDesiredState(_node.getState(), State.ACTIVE); + _node.setDesiredState(State.ACTIVE); _virtualHost = (VirtualHostImpl<?,?,?>)_node.getVirtualHost(); @@ -144,7 +152,7 @@ public class VirtualHostMessageStoreTest if (_virtualHost != null) { VirtualHostNode<?> node = _virtualHost.getParent(VirtualHostNode.class); - node.setDesiredState(node.getState(), State.STOPPED); + node.setDesiredState(State.STOPPED); } } finally @@ -157,10 +165,10 @@ public class VirtualHostMessageStoreTest protected void reloadVirtualHost() { assertEquals("Virtual host node is not active", State.ACTIVE, _virtualHost.getState()); - State currentState = _node.setDesiredState(State.ACTIVE, State.STOPPED); + State currentState = _node.setDesiredState(State.STOPPED); assertEquals("Virtual host node is not stopped", State.STOPPED, currentState); - currentState = _node.setDesiredState(State.STOPPED, State.ACTIVE); + currentState = _node.setDesiredState(State.ACTIVE); assertEquals("Virtual host node is not active", State.ACTIVE, currentState); _virtualHost = (VirtualHostImpl<?, ?, ?>) _node.getVirtualHost(); } @@ -628,7 +636,7 @@ public class VirtualHostMessageStoreTest throws Exception { - Map<String,Object> queueArguments = new HashMap<String, Object>(); + final Map<String,Object> queueArguments = new HashMap<String, Object>(); if(usePriority || lastValueQueue) { @@ -650,14 +658,25 @@ public class VirtualHostMessageStoreTest queueArguments.put(Queue.DURABLE, durable); queueArguments.put(Queue.LIFETIME_POLICY, LifetimePolicy.PERMANENT); queueArguments.put(Queue.EXCLUSIVE, exclusive ? ExclusivityPolicy.CONTAINER : ExclusivityPolicy.NONE); - if(exclusive && queueOwner != null) - { - queueArguments.put(Queue.OWNER, queueOwner); - } - AMQQueue<?> queue = null; + AMQSessionModel sessionModel = mock(AMQSessionModel.class); + AMQConnectionModel connectionModel = mock(AMQConnectionModel.class); + when(sessionModel.getConnectionModel()).thenReturn(connectionModel); + when(connectionModel.getRemoteContainerName()).thenReturn(queueOwner); + SessionPrincipal principal = new SessionPrincipal(sessionModel); + AMQQueue<?> queue = Subject.doAs(new Subject(true, + Collections.singleton(principal), + Collections.emptySet(), + Collections.emptySet()), + new PrivilegedAction<AMQQueue<?>>() + { + @Override + public AMQQueue<?> run() + { + return _virtualHost.createQueue(queueArguments); + + } + }); - //Ideally we would be able to use the QueueDeclareHandler here. - queue = _virtualHost.createQueue(queueArguments); validateQueueProperties(queue, usePriority, durable, exclusive, lastValueQueue); } Modified: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/Asserts.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/Asserts.java?rev=1592030&r1=1592029&r2=1592030&view=diff ============================================================================== --- qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/Asserts.java (original) +++ qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/Asserts.java Fri May 2 20:32:16 2014 @@ -43,6 +43,7 @@ import org.apache.qpid.server.model.Port import org.apache.qpid.server.model.Queue; import org.apache.qpid.server.model.State; import org.apache.qpid.server.model.VirtualHost; +import org.apache.qpid.server.model.port.AmqpPort; import org.apache.qpid.server.queue.LastValueQueue; import org.apache.qpid.server.queue.PriorityQueue; import org.apache.qpid.server.queue.SortedQueue; @@ -63,6 +64,7 @@ public class Asserts ConfiguredObject.LAST_UPDATED_TIME, ConfiguredObject.DESCRIPTION, ConfiguredObject.CONTEXT, + ConfiguredObject.DESIRED_STATE, VirtualHost.SUPPORTED_QUEUE_TYPES, VirtualHost.TYPE, VirtualHost.MESSAGE_STORE_SETTINGS); @@ -120,7 +122,8 @@ public class Asserts Queue.MESSAGE_GROUP_KEY, Queue.MESSAGE_GROUP_SHARED_GROUPS, PriorityQueue.PRIORITIES, - ConfiguredObject.CONTEXT); + ConfiguredObject.CONTEXT, + ConfiguredObject.DESIRED_STATE); assertEquals("Unexpected value of queue attribute " + Queue.NAME, queueName, queueData.get(Queue.NAME)); assertNotNull("Unexpected value of queue attribute " + Queue.ID, queueData.get(Queue.ID)); @@ -226,7 +229,8 @@ public class Asserts ConfiguredObject.LAST_UPDATED_BY, ConfiguredObject.LAST_UPDATED_TIME, ConfiguredObject.DESCRIPTION, - ConfiguredObject.CONTEXT); + ConfiguredObject.CONTEXT, + ConfiguredObject.DESIRED_STATE); assertEquals("Unexpected value for connection attribute " + Connection.PORT, TestBrokerConfiguration.ENTRY_NAME_AMQP_PORT, connectionData.get(Connection.PORT)); @@ -279,6 +283,7 @@ public class Asserts ConfiguredObject.LAST_UPDATED_TIME, ConfiguredObject.DESCRIPTION, ConfiguredObject.CONTEXT, + ConfiguredObject.DESIRED_STATE, Port.AUTHENTICATION_PROVIDER, Port.KEY_STORE, Port.TRUST_STORES, @@ -296,11 +301,12 @@ public class Asserts ConfiguredObject.LAST_UPDATED_TIME, ConfiguredObject.DESCRIPTION, ConfiguredObject.CONTEXT, + ConfiguredObject.DESIRED_STATE, Port.AUTHENTICATION_PROVIDER, Port.BINDING_ADDRESS, Port.TCP_NO_DELAY, - Port.SEND_BUFFER_SIZE, - Port.RECEIVE_BUFFER_SIZE, + AmqpPort.SEND_BUFFER_SIZE, + AmqpPort.RECEIVE_BUFFER_SIZE, Port.NEED_CLIENT_AUTH, Port.WANT_CLIENT_AUTH, Port.KEY_STORE, @@ -332,7 +338,8 @@ public class Asserts ConfiguredObject.LAST_UPDATED_BY, ConfiguredObject.LAST_UPDATED_TIME, ConfiguredObject.DESCRIPTION, - ConfiguredObject.CONTEXT); + ConfiguredObject.CONTEXT, + ConfiguredObject.DESIRED_STATE); assertEquals("Unexpected value of exchange attribute " + Exchange.NAME, exchangeName, exchangeData.get(Exchange.NAME)); @@ -368,7 +375,8 @@ public class Asserts ConfiguredObject.LAST_UPDATED_BY, ConfiguredObject.LAST_UPDATED_TIME, ConfiguredObject.DESCRIPTION, - ConfiguredObject.CONTEXT); + ConfiguredObject.CONTEXT, + ConfiguredObject.DESIRED_STATE); assertEquals("Unexpected binding attribute " + Binding.NAME, bindingName, binding.get(Binding.NAME)); assertEquals("Unexpected binding attribute " + Binding.QUEUE, queueName, binding.get(Binding.QUEUE)); Modified: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/AuthenticationProviderRestTest.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/AuthenticationProviderRestTest.java?rev=1592030&r1=1592029&r2=1592030&view=diff ============================================================================== --- qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/AuthenticationProviderRestTest.java (original) +++ qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/AuthenticationProviderRestTest.java Fri May 2 20:32:16 2014 @@ -309,7 +309,8 @@ public class AuthenticationProviderRestT { Asserts.assertAttributesPresent(provider, ConfiguredObjectTypeRegistry.getAttributeNames( AuthenticationProvider.class), - AuthenticationProvider.DESCRIPTION, ConfiguredObject.CONTEXT, ConfiguredObject.CREATED_BY, + AuthenticationProvider.DESCRIPTION, ConfiguredObject.CONTEXT, + ConfiguredObject.DESIRED_STATE, ConfiguredObject.CREATED_BY, ConfiguredObject.CREATED_TIME, ConfiguredObject.LAST_UPDATED_BY, ConfiguredObject.LAST_UPDATED_TIME); assertEquals("Unexpected value of provider attribute " + AuthenticationProvider.STATE, State.ACTIVE.name(), provider.get(AuthenticationProvider.STATE)); Modified: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BrokerRestHttpsTest.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BrokerRestHttpsTest.java?rev=1592030&r1=1592029&r2=1592030&view=diff ============================================================================== --- qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BrokerRestHttpsTest.java (original) +++ qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BrokerRestHttpsTest.java Fri May 2 20:32:16 2014 @@ -71,6 +71,7 @@ public class BrokerRestHttpsTest extends ConfiguredObject.LAST_UPDATED_BY, ConfiguredObject.LAST_UPDATED_TIME, ConfiguredObject.DESCRIPTION, - ConfiguredObject.CONTEXT); + ConfiguredObject.CONTEXT, + ConfiguredObject.DESIRED_STATE); } } Modified: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BrokerRestTest.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BrokerRestTest.java?rev=1592030&r1=1592029&r2=1592030&view=diff ============================================================================== --- qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BrokerRestTest.java (original) +++ qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BrokerRestTest.java Fri May 2 20:32:16 2014 @@ -210,7 +210,8 @@ public class BrokerRestTest extends Qpid ConfiguredObject.LAST_UPDATED_BY, ConfiguredObject.LAST_UPDATED_TIME, ConfiguredObject.DESCRIPTION, - ConfiguredObject.CONTEXT); + ConfiguredObject.CONTEXT, + ConfiguredObject.DESIRED_STATE); assertEquals("Unexpected value of attribute " + Broker.BUILD_VERSION, QpidProperties.getBuildVersion(), brokerDetails.get(Broker.BUILD_VERSION)); Modified: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/ConnectionRestTest.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/ConnectionRestTest.java?rev=1592030&r1=1592029&r2=1592030&view=diff ============================================================================== --- qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/ConnectionRestTest.java (original) +++ qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/ConnectionRestTest.java Fri May 2 20:32:16 2014 @@ -182,6 +182,7 @@ public class ConnectionRestTest extends ConfiguredObject.LAST_UPDATED_TIME, ConfiguredObject.DESCRIPTION, ConfiguredObject.CONTEXT, + ConfiguredObject.DESIRED_STATE, Session.STATE, Session.DURABLE, Session.LIFETIME_POLICY); Modified: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/GroupProviderRestTest.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/GroupProviderRestTest.java?rev=1592030&r1=1592029&r2=1592030&view=diff ============================================================================== --- qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/GroupProviderRestTest.java (original) +++ qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/GroupProviderRestTest.java Fri May 2 20:32:16 2014 @@ -329,7 +329,8 @@ public class GroupProviderRestTest exten ConfiguredObject.LAST_UPDATED_BY, ConfiguredObject.LAST_UPDATED_TIME, ConfiguredObject.DESCRIPTION, - ConfiguredObject.CONTEXT); + ConfiguredObject.CONTEXT, + ConfiguredObject.DESIRED_STATE); assertEquals("Unexpected value of provider attribute " + GroupProvider.STATE, State.ACTIVE.name(), provider.get(GroupProvider.STATE)); assertEquals("Unexpected value of provider attribute " + GroupProvider.LIFETIME_POLICY, Modified: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/PreferencesProviderRestTest.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/PreferencesProviderRestTest.java?rev=1592030&r1=1592029&r2=1592030&view=diff ============================================================================== --- qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/PreferencesProviderRestTest.java (original) +++ qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/PreferencesProviderRestTest.java Fri May 2 20:32:16 2014 @@ -169,7 +169,8 @@ public class PreferencesProviderRestTest ConfiguredObject.LAST_UPDATED_BY, ConfiguredObject.LAST_UPDATED_TIME, ConfiguredObject.DESCRIPTION, - ConfiguredObject.CONTEXT); + ConfiguredObject.CONTEXT, + ConfiguredObject.DESIRED_STATE); assertEquals("Unexpected value of provider attribute " + PreferencesProvider.STATE, State.ACTIVE.name(), provider.get(PreferencesProvider.STATE)); assertEquals("Unexpected value of provider attribute " + PreferencesProvider.LIFETIME_POLICY, Modified: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/QueueRestTest.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/QueueRestTest.java?rev=1592030&r1=1592029&r2=1592030&view=diff ============================================================================== --- qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/QueueRestTest.java (original) +++ qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/QueueRestTest.java Fri May 2 20:32:16 2014 @@ -215,7 +215,8 @@ public class QueueRestTest extends QpidR ConfiguredObject.LAST_UPDATED_BY, ConfiguredObject.LAST_UPDATED_TIME, ConfiguredObject.DESCRIPTION, - ConfiguredObject.CONTEXT); + ConfiguredObject.CONTEXT, + ConfiguredObject.DESIRED_STATE); assertEquals("Unexpected binding attribute " + Consumer.NAME, "1", consumer.get(Consumer.NAME)); assertEquals("Unexpected binding attribute " + Consumer.DURABLE, Boolean.FALSE, consumer.get(Consumer.DURABLE)); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
