Merge branch 'moqui:master' into master

.gitignore

@@ -12,6 +12,8 @@ build
 /execwartmp
 /docker/runtime
 /docker/db
+/docker/elasticsearch/data/nodes
+/docker/opensearch/data/nodes
 
 # IntelliJ IDEA files
 .idea

ReleaseNotes.md

@@ -1,6 +1,22 @@
 
+
 # Moqui Framework Release Notes
 
+## Release 3.1.0 - Not Yet Released
+
+Moqui Framework 3.1.0 is a minor new feature and bug fix release with no changes that are not backward compatible.
+
+### New Features
+
+- Updated Docker Compose files to use more recent recommended configurations, and scripts to use 'docker compose' for
+  the Docker Compose Plugin instead of 'docker-compose' for the old separate package
+- Entity Datasource implementation for Elastic/OpenSearch using the ElasticFacade
+  - supports CrUD operations, filtered finds, and large find result handling with a paginating EntityListIterator
+  - does not currently support view entities as Elastic/OpenSearch do not support any sort of joins; some view entity
+    support may be added for single-member view entities, or perhaps multi-member with nested documents in some way
+  - intended primarily for logging type data with the ArtifactHit as the main test case, which can now be put in the 
+    new `logging` entity group to put ArtifactHit data in Elastic/OpenSearch instead of the transactional database
+
 ## Release 3.0.0 - 31 May 2022
 
 Moqui Framework 3.0.0 is a major new feature and bug fix release with some changes that are not backward compatible.

build.gradle

@@ -28,7 +28,7 @@ import org.ajoberstar.grgit.*
 
 defaultTasks 'build'
 
-def openSearchVersion = '2.2.0'
+def openSearchVersion = '2.4.0'
 def elasticSearchVersion = '7.10.2'
 
 def tomcatHome = '../apache-tomcat'

docker/build-compose-up.sh

@@ -0,0 +1,22 @@
+#! /bin/bash
+
+if [[ ! $1 ]]; then
+  echo "Usage: ./build-compose-up.sh <docker compose file> [<moqui directory like ..>] [<runtime image like eclipse-temurin:11-jdk>]"
+  exit 1
+fi
+
+COMP_FILE="${1}"
+MOQUI_HOME="${2:-..}"
+NAME_TAG=moqui
+RUNTIME_IMAGE="${3:-eclipse-temurin:11-jdk}"
+
+if [ -f simple/docker-build.sh ]; then
+  cd simple
+  ./docker-build.sh ../.. $NAME_TAG $RUNTIME_IMAGE
+  # shellcheck disable=SC2103
+  cd ..
+fi
+
+if [ -f compose-up.sh ]; then
+  ./compose-up.sh $COMP_FILE $MOQUI_HOME $RUNTIME_IMAGE
+fi

docker/clean.sh

@@ -1,11 +1,16 @@
 #! /bin/bash
 
+search_name=opensearch
+if [ -d runtime/opensearch/bin ]; then search_name=opensearch;
+elif [ -d runtime/elasticsearch/bin ]; then search_name=elasticsearch;
+fi
+
 rm -Rf runtime/
 rm -Rf runtime1/
 rm -Rf runtime2/
 rm -Rf db/
-rm -Rf elasticsearch/data/nodes
-rm elasticsearch/logs/*.log
+rm -Rf $search_name/data/nodes
+rm $search_name/logs/*.log
 
 docker rm moqui-server
 docker rm moqui-database

docker/compose-down.sh

@@ -8,4 +8,4 @@ fi
 COMP_FILE="${1}"
 
 # set the project name to 'moqui', network will be called 'moqui_default'
-docker-compose -f $COMP_FILE -p moqui down
+docker compose -f $COMP_FILE -p moqui down

docker/compose-up.sh

@@ -1,21 +1,33 @@
 #! /bin/bash
 
 if [[ ! $1 ]]; then
-  echo "Usage: ./compose-up.sh <docker compose file> [<moqui directory>]"
+  echo "Usage: ./compose-up.sh <docker compose file> [<moqui directory like ..>] [<runtime image like eclipse-temurin:11-jdk>]"
   exit 1
 fi
 
 COMP_FILE="${1}"
 MOQUI_HOME="${2:-..}"
+NAME_TAG=moqui
+RUNTIME_IMAGE="${3:-eclipse-temurin:11-jdk}"
 
+# Note: If you don't have access to your conf directory while running this:
+#   This will make it so that your docker/conf directory no longer has your configuration files in it.
+#      This is because when docker-compose provisions a volume on the host it applies the host's data before the image's data.
+#   - change docker compose's moqui-server conf volume path from ./runtime/conf to conf
+#   - add a top level volumes: tag with conf: below
+#   - remove the next block of if statements from this file and you should be good to go
+search_name=opensearch
+if [ -d runtime/opensearch/bin ]; then search_name=opensearch;
+elif [ -d runtime/elasticsearch/bin ]; then search_name=elasticsearch;
+fi
 if [ ! -e runtime ]; then mkdir runtime; fi
 if [ ! -e runtime/conf ]; then cp -R $MOQUI_HOME/runtime/conf runtime/; fi
 if [ ! -e runtime/lib ]; then cp -R $MOQUI_HOME/runtime/lib runtime/; fi
 if [ ! -e runtime/classes ]; then cp -R $MOQUI_HOME/runtime/classes runtime/; fi
 if [ ! -e runtime/log ]; then cp -R $MOQUI_HOME/runtime/log runtime/; fi
 if [ ! -e runtime/txlog ]; then cp -R $MOQUI_HOME/runtime/txlog runtime/; fi
 if [ ! -e runtime/db ]; then cp -R $MOQUI_HOME/runtime/db runtime/; fi
-if [ ! -e runtime/elasticsearch ]; then cp -R $MOQUI_HOME/runtime/elasticsearch runtime/; fi
+if [ ! -e runtime/$search_name ]; then cp -R $MOQUI_HOME/runtime/$search_name runtime/; fi
 
 # set the project name to 'moqui', network will be called 'moqui_default'
-docker-compose -f $COMP_FILE -p moqui up -d
+docker compose -f $COMP_FILE -p moqui up -d