directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From smckin...@apache.org
Subject directory-fortress-core git commit: FC-67 - set build props
Date Sun, 15 Feb 2015 20:21:12 GMT
Repository: directory-fortress-core
Updated Branches:
  refs/heads/master 58456f7d5 -> ba92c367a


FC-67 - set build props


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

Branch: refs/heads/master
Commit: ba92c367a7b8d732f6f0110f6a215123b4c52c41
Parents: 58456f7
Author: Shawn McKinney <smckinney@apache.org>
Authored: Sun Feb 15 14:21:00 2015 -0600
Committer: Shawn McKinney <smckinney@apache.org>
Committed: Sun Feb 15 14:21:00 2015 -0600

----------------------------------------------------------------------
 README-TEN-MINUTE-GUIDE.txt |  4 ++--
 build.properties            | 15 ++++++++-------
 config/log4j.xml            | 10 ++++------
 3 files changed, 14 insertions(+), 15 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/ba92c367/README-TEN-MINUTE-GUIDE.txt
----------------------------------------------------------------------
diff --git a/README-TEN-MINUTE-GUIDE.txt b/README-TEN-MINUTE-GUIDE.txt
index 76f8e4a..4bd4a6b 100644
--- a/README-TEN-MINUTE-GUIDE.txt
+++ b/README-TEN-MINUTE-GUIDE.txt
@@ -26,7 +26,7 @@ ________________________________________________________________________________
 ###################################################################################
 # SECTION 0.  Prerequisites for Fortress Ten Minute Guide
 ###################################################################################
-1. Linux machine (tested on Ubuntu 12.04, 14.04 & Centos 6.3)
+1. Linux machine (tested on Ubuntu 12.04, 14.04 & Centos 6.3, 7)
 
 2. Internet access to retrieve source code from Apache Fortress GIT repos and binary dependencies
from online Maven repo.
 
@@ -60,7 +60,7 @@ All other packages will be covered inside the tutorial.
 5. Create the Fortress Core javadoc:
 # $M2_HOME/bin/mvn javadoc:javadoc
 
-6. Point your web browser to the following location:s
+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)

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/ba92c367/build.properties
----------------------------------------------------------------------
diff --git a/build.properties b/build.properties
index 04ad364..f8a0e06 100644
--- a/build.properties
+++ b/build.properties
@@ -70,22 +70,23 @@ ldap.client.type=apache
 
 # These parameters point fortress to LDAP host:
 ldap.host=localhost
-#ldap.port=389
-#ldap.host=fortressdemo2.com
 ldap.port=10389
-
+enable.ldap.ssl=false
 #ldap.uris=ldap://${ldap.host}:${ldap.port}
+
 # These are needed for client SSL connections with LDAP Server:
-#ldap.uris=ldap://${ldap.host}:389 ldaps://${ldap.host}:${ldap.port}
 #enable.ldap.ssl=true
+#ldap.host=fortressdemo2.com
+#ldap.port=10636
 #enable.ldap.ssl.debug=true
-#key.store=/home/smckinn/fortress/builder/src/test/resources/certs/mykeystore
-#key.store.password=changeit
 #trust.store=/home/smckinn/GIT/fortressDev/directory-fortress-core/src/test/resources/certs/mytruststore
 #trust.store.password=changeit
 #trust.store.set.prop=true
 
-# These are needed for OpenLDAP server-side SSL configuration:
+# These are needed for slapd startup SSL configuration:
+#ldap.uris=ldap://${ldap.host}:389 ldaps://${ldap.host}:${ldap.port}
+
+# These are needed for slapd server-side SSL configuration:
 #tls.ca.cert.file=ca-cert.pem
 #tls.cert.file=server-cert.pem
 #tls.key.file=server-key.pem

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/ba92c367/config/log4j.xml
----------------------------------------------------------------------
diff --git a/config/log4j.xml b/config/log4j.xml
index 71a7b1f..9b99963 100755
--- a/config/log4j.xml
+++ b/config/log4j.xml
@@ -48,12 +48,10 @@
         <appender-ref ref="console"/>
     </category>
 
-    <!--
-        <category name="org.apache.directory.api" class="org.apache.log4j.Logger" additivity="false">
-            <priority value="DEBUG" class="org.apache.log4j.Level"/>
-            <appender-ref ref="file"/>
-        </category>
-    -->
+    <category name="org.apache.directory.api" class="org.apache.log4j.Logger" additivity="false">
+        <priority value="DEBUG" class="org.apache.log4j.Level"/>
+        <appender-ref ref="file"/>
+    </category>
 
     <root>
         <priority value="INFO" class="org.apache.log4j.Level"/>


Mime
View raw message