You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by el...@apache.org on 2014/10/21 01:07:03 UTC
[46/50] git commit: FC-148 - Extend password max age for demo users
FC-148 - Extend password max age for demo users
Project: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/commit/23001622
Tree: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/tree/23001622
Diff: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/diff/23001622
Branch: refs/heads/master
Commit: 23001622084afcafda4cac5fe3c50a7c0ecdabde
Parents: 1b0a0bc
Author: Shawn McKinney <sh...@jts.us>
Authored: Fri Sep 5 08:38:07 2014 -0500
Committer: Shawn McKinney <sh...@jts.us>
Committed: Fri Sep 5 08:38:07 2014 -0500
----------------------------------------------------------------------
config/log4j.xml | 12 ++++++------
ldap/setup/FortressDemoUsers.xml | 10 +++++-----
2 files changed, 11 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/23001622/config/log4j.xml
----------------------------------------------------------------------
diff --git a/config/log4j.xml b/config/log4j.xml
index d9a1b4a..8c77cca 100755
--- a/config/log4j.xml
+++ b/config/log4j.xml
@@ -32,12 +32,12 @@
<appender-ref ref="console"/>
</category>
-<!--
- <category name="org.apache.directory.api" class="org.apache.log4j.Logger" additivity="false">
- <priority value="DEBUG" class="org.apache.log4j.Level"/>
- <appender-ref ref="file"/>
- </category>
--->
+ <!--
+ <category name="org.apache.directory.api" class="org.apache.log4j.Logger" additivity="false">
+ <priority value="DEBUG" class="org.apache.log4j.Level"/>
+ <appender-ref ref="file"/>
+ </category>
+ -->
<root>
<priority value="INFO" class="org.apache.log4j.Level"/>
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/23001622/ldap/setup/FortressDemoUsers.xml
----------------------------------------------------------------------
diff --git a/ldap/setup/FortressDemoUsers.xml b/ldap/setup/FortressDemoUsers.xml
index 40ca567..25a24c4 100755
--- a/ldap/setup/FortressDemoUsers.xml
+++ b/ldap/setup/FortressDemoUsers.xml
@@ -140,16 +140,16 @@
<userrole userId="demoUser10" name="role1" beginTime="0000" endTime="0000" beginDate="" endDate="" beginLockDate="" endLockDate="" dayMask="" timeout="0"/>
<userrole userId="tcmanager" name="manager-gui" beginTime="0000" endTime="0000" beginDate="" endDate="" beginLockDate="" endLockDate="" dayMask="" timeout="0"/>
+ <userrole userId="tcmanager" name="manager-script" beginTime="0000" endTime="0000" beginDate="" endDate="" beginLockDate="" endLockDate="" dayMask="" timeout="0"/>
<userrole userId="tcmanager" name="manager" beginTime="0000" endTime="0000" beginDate="" endDate="" beginLockDate="" endLockDate="" dayMask="" timeout="0"/>
- <userrole userId="tcmanager" name="manager-jmx" beginTime="0000" endTime="0000" beginDate="" endDate="" beginLockDate="" endLockDate="" dayMask="" timeout="0"/>
</adduserrole>
<addrole>
<role name="role1" description="Tomcat Role 1 for Calendar App"/>
<role name="role2" description="Tomcat Role 2 for Calendar App"/>
- <role name="manager-gui" description="Tomcat 7 Manager Role"/>
+ <role name="manager-gui" description="Tomcat 7 Manager Role for Manager UI"/>
+ <role name="manager-script" description="Tomcat 7 Manager Role for Management Scripts"/>
<role name="manager" description="Tomcat Manager Role"/>
- <role name="manager-jmx" description="Tomcat Manager Role"/>
<role name="EnmasseSuperUser" description="Role to access En Masse services"/>
</addrole>
@@ -189,11 +189,11 @@
<!-- safe modify must be false iff user can chg pw after reset -->
<policy name="Test1"
minAge="0"
- maxAge="525600"
+ maxAge="7776000"
inHistory="5"
checkQuality="2"
minLength="4"
- expireWarning="1000000"
+ expireWarning="2592000"
graceLoginLimit="3"
lockout="true"
lockoutDuration="0"