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 2020/05/22 15:16:40 UTC

[directory-fortress-core] branch master updated: 2.0.5 release preps

This is an automated email from the ASF dual-hosted git repository.

smckinney pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/directory-fortress-core.git


The following commit(s) were added to refs/heads/master by this push:
     new 59e2072  2.0.5 release preps
59e2072 is described below

commit 59e20721495a9ce030ee6b1d88a1f9b802b29b56
Author: Shawn McKinney <sm...@symas.com>
AuthorDate: Fri May 22 10:16:34 2020 -0500

    2.0.5 release preps
---
 README-QUICKSTART-APACHEDS.md      | 30 +++++++++++++++---------------
 README-QUICKSTART-SLAPD.md         | 30 +++++++++++++++---------------
 README-TEN-MINUTE-GUIDE.md         |  2 +-
 README.md                          |  4 ++--
 build.properties.example           |  2 +-
 ldap/schema/fortress.schema        |  2 +-
 ldap/setup/refreshLDAPData-src.xml |  4 ----
 slapd.properties.example           |  2 +-
 8 files changed, 36 insertions(+), 40 deletions(-)

diff --git a/README-QUICKSTART-APACHEDS.md b/README-QUICKSTART-APACHEDS.md
index 3ad7d3f..8f0bf89 100644
--- a/README-QUICKSTART-APACHEDS.md
+++ b/README-QUICKSTART-APACHEDS.md
@@ -18,7 +18,7 @@
 
 # ApacheDS & Fortress QUICKSTART
 
- Apache Fortress 2.0.4 and ApacheDS Quickstart System Architecture
+ Apache Fortress 2.0.5 and ApacheDS Quickstart System Architecture
  ![ApacheDS & Fortress System Architecture](images/fortress-apacheds-system-arch.png "ApacheDS & Fortress System Architecture")
 
 -------------------------------------------------------------------------------
@@ -36,7 +36,7 @@
 ___________________________________________________________________________________
 ## Document Overview
 
- * This document contains instructions to install Apache Fortress 2.0.4 Core, Web, Rest and ApacheDS.
+ * This document contains instructions to install Apache Fortress 2.0.5 Core, Web, Rest and ApacheDS.
 
 -------------------------------------------------------------------------------
 ## SECTION 1. Prerequisites
@@ -109,15 +109,15 @@ ________________________________________________________________________________
 1. Download the package:
  a. from git:
  ```
- git clone --branch 2.0.4  https://gitbox.apache.org/repos/asf/directory-fortress-core.git
+ git clone --branch 2.0.5  https://gitbox.apache.org/repos/asf/directory-fortress-core.git
  cd directory-fortress-core
  ```
 
  b. or download package:
  ```
- wget http://www.apache.org/dist/directory/fortress/dist/2.0.4/fortress-core-2.0.4-source-release.zip
- unzip fortress-core-2.0.4-source-release.zip
- cd fortress-core-2.0.4
+ wget http://www.apache.org/dist/directory/fortress/dist/2.0.5/fortress-core-2.0.5-source-release.zip
+ unzip fortress-core-2.0.5-source-release.zip
+ cd fortress-core-2.0.5
  ```
 
 2. Prepare the package:
@@ -284,7 +284,7 @@ During this section, you will be asked to setup Apache Tomcat 8 and prepare for
 2. Download the fortress realm proxy jar into tomcat/lib folder:
 
   ```
-  sudo wget http://repo.maven.apache.org/maven2/org/apache/directory/fortress/fortress-realm-proxy/2.0.4/fortress-realm-proxy-2.0.4.jar -P /usr/local/tomcat8/lib
+  sudo wget http://repo.maven.apache.org/maven2/org/apache/directory/fortress/fortress-realm-proxy/2.0.5/fortress-realm-proxy-2.0.5.jar -P /usr/local/tomcat8/lib
   ```
 
 3. Prepare tomcat fortress usage:
@@ -378,15 +378,15 @@ During this section, you will be asked to setup Apache Fortress Rest Application
 
  a. from git:
  ```
- git clone --branch 2.0.4  https://gitbox.apache.org/repos/asf/directory-fortress-enmasse.git
+ git clone --branch 2.0.5  https://gitbox.apache.org/repos/asf/directory-fortress-enmasse.git
  cd directory-fortress-enmasse
  ```
 
  b. or download package:
  ```
- wget http://www.apache.org/dist/directory/fortress/dist/2.0.4/fortress-rest-2.0.4-source-release.zip
- unzip fortress-rest-2.0.4-source-release.zip
- cd fortress-rest-2.0.4
+ wget http://www.apache.org/dist/directory/fortress/dist/2.0.5/fortress-rest-2.0.5-source-release.zip
+ unzip fortress-rest-2.0.5-source-release.zip
+ cd fortress-rest-2.0.5
  ```
 
 2. Prepare:
@@ -424,15 +424,15 @@ During this section, you will be asked to setup Apache Fortress Web Application
 
  a. from git:
  ```
- git clone --branch 2.0.4  https://gitbox.apache.org/repos/asf/directory-fortress-commander.git
+ git clone --branch 2.0.5  https://gitbox.apache.org/repos/asf/directory-fortress-commander.git
  cd directory-fortress-commander
  ```
 
  b. or download package:
  ```
- wget http://www.apache.org/dist/directory/fortress/dist/2.0.4/fortress-web-2.0.4-source-release.zip
- unzip fortress-web-2.0.4-source-release.zip
- cd fortress-web-2.0.4
+ wget http://www.apache.org/dist/directory/fortress/dist/2.0.5/fortress-web-2.0.5-source-release.zip
+ unzip fortress-web-2.0.5-source-release.zip
+ cd fortress-web-2.0.5
  ```
 
 2. Prepare:
diff --git a/README-QUICKSTART-SLAPD.md b/README-QUICKSTART-SLAPD.md
index 07cfced..a8072be 100644
--- a/README-QUICKSTART-SLAPD.md
+++ b/README-QUICKSTART-SLAPD.md
@@ -18,7 +18,7 @@
 
 # OpenLDAP & Fortress QUICKSTART
 
- Apache Fortress 2.0.4 and OpenLDAP Quickstart System Architecture
+ Apache Fortress 2.0.5 and OpenLDAP Quickstart System Architecture
  ![OpenLDAP & Fortress System Architecture](images/fortress-openldap-accel-system-arch.png "OpenLDAP & Fortress System Architecture")
 
 -------------------------------------------------------------------------------
@@ -35,7 +35,7 @@
 ___________________________________________________________________________________
 ## Document Overview
 
- * This document contains instructions to install Apache Fortress 2.0.4 Core and related components.
+ * This document contains instructions to install Apache Fortress 2.0.5 Core and related components.
 
 -------------------------------------------------------------------------------
 ## SECTION 1. Prerequisites
@@ -57,15 +57,15 @@ ________________________________________________________________________________
 
  a. from git:
  ```
- git clone --branch 2.0.4  https://gitbox.apache.org/repos/asf/directory-fortress-core.git
+ git clone --branch 2.0.5  https://gitbox.apache.org/repos/asf/directory-fortress-core.git
  cd directory-fortress-core
  ```
 
  b. or download package:
  ```
- wget http://www.apache.org/dist/directory/fortress/dist/2.0.4/fortress-core-2.0.4-source-release.zip
- unzip fortress-core-2.0.4-source-release.zip
- cd fortress-core-2.0.4
+ wget http://www.apache.org/dist/directory/fortress/dist/2.0.5/fortress-core-2.0.5-source-release.zip
+ unzip fortress-core-2.0.5-source-release.zip
+ cd fortress-core-2.0.5
  ```
 
 2. Prepare the package:
@@ -307,7 +307,7 @@ During this section, you will be asked to setup Apache Tomcat 8 and prepare for
 2. Download the fortress realm proxy jar into tomcat/lib folder:
 
   ```
-  sudo wget http://repo.maven.apache.org/maven2/org/apache/directory/fortress/fortress-realm-proxy/2.0.4/fortress-realm-proxy-2.0.4.jar -P /usr/local/tomcat8/lib
+  sudo wget http://repo.maven.apache.org/maven2/org/apache/directory/fortress/fortress-realm-proxy/2.0.5/fortress-realm-proxy-2.0.5.jar -P /usr/local/tomcat8/lib
   ```
 
 3. Prepare tomcat fortress usage:
@@ -402,15 +402,15 @@ During this section, you will be asked to setup Apache Fortress Rest Application
 
  a. from git:
  ```
- git clone --branch 2.0.4  https://gitbox.apache.org/repos/asf/directory-fortress-enmasse.git
+ git clone --branch 2.0.5  https://gitbox.apache.org/repos/asf/directory-fortress-enmasse.git
  cd directory-fortress-enmasse
  ```
 
  b. or download package:
  ```
- wget http://www.apache.org/dist/directory/fortress/dist/2.0.4/fortress-rest-2.0.4-source-release.zip
- unzip fortress-rest-2.0.4-source-release.zip
- cd fortress-rest-2.0.4
+ wget http://www.apache.org/dist/directory/fortress/dist/2.0.5/fortress-rest-2.0.5-source-release.zip
+ unzip fortress-rest-2.0.5-source-release.zip
+ cd fortress-rest-2.0.5
  ```
 
 2. Prepare:
@@ -448,15 +448,15 @@ During this section, you will be asked to setup Apache Fortress Web Application
 
  a. from git:
  ```
- git clone --branch 2.0.4  https://gitbox.apache.org/repos/asf/directory-fortress-commander.git
+ git clone --branch 2.0.5  https://gitbox.apache.org/repos/asf/directory-fortress-commander.git
  cd directory-fortress-commander
  ```
 
  b. or download package:
  ```
- wget http://www.apache.org/dist/directory/fortress/dist/2.0.4/fortress-web-2.0.4-source-release.zip
- unzip fortress-web-2.0.4-source-release.zip
- cd fortress-web-2.0.4
+ wget http://www.apache.org/dist/directory/fortress/dist/2.0.5/fortress-web-2.0.5-source-release.zip
+ unzip fortress-web-2.0.5-source-release.zip
+ cd fortress-web-2.0.5
  ```
 
 2. Prepare:
diff --git a/README-TEN-MINUTE-GUIDE.md b/README-TEN-MINUTE-GUIDE.md
index 02b890a..63201ad 100644
--- a/README-TEN-MINUTE-GUIDE.md
+++ b/README-TEN-MINUTE-GUIDE.md
@@ -19,7 +19,7 @@
 -------------------------------------------------------------------------------
 # README for Apache Fortress Ten Minute Guide
 
- * Version 2.0.4
+ * Version 2.0.5
  * This document has been deprecated in favor of:
     * Follow these instructions: [README-QUICKSTART-APACHEDS](./README-QUICKSTART-APACHEDS.md)
     * Follow these instructions: [README-QUICKSTART-SLAPD](./README-QUICKSTART-SLAPD.md)
diff --git a/README.md b/README.md
index 4154ca4..1948f6e 100644
--- a/README.md
+++ b/README.md
@@ -92,10 +92,10 @@ From Apache GIT Fortress-Core Software Repo:
  git clone  https://gitbox.apache.org/repos/asf/directory-fortress-core.git
  ```
 
- * or by specific version, e.g. 2.0.4
+ * or by specific version, e.g. 2.0.5
 
  ```
