portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dlest...@apache.org
Subject svn commit: r329461 - in /portals/jetspeed-2/trunk: ./ applications/security/ applications/security/src/java/org/apache/jetspeed/portlets/security/ applications/security/src/java/org/apache/jetspeed/portlets/security/resources/ applications/security/sr...
Date Sat, 29 Oct 2005 18:06:50 GMT
Author: dlestrat
Date: Sat Oct 29 11:06:32 2005
New Revision: 329461

URL: http://svn.apache.org/viewcvs?rev=329461&view=rev
Log:
http://issues.apache.org/jira/browse/JS2-23#action_12356283

Remove experimental security JSF portlet.  Add Null checks.

Removed:
    portals/jetspeed-2/trunk/applications/security/src/java/org/apache/jetspeed/portlets/security/SecurityApplicationUtils.java
    portals/jetspeed-2/trunk/applications/security/src/java/org/apache/jetspeed/portlets/security/resources/RoleMgtResources.properties
    portals/jetspeed-2/trunk/applications/security/src/java/org/apache/jetspeed/portlets/security/resources/RoleMgtResources_de.properties
    portals/jetspeed-2/trunk/applications/security/src/java/org/apache/jetspeed/portlets/security/resources/RoleMgtResources_en.properties
    portals/jetspeed-2/trunk/applications/security/src/java/org/apache/jetspeed/portlets/security/resources/RoleMgtResources_es.properties
    portals/jetspeed-2/trunk/applications/security/src/java/org/apache/jetspeed/portlets/security/resources/RoleMgtResources_hu.properties
    portals/jetspeed-2/trunk/applications/security/src/java/org/apache/jetspeed/portlets/security/resources/RoleMgtResources_pl.properties
    portals/jetspeed-2/trunk/applications/security/src/java/org/apache/jetspeed/portlets/security/resources/RoleMgtResources_ru.properties
    portals/jetspeed-2/trunk/applications/security/src/java/org/apache/jetspeed/portlets/security/rolemgt/AddRoleCommandLinkActionListener.java
    portals/jetspeed-2/trunk/applications/security/src/java/org/apache/jetspeed/portlets/security/rolemgt/AvailableUsersList.java
    portals/jetspeed-2/trunk/applications/security/src/java/org/apache/jetspeed/portlets/security/rolemgt/PanelTabStateListener.java
    portals/jetspeed-2/trunk/applications/security/src/java/org/apache/jetspeed/portlets/security/rolemgt/RoleActionController.java
    portals/jetspeed-2/trunk/applications/security/src/java/org/apache/jetspeed/portlets/security/rolemgt/RoleActionForm.java
    portals/jetspeed-2/trunk/applications/security/src/java/org/apache/jetspeed/portlets/security/rolemgt/RoleActionListener.java
    portals/jetspeed-2/trunk/applications/security/src/java/org/apache/jetspeed/portlets/security/rolemgt/RoleMgtPortlet.java
    portals/jetspeed-2/trunk/applications/security/src/java/org/apache/jetspeed/portlets/security/rolemgt/RoleMgtRenderUtil.java
    portals/jetspeed-2/trunk/applications/security/src/java/org/apache/jetspeed/portlets/security/rolemgt/RoleMgtUser.java
    portals/jetspeed-2/trunk/applications/security/src/java/org/apache/jetspeed/portlets/security/rolemgt/RoleTreeItem.java
    portals/jetspeed-2/trunk/applications/security/src/java/org/apache/jetspeed/portlets/security/rolemgt/RoleTreeTable.java
    portals/jetspeed-2/trunk/applications/security/src/java/org/apache/jetspeed/portlets/security/rolemgt/SelectedUsersList.java
    portals/jetspeed-2/trunk/applications/security/src/test/org/apache/jetspeed/portlets/security/TestSecurityApplicationUtils.java
    portals/jetspeed-2/trunk/applications/security/src/webapp/WEB-INF/faces-config.xml
    portals/jetspeed-2/trunk/applications/security/src/webapp/WEB-INF/security/rolemgt/role-add-group.jsp
    portals/jetspeed-2/trunk/applications/security/src/webapp/WEB-INF/security/rolemgt/role-add-user.jsp
    portals/jetspeed-2/trunk/applications/security/src/webapp/WEB-INF/security/rolemgt/role-add.jsp
    portals/jetspeed-2/trunk/applications/security/src/webapp/WEB-INF/security/rolemgt/role-mgt.jsp
    portals/jetspeed-2/trunk/applications/security/src/webapp/WEB-INF/security/rolemgt/roles-view.jsp
    portals/jetspeed-2/trunk/applications/security/src/webapp/WEB-INF/security/user-mgt/addUser.jsp
    portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/wip/folder.metadata
    portals/jetspeed-2/trunk/src/webapp/WEB-INF/pages/wip/role-mgt.psml
Modified:
    portals/jetspeed-2/trunk/.classpath
    portals/jetspeed-2/trunk/applications/security/project.xml
    portals/jetspeed-2/trunk/applications/security/src/webapp/WEB-INF/portlet.xml
    portals/jetspeed-2/trunk/applications/security/src/webapp/WEB-INF/web.xml
    portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/psml/AbstractBaseElement.java
    portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/psml/FragmentImpl.java
    portals/jetspeed-2/trunk/components/registry/src/test/org/apache/jetspeed/components/portletentity/TestPortletEntityDAO.java
    portals/jetspeed-2/trunk/layout-portlets/src/test/org/apache/jetspeed/portlets/layout/TestColumnLayout.java

Modified: portals/jetspeed-2/trunk/.classpath
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/.classpath?rev=329461&r1=329460&r2=329461&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/.classpath (original)
+++ portals/jetspeed-2/trunk/.classpath Sat Oct 29 11:06:32 2005
@@ -46,6 +46,7 @@
 	<classpathentry excluding="**/.svn/*" kind="src" path="maven-plugin/src/java"/>
 	<classpathentry excluding="**/.svn/*" kind="src" path="content-server/src/java"/>
 	<classpathentry excluding="**/.svn/*" kind="src" path="layout-portlets/src/java"/>
+	<classpathentry excluding="**/.svn/*" kind="src" path="layout-portlets/src/test"/>
 	<classpathentry excluding="**/.svn/*" kind="src" path="taglibs/treecontrol/src/java"/>
 	<classpathentry excluding="**/.svn/*" kind="src" path="app-servers/security/jboss/src/java"/>
 	<classpathentry excluding="**/.svn/*" kind="src" path="applications/demo/src/java"/>
@@ -56,7 +57,6 @@
 	<classpathentry excluding="**/.svn/*" kind="src" path="applications/pam/src/java"/>
 	<classpathentry excluding="**/.svn/*" kind="src" path="applications/rss/src/java"/>
 	<classpathentry excluding="**/.svn/*" kind="src" path="applications/security/src/java"/>
-	<classpathentry excluding="**/.svn/*" kind="src" path="applications/security/src/test"/>
 	<classpathentry excluding="**/.svn/*" kind="src" path="applications/struts-demo/src/java"/>
 	<classpathentry exported="true" kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="var" path="MAVEN_REPO/jdom/jars/jdom-1.0.jar"/>

Modified: portals/jetspeed-2/trunk/applications/security/project.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/applications/security/project.xml?rev=329461&r1=329460&r2=329461&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/applications/security/project.xml (original)
+++ portals/jetspeed-2/trunk/applications/security/project.xml Sat Oct 29 11:06:32 2005
@@ -165,38 +165,7 @@
       <properties>
         <war.bundle>${log4j.include}</war.bundle>
       </properties>
