You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ri...@apache.org on 2008/03/10 18:16:19 UTC
svn commit: r635602 - in /incubator/qpid/branches/M2.1/java:
broker/src/main/java/org/apache/qpid/server/handler/
broker/src/main/java/org/apache/qpid/server/protocol/
broker/src/main/java/org/apache/qpid/server/security/access/
broker/src/main/java/or...
Author: ritchiem
Date: Mon Mar 10 10:16:09 2008
New Revision: 635602
URL: http://svn.apache.org/viewvc?rev=635602&view=rev
Log:
QPID-107 : Changes based on code review.
Modified:
incubator/qpid/branches/M2.1/java/broker/src/main/java/org/apache/qpid/server/handler/ExchangeDeclareHandler.java
incubator/qpid/branches/M2.1/java/broker/src/main/java/org/apache/qpid/server/handler/QueueDeclareHandler.java
incubator/qpid/branches/M2.1/java/broker/src/main/java/org/apache/qpid/server/handler/QueueUnbindHandler.java (props changed)
incubator/qpid/branches/M2.1/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQMinaProtocolSession.java
incubator/qpid/branches/M2.1/java/broker/src/main/java/org/apache/qpid/server/security/access/PrincipalPermissions.java
incubator/qpid/branches/M2.1/java/broker/src/main/java/org/apache/qpid/server/security/access/plugins/SimpleXML.java
incubator/qpid/branches/M2.1/java/client/src/main/java/org/apache/qpid/client/AMQSession.java
incubator/qpid/branches/M2.1/java/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolHandler.java
incubator/qpid/branches/M2.1/java/common/src/main/java/org/apache/qpid/framing/AMQShortString.java
incubator/qpid/branches/M2.1/java/common/src/test/java/org/apache/qpid/framing/AMQShortStringTest.java
incubator/qpid/branches/M2.1/java/systests/etc/acl.config.xml
incubator/qpid/branches/M2.1/java/systests/src/main/java/org/apache/qpid/server/security/acl/SimpleACLTest.java
Modified: incubator/qpid/branches/M2.1/java/broker/src/main/java/org/apache/qpid/server/handler/ExchangeDeclareHandler.java
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/M2.1/java/broker/src/main/java/org/apache/qpid/server/handler/ExchangeDeclareHandler.java?rev=635602&r1=635601&r2=635602&view=diff
==============================================================================
--- incubator/qpid/branches/M2.1/java/broker/src/main/java/org/apache/qpid/server/handler/ExchangeDeclareHandler.java (original)
+++ incubator/qpid/branches/M2.1/java/broker/src/main/java/org/apache/qpid/server/handler/ExchangeDeclareHandler.java Mon Mar 10 10:16:09 2008
@@ -59,8 +59,11 @@
ExchangeRegistry exchangeRegistry = virtualHost.getExchangeRegistry();
ExchangeFactory exchangeFactory = virtualHost.getExchangeFactory();
- //Perform ACL
- virtualHost.getAccessManager().authorise(session, Permission.CREATE, body);
+ if (!body.getPassive())
+ {
+ //Perform ACL if request is not passive
+ virtualHost.getAccessManager().authorise(session, Permission.CREATE, body);
+ }
if (_logger.isDebugEnabled())
{
Modified: incubator/qpid/branches/M2.1/java/broker/src/main/java/org/apache/qpid/server/handler/QueueDeclareHandler.java
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/M2.1/java/broker/src/main/java/org/apache/qpid/server/handler/QueueDeclareHandler.java?rev=635602&r1=635601&r2=635602&view=diff
==============================================================================
--- incubator/qpid/branches/M2.1/java/broker/src/main/java/org/apache/qpid/server/handler/QueueDeclareHandler.java (original)
+++ incubator/qpid/branches/M2.1/java/broker/src/main/java/org/apache/qpid/server/handler/QueueDeclareHandler.java Mon Mar 10 10:16:09 2008
@@ -55,7 +55,7 @@
return _instance;
}
- @Configured(path = "queue.auto_register", defaultValue = "false")
+ @Configured(path = "queue.auto_register", defaultValue = "true")
public boolean autoRegister;
private final AtomicInteger _counter = new AtomicInteger();
@@ -74,9 +74,12 @@
QueueRegistry queueRegistry = virtualHost.getQueueRegistry();
MessageStore store = virtualHost.getMessageStore();
- // Perform ACL on queue Creation
- virtualHost.getAccessManager().authorise(session, Permission.CREATE, body);
+ if (!body.getPassive())
+ {
+ //Perform ACL if request is not passive
+ virtualHost.getAccessManager().authorise(session, Permission.CREATE, body);
+ }
final AMQShortString queueName;
@@ -119,10 +122,6 @@
if (autoRegister)
{
Exchange defaultExchange = exchangeRegistry.getDefaultExchange();
-
- // Perform ACL to control bindings
- virtualHost.getAccessManager().authorise(session, Permission.BIND, body,
- defaultExchange, queue, queueName);
queue.bind(queueName, null, defaultExchange);
_logger.info("Queue " + queueName + " bound to default exchange(" + defaultExchange.getName() + ")");
Propchange: incubator/qpid/branches/M2.1/java/broker/src/main/java/org/apache/qpid/server/handler/QueueUnbindHandler.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/qpid/branches/M2.1/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQMinaProtocolSession.java
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/M2.1/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQMinaProtocolSession.java?rev=635602&r1=635601&r2=635602&view=diff
==============================================================================
--- incubator/qpid/branches/M2.1/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQMinaProtocolSession.java (original)
+++ incubator/qpid/branches/M2.1/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQMinaProtocolSession.java Mon Mar 10 10:16:09 2008
@@ -348,7 +348,7 @@
_logger.info("Closing connection due to: " + e.getMessage());
}
- markChannelawaitingCloseOk(channelId);
+ markChannelAwaitingCloseOk(channelId);
closeSession();
_stateManager.changeState(AMQState.CONNECTION_CLOSING);
writeFrame(e.getCloseFrame(channelId));
@@ -537,7 +537,7 @@
try
{
channel.close(this);
- markChannelawaitingCloseOk(channelId);
+ markChannelAwaitingCloseOk(channelId);
}
finally
{
@@ -552,7 +552,7 @@
_closingChannelsList.remove(new Integer(channelId));
}
- private void markChannelawaitingCloseOk(int channelId)
+ private void markChannelAwaitingCloseOk(int channelId)
{
_closingChannelsList.add(channelId);
}
Modified: incubator/qpid/branches/M2.1/java/broker/src/main/java/org/apache/qpid/server/security/access/PrincipalPermissions.java
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/M2.1/java/broker/src/main/java/org/apache/qpid/server/security/access/PrincipalPermissions.java?rev=635602&r1=635601&r2=635602&view=diff
==============================================================================
--- incubator/qpid/branches/M2.1/java/broker/src/main/java/org/apache/qpid/server/security/access/PrincipalPermissions.java (original)
+++ incubator/qpid/branches/M2.1/java/broker/src/main/java/org/apache/qpid/server/security/access/PrincipalPermissions.java Mon Mar 10 10:16:09 2008
@@ -33,19 +33,19 @@
public class PrincipalPermissions
{
- private static final int CONSUME_QUEUES_KEY = 0;
- private static final int CONSUME_TEMPORARY_KEY = 1;
- private static final int CONSUME_OWN_QUEUES_ONLY_KEY = 2;
-
- private static final int CREATE_QUEUES_KEY = 0;
- private static final int CREATE_EXCHANGES_KEY = 1;
-
- private static final int CREATE_QUEUE_TEMPORARY_KEY = 2;
- private static final int CREATE_QUEUE_QUEUES_KEY = 1;
- private static final int CREATE_QUEUE_EXCHANGES_KEY = 0;
+ private static final Object CONSUME_QUEUES_KEY = new Object();
+ private static final Object CONSUME_TEMPORARY_KEY = new Object();
+ private static final Object CONSUME_OWN_QUEUES_ONLY_KEY = new Object();
+
+ private static final Object CREATE_QUEUES_KEY = new Object();
+ private static final Object CREATE_EXCHANGES_KEY = new Object();
+
+ private static final Object CREATE_QUEUE_TEMPORARY_KEY = new Object();
+ private static final Object CREATE_QUEUE_QUEUES_KEY = new Object();
+ private static final Object CREATE_QUEUE_EXCHANGES_KEY = new Object();
- private static final int CREATE_QUEUE_EXCHANGES_TEMPORARY_KEY = 0;
- private static final int CREATE_QUEUE_EXCHANGES_ROUTINGKEYS_KEY = 1;
+ private static final Object CREATE_QUEUE_EXCHANGES_TEMPORARY_KEY = new Object();
+ private static final Object CREATE_QUEUE_EXCHANGES_ROUTINGKEYS_KEY = new Object();
private static final int PUBLISH_EXCHANGES_KEY = 0;
@@ -316,15 +316,7 @@
// The existence of this user specific PP can be validated in the map SimpleXML maintains.
case BIND: // Parameters : QueueBindMethod , Exchange , AMQQueue, AMQShortString routingKey
-// QueueDeclareBody body = (QueueDeclareBody) parameters[0];
-
Exchange exchange = (Exchange) parameters[1];
-
- if (exchange.getName().equals("<<default>>"))
- {
- // Binding to <<default>> can not be programmed via ACLs due to '<','>' unable to be used in the XML
- System.err.println("Binding on exchange <<default>> not alowed via ACLs");
- }
AMQQueue bind_queueName = (AMQQueue) parameters[2];
AMQShortString routingKey = (AMQShortString) parameters[3];
Modified: incubator/qpid/branches/M2.1/java/broker/src/main/java/org/apache/qpid/server/security/access/plugins/SimpleXML.java
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/M2.1/java/broker/src/main/java/org/apache/qpid/server/security/access/plugins/SimpleXML.java?rev=635602&r1=635601&r2=635602&view=diff
==============================================================================
--- incubator/qpid/branches/M2.1/java/broker/src/main/java/org/apache/qpid/server/security/access/plugins/SimpleXML.java (original)
+++ incubator/qpid/branches/M2.1/java/broker/src/main/java/org/apache/qpid/server/security/access/plugins/SimpleXML.java Mon Mar 10 10:16:09 2008
@@ -46,9 +46,8 @@
*/
public class SimpleXML implements ACLPlugin
{
- private static final Logger _logger = ACLManager.getLogger();
-
private Map<String, PrincipalPermissions> _users;
+ private final AccessResult GRANTED = new AccessResult(this, AccessResult.AccessStatus.GRANTED);
public SimpleXML()
{
@@ -57,8 +56,6 @@
public void setConfiguaration(Configuration config)
{
- _logger.info("SimpleXML Configuration");
-
processConfig(config);
}
@@ -87,7 +84,6 @@
for (String user : users)
{
grant(Permission.PUBLISH, user);
- _logger.info("PUBLISH:GRANTED:USER:" + user + " for all destinations");
}
// Process exchange limited users
@@ -113,7 +109,6 @@
for (String user : users)
{
grant(Permission.PUBLISH, user, exchangeName, routingKeyValue);
- _logger.info("PUBLISH:GRANTED:USER:" + user + " on Exchange '" + exchangeName + "' for key '" + routingKeyValue + "'");
}
//Apply permissions to Groups
@@ -129,7 +124,6 @@
for (String user : users)
{
grant(Permission.PUBLISH, user, exchangeName);
- _logger.info("PUBLISH:GRANTED:USER:" + user + " on Exchange:" + exchangeName);
}
//Apply permissions to Groups
@@ -172,21 +166,6 @@
for (String user : users)
{
grant(Permission.CONSUME, user, queueName, temporary, ownQueues);
- if (temporary)
- {
- if (ownQueues)
- {
- _logger.info("CONSUME:GRANTED:USER:" + user + " on temporary queues owned by user.");
- }
- else
- {
- _logger.info("CONSUME:GRANTED:USER:" + user + " on all temporary queues.");
- }
- }
- else
- {
- _logger.info("CONSUME:GRANTED:USER:" + user + " on queue '" + queueName + "'");
- }
}
//See if we have another config
@@ -200,7 +179,6 @@
for (String user : users)
{
grant(Permission.CONSUME, user);
- _logger.info("CONSUME:GRANTED:USER:" + user + " from all queues.");
}
}
@@ -237,12 +215,6 @@
(queueName.equals("") ? null : queueName),
(exchange.equals("") ? null : exchange),
(routingKey.equals("") ? null : routingKey));
-
- _logger.info("CREATE :GRANTED:USER:" + user + " for "
- + (queueName.equals("") ? "" : "queue '" + queueName + "' ")
- + (exchange.equals("") ? "" : "exchange '" + exchange + "' ")
- + (routingKey.equals("") ? "" : " rk '" + routingKey + "' ")
- + (temporary ? " temporary:" + temporary : ""));
}
//See if we have another config
@@ -256,14 +228,6 @@
for (String user : users)
{
grant(Permission.CREATE, user, temporary, queueName);
- if (temporary)
- {
- _logger.info("CREATE :GRANTED:USER:" + user + " from temporary queues on any exchange.");
- }
- else
- {
- _logger.info("CREATE :GRANTED:USER:" + user + " from queue '" + queueName + "' on any exchange.");
- }
}
//See if we have another config
@@ -285,7 +249,6 @@
for (String user : users)
{
grant(Permission.CREATE, user, exchange, clazz);
- _logger.info("CREATE:GRANTED:USER:" + user + " for exchange '" + exchange + ":class:'" + clazz);
}
//See if we have another config
@@ -299,7 +262,6 @@
for (String user : users)
{
grant(Permission.CREATE, user);
- _logger.info("CREATE:GRANTED:USER:" + user + " from all queues & exchanges.");
}
@@ -326,15 +288,12 @@
//Get the Users Permissions
PrincipalPermissions permissions = _users.get(username);
- _logger.warn("Processing :" + permission + " for:" + username + ":" + permissions+":"+parameters.length);
-
if (permissions != null)
{
switch (permission)
{
case ACCESS:
- _logger.warn("GRANTED:"+permission);
- return new AccessResult(this, AccessResult.AccessStatus.GRANTED);
+ return GRANTED;
case BIND: // Body QueueDeclareBody - Parameters : Exchange, Queue, QueueName
// Body QueueBindBody - Paramters : Exchange, Queue, QueueName
if (parameters.length == 3)
@@ -342,23 +301,20 @@
// Parameters : Exchange, Queue, RoutingKey
if (permissions.authorise(Permission.BIND, body, parameters[0], parameters[1], parameters[2]))
{
- _logger.warn("GRANTED:"+permission);
- return new AccessResult(this, AccessResult.AccessStatus.GRANTED);
+ return GRANTED;
}
}
break;
case CONSUME: // Parameters : none
if (parameters.length == 1 && permissions.authorise(Permission.CONSUME, parameters[0]))
{
- _logger.warn("GRANTED:"+permission);
- return new AccessResult(this, AccessResult.AccessStatus.GRANTED);
+ return GRANTED;
}
break;
case CREATE: // Body : QueueDeclareBody | ExchangeDeclareBody - Parameters : none
if (permissions.authorise(Permission.CREATE, body))
{
- _logger.warn("GRANTED:"+permission);
- return new AccessResult(this, AccessResult.AccessStatus.GRANTED);
+ return GRANTED;
}
break;
case PUBLISH: // Body : BasicPublishBody Parameters : exchange
@@ -367,8 +323,7 @@
if (permissions.authorise(Permission.PUBLISH, ((Exchange) parameters[0]).getName(),
((BasicPublishBody) body).getRoutingKey()))
{
- _logger.warn("GRANTED:"+permission);
- return new AccessResult(this, AccessResult.AccessStatus.GRANTED);
+ return GRANTED;
}
}
break;
@@ -381,51 +336,7 @@
}
}
- _logger.warn("Access Denied for :" + permission + " for:" + username + ":" + permissions);
//todo potential refactor this ConnectionException Out of here
throw body.getConnectionException(AMQConstant.ACCESS_REFUSED, error);
}
-
-//todo use or lose
-// if (accessObject instanceof VirtualHost)
-// {
-// VirtualHostAccess[] hosts = lookupVirtualHost(user.getName());
-//
-// if (hosts != null)
-// {
-// for (VirtualHostAccess host : hosts)
-// {
-// if (accessObject.getAccessableName().equals(host.getVirtualHost()))
-// {
-// if (host.getAccessRights().allows(rights))
-// {
-// return new AccessResult(this, AccessResult.AccessStatus.GRANTED);
-// }
-// else
-// {
-// return new AccessResult(this, AccessResult.AccessStatus.REFUSED);
-// }
-// }
-// }
-// }
-// }
-// else if (accessObject instanceof AMQQueue)
-// {
-// String[] queues = lookupQueue(username, ((AMQQueue) accessObject).getVirtualHost());
-//
-// if (queues != null)
-// {
-// for (String queue : queues)
-// {
-// if (accessObject.getAccessableName().equals(queue))
-// {
-// return new AccessResult(this, AccessResult.AccessStatus.GRANTED);
-// }
-// }
-// }
-// }
-
-// return new AccessResult(this, AccessResult.AccessStatus.REFUSED);
-// }
-
}
Modified: incubator/qpid/branches/M2.1/java/client/src/main/java/org/apache/qpid/client/AMQSession.java
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/M2.1/java/client/src/main/java/org/apache/qpid/client/AMQSession.java?rev=635602&r1=635601&r2=635602&view=diff
==============================================================================
--- incubator/qpid/branches/M2.1/java/client/src/main/java/org/apache/qpid/client/AMQSession.java (original)
+++ incubator/qpid/branches/M2.1/java/client/src/main/java/org/apache/qpid/client/AMQSession.java Mon Mar 10 10:16:09 2008
@@ -2377,7 +2377,7 @@
* @todo Verify the destiation is valid or throw an exception.
* @todo Be aware of possible changes to parameter order as versions change.
*/
- public AMQShortString declareQueue(final AMQDestination amqd, final AMQProtocolHandler protocolHandler)
+ private AMQShortString declareQueue(final AMQDestination amqd, final AMQProtocolHandler protocolHandler)
throws AMQException
{
/*return new FailoverRetrySupport<AMQShortString, AMQException>(*/
@@ -2445,7 +2445,7 @@
return ++_nextProducerId;
}
- public AMQProtocolHandler getProtocolHandler()
+ private AMQProtocolHandler getProtocolHandler()
{
return _connection.getProtocolHandler();
}
Modified: incubator/qpid/branches/M2.1/java/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolHandler.java
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/M2.1/java/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolHandler.java?rev=635602&r1=635601&r2=635602&view=diff
==============================================================================
--- incubator/qpid/branches/M2.1/java/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolHandler.java (original)
+++ incubator/qpid/branches/M2.1/java/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolHandler.java Mon Mar 10 10:16:09 2008
@@ -209,8 +209,7 @@
}
catch (RuntimeException e)
{
- _logger.warn(e.getMessage());
- e.printStackTrace();
+ _logger.error(e.getMessage(), e);
}
if (Boolean.getBoolean("protectio"))
Modified: incubator/qpid/branches/M2.1/java/common/src/main/java/org/apache/qpid/framing/AMQShortString.java
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/M2.1/java/common/src/main/java/org/apache/qpid/framing/AMQShortString.java?rev=635602&r1=635601&r2=635602&view=diff
==============================================================================
--- incubator/qpid/branches/M2.1/java/common/src/main/java/org/apache/qpid/framing/AMQShortString.java (original)
+++ incubator/qpid/branches/M2.1/java/common/src/main/java/org/apache/qpid/framing/AMQShortString.java Mon Mar 10 10:16:09 2008
@@ -325,7 +325,7 @@
for (int i = 0; i < otherString.length(); i++)
{
- if (_data[i] != otherString._data[i])
+ if (charAt(i) != otherString.charAt(i))
{
return false;
}
@@ -646,7 +646,7 @@
- return new AMQShortString(data,0,size);
+ return new AMQShortString(data,0,size);
}
public int toIntValue()
Modified: incubator/qpid/branches/M2.1/java/common/src/test/java/org/apache/qpid/framing/AMQShortStringTest.java
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/M2.1/java/common/src/test/java/org/apache/qpid/framing/AMQShortStringTest.java?rev=635602&r1=635601&r2=635602&view=diff
==============================================================================
--- incubator/qpid/branches/M2.1/java/common/src/test/java/org/apache/qpid/framing/AMQShortStringTest.java (original)
+++ incubator/qpid/branches/M2.1/java/common/src/test/java/org/apache/qpid/framing/AMQShortStringTest.java Mon Mar 10 10:16:09 2008
@@ -24,36 +24,36 @@
public class AMQShortStringTest extends TestCase
{
- AMQShortString Hello = new AMQShortString("Hello");
- AMQShortString Hell = new AMQShortString("Hell");
- AMQShortString Goodbye = new AMQShortString("Goodbye");
- AMQShortString Good = new AMQShortString("Good");
- AMQShortString Bye = new AMQShortString("Bye");
+ public static final AMQShortString HELLO = new AMQShortString("Hello");
+ public static final AMQShortString HELL = new AMQShortString("Hell");
+ public static final AMQShortString GOODBYE = new AMQShortString("Goodbye");
+ public static final AMQShortString GOOD = new AMQShortString("Good");
+ public static final AMQShortString BYE = new AMQShortString("BYE");
public void testStartsWith()
{
- assertTrue(Hello.startsWith(Hell));
+ assertTrue(HELLO.startsWith(HELL));
- assertFalse(Hell.startsWith(Hello));
+ assertFalse(HELL.startsWith(HELLO));
- assertTrue(Goodbye.startsWith(Good));
+ assertTrue(GOODBYE.startsWith(GOOD));
- assertFalse(Good.startsWith(Goodbye));
+ assertFalse(GOOD.startsWith(GOODBYE));
}
public void testEndWith()
{
- assertFalse(Hell.endsWith(Hello));
+ assertFalse(HELL.endsWith(HELLO));
- assertTrue(Goodbye.endsWith(new AMQShortString("bye")));
+ assertTrue(GOODBYE.endsWith(new AMQShortString("bye")));
- assertFalse(Goodbye.endsWith(Bye));
+ assertFalse(GOODBYE.endsWith(BYE));
}
public void testEquals()
{
- assertEquals(Goodbye, new AMQShortString("Goodbye"));
+ assertEquals(GOODBYE, new AMQShortString("Goodbye"));
assertEquals(new AMQShortString("A"), new AMQShortString("A"));
assertFalse(new AMQShortString("A").equals(new AMQShortString("a")));
}
Modified: incubator/qpid/branches/M2.1/java/systests/etc/acl.config.xml
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/M2.1/java/systests/etc/acl.config.xml?rev=635602&r1=635601&r2=635602&view=diff
==============================================================================
--- incubator/qpid/branches/M2.1/java/systests/etc/acl.config.xml (original)
+++ incubator/qpid/branches/M2.1/java/systests/etc/acl.config.xml Mon Mar 10 10:16:09 2008
@@ -219,10 +219,6 @@
<timeoutFactor>2.0</timeoutFactor>
</heartbeat>
- <queue>
- <auto_register>false</auto_register>
- </queue>
-
<virtualhosts>${conf}/virtualhosts.xml</virtualhosts>
</broker>
Modified: incubator/qpid/branches/M2.1/java/systests/src/main/java/org/apache/qpid/server/security/acl/SimpleACLTest.java
URL: http://svn.apache.org/viewvc/incubator/qpid/branches/M2.1/java/systests/src/main/java/org/apache/qpid/server/security/acl/SimpleACLTest.java?rev=635602&r1=635601&r2=635602&view=diff
==============================================================================
--- incubator/qpid/branches/M2.1/java/systests/src/main/java/org/apache/qpid/server/security/acl/SimpleACLTest.java (original)
+++ incubator/qpid/branches/M2.1/java/systests/src/main/java/org/apache/qpid/server/security/acl/SimpleACLTest.java Mon Mar 10 10:16:09 2008
@@ -45,12 +45,17 @@
final String QpidExampleHome = System.getProperty("QPID_EXAMPLE_HOME");
final File defaultaclConfigFile = new File(QpidExampleHome, "etc/acl.config.xml");
- if (!defaultaclConfigFile.exists() || System.getProperty("QPID_HOME") == null)
+ if (!defaultaclConfigFile.exists())
{
System.err.println("Configuration file not found:" + defaultaclConfigFile);
fail("Configuration file not found:" + defaultaclConfigFile);
}
+ if (System.getProperty("QPID_HOME") == null)
+ {
+ fail("QPID_HOME not set");
+ }
+
ConfigurationFileApplicationRegistry config = new ConfigurationFileApplicationRegistry(defaultaclConfigFile);
ApplicationRegistry.initialise(config, 1);
@@ -175,9 +180,9 @@
conn.start();
- //Create Temporary Queue
- ((AMQSession) sesh).declareQueue((AMQDestination) sesh.createTemporaryQueue(),
- ((AMQSession) sesh).getProtocolHandler());
+ //Create Temporary Queue - can't use the createTempQueue as QueueName is null.
+ ((AMQSession) sesh).createQueue(new AMQShortString("doesnt_matter_as_autodelete_means_tmp"),
+ true, false, false);
conn.close();
}
@@ -198,8 +203,7 @@
conn.start();
//Create a Named Queue
- ((AMQSession) sesh).declareQueue((AMQDestination) sesh.createQueue("IllegalQueue"),
- ((AMQSession) sesh).getProtocolHandler());
+ ((AMQSession) sesh).createQueue(new AMQShortString("IllegalQueue"), false, false, false);
fail("Test failed as Queue creation succeded.");
}
@@ -391,8 +395,7 @@
conn.start();
//Create Temporary Queue
- ((AMQSession) sesh).declareQueue((AMQDestination) sesh.createQueue("example.RequestQueue"),
- ((AMQSession) sesh).getProtocolHandler());
+ ((AMQSession) sesh).createQueue(new AMQShortString("example.RequestQueue"), false, false, false);
conn.close();
}
@@ -402,7 +405,7 @@
}
}
- public void testServerCreateNamedQueueInValid() throws JMSException, URLSyntaxException, AMQException
+ public void testServerCreateNamedQueueInvalid() throws JMSException, URLSyntaxException, AMQException
{
try
{
@@ -413,8 +416,7 @@
conn.start();
//Create a Named Queue
- ((AMQSession) sesh).declareQueue((AMQDestination) sesh.createQueue("IllegalQueue"),
- ((AMQSession) sesh).getProtocolHandler());
+ ((AMQSession) sesh).createQueue(new AMQShortString("IllegalQueue"), false, false, false);
fail("Test failed as creation succeded.");
}
@@ -434,8 +436,8 @@
conn.start();
- ((AMQSession) sesh).declareQueue((AMQDestination) sesh.createTemporaryQueue(),
- ((AMQSession) sesh).getProtocolHandler());
+ ((AMQSession) sesh).createQueue(new AMQShortString("again_ensure_auto_delete_queue_for_temporary"),
+ true, false, false);
fail("Test failed as creation succeded.");
}