-  git clone --branch 2.0.4  https://gitbox.apache.org/repos/asf/directory-fortress-core.git
+  git clone --branch 2.0.5  https://gitbox.apache.org/repos/asf/directory-fortress-core.git
  ```
 
 2. Set Java and Maven home on machines.
diff --git a/build.properties.example b/build.properties.example
index ef5c6de..31d30a9 100644
--- a/build.properties.example
+++ b/build.properties.example
@@ -139,7 +139,7 @@ group.properties=configParameter
 
 # The following optional HTTP parameters are needed when Fortress core client-side communicates though fortress-rest HTTP proxy (rather than LDAP) server:
 # Thr nav URL to fortress-rest impl: uri = httpProtocol + "://" + httpHost + ":" + httpPort + "/" + "fortress-rest-" + version; + "/";:
-# version is set as system property, i.e. -Dversion=2.0.4
+# version is set as system property, i.e. -Dversion=2.0.5
 # Setting the enable.mgr.impl.rest to 'true' sets Fortress instance to use HTTP services rather than LDAPv3 protocol. Default value is 'false':
 # Use interface over REST/HTTP?  Default is false (use LDAPv3)
 #enable.mgr.impl.rest=true
diff --git a/ldap/schema/fortress.schema b/ldap/schema/fortress.schema
index a34bbe8..1c0310f 100644
--- a/ldap/schema/fortress.schema
+++ b/ldap/schema/fortress.schema
@@ -19,7 +19,7 @@
 #   under the License.
 #
 #
-###  Fortress Schema version 2.0.4
+###  Fortress Schema version 2.0.5
 ###  This schema is required for Apache Fortress Core deployments using OpenLDAP
 ###  IANA PRIVATE ENTERPRISE NUMBER: 1.3.6.1.4.1.18060.17
 ###  1. Fortress Attributes: 1.3.6.1.4.1.18060.17.1.*
diff --git a/ldap/setup/refreshLDAPData-src.xml b/ldap/setup/refreshLDAPData-src.xml
index cfca325..2ed6c95 100755
--- a/ldap/setup/refreshLDAPData-src.xml
+++ b/ldap/setup/refreshLDAPData-src.xml
@@ -72,7 +72,6 @@
             <addconfig>
                 <!-- These values are mapped to a config node named 'DEFAULT' by the FortressAntTask: -->
                 <config props="config.realm:DEFAULT"/>
-                <!-- 2.0.4 schema change maps these to 'gidUnumber' and 'uidNumber' attrs on the associated ftConfig entity. -->
                 <config props="config.gid.number:10000"/>
                 <config props="config.uid.number:20000"/>
                 <!-- These values are stored as properties on the configuration node named 'DEFAULT': -->
@@ -105,9 +104,6 @@
                 <config props="group.properties:@GROUP_PROPERTIES@"/>
                 <config props="role.occupants:@ROLE_OCCUPANTS@"/>
                 <config props="rfc2307:@IS_RFC2307@"/>
-                <!-- Storing these values as props is deprecated since 2.0.4. -->
-                <config props="gidNumber:5000"/>
-                <config props="uidNumber:1000"/>
                 <!-- For encoding user input. . -->
                 <config props="attr.delimiter:$"/>
                 <config props="field.length:130"/>
diff --git a/slapd.properties.example b/slapd.properties.example
index 199f34a..ea42f7e 100644
--- a/slapd.properties.example
+++ b/slapd.properties.example
@@ -123,7 +123,7 @@ log.ops=logops bind writes compare
 
 # The following optional HTTP parameters are needed when Fortress core client-side communicates though fortress-rest HTTP proxy (rather than LDAP) server:
 # Thr nav URL to fortress-rest impl: uri = httpProtocol + "://" + httpHost + ":" + httpPort + "/" + "fortress-rest-" + version; + "/";:
-# version is set as system property, i.e. -Dversion=2.0.4
+# version is set as system property, i.e. -Dversion=2.0.5
 # Setting the enable.mgr.impl.rest to 'true' sets Fortress instance to use HTTP services rather than LDAPv3 protocol. Default value is 'false':
 # Use interface over REST/HTTP?  Default is false (use LDAPv3)
 #enable.mgr.impl.rest=true