-    </dependency>  
-    
-    <dependency>
-       <id>myfaces:myfaces-impl</id>
-       <version>${myfaces.version}</version>
-       <properties>
-         <war.bundle>true</war.bundle>
-       </properties>
-    </dependency>
-    <dependency>
-       <id>myfaces:myfaces-api</id>
-       <version>${myfaces.version}</version>
-       <properties>
-         <war.bundle>true</war.bundle>
-       </properties>
-     </dependency>
-     <dependency>
-       <id>myfaces:tomahawk</id>
-       <version>${myfaces.version}</version>
-       <properties>
-         <war.bundle>true</war.bundle>
-       </properties>
-     </dependency>
- 
-    <dependency>
-	    <id>portals-bridges:portals-bridges-jsf</id>
-	    <version>${portals.bridges.jsf.version}</version>
-	    <properties>
-			<war.bundle>true</war.bundle>
-	    </properties>
-    </dependency>
-      
+    </dependency>      
     <dependency>
       <id>commons-logging</id>
       <version>${commons.logging.version}</version>

Modified: portals/jetspeed-2/trunk/applications/security/src/webapp/WEB-INF/portlet.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/applications/security/src/webapp/WEB-INF/portlet.xml?rev=329461&r1=329460&r2=329461&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/applications/security/src/webapp/WEB-INF/portlet.xml (original)
+++ portals/jetspeed-2/trunk/applications/security/src/webapp/WEB-INF/portlet.xml Sat Oct 29 11:06:32 2005
@@ -1,544 +1,518 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-Copyright 2004 The Apache Software Foundation
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
+    Copyright 2004 The Apache Software Foundation
+    
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+    
     http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
+    
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
 -->
 <portlet-app id="security" version="1.0">
-	<portlet id="LoginPortlet">
-    	<init-param>
-      		<name>ViewPage</name>
-      		<value>/WEB-INF/security/login/login.jsp</value>
-		</init-param>
-    	<portlet-name>LoginPortlet</portlet-name>
-    	<display-name>Login</display-name>
-    	<portlet-class>org.apache.portals.bridges.common.GenericServletPortlet</portlet-class>
-	    <expiration-cache>-1</expiration-cache>
-    	<supports>
-	      <mime-type>text/html</mime-type>
-    	  <portlet-mode>VIEW</portlet-mode>
-    	</supports>
-      <supported-locale>en</supported-locale>
-      <supported-locale>ja</supported-locale>
-	    <resource-bundle>org.apache.jetspeed.portlets.security.resources.LoginResources</resource-bundle>
-		<portlet-info>
-			<title>Login</title>
-			<short-title>Login</short-title>
-    	</portlet-info>
-  	</portlet>
-	<portlet id="LoginPortletForXHTMLBasic">
-    	<init-param>
-      		<name>ViewPage</name>
-      		<value>/WEB-INF/security/login/login-xhtmlbasic.jsp</value>
-		</init-param>
-    	<portlet-name>LoginPortletForXHTMLBasic</portlet-name>
-    	<display-name>Login for XHTML Basic</display-name>
-    	<portlet-class>org.apache.portals.bridges.common.GenericServletPortlet</portlet-class>
-	    <expiration-cache>-1</expiration-cache>
-    	<supports>
-	      <mime-type>text/html</mime-type>
-    	  <portlet-mode>VIEW</portlet-mode>
-    	</supports>
-      <supported-locale>en</supported-locale>
-      <supported-locale>ja</supported-locale>
-	    <resource-bundle>org.apache.jetspeed.portlets.security.resources.LoginResources</resource-bundle>
-		<portlet-info>
-			<title>Login</title>
-			<short-title>Login</short-title>
-    	</portlet-info>
-  	</portlet>
-  	<!-- *********************** -->
-  	<!-- Role Management Portlet -->
-  	<!-- *********************** -->
-  	<portlet id="RoleMgtPortlet">
-      <init-param>
-        <description>This parameter sets the template used in view mode.</description>
-        <name>ViewPage</name>
-        <value>/WEB-INF/security/rolemgt/role-mgt.jsp</value>
-      </init-param>   
-      <portlet-name>RoleMgtPortlet</portlet-name>
-      <display-name>Role Management</display-name>
-      <description>Manage the portal roles.</description>
-      <portlet-class>org.apache.jetspeed.portlets.security.rolemgt.RoleMgtPortlet</portlet-class>
-      <expiration-cache>-1</expiration-cache>
-      <supports>
-        <mime-type>text/html</mime-type>
-        <portlet-mode>VIEW</portlet-mode>
-      </supports>
-      <supported-locale>en</supported-locale>
-      <resource-bundle>org.apache.jetspeed.portlets.security.resources.RoleMgtResources</resource-bundle>
-      <portlet-info>
-        <title>Role Management</title>
-        <short-title>Role Management</short-title>
-        <keywords>security,role</keywords>
-      </portlet-info>
+    <portlet id="LoginPortlet">
+        <init-param>
+            <name>ViewPage</name>
+            <value>/WEB-INF/security/login/login.jsp</value>
+        </init-param>
+        <portlet-name>LoginPortlet</portlet-name>
+        <display-name>Login</display-name>
+        <portlet-class>org.apache.portals.bridges.common.GenericServletPortlet</portlet-class>
+        <expiration-cache>-1</expiration-cache>
+        <supports>
+            <mime-type>text/html</mime-type>
+            <portlet-mode>VIEW</portlet-mode>
+        </supports>
+        <supported-locale>en</supported-locale>
+        <supported-locale>ja</supported-locale>
+        <resource-bundle>org.apache.jetspeed.portlets.security.resources.LoginResources</resource-bundle>
+        <portlet-info>
+            <title>Login</title>
+            <short-title>Login</short-title>
+        </portlet-info>
+    </portlet>
+    <portlet id="LoginPortletForXHTMLBasic">
+        <init-param>
+            <name>ViewPage</name>
+            <value>/WEB-INF/security/login/login-xhtmlbasic.jsp</value>
+        </init-param>
+        <portlet-name>LoginPortletForXHTMLBasic</portlet-name>
+        <display-name>Login for XHTML Basic</display-name>
+        <portlet-class>org.apache.portals.bridges.common.GenericServletPortlet</portlet-class>
+        <expiration-cache>-1</expiration-cache>
+        <supports>
+            <mime-type>text/html</mime-type>
+            <portlet-mode>VIEW</portlet-mode>
+        </supports>
+        <supported-locale>en</supported-locale>
+        <supported-locale>ja</supported-locale>
+        <resource-bundle>org.apache.jetspeed.portlets.security.resources.LoginResources</resource-bundle>
+        <portlet-info>
+            <title>Login</title>
+            <short-title>Login</short-title>
+        </portlet-info>
     </portlet>
     <!-- *********************** -->
-  	<!-- Change Password Portlet -->
-  	<!-- *********************** -->
+    <!-- Change Password Portlet -->
+    <!-- *********************** -->
     <portlet id="ChangePasswordPortlet">
