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/16 03:32:54 UTC
directory-fortress-core git commit: FC-66 - readme cleanup
Repository: directory-fortress-core
Updated Branches:
refs/heads/master 5b3a1ef56 -> 4433cc1a5
FC-66 - readme cleanup
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/4433cc1a
Tree: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/tree/4433cc1a
Diff: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/diff/4433cc1a
Branch: refs/heads/master
Commit: 4433cc1a50f14f52b049b6941f7f7e75abae8fbb
Parents: 5b3a1ef
Author: Shawn McKinney <sm...@apache.org>
Authored: Sun Feb 15 20:32:40 2015 -0600
Committer: Shawn McKinney <sm...@apache.org>
Committed: Sun Feb 15 20:32:40 2015 -0600
----------------------------------------------------------------------
README-TEN-MINUTE-GUIDE.txt | 21 +++++++++++---------
.../core/doc-files/apache-directory-server.html | 3 +++
.../core/doc-files/apache-fortress-rest.html | 2 +-
.../core/doc-files/apache-fortress-web.html | 4 ++--
4 files changed, 18 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/4433cc1a/README-TEN-MINUTE-GUIDE.txt
----------------------------------------------------------------------
diff --git a/README-TEN-MINUTE-GUIDE.txt b/README-TEN-MINUTE-GUIDE.txt
index 4bd4a6b..db25975 100644
--- a/README-TEN-MINUTE-GUIDE.txt
+++ b/README-TEN-MINUTE-GUIDE.txt
@@ -48,21 +48,24 @@ All other packages will be covered inside the tutorial.
2. Change directory to package home:
# cd directory-fortress-core/
-3. Set JAVA_HOME
-# export JAVA_HOME=...
+3. Set JAVA_HOME & M2_HOME
-4. Set Maven Home:
-# export M2_HOME=...
-
-5. Build the Fortress Core source:
-# $M2_HOME/bin/mvn clean install -DskipTests
+4. Build the Fortress Core source:
+# mvn clean install -DskipTests
5. Create the Fortress Core javadoc:
-# $M2_HOME/bin/mvn javadoc:javadoc
+# mvn javadoc:javadoc
6. Point your web browser to the following location:
file:///[package home]/target/site/apidocs/org/apache/directory/fortress/core/doc-files/ten-minute-guide.html
(where [package_home] is location of directory-fortress-core base package)
-7. Follow the steps under 'Navigation Links'
\ No newline at end of file
+7. Follow the steps under 'Navigation Links':
+ a. Setup Apache Directory Server
+ b. Setup Apache Directory Studio
+ c. Build Apache Fortress Core
+ d. Build Apache Fortress Realm
+ e. Setup Apache Tomcat Web Server
+ f. Build Apache Fortress Rest
+ g. Build Apache Fortress Web
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/4433cc1a/src/main/java/org/apache/directory/fortress/core/doc-files/apache-directory-server.html
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/doc-files/apache-directory-server.html b/src/main/java/org/apache/directory/fortress/core/doc-files/apache-directory-server.html
index b8d698d..88820f9 100755
--- a/src/main/java/org/apache/directory/fortress/core/doc-files/apache-directory-server.html
+++ b/src/main/java/org/apache/directory/fortress/core/doc-files/apache-directory-server.html
@@ -70,8 +70,11 @@ This section provides instructions to install the Apache Directory Server which
# ./apacheds-2.0.0-M19-64bit.bin
</p>
</pre>
+ Unless you know what you're doing, accept the defaults.
</li>
+ <br>
+
<li>
If you have trouble pulling you can get binaries here: <a href="http://directory.apache.org/apacheds/downloads.html">Apache Directory Downloads Page</a>.
</li>
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/4433cc1a/src/main/java/org/apache/directory/fortress/core/doc-files/apache-fortress-rest.html
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/doc-files/apache-fortress-rest.html b/src/main/java/org/apache/directory/fortress/core/doc-files/apache-fortress-rest.html
index 247c2df..29e409d 100755
--- a/src/main/java/org/apache/directory/fortress/core/doc-files/apache-fortress-rest.html
+++ b/src/main/java/org/apache/directory/fortress/core/doc-files/apache-fortress-rest.html
@@ -103,7 +103,7 @@
Core</a>, to this package's resource folder.
<pre>
<p style="font: monospace; color: black; background-color: lightgrey; font-size: 10pt">
-# cp [directory-fortress-core]/src/test/resources/fortress.properties [directory-fortress-enmasse]/src/main/resources
+# cp [directory-fortress-core]/config/fortress.properties [directory-fortress-enmasse]/src/main/resources
</p>
</pre>
Where [directory-fortress-core] is base folder of the fortress core source package and
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/4433cc1a/src/main/java/org/apache/directory/fortress/core/doc-files/apache-fortress-web.html
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/doc-files/apache-fortress-web.html b/src/main/java/org/apache/directory/fortress/core/doc-files/apache-fortress-web.html
index fb13641..fea5ec5 100755
--- a/src/main/java/org/apache/directory/fortress/core/doc-files/apache-fortress-web.html
+++ b/src/main/java/org/apache/directory/fortress/core/doc-files/apache-fortress-web.html
@@ -88,7 +88,7 @@
Copy the fortress.properties, created on step <a href="./apache-fortress-core.html">Build Apache Fortress Core</a>, to this package's resource folder.
<pre>
<p style="font: monospace; color: black; background-color: lightgrey; font-size: 10pt">
-# cp [directory-fortress-core]/src/test/resources/fortress.properties [directory-fortress-commander]/src/main/resources
+# cp [directory-fortress-core]/config/fortress.properties [directory-fortress-commander]/src/main/resources
</p>
</pre>
Where [directory-fortress-core] is base folder of the fortress core source package and [directory-fortress-commander] is the current package's home folder.
@@ -148,7 +148,7 @@
Run the Selenium Web driver integration tests:
<pre>
<p style="font: monospace; color: black; background-color: lightgrey; font-size: 10pt">
-# $M2_HOME/bin/mvn verify -DskipTests=false
+# $M2_HOME/bin/mvn verify -DskipTests=false -Dnoload
</p>
</pre>
</li>