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 2010/06/04 11:39:47 UTC
svn commit: r951341 - in /qpid/trunk/qpid/java/broker-plugins:
access-control/
access-control/src/test/java/org/apache/qpid/server/security/access/plugins/
simple-xml/ simple-xml/src/test/java/org/apache/qpid/server/security/access/
Author: ritchiem
Date: Fri Jun 4 09:39:47 2010
New Revision: 951341
URL: http://svn.apache.org/viewvc?rev=951341&view=rev
Log:
QPID-2632 : Applied patch from Andrew Kennedy. To convert RST and PPT to QTCs not IBBCs
Modified:
qpid/trunk/qpid/java/broker-plugins/access-control/build.xml
qpid/trunk/qpid/java/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/plugins/RuleSetTest.java
qpid/trunk/qpid/java/broker-plugins/simple-xml/build.xml
qpid/trunk/qpid/java/broker-plugins/simple-xml/src/test/java/org/apache/qpid/server/security/access/PrincipalPermissionsTest.java
Modified: qpid/trunk/qpid/java/broker-plugins/access-control/build.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/access-control/build.xml?rev=951341&r1=951340&r2=951341&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/access-control/build.xml (original)
+++ qpid/trunk/qpid/java/broker-plugins/access-control/build.xml Fri Jun 4 09:39:47 2010
@@ -18,7 +18,7 @@
-->
<project name="Qpid Broker-Plugins Access Control" default="build">
<property name="module.depends" value="common broker broker-plugins" />
- <property name="module.test.depends" value="test common/test broker/test management/common" />
+ <property name="module.test.depends" value="test common/test broker/test management/common systests" />
<property name="module.manifest" value="MANIFEST.MF" />
<property name="module.plugin" value="true" />
Modified: qpid/trunk/qpid/java/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/plugins/RuleSetTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/plugins/RuleSetTest.java?rev=951341&r1=951340&r2=951341&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/plugins/RuleSetTest.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/access-control/src/test/java/org/apache/qpid/server/security/access/plugins/RuleSetTest.java Fri Jun 4 09:39:47 2010
@@ -21,7 +21,6 @@
package org.apache.qpid.server.security.access.plugins;
-
import org.apache.qpid.framing.AMQShortString;
import org.apache.qpid.server.security.Result;
import org.apache.qpid.server.security.access.ObjectProperties;
@@ -29,7 +28,7 @@ import org.apache.qpid.server.security.a
import org.apache.qpid.server.security.access.Operation;
import org.apache.qpid.server.security.access.Permission;
import org.apache.qpid.server.security.access.config.RuleSet;
-import org.apache.qpid.server.util.InternalBrokerBaseCase;
+import org.apache.qpid.test.utils.QpidTestCase;
/**
* This test checks that the {@link RuleSet} object which forms the core of the access control plugin performs correctly.
@@ -39,7 +38,7 @@ import org.apache.qpid.server.util.Inter
* access control mechanism is validated by checking whether operations would be authorised by calling the
* {@link RuleSet#check(String, Operation, ObjectType, ObjectProperties)} method.
*/
-public class RuleSetTest extends InternalBrokerBaseCase
+public class RuleSetTest extends QpidTestCase
{
private RuleSet _ruleSet;
@@ -52,6 +51,7 @@ public class RuleSetTest extends Interna
public void setUp() throws Exception
{
super.setUp();
+
_ruleSet = new RuleSet();
_ruleSet.configure(RuleSet.TRANSITIVE, Boolean.FALSE);
}
Modified: qpid/trunk/qpid/java/broker-plugins/simple-xml/build.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/simple-xml/build.xml?rev=951341&r1=951340&r2=951341&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/simple-xml/build.xml (original)
+++ qpid/trunk/qpid/java/broker-plugins/simple-xml/build.xml Fri Jun 4 09:39:47 2010
@@ -18,7 +18,7 @@
-->
<project name="Qpid Broker-Plugins Simple XML" default="build">
<property name="module.depends" value="common broker broker-plugins" />
- <property name="module.test.depends" value="test broker/test common/test management/common" />
+ <property name="module.test.depends" value="test broker/test common/test management/common systests" />
<property name="module.manifest" value="MANIFEST.MF" />
<property name="module.plugin" value="true" />
Modified: qpid/trunk/qpid/java/broker-plugins/simple-xml/src/test/java/org/apache/qpid/server/security/access/PrincipalPermissionsTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/simple-xml/src/test/java/org/apache/qpid/server/security/access/PrincipalPermissionsTest.java?rev=951341&r1=951340&r2=951341&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/simple-xml/src/test/java/org/apache/qpid/server/security/access/PrincipalPermissionsTest.java (original)
+++ qpid/trunk/qpid/java/broker-plugins/simple-xml/src/test/java/org/apache/qpid/server/security/access/PrincipalPermissionsTest.java Fri Jun 4 09:39:47 2010
@@ -18,24 +18,16 @@
* under the License.
*
*/
-
package org.apache.qpid.server.security.access;
-import junit.framework.TestCase;
-
import org.apache.qpid.AMQException;
import org.apache.qpid.framing.AMQShortString;
-import org.apache.qpid.framing.FieldTable;
-import org.apache.qpid.server.exchange.DirectExchange;
-import org.apache.qpid.server.queue.AMQQueueFactory;
-import org.apache.qpid.server.registry.ApplicationRegistry;
import org.apache.qpid.server.security.Result;
import org.apache.qpid.server.security.access.config.PrincipalPermissions;
import org.apache.qpid.server.security.access.config.PrincipalPermissions.Permission;
-import org.apache.qpid.server.virtualhost.VirtualHost;
-import org.apache.qpid.server.util.InternalBrokerBaseCase;
+import org.apache.qpid.test.utils.QpidTestCase;
-public class PrincipalPermissionsTest extends InternalBrokerBaseCase
+public class PrincipalPermissionsTest extends QpidTestCase
{
private String _user = "user";
private PrincipalPermissions _perms;
@@ -120,10 +112,8 @@ public class PrincipalPermissionsTest ex
public void testPublish() throws AMQException
{
- DirectExchange exchange = DirectExchange.TYPE.newInstance(_virtualHost, _exchangeName, false, 1, _autoDelete);
-
String[] authArgs = new String[]{_exchangeName.asString(), _routingKey.asString()};
- Object[] grantArgs = new Object[]{exchange.getNameShortString(), _routingKey};
+ Object[] grantArgs = new Object[]{_exchangeName, _routingKey};
assertEquals(Result.DENIED, _perms.authorise(Permission.PUBLISH, authArgs));
_perms.grant(Permission.PUBLISH, grantArgs);
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org