epugh 2004/11/01 07:38:49
Modified: security/memory/src/test/org/apache/fulcrum/security/memory/dynamic
MemoryDynamicModelManagerTest.java
MemoryRoleManagerTest.java
MemoryPermissionManagerTest.java
MemoryUserManagerTest.java
MemoryGroupManagerTest.java
security/memory/src/test/org/apache/fulcrum/security/memory/basic
MemoryUserManagerTest.java
MemoryBasicModelManagerTest.java
MemoryGroupManagerTest.java
security/memory/src/test BasicMemoryRoleConfig.xml
security/memory/src/test/org/apache/fulcrum/security/memory/turbine
MemoryTurbineModelManagerTest.java
Log:
Missed some update config files while committing
Revision Changes Path
1.3 +3 -3
jakarta-turbine-fulcrum/security/memory/src/test/org/apache/fulcrum/security/memory/dynamic/MemoryDynamicModelManagerTest.java
Index: MemoryDynamicModelManagerTest.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-fulcrum/security/memory/src/test/org/apache/fulcrum/security/memory/dynamic/MemoryDynamicModelManagerTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- MemoryDynamicModelManagerTest.java 7 Jul 2004 16:51:26 -0000 1.2
+++ MemoryDynamicModelManagerTest.java 1 Nov 2004 15:38:48 -0000 1.3
@@ -35,8 +35,8 @@
{
try
{
- this.setRoleFileName(null);
- this.setConfigurationFileName("src/test/DynamicMemory.xml");
+ this.setRoleFileName("src/test/DynamicMemoryRoleConfig.xml");
+
this.setConfigurationFileName("src/test/DynamicMemoryComponentConfig.xml");
securityService = (SecurityService)
lookup(SecurityService.ROLE);
super.setUp();
1.3 +3 -6
jakarta-turbine-fulcrum/security/memory/src/test/org/apache/fulcrum/security/memory/dynamic/MemoryRoleManagerTest.java
Index: MemoryRoleManagerTest.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-fulcrum/security/memory/src/test/org/apache/fulcrum/security/memory/dynamic/MemoryRoleManagerTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- MemoryRoleManagerTest.java 7 Jul 2004 16:51:26 -0000 1.2
+++ MemoryRoleManagerTest.java 1 Nov 2004 15:38:48 -0000 1.3
@@ -25,16 +25,13 @@
*/
public class MemoryRoleManagerTest extends AbstractRoleManagerTest
{
- public static void main(String[] args)
- {
- junit.textui.TestRunner.run(MemoryRoleManagerTest.class);
- }
+
public void setUp()
{
try
{
- this.setRoleFileName(null);
- this.setConfigurationFileName("src/test/DynamicMemory.xml");
+ this.setRoleFileName("src/test/DynamicMemoryRoleConfig.xml");
+
this.setConfigurationFileName("src/test/DynamicMemoryComponentConfig.xml");
securityService = (SecurityService)
lookup(SecurityService.ROLE);
roleManager = (RoleManager) securityService.getRoleManager();
}
1.4 +4 -8
jakarta-turbine-fulcrum/security/memory/src/test/org/apache/fulcrum/security/memory/dynamic/MemoryPermissionManagerTest.java
Index: MemoryPermissionManagerTest.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-fulcrum/security/memory/src/test/org/apache/fulcrum/security/memory/dynamic/MemoryPermissionManagerTest.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- MemoryPermissionManagerTest.java 7 Jul 2004 16:51:26 -0000 1.3
+++ MemoryPermissionManagerTest.java 1 Nov 2004 15:38:48 -0000 1.4
@@ -23,17 +23,13 @@
*/
public class MemoryPermissionManagerTest extends AbstractPermissionManagerTest
{
- public static void main(String[] args)
- {
- junit.textui.TestRunner.run(MemoryPermissionManagerTest.class);
- }
+
public void setUp()
- {
-
+ {
try
{
- this.setRoleFileName(null);
- this.setConfigurationFileName("src/test/DynamicMemory.xml");
+ this.setRoleFileName("src/test/DynamicMemoryRoleConfig.xml");
+
this.setConfigurationFileName("src/test/DynamicMemoryComponentConfig.xml");
securityService = (SecurityService) lookup(SecurityService.ROLE);
permissionManager = securityService.getPermissionManager();
}
1.3 +3 -6
jakarta-turbine-fulcrum/security/memory/src/test/org/apache/fulcrum/security/memory/dynamic/MemoryUserManagerTest.java
Index: MemoryUserManagerTest.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-fulcrum/security/memory/src/test/org/apache/fulcrum/security/memory/dynamic/MemoryUserManagerTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- MemoryUserManagerTest.java 7 Jul 2004 16:51:26 -0000 1.2
+++ MemoryUserManagerTest.java 1 Nov 2004 15:38:48 -0000 1.3
@@ -24,16 +24,13 @@
*/
public class MemoryUserManagerTest extends AbstractUserManagerTest
{
- public static void main(String[] args)
- {
- junit.textui.TestRunner.run(MemoryUserManagerTest.class);
- }
+
public void setUp()
{
try
{
- this.setRoleFileName(null);
- this.setConfigurationFileName("src/test/DynamicMemory.xml");
+ this.setRoleFileName("src/test/DynamicMemoryRoleConfig.xml");
+
this.setConfigurationFileName("src/test/DynamicMemoryComponentConfig.xml");
securityService = (SecurityService)
lookup(SecurityService.ROLE);
userManager = securityService.getUserManager();
}
1.3 +2 -2
jakarta-turbine-fulcrum/security/memory/src/test/org/apache/fulcrum/security/memory/dynamic/MemoryGroupManagerTest.java
Index: MemoryGroupManagerTest.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-fulcrum/security/memory/src/test/org/apache/fulcrum/security/memory/dynamic/MemoryGroupManagerTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- MemoryGroupManagerTest.java 7 Jul 2004 16:51:26 -0000 1.2
+++ MemoryGroupManagerTest.java 1 Nov 2004 15:38:48 -0000 1.3
@@ -32,8 +32,8 @@
{
try
{
- this.setRoleFileName(null);
- this.setConfigurationFileName("src/test/DynamicMemory.xml");
+ this.setRoleFileName("src/test/DynamicMemoryRoleConfig.xml");
+
this.setConfigurationFileName("src/test/DynamicMemoryComponentConfig.xml");
securityService = (SecurityService) lookup(SecurityService.ROLE);
groupManager = securityService.getGroupManager();
}
1.3 +3 -6
jakarta-turbine-fulcrum/security/memory/src/test/org/apache/fulcrum/security/memory/basic/MemoryUserManagerTest.java
Index: MemoryUserManagerTest.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-fulcrum/security/memory/src/test/org/apache/fulcrum/security/memory/basic/MemoryUserManagerTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- MemoryUserManagerTest.java 7 Jul 2004 16:51:26 -0000 1.2
+++ MemoryUserManagerTest.java 1 Nov 2004 15:38:49 -0000 1.3
@@ -24,16 +24,13 @@
*/
public class MemoryUserManagerTest extends AbstractUserManagerTest
{
- public static void main(String[] args)
- {
- junit.textui.TestRunner.run(MemoryUserManagerTest.class);
- }
+
public void setUp()
{
try
{
- this.setRoleFileName(null);
- this.setConfigurationFileName("src/test/BasicMemory.xml");
+ this.setRoleFileName("src/test/BasicMemoryRoleConfig.xml");
+
this.setConfigurationFileName("src/test/BasicMemoryComponentConfig.xml");
securityService = (SecurityService)
lookup(SecurityService.ROLE);
userManager = securityService.getUserManager();
}
1.3 +3 -3
jakarta-turbine-fulcrum/security/memory/src/test/org/apache/fulcrum/security/memory/basic/MemoryBasicModelManagerTest.java
Index: MemoryBasicModelManagerTest.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-fulcrum/security/memory/src/test/org/apache/fulcrum/security/memory/basic/MemoryBasicModelManagerTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- MemoryBasicModelManagerTest.java 7 Jul 2004 16:51:26 -0000 1.2
+++ MemoryBasicModelManagerTest.java 1 Nov 2004 15:38:49 -0000 1.3
@@ -37,8 +37,8 @@
{
try
{
- this.setRoleFileName(null);
- this.setConfigurationFileName("src/test/BasicMemory.xml");
+ this.setRoleFileName("src/test/BasicMemoryRoleConfig.xml");
+
this.setConfigurationFileName("src/test/BasicMemoryComponentConfig.xml");
securityService = (SecurityService)
lookup(SecurityService.ROLE);
super.setUp();
1.3 +2 -2
jakarta-turbine-fulcrum/security/memory/src/test/org/apache/fulcrum/security/memory/basic/MemoryGroupManagerTest.java
Index: MemoryGroupManagerTest.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-fulcrum/security/memory/src/test/org/apache/fulcrum/security/memory/basic/MemoryGroupManagerTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- MemoryGroupManagerTest.java 7 Jul 2004 16:51:26 -0000 1.2
+++ MemoryGroupManagerTest.java 1 Nov 2004 15:38:49 -0000 1.3
@@ -32,8 +32,8 @@
{
try
{
- this.setRoleFileName(null);
- this.setConfigurationFileName("src/test/BasicMemory.xml");
+ this.setRoleFileName("src/test/BasicMemoryRoleConfig.xml");
+
this.setConfigurationFileName("src/test/BasicMemoryComponentConfig.xml");
securityService = (SecurityService) lookup(SecurityService.ROLE);
groupManager = securityService.getGroupManager();
}
1.2 +1 -1
jakarta-turbine-fulcrum/security/memory/src/test/BasicMemoryRoleConfig.xml
Index: BasicMemoryRoleConfig.xml
===================================================================
RCS file:
/home/cvs/jakarta-turbine-fulcrum/security/memory/src/test/BasicMemoryRoleConfig.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- BasicMemoryRoleConfig.xml 1 Nov 2004 13:29:21 -0000 1.1
+++ BasicMemoryRoleConfig.xml 1 Nov 2004 15:38:49 -0000 1.2
@@ -24,6 +24,6 @@
<role
name="org.apache.fulcrum.security.model.ACLFactory"
shorthand="aclFactory"
-
default-class="org.apache.fulcrum.security.model.dynamic.DynamicACLFactory"/>
+ default-class="org.apache.fulcrum.security.model.basic.BasicACLFactory"/>
</role-list>
1.4 +2 -2
jakarta-turbine-fulcrum/security/memory/src/test/org/apache/fulcrum/security/memory/turbine/MemoryTurbineModelManagerTest.java
Index: MemoryTurbineModelManagerTest.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-fulcrum/security/memory/src/test/org/apache/fulcrum/security/memory/turbine/MemoryTurbineModelManagerTest.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- MemoryTurbineModelManagerTest.java 7 Jul 2004 18:19:06 -0000 1.3
+++ MemoryTurbineModelManagerTest.java 1 Nov 2004 15:38:49 -0000 1.4
@@ -37,8 +37,8 @@
public void setUp() throws Exception
{
- this.setRoleFileName(null);
- this.setConfigurationFileName("src/test/TurbineMemory.xml");
+ this.setRoleFileName("src/test/TurbineMemoryRoleConfig.xml");
+ this.setConfigurationFileName("src/test/TurbineMemoryComponentConfig.xml");
securityService = (SecurityService) lookup(SecurityService.ROLE);
super.setUp();
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
