directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From smckin...@apache.org
Subject [1/3] directory-fortress-core git commit: FC-109 - minor cleanup includes reformatting javadoc
Date Tue, 02 Jun 2015 19:55:00 GMT
Repository: directory-fortress-core
Updated Branches:
  refs/heads/1.0-RC41 5b8951c48 -> ae72bf061


http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/ae72bf06/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 fe53020..4431f18 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
@@ -18,38 +18,36 @@
  *
 -->
 <html>
-  <head>
+<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-web.html">Build Apache Fortress Web</a></li>
-          <li><a href="./apache-fortress-rest.html">Build Apache Fortress Rest</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/>
-    
-    <h4>This section provides instructions to install the Apache Directory Server which
is needed by Fortress</h4>
-    Steps to install:
-    <ol>
-
-      <li>
+</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-web.html">Build Apache Fortress Web</a></li>
+        <li><a href="./apache-fortress-rest.html">Build Apache Fortress Rest</a></li>
+    </ul>
+    <li><a href="./ten-minute-guide.html">Ten Minute Guide</a></li>
+</fieldset>
+<hr>
+<h3>Setup Apache Directory Server</h3>
+<img src="apacheds-logo.jpeg"/>
+<br/><br/>
+
+<h4>This section provides instructions to install the Apache Directory Server which
is needed by Fortress</h4>
+Steps to install:
+<ol>
+
+    <li>
         Download and install Apache Directory Server
         <br/><br/>
         For 32-bit (as root):
@@ -60,7 +58,7 @@ 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">
@@ -70,27 +68,27 @@ chmod a+x *.bin
           </p>
         </pre>
         Unless you know what you're doing, accept the defaults.
-      </li>
+    </li>
 
-      <br/>
+    <br/>
 
-      <li>
-        If you have trouble pulling you can get binaries here: 
+    <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>
+    </li>
 
-      <br/>
+    <br/>
 
-      <li>
+    <li>
         Edit ApacheDS conf file
         <pre>
           <p style="font: monospace; color: black; background-color: lightgrey; font-size:
10pt">
 sudo vi /opt/apacheds-2.0.0-M19/conf/wrapper.conf
           </p>
         </pre>
-      </li>
+    </li>
 
-      <li>
+    <li>
         Add location of java:
         <pre>
           <p style="font: monospace; color: black; background-color: lightgrey; font-size:
10pt">
@@ -98,17 +96,17 @@ wrapper.java.command=/path/java/bin/java
           </p>
         </pre>
         Where 'path' equals fully qualified location of target machine's java.
-      </li>
+    </li>
 
-      <br/>
+    <br/>
 
-      <li>
+    <li>
         Save and exit.
-      </li>
+    </li>
 
-      <br/>
+    <br/>
 
-      <li>
+    <li>
         After installation start the directory server process.
 
         From system command prompt (as root):
@@ -117,23 +115,22 @@ wrapper.java.command=/path/java/bin/java
 /etc/init.d/apacheds-2.0.0-M19-default start
           </p>
         </pre>
-      </li>
+    </li>
 
-      <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).
+/etc/init.d/apacheds-2.0.0-M19-default status ApacheDS - default is running (70041).
           </p>
         </pre>
-      </li>
+    </li>
 
-      <br/>
-    </ol>
-  </body>
-  <p style="font: monospace; color: black; font-size: 6pt">Copyright 2003-2015, The
Apache Software Foundation. 
+    <br/>
+</ol>
+</body>
+<p style="font: monospace; color: black; font-size: 6pt">Copyright 2003-2015, The Apache
Software Foundation.
     All RightsReserved.</p>
 </html>

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/ae72bf06/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 3d4a775..aed4d2d 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
@@ -48,7 +48,7 @@ Steps to complete:
 <ol>
     <li>Set java and maven home env variables.</li>
 
-    <br/>
+    <br>
 
     <li>
         Change directory:
@@ -70,7 +70,8 @@ cp build.properties.example build.properties
 
     <li>
         Edit the build.properties in root folder of package.
-        These parameters will be used to generate config artifacts: <b>config/fortress.properties</b>
and <b>ldap/setup/refreshLDAPData.xml</b>, needed later on.
+        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:
 
@@ -86,7 +87,7 @@ ldap.server.type=apacheds
     </li>
 
     <li>
-        Build fortress core.  This step will generate config artifacts using settings from
build.properties.
+        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 install
@@ -179,7 +180,8 @@ mvn test -Dtest=FortressJUnitTest
 mvn test -Pcli
                     </p>
                 </pre>
-        This program provides a command line interface for driving the fortress APIs.  It
is useful for ad-hoc and automated updates to the data.  It's instruction manual is here:
+        This program provides a command line interface for driving the fortress APIs. It
is useful for ad-hoc and
+        automated updates to the data. It's instruction manual is here:
         <a href="../cli/package-summary.html">Fortress CLI Instruction Manual</a>
     </li>
 
