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/06/09 15:46:56 UTC
directory-fortress-core git commit: FC-110 - Fix openldap server type
parameter
Repository: directory-fortress-core
Updated Branches:
refs/heads/master c48ccf495 -> 5b5feeda6
FC-110 - Fix openldap server type parameter
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/5b5feeda
Tree: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/tree/5b5feeda
Diff: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/diff/5b5feeda
Branch: refs/heads/master
Commit: 5b5feeda695401394576c8ac4dc9537e5be0c28d
Parents: c48ccf4
Author: Shawn McKinney <sm...@apache.org>
Authored: Tue Jun 9 08:47:27 2015 -0500
Committer: Shawn McKinney <sm...@apache.org>
Committed: Tue Jun 9 08:47:27 2015 -0500
----------------------------------------------------------------------
build.xml | 3 +--
config/fortress.properties.src | 3 +++
ldap/setup/refreshLDAPData-src.xml | 1 -
src/main/java/org/apache/directory/fortress/core/GlobalIds.java | 2 +-
4 files changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/5b5feeda/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 4064e34..a24c655 100644
--- a/build.xml
+++ b/build.xml
@@ -888,7 +888,7 @@
<replace file="${dst.remote.conf}" token="@TRUST_STORE_SET_PROPW@" value="${trust.store.set.prop}"/>
<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}"/>
<echo message="############### Modify fortress load scripts per user settings ###############"/>
<delete file="${dst.load.bootstrap.script}"/>
@@ -898,7 +898,6 @@
<replace file="${dst.load.bootstrap.script}" token="@SUFFIX_DC2@" value="${suffix.dc2}"/>
<replace file="${dst.load.bootstrap.script}" token="@SUFFIX@" value="${suffix}"/>
- <replace file="${dst.load.bootstrap.script}" token="@SERVER_TYPE@" value="${ldap.server.type}"/>
<replace file="${dst.load.bootstrap.script}" token="@USERS_DN@" value="${users.dn}"/>
<replace file="${dst.load.bootstrap.script}" token="@GROUPS_DN@" value="${groups.dn}"/>
<replace file="${dst.load.bootstrap.script}" token="@ROLES_DN@" value="${roles.dn}"/>
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/5b5feeda/config/fortress.properties.src
----------------------------------------------------------------------
diff --git a/config/fortress.properties.src b/config/fortress.properties.src
index 1e78e0d..16481be 100755
--- a/config/fortress.properties.src
+++ b/config/fortress.properties.src
@@ -23,6 +23,9 @@
host=@LDAP_HOST@
port=@LDAP_PORT@
+# Options are openldap or apacheds (default):
+ldap.server.type=@SERVER_TYPE@
+
# Used for SSL Connection to LDAP Server:
enable.ldap.ssl=@ENABLE_LDAP_SSL@
enable.ldap.ssl.debug=@ENABLE_LDAP_SSL_DEBUG@
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/5b5feeda/ldap/setup/refreshLDAPData-src.xml
----------------------------------------------------------------------
diff --git a/ldap/setup/refreshLDAPData-src.xml b/ldap/setup/refreshLDAPData-src.xml
index eee0ce6..fd459a7 100755
--- a/ldap/setup/refreshLDAPData-src.xml
+++ b/ldap/setup/refreshLDAPData-src.xml
@@ -74,7 +74,6 @@
<config props="max.user.conn:@USR_MAX_CONN@"/>
<config props="user.session.props.enabled:false"/>
<config props="authn.type:default"/>
- <config props="ldap.server.type:@SERVER_TYPE@"/>
<config props="clientside.sorting:true"/>
<config props="suffix:@SUFFIX@"/>
<config props="user.root:@USERS_DN@"/>
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/5b5feeda/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 16e5b6d..a130081 100755
--- a/src/main/java/org/apache/directory/fortress/core/GlobalIds.java
+++ b/src/main/java/org/apache/directory/fortress/core/GlobalIds.java
@@ -237,7 +237,7 @@ public final class GlobalIds
/*
* *************************************************************************
- * ** OpenAccessMgr AUDIT
+ * ** AUDIT
* ************************************************************************
*/