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 2018/07/13 12:10:35 UTC

directory-fortress-core git commit: 2.0.1 release preps, take 2

Repository: directory-fortress-core
Updated Branches:
  refs/heads/master 845169c8a -> 95177990b


2.0.1 release preps, take 2


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

Branch: refs/heads/master
Commit: 95177990b4ba0c6d32a81a13ab9aa2c530420dda
Parents: 845169c
Author: Shawn McKinney <sm...@apache.org>
Authored: Fri Jul 13 07:10:33 2018 -0500
Committer: Shawn McKinney <sm...@apache.org>
Committed: Fri Jul 13 07:10:33 2018 -0500

----------------------------------------------------------------------
 config/bootstrap/log4j.xml         |  6 ++++++
 config/log4j.xml                   | 15 +++++++++------
 ldap/setup/refreshLDAPData-src.xml |  6 +++---
 pom.xml                            |  2 +-
 4 files changed, 19 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/95177990/config/bootstrap/log4j.xml
----------------------------------------------------------------------
diff --git a/config/bootstrap/log4j.xml b/config/bootstrap/log4j.xml
index 7186e0a..f6000d8 100755
--- a/config/bootstrap/log4j.xml
+++ b/config/bootstrap/log4j.xml
@@ -26,6 +26,12 @@
         </layout>
     </appender>
 
+    <category name="org.apache.directory.fortress.core" class="org.apache.log4j.Logger" additivity="false">
+        <priority value="INFO" class="org.apache.log4j.Level"/>
+        <appender-ref ref="console"/>
+    </category>
+
+
     <root>
         <priority value="INFO" class="org.apache.log4j.Level"/>
         <appender-ref ref="console"/>

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/95177990/config/log4j.xml
----------------------------------------------------------------------
diff --git a/config/log4j.xml b/config/log4j.xml
index 078812e..4cc1b1b 100755
--- a/config/log4j.xml
+++ b/config/log4j.xml
@@ -38,17 +38,20 @@
         </layout>
     </appender>
 
-<!--
-    <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 name="org.apache.directory.fortress.core" class="org.apache.log4j.Logger" additivity="false">
+        <priority value="INFO" class="org.apache.log4j.Level"/>
+        <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="console"/>
+    </category-->
 
     <root>
         <priority value="INFO" class="org.apache.log4j.Level"/>
         <appender-ref ref="console"/>
-        <appender-ref ref="file"/>
+        <!--<appender-ref ref="file"/>-->
     </root>
 
 </log4j:configuration>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/95177990/ldap/setup/refreshLDAPData-src.xml
----------------------------------------------------------------------
diff --git a/ldap/setup/refreshLDAPData-src.xml b/ldap/setup/refreshLDAPData-src.xml
index b7cb3df..9820aff 100755
--- a/ldap/setup/refreshLDAPData-src.xml
+++ b/ldap/setup/refreshLDAPData-src.xml
@@ -69,8 +69,8 @@
 
             <addconfig>
                 <config props="config.realm:DEFAULT"/>
-                <config props="min.user.conn:@USR_MIN_CONN@"/>
-                <config props="max.user.conn:@USR_MAX_CONN@"/>
+                <!--config props="min.user.conn:@USR_MIN_CONN@"/-->
+                <!--config props="max.user.conn:@USR_MAX_CONN@"/-->
                 <config props="user.session.props.enabled:false"/>
                 <config props="authn.type:default"/>
                 <config props="clientside.sorting:true"/>
@@ -85,7 +85,7 @@
                 <config props="permou.root:@PERMOUS_DN@"/>
                 <config props="adminrole.root:@ADMINROLES_DN@"/>
                 <config props="adminperm.root:@ADMINPERMS_DN@"/>
-                <config props="example.root:ou=Examples,@SUFFIX@"/>
+                <!--config props="example.root:ou=Examples,@SUFFIX@"/-->
                 <!--config props="accessmgr.implementation:org.apache.directory.fortress.core.impl.AccessMgrImpl"/-->
                 <!--config props="auditmgr.implementation:org.apache.directory.fortress.audit.AuditMgrImpl"/-->
                 <config props="audit.root:@AUDITS_DN@"/>

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/95177990/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index f8e4432..1137447 100644
--- a/pom.xml
+++ b/pom.xml
@@ -31,7 +31,7 @@
   <artifactId>fortress-core</artifactId>
   <packaging>jar</packaging>
   <name>Apache Fortress Core</name>
-  <version>2.0.2-SNAPSHOT</version>
+  <version>2.0.1-SNAPSHOT</version>
   <inceptionYear>2007</inceptionYear>
   <description>
     Apache Fortress is a standards-based Access Management SDK that implements ANSI RBAC INCITS 359.