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/17 16:56:37 UTC

directory-fortress-core git commit: FC-66 - simplify steps

Repository: directory-fortress-core
Updated Branches:
  refs/heads/master 95f9ceebe -> d306b4b64


FC-66 - simplify steps


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

Branch: refs/heads/master
Commit: d306b4b6495d6d39ec4366156d80c8784c42f545
Parents: 95f9cee
Author: Shawn McKinney <sm...@apache.org>
Authored: Tue Feb 17 09:56:24 2015 -0600
Committer: Shawn McKinney <sm...@apache.org>
Committed: Tue Feb 17 09:56:24 2015 -0600

----------------------------------------------------------------------
 .../core/doc-files/apache-fortress-core.html    | 22 ++++----------------
 .../core/doc-files/apache-fortress-realm.html   | 11 ----------
 .../core/doc-files/apache-fortress-rest.html    | 11 ----------
 .../core/doc-files/apache-fortress-web.html     |  8 -------
 .../core/doc-files/ten-minute-guide.html        |  9 ++++++++
 5 files changed, 13 insertions(+), 48 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/d306b4b6/src/main/java/org/apache/directory/fortress/core/doc-files/apache-fortress-core.html
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/doc-files/apache-fortress-core.html b/src/main/java/org/apache/directory/fortress/core/doc-files/apache-fortress-core.html
index 7b6cab9..dd47319 100755
--- a/src/main/java/org/apache/directory/fortress/core/doc-files/apache-fortress-core.html
+++ b/src/main/java/org/apache/directory/fortress/core/doc-files/apache-fortress-core.html
@@ -45,17 +45,6 @@
 <br><br>This section provides instructions to install Fortress and run the junit tests.
 <h4>Steps to build the Fortress Core</h4>
 <ol>
-    <li>
-        Clone the <a href="https://git-wip-us.apache.org/repos/asf?p=directory-fortress-core.git">Directory Fortress
-        Core Git repo</a>:
-            <pre>
-                <p style="font: monospace; color: black; background-color: lightgrey; font-size: 10pt">
-git clone https://git-wip-us.apache.org/repos/asf/directory-fortress-core.git
-                </p>
-            </pre>
-
-    </li>
-
     <li>Set java and maven home env variables.</li>
 
     <br>
@@ -80,8 +69,7 @@ cp build.properties.example build.properties
 
     <li>
         Edit the build.properties in root folder of package.
-        These parameters are bound for files like <b>config/fortress.properties</b> and <b>ldap/setup/refreshLDAPData.xml</b>
-        and used on subsequent steps.
+        These parameters will be used to generate config artifacts: <b>config/fortress.properties</b> and <b>ldap/setup/refreshLDAPData.xml</b>, needed later on.
         <br>
         Change the settings to:
 
@@ -97,18 +85,16 @@ ldap.server.type=apacheds
     </li>
 
     <li>
-        Build fortress core with maven and install to local repo. The fortress realm [<a
-            href="apache-fortress-realm.html">Install Apache Fortress Realm</a>]
-        is dependent on fortress core.
+        Build fortress core.  This step will generate config artifacts using settings from build.properties.
                 <pre>
                     <p style="font: monospace; color: black; background-color: lightgrey; font-size: 10pt">
-mvn clean install -DskipTests
+mvn install -DskipTests
                     </p>
                 </pre>
     </li>
 
     <li>
-        Verify the following files were created by build as they are required later:
+        Verify the following config artifacts were created by build as they are required later:
                 <pre>
                     <p style="font: monospace; color: black; background-color: lightgrey; font-size: 10pt">
 ls -l config/fortress.properties

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/d306b4b6/src/main/java/org/apache/directory/fortress/core/doc-files/apache-fortress-realm.html
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/doc-files/apache-fortress-realm.html b/src/main/java/org/apache/directory/fortress/core/doc-files/apache-fortress-realm.html
index a770095..693d300 100644
--- a/src/main/java/org/apache/directory/fortress/core/doc-files/apache-fortress-realm.html
+++ b/src/main/java/org/apache/directory/fortress/core/doc-files/apache-fortress-realm.html
@@ -46,17 +46,6 @@
 
 <ol>
 
-    <li>
-        Clone the <a href="https://git-wip-us.apache.org/repos/asf?p=directory-fortress-realm.git">Apache Fortress Realm
-        Git repo</a>:
-            <pre>
-                <p style="font: monospace; color: black; background-color: lightgrey; font-size: 10pt">
-git clone https://git-wip-us.apache.org/repos/asf/directory-fortress-realm.git
-                </p>
-            </pre>
-
-    </li>
-
     <li>Set java and maven home env variables.</li>
 
     <br>

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/d306b4b6/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 6b70e57..b62d981 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
@@ -47,17 +47,6 @@
 
 <ol>
 
-    <li>
-        Clone the <a href="https://git-wip-us.apache.org/repos/asf?p=directory-fortress-enmasse.git">Apache Fortress
-        Rest Git repo</a>:
-            <pre>
-                <p style="font: monospace; color: black; background-color: lightgrey; font-size: 10pt">
-git clone https://git-wip-us.apache.org/repos/asf/directory-fortress-enmasse.git
-                </p>
-            </pre>
-
-    </li>
-
     <li>Set java and maven home env variables.</li>
 
     <br>

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/d306b4b6/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 7c21250..1a284e4 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
@@ -49,14 +49,6 @@
 
       <ol>
 
-          <li>
-              Clone the <a href="https://git-wip-us.apache.org/repos/asf?p=directory-fortress-commander.git">Apache Fortress Web Git repo</a>:
-            <pre>
-                <p style="font: monospace; color: black; background-color: lightgrey; font-size: 10pt">
-git clone https://git-wip-us.apache.org/repos/asf/directory-fortress-commander.git
-                </p>
-            </pre>
-
           </li>
 
           <li>Set java and maven home env variables.</li>

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/d306b4b6/src/main/java/org/apache/directory/fortress/core/doc-files/ten-minute-guide.html
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/doc-files/ten-minute-guide.html b/src/main/java/org/apache/directory/fortress/core/doc-files/ten-minute-guide.html
index 52edd64..9f510fb 100644
--- a/src/main/java/org/apache/directory/fortress/core/doc-files/ten-minute-guide.html
+++ b/src/main/java/org/apache/directory/fortress/core/doc-files/ten-minute-guide.html
@@ -83,6 +83,15 @@ cd directory-fortress-core/
     <br>
     <li>Set java and maven home env variables.</li>
     <br>
+
+    <li>Build the core source:
+                <pre>
+                    <p style="font: monospace; color: black; background-color: lightgrey; font-size: 10pt">
+mvn clean install -DskipTests
+                    </p>
+                </pre>
+    </li>
+
     <li>Build the javadoc which contains the tutorial:
                 <pre>
                     <p style="font: monospace; color: black; background-color: lightgrey; font-size: 10pt">