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/02/16 22:22:25 UTC
directory-fortress-enmasse git commit: FC-68 - Rename config artifacts
Repository: directory-fortress-enmasse
Updated Branches:
refs/heads/master 5e9d439e6 -> 209794b44
FC-68 - Rename config artifacts
Project: http://git-wip-us.apache.org/repos/asf/directory-fortress-enmasse/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-fortress-enmasse/commit/209794b4
Tree: http://git-wip-us.apache.org/repos/asf/directory-fortress-enmasse/tree/209794b4
Diff: http://git-wip-us.apache.org/repos/asf/directory-fortress-enmasse/diff/209794b4
Branch: refs/heads/master
Commit: 209794b44db36fd0929f25b40fbd210418d39204
Parents: 5e9d439
Author: Shawn McKinney <sm...@apache.org>
Authored: Mon Feb 16 15:22:12 2015 -0600
Committer: Shawn McKinney <sm...@apache.org>
Committed: Mon Feb 16 15:22:12 2015 -0600
----------------------------------------------------------------------
.gitignore | 1 +
src/main/resources/fortress.properties | 58 ---------------------
src/main/resources/fortress.properties.example | 58 +++++++++++++++++++++
3 files changed, 59 insertions(+), 58 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-fortress-enmasse/blob/209794b4/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index cf11e60..0cc207c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
.settings/*
+fortress.properties
http://git-wip-us.apache.org/repos/asf/directory-fortress-enmasse/blob/209794b4/src/main/resources/fortress.properties
----------------------------------------------------------------------
diff --git a/src/main/resources/fortress.properties b/src/main/resources/fortress.properties
deleted file mode 100644
index ef88874..0000000
--- a/src/main/resources/fortress.properties
+++ /dev/null
@@ -1,58 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-#
-
-# Host name and port of LDAP DIT:
-host=localhost
-port=10389
-
-# These credentials are used for read/write access to all nodes under suffix:
-admin.user=uid=admin,ou=system
-# LDAP admin root pass is encrypted using 'encrypt' target in build.xml:
-admin.pw=secret
-
-# This is min/max settings for LDAP administrator pool connections that have read/write access to all nodes under suffix:
-min.admin.conn=1
-max.admin.conn=25
-
-# Used for SSL Connection to LDAP Server:
-#enable.ldap.ssl=true
-#enable.ldap.ssl.debug=true
-#trust.store=/fully/qualified/path/and/file/name/to/java/truststore
-#trust.store.password=changeit
-#trust.store.set.prop=true
-
-# This node contains fortress properties stored on behalf of connecting LDAP clients:
-config.realm=DEFAULT
-config.root=ou=Config,dc=example,dc=com
-
-# enable this to see trace statements when connection pool allocates new connections:
-debug.ldap.pool=true
-
-# Default for pool reconnect flag is false:
-enable.pool.reconnect=true
-
-ehcache.config.file=ehcache.xml
-role1=admin
-role2=role1
-
-# If for any reason echcache must be DISABLED for DSD, make sure this parameter is set to 'true' which is the default. Otherwise performance penalty will be incurred during multi-role activations.
-disable.dsd.cache=false
-
-
http://git-wip-us.apache.org/repos/asf/directory-fortress-enmasse/blob/209794b4/src/main/resources/fortress.properties.example
----------------------------------------------------------------------
diff --git a/src/main/resources/fortress.properties.example b/src/main/resources/fortress.properties.example
new file mode 100644
index 0000000..ef88874
--- /dev/null
+++ b/src/main/resources/fortress.properties.example
@@ -0,0 +1,58 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#
+
+# Host name and port of LDAP DIT:
+host=localhost
+port=10389
+
+# These credentials are used for read/write access to all nodes under suffix:
+admin.user=uid=admin,ou=system
+# LDAP admin root pass is encrypted using 'encrypt' target in build.xml:
+admin.pw=secret
+
+# This is min/max settings for LDAP administrator pool connections that have read/write access to all nodes under suffix:
+min.admin.conn=1
+max.admin.conn=25
+
+# Used for SSL Connection to LDAP Server:
+#enable.ldap.ssl=true
+#enable.ldap.ssl.debug=true
+#trust.store=/fully/qualified/path/and/file/name/to/java/truststore
+#trust.store.password=changeit
+#trust.store.set.prop=true
+
+# This node contains fortress properties stored on behalf of connecting LDAP clients:
+config.realm=DEFAULT
+config.root=ou=Config,dc=example,dc=com
+
+# enable this to see trace statements when connection pool allocates new connections:
+debug.ldap.pool=true
+
+# Default for pool reconnect flag is false:
+enable.pool.reconnect=true
+
+ehcache.config.file=ehcache.xml
+role1=admin
+role2=role1
+
+# If for any reason echcache must be DISABLED for DSD, make sure this parameter is set to 'true' which is the default. Otherwise performance penalty will be incurred during multi-role activations.
+disable.dsd.cache=false
+
+