[jboss-cvs] JBossBlog SVN: r222 - in trunk: src/action/org/jboss/blog/session/security and 2 other directories.

[jboss-cvs-commits at lists.jboss.org]

Author: adamw
Date: 2008-02-26 08:49:03 -0500 (Tue, 26 Feb 2008)
New Revision: 222

Modified:
   trunk/resources/WEB-INF/pages.xml
   trunk/src/action/org/jboss/blog/session/security/ExternalSecurityService.java
   trunk/src/action/org/jboss/blog/session/security/SecurityModBean.java
   trunk/src/model/org/jboss/blog/model/security/SecurityUser.java
   trunk/view/security/security_group_add.xhtml
Log:


Modified: trunk/resources/WEB-INF/pages.xml
===================================================================
--- trunk/resources/WEB-INF/pages.xml	2008-02-26 13:22:05 UTC (rev 221)
+++ trunk/resources/WEB-INF/pages.xml	2008-02-26 13:49:03 UTC (rev 222)
@@ -15,6 +15,12 @@
         </navigation>
     </page>
 
+    <page view-id="*">
+        <navigation from-action="#{identity.logout}">
+            <redirect view-id="/home.xhtml"/>
+        </navigation>
+    </page>
+
     <!-- View feeds -->
 
     <page view-id="/view/feed.xhtml">

Modified: trunk/src/action/org/jboss/blog/session/security/ExternalSecurityService.java
===================================================================
--- trunk/src/action/org/jboss/blog/session/security/ExternalSecurityService.java	2008-02-26 13:22:05 UTC (rev 221)
+++ trunk/src/action/org/jboss/blog/session/security/ExternalSecurityService.java	2008-02-26 13:49:03 UTC (rev 222)
@@ -25,7 +25,10 @@
     private EntityManager entityManager;
 
     public SecurityUser authenticate(String username, String password) throws InvalidLoginException {
-        return null;
+        SecurityUser user = new SecurityUser();
+        user.setExternalId(Long.parseLong(username));
+
+        return user;
     }
 
     public SecurityGroup getUnrestrictedSecurityGroup(RestrictedSecurityGroup securityGroup) {
@@ -57,11 +60,11 @@
     }
 
     public List<SecurityGroup> getGroupsOfUser(SecurityUser securityUser) {
-        return null;
-    }
+        List<SecurityGroup> groups = new ArrayList<SecurityGroup>();
+        groups.add(getUnrestrictedSecurityGroup(
+                new SecurityGroup("group" + securityUser.getExternalId(), securityUser.getExternalId())));
 
-    public String getDisplayName(SecurityUser securityUser) {
-        return "";
+        return groups;
     }
 
     public String getDisplayName(RestrictedSecurityGroup securityGroup) {

Modified: trunk/src/action/org/jboss/blog/session/security/SecurityModBean.java
===================================================================
--- trunk/src/action/org/jboss/blog/session/security/SecurityModBean.java	2008-02-26 13:22:05 UTC (rev 221)
+++ trunk/src/action/org/jboss/blog/session/security/SecurityModBean.java	2008-02-26 13:49:03 UTC (rev 222)
@@ -104,13 +104,13 @@
     }
 
     private SecurityMapping getMapping() {
-        Integer idForRole = null;
-        if (getGroup() != null) {
-            idForRole = getGroup().getId();
+        Integer idForRole;
+
+        switch (getRole()) {
+            case GROUP_ADMIN: idForRole = getGroup().getId(); break;
+            case FEED_ADMIN: idForRole = getFeed().getId(); break;
+            default: idForRole = null;
         }
-        if (getFeed() != null) {
-            idForRole = getFeed().getId();
-        }
 
         return getMapping(getRole(), idForRole);
     }

Modified: trunk/src/model/org/jboss/blog/model/security/SecurityUser.java
===================================================================
--- trunk/src/model/org/jboss/blog/model/security/SecurityUser.java	2008-02-26 13:22:05 UTC (rev 221)
+++ trunk/src/model/org/jboss/blog/model/security/SecurityUser.java	2008-02-26 13:49:03 UTC (rev 222)
@@ -18,9 +18,6 @@
     @NotNull
     private Long externalId;
 
-    @Transient
-    private Object realUser;
-
     public Integer getId() {
         return id;
     }
@@ -37,14 +34,6 @@
         this.externalId = externalId;
     }
 
-    public Object getRealUser() {
-        return realUser;
-    }
-
-    public void setRealUser(Object realUser) {
-        this.realUser = realUser;
-    }
-
     public boolean equals(Object o) {
         if (this == o) return true;
         if (!(o instanceof SecurityUser)) return false;

Modified: trunk/view/security/security_group_add.xhtml
===================================================================
--- trunk/view/security/security_group_add.xhtml	2008-02-26 13:22:05 UTC (rev 221)
+++ trunk/view/security/security_group_add.xhtml	2008-02-26 13:49:03 UTC (rev 222)
@@ -26,10 +26,11 @@
                 <div class="formbuttons">
                     <ul>
                         <li>
-                            <h:commandButton value="Add" styleClass="submit" action="#{securityMod.addSecurityGroup}">
-                                <f:param name="role" value="ADMIN" />    
-                            </h:commandButton>
+                            <h:commandButton value="Add" styleClass="submit" action="#{securityMod.addSecurityGroup}" />
                         </li>
+                        <li>
+                            <s:button value="Cancel" view="/security/security_manager.xhtml" styleClass="submit" />
+                        </li>
                     </ul>
                 </div>
             </div>