-      <init-param>
-        <description>This parameter sets the template used in view mode.</description>
-        <name>ViewPage</name>
-        <value>/WEB-INF/security/chgpwd/change-password.jsp</value>
-      </init-param>   
-      <portlet-name>ChangePasswordPortlet</portlet-name>
-      <display-name>Change Password</display-name>
-      <description>Change current logged on user its password.</description>
-      <portlet-class>org.apache.jetspeed.portlets.security.ChangePasswordPortlet</portlet-class>
-      <expiration-cache>-1</expiration-cache>
-      <supports>
-        <mime-type>text/html</mime-type>
-        <portlet-mode>VIEW</portlet-mode>
-      </supports>
-      <supported-locale>en</supported-locale>
-      <supported-locale>nl</supported-locale>
-      <resource-bundle>org.apache.jetspeed.portlets.security.resources.ChgPwdResources</resource-bundle>
-      <portlet-info>
-        <title>Change Password</title>
-        <short-title>Change Password</short-title>
-        <keywords>security,user,password</keywords>
-      </portlet-info>
-    </portlet>
-
-<portlet id="UserBrowserPortlet">
-    <init-param>
-    	<description>This parameter sets the template used in view mode.</description>
-		<name>ViewPage</name>
-			<value>/WEB-INF/security/users/user-browser.vm</value>
-     </init-param>   
-    <portlet-name>UserBrowserPortlet</portlet-name>
-    <display-name>User Browser</display-name>
-    <description>The User Browser displays a list of users managed in this portal. From here you can add, edit, and users.</description>
-    <portlet-class>org.apache.jetspeed.portlets.security.users.UserBrowser</portlet-class>
-    <expiration-cache>-1</expiration-cache>
-    <supports>
-      <mime-type>text/html</mime-type>
-      <portlet-mode>VIEW</portlet-mode>
-<!--  not implemented yet
-      <portlet-mode>EDIT</portlet-mode>
-      <portlet-mode>HELP</portlet-mode>
--->
-    </supports>
-    <supported-locale>en</supported-locale>
-    <resource-bundle>org.apache.jetspeed.portlets.security.resources.SecurityResources</resource-bundle>            
-    <portlet-info>
-      <title>User Browser</title>
-      <short-title>Users</short-title>
-      <keywords>admin,security,users</keywords>
-    </portlet-info>
-    <portlet-preferences>
-      <preference>                            
-        <name>WindowSize</name>                    
-        <value>10</value>    
-      </preference>                               		    
-    </portlet-preferences>                    
-  </portlet>
-
-<portlet id="UserDetailsPortlet">
-    <init-param>
-      <description>This parameter sets the template used in view mode.</description>
-	  <name>ViewPage</name>
-	  <value>/WEB-INF/security/users/user-details.jsp</value>
-    </init-param>   
-    <init-param>
-      <description>This parameter sets the template used in edit mode.</description>
-      <name>EditPage</name>
-      <value>/WEB-INF/security/users/user-details-edit.jsp</value>
-    </init-param>   
-    <portlet-name>UserDetailsPortlet</portlet-name>
-    <display-name>User Information</display-name>
-    <description>The User Details portlet displays a users details in a tabbed view. From here you can add, edit, and user information.</description>
-    <portlet-class>org.apache.jetspeed.portlets.security.users.UserDetailsPortlet</portlet-class>
-    <expiration-cache>-1</expiration-cache>
-    <supports>
-      <mime-type>text/html</mime-type>
-      <portlet-mode>EDIT</portlet-mode>
-      <portlet-mode>VIEW</portlet-mode>
-<!-- not implemented yet
-      <portlet-mode>HELP</portlet-mode>
--->
-    </supports>
-    <supported-locale>en</supported-locale>
-    <resource-bundle>org.apache.jetspeed.portlets.security.resources.SecurityResources</resource-bundle>            
-    <portlet-preferences>
-      <preference>
-        <name>showUserTab</name>
-        <value>false</value>
-      </preference>
-      <preference>
-        <name>showAttributesTab</name>
-        <value>true</value>
-      </preference>
-      <preference>
-        <name>showPasswordTab</name>
-        <value>true</value>
-      </preference>
-      <preference>
-        <name>showRoleTab</name>
-        <value>true</value>
-      </preference>
-      <preference>
-        <name>showGroupTab</name>
-        <value>true</value>
-      </preference>
-      <preference>
-        <name>showProfileTab</name>
-        <value>true</value>
-      </preference>
-      <preference>
-        <name>showPasswordOnUserTab</name>
-        <value>false</value>
-      </preference>
-      <preference>
-        <name>showPasswordExpiration</name>
-        <value>false</value>
-      </preference>
-      <preference>
-        <name>showChangePasswordRequiredForAddUser</name>
-        <value>true</value>
-      </preference>      
-      <preference>
-        <name>showRoleForAddUser</name>
-        <value>true</value>
-      </preference>      
-      <preference>
-        <name>showProfileForAddUser</name>
-        <value>true</value>
-      </preference>      
-      <preference>
-        <name>defaultChangePasswordRequired</name>
-        <value>false</value>
-      </preference>
-      <preference>
-        <name>defaultRole</name>
-        <value>user</value>
-      </preference>
-      <preference>
-        <name>defaultProfile</name>
-        <value>j2</value>
-      </preference>
-      <preference>
-        <name>newUserTemplateDirectory</name>
-        <value>/_user/template/</value>
-      </preference>      
-    </portlet-preferences>
-    <portlet-info>
-      <title>User Detail Information</title>
-      <short-title>User</short-title>
-      <keywords>admin,security,users</keywords>
-    </portlet-info>
-</portlet>
-
-<portlet id="GroupDetailsPortlet">
-    <init-param>
-    	<description>This parameter sets the template used in view mode.</description>
-		<name>ViewPage</name>
-			<value>/WEB-INF/security/groups/group-details.vm</value>
-     </init-param>   
-    <portlet-name>GroupDetailsPortlet</portlet-name>
-    <display-name>Group Information</display-name>
-    <description>The Group Details portlet displays a groups details in a tabbed view. From here you can add, edit, and group information.</description>
-    <portlet-class>org.apache.jetspeed.portlets.security.groups.GroupDetails</portlet-class>
-    <expiration-cache>-1</expiration-cache>
-    <supports>
-      <mime-type>text/html</mime-type>
-      <portlet-mode>VIEW</portlet-mode>
-<!-- not implemented yet
-      <portlet-mode>EDIT</portlet-mode>
-      <portlet-mode>HELP</portlet-mode>
--->      
-    </supports>
-    <supported-locale>en</supported-locale>
-    <resource-bundle>org.apache.jetspeed.portlets.security.resources.SecurityResources</resource-bundle>            
-    <portlet-info>
-      <title>Group Detail Information</title>
-      <short-title>Group</short-title>
-      <keywords>admin,security,group</keywords>
-    </portlet-info>
-</portlet>
-
-<portlet id="RoleDetailsPortlet">
-    <init-param>
-    	<description>This parameter sets the template used in view mode.</description>
-		<name>ViewPage</name>
-			<value>/WEB-INF/security/roles/role-details.vm</value>
-     </init-param>   
-    <portlet-name>RoleDetailsPortlet</portlet-name>
-    <display-name>Role Information</display-name>
-    <description>The Role Details portlet displays a roles details in a tabbed view. From here you can add, edit, and role information.</description>
-    <portlet-class>org.apache.jetspeed.portlets.security.roles.RoleDetails</portlet-class>
-    <expiration-cache>-1</expiration-cache>
-    <supports>
-      <mime-type>text/html</mime-type>
-      <portlet-mode>VIEW</portlet-mode>
-<!-- not implemented yet
-      <portlet-mode>EDIT</portlet-mode>
-      <portlet-mode>HELP</portlet-mode>
--->      
-    </supports>
-    <supported-locale>en</supported-locale>
-    <resource-bundle>org.apache.jetspeed.portlets.security.resources.SecurityResources</resource-bundle>            
-    <portlet-info>
-      <title>Role Detail Information</title>
-      <short-title>Role</short-title>
-      <keywords>admin,security,role</keywords>
-    </portlet-info>
-</portlet>
-
-<portlet id="SSOBrowserPortlet">
-    <init-param>
-    	<description>This parameter sets the template used in view mode.</description>
-		<name>ViewPage</name>
-			<value>/WEB-INF/security/sso/sites-view.vm</value>
-     </init-param>   
-    <portlet-name>SSOBrowserPortlet</portlet-name>
-    <display-name>SSO Sites Browser</display-name>
-    <description>SSO Sites Browser Portlet</description>
-    <portlet-class>org.apache.jetspeed.portlets.security.sso.SSOBrowser</portlet-class>
-    <expiration-cache>-1</expiration-cache>
-    <supports>
-      <mime-type>text/html</mime-type>
-      <portlet-mode>VIEW</portlet-mode>
-<!-- not implemented yet
-      <portlet-mode>EDIT</portlet-mode>
-      <portlet-mode>HELP</portlet-mode>
--->      
-    </supports>
-    <supported-locale>en</supported-locale>
-    <resource-bundle>org.apache.jetspeed.portlets.security.resources.SSOResources</resource-bundle>            
-    <portlet-info>
-      <title>SSO Sites</title>
-      <short-title>Sites</short-title>
-      <keywords>admin,security,site,SSO</keywords>
-    </portlet-info>
-</portlet>
-
-<portlet id="SSODetailsPortlet">
-    <init-param>
-    	<description>This parameter sets the template used in view mode.</description>
-		<name>ViewPage</name>
-			<value>/WEB-INF/security/sso/sites-details.vm</value>
-     </init-param>   
-    <portlet-name>SSODetailsPortlet</portlet-name>
-    <display-name>SSO Details</display-name>
-    <description>SSO Site Details Portlet</description>
-    <portlet-class>org.apache.jetspeed.portlets.security.sso.SSODetails</portlet-class>
-    <expiration-cache>-1</expiration-cache>
-    <supports>
-      <mime-type>text/html</mime-type>
-      <portlet-mode>VIEW</portlet-mode>
-<!-- not implemented yet
-      <portlet-mode>EDIT</portlet-mode>
-      <portlet-mode>HELP</portlet-mode>
--->      
-    </supports>
-    <supported-locale>en</supported-locale>
-    <resource-bundle>org.apache.jetspeed.portlets.security.resources.SSOResources</resource-bundle>            
-    <portlet-info>
-      <title>SSO Details</title>
-      <short-title>SSO Details</short-title>
-      <keywords>admin,security,site,SSO</keywords>
-    </portlet-info>
-</portlet>
-
-<portlet id="UserChooser">
-    <init-param>
-    	<description>This parameter sets the template used in view mode.</description>
-		<name>ViewPage</name>
-			<value>/WEB-INF/security/users/user-chooser.vm</value>
-     </init-param>   
-    <portlet-name>UserChooser</portlet-name>
-    <display-name>Users</display-name>
-    <description>User Chooser Portlet</description>
-    <portlet-class>org.apache.jetspeed.portlets.security.users.UserChooserPortlet</portlet-class>
-    <expiration-cache>-1</expiration-cache>
-    <supports>
-      <mime-type>text/html</mime-type>
-      <portlet-mode>EDIT</portlet-mode>
-      <portlet-mode>VIEW</portlet-mode>
-      <portlet-mode>HELP</portlet-mode>
-    </supports>
-    <supported-locale>en</supported-locale>
-    <resource-bundle>org.apache.jetspeed.portlets.security.resources.SecurityResources</resource-bundle>            
-    <portlet-preferences>
-      <preference>                            
-        <name>WindowSize</name>                    
-        <value>1000</value>    
-      </preference>                               		    
-    </portlet-preferences>            
-    <portlet-info>
-      <title>User Select</title>
-      <short-title>Users</short-title>
-      <keywords>admin,security,users</keywords>
-    </portlet-info>
-</portlet>
-
-<portlet id="UserMultiChooser">
-    <init-param>
-    	<description>This parameter sets the template used in view mode.</description>
-		<name>ViewPage</name>
-			<value>/WEB-INF/security/users/user-multi-chooser.vm</value>
-     </init-param>   
-    <portlet-name>UserMultiChooser</portlet-name>
-    <display-name>Choose Multiple Users</display-name>
-    <description>Multiple User Chooser Portlet</description>
-    <portlet-class>org.apache.jetspeed.portlets.security.users.UserChooserPortlet</portlet-class>
-    <expiration-cache>-1</expiration-cache>
-    <supports>
-      <mime-type>text/html</mime-type>
-      <portlet-mode>EDIT</portlet-mode>
-      <portlet-mode>VIEW</portlet-mode>
-      <portlet-mode>HELP</portlet-mode>
-    </supports>
-    <supported-locale>en</supported-locale>
-    <resource-bundle>org.apache.jetspeed.portlets.security.resources.SecurityResources</resource-bundle>            
-    <portlet-preferences>
-      <preference>                            
-        <name>WindowSize</name>                    
-        <value>1000</value>    
-      </preference>                               		    
-    </portlet-preferences>            
-    <portlet-info>
-      <title>Users Select</title>
-      <short-title>Users</short-title>
-      <keywords>admin,security,users</keywords>
-    </portlet-info>
-</portlet>
-
-<portlet id="RoleChooser">
-    <init-param>
-    	<description>This parameter sets the template used in view mode.</description>
-		<name>ViewPage</name>
-			<value>/WEB-INF/security/users/role-chooser.vm</value>
-     </init-param>   
-    <portlet-name>RoleChooser</portlet-name>
-    <display-name>Roles</display-name>
-    <description>Role Chooser Portlet</description>
-    <portlet-class>org.apache.jetspeed.portlets.security.users.RoleChooserPortlet</portlet-class>
-    <expiration-cache>-1</expiration-cache>
-    <supports>
-      <mime-type>text/html</mime-type>
-      <portlet-mode>EDIT</portlet-mode>
-      <portlet-mode>VIEW</portlet-mode>
-      <portlet-mode>HELP</portlet-mode>
-    </supports>
-    <supported-locale>en</supported-locale>
-    <resource-bundle>org.apache.jetspeed.portlets.security.resources.SecurityResources</resource-bundle>            
-    <portlet-preferences>
-      <preference>                            
-        <name>WindowSize</name>                    
-        <value>1000</value>    
-      </preference>                               		    
-    </portlet-preferences>                
-    <portlet-info>
-      <title>Role Select</title>
-      <short-title>Roles</short-title>
-      <keywords>admin,security,roles</keywords>
-    </portlet-info>
-</portlet>
-
-<portlet id="GroupChooser">
-    <init-param>
-    	<description>This parameter sets the template used in view mode.</description>
-		<name>ViewPage</name>
-			<value>/WEB-INF/security/users/group-chooser.vm</value>
-     </init-param>   
-    <portlet-name>GroupChooser</portlet-name>
-    <display-name>Groups</display-name>
-    <description>Group Chooser Portlet</description>
-    <portlet-class>org.apache.jetspeed.portlets.security.users.GroupChooserPortlet</portlet-class>
-    <expiration-cache>-1</expiration-cache>
-    <supports>
-      <mime-type>text/html</mime-type>
-      <portlet-mode>EDIT</portlet-mode>
-      <portlet-mode>VIEW</portlet-mode>
-      <portlet-mode>HELP</portlet-mode>
-    </supports>
-    <supported-locale>en</supported-locale>
-    <resource-bundle>org.apache.jetspeed.portlets.security.resources.SecurityResources</resource-bundle>            
-    <portlet-preferences>
-      <preference>                            
-        <name>WindowSize</name>                    
-        <value>1000</value>    
-      </preference>                               		    
-    </portlet-preferences>                
-    <portlet-info>
-      <title>Group Select</title>
-      <short-title>Groups</short-title>
-      <keywords>admin,security,groups</keywords>
-    </portlet-info>
-</portlet>
-
-<portlet id="GroupBrowser">
-    <init-param>
-    	<description>This parameter sets the template used in view mode.</description>
-		<name>ViewPage</name>
-			<value>/WEB-INF/security/groups/groups-view.vm</value>
-     </init-param>   
-    <portlet-name>GroupBrowserPortlet</portlet-name>
-    <display-name>Group Admin</display-name>
-    <description>Group Browser Portlet</description>
-    <portlet-class>org.apache.jetspeed.portlets.security.groups.GroupBrowser</portlet-class>
-    <expiration-cache>-1</expiration-cache>
-    <supports>
-      <mime-type>text/html</mime-type>
-      <portlet-mode>VIEW</portlet-mode>
-    </supports>
-    <supported-locale>en</supported-locale>
-    <resource-bundle>org.apache.jetspeed.portlets.security.resources.SecurityResources</resource-bundle>            
-    <portlet-preferences>
-      <preference>                            
-        <name>WindowSize</name>                    
-        <value>1000</value>    
-      </preference>                               		    
-    </portlet-preferences>                
-    <portlet-info>
-      <title>Group admin</title>
-      <short-title>Groups</short-title>
-      <keywords>admin,security,groups</keywords>
-    </portlet-info>
-</portlet>
-
-<portlet id="RoleBrowser">
-    <init-param>
-    	<description>This parameter sets the template used in view mode.</description>
-		<name>ViewPage</name>
-			<value>/WEB-INF/security/roles/roles-view.vm</value>
-     </init-param>   
-    <portlet-name>RoleBrowserPortlet</portlet-name>
-    <display-name>Role Admin</display-name>
-    <description>Role Browser Portlet</description>
-    <portlet-class>org.apache.jetspeed.portlets.security.roles.RoleBrowser</portlet-class>
-    <expiration-cache>-1</expiration-cache>
-    <supports>
-      <mime-type>text/html</mime-type>
-      <portlet-mode>VIEW</portlet-mode>
-    </supports>
-    <supported-locale>en</supported-locale>
-    <resource-bundle>org.apache.jetspeed.portlets.security.resources.SecurityResources</resource-bundle>            
-    <portlet-preferences>
-      <preference>                            
-        <name>WindowSize</name>                    
-        <value>1000</value>    
-      </preference>                               		    
-    </portlet-preferences>                
-    <portlet-info>
-      <title>Role admin</title>
-      <short-title>Roles</short-title>
-      <keywords>admin,security,roles</keywords>
-    </portlet-info>
-</portlet>
+        <init-param>
+            <description>This parameter sets the template used in view mode.</description>
+            <name>ViewPage</name>
+            <value>/WEB-INF/security/chgpwd/change-password.jsp</value>
+        </init-param>
+        <portlet-name>ChangePasswordPortlet</portlet-name>
+        <display-name>Change Password</display-name>
+        <description>Change current logged on user its password.</description>
+        <portlet-class>org.apache.jetspeed.portlets.security.ChangePasswordPortlet</portlet-class>
+        <expiration-cache>-1</expiration-cache>
+        <supports>
+            <mime-type>text/html</mime-type>
+            <portlet-mode>VIEW</portlet-mode>
+        </supports>
+        <supported-locale>en</supported-locale>
+        <supported-locale>nl</supported-locale>
+        <resource-bundle>org.apache.jetspeed.portlets.security.resources.ChgPwdResources</resource-bundle>
+        <portlet-info>
+            <title>Change Password</title>
+            <short-title>Change Password</short-title>
+            <keywords>security,user,password</keywords>
+        </portlet-info>
+    </portlet>
+
+    <portlet id="UserBrowserPortlet">
+        <init-param>
+            <description>This parameter sets the template used in view mode.</description>
+            <name>ViewPage</name>
+            <value>/WEB-INF/security/users/user-browser.vm</value>
+        </init-param>
+        <portlet-name>UserBrowserPortlet</portlet-name>
+        <display-name>User Browser</display-name>
+        <description>The User Browser displays a list of users managed in this portal. From here you can add, edit, and users.</description>
+        <portlet-class>org.apache.jetspeed.portlets.security.users.UserBrowser</portlet-class>
+        <expiration-cache>-1</expiration-cache>
+        <supports>
+            <mime-type>text/html</mime-type>
+            <portlet-mode>VIEW</portlet-mode>
+            <!--  not implemented yet
+                <portlet-mode>EDIT</portlet-mode>
+                <portlet-mode>HELP</portlet-mode>
+            -->
+        </supports>
+        <supported-locale>en</supported-locale>
+        <resource-bundle>org.apache.jetspeed.portlets.security.resources.SecurityResources</resource-bundle>
+        <portlet-info>
+            <title>User Browser</title>
+            <short-title>Users</short-title>
+            <keywords>admin,security,users</keywords>
+        </portlet-info>
+        <portlet-preferences>
+            <preference>
+                <name>WindowSize</name>
+                <value>10</value>
+            </preference>
+        </portlet-preferences>
+    </portlet>
+
+    <portlet id="UserDetailsPortlet">
+        <init-param>
+            <description>This parameter sets the template used in view mode.</description>
+            <name>ViewPage</name>
+            <value>/WEB-INF/security/users/user-details.jsp</value>
+        </init-param>
+        <init-param>
+            <description>This parameter sets the template used in edit mode.</description>
+            <name>EditPage</name>
+            <value>/WEB-INF/security/users/user-details-edit.jsp</value>
+        </init-param>
+        <portlet-name>UserDetailsPortlet</portlet-name>
+        <display-name>User Information</display-name>
+        <description>The User Details portlet displays a users details in a tabbed view. From here you can add, edit, and user information.</description>
+        <portlet-class>org.apache.jetspeed.portlets.security.users.UserDetailsPortlet</portlet-class>
+        <expiration-cache>-1</expiration-cache>
+        <supports>
+            <mime-type>text/html</mime-type>
+            <portlet-mode>EDIT</portlet-mode>
+            <portlet-mode>VIEW</portlet-mode>
+            <!-- not implemented yet
+                <portlet-mode>HELP</portlet-mode>
+            -->
+        </supports>
+        <supported-locale>en</supported-locale>
+        <resource-bundle>org.apache.jetspeed.portlets.security.resources.SecurityResources</resource-bundle>
+        <portlet-preferences>
+            <preference>
+                <name>showUserTab</name>
+                <value>false</value>
+            </preference>
+            <preference>
+                <name>showAttributesTab</name>
+                <value>true</value>
+            </preference>
+            <preference>
+                <name>showPasswordTab</name>
+                <value>true</value>
+            </preference>
+            <preference>
+                <name>showRoleTab</name>
+                <value>true</value>
+            </preference>
+            <preference>
+                <name>showGroupTab</name>
+                <value>true</value>
+            </preference>
+            <preference>
+                <name>showProfileTab</name>
+                <value>true</value>
+            </preference>
+            <preference>
+                <name>showPasswordOnUserTab</name>
+                <value>false</value>
+            </preference>
+            <preference>
+                <name>showPasswordExpiration</name>
+                <value>false</value>
+            </preference>
+            <preference>
+                <name>showChangePasswordRequiredForAddUser</name>
+                <value>true</value>
+            </preference>
+            <preference>
+                <name>showRoleForAddUser</name>
+                <value>true</value>
+            </preference>
+            <preference>
+                <name>showProfileForAddUser</name>
+                <value>true</value>
+            </preference>
+            <preference>
+                <name>defaultChangePasswordRequired</name>
+                <value>false</value>
+            </preference>
+            <preference>
+                <name>defaultRole</name>
+                <value>user</value>
+            </preference>
+            <preference>
+                <name>defaultProfile</name>
+                <value>j2</value>
+            </preference>
+            <preference>
+                <name>newUserTemplateDirectory</name>
+                <value>/_user/template/</value>
+            </preference>
+        </portlet-preferences>
+        <portlet-info>
+            <title>User Detail Information</title>
+            <short-title>User</short-title>
+            <keywords>admin,security,users</keywords>
+        </portlet-info>
+    </portlet>
+
+    <portlet id="GroupDetailsPortlet">
+        <init-param>
+            <description>This parameter sets the template used in view mode.</description>
+            <name>ViewPage</name>
+            <value>/WEB-INF/security/groups/group-details.vm</value>
+        </init-param>
+        <portlet-name>GroupDetailsPortlet</portlet-name>
+        <display-name>Group Information</display-name>
+        <description>The Group Details portlet displays a groups details in a tabbed view. From here you can add, edit, and group information.</description>
+        <portlet-class>org.apache.jetspeed.portlets.security.groups.GroupDetails</portlet-class>
+        <expiration-cache>-1</expiration-cache>
+        <supports>
+            <mime-type>text/html</mime-type>
+            <portlet-mode>VIEW</portlet-mode>
+            <!-- not implemented yet
+                <portlet-mode>EDIT</portlet-mode>
+                <portlet-mode>HELP</portlet-mode>
+            -->
+        </supports>
+        <supported-locale>en</supported-locale>
+        <resource-bundle>org.apache.jetspeed.portlets.security.resources.SecurityResources</resource-bundle>
+        <portlet-info>
+            <title>Group Detail Information</title>
+            <short-title>Group</short-title>
+            <keywords>admin,security,group</keywords>
+        </portlet-info>
+    </portlet>
+
+    <portlet id="RoleDetailsPortlet">
+        <init-param>
+            <description>This parameter sets the template used in view mode.</description>
+            <name>ViewPage</name>
+            <value>/WEB-INF/security/roles/role-details.vm</value>
+        </init-param>
+        <portlet-name>RoleDetailsPortlet</portlet-name>
+        <display-name>Role Information</display-name>
+        <description>The Role Details portlet displays a roles details in a tabbed view. From here you can add, edit, and role information.</description>
+        <portlet-class>org.apache.jetspeed.portlets.security.roles.RoleDetails</portlet-class>
+        <expiration-cache>-1</expiration-cache>
+        <supports>
+            <mime-type>text/html</mime-type>
+            <portlet-mode>VIEW</portlet-mode>
+            <!-- not implemented yet
+                <portlet-mode>EDIT</portlet-mode>
+                <portlet-mode>HELP</portlet-mode>
+            -->
+        </supports>
+        <supported-locale>en</supported-locale>
+        <resource-bundle>org.apache.jetspeed.portlets.security.resources.SecurityResources</resource-bundle>
+        <portlet-info>
+            <title>Role Detail Information</title>
+            <short-title>Role</short-title>
+            <keywords>admin,security,role</keywords>
+        </portlet-info>
+    </portlet>
+
+    <portlet id="SSOBrowserPortlet">
+        <init-param>
+            <description>This parameter sets the template used in view mode.</description>
+            <name>ViewPage</name>
+            <value>/WEB-INF/security/sso/sites-view.vm</value>
+        </init-param>
+        <portlet-name>SSOBrowserPortlet</portlet-name>
+        <display-name>SSO Sites Browser</display-name>
+        <description>SSO Sites Browser Portlet</description>
+        <portlet-class>org.apache.jetspeed.portlets.security.sso.SSOBrowser</portlet-class>
+        <expiration-cache>-1</expiration-cache>
+        <supports>
+            <mime-type>text/html</mime-type>
+            <portlet-mode>VIEW</portlet-mode>
+            <!-- not implemented yet
+                <portlet-mode>EDIT</portlet-mode>
+                <portlet-mode>HELP</portlet-mode>
+            -->
+        </supports>
+        <supported-locale>en</supported-locale>
+        <resource-bundle>org.apache.jetspeed.portlets.security.resources.SSOResources</resource-bundle>
+        <portlet-info>
+            <title>SSO Sites</title>
+            <short-title>Sites</short-title>
+            <keywords>admin,security,site,SSO</keywords>
+        </portlet-info>
+    </portlet>
+
+    <portlet id="SSODetailsPortlet">
+        <init-param>
+            <description>This parameter sets the template used in view mode.</description>
+            <name>ViewPage</name>
+            <value>/WEB-INF/security/sso/sites-details.vm</value>
+        </init-param>
+        <portlet-name>SSODetailsPortlet</portlet-name>
+        <display-name>SSO Details</display-name>
+        <description>SSO Site Details Portlet</description>
+        <portlet-class>org.apache.jetspeed.portlets.security.sso.SSODetails</portlet-class>
+        <expiration-cache>-1</expiration-cache>
+        <supports>
+            <mime-type>text/html</mime-type>
+            <portlet-mode>VIEW</portlet-mode>
+            <!-- not implemented yet
+                <portlet-mode>EDIT</portlet-mode>
+                <portlet-mode>HELP</portlet-mode>
+            -->
+        </supports>
+        <supported-locale>en</supported-locale>
+        <resource-bundle>org.apache.jetspeed.portlets.security.resources.SSOResources</resource-bundle>
+        <portlet-info>
+            <title>SSO Details</title>
+            <short-title>SSO Details</short-title>
+            <keywords>admin,security,site,SSO</keywords>
+        </portlet-info>
+    </portlet>
+
+    <portlet id="UserChooser">
+        <init-param>
+            <description>This parameter sets the template used in view mode.</description>
+            <name>ViewPage</name>
+            <value>/WEB-INF/security/users/user-chooser.vm</value>
+        </init-param>
+        <portlet-name>UserChooser</portlet-name>
+        <display-name>Users</display-name>
+        <description>User Chooser Portlet</description>
+        <portlet-class>org.apache.jetspeed.portlets.security.users.UserChooserPortlet</portlet-class>
+        <expiration-cache>-1</expiration-cache>
+        <supports>
+            <mime-type>text/html</mime-type>
+            <portlet-mode>EDIT</portlet-mode>
+            <portlet-mode>VIEW</portlet-mode>
+            <portlet-mode>HELP</portlet-mode>
+        </supports>
+        <supported-locale>en</supported-locale>
+        <resource-bundle>org.apache.jetspeed.portlets.security.resources.SecurityResources</resource-bundle>
+        <portlet-preferences>
+            <preference>
+                <name>WindowSize</name>
+                <value>1000</value>
+            </preference>
+        </portlet-preferences>
+        <portlet-info>
+            <title>User Select</title>
+            <short-title>Users</short-title>
+            <keywords>admin,security,users</keywords>
+        </portlet-info>
+    </portlet>
+
+    <portlet id="UserMultiChooser">
+        <init-param>
+            <description>This parameter sets the template used in view mode.</description>
+            <name>ViewPage</name>
+            <value>/WEB-INF/security/users/user-multi-chooser.vm</value>
+        </init-param>
+        <portlet-name>UserMultiChooser</portlet-name>
+        <display-name>Choose Multiple Users</display-name>
+        <description>Multiple User Chooser Portlet</description>
+        <portlet-class>org.apache.jetspeed.portlets.security.users.UserChooserPortlet</portlet-class>
+        <expiration-cache>-1</expiration-cache>
+        <supports>
+            <mime-type>text/html</mime-type>
+            <portlet-mode>EDIT</portlet-mode>
+            <portlet-mode>VIEW</portlet-mode>
+            <portlet-mode>HELP</portlet-mode>
+        </supports>
+        <supported-locale>en</supported-locale>
+        <resource-bundle>org.apache.jetspeed.portlets.security.resources.SecurityResources</resource-bundle>
+        <portlet-preferences>
+            <preference>
+                <name>WindowSize</name>
+                <value>1000</value>
+            </preference>
+        </portlet-preferences>
+        <portlet-info>
+            <title>Users Select</title>
+            <short-title>Users</short-title>
+            <keywords>admin,security,users</keywords>
+        </portlet-info>
+    </portlet>
+
+    <portlet id="RoleChooser">
+        <init-param>
+            <description>This parameter sets the template used in view mode.</description>
+            <name>ViewPage</name>
+            <value>/WEB-INF/security/users/role-chooser.vm</value>
+        </init-param>
+        <portlet-name>RoleChooser</portlet-name>
+        <display-name>Roles</display-name>
+        <description>Role Chooser Portlet</description>
+        <portlet-class>org.apache.jetspeed.portlets.security.users.RoleChooserPortlet</portlet-class>
+        <expiration-cache>-1</expiration-cache>
+        <supports>
+            <mime-type>text/html</mime-type>
+            <portlet-mode>EDIT</portlet-mode>
+            <portlet-mode>VIEW</portlet-mode>
+            <portlet-mode>HELP</portlet-mode>
+        </supports>
+        <supported-locale>en</supported-locale>
+        <resource-bundle>org.apache.jetspeed.portlets.security.resources.SecurityResources</resource-bundle>
+        <portlet-preferences>
+            <preference>
+                <name>WindowSize</name>
+                <value>1000</value>
+            </preference>
+        </portlet-preferences>
+        <portlet-info>
+            <title>Role Select</title>
+            <short-title>Roles</short-title>
+            <keywords>admin,security,roles</keywords>
+        </portlet-info>
+    </portlet>
+
+    <portlet id="GroupChooser">
+        <init-param>
+            <description>This parameter sets the template used in view mode.</description>
+            <name>ViewPage</name>
+            <value>/WEB-INF/security/users/group-chooser.vm</value>
+        </init-param>
+        <portlet-name>GroupChooser</portlet-name>
+        <display-name>Groups</display-name>
+        <description>Group Chooser Portlet</description>
+        <portlet-class>org.apache.jetspeed.portlets.security.users.GroupChooserPortlet</portlet-class>
+        <expiration-cache>-1</expiration-cache>
+        <supports>
+            <mime-type>text/html</mime-type>
+            <portlet-mode>EDIT</portlet-mode>
+            <portlet-mode>VIEW</portlet-mode>
+            <portlet-mode>HELP</portlet-mode>
+        </supports>
+        <supported-locale>en</supported-locale>
+        <resource-bundle>org.apache.jetspeed.portlets.security.resources.SecurityResources</resource-bundle>
+        <portlet-preferences>
+            <preference>
+                <name>WindowSize</name>
+                <value>1000</value>
+            </preference>
+        </portlet-preferences>
+        <portlet-info>
+            <title>Group Select</title>
+            <short-title>Groups</short-title>
+            <keywords>admin,security,groups</keywords>
+        </portlet-info>
+    </portlet>
+
+    <portlet id="GroupBrowser">
+        <init-param>
+            <description>This parameter sets the template used in view mode.</description>
+            <name>ViewPage</name>
+            <value>/WEB-INF/security/groups/groups-view.vm</value>
+        </init-param>
+        <portlet-name>GroupBrowserPortlet</portlet-name>
+        <display-name>Group Admin</display-name>
+        <description>Group Browser Portlet</description>
+        <portlet-class>org.apache.jetspeed.portlets.security.groups.GroupBrowser</portlet-class>
+        <expiration-cache>-1</expiration-cache>
+        <supports>
+            <mime-type>text/html</mime-type>
+            <portlet-mode>VIEW</portlet-mode>
+        </supports>
+        <supported-locale>en</supported-locale>
+        <resource-bundle>org.apache.jetspeed.portlets.security.resources.SecurityResources</resource-bundle>
+        <portlet-preferences>
+            <preference>
+                <name>WindowSize</name>
+                <value>1000</value>
+            </preference>
+        </portlet-preferences>
+        <portlet-info>
+            <title>Group admin</title>
+            <short-title>Groups</short-title>
+            <keywords>admin,security,groups</keywords>
+        </portlet-info>
+    </portlet>
+
+    <portlet id="RoleBrowser">
+        <init-param>
+            <description>This parameter sets the template used in view mode.</description>
+            <name>ViewPage</name>
+            <value>/WEB-INF/security/roles/roles-view.vm</value>
+        </init-param>
+        <portlet-name>RoleBrowserPortlet</portlet-name>
+        <display-name>Role Admin</display-name>
+        <description>Role Browser Portlet</description>
+        <portlet-class>org.apache.jetspeed.portlets.security.roles.RoleBrowser</portlet-class>
+        <expiration-cache>-1</expiration-cache>
+        <supports>
+            <mime-type>text/html</mime-type>
+            <portlet-mode>VIEW</portlet-mode>
+        </supports>
+        <supported-locale>en</supported-locale>
+        <resource-bundle>org.apache.jetspeed.portlets.security.resources.SecurityResources</resource-bundle>
+        <portlet-preferences>
+            <preference>
+                <name>WindowSize</name>
+                <value>1000</value>
+            </preference>
+        </portlet-preferences>
+        <portlet-info>
+            <title>Role admin</title>
+            <short-title>Roles</short-title>
+            <keywords>admin,security,roles</keywords>
+        </portlet-info>
+    </portlet>
 
 </portlet-app>
 

