svn commit: r604875 [2/2] - in /lenya/branches/branch_1_2_x_shibboleth/src: java/org/apache/lenya/ac/ java/org/apache/lenya/ac/file/ java/org/apache/lenya/ac/impl/ java/org/apache/lenya/ac/impl/antlr/ java/org/apache/lenya/ac/impl/jexl/ java/org/apache...

Modified: lenya/branches/branch_1_2_x_shibboleth/src/test/org/apache/lenya/cms/workflow/WorkflowTest.java
URL: http://svn.apache.org/viewvc/lenya/branches/branch_1_2_x_shibboleth/src/test/org/apache/lenya/cms/workflow/WorkflowTest.java?rev=604875&r1=604874&r2=604875&view=diff
==============================================================================
--- lenya/branches/branch_1_2_x_shibboleth/src/test/org/apache/lenya/cms/workflow/WorkflowTest.java (original)
+++ lenya/branches/branch_1_2_x_shibboleth/src/test/org/apache/lenya/cms/workflow/WorkflowTest.java Mon Dec 17 06:11:52 2007
@@ -31,6 +31,8 @@
 import org.apache.lenya.ac.Policy;
 import org.apache.lenya.ac.Role;
 import org.apache.lenya.ac.User;
+import org.apache.lenya.ac.UserManager;
+import org.apache.lenya.ac.UserReference;
 import org.apache.lenya.ac.file.FileItemManager;
 import org.apache.lenya.ac.impl.AccessControlTest;
 import org.apache.lenya.cms.PublicationHelper;
@@ -124,10 +126,9 @@
             System.out.println("Current state: " + instance.getCurrentState());
 
             Identity identity = new Identity();
-            User user =
-                getAccreditableManager().getUserManager().getUser(
-                    situations[situationIndex].getUser());
-            identity.addIdentifiable(user);
+            UserManager userManager = getAccreditableManager().getUserManager();
+            User user = userManager.getUser(situations[situationIndex].getUser());
+            identity.addIdentifiable(new UserReference(user.getId(), userManager.getId()));
 
             Role[] roles = policy.getRoles(identity);
             System.out.print("Roles:");

Modified: lenya/branches/branch_1_2_x_shibboleth/src/webapp/lenya/content/admin/users/overview.xsp
URL: http://svn.apache.org/viewvc/lenya/branches/branch_1_2_x_shibboleth/src/webapp/lenya/content/admin/users/overview.xsp?rev=604875&r1=604874&r2=604875&view=diff
==============================================================================
--- lenya/branches/branch_1_2_x_shibboleth/src/webapp/lenya/content/admin/users/overview.xsp (original)
+++ lenya/branches/branch_1_2_x_shibboleth/src/webapp/lenya/content/admin/users/overview.xsp Mon Dec 17 06:11:52 2007
@@ -32,6 +32,7 @@
     <xsp:include>org.apache.lenya.ac.UserManager</xsp:include>
     <xsp:include>org.apache.lenya.ac.User</xsp:include>
     <xsp:include>org.apache.lenya.ac.Group</xsp:include>
+    <xsp:include>org.apache.lenya.ac.Groupable</xsp:include>
     <xsp:include>org.apache.lenya.ac.ldap.LDAPUser</xsp:include>
     <xsp:include>java.io.File</xsp:include>
     <xsp:include>java.util.Arrays</xsp:include>
@@ -94,12 +95,14 @@
       </attributes>
       <groups>
         <xsp:logic>
-            Group groups[] = user.getGroups();
-            for (int i = 0; i &lt; groups.length; i++) {
-                <xsp:content>
-                  <group><xsp:attribute name="id"><xsp:expr>groups[i].getId()</xsp:expr></xsp:attribute><xsp:expr>groups[i].getName()</xsp:expr></group>
-                </xsp:content>
-            }
+          if (user instanceof Groupable) {
+              Group groups[] = ((Groupable) user).getGroups();
+              for (int i = 0; i &lt; groups.length; i++) {
+                  <xsp:content>
+                    <group><xsp:attribute name="id"><xsp:expr>groups[i].getId()</xsp:expr></xsp:attribute><xsp:expr>groups[i].getName()</xsp:expr></group>
+                  </xsp:content>
+              }
+          }
         </xsp:logic>
       </groups>
     </user>

Modified: lenya/branches/branch_1_2_x_shibboleth/src/webapp/lenya/content/admin/users/users.xsp
URL: http://svn.apache.org/viewvc/lenya/branches/branch_1_2_x_shibboleth/src/webapp/lenya/content/admin/users/users.xsp?rev=604875&r1=604874&r2=604875&view=diff
==============================================================================
--- lenya/branches/branch_1_2_x_shibboleth/src/webapp/lenya/content/admin/users/users.xsp (original)
+++ lenya/branches/branch_1_2_x_shibboleth/src/webapp/lenya/content/admin/users/users.xsp Mon Dec 17 06:11:52 2007
@@ -30,6 +30,7 @@
     <xsp:include>org.apache.lenya.ac.User</xsp:include>
     <xsp:include>org.apache.lenya.ac.UserType</xsp:include>
     <xsp:include>org.apache.lenya.ac.Group</xsp:include>
+    <xsp:include>org.apache.lenya.ac.Groupable</xsp:include>
     <xsp:include>java.io.File</xsp:include>
     <xsp:include>java.util.Iterator</xsp:include>
   </xsp:structure>
@@ -42,7 +43,10 @@
         UserManager userManager = (UserManager)
             <input:get-attribute module="access-control" name="user-manager" as="object"/>;
             
-        User currentUser = userManager.getUser(currentUserId);
+        User currentUser = null;
+        if (userManager.contains(currentUserId)) {
+            currentUser = userManager.getUser(currentUserId);
+        }
             
         User[] users = userManager.getUsers();
         for (int userIndex = 0; userIndex &lt; users.length; userIndex++) {
@@ -53,7 +57,6 @@
             if (user == currentUser) {
                 deletable = false;
             }
-            
       </xsp:logic>
         
       <user>
@@ -63,11 +66,13 @@
         <email><xsp:expr>user.getEmail()</xsp:expr></email>
         <groups>
           <xsp:logic>
-            Group groups[] = user.getGroups();
-            for (int i = 0; i &lt; groups.length; i++) {
-                <xsp:content>
-                  <group><xsp:attribute name="id"><xsp:expr>groups[i].getId()</xsp:expr></xsp:attribute></group>
-                </xsp:content>
+            if (user instanceof Groupable) {
+                Group groups[] = ((Groupable) user).getGroups();
+                for (int i = 0; i &lt; groups.length; i++) {
+                    <xsp:content>
+                      <group><xsp:attribute name="id"><xsp:expr>groups[i].getId()</xsp:expr></xsp:attribute></group>
+                    </xsp:content>
+                }
             }
           </xsp:logic>
         </groups>