[jboss-svn-commits] JBL Code SVN: r11133 - in labs/jbosslabs/branches/identity_integration/trunk/portal-extensions: jbwebsite-security and 3 other directories.

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

Author: sohil.shah at jboss.com
Date: 2007-04-19 15:43:22 -0400 (Thu, 19 Apr 2007)
New Revision: 11133

Modified:
   labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-common/
   labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-security/
   labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/
   labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/src/standalone/security/acl-permissions.xml
   labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/src/web/admin/index.xhtml
Log:
Integrated Access Control into the User Management Module


Property changes on: labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-common
___________________________________________________________________
Name: svn:ignore
   + target



Property changes on: labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-security
___________________________________________________________________
Name: svn:ignore
   + target



Property changes on: labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin
___________________________________________________________________
Name: svn:ignore
   + target


Modified: labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/src/standalone/security/acl-permissions.xml
===================================================================
--- labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/src/standalone/security/acl-permissions.xml	2007-04-19 17:54:45 UTC (rev 11132)
+++ labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/src/standalone/security/acl-permissions.xml	2007-04-19 19:43:22 UTC (rev 11133)
@@ -6,17 +6,16 @@
 	-->		
 	<!--  Anonymous represents any non-authenticated user -->
 	<role name="Anonymous" id="anonymous">		    								
-		<!-- (UserManagement Module) -->
 		<permission action="createUser"/>					
 	</role>
 		
 	<!--  this role represents a regular registered user on the site -->	
-	<role name="User" id="user">	                    	                                 
+	<role name="User" id="user">	     
+	    <permission action="userManagement"/>               	                                 
 	</role>
 				
 	<!--  Admin represents users that have Administrative privileges on the site -->		
-	<role name="Admin" id="admin">	    	    	    		
-		<!--  (UserManagement Module) -->	    		
+	<role name="Admin" id="admin">	    	    	    			    		
 	    <no-permission action="createUser"/>
 	    	    	    	    
 	    <!--  generic for all other modules -->	
@@ -26,8 +25,7 @@
 	<!--  this is done for programmatic access by system level components...this access is not in the context of any particular user -->
 	<role name="system" id="system">
 		<permission action="all"/>
-	</role>
-		
+	</role>		
 	<!--  
 		custom roles 
 	-->														

Modified: labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/src/web/admin/index.xhtml
===================================================================
--- labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/src/web/admin/index.xhtml	2007-04-19 17:54:45 UTC (rev 11132)
+++ labs/jbosslabs/branches/identity_integration/trunk/portal-extensions/jbwebsite-user-admin/src/web/admin/index.xhtml	2007-04-19 19:43:22 UTC (rev 11133)
@@ -11,8 +11,8 @@
 <ui:define name="mainContent">
 
 
+<acl:isAllowed fragmentId="acl://userManagement">
 
-
 <jsfHtml:outputLink value="#{jbossfacelets:outputLink('/admin/index.jsf',true)}" styleClass="pn-title" >
 	<font class="pn-title">
 	<b>User Management - Control Panel</b></font>
@@ -32,12 +32,14 @@
 </td>
 </acl:isAllowed>
 
+
 	<!-- edit My Profile -->
 	<td align="center" valign="top">
 		<jsfHtml:outputLink value="#{jbossfacelets:outputLink('/admin/profile/editMyProfile.jsf',true)}">
 			<img src="#{jbossfacelets:contextPath()}/admin/images/info.gif" border="0" alt="My Account"/>
 		</jsfHtml:outputLink><br/><br/>
 	</td>
+	
 </tr>
 
 <!-- display the labels corresponding to the icons -->
@@ -59,10 +61,13 @@
 	</jsfHtml:outputLink>
 <br/><br/>
 </td>
+
+
 </tr>
 
 </table>
 
+</acl:isAllowed>
 
 </ui:define>
 </ui:composition>