Modified: portals/jetspeed-2/trunk/applications/security/src/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/applications/security/src/webapp/WEB-INF/web.xml?rev=329461&r1=329460&r2=329461&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/applications/security/src/webapp/WEB-INF/web.xml (original)
+++ portals/jetspeed-2/trunk/applications/security/src/webapp/WEB-INF/web.xml Sat Oct 29 11:06:32 2005
@@ -19,120 +19,8 @@
 <web-app>
 	<display-name>Security Portlets</display-name>
 	<description>Security Portlets</description>
-	
-	<context-param>
-    	<param-name>javax.faces.application.CONFIG_FILES</param-name>
-    	<param-value>/WEB-INF/faces-config.xml</param-value>
-  	</context-param>
-   	<context-param>
-        <param-name>org.apache.myfaces.ALLOW_JAVASCRIPT</param-name>
-        <param-value>true</param-value>
-        <description>
-            This parameter tells MyFaces if javascript code should be allowed in the
-            rendered HTML output.
-            If javascript is allowed, command_link anchors will have javascript code
-            that submits the corresponding form.
-            If javascript is not allowed, the state saving info and nested parameters
-            will be added as url parameters.
-            Default: "true"
-        </description>
-    </context-param>
-    
-    <context-param>
-        <param-name>org.apache.myfaces.DETECT_JAVASCRIPT</param-name>
-        <param-value>false</param-value>
-        <description>
-            This parameter tells MyFaces if javascript code should be allowed in the
-            rendered HTML output.
-            If javascript is allowed, command_link anchors will have javascript code
-            that submits the corresponding form.
-            If javascript is not allowed, the state saving info and nested parameters
-            will be added as url parameters.
-            Default: "false"
 
