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/10 16:50:18 UTC
directory-fortress-core git commit: FC-56 - refine core README's
Repository: directory-fortress-core
Updated Branches:
refs/heads/master 946d5971b -> d4fd74c15
FC-56 - refine core README's
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/d4fd74c1
Tree: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/tree/d4fd74c1
Diff: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/diff/d4fd74c1
Branch: refs/heads/master
Commit: d4fd74c158d2f93c877945afd9d70416b290a16a
Parents: 946d597
Author: Shawn McKinney <sm...@apache.org>
Authored: Tue Feb 10 09:50:04 2015 -0600
Committer: Shawn McKinney <sm...@apache.org>
Committed: Tue Feb 10 09:50:04 2015 -0600
----------------------------------------------------------------------
README-TEN-MINUTE-GUIDE.txt | 27 ++++++++++-----
README.txt | 35 ++++++++++++--------
.../fortress/core/rbac/UserTestData.java | 2 +-
3 files changed, 41 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/d4fd74c1/README-TEN-MINUTE-GUIDE.txt
----------------------------------------------------------------------
diff --git a/README-TEN-MINUTE-GUIDE.txt b/README-TEN-MINUTE-GUIDE.txt
index 1b31827..76f8e4a 100644
--- a/README-TEN-MINUTE-GUIDE.txt
+++ b/README-TEN-MINUTE-GUIDE.txt
@@ -20,19 +20,28 @@ ________________________________________________________________________________
###################################################################################
# README for Fortress Ten Minute Guide
# Version 1.0-RC40
-# last updated: February 5, 2015
+# last updated: February 10, 2015
###################################################################################
-_____________________________________________________________________________
-#############################################################################
-# Prerequisites:
-#############################################################################
-1. Linux machine (tested on Ubuntu 12.04 & Centos 6.3)
-2. Internet access to retrieve dependencies from online Maven repo.
-3. Java SDK Version 7 (or greater), Apache Maven 3, and Git installed to target machine.
-4. All other packages will be covered inside the tutorial.
+___________________________________________________________________________________
+###################################################################################
+# SECTION 0. Prerequisites for Fortress Ten Minute Guide
+###################################################################################
+1. Linux machine (tested on Ubuntu 12.04, 14.04 & Centos 6.3)
+
+2. Internet access to retrieve source code from Apache Fortress GIT repos and binary dependencies from online Maven repo.
+
+3. Git installed to target machine.
+
+4. Java SDK Version 7 or beyond installed to target machine.
+
+5. Apache Maven 3 installed to target machine.
+
+All other packages will be covered inside the tutorial.
+
#############################################################################
# Instructions for downloading app and generating the install doc:
#############################################################################
+
1. Clone the directory-fortress-core from apache git repo:
# git clone https://git-wip-us.apache.org/repos/asf/directory-fortress-core.git
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/d4fd74c1/README.txt
----------------------------------------------------------------------
diff --git a/README.txt b/README.txt
index ae1d8fc..fed7800 100755
--- a/README.txt
+++ b/README.txt
@@ -46,8 +46,9 @@ ________________________________________________________________________________
###################################################################################
# Document Overview
###################################################################################
-This document contains instructions to download, compile, load and test Fortress SDK with LDAP system.
+This document contains instructions to download, compile, load and test Fortress Core SDK with LDAP system.
If you don't already have an LDAP server installed, options follow in subsequent sections.
+
___________________________________________________________________________________
###################################################################################
# Tips for users of Fortress Core
@@ -77,31 +78,29 @@ ________________________________________________________________________________
- Questions pertaining to usage of this software may be submitted to:
http://mail-archives.apache.org/mod_mbox/directory-fortress/
+
___________________________________________________________________________________
###################################################################################
# SECTION 0. Prerequisites for Fortress Core SDK installation and usage
###################################################################################
-1. Internet access to retrieve source code from Apache Fortress Core GIT and binary dependencies from online Maven repo.
+a. Internet access to retrieve source code from Apache Fortress Core GIT and binary dependencies from online Maven repo.
Fortress installation procedures use Maven and Apache Ant.
The ant targets need external access to the Internet to pull down dependencies but may run without IFF:
-a. The necessary binary jars are already present and loaded into FORTRESS_HOME/lib folder. For list of dependency jars check out the ivy.xml file.
-b. Local mode has been enabled in target runtime env. This can be done by adding the following to build.properties file:
-
-local.mode=true
-
-More prereqs:
+ - The necessary binary jars are already present and loaded into FORTRESS_HOME/lib folder. For list of dependency jars check out the ivy.xml file.
+ - Local mode has been enabled in target runtime env. This can be done by adding the following to build.properties file:
+ local.mode=true
-2. Java SDK Version 7 or beyond installed to target environment
+b. Java SDK Version 7 or beyond installed to target machine
-3. Apache Maven 3 installed to target environment
+c. Apache Maven 3 installed to target machine.
-4. LDAP server installed. (options follow in section 1).
-
-Prereq notes:
+d. LDAP server installed. (options follow in section 1).
+Notes:
- Fortress is LDAPv3 compliant and works with any directory server.
- Tested with ApacheDS: FORTRESS_HOME/deprecate/README-QUICKSTART-APACHEDS.html.
- Tested with OpenLDAP: FORTRESS_HOME/deprecate/README-QUICKSTART.html.
+
___________________________________________________________________________________
###################################################################################
# SECTION 1. Options for installing OpenLDAP to target server environment
@@ -125,6 +124,7 @@ This document includes three options for use of Fortress and LDAP server:
-------------------------------------------------------------------------------
- Required Sections to follow:
2, 4, 5, 7, 8
+
___________________________________________________________________________________
###################################################################################
# SECTION 2. Instructions to pull Fortress source code from Apache GIT
@@ -168,6 +168,7 @@ install notes:
files, javadoc and test distributions.
- Project artifacts are loaded into $FORTRESS_HOME/target location.
+
___________________________________________________________________________________
###################################################################################
# SECTION 4. Instructions to build software distribution packages using ant 'dist' target.
@@ -207,6 +208,7 @@ dist notes:
files, javadoc and sample distributions.
- Project artifacts are loaded into $FORTRESS_HOME/dist location.
+
___________________________________________________________________________________
###################################################################################
# SECTION 5. Instructions to configure SDK for target system using build.properties file.
@@ -286,6 +288,7 @@ user.min.conn=1
# You may need to experiment to determine optimal setting for max. It should be much less than concurrent number of user's.
user.max.conn=10
+
___________________________________________________________________________________
###################################################################################
# SECTION 6. Instructions for pre-existing or native OpenLDAP installation using 'load-slapd' target.
@@ -487,6 +490,7 @@ init-slapd notes:
- Refreshes database contents by moving default and history database folders to location ${db.root}/backup.
- per your db.root setting in build.properties file.
- Seeds LDAP data by calling 'load-slapd' target as described in section above.
+
_______________________________________________________________________________
###############################################################################
# SECTION 8. Instructions to integration test using 'FortressJUnitTest' maven target
@@ -512,6 +516,7 @@ FortressJUnitTest Notes:
- If you followed steps from SECTION 6 (existing OpenLDAP server), do NOT run the 'init-slapd' target.
- WARNING log messages are good as these are negative tests in action:
+
___________________________________________________________________________________
###################################################################################
# SECTION 9. Instructions to run the command line interpreter (CLI) utility using 'cli' target
@@ -524,6 +529,7 @@ a. from FORTRESS_HOME enter the following command:
b. follow instructions in the command line interpreter reference manual contained within the javadoc:
$FORTRESS_HOME/dist/docs/api/com/jts/fortress/cli/package-summary.html
+
___________________________________________________________________________________
###################################################################################
# SECTION 10. Instructions to load policy data using maven fortress-load.
@@ -543,6 +549,7 @@ Notes:
- This maven target executes FortressAntTask class (as described in FORTRESS_HOME/dist/docs/api/org/openldap/fortress/ant/FortressAntTask.html).
- Drives Fortress policy apis using a simple xml format.
- Use to automate user and rbac policy data loads.
+
___________________________________________________________________________________
###################################################################################
# SECTION 11. Instructions to build and test the fortress samples with 'test-samples' target
@@ -579,6 +586,7 @@ Testing Notes:
- The 'test-samples' target may be run as many times as necessary and should be run at least twice to test the teardown A/P/R/BAC APIs.
- The 2nd and subsequent times 'test-samples' runs, it will tear down the data loaded during the prior run.
+
___________________________________________________________________________________
###################################################################################
# SECTION 12. Instructions to run the command console using 'console' target
@@ -587,6 +595,7 @@ ________________________________________________________________________________
a. from FORTRESS_HOME enter the following command:
# $ANT_HOME/bin/ant console
+
___________________________________________________________________________________
###################################################################################
# SECTION 13. Instructions to performance test fortress core using maven loadtest profile and jmeter.
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/d4fd74c1/src/test/java/org/apache/directory/fortress/core/rbac/UserTestData.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/directory/fortress/core/rbac/UserTestData.java b/src/test/java/org/apache/directory/fortress/core/rbac/UserTestData.java
index abb610b..d78ab05 100755
--- a/src/test/java/org/apache/directory/fortress/core/rbac/UserTestData.java
+++ b/src/test/java/org/apache/directory/fortress/core/rbac/UserTestData.java
@@ -6189,7 +6189,7 @@ public class UserTestData extends TestCase
"0", /* TIMEOUT_COL */
"", /* ASSGND_ROLES_COL */
"", /* AUTHZ_ROLES_COL */
- "Maumelle,AR,72113,9 Vantage Point,2 floor,MBR", /* ADDRESS_COL */
+ "Lawrence,KS,66045,Strong Hall,Computer Science,222",/* ADDRESS_COL */
"888-888-8888,777-777-7777",/* PHONES_COL */
"555-555-5555,444-444-4444",/* MOBILES_COL */
"Tester", /* TITLE_COL */