You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by sm...@apache.org on 2015/02/09 03:09:12 UTC

directory-fortress-core git commit: FC-56 - fix the studio setup

Repository: directory-fortress-core
Updated Branches:
  refs/heads/master 792273900 -> 946d5971b


FC-56 - fix the studio setup


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

Branch: refs/heads/master
Commit: 946d5971ba8722fa93815b2107080c171cf0fac8
Parents: 7922739
Author: Shawn McKinney <sm...@apache.org>
Authored: Sun Feb 8 20:08:57 2015 -0600
Committer: Shawn McKinney <sm...@apache.org>
Committed: Sun Feb 8 20:08:57 2015 -0600

----------------------------------------------------------------------
 .../fortress/core/doc-files/apache-directory-studio.html  |  9 ++++-----
 .../directory/fortress/core/doc-files/apache-tomcat.html  | 10 +++++-----
 .../fortress/core/doc-files/ten-minute-guide.html         |  4 ++--
 3 files changed, 11 insertions(+), 12 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/946d5971/src/main/java/org/apache/directory/fortress/core/doc-files/apache-directory-studio.html
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/doc-files/apache-directory-studio.html b/src/main/java/org/apache/directory/fortress/core/doc-files/apache-directory-studio.html
index babee25..00276df 100644
--- a/src/main/java/org/apache/directory/fortress/core/doc-files/apache-directory-studio.html
+++ b/src/main/java/org/apache/directory/fortress/core/doc-files/apache-directory-studio.html
@@ -56,8 +56,8 @@ This section provides instructions to install and configure Apache Directory Stu
 # mkdir tmp
 # cd tmp
 # wget http://mirrors.ibiblio.org/apache//directory/studio/dist/2.0.0.v20130628/ApacheDirectoryStudio-linux-x86-2.0.0.v20130628.tar.gz
-# chmod a+x *.bin
-# ./apacheds-2.0.0-M19-32bit.bin
+# tar xvf ApacheDirectoryStudio-linux-x86-2.0.0.v20130628.tar.gz
+# cd ApacheDirectoryStudio-linux-x86-2.0.0.v20130628/
             </p>
         </pre>
         For 64-bit (as root):
@@ -66,8 +66,8 @@ This section provides instructions to install and configure Apache Directory Stu
 # mkdir tmp
 # cd tmp
 # wget http://mirrors.ibiblio.org/apache//directory/studio/dist/2.0.0.v20130628/ApacheDirectoryStudio-linux-x86_64-2.0.0.v20130628.tar.gz
-# chmod a+x *.bin
-# ./apacheds-2.0.0-M19-64bit.bin
+# tar xvf ApacheDirectoryStudio-linux-x86_64-2.0.0.v20130628.tar.gz
+# cd ApacheDirectoryStudio-linux-x86_64-2.0.0.v20130628/
             </p>
         </pre>
     </li>
@@ -82,7 +82,6 @@ This section provides instructions to install and configure Apache Directory Stu
         After installation start the directory studio process.
         <pre>
             <p style="font: monospace; color: black; background-color: lightgrey; font-size: 10pt">
-# cd ApacheDirectoryStudio-linux-x86_64-2.0.0.v20130628
 # export JAVA_HOME=...
 # ./ApacheDirectoryStudio
             </p>

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/946d5971/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 ce8e41d..67f03a0 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
@@ -43,10 +43,9 @@
 <h3>Setup Apache Tomcat Web Server</h3>
 <img src="tomcat.png">
 <br><br>
-This document contains instructions to install Tomcat 7. Any Tomcat (version 7 and beyond) instance
-may be used but server commands and file locations must be translated to match target environment.
+This document contains instructions to install Tomcat 7 and configure for use with Fortress Realm.
 <hr>
-<h4>This section describes how to install Apache Tomcat to Debian and Fedora distros</h4>
+<h4>This section covers installation to Debian and Fedora distros</h4>
 <ol>
     <li>
         If Tomcat is already installed skip this step.
@@ -122,8 +121,7 @@ may be used but server commands and file locations must be translated to match t
             </p>
         </pre>
         Using the config file realm to store credentials for an important application like the Tomcat Manager is a
-        security <b>antipattern</b>. For production, a realm like
-        fortress realm should used globally by Tomcat.
+        security <b>antipattern</b>. In production, the fortress realm should be used globally by Tomcat.
     </li>
 
     <br>
@@ -164,6 +162,8 @@ Ensure there are no errors within Tomcat's log.  One common problem:
         UnsupportedClassVersionError.  This is a sure sign that your Tomcat is running under the wrong version of java.  Remember Java 7 or greater is required to run this tutorial.
     </li>
 
+    <br>
+
     <li>
         Verify setup by signing onto the Tomcat Manager app with credentials <b>userId</b>: <i>tcmanager</i>, <b>password</b>:
         <i>m@nager123</i>

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/946d5971/src/main/java/org/apache/directory/fortress/core/doc-files/ten-minute-guide.html
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/doc-files/ten-minute-guide.html b/src/main/java/org/apache/directory/fortress/core/doc-files/ten-minute-guide.html
index 6aae88a..4f3dd05 100644
--- a/src/main/java/org/apache/directory/fortress/core/doc-files/ten-minute-guide.html
+++ b/src/main/java/org/apache/directory/fortress/core/doc-files/ten-minute-guide.html
@@ -26,13 +26,13 @@
 <BODY>
 <p>
     <h3>Overview</h3>
-    The documents linked by this guide provides a how-to guide for downloading, building and installing Apache Fortress software from source in about ten minutes.
+    The documents linked by this guide provides instructions to download, build and install Apache Fortress software from source in about ten minutes.
     <br><br>
 <hr>
 <h4>Steps</h4>
 <fieldset>
     <legend><b>Navigation Links</b></legend>
-    The following steps are covered by this tutorial and must be completed in order.  Except for the rest and web components which are optional.
+    These steps must be completed in order.  Except fortress rest and web steps, both are optional.
     <ul>
         <li><a href="./apache-directory-server.html">Setup Apache Directory Server</a></li>
         <li><a href="./apache-directory-studio.html">Setup Apache Directory Studio</a></li>