-            Setting this param to true should be combined with STATE_SAVING_METHOD "server" for
-            best results.
-
-            This is an EXPERIMENTAL feature. You also have to enable the detector filter/filter mapping below to get
-            JavaScript detection working.
-        </description>
-    </context-param>
-
-    <context-param>
-        <param-name>org.apache.myfaces.PRETTY_HTML</param-name>
-        <param-value>true</param-value>
-        <description>
-            If true, rendered HTML code will be formatted, so that it is "human readable".
-            i.e. additional line separators and whitespace will be written, that do not
-            influence the HTML code.
-            Default: "true"
-        </description>
-    </context-param>
-
-    <context-param>
-        <param-name>org.apache.myfaces.AUTO_SCROLL</param-name>
-        <param-value>true</param-value>
-        <description>
-            If true, a javascript function will be rendered that is able to restore the
-            former vertical scroll on every request. Convenient feature if you have pages
-            with long lists and you do not want the browser page to always jump to the top
-            if you trigger a link or button action that stays on the same page.
-            Default: "false"
-        </description>
-    </context-param>
-
-    <!-- Extensions Filter -->
-    <filter>
-        <filter-name>extensionsFilter</filter-name>
-        <filter-class>org.apache.myfaces.component.html.util.ExtensionsFilter</filter-class>
-        <init-param>
-            <param-name>uploadMaxFileSize</param-name>
-            <param-value>100m</param-value>
-            <description>Set the size limit for uploaded files.
-                Format: 10 - 10 bytes
-                        10k - 10 KB
-                        10m - 10 MB
-                        1g - 1 GB
-            </description>
-        </init-param>
-        <init-param>
-            <param-name>uploadThresholdSize</param-name>
-            <param-value>100k</param-value>
-            <description>Set the threshold size - files
-                    below this limit are stored in memory, files above
-                    this limit are stored on disk.
-
-                Format: 10 - 10 bytes
-                        10k - 10 KB
-                        10m - 10 MB
-                        1g - 1 GB
-            </description>
-        </init-param>
-	</filter>
-
-    <!-- Filter Mappings -->
-    <filter-mapping>
-        <filter-name>extensionsFilter</filter-name>
-        <url-pattern>*.jsf</url-pattern>
-    </filter-mapping>
-    <filter-mapping>
-        <filter-name>extensionsFilter</filter-name>
-        <url-pattern>/faces/*</url-pattern>
-    </filter-mapping>
-
-    <!-- Listener, that does all the startup work (configuration, init). -->
-  	<listener>
-    	<listener-class>org.apache.myfaces.webapp.StartupServletContextListener</listener-class>
-  	</listener>
-  
-  	<!-- Faces Servlet -->
-  	<servlet>
-    	<servlet-name>Faces Servlet</servlet-name>
-    	<servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
-    	<load-on-startup>1</load-on-startup>
-  	</servlet>
-  	
-  	<!-- Define Velocity Servlet -->
+    <!-- Define Velocity Servlet -->
 	<servlet>
 		<servlet-name>velocity</servlet-name>
 		<servlet-class>org.apache.portals.bridges.velocity.BridgesVelocityViewServlet</servlet-class>
@@ -147,14 +35,7 @@
 		<load-on-startup>10</load-on-startup>
 	</servlet>
   	
-  	<!-- extension mapping -->
-  	<!-- Faces mapping -->
-  	<servlet-mapping>
-  		<servlet-name>Faces Servlet</servlet-name>
-   		<url-pattern>*.jsf</url-pattern>
-  	</servlet-mapping>	
-  	
-    <!-- Map *.vm files to Velocity  -->
+  	<!-- Map *.vm files to Velocity  -->
 	<servlet-mapping>
 		<servlet-name>velocity</servlet-name>
 		<url-pattern>*.vm</url-pattern>

Modified: portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/psml/AbstractBaseElement.java
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/psml/AbstractBaseElement.java?rev=329461&r1=329460&r2=329461&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/psml/AbstractBaseElement.java (original)
+++ portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/psml/AbstractBaseElement.java Sat Oct 29 11:06:32 2005
@@ -573,7 +573,7 @@
      */
     public int hashCode()
     {
-        return id.hashCode();
+        return ((null != id) ? id.hashCode() : -1);
     }
     
     /**

Modified: portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/psml/FragmentImpl.java
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/psml/FragmentImpl.java?rev=329461&r1=329460&r2=329461&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/psml/FragmentImpl.java (original)
+++ portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/psml/FragmentImpl.java Sat Oct 29 11:06:32 2005
@@ -344,15 +344,16 @@
      */
     public boolean equals( Object obj )
     {
+        boolean isEqual = false;
         if (obj != null && obj instanceof Fragment)
         {
             Fragment aFragment = (Fragment) obj;
-            return getId().equals(aFragment.getId());
-        }
-        else
-        {
-            return false;
+            if ((null != aFragment.getId()) && (null != getId()) && (getId().equals(aFragment.getId())))
+            {
+                isEqual = true;
+            }
         }
+        return isEqual;
     }
 
     /**

Modified: portals/jetspeed-2/trunk/components/registry/src/test/org/apache/jetspeed/components/portletentity/TestPortletEntityDAO.java
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/registry/src/test/org/apache/jetspeed/components/portletentity/TestPortletEntityDAO.java?rev=329461&r1=329460&r2=329461&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/registry/src/test/org/apache/jetspeed/components/portletentity/TestPortletEntityDAO.java (original)
+++ portals/jetspeed-2/trunk/components/registry/src/test/org/apache/jetspeed/components/portletentity/TestPortletEntityDAO.java Sat Oct 29 11:06:32 2005
@@ -250,9 +250,7 @@
             return f.getType();
         }
 
-        /*
-         * (non-Javadoc)
-         * 
+        /** 
          * @see java.lang.Object#hashCode()
          */
         public int hashCode()
