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 2016/04/16 05:03:06 UTC
directory-fortress-commander git commit: simplify steps
Repository: directory-fortress-commander
Updated Branches:
refs/heads/master 020527a3d -> 83d70b184
simplify steps
Project: http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/commit/83d70b18
Tree: http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/tree/83d70b18
Diff: http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/diff/83d70b18
Branch: refs/heads/master
Commit: 83d70b184e201b006e2207dc4145dd9318c72b1a
Parents: 020527a
Author: Shawn McKinney <sm...@apache.org>
Authored: Fri Apr 15 12:23:59 2016 -0500
Committer: Shawn McKinney <sm...@apache.org>
Committed: Fri Apr 15 12:23:59 2016 -0500
----------------------------------------------------------------------
README-QUICKSTART.md | 34 ++++++++++++++--------------------
1 file changed, 14 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/83d70b18/README-QUICKSTART.md
----------------------------------------------------------------------
diff --git a/README-QUICKSTART.md b/README-QUICKSTART.md
index 581175e..6445c69 100644
--- a/README-QUICKSTART.md
+++ b/README-QUICKSTART.md
@@ -23,10 +23,9 @@
* Document Overview
* SECTION 1. Prerequisites
- * SECTION 2. Configure Tomcat
+ * SECTION 2. Configure Tomcat and Deploy Fortress Web
* SECTION 3. Load Sample Security Policy
- * SECTION 4. Deploy to Tomcat Server
- * SECTION 5. Test
+ * SECTION 4. Test
___________________________________________________________________________________
## Document Overview
@@ -39,12 +38,12 @@ This document contains instructions to deploy a pre-built Apache Fortress Web in
Minimum software requirements:
* Apache Tomcat7++
- * Completed either:
+ * Completed either section in Apache Fortress Core Quickstart:
* *SECTION 2. Apache Fortress Core and OpenLDAP Setup* in [README-QUICKSTART-SLAPD.md](https://github.com/apache/directory-fortress-core/blob/master/README-QUICKSTART-SLAPD.md)
* *SECTION 3. Apache Fortress Core Setup* in [README-QUICKSTART-APACHEDS.md](https://github.com/apache/directory-fortress-core/blob/master/README-QUICKSTART-APACHEDS.md)
___________________________________________________________________________________
-## SECTION 2. Configure Tomcat
+## SECTION 2. Configure Tomcat and Deploy Fortress Web
Set the java system properties in tomcat with the target ldap server's coordinates.
@@ -73,7 +72,15 @@ Set the java system properties in tomcat with the target ldap server's coordinat
where *TOMCAT_HOME* matches your target env.
-5. Restart tomcat for new settings to take effect.
+5. Download the fortress web war into tomcat/webapps folder:
+
+ ```
+ wget http://repo.maven.apache.org/maven2/org/apache/directory/fortress/fortress-web/1.0.0/fortress-web-1.0.0.war -P $TOMCAT_HOME/webapps
+ ```
+
+ where *TOMCAT_HOME* matches your target env.
+
+6. Restart tomcat for new settings to take effect.
___________________________________________________________________________________
## SECTION 3. Load Sample Security Policy
@@ -84,20 +91,7 @@ mvn install -Dload.file=./src/main/resources/FortressWebDemoUsers.xml
```
___________________________________________________________________________________
-## SECTION 4. Deploy to Tomcat Server
-
-1. Download the fortress web war into tomcat/webapps folder:
-
- ```
- wget http://repo.maven.apache.org/maven2/org/apache/directory/fortress/fortress-web/1.0.0/fortress-web-1.0.0.war -P $TOMCAT_HOME/webapps
- ```
-
- where *TOMCAT_HOME* matches your target env.
-
-2. You may need to restart Tomcat.
-
-___________________________________________________________________________________
-## SECTION 5. Test
+## SECTION 4. Test
1. Open browser and test (creds: test/password):