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/06 22:11:39 UTC
directory-fortress-core git commit: FC-56 - add new page for studio,
refine steps based on tests, pull binaries by wget
Repository: directory-fortress-core
Updated Branches:
refs/heads/master 0212adfa4 -> 7832d21a4
FC-56 - add new page for studio, refine steps based on tests, pull binaries by wget
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/7832d21a
Tree: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/tree/7832d21a
Diff: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/diff/7832d21a
Branch: refs/heads/master
Commit: 7832d21a41dbb32bbdef79753346c057416e1dfb
Parents: 0212adf
Author: Shawn McKinney <sm...@apache.org>
Authored: Fri Feb 6 15:11:21 2015 -0600
Committer: Shawn McKinney <sm...@apache.org>
Committed: Fri Feb 6 15:11:21 2015 -0600
----------------------------------------------------------------------
.../core/doc-files/apache-directory-server.html | 136 +++++++++++++++++
.../core/doc-files/apache-directory.html | 151 -------------------
.../core/doc-files/apache-fortress-core.html | 32 ++--
.../core/doc-files/apache-fortress-realm.html | 13 +-
.../core/doc-files/apache-fortress-rest.html | 32 ++--
.../core/doc-files/apache-fortress-web.html | 44 ++----
.../fortress/core/doc-files/apache-tomcat.html | 147 +++++++-----------
.../core/doc-files/ten-minute-guide.html | 5 +-
.../directory/fortress/core/overview.html | 2 +-
9 files changed, 243 insertions(+), 319 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/7832d21a/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
new file mode 100755
index 0000000..fa24ca2
--- /dev/null
+++ b/src/main/java/org/apache/directory/fortress/core/doc-files/apache-directory-server.html
@@ -0,0 +1,136 @@
+<!--
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+-->
+<html>
+<head>
+ <title>Apache Fortress Ten Minute Guide</title>
+ <link rel="stylesheet" type="text/css" href="../../../../../../stylesheet.css" title="Style">
+</head>
+<body>
+<hr>
+<fieldset>
+ <legend><b>Navigation Links</b></legend>
+ <ul>
+ <li><a href="./apache-directory-server.html">Setup Apache Directory Server</a></li>
+ <li><a href="./apache-directory-studio.html">Setup Apache Directory Studio</a></li>
+ <li><a href="./apache-fortress-core.html">Build Apache Fortress Core</a></li>
+ <li><a href="./apache-fortress-realm.html">Build Apache Fortress Realm</a></li>
+ <li><a href="./apache-tomcat.html">Setup Apache Tomcat Web Server</a></li>
+ <li><a href="./apache-fortress-rest.html">Build Apache Fortress Rest</a></li>
+ <li><a href="./apache-fortress-web.html">Build Apache Fortress Web</a></li>
+ </ul>
+ <li><a href="./ten-minute-guide.html">Ten Minute Guide</a></li>
+</fieldset>
+<hr>
+<p>
+
+<h3>Setup Apache Directory Server</h3>
+<img src="apacheds-logo.jpeg">
+<br><br>
+This section provides instructions to install the Apache Directory Server which is needed by Fortress.
+<h4>Steps to install</h4>
+<ol>
+
+ <li>
+ Download and install Apache Directory Server
+ <br><br>
+ For 32-bit (as root):
+ <pre>
+ <p style="font: monospace; color: black; background-color: lightgrey; font-size: 10pt">
+# mkdir tmp
+# cd tmp
+# wget http://mirror.nexcess.net/apache//directory/apacheds/dist/2.0.0-M19/apacheds-2.0.0-M19-32bit.bin
+# chmod a+x *.bin
+# ./apacheds-2.0.0-M19-32bit.bin
+ </p>
+ </pre>
+ For 64-bit (as root):
+ <pre>
+ <p style="font: monospace; color: black; background-color: lightgrey; font-size: 10pt">
+# mkdir tmp
+# cd tmp
+# wget http://mirror.nexcess.net/apache//directory/apacheds/dist/2.0.0-M19/apacheds-2.0.0-M19-64bit.bin
+# chmod a+x *.bin
+# ./apacheds-2.0.0-M19-64bit.bin
+ </p>
+ </pre>
+ </li>
+
+ <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>
+
+ <br>
+
+ <li>
+ Edit ApacheDS conf file
+ <pre>
+ <p style="font: monospace; color: black; background-color: lightgrey; font-size: 10pt">
+# sudo /opt/apacheds-2.0.0-M19/conf/wrapper.conf
+ </p>
+ </pre>
+ </li>
+
+ <li>
+ Add location of java:
+ <pre>
+ <p style="font: monospace; color: black; background-color: lightgrey; font-size: 10pt">
+wrapper.java.command=/path/java/bin/java
+ </p>
+ </pre>
+ Where 'path' equals fully qualified location of target machine's java.
+ </li>
+
+ <br>
+
+ <li>
+ Save and exit.
+ </li>
+
+ <br>
+
+ <li>
+ After installation start the directory server process.
+
+ From system command prompt (as root):
+ <pre>
+ <p style="font: monospace; color: black; background-color: lightgrey; font-size: 10pt">
+# /etc/init.d/apacheds-2.0.0-M19-default start
+ </p>
+ </pre>
+ </li>
+
+ <li>
+ Check the status of server process.
+
+ From system command prompt (as root):
+ <pre>
+ <p style="font: monospace; color: black; background-color: lightgrey; font-size: 10pt">
+# /etc/init.d/apacheds-2.0.0-M19-default status
+ApacheDS - default is running (70041).
+ </p>
+ </pre>
+ </li>
+
+ <br>
+</ol>
+</body>
+<p style="font: monospace; color: black; font-size: 6pt">Copyright 2003-2015, The Apache Software Foundation. All Rights
+ Reserved.</p>
+</html>
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/7832d21a/src/main/java/org/apache/directory/fortress/core/doc-files/apache-directory.html
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/doc-files/apache-directory.html b/src/main/java/org/apache/directory/fortress/core/doc-files/apache-directory.html
deleted file mode 100755
index de08ddd..0000000
--- a/src/main/java/org/apache/directory/fortress/core/doc-files/apache-directory.html
+++ /dev/null
@@ -1,151 +0,0 @@
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
--->
-<html>
-<head>
- <title>Apache Fortress Ten Minute Guide</title>
- <link rel="stylesheet" type="text/css" href="../../../../../../stylesheet.css" title="Style">
-</head>
-<body>
-<hr>
-<fieldset>
- <legend><b>Navigation Links</b></legend>
- <ul>
- <li><a href="./apache-directory.html">Setup Apache Directory Server</a></li>
- <li><a href="./apache-fortress-core.html">Build Apache Fortress Core</a></li>
- <li><a href="./apache-fortress-realm.html">Build Apache Fortress Realm</a></li>
- <li><a href="./apache-tomcat.html">Setup Apache Tomcat Web Server</a></li>
- <li><a href="./apache-fortress-rest.html">Build Apache Fortress Rest</a></li>
- <li><a href="./apache-fortress-web.html">Build Apache Fortress Web</a></li>
- </ul>
- <li><a href="./ten-minute-guide.html">Ten Minute Guide</a></li>
-</fieldset>
-<hr>
-<p>
-
-<h3>Setup Apache Directory Server</h3>
-<img src="apacheds-logo.jpeg">
-<br><br>
-Download and install the package for your platform <a href="http://directory.apache.org/apacheds/downloads.html">Apache
- Directory Downloads Page</a>.
-
-This section provides instructions to install Directory Server and Studio. The Apache Directory is an LDAPv3 compliant
-directory server. Apache Studio
-is an ldap browser that can be used to maintain the ldap server directory and data.
-<h4>Steps to install</h4>
-<ol>
-
- <li>
- Download and install the package for your platform <a
- href="http://directory.apache.org/apacheds/downloads.html">Apache Directory Server Downloads Page</a>.
-
- <br><br>
-
- <ol type="A">
- <li>
- After installation start the directory server process.
-
- For Debian from system command prompt:
- <pre>
- <p style="font: monospace; color: black; background-color: lightgrey; font-size: 10pt">
- # sudo /etc/init.d/apacheds-[VERSION]-default start
- </p>
- </pre>
- Where [VERSION] matches what was installed earlier. At the time of this writing the latest version is
- 2.0.0-M19.
- For Redhat (as root):
- <pre>
- <p style="font: monospace; color: black; background-color: lightgrey; font-size: 10pt">
- TODO: add instructions here
- </p>
- </pre>
-
- </li>
-
- <li>
- Check the status of server process.
-
- For Debian from system command prompt:
- <pre>
- <p style="font: monospace; color: black; background-color: lightgrey; font-size: 10pt">
- # sudo /etc/init.d/apacheds-[VERSION]-default status
- ApacheDS - default is running (70041).
- </p>
- </pre>
- For Redhat (as root):
- <pre>
- <p style="font: monospace; color: black; background-color: lightgrey; font-size: 10pt">
- TODO: add instructions here
- </p>
- </pre>
- </li>
-
- </ol>
-
- </li>
-
- <br>
-
- <li>
- Download and install Apache Directory Studio <a href="http://directory.apache.org/studio/downloads.html">Apache
- Directory Studio Downloads Page</a>.
-
- <br><br>
-
- <ol type="A">
- <li>
- After installation start the directory studio process.
-
- </li>
-
- <br>
-
- <li>
- From the LDAP Browser perspective create a new connection. Enter an arbitrary name for connection, e.g.
- 'apacheds'. If apache directory server is running locally you may use 'localhost' and default port is
- '10389'.
- </li>
- <br><img src="./connection-create-screenshot1.png"/><br><br>
-
- <br>
-
- <li>
- The default creds for apache directory server are 'uid=admin,ou=system' and 'secret' for the password.
- It's a good idea to verify this info by clicking on the 'Check Authentication' button.
- </li>
- <br><img src="./connection-create-screenshot2.png"/><br><br>
-
- <br>
- <li>
- After all the info has been entered, you should be able to browse the directory.
- </li>
- <br><img src="./connection-create-screenshot3.png"/><br><br>
-
- <br>
-
- </ol>
-
- </li>
-
- <br>
-</ol>
-</body>
-<p style="font: monospace; color: black; font-size: 6pt">Copyright 2003-2015, The Apache Software Foundation. All Rights
- Reserved.</p>
-</html>
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/7832d21a/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 85f8d48..1344335 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
@@ -27,7 +27,8 @@
<fieldset>
<legend><b>Navigation Links</b></legend>
<ul>
- <li><a href="./apache-directory.html">Setup Apache Directory Server</a></li>
+ <li><a href="./apache-directory-server.html">Setup Apache Directory Server</a></li>
+ <li><a href="./apache-directory-studio.html">Setup Apache Directory Studio</a></li>
<li><a href="./apache-fortress-core.html">Build Apache Fortress Core</a></li>
<li><a href="./apache-fortress-realm.html">Build Apache Fortress Realm</a></li>
<li><a href="./apache-tomcat.html">Setup Apache Tomcat Web Server</a></li>
@@ -49,7 +50,7 @@
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
+# git clone https://git-wip-us.apache.org/repos/asf/directory-fortress-core.git
</p>
</pre>
@@ -59,7 +60,7 @@
Set JAVA_HOME:
<pre>
<p style="font: monospace; color: black; background-color: lightgrey; font-size: 10pt">
- # export JAVA_HOME=/opt/jdk1.7.0_10/
+# export JAVA_HOME=/opt/jdk1.7.0_10/
</p>
</pre>
@@ -69,7 +70,7 @@
Change directory:
<pre>
<p style="font: monospace; color: black; background-color: lightgrey; font-size: 10pt">
- # cd directory-fortress-core/
+# cd directory-fortress-core/
</p>
</pre>
</li>
@@ -78,7 +79,7 @@
Set M2_HOME:
<pre>
<p style="font: monospace; color: black; background-color: lightgrey; font-size: 10pt">
- # export M2_HOME=/usr/local/maven-version
+# export M2_HOME=/usr/local/maven-version
</p>
</pre>
</li>
@@ -92,10 +93,10 @@
<pre>
<p style="font: monospace; color: black; background-color: lightgrey; font-size: 10pt">
- # This points fortress to LDAP host.
- ldap.host=localhost
- ldap.port=10389
- ldap.server.type=apacheds
+# This points fortress to LDAP host.
+ldap.host=localhost
+ldap.port=10389
+ldap.server.type=apacheds
</p>
</pre>
@@ -107,7 +108,7 @@
is dependent on fortress core.
<pre>
<p style="font: monospace; color: black; background-color: lightgrey; font-size: 10pt">
- # $M2_HOME/bin/mvn clean install -DskipTests=true
+# $M2_HOME/bin/mvn clean install -DskipTests
</p>
</pre>
</li>
@@ -116,8 +117,8 @@
Verify the following files 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
- # ls -l ldap/setup/refreshLDAPData.xml
+# ls -l config/fortress.properties
+# ls -l ldap/setup/refreshLDAPData.xml
</p>
</pre>
</li>
@@ -172,7 +173,7 @@
Build the fortress LDAP DIT and create the configuration node:
<pre>
<p style="font: monospace; color: black; background-color: lightgrey; font-size: 10pt">
- # $M2_HOME/bin/mvn install -Dload.file=./ldap/setup/refreshLDAPData.xml -DskipTests=true
+# $M2_HOME/bin/mvn install -Dload.file=./ldap/setup/refreshLDAPData.xml -DskipTests
</p>
</pre>
</li>
@@ -181,8 +182,7 @@
Load the fortress ARBAC policies:
<pre>
<p style="font: monospace; color: black; background-color: lightgrey; font-size: 10pt">
- # $M2_HOME/bin/mvn install -Dload.file=./ldap/setup/DelegatedAdminManagerLoad.xml
- -DskipTests=true
+# $M2_HOME/bin/mvn install -Dload.file=./ldap/setup/DelegatedAdminManagerLoad.xml -DskipTests
</p>
</pre>
</li>
@@ -191,7 +191,7 @@
Run the Fortress Core Regression Tess:
<pre>
<p style="font: monospace; color: black; background-color: lightgrey; font-size: 10pt">
- # $M2_HOME/bin/mvn -Dtest=FortressJUnitTest test
+# $M2_HOME/bin/mvn -Dtest=FortressJUnitTest test
</p>
</pre>
Tests should run with no errors.
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/7832d21a/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 c3ca722..ac610ae 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
@@ -27,7 +27,8 @@
<fieldset>
<legend><b>Navigation Links</b></legend>
<ul>
- <li><a href="./apache-directory.html">Setup Apache Directory Server</a></li>
+ <li><a href="./apache-directory-server.html">Setup Apache Directory Server</a></li>
+ <li><a href="./apache-directory-studio.html">Setup Apache Directory Studio</a></li>
<li><a href="./apache-fortress-core.html">Build Apache Fortress Core</a></li>
<li><a href="./apache-fortress-realm.html">Build Apache Fortress Realm</a></li>
<li><a href="./apache-tomcat.html">Setup Apache Tomcat Web Server</a></li>
@@ -50,7 +51,7 @@
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
+# git clone https://git-wip-us.apache.org/repos/asf/directory-fortress-realm.git
</p>
</pre>
@@ -60,7 +61,7 @@
Set JAVA_HOME:
<pre>
<p style="font: monospace; color: black; background-color: lightgrey; font-size: 10pt">
- # export JAVA_HOME=/opt/jdk1.7.0_10/
+# export JAVA_HOME=/opt/jdk1.7.0_10/
</p>
</pre>
</li>
@@ -69,7 +70,7 @@
Change directory:
<pre>
<p style="font: monospace; color: black; background-color: lightgrey; font-size: 10pt">
- # cd directory-fortress-realm/
+# cd directory-fortress-realm/
</p>
</pre>
</li>
@@ -78,7 +79,7 @@
Set M2_HOME:
<pre>
<p style="font: monospace; color: black; background-color: lightgrey; font-size: 10pt">
- # export M2_HOME=/usr/local/maven-version
+# export M2_HOME=/usr/local/maven-version
</p>
</pre>
</li>
@@ -92,7 +93,7 @@
are both dependent on the fortress realm.
<pre>
<p style="font: monospace; color: black; background-color: lightgrey; font-size: 10pt">
- # $M2_HOME/bin/mvn clean install
+# $M2_HOME/bin/mvn clean install
</p>
</pre>
</li>
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/7832d21a/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 d5b72f0..91d04fc 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
@@ -27,7 +27,8 @@
<fieldset>
<legend><b>Navigation Links</b></legend>
<ul>
- <li><a href="./apache-directory.html">Setup Apache Directory Server</a></li>
+ <li><a href="./apache-directory-server.html">Setup Apache Directory Server</a></li>
+ <li><a href="./apache-directory-studio.html">Setup Apache Directory Studio</a></li>
<li><a href="./apache-fortress-core.html">Build Apache Fortress Core</a></li>
<li><a href="./apache-fortress-realm.html">Build Apache Fortress Realm</a></li>
<li><a href="./apache-tomcat.html">Setup Apache Tomcat Web Server</a></li>
@@ -51,7 +52,7 @@
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-rest.git
+# git clone https://git-wip-us.apache.org/repos/asf/directory-fortress-enmasse.git
</p>
</pre>
@@ -61,7 +62,7 @@
Set JAVA_HOME:
<pre>
<p style="font: monospace; color: black; background-color: lightgrey; font-size: 10pt">
- # export JAVA_HOME=/opt/jdk1.7.0_10/
+# export JAVA_HOME=/opt/jdk1.7.0_10/
</p>
</pre>
@@ -71,7 +72,7 @@
Change directory:
<pre>
<p style="font: monospace; color: black; background-color: lightgrey; font-size: 10pt">
- # cd directory-fortress-enmasse/
+# cd directory-fortress-enmasse/
</p>
</pre>
</li>
@@ -80,7 +81,7 @@
Set M2_HOME:
<pre>
<p style="font: monospace; color: black; background-color: lightgrey; font-size: 10pt">
- # export M2_HOME=/usr/share/maven-version
+# export M2_HOME=/usr/share/maven-version
</p>
</pre>
</li>
@@ -89,7 +90,7 @@
Generate the javadoc
<pre>
<p style="font: monospace; color: black; background-color: lightgrey; font-size: 10pt">
- # $M2_HOME/bin/mvn javadoc:javadoc
+# $M2_HOME/bin/mvn javadoc:javadoc
</p>
</pre>
The javadoc will be located under target/site/apidocs.
@@ -102,8 +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]/config/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
@@ -113,20 +113,10 @@
<br>
<li>
- Load the fortress rest test policies:
- <pre>
- <p style="font: monospace; color: black; background-color: lightgrey; font-size: 10pt">
- # $M2_HOME/bin/mvn install -Dload.file=./src/main/resources/FortressRestServerRoles.xml
- -DskipTests=true
- </p>
- </pre>
- </li>
-
- <li>
To deploy fortress rest, run this command:
<pre>
<p style="font: monospace; color: black; background-color: lightgrey; font-size: 10pt">
- # $M2_HOME/bin/mvn tomcat:deploy
+# $M2_HOME/bin/mvn tomcat:deploy
</p>
</pre>
</li>
@@ -135,7 +125,7 @@
To redeploy:
<pre>
<p style="font: monospace; color: black; background-color: lightgrey; font-size: 10pt">
- # $M2_HOME/bin/mvn tomcat:redeploy
+# $M2_HOME/bin/mvn tomcat:redeploy
</p>
</pre>
</li>
@@ -144,7 +134,7 @@
Run the tests:
<pre>
<p style="font: monospace; color: black; background-color: lightgrey; font-size: 10pt">
- # $M2_HOME/bin/mvn test
+# $M2_HOME/bin/mvn test
</p>
</pre>
</li>
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/7832d21a/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 7194af3..806a1ec 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
@@ -27,7 +27,8 @@
<fieldset>
<legend><b>Navigation Links</b></legend>
<ul>
- <li><a href="./apache-directory.html">Setup Apache Directory Server</a></li>
+ <li><a href="./apache-directory-server.html">Setup Apache Directory Server</a></li>
+ <li><a href="./apache-directory-studio.html">Setup Apache Directory Studio</a></li>
<li><a href="./apache-fortress-core.html">Build Apache Fortress Core</a></li>
<li><a href="./apache-fortress-realm.html">Build Apache Fortress Realm</a></li>
<li><a href="./apache-tomcat.html">Setup Apache Tomcat Web Server</a></li>
@@ -49,7 +50,7 @@
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-web.git
+# git clone https://git-wip-us.apache.org/repos/asf/directory-fortress-commander.git
</p>
</pre>
@@ -96,16 +97,6 @@
<br>
<li>
- Load the fortress web test policies:
- <pre>
- <p style="font: monospace; color: black; background-color: lightgrey; font-size: 10pt">
- # $M2_HOME/bin/mvn install -Dload.file=./src/main/resources/FortressWebDemoUsers.xml
- -DskipTests=true
- </p>
- </pre>
- </li>
-
- <li>
To deploy fortress web, run this command:
<pre>
<p style="font: monospace; color: black; background-color: lightgrey; font-size: 10pt">
@@ -126,23 +117,7 @@
<li>
Connect to web app:
<br><br>
- <ol type="a">
- <li>
- non-SSL -
- local: <a href="http://localhost:8080/fortress-web">http://localhost:8080/fortress-web</a>,
- remote: <a href="http://fortressdemo2.com:8080/fortress-web">http://fortressdemo2.com:8080/fortress-web</a>
- <br>
- </li>
- <br>
- <li>
- SSL -
- local: <a href="https://localhost:8443/fortress-web">https://localhost:8443/fortress-web</a>,
- remote: <a href="https://fortressdemo2.com:8443/fortress-web">https://fortressdemo2.com:8443/fortress-web</a>
- </li>
- <br>
- Accept the self-signed certificate when the warning dialog appears.
- </ol>
-
+ <a href="http://localhost:8080/fortress-web">http://localhost:8080/fortress-web</a>,
</li>
<br>
@@ -168,6 +143,17 @@
</li>
</ol>
</li>
+
+ <li>
+ 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
+ </p>
+ </pre>
+ </li>
+
+
</ol>
</body>
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/7832d21a/src/main/java/org/apache/directory/fortress/core/doc-files/apache-tomcat.html
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/doc-files/apache-tomcat.html b/src/main/java/org/apache/directory/fortress/core/doc-files/apache-tomcat.html
index 06ac67c..ce8e41d 100755
--- a/src/main/java/org/apache/directory/fortress/core/doc-files/apache-tomcat.html
+++ b/src/main/java/org/apache/directory/fortress/core/doc-files/apache-tomcat.html
@@ -27,7 +27,8 @@
<fieldset>
<legend><b>Navigation Links</b></legend>
<ul>
- <li><a href="./apache-directory.html">Setup Apache Directory Server</a></li>
+ <li><a href="./apache-directory-server.html">Setup Apache Directory Server</a></li>
+ <li><a href="./apache-directory-studio.html">Setup Apache Directory Studio</a></li>
<li><a href="./apache-fortress-core.html">Build Apache Fortress Core</a></li>
<li><a href="./apache-fortress-realm.html">Build Apache Fortress Realm</a></li>
<li><a href="./apache-tomcat.html">Setup Apache Tomcat Web Server</a></li>
@@ -42,31 +43,30 @@
<h3>Setup Apache Tomcat Web Server</h3>
<img src="tomcat.png">
<br><br>
-This document contains instructions to install Tomcat 7 to common Linux distros. Any Tomcat (version 7 and beyond)
-instance
+This document contains instructions to install Tomcat 7. Any Tomcat (version 7 and beyond) instance
may be used but server commands and file locations must be translated to match target environment.
<hr>
-<h4>This section describes how to install Apache Tomcat to Debian and Redhat distros and enable HTTPS communication</h4>
+<h4>This section describes how to install Apache Tomcat to Debian and Fedora distros</h4>
<ol>
<li>
If Tomcat is already installed skip this step.
<br><br>
- For Debian from system command prompt:
+ Debian:
<pre>
<p style="font: monospace; color: black; background-color: lightgrey; font-size: 10pt">
- # sudo apt-get install tomcat7 tomcat7-admin tomcat7-docs
+# sudo apt-get install tomcat7 tomcat7-admin tomcat7-docs
</p>
</pre>
- For Redhat (as root):
+ Fedora (as root):
<pre>
<p style="font: monospace; color: black; background-color: lightgrey; font-size: 10pt">
- # mkdir tmp
- # cd tmp
- # wget http://www.us.apache.org/dist/tomcat/tomcat-7/v7.0.55/bin/apache-tomcat-7.0.55.tar.gz
- # tar xzf apache-tomcat-7.0.55.tar.gz
- # mv apache-tomcat-7.0.55 /usr/share/tomcat7
- # cd /usr/share/tomcat7
- # ./bin/startup.sh
+# mkdir tmp
+# cd tmp
+# wget http://www.us.apache.org/dist/tomcat/tomcat-7/v7.0.55/bin/apache-tomcat-7.0.55.tar.gz
+# tar xzf apache-tomcat-7.0.55.tar.gz
+# mv apache-tomcat-7.0.55 /usr/share/tomcat7
+# cd /usr/share/tomcat7
+# ./bin/startup.sh
</p>
</pre>
@@ -76,7 +76,7 @@ may be used but server commands and file locations must be translated to match t
Verify process is running:
<pre>
<p style="font: monospace; color: black; background-color: lightgrey; font-size: 10pt">
- # ps -ef | grep tomcat
+# ps -ef | grep tomcat
</p>
</pre>
</li>
@@ -87,7 +87,7 @@ may be used but server commands and file locations must be translated to match t
jar name is fortress-realm-proxy-[version].jar and located here: directory-fortress-realm/proxy/target
<pre>
<p style="font: monospace; color: black; background-color: lightgrey; font-size: 10pt">
- # cp fortress-realm-proxy-[VERSION]-proxy.jar /usr/share/tomcat7/lib
+# cp fortress-realm-proxy-[VERSION]-proxy.jar /usr/share/tomcat7/lib
</p>
</pre>
Where [VERSION] matches the value in this packages pom.xml file. At the time of this writing the current version
@@ -100,7 +100,13 @@ may be used but server commands and file locations must be translated to match t
Edit tomcat-users.xml:
<pre>
<p style="font: monospace; color: black; background-color: lightgrey; font-size: 10pt">
- # vi /usr/share/tomcat7/conf/tomcat-users.xml
+# vi /usr/share/tomcat7/conf/tomcat-users.xml
+ </p>
+ </pre>
+ Note: Depending on how and where you installed Tomcat, the tomcat-users.xml could be different locations. To find out where:
+ <pre>
+ <p style="font: monospace; color: black; background-color: lightgrey; font-size: 10pt">
+# sudo find / -name tomcat-users.xml
</p>
</pre>
</li>
@@ -110,9 +116,9 @@ may be used but server commands and file locations must be translated to match t
via maven.
<pre>
<p style="font: monospace; color: black; background-color: lightgrey; font-size: 10pt">
- <role rolename="manager-script"/>
- <role rolename="manager-gui"/>
- <user username="tcmanager" password="m@nager123" roles="manager-script,manager-gui"/>
+<role rolename="manager-script"/>
+<role rolename="manager-gui"/>
+<user username="tcmanager" password="m@nager123" roles="manager-script,manager-gui"/>
</p>
</pre>
Using the config file realm to store credentials for an important application like the Tomcat Manager is a
@@ -129,86 +135,41 @@ may be used but server commands and file locations must be translated to match t
<br>
<li>
- Enable Tomcat SSL
- <ol type="a">
- <br>
- <li>
- Copy keystore created during <a href="II-keys.html">Section II - Managing PKI Keys</a> to <b>/usr/local/tomcat/conf</b>
- folder.
- <pre>
- <p style="font: monospace; color: black; background-color: lightgrey; font-size: 10pt">
- # sudo cp src/test/resources/certs/mykeystore /usr/share/tomcat7/conf
- </p>
- </pre>
- </li>
-
- <li>
- Edit <b>/usr/share/tomcat7/conf/server.xml</b> file:
- <pre>
- <p style="font: monospace; color: black; background-color: lightgrey; font-size: 10pt">
- # vi /usr/share/tomcat7/conf/server.xml
- </p>
- </pre>
- </li>
- <li>
- Add the following to <b>server.xml</b>:
- <pre>
- <p style="font: monospace; color: black; background-color: lightgrey; font-size: 10pt">
- <!-- Define a SSL Coyote HTTP/1.1 Connector on port 8443 -->
- <Connector
- port="8443" maxThreads="200"
- scheme="https" secure="true" SSLEnabled="true"
- keystoreFile="conf/mykeystore" keystorePass="changeit"
- clientAuth="false" sslProtocol="TLS"/>
- </p>
+ Restart Tomcat on Debian:
+ <pre>
+ <p style="font: monospace; color: black; background-color: lightgrey; font-size: 10pt">
+# sudo /etc/init.d/tomcat7 restart
+ </p>
+ </pre>
+
+ Restart Tomcat on Fedora:
+ <pre>
+ <p style="font: monospace; color: black; background-color: lightgrey; font-size: 10pt">
+# ./bin/shutdown.sh
+# ./bin/startup.sh
+ </p>
+ </pre>
+
+ </li>
+
+ <li>
+ Verify clean logs after startup:
+ <pre>
+ <p style="font: monospace; color: black; background-color: lightgrey; font-size: 10pt">
+# tail -f -n10000 /var/lib/tomcat7/logs/catalina.out
+ </p>
</pre>
- </li>
-
- <li>
- Save and exit the file.
- </li>
-
- <br>
-
- <li>
- Restart Tomcat (Debian):
- <pre>
- <p style="font: monospace; color: black; background-color: lightgrey; font-size: 10pt">
- sudo /etc/init.d/tomcat7 restart
- </p>
- </pre>
-
- Redhat users:
- <pre>
- <p style="font: monospace; color: black; background-color: lightgrey; font-size: 10pt">
- # ./bin/shutdown.sh
- # ./bin/startup.sh
- </p>
- </pre>
-
- </li>
- </ol>
+
+Ensure there are no errors within Tomcat's log. One common problem:
+ UnsupportedClassVersionError. This is a sure sign that your Tomcat is running under the wrong version of java. Remember Java 7 or greater is required to run this tutorial.
</li>
+
<li>
Verify setup by signing onto the Tomcat Manager app with credentials <b>userId</b>: <i>tcmanager</i>, <b>password</b>:
<i>m@nager123</i>
<br><br>
- <ol type="a">
- <li>
- non-SSL -
- local: <a href="http://localhost:8080/manager">http://localhost:8080/manager</a>,
- remote: <a href="http://fortressdemo2.com:8080/manager">http://fortressdemo2.com:8080/manager</a>
- <br>
- </li>
- <br>
- <li>
- SSL -
- local: <a href="https://localhost:8443/manager">https://localhost:8443/manager</a>,
- remote: <a href="https://fortressdemo2.com:8443/manager">https://fortressdemo2.com:8443/manager</a>
- </li>
- </ol>
+ <a href="http://localhost:8080/manager">http://localhost:8080/manager</a>
<br>
- Accept the self-signed certificate when the warning dialog appears.
</li>
</ol>
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/7832d21a/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 bfb0e44..6aae88a 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
@@ -34,7 +34,8 @@
<legend><b>Navigation Links</b></legend>
The following steps are covered by this tutorial and must be completed in order. Except for the rest and web components which are optional.
<ul>
- <li><a href="./apache-directory.html">Setup Apache Directory Server</a></li>
+ <li><a href="./apache-directory-server.html">Setup Apache Directory Server</a></li>
+ <li><a href="./apache-directory-studio.html">Setup Apache Directory Studio</a></li>
<li><a href="./apache-fortress-core.html">Build Apache Fortress Core</a></li>
<li><a href="./apache-fortress-realm.html">Build Apache Fortress Realm</a></li>
<li><a href="./apache-tomcat.html">Setup Apache Tomcat Web Server</a></li>
@@ -49,7 +50,7 @@
These items are required and must be installed to target machine before any of these tutorial steps. Instructions cover Debian and Fedora system syntax.
Fortress is Java, runs on various platforms, but the others are not be covered here.
<ol type="1">
- <li>Java 7 (or greater) SDK</li>
+ <li>Java 7 (or greater) for both compilation (jdk) and runtime (jre) required for every software package covered by this tutorial.</li>
<li><a href="http://git-scm.com/download/linux">Git Download for Linux and Unix</a></li>
<li><a href="http://maven.apache.org/">Apache Maven 3</a></li>
<li><a href="https://www.mozilla.org/en-GB/firefox/new/">Firefox Web Browser</a></li>
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/7832d21a/src/main/java/org/apache/directory/fortress/core/overview.html
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/overview.html b/src/main/java/org/apache/directory/fortress/core/overview.html
index 38a2648..0872307 100755
--- a/src/main/java/org/apache/directory/fortress/core/overview.html
+++ b/src/main/java/org/apache/directory/fortress/core/overview.html
@@ -28,7 +28,7 @@
<p>
<h3>Check out the <a href="org/apache/directory/fortress/core/doc-files/ten-minute-guide.html">Apache Fortress Ten Minute Guide</a></h3>
<h4>Build fortress core, realm, web and rest components from source. Covers tomcat and apacheds server installation and configuration.</h4>
- Designed to get going with apache fortress software in a short amount of time.
+ Designed to get going with apache fortress software in a short amount of time on Fedora and Debian machines.
</p>
<hr>
<h2>What can Fortress Core SDK do?</h2>