[jboss-cvs] JBoss Messaging SVN: r6144 - in trunk: src/main/org/jboss/messaging/core/management/impl and 6 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Mar 23 13:49:42 EDT 2009
Author: ataylor
Date: 2009-03-23 13:49:42 -0400 (Mon, 23 Mar 2009)
New Revision: 6144
Modified:
trunk/src/main/org/jboss/messaging/core/management/AddressControlMBean.java
trunk/src/main/org/jboss/messaging/core/management/RoleInfo.java
trunk/src/main/org/jboss/messaging/core/management/impl/AddressControl.java
trunk/src/main/org/jboss/messaging/core/management/jmx/impl/ReplicationAwareAddressControlWrapper.java
trunk/src/main/org/jboss/messaging/core/security/CheckType.java
trunk/src/main/org/jboss/messaging/core/security/Role.java
trunk/src/main/org/jboss/messaging/core/server/impl/ServerSessionImpl.java
trunk/tests/src/org/jboss/messaging/tests/integration/management/AddressControlTest.java
trunk/tests/src/org/jboss/messaging/tests/integration/management/AddressControlUsingCoreTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/core/deployers/impl/SecurityDeployerTest.java
trunk/tests/src/org/jboss/messaging/tests/unit/core/security/RoleTest.java
Log:
security fix
Modified: trunk/src/main/org/jboss/messaging/core/management/AddressControlMBean.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/management/AddressControlMBean.java 2009-03-23 16:10:07 UTC (rev 6143)
+++ trunk/src/main/org/jboss/messaging/core/management/AddressControlMBean.java 2009-03-23 17:49:42 UTC (rev 6144)
@@ -49,8 +49,8 @@
@Parameter(name = "consume", desc = "Can the user consume from this address?") boolean consume,
@Parameter(name = "createDurableQueue", desc = "Can the user create a durable queue?") boolean createDurableQueue,
@Parameter(name = "deleteDurableQueue", desc = "Can the user delete a durable queue?") boolean deleteDurableQueue,
- @Parameter(name = "createTempQueue", desc = "Can the user create a temp queue?") boolean createTempQueue,
- @Parameter(name = "deleteTempQueue", desc = "Can the user delete a temp queue?") boolean deleteTempQueue,
+ @Parameter(name = "createNonDurableQueue", desc = "Can the user create a temp queue?") boolean createNonDurableQueue,
+ @Parameter(name = "deleteNonDurableQueue", desc = "Can the user delete a temp queue?") boolean deleteNonDurableQueue,
@Parameter(name = "manage", desc = "Can the user send management messages?") boolean manage)
throws Exception;
Modified: trunk/src/main/org/jboss/messaging/core/management/RoleInfo.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/management/RoleInfo.java 2009-03-23 16:10:07 UTC (rev 6143)
+++ trunk/src/main/org/jboss/messaging/core/management/RoleInfo.java 2009-03-23 17:49:42 UTC (rev 6144)
@@ -51,13 +51,13 @@
private static final String ROLE_TABULAR_TYPE_NAME = "RoleTabularInfo";
private static final TabularType TABULAR_TYPE;
private static final String[] ITEM_NAMES = new String[] { "name", "send",
- "consume", "createDurableQueue", "deleteDurableQueue", "createTempQueue", "deleteTempQueue", "manage" };
+ "consume", "createDurableQueue", "deleteDurableQueue", "createNonDurableQueue", "deleteNonDurableQueue", "manage" };
private static final String[] ITEM_DESCRIPTIONS = new String[] {
"Name of the role", "Can the role send messages?", "Can the role consume messages?",
- "Can the role create a durable queue (needed for durable subscribers)?",
- "Can the role delete a durable queue (needed for durable subscribers)?",
- "Can the role create a temp queue?",
- "Can the role create a temp queue?",
+ "Can the role create a durable queue?",
+ "Can the role delete a durable queue?",
+ "Can the role create a non durable queue?",
+ "Can the role create a non durable queue?",
"Can the user send management messages"};
private static final OpenType[] ITEM_TYPES = new OpenType[] { STRING,
BOOLEAN, BOOLEAN, BOOLEAN, BOOLEAN, BOOLEAN, BOOLEAN, BOOLEAN };
@@ -88,9 +88,9 @@
final private boolean deleteDurableQueue;
- final private boolean createTempQueue;
+ final private boolean createNonDurableQueue;
- final private boolean deleteTempQueue;
+ final private boolean deleteNonDurableQueue;
final private boolean manage;
@@ -119,10 +119,10 @@
boolean consume = (Boolean) compositeData.get("consume");
boolean createDurableQueue = (Boolean) compositeData.get("createDurableQueue");
boolean deleteDurableQueue = (Boolean) compositeData.get("deleteDurableQueue");
- boolean createTempQueue = (Boolean) compositeData.get("createTempQueue");
- boolean deleteTempQueue = (Boolean) compositeData.get("deleteTempQueue");
+ boolean createNonDurableQueue = (Boolean) compositeData.get("createNonDurableQueue");
+ boolean deleteNonDurableQueue = (Boolean) compositeData.get("deleteNonDurableQueue");
boolean manage = (Boolean) compositeData.get("manage");
- infos.add(new RoleInfo(name, send, consume, createDurableQueue, deleteDurableQueue, createTempQueue, deleteTempQueue, manage));
+ infos.add(new RoleInfo(name, send, consume, createDurableQueue, deleteDurableQueue, createNonDurableQueue, deleteNonDurableQueue, manage));
}
return (RoleInfo[]) infos.toArray(new RoleInfo[infos.size()]);
@@ -131,15 +131,15 @@
// Constructors --------------------------------------------------
- public RoleInfo(String name, boolean send, boolean consume, boolean createDurableQueue, boolean deleteDurableQueue, boolean createTempQueue, boolean deleteTempQueue, boolean manage)
+ public RoleInfo(String name, boolean send, boolean consume, boolean createDurableQueue, boolean deleteDurableQueue, boolean createNonDurableQueue, boolean deleteNonDurableQueue, boolean manage)
{
this.name = name;
this.send = send;
this.consume = consume;
this.createDurableQueue = createDurableQueue;
this.deleteDurableQueue = deleteDurableQueue;
- this.createTempQueue = createTempQueue;
- this.deleteTempQueue = deleteTempQueue;
+ this.createNonDurableQueue = createNonDurableQueue;
+ this.deleteNonDurableQueue = deleteNonDurableQueue;
this.manage = manage;
}
@@ -170,14 +170,14 @@
return deleteDurableQueue;
}
- public boolean isCreateTempQueue()
+ public boolean isCreateNonDurableQueue()
{
- return createTempQueue;
+ return createNonDurableQueue;
}
- public boolean isDeleteTempQueue()
+ public boolean isDeleteNonDurableQueue()
{
- return deleteTempQueue;
+ return deleteNonDurableQueue;
}
public boolean isManage()
@@ -190,7 +190,7 @@
try
{
return new CompositeDataSupport(TYPE, ITEM_NAMES, new Object[] { name,
- send, consume, createDurableQueue, deleteDurableQueue, createTempQueue, deleteTempQueue, manage });
+ send, consume, createDurableQueue, deleteDurableQueue, createNonDurableQueue, deleteNonDurableQueue, manage });
} catch (OpenDataException e)
{
return null;
@@ -205,8 +205,8 @@
"write=" + consume + ";" +
"createDurableQueue=" + createDurableQueue + "}" +
"deleteDurableQueue=" + deleteDurableQueue + "}" +
- "createTempQueue=" + createTempQueue + "}" +
- "deleteTempQueue=" + deleteTempQueue + "}" +
+ "createNonDurableQueue=" + createNonDurableQueue + "}" +
+ "deleteNonDurableQueue=" + deleteNonDurableQueue + "}" +
"manage=" + manage + "}";
}
Modified: trunk/src/main/org/jboss/messaging/core/management/impl/AddressControl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/management/impl/AddressControl.java 2009-03-23 16:10:07 UTC (rev 6143)
+++ trunk/src/main/org/jboss/messaging/core/management/impl/AddressControl.java 2009-03-23 17:49:42 UTC (rev 6144)
@@ -108,8 +108,8 @@
CheckType.CONSUME.hasRole(role),
CheckType.CREATE_DURABLE_QUEUE.hasRole(role),
CheckType.DELETE_DURABLE_QUEUE.hasRole(role),
- CheckType.CREATE_TEMP_QUEUE.hasRole(role),
- CheckType.DELETE_TEMP_QUEUE.hasRole(role),
+ CheckType.CREATE_NON_DURABLE_QUEUE.hasRole(role),
+ CheckType.DELETE_NON_DURABLE_QUEUE.hasRole(role),
CheckType.MANAGE.hasRole(role));
}
return RoleInfo.toTabularData(roleInfos);
@@ -120,12 +120,12 @@
final boolean consume,
final boolean createDurableQueue,
final boolean deleteDurableQueue,
- final boolean createTempQueue,
- final boolean deleteTempQueue,
+ final boolean createNonDurableQueue,
+ final boolean deleteNonDurableQueue,
final boolean manage) throws Exception
{
Set<Role> roles = securityRepository.getMatch(address.toString());
- Role newRole = new Role(name, send, consume, createDurableQueue, deleteDurableQueue, createTempQueue, deleteTempQueue, manage);
+ Role newRole = new Role(name, send, consume, createDurableQueue, deleteDurableQueue, createNonDurableQueue, deleteNonDurableQueue, manage);
boolean added = roles.add(newRole);
if (!added)
{
Modified: trunk/src/main/org/jboss/messaging/core/management/jmx/impl/ReplicationAwareAddressControlWrapper.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/management/jmx/impl/ReplicationAwareAddressControlWrapper.java 2009-03-23 16:10:07 UTC (rev 6143)
+++ trunk/src/main/org/jboss/messaging/core/management/jmx/impl/ReplicationAwareAddressControlWrapper.java 2009-03-23 17:49:42 UTC (rev 6144)
@@ -86,11 +86,11 @@
final boolean consume,
final boolean createDurableQueue,
final boolean deleteDurableQueue,
- final boolean createTempQueue,
- final boolean deleteTempQueue,
+ final boolean createNonDurableQueue,
+ final boolean deleteNonDurableQueue,
final boolean manage) throws Exception
{
- replicationAwareInvoke("addRole", name, send, consume, createDurableQueue, deleteDurableQueue, createTempQueue, deleteTempQueue, manage);
+ replicationAwareInvoke("addRole", name, send, consume, createDurableQueue, deleteDurableQueue, createNonDurableQueue, deleteNonDurableQueue, manage);
}
// StandardMBean overrides ---------------------------------------
Modified: trunk/src/main/org/jboss/messaging/core/security/CheckType.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/security/CheckType.java 2009-03-23 16:10:07 UTC (rev 6143)
+++ trunk/src/main/org/jboss/messaging/core/security/CheckType.java 2009-03-23 17:49:42 UTC (rev 6144)
@@ -37,8 +37,8 @@
CONSUME {public boolean hasRole(final Role role) { return role.isConsume();}},
CREATE_DURABLE_QUEUE {public boolean hasRole(final Role role) { return role.isCreateDurableQueue();}},
DELETE_DURABLE_QUEUE {public boolean hasRole(final Role role) { return role.isDeleteDurableQueue();}},
- CREATE_TEMP_QUEUE {public boolean hasRole(final Role role) { return role.isCreateTempQueue();}},
- DELETE_TEMP_QUEUE {public boolean hasRole(final Role role) { return role.isDeleteTempQueue();}},
+ CREATE_NON_DURABLE_QUEUE {public boolean hasRole(final Role role) { return role.isCreateNonDurableQueue();}},
+ DELETE_NON_DURABLE_QUEUE {public boolean hasRole(final Role role) { return role.isDeleteNonDurableQueue();}},
MANAGE {public boolean hasRole(final Role role) { return role.isManage();}};
public abstract boolean hasRole(final Role role);
Modified: trunk/src/main/org/jboss/messaging/core/security/Role.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/security/Role.java 2009-03-23 16:10:07 UTC (rev 6143)
+++ trunk/src/main/org/jboss/messaging/core/security/Role.java 2009-03-23 17:49:42 UTC (rev 6144)
@@ -43,9 +43,9 @@
final private boolean deleteDurableQueue;
- final private boolean createTempQueue;
+ final private boolean createNonDurableQueue;
- final private boolean deleteTempQueue;
+ final private boolean deleteNonDurableQueue;
final private boolean manage;
@@ -54,8 +54,8 @@
final boolean consume,
final boolean createDurableQueue,
final boolean deleteDurableQueue,
- final boolean createTempQueue,
- final boolean deleteTempQueue,
+ final boolean createNonDurableQueue,
+ final boolean deleteNonDurableQueue,
boolean manage)
{
if(name == null)
@@ -67,8 +67,8 @@
this.consume = consume;
this.createDurableQueue = createDurableQueue;
this.deleteDurableQueue = deleteDurableQueue;
- this.createTempQueue = createTempQueue;
- this.deleteTempQueue = deleteTempQueue;
+ this.createNonDurableQueue = createNonDurableQueue;
+ this.deleteNonDurableQueue = deleteNonDurableQueue;
this.manage = manage;
}
@@ -99,14 +99,14 @@
return deleteDurableQueue;
}
- public boolean isCreateTempQueue()
+ public boolean isCreateNonDurableQueue()
{
- return createTempQueue;
+ return createNonDurableQueue;
}
- public boolean isDeleteTempQueue()
+ public boolean isDeleteNonDurableQueue()
{
- return deleteTempQueue;
+ return deleteNonDurableQueue;
}
public String toString()
@@ -116,8 +116,8 @@
"write=" + consume + ";" +
"createDurableQueue=" + createDurableQueue + "}" +
"deleteDurableQueue=" + deleteDurableQueue + "}" +
- "createTempQueue=" + createTempQueue + "}" +
- "deleteTempQueue=" + deleteTempQueue + "}";
+ "createNonDurableQueue=" + createNonDurableQueue + "}" +
+ "deleteNonDurableQueue=" + deleteNonDurableQueue + "}";
}
public boolean equals(Object o)
@@ -141,7 +141,7 @@
{
return false;
}
- if (createTempQueue != role.createTempQueue)
+ if (createNonDurableQueue != role.createNonDurableQueue)
{
return false;
}
@@ -149,7 +149,7 @@
{
return false;
}
- if (deleteTempQueue != role.deleteTempQueue)
+ if (deleteNonDurableQueue != role.deleteNonDurableQueue)
{
return false;
}
@@ -173,8 +173,8 @@
result = 31 * result + (consume ? 1 : 0);
result = 31 * result + (createDurableQueue ? 1 : 0);
result = 31 * result + (deleteDurableQueue ? 1 : 0);
- result = 31 * result + (createTempQueue ? 1 : 0);
- result = 31 * result + (deleteTempQueue ? 1 : 0);
+ result = 31 * result + (createNonDurableQueue ? 1 : 0);
+ result = 31 * result + (deleteNonDurableQueue ? 1 : 0);
return result;
}
Modified: trunk/src/main/org/jboss/messaging/core/server/impl/ServerSessionImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/server/impl/ServerSessionImpl.java 2009-03-23 16:10:07 UTC (rev 6143)
+++ trunk/src/main/org/jboss/messaging/core/server/impl/ServerSessionImpl.java 2009-03-23 17:49:42 UTC (rev 6144)
@@ -1302,17 +1302,15 @@
try
{
- if (temporary)
- {
- // make sure the user has privileges to create this queue
- securityStore.check(address, CheckType.CREATE_TEMP_QUEUE, this);
- }
if (durable)
{
// make sure the user has privileges to create this queue
securityStore.check(address, CheckType.CREATE_DURABLE_QUEUE, this);
}
-
+ else
+ {
+ securityStore.check(address, CheckType.CREATE_NON_DURABLE_QUEUE, this);
+ }
Binding binding = postOffice.getBinding(name);
if (binding != null)
@@ -1411,10 +1409,9 @@
// make sure the user has privileges to delete this queue
securityStore.check(binding.getAddress(), CheckType.DELETE_DURABLE_QUEUE, this);
}
- if (queue.isTemporary())
+ else
{
- // make sure the user has privileges to delete this queue
- securityStore.check(binding.getAddress(), CheckType.DELETE_TEMP_QUEUE, this);
+ securityStore.check(binding.getAddress(), CheckType.DELETE_NON_DURABLE_QUEUE, this);
}
queue.deleteAllReferences();
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/management/AddressControlTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/management/AddressControlTest.java 2009-03-23 16:10:07 UTC (rev 6143)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/management/AddressControlTest.java 2009-03-23 17:49:42 UTC (rev 6144)
@@ -130,9 +130,9 @@
assertEquals(role.getName(), roleInfos[0].getName());
assertEquals(CheckType.CONSUME.hasRole(role), roleInfos[0].isConsume());
assertEquals(CheckType.CREATE_DURABLE_QUEUE.hasRole(role), roleInfos[0].isCreateDurableQueue());
- assertEquals(CheckType.CREATE_TEMP_QUEUE.hasRole(role), roleInfos[0].isCreateTempQueue());
+ assertEquals(CheckType.CREATE_NON_DURABLE_QUEUE.hasRole(role), roleInfos[0].isCreateNonDurableQueue());
assertEquals(CheckType.DELETE_DURABLE_QUEUE.hasRole(role), roleInfos[0].isDeleteDurableQueue());
- assertEquals(CheckType.DELETE_TEMP_QUEUE.hasRole(role), roleInfos[0].isDeleteTempQueue());
+ assertEquals(CheckType.DELETE_NON_DURABLE_QUEUE.hasRole(role), roleInfos[0].isDeleteNonDurableQueue());
assertEquals(CheckType.MANAGE.hasRole(role), roleInfos[0].isManage());
assertEquals(CheckType.SEND.hasRole(role), roleInfos[0].isSend());
@@ -156,8 +156,8 @@
CheckType.CONSUME.hasRole(role),
CheckType.CREATE_DURABLE_QUEUE.hasRole(role),
CheckType.DELETE_DURABLE_QUEUE.hasRole(role),
- CheckType.CREATE_TEMP_QUEUE.hasRole(role),
- CheckType.DELETE_TEMP_QUEUE.hasRole(role),
+ CheckType.CREATE_NON_DURABLE_QUEUE.hasRole(role),
+ CheckType.DELETE_NON_DURABLE_QUEUE.hasRole(role),
CheckType.MANAGE.hasRole(role));
tabularData = addressControl.getRoles();
@@ -166,9 +166,9 @@
assertEquals(role.getName(), roleInfos[0].getName());
assertEquals(CheckType.CONSUME.hasRole(role), roleInfos[0].isConsume());
assertEquals(CheckType.CREATE_DURABLE_QUEUE.hasRole(role), roleInfos[0].isCreateDurableQueue());
- assertEquals(CheckType.CREATE_TEMP_QUEUE.hasRole(role), roleInfos[0].isCreateTempQueue());
+ assertEquals(CheckType.CREATE_NON_DURABLE_QUEUE.hasRole(role), roleInfos[0].isCreateNonDurableQueue());
assertEquals(CheckType.DELETE_DURABLE_QUEUE.hasRole(role), roleInfos[0].isDeleteDurableQueue());
- assertEquals(CheckType.DELETE_TEMP_QUEUE.hasRole(role), roleInfos[0].isDeleteTempQueue());
+ assertEquals(CheckType.DELETE_NON_DURABLE_QUEUE.hasRole(role), roleInfos[0].isDeleteNonDurableQueue());
assertEquals(CheckType.MANAGE.hasRole(role), roleInfos[0].isManage());
assertEquals(CheckType.SEND.hasRole(role), roleInfos[0].isSend());
@@ -193,8 +193,8 @@
CheckType.CONSUME.hasRole(role),
CheckType.CREATE_DURABLE_QUEUE.hasRole(role),
CheckType.DELETE_DURABLE_QUEUE.hasRole(role),
- CheckType.CREATE_TEMP_QUEUE.hasRole(role),
- CheckType.DELETE_TEMP_QUEUE.hasRole(role),
+ CheckType.CREATE_NON_DURABLE_QUEUE.hasRole(role),
+ CheckType.DELETE_NON_DURABLE_QUEUE.hasRole(role),
CheckType.MANAGE.hasRole(role));
tabularData = addressControl.getRoles();
@@ -207,8 +207,8 @@
CheckType.CONSUME.hasRole(role),
CheckType.CREATE_DURABLE_QUEUE.hasRole(role),
CheckType.DELETE_DURABLE_QUEUE.hasRole(role),
- CheckType.CREATE_TEMP_QUEUE.hasRole(role),
- CheckType.DELETE_TEMP_QUEUE.hasRole(role),
+ CheckType.CREATE_NON_DURABLE_QUEUE.hasRole(role),
+ CheckType.DELETE_NON_DURABLE_QUEUE.hasRole(role),
CheckType.MANAGE.hasRole(role));
fail("can not add a role which already exists");
}
Modified: trunk/tests/src/org/jboss/messaging/tests/integration/management/AddressControlUsingCoreTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/management/AddressControlUsingCoreTest.java 2009-03-23 16:10:07 UTC (rev 6143)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/management/AddressControlUsingCoreTest.java 2009-03-23 17:49:42 UTC (rev 6144)
@@ -59,9 +59,9 @@
ObjectNames.getAddressObjectName(address));
@Operation(desc = "Add a Role to this address")
- public void addRole(@Parameter(name = "name", desc = "Name of the role to add")String name, @Parameter(name = "send", desc = "Can the user send to an address?")boolean send, @Parameter(name = "consume", desc = "Can the user consume from this address?")boolean consume, @Parameter(name = "createDurableQueue", desc = "Can the user create a durable queue?")boolean createDurableQueue, @Parameter(name = "deleteDurableQueue", desc = "Can the user delete a durable queue?")boolean deleteDurableQueue, @Parameter(name = "createTempQueue", desc = "Can the user create a temp queue?")boolean createTempQueue, @Parameter(name = "deleteTempQueue", desc = "Can the user delete a temp queue?")boolean deleteTempQueue, @Parameter(name = "manage", desc = "Can the user send management messages?")boolean manage) throws Exception
+ public void addRole(@Parameter(name = "name", desc = "Name of the role to add")String name, @Parameter(name = "send", desc = "Can the user send to an address?")boolean send, @Parameter(name = "consume", desc = "Can the user consume from this address?")boolean consume, @Parameter(name = "createDurableQueue", desc = "Can the user create a durable queue?")boolean createDurableQueue, @Parameter(name = "deleteDurableQueue", desc = "Can the user delete a durable queue?")boolean deleteDurableQueue, @Parameter(name = "createNonDurableQueue", desc = "Can the user create a temp queue?")boolean createNonDurableQueue, @Parameter(name = "deleteNonDurableQueue", desc = "Can the user delete a temp queue?")boolean deleteNonDurableQueue, @Parameter(name = "manage", desc = "Can the user send management messages?")boolean manage) throws Exception
{
- proxy.invokeOperation("addRole", name, send, consume, createDurableQueue, deleteDurableQueue, createTempQueue, deleteTempQueue, manage);
+ proxy.invokeOperation("addRole", name, send, consume, createDurableQueue, deleteDurableQueue, createNonDurableQueue, deleteNonDurableQueue, manage);
}
public String getAddress()
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/deployers/impl/SecurityDeployerTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/deployers/impl/SecurityDeployerTest.java 2009-03-23 16:10:07 UTC (rev 6143)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/deployers/impl/SecurityDeployerTest.java 2009-03-23 17:49:42 UTC (rev 6144)
@@ -83,9 +83,9 @@
{
assertTrue(role.isConsume());
assertFalse(role.isCreateDurableQueue());
- assertFalse(role.isCreateTempQueue());
+ assertFalse(role.isCreateNonDurableQueue());
assertFalse(role.isDeleteDurableQueue());
- assertFalse(role.isDeleteTempQueue());
+ assertFalse(role.isDeleteNonDurableQueue());
assertTrue(role.isManage());
assertTrue(role.isSend());
}
@@ -93,9 +93,9 @@
{
assertTrue(role.isConsume());
assertFalse(role.isCreateDurableQueue());
- assertFalse(role.isCreateTempQueue());
+ assertFalse(role.isCreateNonDurableQueue());
assertFalse(role.isDeleteDurableQueue());
- assertFalse(role.isDeleteTempQueue());
+ assertFalse(role.isDeleteNonDurableQueue());
assertTrue(role.isManage());
assertTrue(role.isSend());
}
@@ -103,9 +103,9 @@
{
assertTrue(role.isConsume());
assertTrue(role.isCreateDurableQueue());
- assertFalse(role.isCreateTempQueue());
+ assertFalse(role.isCreateNonDurableQueue());
assertTrue(role.isDeleteDurableQueue());
- assertFalse(role.isDeleteTempQueue());
+ assertFalse(role.isDeleteNonDurableQueue());
assertTrue(role.isManage());
assertTrue(role.isSend());
}
@@ -129,9 +129,9 @@
{
assertTrue(role.isConsume());
assertFalse(role.isCreateDurableQueue());
- assertFalse(role.isCreateTempQueue());
+ assertFalse(role.isCreateNonDurableQueue());
assertFalse(role.isDeleteDurableQueue());
- assertFalse(role.isDeleteTempQueue());
+ assertFalse(role.isDeleteNonDurableQueue());
assertTrue(role.isManage());
assertTrue(role.isSend());
}
@@ -139,9 +139,9 @@
{
assertTrue(role.isConsume());
assertFalse(role.isCreateDurableQueue());
- assertFalse(role.isCreateTempQueue());
+ assertFalse(role.isCreateNonDurableQueue());
assertFalse(role.isDeleteDurableQueue());
- assertFalse(role.isDeleteTempQueue());
+ assertFalse(role.isDeleteNonDurableQueue());
assertTrue(role.isManage());
assertTrue(role.isSend());
}
@@ -149,9 +149,9 @@
{
assertTrue(role.isConsume());
assertTrue(role.isCreateDurableQueue());
- assertFalse(role.isCreateTempQueue());
+ assertFalse(role.isCreateNonDurableQueue());
assertTrue(role.isDeleteDurableQueue());
- assertFalse(role.isDeleteTempQueue());
+ assertFalse(role.isDeleteNonDurableQueue());
assertTrue(role.isManage());
assertTrue(role.isSend());
}
@@ -169,9 +169,9 @@
{
assertTrue(role.isConsume());
assertFalse(role.isCreateDurableQueue());
- assertFalse(role.isCreateTempQueue());
+ assertFalse(role.isCreateNonDurableQueue());
assertFalse(role.isDeleteDurableQueue());
- assertFalse(role.isDeleteTempQueue());
+ assertFalse(role.isDeleteNonDurableQueue());
assertFalse(role.isManage());
assertTrue(role.isSend());
}
@@ -179,9 +179,9 @@
{
assertTrue(role.isConsume());
assertFalse(role.isCreateDurableQueue());
- assertFalse(role.isCreateTempQueue());
+ assertFalse(role.isCreateNonDurableQueue());
assertFalse(role.isDeleteDurableQueue());
- assertFalse(role.isDeleteTempQueue());
+ assertFalse(role.isDeleteNonDurableQueue());
assertFalse(role.isManage());
assertTrue(role.isSend());
}
@@ -189,9 +189,9 @@
{
assertTrue(role.isConsume());
assertFalse(role.isCreateDurableQueue());
- assertTrue(role.isCreateTempQueue());
+ assertTrue(role.isCreateNonDurableQueue());
assertFalse(role.isDeleteDurableQueue());
- assertTrue(role.isDeleteTempQueue());
+ assertTrue(role.isDeleteNonDurableQueue());
assertFalse(role.isManage());
assertTrue(role.isSend());
}
Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/security/RoleTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/security/RoleTest.java 2009-03-23 16:10:07 UTC (rev 6143)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/security/RoleTest.java 2009-03-23 17:49:42 UTC (rev 6144)
@@ -24,9 +24,9 @@
import static org.jboss.messaging.core.security.CheckType.CONSUME;
import static org.jboss.messaging.core.security.CheckType.CREATE_DURABLE_QUEUE;
-import static org.jboss.messaging.core.security.CheckType.CREATE_TEMP_QUEUE;
+import static org.jboss.messaging.core.security.CheckType.CREATE_NON_DURABLE_QUEUE;
import static org.jboss.messaging.core.security.CheckType.DELETE_DURABLE_QUEUE;
-import static org.jboss.messaging.core.security.CheckType.DELETE_TEMP_QUEUE;
+import static org.jboss.messaging.core.security.CheckType.DELETE_NON_DURABLE_QUEUE;
import static org.jboss.messaging.core.security.CheckType.SEND;
import org.jboss.messaging.core.security.Role;
import org.jboss.messaging.tests.util.UnitTestCase;
@@ -56,9 +56,9 @@
assertTrue(SEND.hasRole(role));
assertFalse(CONSUME.hasRole(role));
assertFalse(CREATE_DURABLE_QUEUE.hasRole(role));
- assertFalse(CREATE_TEMP_QUEUE.hasRole(role));
+ assertFalse(CREATE_NON_DURABLE_QUEUE.hasRole(role));
assertFalse(DELETE_DURABLE_QUEUE.hasRole(role));
- assertFalse(DELETE_TEMP_QUEUE.hasRole(role));
+ assertFalse(DELETE_NON_DURABLE_QUEUE.hasRole(role));
}
public void testWriteRole() throws Exception
@@ -67,9 +67,9 @@
assertFalse(SEND.hasRole(role));
assertTrue(CONSUME.hasRole(role));
assertFalse(CREATE_DURABLE_QUEUE.hasRole(role));
- assertFalse(CREATE_TEMP_QUEUE.hasRole(role));
+ assertFalse(CREATE_NON_DURABLE_QUEUE.hasRole(role));
assertFalse(DELETE_DURABLE_QUEUE.hasRole(role));
- assertFalse(DELETE_TEMP_QUEUE.hasRole(role));
+ assertFalse(DELETE_NON_DURABLE_QUEUE.hasRole(role));
}
public void testCreateRole() throws Exception
@@ -78,9 +78,9 @@
assertFalse(SEND.hasRole(role));
assertFalse(CONSUME.hasRole(role));
assertTrue(CREATE_DURABLE_QUEUE.hasRole(role));
- assertFalse(CREATE_TEMP_QUEUE.hasRole(role));
+ assertFalse(CREATE_NON_DURABLE_QUEUE.hasRole(role));
assertFalse(DELETE_DURABLE_QUEUE.hasRole(role));
- assertFalse(DELETE_TEMP_QUEUE.hasRole(role));
+ assertFalse(DELETE_NON_DURABLE_QUEUE.hasRole(role));
}
public void testEqualsAndHashcode() throws Exception
More information about the jboss-cvs-commits
mailing list