Merge pull request #200 from evolvedbinary/6.x.x/feature/support-calabash3

[6.x.x] Support for executing XQuery from XML Calabash 3

Author: adamretter

elemental-parent/pom.xml

@@ -374,9 +374,9 @@
                     <version>3.4.0</version>
                 </plugin>
                 <plugin>
-                    <groupId>com.code54.mojo</groupId>
-                    <artifactId>buildversion-plugin</artifactId>
-                    <version>1.0.3</version>
+                    <groupId>com.evolvedbinary.maven.plugins</groupId>
+                    <artifactId>buildversion-maven-plugin</artifactId>
+                    <version>2.0.0</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
@@ -620,8 +620,8 @@
                 </executions>
             </plugin>
             <plugin>
-                <groupId>com.code54.mojo</groupId>
-                <artifactId>buildversion-plugin</artifactId>
+                <groupId>com.evolvedbinary.maven.plugins</groupId>
+                <artifactId>buildversion-maven-plugin</artifactId>
                 <executions>
                     <execution>
                         <phase>validate</phase>
@@ -814,19 +814,4 @@
         </profile>
     </profiles>
 
-    <pluginRepositories>
-        <pluginRepository>
-            <id>clojars.org</id>
-            <url>https://clojars.org/repo</url>
-        </pluginRepository>
-    </pluginRepositories>
-
-    <distributionManagement>
-        <repository>
-            <id>central-ossrh-staging</id>
-            <name>Central Portal - OSSRH Staging API</name>
-            <url>https://ossrh-staging-api.central.sonatype.com/service/local/staging/deploy/maven2/</url>
-        </repository>
-    </distributionManagement>
-
 </project>

exist-core/src/main/java/org/exist/Namespaces.java

