directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From smckin...@apache.org
Subject directory-fortress-core git commit: FC-73 - Fix javadoc problems
Date Mon, 09 Mar 2015 19:10:10 GMT
Repository: directory-fortress-core
Updated Branches:
  refs/heads/master a698d74da -> 8fc5dd152


FC-73 - Fix javadoc problems


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/8fc5dd15
Tree: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/tree/8fc5dd15
Diff: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/diff/8fc5dd15

Branch: refs/heads/master
Commit: 8fc5dd1521247577065381664b987eb9e329065c
Parents: a698d74
Author: Shawn McKinney <smckinney@apache.org>
Authored: Mon Mar 9 14:09:55 2015 -0500
Committer: Shawn McKinney <smckinney@apache.org>
Committed: Mon Mar 9 14:09:55 2015 -0500

----------------------------------------------------------------------
 ldap/setup/TomcatManagerUsers.xml                           | 9 +++++----
 .../fortress/core/doc-files/apache-fortress-web.html        | 8 ++++----
 .../directory/fortress/core/doc-files/apache-tomcat.html    | 5 +++--
 3 files changed, 12 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/8fc5dd15/ldap/setup/TomcatManagerUsers.xml
----------------------------------------------------------------------
diff --git a/ldap/setup/TomcatManagerUsers.xml b/ldap/setup/TomcatManagerUsers.xml
index f5e8349..6513015 100755
--- a/ldap/setup/TomcatManagerUsers.xml
+++ b/ldap/setup/TomcatManagerUsers.xml
@@ -26,12 +26,13 @@
         <FortressAdmin>
 
             <adduser>
-                <user userId="tcmanager" password="m@nager123" system="true" description="Tomcat
Manager User" ou="demousrs1" cn="tcmanager" sn="manager"  pwPolicy="Test1" beginTime="0000"
endTime="0000" beginDate="20090101" endDate="20990101" beginLockDate="" endLockDate="" dayMask="1234567"
timeout="0" />
+                <user userId="tcmanager" password="m@nager123" system="true" description="Service
account for maven deployment scripts" ou="tc1" />
+                <user userId="tcmanagergui" password="m@nager123" system="true" description="Tomcat
Manager User" ou="tc1" />
             </adduser>
 
             <adduserrole>
-                <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="tcmanagergui" name="manager-gui" />
+                <userrole userId="tcmanager" name="manager-script" />
             </adduserrole>
 
             <addrole>
@@ -41,7 +42,7 @@
 
             <!-- Begin ARBAC Delegated Admin Data: -->
             <addorgunit>
-                <orgunit name="demousrs1" typeName="USER" description="Test User Org 1
for User on Tomcat Calendar App"/>
+                <orgunit name="tc1" typeName="USER" description="TC Test User Org"/>
             </addorgunit>
 
          </FortressAdmin>

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/8fc5dd15/src/main/java/org/apache/directory/fortress/core/doc-files/apache-fortress-web.html
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/doc-files/apache-fortress-web.html
b/src/main/java/org/apache/directory/fortress/core/doc-files/apache-fortress-web.html
index 1a284e4..f024ce8 100755
--- a/src/main/java/org/apache/directory/fortress/core/doc-files/apache-fortress-web.html
+++ b/src/main/java/org/apache/directory/fortress/core/doc-files/apache-fortress-web.html
@@ -107,19 +107,19 @@ mvn tomcat:redeploy
               <br><br>
               <ol type="a">
                   <li>
-                      <b>userId</b>: <i>test</i>, <b>password</b>:
<i>test</i>
+                      <b>userId</b>: <i>test</i>, <b>password</b>:
<i>password</i>
                   </li>
                   <br>
                   <li>
-                      <b>userId</b>: <i>test1</i>, <b>password</b>:
<i>test</i>
+                      <b>userId</b>: <i>test1</i>, <b>password</b>:
<i>password</i>
                   </li>
                   <br>
                   <li>
-                      <b>userId</b>: <i>test2</i>, <b>password</b>:
<i>test</i>
+                      <b>userId</b>: <i>test2</i>, <b>password</b>:
<i>password</i>
                   </li>
                   <br>
                   <li>
-                      <b>userId</b>: <i>test3</i>, <b>password</b>:
<i>test</i>
+                      <b>userId</b>: <i>test3</i>, <b>password</b>:
<i>password</i>
                   </li>
               </ol>
           </li>

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/8fc5dd15/src/main/java/org/apache/directory/fortress/core/doc-files/apache-tomcat.html
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/doc-files/apache-tomcat.html
b/src/main/java/org/apache/directory/fortress/core/doc-files/apache-tomcat.html
index 76a2e67..4e8987a 100755
--- a/src/main/java/org/apache/directory/fortress/core/doc-files/apache-tomcat.html
+++ b/src/main/java/org/apache/directory/fortress/core/doc-files/apache-tomcat.html
@@ -102,7 +102,8 @@ vi /usr/local/tomcat7/conf/tomcat-users.xml
             <p style="font: monospace; color: black; background-color: lightgrey; font-size:
10pt">
 &lt;role rolename="manager-script"/&gt;
 &lt;role rolename="manager-gui"/&gt;
-&lt;user username="tcmanager" password="m@nager123" roles="manager-script,manager-gui"/&gt;
+&lt;user username="tcmanager" password="m@nager123" roles="manager-script"/&gt;
+&lt;user username="tcmanagergui" password="m@nager123" roles="manager-gui"/&gt;
             </p>
         </pre>
         Using the config file realm to store credentials for an important application like
the Tomcat Manager is a
@@ -143,7 +144,7 @@ tail -f -n10000 /usr/local/tomcat7/logs/catalina.out
     <br>
 
     <li>
-        Verify setup by signing onto the Tomcat Manager app with credentials <b>userId</b>:
<i>tcmanager</i>, <b>password</b>:
+        Verify setup by signing onto the Tomcat Manager app with credentials <b>userId</b>:
<i>tcmanagergui</i>, <b>password</b>:
         <i>m@nager123</i>
         <br><br>
                 <a href="http://localhost:8080/manager">http://localhost:8080/manager</a>


Mime
View raw message