@@ -192,26 +194,31 @@ mvn test -Pcli
 mvn test -Pconsole
                     </p>
                 </pre>
-        This program provides an interfactive console for driving the fortress functions.
 It is useful for testing and ad-hoc updates to the data.
+        This program provides an interfactive console for driving the fortress functions.
It is useful for testing and
+        ad-hoc updates to the data.
         <br/><br/>
         <ol type="a">
             <li>Start at the Main Menu:
-                <br/><img src="./screenshot-fortress-console-main.png" height="50%"
width="40%" alt="Fortress Console Main"/>
+                <br/><img src="./screenshot-fortress-console-main.png" height="50%"
width="40%"
+                          alt="Fortress Console Main"/>
                 <br/>Enter option to perform a particular manager function.
             </li>
             <br/>
             <li>Option '1' for RBAC Admin Manager Functions:
-                <br/><img src="./screenshot-fortress-console-rbac-admin.png" height="50%"
width="25%" alt="Fortress Console Admin"/>
+                <br/><img src="./screenshot-fortress-console-rbac-admin.png" height="50%"
width="25%"
+                          alt="Fortress Console Admin"/>
                 <br/>Add, Update and Delete RBAC entities.
             </li>
             <br/>
             <li>Option '2' for RBAC Review Manager Functions:
-                <br/><img src="./screenshot-fortress-console-rbac-review.png" height="50%"
width="35%" alt="Fortress Console Review"/>
+                <br/><img src="./screenshot-fortress-console-rbac-review.png" height="50%"
width="35%"
+                          alt="Fortress Console Review"/>
                 <br/>Read and Search RBAC entities.
             </li>
             <br/>
             <li>Option '3' for RBAC Access Manager Functions:
-                <br/><img src="./screenshot-fortress-console-rbac-access.png" height="50%"
width="35%" alt="Fortress Console Access Mgr Tests"/>
+                <br/><img src="./screenshot-fortress-console-rbac-access.png" height="50%"
width="35%"
+                          alt="Fortress Console Access Mgr Tests"/>
                 <br/>Test RBAC runtime functions like createSession and checkAccess.
             </li>
             <br/>

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/ae72bf06/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 6d09c58..5c74003 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
@@ -38,7 +38,6 @@
     <li><a href="./ten-minute-guide.html">Ten Minute Guide</a></li>
 </fieldset>
 <hr>
-<p/>
 
 <h3>Build Apache Fortress Realm</h3>
 

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/ae72bf06/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 9747035..c8b84d9 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
@@ -18,134 +18,134 @@
  *
 -->
 <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-web.html">Build Apache Fortress Web</a></li>
-           <li><a href="./apache-fortress-rest.html">Build Apache Fortress Rest</a></li>
-       </ul>
-       <li><a href="./ten-minute-guide.html">Ten Minute Guide</a></li>
-   </fieldset>
-   <hr>
-   <p>
-
-   <h3>Build Apache Fortress Web</h3>
-   <img src="screenshot-fortress-web.png" height="50%" width="40%" alt="Fortress Web Users">
-
-
-      <h4>This section describes how to install and use the Fortress Web Application
for RBAC Administration </h4>
-
-      <ol>
-
-          </li>
-
-          <li>Set java and maven home env variables.</li>
-
-          <br>
-
-          <li>
-              Change directory:
+<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-web.html">Build Apache Fortress Web</a></li>
+        <li><a href="./apache-fortress-rest.html">Build Apache Fortress Rest</a></li>
+    </ul>
+    <li><a href="./ten-minute-guide.html">Ten Minute Guide</a></li>
+</fieldset>
+<hr>
+<p>
+
+<h3>Build Apache Fortress Web</h3>
+<img src="screenshot-fortress-web.png" height="50%" width="40%" alt="Fortress Web Users">
+
+<h4>This section describes how to install and use the Fortress Web Application for
RBAC Administration </h4>
+
+<ol>
+
+    <li>Set java and maven home env variables.</li>
+
+    <br>
+
+    <li>
+        Change directory:
             <pre>
                 <p style="font: monospace; color: black; background-color: lightgrey;
font-size: 10pt">
 cd directory-fortress-commander/
                 </p>
             </pre>
-          </li>
+    </li>
 
-          <li>
-              Copy the fortress.properties, created on step <a href="./apache-fortress-core.html">Build
Apache Fortress Core</a>, to this package's resource folder.
+    <li>
+        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]/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.
-          </li>
+        Where [directory-fortress-core] is base folder of the fortress core source package
and
+        [directory-fortress-commander] is the current package's home folder.
+    </li>
 
-          <br>
+    <br>
 
-          <li>
-              To load policies for testing into ldap, run this command:
+    <li>
+        To load policies for testing into ldap, run this command:
                 <pre>
                     <p style="font: monospace; color: black; background-color: lightgrey;
font-size: 10pt">
 mvn install -Dload.file=./src/main/resources/FortressWebDemoUsers.xml
                     </p>
                 </pre>
-          </li>
+    </li>
 