@@ -285,14 +283,6 @@
         }
 
         /**
-         * @param id
-         */
-        public void setId(String id)
-        {
-            f.setId(id);
-        }
-
-        /**
          * @param name
          */
         public void setName(String name)
@@ -358,9 +348,7 @@
             f.setType(type);
         }
 
-        /*
-         * (non-Javadoc)
-         * 
+        /** 
          * @see java.lang.Object#toString()
          */
         public String toString()
@@ -373,9 +361,7 @@
             return f.clone();
         }
 
-        /*
-         * (non-Javadoc)
-         * 
+        /** 
          * @see org.apache.jetspeed.om.page.ContentFragment#getContentFragments()
          */
         public List getContentFragments()
@@ -384,9 +370,7 @@
             return null;
         }
 
-        /*
-         * (non-Javadoc)
-         * 
+        /** 
          * @see org.apache.jetspeed.om.page.ContentFragment#getRenderedContent()
          */
         public String getRenderedContent() throws IllegalStateException
@@ -395,9 +379,7 @@
             return null;
         }
 
-        /*
-         * (non-Javadoc)
-         * 
+        /** 
          * @see org.apache.jetspeed.om.page.ContentFragment#overrideRenderedContent(java.lang.String)
          */
         public void overrideRenderedContent(String contnent)
