epugh 2003/08/23 08:25:54
Modified: security/src/java/org/apache/fulcrum/security/adapter/turbine
RoleAdapter.java AccessControlListAdapter.java
SecurityServiceAdapter.java GroupAdapter.java
PermissionAdapter.java UserAdapter.java
Log:
Refactored the packaging. Now there is a a model/ directory where the model lives,
and a spi/ where the various service providers live. I think this will allow better
mixing and matching of models and implementors. Also makes the names clearer.
Revision Changes Path
1.2 +1 -1
jakarta-turbine-fulcrum/security/src/java/org/apache/fulcrum/security/adapter/turbine/RoleAdapter.java
Index: RoleAdapter.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-fulcrum/security/src/java/org/apache/fulcrum/security/adapter/turbine/RoleAdapter.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- RoleAdapter.java 23 Aug 2003 03:56:25 -0000 1.1
+++ RoleAdapter.java 23 Aug 2003 15:25:54 -0000 1.2
@@ -25,7 +25,7 @@
public RoleAdapter()
{
super();
- role = new org.apache.fulcrum.security.entity.impl.RoleImpl();
+ role = new org.apache.fulcrum.security.model.simple.entity.SimpleRole();
}
public RoleAdapter(org.apache.fulcrum.security.entity.Role role){
this.role=role;
1.2 +3 -3
jakarta-turbine-fulcrum/security/src/java/org/apache/fulcrum/security/adapter/turbine/AccessControlListAdapter.java
Index: AccessControlListAdapter.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-fulcrum/security/src/java/org/apache/fulcrum/security/adapter/turbine/AccessControlListAdapter.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AccessControlListAdapter.java 23 Aug 2003 03:56:25 -0000 1.1
+++ AccessControlListAdapter.java 23 Aug 2003 15:25:54 -0000 1.2
@@ -5,7 +5,9 @@
package org.apache.fulcrum.security.adapter.turbine;
import java.util.Iterator;
import java.util.Map;
-import org.apache.fulcrum.security.acl.DefaultAccessControlList;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.turbine.om.security.Group;
import org.apache.turbine.om.security.Permission;
import org.apache.turbine.om.security.Role;
@@ -13,8 +15,6 @@
import org.apache.turbine.util.security.GroupSet;
import org.apache.turbine.util.security.PermissionSet;
import org.apache.turbine.util.security.RoleSet;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
/**
* @author Eric Pugh
*
1.2 +5 -2
jakarta-turbine-fulcrum/security/src/java/org/apache/fulcrum/security/adapter/turbine/SecurityServiceAdapter.java
Index: SecurityServiceAdapter.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-fulcrum/security/src/java/org/apache/fulcrum/security/adapter/turbine/SecurityServiceAdapter.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SecurityServiceAdapter.java 23 Aug 2003 03:56:25 -0000 1.1
+++ SecurityServiceAdapter.java 23 Aug 2003 15:25:54 -0000 1.2
@@ -78,7 +78,10 @@
import org.apache.turbine.util.security.RoleSet;
/**
* An implementation of SecurityService that adapts it to work with
- * Fulcrum Security.
+ * Fulcrum Security. This adapter currently uses the "Simple" model of
+ * security. However, it should actually use the "Turbine" model of
+ * security. I didn't do that because I don't quite understand some of
+ * the reasons behind the "Turbine" model.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Eric Pugh</a>
* @version $Id$
1.2 +1 -1
jakarta-turbine-fulcrum/security/src/java/org/apache/fulcrum/security/adapter/turbine/GroupAdapter.java
Index: GroupAdapter.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-fulcrum/security/src/java/org/apache/fulcrum/security/adapter/turbine/GroupAdapter.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- GroupAdapter.java 23 Aug 2003 03:56:25 -0000 1.1
+++ GroupAdapter.java 23 Aug 2003 15:25:54 -0000 1.2
@@ -25,7 +25,7 @@
public GroupAdapter()
{
super();
- group = new org.apache.fulcrum.security.entity.impl.GroupImpl();
+
// TODO Auto-generated constructor stub
}
1.2 +1 -1
jakarta-turbine-fulcrum/security/src/java/org/apache/fulcrum/security/adapter/turbine/PermissionAdapter.java
Index: PermissionAdapter.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-fulcrum/security/src/java/org/apache/fulcrum/security/adapter/turbine/PermissionAdapter.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- PermissionAdapter.java 23 Aug 2003 03:56:25 -0000 1.1
+++ PermissionAdapter.java 23 Aug 2003 15:25:54 -0000 1.2
@@ -20,7 +20,7 @@
public PermissionAdapter()
{
super();
- permission = new org.apache.fulcrum.security.entity.impl.PermissionImpl();
+ permission = new
org.apache.fulcrum.security.model.simple.entity.SimplePermission();
}
public PermissionAdapter(org.apache.fulcrum.security.entity.Permission
permission)
{
1.2 +5 -5
jakarta-turbine-fulcrum/security/src/java/org/apache/fulcrum/security/adapter/turbine/UserAdapter.java
Index: UserAdapter.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-fulcrum/security/src/java/org/apache/fulcrum/security/adapter/turbine/UserAdapter.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- UserAdapter.java 23 Aug 2003 03:56:25 -0000 1.1
+++ UserAdapter.java 23 Aug 2003 15:25:54 -0000 1.2
@@ -26,7 +26,7 @@
public UserAdapter()
{
super();
- user = new org.apache.fulcrum.security.entity.impl.UserImpl();
+ user = new org.apache.fulcrum.security.model.simple.entity.SimpleUser();
}
public UserAdapter(org.apache.fulcrum.security.entity.User user)
{
@@ -128,12 +128,12 @@
// TODO Auto-generated method stub
return null;
}
- /* (non-Javadoc)
+ /* Adapter from getUserName to getName!
* @see org.apache.turbine.om.security.User#getUserName()
*/
public String getUserName()
{
- return user.getUserName();
+ return user.getName();
}
/* (non-Javadoc)
* @see org.apache.turbine.om.security.User#getFirstName()
@@ -259,12 +259,12 @@
{
// TODO Auto-generated method stub
}
- /* (non-Javadoc)
+ /* Adaper for user name to name.
* @see org.apache.turbine.om.security.User#setUserName(java.lang.String)
*/
public void setUserName(String arg0)
{
- user.setUserName(arg0);
+ user.setName(arg0);
}
/* (non-Javadoc)
* @see org.apache.turbine.om.security.User#setFirstName(java.lang.String)
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
