Merge pull request #16 from progress/develop

Merge from Develop

Author: DustinGrau-PSC

README.md

@@ -2,13 +2,13 @@
 
 ### Welcome!
 
-This repository contains sample projects ready for import into PDSOE and PASOE, meant to illustrate usage of the **Progress Spark Toolkit**. Please note that all demos are for illustrating server-side micro-services only; there are no UI components bundled as of the September 2018 release (v4.3.0).
+This repository contains sample projects ready for import into PDSOE and PASOE, meant to illustrate usage of the **Progress Spark Toolkit**. Please note that all demos are for illustrating server-side micro-services only; there are no UI components bundled as of the November 2019 release (v5.0.0).
 
-**Note:** This release utilizes toolkit release [v4.6.0](https://github.com/progress/Spark-Toolkit/releases/tag/v4.6.0).
+**Note:** This release utilizes toolkit release [v4.6.0](https://github.com/progress/Spark-Toolkit/releases/tag/v5.0.0).
 
 ## Requirements
 
-**OpenEdge 11.7.4** or later, with the **Spark.pl** library compiled on your appropriate version (11 or 12).
+**OpenEdge 11.7.5** or **OpenEdge 12.1.**, and later, with the **Spark.pl** library compiled on your appropriate version (11 or 12).
 
 - Apache Ant 1.9.x+ (included as of OE 11.7+ at DLC/ant and run as DLC/bin/proant)
 - Progress Compile Tools, or "PCT" (included as of OE 11.7.3 at DLC/pct/PCT.jar)

docs/Spark Evaluation Guide.docx

@@ -1,6 +1,27 @@
 # Changelog
 
-## OpenEdge 11.7.4+ and 12.0
+## OpenEdge 11.7.5 and 12.1
+
+### v5.0.0
+
+- Removes all local overrides of the OpenEdge.* classes which are now provided in the minimum OE versions required: 11.7.5 and 12.1.
+
+
+## OpenEdge 11.7.4 and 12.0
+
+### v4.6.2
+
+- Minor fixes, primarily updates to ensure full compatibility with OpenEdge 12.1.
+
+### v4.6.1
+
+- Documentation updates, clarifying minimal version of OpenEdge.
+- Minor bugfixes, cleanup as needed.
+
+### v4.6.0
+
+- Bugfix release focused on enhancements for diagnostic tooling and reporting capabilities.
+- Further support for OpenEdge 12.0 and forthcoming 12.1 release.
 
 ### v4.5.1
 
@@ -26,6 +47,8 @@
 - Make necessary adjustments to patterns since the switch to the DataObjectHandler class as of v4.3.0.
 - Framework now officially requires OpenEdge 11.7.4 due to features inherent in that service pack.
 
+## OpenEdge 11.7.3
+
 ### v4.3.0
 
 - Adapted the DOHEventsHandler class to access service metadata as stored in the CatalogManager.

docs/Spark Quick-Start Guide.docx

@@ -30,6 +30,7 @@
         <mkdir dir="${pas.path}/conf/spark"/>
         <copy file="${deploy}/Realm/SparkRealm.cp" toDir="${pas.path}/common/lib"/>
         <copy file="${deploy}/Realm/SparkRealm.json" toDir="${pas.path}/conf/spark"/>
+    	<copy file="${deploy}/Realm/ABLDomainRegistry.keystore" toDir="${pas.path}/conf"/>
     </target>
 
     <macrodef name="init_env">

oe117/CHANGELOG.md

@@ -0,0 +1 @@
+spark,spark01

oe117/DynSports/AppServer/Spark.pl

@@ -1,7 +1,7 @@
 {
     "Config": {
         "General": [{
-            "ApiVersion": 4.6,
+            "ApiVersion": 5.0,
             "CatalogService": "Spark.Core.Service.ICatalog",
             "BusinessRoot": "Business",
             "IdProperty": "id",

oe117/DynSports/AppServer/build.xml

@@ -141,8 +141,8 @@
  ## <b:bean id="OEClientPrincipalFilter" ...
  ##
  OEClientPrincipalFilter.enabled=true
- OEClientPrincipalFilter.key=oech1::23222e35397562
- OEClientPrincipalFilter.registryFile=
+ OEClientPrincipalFilter.key=
+ OEClientPrincipalFilter.registryFile=ABLDomainRegistry.keystore
  OEClientPrincipalFilter.domain=spark
  OEClientPrincipalFilter.roles=
  OEClientPrincipalFilter.authz=true
@@ -333,9 +333,9 @@
 
  OERealm.AuthProvider.createCPAuthn=true
  OERealm.AuthProvider.sealClientPrincipal=true
- OERealm.AuthProvider.multiTenant=false
+ OERealm.AuthProvider.multiTenant=true
+ OERealm.AuthProvider.registryFile=ABLDomainRegistry.keystore
  OERealm.AuthProvider.userDomain=spark
- OERealm.AuthProvider.key=oech1::23222e35397562
  OERealm.AuthProvider.expires=0
  OERealm.AuthProvider.authz=true