-          <li>
-              To deploy fortress web, run this command:
+    <li>
+        To deploy fortress web, run this command:
                 <pre>
                     <p style="font: monospace; color: black; background-color: lightgrey;
font-size: 10pt">
 mvn tomcat:deploy
                     </p>
                 </pre>
-          </li>
+    </li>
 
-          <li>
-              To redeploy:
+    <li>
+        To redeploy:
                 <pre>
                     <p style="font: monospace; color: black; background-color: lightgrey;
font-size: 10pt">
 mvn tomcat:redeploy
                     </p>
                 </pre>
-          </li>
-
-          <li>
-              Connect to web app:
-              <br><br>
-              <a href="http://localhost:8080/fortress-web">http://localhost:8080/fortress-web</a>,
-          </li>
-
-          <br>
-
-          <li>
-              Try the various user accounts, notice how each has different policies:
-              <br><br>
-              <ol type="a">
-                  <li>
-                      <b>userId</b>: <i>test</i>, <b>password</b>:
<i>password</i>
-                  </li>
-                  <br>
-                  <li>
-                      <b>userId</b>: <i>test1</i>, <b>password</b>:
<i>password</i>
-                  </li>
-                  <br>
-                  <li>
-                      <b>userId</b>: <i>test2</i>, <b>password</b>:
<i>password</i>
-                  </li>
-                  <br>
-                  <li>
-                      <b>userId</b>: <i>test3</i>, <b>password</b>:
<i>password</i>
-                  </li>
-              </ol>
-          </li>
-
-          <br>
-
-          <li>
-              Run the Selenium Web driver integration tests:
+    </li>
+
+    <li>
+        Connect to web app:
+        <br><br>
+        <a href="http://localhost:8080/fortress-web">http://localhost:8080/fortress-web</a>,
+    </li>
+
+    <br>
+
+    <li>
+        Try the various user accounts, notice how each has different policies:
+        <br><br>
+        <ol type="a">
+            <li>
+                <b>userId</b>: <i>test</i>, <b>password</b>:
<i>password</i>
+            </li>
+            <br>
+            <li>
+                <b>userId</b>: <i>test1</i>, <b>password</b>:
<i>password</i>
+            </li>
+            <br>
+            <li>
+                <b>userId</b>: <i>test2</i>, <b>password</b>:
<i>password</i>
+            </li>
+            <br>
+            <li>
+                <b>userId</b>: <i>test3</i>, <b>password</b>:
<i>password</i>
+            </li>
+        </ol>
+    </li>
+
+    <br>
+
+    <li>
+        Run the Selenium Web driver integration tests:
                 <pre>
                     <p style="font: monospace; color: black; background-color: lightgrey;
font-size: 10pt">
 mvn test -Dtest=FortressWebSeleniumITCase
                     </p>
                 </pre>
-          </li>
+    </li>
 
-      </ol>
+</ol>
 
-   </body>
-   <p style="font: monospace; color: black; font-size: 6pt">Copyright 2003-2015, The
Apache Software Foundation. All Rights Reserved.</p>
+</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/ae72bf06/src/main/java/org/apache/directory/fortress/core/ldap/ApacheDsDataProvider.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/ldap/ApacheDsDataProvider.java
b/src/main/java/org/apache/directory/fortress/core/ldap/ApacheDsDataProvider.java
index 148b6a9..3d8fe36 100644
--- a/src/main/java/org/apache/directory/fortress/core/ldap/ApacheDsDataProvider.java
+++ b/src/main/java/org/apache/directory/fortress/core/ldap/ApacheDsDataProvider.java
@@ -163,7 +163,7 @@ public abstract class ApacheDsDataProvider
             LOG.info( "javax.net.debug: {}" + IS_SSL_DEBUG );
             System.setProperty( "javax.net.ssl.trustStore", GlobalIds.TRUST_STORE );
             System.setProperty( "javax.net.ssl.trustStorePassword", GlobalIds.TRUST_STORE_PW
);
-            System.setProperty( "javax.net.debug", new Boolean( IS_SSL_DEBUG ).toString()
);
+            System.setProperty( "javax.net.debug", Boolean.valueOf( IS_SSL_DEBUG ).toString()
);
         }
 
         LdapConnectionConfig config = new LdapConnectionConfig();

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/ae72bf06/src/main/java/org/apache/directory/fortress/core/util/time/CUtil.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/util/time/CUtil.java b/src/main/java/org/apache/directory/fortress/core/util/time/CUtil.java
index 87170d3..b45fcf6 100755
--- a/src/main/java/org/apache/directory/fortress/core/util/time/CUtil.java
+++ b/src/main/java/org/apache/directory/fortress/core/util/time/CUtil.java
@@ -60,7 +60,7 @@ import java.util.StringTokenizer;
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public class CUtil
+public final class CUtil
 {
     private static final String CLS_NM = CUtil.class.getName();
     private static final Logger LOG = LoggerFactory.getLogger( CLS_NM );


Mime
View raw message