@@ -406,9 +388,7 @@
 
         }
 
-        /*
-         * (non-Javadoc)
-         * 
+        /** 
          * @see org.apache.jetspeed.om.page.ContentFragment#setPortletContent(org.apache.jetspeed.aggregator.PortletContent)
          */
         public void setPortletContent(PortletContent portletContent)
@@ -416,6 +396,62 @@
             // TODO Auto-generated method stub
 
         }
+
+        /**
+         * @see org.apache.jetspeed.om.page.Fragment#getLayoutColumn()
+         */
+        public int getLayoutColumn()
+        {
+            // TODO Auto-generated method stub
+            return 0;
+        }
+
+        /**
+         * @see org.apache.jetspeed.om.page.Fragment#getLayoutRow()
+         */
+        public int getLayoutRow()
+        {
+            // TODO Auto-generated method stub
+            return 0;
+        }
+
+        /**
+         * @see org.apache.jetspeed.om.page.Fragment#getLayoutSizes()
+         */
+        public String getLayoutSizes()
+        {
+            // TODO Auto-generated method stub
+            return null;
+        }
+
+        /**
+         * @see org.apache.jetspeed.om.page.Fragment#setLayoutColumn(int)
+         */
+        public void setLayoutColumn(int column)
+        {
+            // TODO Auto-generated method stub
+            
+        }
+
+        /**
+         * @see org.apache.jetspeed.om.page.Fragment#setLayoutRow(int)
+         */
+        public void setLayoutRow(int row)
+        {
+            // TODO Auto-generated method stub
+            
+        }
+
+        /**
+         * @see org.apache.jetspeed.om.page.Fragment#setLayoutSizes(java.lang.String)
+         */
+        public void setLayoutSizes(String sizes)
+        {
+            // TODO Auto-generated method stub
+            
+        }
+        
+        
     }
 
     private static final String TEST_APP = "EntityTestApp";

Modified: portals/jetspeed-2/trunk/layout-portlets/src/test/org/apache/jetspeed/portlets/layout/TestColumnLayout.java
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/layout-portlets/src/test/org/apache/jetspeed/portlets/layout/TestColumnLayout.java?rev=329461&r1=329460&r2=329461&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/layout-portlets/src/test/org/apache/jetspeed/portlets/layout/TestColumnLayout.java (original)
+++ portals/jetspeed-2/trunk/layout-portlets/src/test/org/apache/jetspeed/portlets/layout/TestColumnLayout.java Sat Oct 29 11:06:32 2005
@@ -288,7 +288,7 @@
 
         // This is a test to make sure the next row pointer is being decremented
         // correctly
-        Fragment f7 = new FragmentImpl();
+        FragmentImpl f7 = new FragmentImpl();
         f7.setId("f7");
         f7.setPropertyValue("test", "row", "0");
         f7.setPropertyValue("test", "column", "1");



---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org


Mime
View raw message