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

[sm...@apache.org]

Repository: directory-fortress-commander
Updated Branches:
  refs/heads/master eb846cf8c -> fa51720ee


FC-56 - Cleanup deploy procedures


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

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

----------------------------------------------------------------------
 README.txt | 54 ++++++++++++++++++++++++++++++++++++------------------
 1 file changed, 36 insertions(+), 18 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/directory-fortress-commander/blob/fa51720e/README.txt
----------------------------------------------------------------------
diff --git a/README.txt b/README.txt
index 9b63cd5..fec709a 100755
--- a/README.txt
+++ b/README.txt
@@ -32,7 +32,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 Web Git Repo:
@@ -63,7 +65,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-commander]/src/main/resources
 
@@ -80,35 +82,51 @@ Run maven install with load file:
 # SECTION 5:  Instructions to Deploy Fortress Web 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>
 
-note: a typical location for this maven configuration file is: ~/.m2/settings.xml
+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 named fortress-realm-proxy-[version].jar and located here: [directory-fortress-realm]/proxy/target.
 
-Add to file:
+Where [directory-fortress-realm] is base folder of the fortress realm source package.
 
-<server>
-	<id>local-tomcat</id>
-      <username>tcmanager</username>
-      <password>m@nager123</password>
-</server>
+c. Restart Tomcat server.
 
-note: If you followed the installation steps of Fortress Ten Minute Guide your Tomcat Manager creds would be as above.
+Note: The 'Ten Minute Guide', located in directory-fortress-core documentation describes the Tomcat/Fortress Realm setup in detail.
+
+d. Enter maven command to deploy to Tomcat:
+# $M2_HOME/bin/mvn tomcat:deploy
 
-b. Enter maven command to deploy to Tomcat:
+e. Enter maven command to deploy to Tomcat:
 # $M2_HOME/bin/mvn tomcat:deploy
 
-c. To redeploy:
+f. To redeploy:
 # $M2_HOME/bin/mvn tomcat:redeploy
 ___________________________________________________________________________________
 ###################################################################################
 # SECTION 6:  Instructions to test Fortress Rest application
 ###################################################################################
 
-Note: This test case depends:
+Run the Selenium Web driver integration tests:
+# $M2_HOME/bin/mvn verify -DskipTests=false
+
+Note: This test case depends on:
+
+a. SECTION 8 in directory-fortress-core README, 'Instructions to integration test using 'FortressJUnitTest'' has been executed.
+This step loads test data into the ldap server.
 
-a. Test data loaded from SECTION X of Apache Fortress Core README
 b. Test data loaded from SECTION 4 of this document
-c. Firefox is loaded on target machine
 
-Run the Selenium Web driver integration tests:
-# $M2_HOME/bin/mvn verify -DskipTests=false
\ No newline at end of file
+c. Firefox is loaded on target machine
\ No newline at end of file