Skip to content

Commit

Permalink
Merge pull request #23 from progress/develop
Browse files Browse the repository at this point in the history
Forcing the merge as this is blocking an inquiry to examine the latest patterns intended for the OpenEdge 12.2 release.
  • Loading branch information
DustinGrau-PSC authored Dec 4, 2020
2 parents 1b7d7a1 + da272ff commit c6a41c8
Show file tree
Hide file tree
Showing 70 changed files with 11,323 additions and 997 deletions.
14 changes: 8 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,20 @@

The **Progress Spark Toolkit** is a [CCS-compliant](https://github.com/progress/CCS) reference implementation from Progress meant to aid in creating an ABL application which provides RESTful API's for microservices. This repository primarily contains ABL artifacts and was built specifically for the **Progress Application Server for OpenEdge** to provide the back-end (server-side) support for exposing ABL logic via HTTP/HTTP.

**Latest Release:** v5.0.2 (April 2020) for OE 11.7.5+ and OE 12.1+
**Latest Release:** v6.0.0 (December 2020) for OE 11.7.7+ and OE 12.2.3+

## Requirements

Due to the inclusion of the CCS libraries and new Business Logic features within the OpenEdge product, version **11.7.5** or **12.1** is required as a minimum, along with toolkit version **5.0.0** or later being highly recommended. Current builds of the PL files in the following distribution directories are compiled using the following OpenEdge versions for proper compatibility:
Due to the inclusion of the CCS libraries and new Business Logic features within the OpenEdge product, version **11.7.5** or **12.1** is required as a minimum, along with toolkit version **6.0.0** or later being highly recommended. Current builds of the PL files in the following distribution directories are compiled using the following OpenEdge versions for proper compatibility:

* /dist/oe11 - 11.7.5+
* /dist/oe12 - 12.1+
* /dist/oe11 - 11.7.5+, 11.7.7+ preferred
* /dist/oe12 - 12.1+, 12.2.3+ preferred

**Previous Release Requirements:**

OE 11.7.4+ or OE 12.0+ for v4.4.0 through 4.6.x
OE 11.7.5+ or OE 12.1+ for v5.0.x

OE 11.7.4+ or OE 12.0+ for v4.4.0 through 4.6.x

OE 11.7.3+ for v4.3.0 (deprecated, upgrade recommended)

Expand All @@ -36,7 +38,7 @@ As previously mentioned, the Progress Spark Toolkit library is intended for use
5. Copy the .json and .cp files from the `/cfg/` folder to a new `CATALINA_BASE/conf/spark/` directory.
6. If intending to utilize OERealm security, copy the `/cfg/Realm/SparkRealm.json` file to `CATALINA_BASE/conf/spark/` and `/cfg/Realm/SparkRealm.cp` to `CATALINA_BASE/common/lib/`.

**CCS Note:** As of release **4.6.0** the inclusion of the CCS source code and Ccs.pl has been discontinued and all related source is removed from this repository. As of **OpenEdge 11.7.4 / 12.0** all CCS class interfaces are already included within the product and are utilized to build the Spark.pl library. Therefore, it is no longer necessary to include this PL file within your PROPATH or included as part of your code promotion processes.
**CCS Note:** As of release **4.6.0** the inclusion of the CCS source code and Ccs.pl has been discontinued and all related source is removed from this repository. As of **OpenEdge 11.7.5 / 12.1** all CCS class interfaces are already included within the product and are utilized to build the Spark.pl library. Therefore, it is no longer necessary to include this PL file within your PROPATH or included as part of your code promotion processes.


## Contributions / Changes
Expand Down
1 change: 1 addition & 0 deletions cfg/Realm/ABLDomainRegistry.csv
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
spark,spark01
Binary file removed cfg/Realm/SparkRealm.cp
Binary file not shown.
2 changes: 1 addition & 1 deletion cfg/Realm/SparkRealm.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"debug": false,
"domain": "OESPA",
"password": "oech1::23227b35391760323c3f",
"password": "odeb0::h89wUJTwvKly2BsqXZeX3hAM8LHnMLypry7LZsxwFKWCQ76JPqKXj0idvZZrLM2S",
"role": "SPAClient"
}
Binary file removed cfg/SparkReset.cp
Binary file not shown.
2 changes: 1 addition & 1 deletion cfg/catalog.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"Config": {
"General": [{
"ApiVersion": 5.0,
"ApiVersion": 6.0,
"CatalogService": "Spark.Core.Service.ICatalog",
"BusinessRoot": "Business",
"IdProperty": "id",
Expand Down
7 changes: 0 additions & 7 deletions cfg/schema.json

This file was deleted.

3 changes: 0 additions & 3 deletions cfg/startup.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,6 @@
}, {
"Manager": "Spark.Core.Manager.ICatalogManager",
"Implementation": "Spark.Core.Manager.CatalogManager"
}, {
"Manager": "Spark.Core.Manager.IConnectionManager",
"Implementation": "Spark.Core.Manager.ConnectionManager"
}, {
"Manager": "Spark.Core.Manager.ITranslationManager",
"Implementation": "Spark.Core.Manager.TranslationManager"
Expand Down
Binary file modified dist/oe11/Diagnostic.pl
Binary file not shown.
Binary file modified dist/oe11/Spark.pl
Binary file not shown.
Binary file modified dist/oe12/Diagnostic.pl
Binary file not shown.
Binary file modified dist/oe12/Spark.pl
Binary file not shown.
Loading

0 comments on commit c6a41c8

Please sign in to comment.