You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jetspeed-dev@portals.apache.org by at...@apache.org on 2008/09/12 04:19:54 UTC
svn commit: r694583 - in
/portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-security/src:
main/java/org/apache/jetspeed/security/util/test/
test/java/org/apache/jetspeed/security/
test/java/org/apache/jetspeed/security/spi/
Author: ate
Date: Thu Sep 11 19:19:53 2008
New Revision: 694583
URL: http://svn.apache.org/viewvc?rev=694583&view=rev
Log:
Some still very much broken test classes which we're touched by the JetspeedPermission factory refactoring
Modified:
portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/util/test/AbstractSecurityTestcase.java
portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-security/src/test/java/org/apache/jetspeed/security/TestPermissionManager.java
portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-security/src/test/java/org/apache/jetspeed/security/TestRdbmsPolicy.java
portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-security/src/test/java/org/apache/jetspeed/security/TestRdbmsPolicyFolder.java
portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-security/src/test/java/org/apache/jetspeed/security/spi/TestRoleSecurityHandler.java
Modified: portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/util/test/AbstractSecurityTestcase.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/util/test/AbstractSecurityTestcase.java?rev=694583&r1=694582&r2=694583&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/util/test/AbstractSecurityTestcase.java (original)
+++ portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-security/src/main/java/org/apache/jetspeed/security/util/test/AbstractSecurityTestcase.java Thu Sep 11 19:19:53 2008
@@ -31,7 +31,7 @@
import org.apache.jetspeed.security.AuthenticationProviderProxy;
import org.apache.jetspeed.security.Group;
import org.apache.jetspeed.security.GroupManager;
-import org.apache.jetspeed.security.PermissionManager;
+import org.apache.jetspeed.security.JetspeedPermissionManager;
import org.apache.jetspeed.security.Role;
import org.apache.jetspeed.security.RoleManager;
import org.apache.jetspeed.security.SecurityProvider;
@@ -85,7 +85,7 @@
protected RoleManager rms;
/** The permission manager. */
- protected PermissionManager pms;
+ protected JetspeedPermissionManager pms;
protected SecurityAttributesProvider sap;
@@ -121,7 +121,7 @@
rms = (RoleManager) scm.getComponent("org.apache.jetspeed.security.RoleManager");
// Authorization.
- pms = (PermissionManager) scm.getComponent("org.apache.jetspeed.security.PermissionManager");
+ pms = (JetspeedPermissionManager) scm.getComponent("org.apache.jetspeed.security.JetspeedPermissionManager");
sap = (SecurityAttributesProvider) scm.getComponent("org.apache.jetspeed.security.attributes.SecurityAttributesProvider");
Modified: portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-security/src/test/java/org/apache/jetspeed/security/TestPermissionManager.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-security/src/test/java/org/apache/jetspeed/security/TestPermissionManager.java?rev=694583&r1=694582&r2=694583&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-security/src/test/java/org/apache/jetspeed/security/TestPermissionManager.java (original)
+++ portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-security/src/test/java/org/apache/jetspeed/security/TestPermissionManager.java Thu Sep 11 19:19:53 2008
@@ -40,6 +40,7 @@
import org.apache.jetspeed.security.impl.RolePrincipalImpl;
import org.apache.jetspeed.security.impl.UserPrincipalImpl;
import org.apache.jetspeed.security.om.InternalPermission;
+import org.apache.jetspeed.security.spi.impl.PortletPermission;
import org.apache.jetspeed.security.util.test.AbstractSecurityTestcase;
/**
Modified: portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-security/src/test/java/org/apache/jetspeed/security/TestRdbmsPolicy.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-security/src/test/java/org/apache/jetspeed/security/TestRdbmsPolicy.java?rev=694583&r1=694582&r2=694583&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-security/src/test/java/org/apache/jetspeed/security/TestRdbmsPolicy.java (original)
+++ portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-security/src/test/java/org/apache/jetspeed/security/TestRdbmsPolicy.java Thu Sep 11 19:19:53 2008
@@ -29,6 +29,7 @@
import org.apache.jetspeed.security.impl.PassiveCallbackHandler;
import org.apache.jetspeed.security.impl.UserPrincipalImpl;
+import org.apache.jetspeed.security.spi.impl.PortletPermission;
import org.apache.jetspeed.security.util.test.AbstractSecurityTestcase;
/**
Modified: portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-security/src/test/java/org/apache/jetspeed/security/TestRdbmsPolicyFolder.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-security/src/test/java/org/apache/jetspeed/security/TestRdbmsPolicyFolder.java?rev=694583&r1=694582&r2=694583&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-security/src/test/java/org/apache/jetspeed/security/TestRdbmsPolicyFolder.java (original)
+++ portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-security/src/test/java/org/apache/jetspeed/security/TestRdbmsPolicyFolder.java Thu Sep 11 19:19:53 2008
@@ -26,11 +26,10 @@
import junit.framework.Test;
import junit.framework.TestSuite;
-import org.apache.jetspeed.security.FolderPermission;
import org.apache.jetspeed.security.SecurityException;
-import org.apache.jetspeed.security.UserPrincipal;
import org.apache.jetspeed.security.impl.PassiveCallbackHandler;
-import org.apache.jetspeed.security.impl.UserPrincipalImpl;
+import org.apache.jetspeed.security.spi.impl.BaseJetspeedPermission;
+import org.apache.jetspeed.security.spi.impl.FolderPermission;
import org.apache.jetspeed.security.util.test.AbstractSecurityTestcase;
/**
@@ -106,7 +105,7 @@
{
public Object run()
{
- FolderPermission perm1 = new FolderPermission("/files/test.xml", "edit");
+ BaseJetspeedPermission perm1 = new FolderPermission.Factory().newPermission("/files/test.xml", "edit");
AccessController.checkPermission(perm1);
return null;
}
@@ -124,7 +123,7 @@
{
public Object run()
{
- FolderPermission perm2 = new FolderPermission("/files/test.xml", "secure");
+ BaseJetspeedPermission perm2 = new FolderPermission.Factory().newPermission("/files/test.xml", "secure");
AccessController.checkPermission(perm2);
return null;
}
@@ -149,7 +148,7 @@
{
public Object run()
{
- FolderPermission perm1 = new FolderPermission("/files/subfolder1/test.xml", "view");
+ BaseJetspeedPermission perm1 = new FolderPermission.Factory().newPermission("/files/subfolder1/test.xml", "view");
AccessController.checkPermission(perm1);
return null;
}
@@ -167,7 +166,7 @@
{
public Object run()
{
- FolderPermission perm1 = new FolderPermission("/files/subfolder1/foo", "view");
+ BaseJetspeedPermission perm1 = new FolderPermission.Factory().newPermission("/files/subfolder1/foo", "view");
AccessController.checkPermission(perm1);
return null;
}
@@ -184,7 +183,7 @@
{
public Object run()
{
- FolderPermission perm1 = new FolderPermission("/files/subfolder1/foo/anotherdoc.xml", "view");
+ BaseJetspeedPermission perm1 = new FolderPermission.Factory().newPermission("/files/subfolder1/foo/anotherdoc.xml", "view");
AccessController.checkPermission(perm1);
return null;
}
@@ -202,7 +201,7 @@
{
public Object run()
{
- FolderPermission perm1 = new FolderPermission("/files/subfolder2/test.xml", "view");
+ BaseJetspeedPermission perm1 = new FolderPermission.Factory().newPermission("/files/subfolder2/test.xml", "view");
AccessController.checkPermission(perm1);
return null;
}
@@ -220,7 +219,7 @@
{
public Object run()
{
- FolderPermission perm1 = new FolderPermission("/files/subfolder2/foo", "view");
+ BaseJetspeedPermission perm1 = new FolderPermission.Factory().newPermission("/files/subfolder2/foo", "view");
AccessController.checkPermission(perm1);
return null;
}
@@ -237,7 +236,7 @@
{
public Object run()
{
- FolderPermission perm1 = new FolderPermission("/files/subfolder2/foo/anotherdoc.xml", "view");
+ BaseJetspeedPermission perm1 = new FolderPermission.Factory().newPermission("/files/subfolder2/foo/anotherdoc.xml", "view");
AccessController.checkPermission(perm1);
return null;
}
@@ -255,19 +254,22 @@
*/
protected void initUser()
{
+ User user = null;
try
{
- ums.addUser("anon", "password");
+ user = ums.addUser("anon", false);
+ PasswordCredential pwc = ums.getPasswordCredential(user);
+ pwc.setPassword(null, "password");
+ ums.storePasswordCredential(pwc);
}
catch (SecurityException sex)
{
+ sex.printStackTrace();
}
- UserPrincipal user = new UserPrincipalImpl("anon");
-
- FolderPermission perm1 = new FolderPermission("/files/test.xml", "edit");
- FolderPermission perm2 = new FolderPermission("/files/subfolder1/*", "view");
- FolderPermission perm3 = new FolderPermission("/files/subfolder2/-", "view");
+ BaseJetspeedPermission perm1 = new FolderPermission.Factory().newPermission("/files/test.xml", "edit");
+ BaseJetspeedPermission perm2 = new FolderPermission.Factory().newPermission("/files/subfolder1/*", "view");
+ BaseJetspeedPermission perm3 = new FolderPermission.Factory().newPermission("/files/subfolder2/-", "view");
try
{
pms.addPermission(perm1);
@@ -291,9 +293,9 @@
{
ums.removeUser("anon");
- FolderPermission perm1 = new FolderPermission("/files/test.xml", "edit");
- FolderPermission perm2 = new FolderPermission("/files/subfolder1/*", "view");
- FolderPermission perm3 = new FolderPermission("/files/subfolder2/-", "view");
+ BaseJetspeedPermission perm1 = new FolderPermission.Factory().newPermission("/files/test.xml", "edit");
+ BaseJetspeedPermission perm2 = new FolderPermission.Factory().newPermission("/files/subfolder1/*", "view");
+ BaseJetspeedPermission perm3 = new FolderPermission.Factory().newPermission("/files/subfolder2/-", "view");
pms.removePermission(perm1);
pms.removePermission(perm2);
pms.removePermission(perm3);
Modified: portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-security/src/test/java/org/apache/jetspeed/security/spi/TestRoleSecurityHandler.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-security/src/test/java/org/apache/jetspeed/security/spi/TestRoleSecurityHandler.java?rev=694583&r1=694582&r2=694583&view=diff
==============================================================================
--- portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-security/src/test/java/org/apache/jetspeed/security/spi/TestRoleSecurityHandler.java (original)
+++ portals/jetspeed-2/portal/branches/security-refactoring/components/jetspeed-security/src/test/java/org/apache/jetspeed/security/spi/TestRoleSecurityHandler.java Thu Sep 11 19:19:53 2008
@@ -20,8 +20,8 @@
import java.security.Permissions;
import java.security.Principal;
-import org.apache.jetspeed.security.PortletPermission;
import org.apache.jetspeed.security.impl.RolePrincipalImpl;
+import org.apache.jetspeed.security.spi.impl.PortletPermission;
import org.apache.jetspeed.security.util.test.AbstractSecurityTestcase;
import junit.framework.Test;
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org