directory-fortress-enmasse git commit: FC-56 - Cleanup deploy procedures

[sm...@apache.org]

Repository: directory-fortress-enmasse
Updated Branches:
  refs/heads/master a5d677f6f -> c1476cc6d


FC-56 - Cleanup deploy procedures


Project: http://git-wip-us.apache.org/repos/asf/directory-fortress-enmasse/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-fortress-enmasse/commit/c1476cc6
Tree: http://git-wip-us.apache.org/repos/asf/directory-fortress-enmasse/tree/c1476cc6
Diff: http://git-wip-us.apache.org/repos/asf/directory-fortress-enmasse/diff/c1476cc6

Branch: refs/heads/master
Commit: c1476cc6d670117969646efea70c2418cf824735
Parents: a5d677f
Author: Shawn McKinney <sm...@apache.org>
Authored: Thu Feb 5 17:17:11 2015 -0600
Committer: Shawn McKinney <sm...@apache.org>
Committed: Thu Feb 5 17:17:11 2015 -0600

----------------------------------------------------------------------
 README.txt | 45 +++++++++++++++++++++++++++++----------------
 1 file changed, 29 insertions(+), 16 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/directory-fortress-enmasse/blob/c1476cc6/README.txt
----------------------------------------------------------------------
diff --git a/README.txt b/README.txt
index adb1718..3aea63d 100755
--- a/README.txt
+++ b/README.txt
@@ -18,8 +18,6 @@
 #
 #
 #
-# Fortress slapd.conf default settings.
-# Note: Directives that begin with '@' are substitution parms for Fortress' build.xml 'init-slapd' target.
 ___________________________________________________________________________________
 ###################################################################################
 README for Fortress Rest Application Installation
@@ -36,7 +34,9 @@ c. Apache Maven installed to target environment
 
 d. LDAP server installed.  (see README in Apache Fortress Core)
 
-e. Apache Tomcat or other servlet container installed
+e. Apache Tomcat 7 or greater installed to local machine.
+
+f. directory-fortress-realm proxy jar loaded into Tomcat server's /lib folder.
 _________________________________________________________________________________
 ###################################################################################
 # SECTION 1:  Instructions to clone source from Fortress Rest Git Repo:
@@ -75,7 +75,7 @@ ________________________________________________________________________________
 # SECTION 3:  Obtain the fortress.properties
 ###################################################################################
 
-Copy the fortress.properties, created during Apache Fortress Core setup, to this package's resource folder.
+Copy the fortress.properties, created during [directory-fortress-core] setup, to this package's resource folder.
 
 # cp [directory-fortress-core]/config/fortress.properties [directory-fortress-enmasse]/src/main/resources
 
@@ -92,24 +92,37 @@ Run maven install with load file:
 # SECTION 5:  Instructions to Deploy Fortress Rest application to Tomcat
 ###################################################################################
 
-a. Enable Maven to communicate with Tomcat using settings.xml file.
+a. If Tomcat has global security enabled you must add credentials to pom.xml:
+
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>tomcat-maven-plugin</artifactId>
+        <version>${version.tomcat.maven.plugin}</version>
+        <configuration>
+            ...
+          <!-- Warning the tomcat manager creds here are for deploying into a demo environment only. -->
+          <username>tcmanager</username>
+          <password>m@nager123</password>
+        </configuration>
+      </plugin>
+
+b. Copy the Fortress Realm Proxy jar file to Tomcat's server/lib folder.
+   Place the fortress-realm proxy jar, generated by the [directory-fortress-realm] package into Tomcat server's /lib folder.
+   The proxy jar name is fortress-realm-proxy-[version].jar and located here: [directory-fortress-realm]/proxy/target.
 
-note: a typical location for this maven configuration file is: ~/.m2/settings.xml
+Where [directory-fortress-realm] is base folder of the fortress realm source package.
 
-Add to file:
+c. Restart Tomcat server.
 
-<server>
-	<id>local-tomcat</id>
-      <username>tcmanager</username>
-      <password>m@nager123</password>
-</server>
+Note: The 'Ten Minute Guide', located in directory-fortress-core documentation describes the Tomcat/Fortress Realm setup in detail.
 
-note: If you followed the installation steps of Fortress Ten Minute Guide your Tomcat Manager creds would be as above.
+d. Enter maven command to deploy to Tomcat:
+# $M2_HOME/bin/mvn tomcat:deploy
 
-b. Enter maven command to deploy to Tomcat:
+e. To deploy:
 # $M2_HOME/bin/mvn tomcat:deploy
 
-c. To redeploy:
+f. To redeploy:
 # $M2_HOME/bin/mvn tomcat:redeploy
 ___________________________________________________________________________________
 ###################################################################################
@@ -136,7 +149,7 @@ note4:  If for any reason these tests should not be run during maven processing,
 
 ___________________________________________________________________________________
 ###################################################################################
-# SECTION 7:  Alternative testing procedures
+# SECTION 7:  Alternate testing procedures
 ###################################################################################
 
 Another way to test Fortress Rest is using the Fortress Core APIs which can be configured to communicate via HTTP/REST.