Merge pull request #143 from aclavio/develop

Release 1.0.0

.gitignore

@@ -6,4 +6,6 @@ build
 gradle-local.properties
 *.settings*
 *.classpath
-state-conductor-example/bin/
+state-conductor-example/bin/
+.DS_Store
+*.jar

CONTRIBUTING.md

@@ -13,7 +13,7 @@ There are two sub-projects.
 
 State-conductor-modules which contains the core library that gets built into the mlBundle redistributable.
 
-State-conductor-example which has unit tests, as well as example flows and actions.
+State-conductor-example which has unit tests, as well as example state machines and actions.
 
 ## Found an Issue?
 If you find a bug in the source code or a mistake in the documentation, you can help us by submitting an issue to our [GitHub Issue Tracker][issue tracker]. Even better, you can submit a Pull Request with a fix for the issue you filed.
@@ -254,10 +254,10 @@ Use `git rebase` (not `git merge`) to sync your work from time to time.
   $ ./gradlew -Dtest.single=TestName test
   ```
 
-- For best results, do not include the final word test. For example, suppose you want to run FlowRunnerTest:
+- For best results, do not include the final word test. For example, suppose you want to run StateMachineRunnerTest:
 
   ```sh
-  $ ./gradlew -Dtest.single=FlowRunner test
+  $ ./gradlew -Dtest.single=StateMachineRunner test
   ```
 
 You can run the e2e tests from Visual Studio Code or another IDE to perform fullstack debugging. To do so, add a run/debug

build.gradle

@@ -1,6 +1,7 @@
 allprojects {
   project.ext {
     mlgradleVersion = "3.17.0"
+    springVersion = "2.3.3.RELEASE"
   }
 
   repositories {
@@ -10,5 +11,5 @@ allprojects {
   }
 
   group = "com.marklogic"
-  version = "0.8.0"
+  version = "1.0.0"
 }

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

settings.gradle

@@ -1 +1 @@
-include "state-conductor-modules", "state-conductor-cpf", "state-conductor-dataservices", "state-conductor-example", "state-conductor-dhf5-example"
+include "state-conductor-modules", "state-conductor-dataservices", "state-conductor-example", "state-conductor-dhf5-example"

state-conductor-corb-example/bin/runCorbDriver.sh

@@ -1,15 +1,15 @@
 #!/bin/bash
 for (( ; ; ))
 do
-  echo "processing jobs [ hit CTRL+C to stop]"
+  echo "processing executions [ hit CTRL+C to stop]"
   java -server -cp .:./libs/marklogic-xcc-10.0.3.jar:./libs/marklogic-corb-2.4.6.jar -DOPTIONS-FILE=corbDriver.properties com.marklogic.developer.corb.Manager "$@"
   code=$?
   if [ $code -eq 0 ]
   then
     continue
   elif [ $code -eq 3 ]
   then
-    echo "no jobs to process, sleeping 15 seconds..."
+    echo "no executions to process, sleeping 15 seconds..."
     sleep 15s
     continue
   else

state-conductor-corb-example/gradle.properties

@@ -7,5 +7,3 @@ mlTestRestPort=8011
 xdbcCorbPort=9006
 
 xccConnectionUri=
-
-installCpf=true