Skip to content

Commit

Permalink
Es alignment for 4.x (#1742)
Browse files Browse the repository at this point in the history 
* Test docs for ES alignment

* Move entity management logic from QS to core lib (#1735)

* Move enitiy management logic from QS to core lib

* Update tests to not rely on list order for comparison

* Save the entity on disk

* Add triggers for entity model TDE generation (#1734)

* Support for ES models in content creation (#1738)

* Support for content creation with ES models

* Fixing variable assignment and indentation

* Incorporate referenced entity model definitions in same definitions (#1739)

* Add triggers for entity model TDE generation

* Combine referenced entities into a single entity model

* Es alignment - Fix failing tests (#1747)

* Add triggers for entity model TDE generation

* Combine referenced entities into a single entity model

* Add triggers folder to upgrade test example

* Adjust TDEs to be more forgiving

* Retain namespaces when creating search options

* Clean up entity models after loading them

* Create 'LoadUserArtifactsCommand' for loading entities, mappings (#1755)

* Prevent mappings files being loaded to the hub modules db

* Create a separate command for loading user artifacts

* Create corresponding gradle command for loading user artifacts

* Run 'LoadUserArtifactsCommand' after 'LoadUserModulesCommand' is run

* Modify existing tests/ add new tests

* fixing #1736 (#1737)

* Updating test for DHFPROD-1581 (#1740)

* Fix for DHFPROD-590 and DHFPROD-1698 (#1741)

* Populating 'errors' and 'hasErrors' object (Fix for DHFPROD-1698)

* Place bug icon on the correct line (DHFPROD-1698)

* Setting content db to final db (#1744)

* Setting content db to final db

* Test to verify if content db is set to final db

*  Revert Spring boot version upgrade for QS (#1748)

* Revert "Upgrade Spring boot ver for QS (#1698)"

This reverts commit c2b1323

* Update authenticated.ts

* Update authenticated.ts

* 2019 copyright update (#1752)

* Updating gradle-dhs.properties to run DHF core tests in DHS (#1753)

* E2e/qs misc test (#1756)

* add po for invalid title alert

* add po for duplicate flowname alert

* add test for invalid char on entity title

* add test for duplicate flow names

* Move entity management logic from QS to core lib (#1735)

* Move enitiy management logic from QS to core lib

* Update tests to not rely on list order for comparison

* Save the entity on disk

* Create 'LoadUserArtifactsCommand' for loading entities, mappings (#1755)

* Prevent mappings files being loaded to the hub modules db

* Create a separate command for loading user artifacts

* Create corresponding gradle command for loading user artifacts

* Run 'LoadUserArtifactsCommand' after 'LoadUserModulesCommand' is run

* Modify existing tests/ add new tests
  • Loading branch information
@aebadirad
aebadirad authored Jan 18, 2019
1 parent 55ed415 commit ace5aad
Show file tree
Hide file tree
Showing 85 changed files with 3,252 additions and 394 deletions.
1 change: 1 addition & 0 deletions examples/online-store/entity-config/databases/final-database.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"path-namespace":[{"prefix":"es", "namespace-uri":"http://marklogic.com/entity-services"}], "range-element-index":[{"collation":"http://marklogic.com/collation/codepoint", "invalid-values":"reject", "localname":"sku", "namespace-uri":null, "range-value-positions":false, "scalar-type":"string"}]}
1 change: 1 addition & 0 deletions examples/online-store/entity-config/databases/staging-database.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"path-namespace":[{"prefix":"es", "namespace-uri":"http://marklogic.com/entity-services"}], "range-element-index":[{"collation":"http://marklogic.com/collation/codepoint", "invalid-values":"reject", "localname":"sku", "namespace-uri":null, "range-value-positions":false, "scalar-type":"string"}]}
57 changes: 57 additions & 0 deletions examples/online-store/entity-config/final-entity-options.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
<?xml version="1.0" encoding="UTF-8"?>
<search:options xmlns:search="http://marklogic.com/appservices/search">
<search:constraint name="Collection">
<search:collection/>
</search:constraint>
<search:constraint name="entity-type">
<search:value>
<search:element ns="http://marklogic.com/entity-services" name="title"/>
</search:value>
</search:constraint>
<search:constraint name="id">
<search:value>
<search:element ns="" name="id"/>
</search:value>
</search:constraint>
<!--The name of this constraint is a duplicate in the generated XML. It is within a comment so that the XML may be valid, but you may need to edit for your use case.
<search:constraint name="id" xmlns:search="http://marklogic.com/appservices/search">
<search:range type="xs:string" facet="true" collation="http://marklogic.com/collation/codepoint">
<search:path-index xmlns:es="http://marklogic.com/entity-services">//es:instance/Order/id</search:path-index>
</search:range>
</search:constraint>
-->
<!--The name of this constraint is a duplicate in the generated XML. It is within a comment so that the XML may be valid, but you may need to edit for your use case.
<search:constraint name="id" xmlns:search="http://marklogic.com/appservices/search">
<search:range type="xs:string" facet="true" collation="http://marklogic.com/collation/codepoint">
<search:element ns="" name="id" xmlns:es="http://marklogic.com/entity-services"/>
</search:range>
</search:constraint>
-->
<search:tuples name="Order">
<search:range type="xs:string" facet="true" collation="http://marklogic.com/collation/codepoint">
<search:path-index>//*:instance/Order/id</search:path-index>
</search:range>
<search:range type="xs:string" facet="true" collation="http://marklogic.com/collation/codepoint">
<search:element ns="" name="id"/>
</search:range>
</search:tuples>
<!--Uncomment to return no results for a blank search, rather than the default of all results
<search:term xmlns:search="http://marklogic.com/appservices/search">
<search:empty apply="no-results"/>
</search:term>
-->
<search:values name="uris">
<search:uri/>
</search:values>
<!--Change to 'filtered' to exclude false-positives in certain searches-->
<search:search-option>unfiltered</search:search-option>
<!--Modify document extraction to change results returned-->
<search:extract-document-data selected="include">
<search:extract-path>//*:instance/(Product|Order)</search:extract-path>
</search:extract-document-data>
<!--Change or remove this additional-query to broaden search beyond entity instance documents-->
<!--To return facets, change this option to 'true' and edit constraints-->
<search:return-facets>true</search:return-facets>
<!--To return snippets, comment out or remove this option-->
<search:transform-results apply="empty-snippet"/>
</search:options>
57 changes: 57 additions & 0 deletions examples/online-store/entity-config/staging-entity-options.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
<?xml version="1.0" encoding="UTF-8"?>
<search:options xmlns:search="http://marklogic.com/appservices/search">
<search:constraint name="Collection">
<search:collection/>
</search:constraint>
<search:constraint name="entity-type">
<search:value>
<search:element ns="http://marklogic.com/entity-services" name="title"/>
</search:value>
</search:constraint>
<search:constraint name="id">
<search:value>
<search:element ns="" name="id"/>
</search:value>
</search:constraint>
<!--The name of this constraint is a duplicate in the generated XML. It is within a comment so that the XML may be valid, but you may need to edit for your use case.
<search:constraint name="id" xmlns:search="http://marklogic.com/appservices/search">
<search:range type="xs:string" facet="true" collation="http://marklogic.com/collation/codepoint">
<search:path-index xmlns:es="http://marklogic.com/entity-services">//es:instance/Order/id</search:path-index>
</search:range>
</search:constraint>
-->
<!--The name of this constraint is a duplicate in the generated XML. It is within a comment so that the XML may be valid, but you may need to edit for your use case.
<search:constraint name="id" xmlns:search="http://marklogic.com/appservices/search">
<search:range type="xs:string" facet="true" collation="http://marklogic.com/collation/codepoint">
<search:element ns="" name="id" xmlns:es="http://marklogic.com/entity-services"/>
</search:range>
</search:constraint>
-->
<search:tuples name="Order">
<search:range type="xs:string" facet="true" collation="http://marklogic.com/collation/codepoint">
<search:path-index>//*:instance/Order/id</search:path-index>
</search:range>
<search:range type="xs:string" facet="true" collation="http://marklogic.com/collation/codepoint">
<search:element ns="" name="id"/>
</search:range>
</search:tuples>
<!--Uncomment to return no results for a blank search, rather than the default of all results
<search:term xmlns:search="http://marklogic.com/appservices/search">
<search:empty apply="no-results"/>
</search:term>
-->
<search:values name="uris">
<search:uri/>
</search:values>
<!--Change to 'filtered' to exclude false-positives in certain searches-->
<search:search-option>unfiltered</search:search-option>
<!--Modify document extraction to change results returned-->
<search:extract-document-data selected="include">
<search:extract-path>//*:instance/(Product|Order)</search:extract-path>
</search:extract-document-data>
<!--Change or remove this additional-query to broaden search beyond entity instance documents-->
<!--To return facets, change this option to 'true' and edit constraints-->
<search:return-facets>true</search:return-facets>
<!--To return snippets, comment out or remove this option-->
<search:transform-results apply="empty-snippet"/>
</search:options>
Binary file added examples/online-store/gradle/wrapper/gradle-wrapper.jar
View file
Binary file not shown.
172 changes: 172 additions & 0 deletions examples/online-store/gradlew
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,172 @@
#!/usr/bin/env sh

##############################################################################
##
## Gradle start up script for UN*X
##
##############################################################################

# Attempt to set APP_HOME
# Resolve links: $0 may be a link
PRG="$0"
# Need this for relative symlinks.
while [ -h "$PRG" ] ; do
ls=`ls -ld "$PRG"`
link=`expr "$ls" : '.*-> \(.*\)$'`
if expr "$link" : '/.*' > /dev/null; then
PRG="$link"
else
PRG=`dirname "$PRG"`"/$link"
fi
done
SAVED="`pwd`"
cd "`dirname \"$PRG\"`/" >/dev/null
APP_HOME="`pwd -P`"
cd "$SAVED" >/dev/null

APP_NAME="Gradle"
APP_BASE_NAME=`basename "$0"`

# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS=""

# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD="maximum"

warn ( ) {
echo "$*"
}

die ( ) {
echo
echo "$*"
echo
exit 1
}

# OS specific support (must be 'true' or 'false').
cygwin=false
msys=false
darwin=false
nonstop=false
case "`uname`" in
CYGWIN* )
cygwin=true
;;
Darwin* )
darwin=true
;;
MINGW* )
msys=true
;;
NONSTOP* )
nonstop=true
;;
esac

CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar

# Determine the Java command to use to start the JVM.
if [ -n "$JAVA_HOME" ] ; then
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
# IBM's JDK on AIX uses strange locations for the executables
JAVACMD="$JAVA_HOME/jre/sh/java"
else
JAVACMD="$JAVA_HOME/bin/java"
fi
if [ ! -x "$JAVACMD" ] ; then
die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
Please set the JAVA_HOME variable in your environment to match the
location of your Java installation."
fi
else
JAVACMD="java"
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
Please set the JAVA_HOME variable in your environment to match the
location of your Java installation."
fi

# Increase the maximum file descriptors if we can.
if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
MAX_FD_LIMIT=`ulimit -H -n`
if [ $? -eq 0 ] ; then
if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
MAX_FD="$MAX_FD_LIMIT"
fi
ulimit -n $MAX_FD
if [ $? -ne 0 ] ; then
warn "Could not set maximum file descriptor limit: $MAX_FD"
fi
else
warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
fi
fi

# For Darwin, add options to specify how the application appears in the dock
if $darwin; then
GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
fi

# For Cygwin, switch paths to Windows format before running java
if $cygwin ; then
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
JAVACMD=`cygpath --unix "$JAVACMD"`

# We build the pattern for arguments to be converted via cygpath
ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
SEP=""
for dir in $ROOTDIRSRAW ; do
ROOTDIRS="$ROOTDIRS$SEP$dir"
SEP="|"
done
OURCYGPATTERN="(^($ROOTDIRS))"
# Add a user-defined pattern to the cygpath arguments
if [ "$GRADLE_CYGPATTERN" != "" ] ; then
OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
fi
# Now convert the arguments - kludge to limit ourselves to /bin/sh
i=0
for arg in "$@" ; do
CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option

if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition
eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
else
eval `echo args$i`="\"$arg\""
fi
i=$((i+1))
done
case $i in
(0) set -- ;;
(1) set -- "$args0" ;;
(2) set -- "$args0" "$args1" ;;
(3) set -- "$args0" "$args1" "$args2" ;;
(4) set -- "$args0" "$args1" "$args2" "$args3" ;;
(5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
(6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
(7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
(8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
(9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
esac
fi

# Escape application args
save ( ) {
for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
echo " "
}
APP_ARGS=$(save "$@")

# Collect all arguments for the java command, following the shell quoting and substitution rules
eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"

# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
cd "$(dirname "$0")"
fi

exec "$JAVACMD" "$@"
84 changes: 84 additions & 0 deletions examples/online-store/gradlew.bat
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,84 @@
@if "%DEBUG%" == "" @echo off
@rem ##########################################################################
@rem
@rem Gradle startup script for Windows
@rem
@rem ##########################################################################

@rem Set local scope for the variables with windows NT shell
if "%OS%"=="Windows_NT" setlocal

set DIRNAME=%~dp0
if "%DIRNAME%" == "" set DIRNAME=.
set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME%

@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
set DEFAULT_JVM_OPTS=

@rem Find java.exe
if defined JAVA_HOME goto findJavaFromJavaHome

set JAVA_EXE=java.exe
%JAVA_EXE% -version >NUL 2>&1
if "%ERRORLEVEL%" == "0" goto init

echo.
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
echo.
echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation.

goto fail

:findJavaFromJavaHome
set JAVA_HOME=%JAVA_HOME:"=%
set JAVA_EXE=%JAVA_HOME%/bin/java.exe

if exist "%JAVA_EXE%" goto init

echo.
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
echo.
echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation.

goto fail

:init
@rem Get command-line arguments, handling Windows variants

if not "%OS%" == "Windows_NT" goto win9xME_args

:win9xME_args
@rem Slurp the command line arguments.
set CMD_LINE_ARGS=
set _SKIP=2

:win9xME_args_slurp
if "x%~1" == "x" goto execute

set CMD_LINE_ARGS=%*

:execute
@rem Setup the command line

set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar

@rem Execute Gradle
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%

:end
@rem End local scope for the variables with windows NT shell
if "%ERRORLEVEL%"=="0" goto mainEnd

:fail
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
rem the _cmd.exe /c_ return code!
if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
exit /b 1

:mainEnd
if "%OS%"=="Windows_NT" endlocal

:omega
8 changes: 8 additions & 0 deletions examples/online-store/plugins/entities/Product/harmonize/123/123.properties
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
#
#Thu Jan 03 14:14:30 MST 2019
collectorModule=collector.xqy
dataFormat=xml
codeFormat=xqy
mainCodeFormat=xqy
mainModule=main.xqy
collectorCodeFormat=xqy
Loading

0 comments on commit ace5aad

Please sign in to comment.