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-133 - Change audit flags
Date Sat, 02 Jan 2016 05:04:12 GMT
Repository: directory-fortress-core
Updated Branches:
  refs/heads/master e9e9570ac -> 3d1f1d3cc


 FC-133 - Change audit flags


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

Branch: refs/heads/master
Commit: 3d1f1d3cc64be4230ca36415a54ff717f9db4460
Parents: e9e9570
Author: Shawn McKinney <smckinney@apache.org>
Authored: Fri Jan 1 23:04:08 2016 -0600
Committer: Shawn McKinney <smckinney@apache.org>
Committed: Fri Jan 1 23:04:08 2016 -0600

----------------------------------------------------------------------
 build.properties.example                                      | 4 ++--
 build.xml                                                     | 4 ++--
 .../java/org/apache/directory/fortress/core/GlobalIds.java    | 7 ++++---
 3 files changed, 8 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/3d1f1d3c/build.properties.example
----------------------------------------------------------------------
diff --git a/build.properties.example b/build.properties.example
index 36287e0..8acd9e3 100644
--- a/build.properties.example
+++ b/build.properties.example
@@ -97,8 +97,8 @@ admin.max.conn=10
 user.min.conn=1
 user.max.conn=10
 
-# Only works if ldap.server.type=openldap:
-enable.audit=true
+# Only disable audit IF ldap.server.type=openldap ABND the slapo access log overlay is NOT
enabled.  This will save roundtrip w/ server for ldapcompare:
+#disable.audit=true
 
 # Used for searching openldap slapo access log:
 log.admin.user=cn=Manager,cn=log

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/3d1f1d3c/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 7ec3cc0..d92fb97 100644
--- a/build.xml
+++ b/build.xml
@@ -37,7 +37,7 @@
        <!-- ########### Project specific properties ########################### -->
        <property name="project.name" value="Fortress Identity Access Management SDK"/>
        <property name="name" value="fortress"/>
-       <property name="ivy.install.version" value="2.2.0"/>
+       <property name="ivy.install.version" value="2.4.0"/>
        <property name="title" value="Fortress Identity and Access Management SDK for Java
${version}"/>
        <property name="title.samples" value="Fortress Identity and Access Management Samples
for Java ${version}"/>
        <property name="vendor" value="Joshua Tree Software"/>
@@ -897,7 +897,7 @@
          <replace file="${dst.remote.conf}" token="@KEY_STORE@" value="${key.store}"/>
          <replace file="${dst.remote.conf}" token="@KEY_STORE_PW@" value="${key.store.password}"/>
          <replace file="${dst.remote.conf}" token="@SERVER_TYPE@" value="${ldap.server.type}"/>
-         <replace file="${dst.remote.conf}" token="@IS_AUDIT@" value="${enable.audit}"/>
+         <replace file="${dst.remote.conf}" token="@IS_AUDIT@" value="${disable.audit}"/>
 
          <echo message="###############  Modify fortress load scripts per user settings
 ###############"/>
          <delete file="${dst.load.bootstrap.script}"/>

http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/3d1f1d3c/src/main/java/org/apache/directory/fortress/core/GlobalIds.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/GlobalIds.java b/src/main/java/org/apache/directory/fortress/core/GlobalIds.java
index a130081..1bb06d8 100755
--- a/src/main/java/org/apache/directory/fortress/core/GlobalIds.java
+++ b/src/main/java/org/apache/directory/fortress/core/GlobalIds.java
@@ -48,9 +48,10 @@ public final class GlobalIds
 
     public static final String HOME = "HOME";
     public static final String TENANT = "tenant";
-    private static final String ENABLE_AUDIT = "enable.audit";
-    public static final boolean IS_AUDIT = ( ( Config.getProperty( ENABLE_AUDIT ) != null
) && ( Config
-        .getProperty( ENABLE_AUDIT ).equalsIgnoreCase( "true" ) ) );
+    private static final String DISABLE_AUDIT = "disable.audit";
+    // This constant is true unless the disable.audit flag is true.
+    public static final boolean IS_AUDIT = ( ( Config.getProperty( DISABLE_AUDIT ) != null
) && ( ! Config
+        .getProperty( DISABLE_AUDIT ).equalsIgnoreCase( "true" ) ) );
     private static final String ENABLE_REST = "enable.mgr.impl.rest";
     public static final boolean IS_REST = ( ( Config.getProperty( ENABLE_REST ) != null )
&& ( Config
         .getProperty( ENABLE_REST ).equalsIgnoreCase( "true" ) ) );


Mime
View raw message