@@ -60,6 +60,7 @@ public interface Namespaces {
     String DTD_NS = XMLConstants.XML_DTD_NS_URI;
 
 	String SCHEMA_NS = XMLConstants.W3C_XML_SCHEMA_NS_URI;
+	String SCHEMA_NS_PREFIX = "xs";
     String SCHEMA_DATATYPES_NS = "http://www.w3.org/2001/XMLSchema-datatypes";
 	String SCHEMA_INSTANCE_NS = XMLConstants.W3C_XML_SCHEMA_INSTANCE_NS_URI;
 

exist-core/src/main/java/org/exist/client/CommandlineOptions.java

@@ -83,6 +83,10 @@ public class CommandlineOptions {
             .description("do not make embedded mode available")
             .defaultValue(false)
             .build();
+    private static final Argument<Boolean> noAutoDeployArg = optionArgument("-a", "--no-auto-deploy")
+        .description("Disable auto-deployment of EXPath Packages")
+        .defaultValue(false)
+        .build();
 
 
     /* gui arguments */
@@ -168,7 +172,7 @@ private static Optional<XmldbURI> optUri(final ParsedArguments parsedArguments,
 
     public static CommandlineOptions parse(final String[] args) throws ArgumentException, URISyntaxException {
         final ParsedArguments arguments = CommandLineParser
-                .withArguments(userArg, passwordArg, useSslArg, embeddedArg, embeddedConfigArg, noEmbeddedModeArg)
+                .withArguments(userArg, passwordArg, useSslArg, embeddedArg, embeddedConfigArg, noEmbeddedModeArg, noAutoDeployArg)
                 .andArguments(noGuiArg, guiQueryDialogArg)
                 .andArguments(mkColArg, rmColArg, setColArg)
                 .andArguments(parseDocsArg, getDocArg, rmDocArg)
@@ -189,6 +193,7 @@ public static CommandlineOptions parse(final String[] args) throws ArgumentExcep
         final boolean embedded = getBool(arguments, embeddedArg);
         final Optional<Path> embeddedConfig = getPathOpt(arguments, embeddedConfigArg);
         final boolean noEmbeddedMode = getBool(arguments, noEmbeddedModeArg);
+        final boolean noAutoDeploy = getBool(arguments, noAutoDeployArg);
 
         final boolean startGUI = !getBool(arguments, noGuiArg);
         final boolean openQueryGUI = getBool(arguments, guiQueryDialogArg);
@@ -233,6 +238,7 @@ public static CommandlineOptions parse(final String[] args) throws ArgumentExcep
                 embedded,
                 embeddedConfig,
                 noEmbeddedMode,
+                noAutoDeploy,
                 startGUI,
                 openQueryGUI,
                 mkCol,
@@ -252,7 +258,7 @@ public static CommandlineOptions parse(final String[] args) throws ArgumentExcep
         );
     }
 
-    public CommandlineOptions(boolean quiet, boolean verbose, Optional<Path> outputFile, Map<String, String> options, Optional<String> username, Optional<String> password, boolean useSSL, boolean embedded, Optional<Path> embeddedConfig, boolean noEmbeddedMode, boolean startGUI, boolean openQueryGUI, Optional<XmldbURI> mkCol, Optional<XmldbURI> rmCol, Optional<XmldbURI> setCol, List<Path> parseDocs, Optional<XmldbURI> getDoc, Optional<String> rmDoc, Optional<String> xpath, List<Path> queryFiles, Optional<Integer> howManyResults, Optional<Path> traceQueriesFile, Optional<String> setDoc, Optional<Path> xupdateFile, boolean reindex, boolean reindexRecurse) {
+    public CommandlineOptions(boolean quiet, boolean verbose, Optional<Path> outputFile, Map<String, String> options, Optional<String> username, Optional<String> password, boolean useSSL, boolean embedded, Optional<Path> embeddedConfig, boolean noEmbeddedMode, boolean noAutoDeploy, boolean startGUI, boolean openQueryGUI, Optional<XmldbURI> mkCol, Optional<XmldbURI> rmCol, Optional<XmldbURI> setCol, List<Path> parseDocs, Optional<XmldbURI> getDoc, Optional<String> rmDoc, Optional<String> xpath, List<Path> queryFiles, Optional<Integer> howManyResults, Optional<Path> traceQueriesFile, Optional<String> setDoc, Optional<Path> xupdateFile, boolean reindex, boolean reindexRecurse) {
         this.quiet = quiet;
         this.verbose = verbose;
         this.outputFile = outputFile;
@@ -263,6 +269,7 @@ public CommandlineOptions(boolean quiet, boolean verbose, Optional<Path> outputF
         this.embedded = embedded;
         this.embeddedConfig = embeddedConfig;
         this.noEmbeddedMode = noEmbeddedMode;
+        this.noAutoDeploy = noAutoDeploy;
         this.startGUI = startGUI;
         this.openQueryGUI = openQueryGUI;
         this.mkCol = mkCol;
@@ -292,6 +299,7 @@ public CommandlineOptions(boolean quiet, boolean verbose, Optional<Path> outputF
     final boolean embedded;
     final Optional<Path> embeddedConfig;
     final boolean noEmbeddedMode;
+    final boolean noAutoDeploy;
 
     final boolean startGUI;
     final boolean openQueryGUI;

exist-core/src/main/java/org/exist/client/InteractiveClient.java

@@ -147,6 +147,7 @@ public class InteractiveClient {
     public static final String CREATE_DATABASE = "create-database";
     public static final String LOCAL_MODE = "local-mode-opt";
     public static final String NO_EMBED_MODE = "NO_EMBED_MODE";
+    public static final String NO_AUTO_DEPLOY = "no-autodeploy";
 
     // values
     protected static final String EDIT_CMD = "emacsclient -t $file";
@@ -155,6 +156,7 @@ public class InteractiveClient {
     protected static final String SSL_ENABLE_DEFAULT = "FALSE";
     protected static final String LOCAL_MODE_DEFAULT = "FALSE";
     protected static final String NO_EMBED_MODE_DEFAULT = "FALSE";
+    protected static final String NO_AUTO_DEPLOY_DEFAULT = "FALSE";
     protected static final String USER_DEFAULT = SecurityManager.DBA_USER;
 
     protected static final String driver = "org.exist.xmldb.DatabaseImpl";
@@ -173,6 +175,7 @@ public class InteractiveClient {
         defaultProps.setProperty(PERMISSIONS, "false");
         defaultProps.setProperty(EXPAND_XINCLUDES, "true");
         defaultProps.setProperty(SSL_ENABLE, SSL_ENABLE_DEFAULT);
+        defaultProps.setProperty(NO_AUTO_DEPLOY, NO_AUTO_DEPLOY_DEFAULT);
     }
 
     protected static final int colSizes[] = new int[]{10, 10, 10, -1};
@@ -333,6 +336,7 @@ protected void connect() throws Exception {
         // Configure database
         database.setProperty(CREATE_DATABASE, "true");
         database.setProperty(SSL_ENABLE, properties.getProperty(SSL_ENABLE));
+        database.setProperty(NO_AUTO_DEPLOY, properties.getProperty(NO_AUTO_DEPLOY));
 
         // secure empty configuration
         final String configProp = properties.getProperty(InteractiveClient.CONFIGURATION);
@@ -1971,6 +1975,9 @@ protected void setPropertiesFromCommandLine(final CommandlineOptions options, fi
         if(options.noEmbeddedMode) {
             props.setProperty(NO_EMBED_MODE, "TRUE");
         }
+        if (options.noAutoDeploy) {
+            props.setProperty(NO_AUTO_DEPLOY, "TRUE");
+        }
     }
 
     /**

exist-core/src/main/java/org/exist/collections/MutableCollection.java

@@ -481,7 +481,7 @@ public MutableDocumentSet allDocs(final DBBroker broker, final MutableDocumentSe
         if(recursive && subColls != null) {
             // process the child collections
             for(final XmldbURI subCol : subColls) {
-                try(final Collection child = broker.openCollection(subCol, NO_LOCK)) {      // NOTE: the recursive call below to child.addDocs will take a lock
+                try(final Collection child = broker.openCollection(subCol, INTENTION_READ)) {      // NOTE: the recursive call below to child.addDocs will take a lock
                     //A collection may have been removed in the meantime, so check first
                     if(child != null) {
                         child.allDocs(broker, docs, recursive, lockMap);