You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jetspeed-dev@portals.apache.org by ta...@apache.org on 2002/02/25 05:25:37 UTC
cvs commit: jakarta-jetspeed/webapp/WEB-INF/templates/vm/portlets/html user-form.vm
taylor 02/02/24 20:25:37
Modified: webapp/WEB-INF/conf JetspeedResources.properties
TurbineResources.properties
webapp/WEB-INF/db jetspeed.script
webapp/WEB-INF/templates/vm GlobalMacros.vm
webapp/WEB-INF/templates/vm/portlets/html user-form.vm
Log:
- added 'Disabled' field to User edit form
- updated sample database to support disabled column
- modified TR.p to support extended-turbine 'User' interface: JetspeedUser with impl BaseJetspeedUser
services.SecurityService.user.class=org.apache.jetspeed.om.security.BaseJetspeedUser
services.SecurityService.userPeer.class=org.apache.jetspeed.om.security.peer.TurbineUserPeerAdapter
database.maps.builder=org.apache.jetspeed.om.security.db.map.JetspeedMapBuilderAdapter
- added several feature configurations to JR.p
- disable account feature after n logon failures over a time interval
- made automatic saving of user during logoff without a transaction optional - by default false
- disabled account feature, and form to display when account is disabled
services.JetspeedSecurity.logon.auto.disable=true
logon.disabled.form=AccountDisabled.vm
Revision Changes Path
1.65 +14 -1 jakarta-jetspeed/webapp/WEB-INF/conf/JetspeedResources.properties
Index: JetspeedResources.properties
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/webapp/WEB-INF/conf/JetspeedResources.properties,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- JetspeedResources.properties 23 Feb 2002 23:07:32 -0000 1.64
+++ JetspeedResources.properties 25 Feb 2002 04:25:37 -0000 1.65
@@ -1,7 +1,7 @@
################################################################################
# Jetspeed Configuration
# Author: Kevin A. Burton (burton@apache.org)
-# $Id: JetspeedResources.properties,v 1.64 2002/02/23 23:07:32 taylor Exp $
+# $Id: JetspeedResources.properties,v 1.65 2002/02/25 04:25:37 taylor Exp $
################################################################################
# This is the main file you will need to configuration Jetspeed. If there are
# any secondary files they will be pointed to from this file.
@@ -412,6 +412,16 @@
services.JetspeedSecurity.caseinsensitive.password=false
services.JetspeedSecurity.caseinsensitive.upper=true
+# Auto-Account-Disable Feature
+services.JetspeedSecurity.logon.auto.disable=true
+
+# 3 logon strikes per 300 seconds and your out
+services.JetspeedSecurity.logon.strike.count=3
+services.JetspeedSecurity.logon.strike.interval=300
+# dont allow more than 10 over any time period
+services.JetspeedSecurity.logon.strike.max=10
+
+
#########################################
# Template Locator Service #
#########################################
@@ -491,6 +501,9 @@
# useful for getting a little added security (default)
automatic.logon.cookie.generation=everylogon
+# automatically save user state on logout
+automatic.logout.save = false
+logon.disabled.form=AccountDisabled.vm
#########################################
# Navigation Bar customization #
1.43 +7 -4 jakarta-jetspeed/webapp/WEB-INF/conf/TurbineResources.properties
Index: TurbineResources.properties
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/webapp/WEB-INF/conf/TurbineResources.properties,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- TurbineResources.properties 13 Feb 2002 20:33:10 -0000 1.42
+++ TurbineResources.properties 25 Feb 2002 04:25:37 -0000 1.43
@@ -1,5 +1,5 @@
# -------------------------------------------------------------------
-# $Id: TurbineResources.properties,v 1.42 2002/02/13 20:33:10 taylor Exp $
+# $Id: TurbineResources.properties,v 1.43 2002/02/25 04:25:37 taylor Exp $
#
# This is the configuration file for Turbine.
#
@@ -344,7 +344,8 @@
# Default: org.apache.turbine.util.db.map.TurbineMapBuilder
# -------------------------------------------------------------------
-database.maps.builder=org.apache.turbine.util.db.map.TurbineMapBuilder
+# database.maps.builder=org.apache.turbine.util.db.map.TurbineMapBuilder
+database.maps.builder=org.apache.jetspeed.om.security.db.map.JetspeedMapBuilderAdapter
# -------------------------------------------------------------------
#
@@ -776,7 +777,8 @@
# Default: org.apache.turbine.om.security.TurbineUser
#
-services.SecurityService.user.class=org.apache.turbine.om.security.TurbineUser
+# services.SecurityService.user.class=org.apache.turbine.om.security.TurbineUser
+services.SecurityService.user.class=org.apache.jetspeed.om.security.BaseJetspeedUser
#
# This setting is DBSecurityService specific - this class is consulted for the names
@@ -787,7 +789,8 @@
#
# Defalut: org.apache.turbine.om.security.peer.TurbineUserPeer
#
-services.SecurityService.userPeer.class=org.apache.turbine.om.security.peer.TurbineUserPeer
+# services.SecurityService.userPeer.class=org.apache.turbine.om.security.peer.TurbineUserPeer
+services.SecurityService.userPeer.class=org.apache.jetspeed.om.security.peer.TurbineUserPeerAdapter
#
# This is the class that implements UserManager interface.
1.12 +3 -3 jakarta-jetspeed/webapp/WEB-INF/db/jetspeed.script
Index: jetspeed.script
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/webapp/WEB-INF/db/jetspeed.script,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- jetspeed.script 20 Nov 2001 04:55:29 -0000 1.11
+++ jetspeed.script 25 Feb 2002 04:25:37 -0000 1.12
@@ -1,7 +1,7 @@
CREATE TABLE TURBINE_PERMISSION(PERMISSION_ID INTEGER NOT NULL IDENTITY PRIMARY KEY,PERMISSION_NAME VARCHAR NOT NULL,OBJECTDATA BINARY)
CREATE TABLE TURBINE_ROLE(ROLE_ID INTEGER NOT NULL IDENTITY PRIMARY KEY,ROLE_NAME VARCHAR NOT NULL,OBJECTDATA BINARY)
CREATE TABLE TURBINE_GROUP(GROUP_ID INTEGER NOT NULL IDENTITY PRIMARY KEY,GROUP_NAME VARCHAR NOT NULL,OBJECTDATA BINARY)
-CREATE TABLE TURBINE_USER(USER_ID INTEGER NOT NULL IDENTITY PRIMARY KEY,LOGIN_NAME VARCHAR NOT NULL,PASSWORD_VALUE VARCHAR NOT NULL,FIRST_NAME VARCHAR NOT NULL,LAST_NAME VARCHAR NOT NULL,EMAIL VARCHAR,CONFIRM_VALUE VARCHAR,MODIFIED TIMESTAMP,CREATED TIMESTAMP,LAST_LOGIN TIMESTAMP,OBJECTDATA BINARY)
+CREATE TABLE TURBINE_USER(USER_ID INTEGER NOT NULL IDENTITY PRIMARY KEY,LOGIN_NAME VARCHAR NOT NULL,PASSWORD_VALUE VARCHAR NOT NULL,FIRST_NAME VARCHAR NOT NULL,LAST_NAME VARCHAR NOT NULL,EMAIL VARCHAR,CONFIRM_VALUE VARCHAR,MODIFIED TIMESTAMP,CREATED TIMESTAMP,LAST_LOGIN TIMESTAMP,DISABLED CHAR,OBJECTDATA BINARY)
CREATE TABLE TURBINE_ROLE_PERMISSION(ROLE_ID INTEGER NOT NULL,PERMISSION_ID INTEGER NOT NULL)
CREATE UNIQUE INDEX ROLE_PERMISSION_INDEX ON TURBINE_ROLE_PERMISSION(ROLE_ID,PERMISSION_ID)
CREATE TABLE TURBINE_USER_GROUP_ROLE(USER_ID INTEGER NOT NULL,GROUP_ID INTEGER NOT NULL,ROLE_ID INTEGER NOT NULL)
@@ -96,8 +96,8 @@
INSERT INTO TURBINE_ROLE VALUES(2,'admin',NULL)
INSERT INTO TURBINE_GROUP VALUES(1,'Jetspeed',NULL)
INSERT INTO TURBINE_GROUP VALUES(2,'apache',NULL)
-INSERT INTO TURBINE_USER VALUES(0,'turbine','turbine','Tommy','Turbine','david@bluesunrise.com','CONFIRMED',NULL,NULL,'2001-11-11 18:45:32.671','aced0005737200136a6176612e7574696c2e486173687461626c6513bb0f25214ae4b803000246000a6c6f6164466163746f724900097468726573686f6c6478703f400000000000027708000000030000000174000f5f6163636573735f636f756e746572737200116a6176612e6c616e672e496e746567657212e2a0a4f781873802000149000576616c7565787200106a6176612e6c616e672e4e756d62657286ac951d0b94e08b02000078700000007678')
-INSERT INTO TURBINE_USER VALUES(1,'admin','jetspeed','Jetspeed','Admin','david@bluesunrise.com','CONFIRMED',NULL,NULL,'2001-11-11 18:45:41.671','aced0005737200136a6176612e7574696c2e486173687461626c6513bb0f25214ae4b803000246000a6c6f6164466163746f724900097468726573686f6c6478703f400000000000027708000000030000000174000f5f6163636573735f636f756e746572737200116a6176612e6c616e672e496e746567657212e2a0a4f781873802000149000576616c7565787200106a6176612e6c616e672e4e756d62657286ac951d0b94e08b0200007870000000a978')
+INSERT INTO TURBINE_USER VALUES(0,'turbine','turbine','Tommy','Turbine','david@bluesunrise.com','CONFIRMED',NULL,NULL,'2001-11-11 18:45:32.671','F','aced0005737200136a6176612e7574696c2e486173687461626c6513bb0f25214ae4b803000246000a6c6f6164466163746f724900097468726573686f6c6478703f400000000000027708000000030000000174000f5f6163636573735f636f756e746572737200116a6176612e6c616e672e496e746567657212e2a0a4f781873802000149000576616c7565787200106a6176612e6c616e672e4e756d62657286ac951d0b94e08b02000078700000007678')
+INSERT INTO TURBINE_USER VALUES(1,'admin','jetspeed','Jetspeed','Admin','david@bluesunrise.com','CONFIRMED',NULL,NULL,'2001-11-11 18:45:41.671','F','aced0005737200136a6176612e7574696c2e486173687461626c6513bb0f25214ae4b803000246000a6c6f6164466163746f724900097468726573686f6c6478703f400000000000027708000000030000000174000f5f6163636573735f636f756e746572737200116a6176612e6c616e672e496e746567657212e2a0a4f781873802000149000576616c7565787200106a6176612e6c616e672e4e756d62657286ac951d0b94e08b0200007870000000a978')
INSERT INTO TURBINE_ROLE_PERMISSION VALUES(1,1)
INSERT INTO TURBINE_ROLE_PERMISSION VALUES(1,2)
INSERT INTO TURBINE_ROLE_PERMISSION VALUES(1,3)
1.4 +7 -0 jakarta-jetspeed/webapp/WEB-INF/templates/vm/GlobalMacros.vm
Index: GlobalMacros.vm
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/webapp/WEB-INF/templates/vm/GlobalMacros.vm,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- GlobalMacros.vm 11 Jul 2001 21:56:24 -0000 1.3
+++ GlobalMacros.vm 25 Feb 2002 04:25:37 -0000 1.4
@@ -79,6 +79,13 @@
</td>
#end
+#macro (formCheckBox2 $label $name $checked)
+ #formLabel("$label")
+ <td bgcolor="$!{skin.TitleBackgroundColor}">
+ <input type="checkbox" name="$name" #if($checked)checked=1#end/>
+ </td>
+#end
+
#macro (formListBox $label $list)
<td bgcolor="$!{skin.TitleBackgroundColor}">
<b>
1.4 +6 -1 jakarta-jetspeed/webapp/WEB-INF/templates/vm/portlets/html/user-form.vm
Index: user-form.vm
===================================================================
RCS file: /home/cvs/jakarta-jetspeed/webapp/WEB-INF/templates/vm/portlets/html/user-form.vm,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- user-form.vm 27 Nov 2001 11:01:29 -0000 1.3
+++ user-form.vm 25 Feb 2002 04:25:37 -0000 1.4
@@ -3,7 +3,7 @@
Display the details of a user.
@author <a href="mailto:taylor@apache.org">David Sean Taylor</a>
-@version $Id: user-form.vm,v 1.3 2001/11/27 11:01:29 kimptoc Exp $
+@version $Id: user-form.vm,v 1.4 2002/02/25 04:25:37 taylor Exp $
*#
<form method="post" action="$jlink.setPanel("User Browser").setAction("portlets.security.UserUpdateAction")">
@@ -31,12 +31,14 @@
#set ($fname = "")
#set ($lname = "")
#set ($email = "")
+ #set ($disabled = "")
#else
#set ($name = $user.UserName)
#set ($pw = $user.Password)
#set ($fname = $user.FirstName)
#set ($lname = $user.LastName)
#set ($email = $user.Email)
+ #set ($disabled = $user.Disabled)
#end
#formCell ("Username" "username" $name)
</tr>
@@ -51,6 +53,9 @@
</tr>
<tr>
#formCell ("Email" "email" $email)
+ </tr>
+ <tr>
+ #formCheckBox2 ("Disabled" "disabled" $disabled)
</tr>
#if ($user.Confirmed != "PENDING")
<tr>
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>