Skip to content

[7.x.x] Support for executing XQuery from XML Calabash 3 #199

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
adamretter merged 18 commits into from
Apr 28, 2026
Merged

[7.x.x] Support for executing XQuery from XML Calabash 3 #199

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
f8f032c
[ignore] Code cleanup
adamretter Apr 28, 2026
7115082
[bugfix] Correct the wrapping in the Serializer so that it outputs th…
adamretter Apr 28, 2026
bf5a8e3
[bugfix] Do not modify namespaces when processing an HTTP POST of an …
adamretter Apr 28, 2026
b9d550f
[refactor] fn:collection can only accept a single URI
adamretter Apr 28, 2026
98c9e56
[optimize] Optimise the use of fn:collection and xmldb:xcollection
adamretter Apr 28, 2026
eaaaf0b
[optimize] Only an intention lock is needed at this point
adamretter Apr 28, 2026
14a5010
[bugfix] When serializing typed results from the REST API ensure that…
adamretter Apr 28, 2026
cb082ae
[optimize] Optimize marshalling/demarshalling of typed REST API XML
adamretter Apr 28, 2026
e1af401
[refactor] Make fn:analyze-string compatible with Saxon versions 9 th…
adamretter Apr 28, 2026
3d12dda
[feature] When looking for conf.xml on the Classpath, also check the …
adamretter Apr 28, 2026
5cb1d7b
[feature] Add additional constructors and converted methods for sever…
adamretter Apr 28, 2026
9d62091
[feature] Allow tests to configure use of temporary storage via the p…
adamretter Apr 28, 2026
bf98b21
[bugfix] Make deserialization of typed values to the REST API more fo…
adamretter Apr 28, 2026
06bfdc9
[feature] Allow the Context Item for query execution to be set via th…
adamretter Apr 28, 2026
d3fd64f
[feature] Allow the Default Collection of the Dynamic Context for que…
adamretter Apr 28, 2026
03f5830
[refactor] Switch to the Evolved Binary port of the buildversion Mave…
adamretter Apr 28, 2026
fc6c968
[bugfix] Fix race condition when sorting values
adamretter Apr 28, 2026
a1b6475
[feature] Add a '-a' and '--no-auto-deploy' argument to the Java Admi…
adamretter Apr 28, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 5 additions & 20 deletions elemental-parent/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -382,9 +382,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>
Expand Down Expand Up @@ -640,8 +640,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>
Expand Down Expand Up @@ -807,19 +807,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>
2 changes: 2 additions & 0 deletions exist-core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1415,6 +1415,7 @@
<include>src/test/java/org/exist/xquery/functions/validate/JingXsdTest.java</include>
<include>src/main/java/org/exist/xquery/functions/validation/Jaxp.java</include>
<include>src/test/java/org/exist/xquery/functions/xmldb/DbStore2Test.java</include>
<include>src/main/java/org/exist/xquery/functions/xmldb/FunXCollection.java</include>
<include>src/main/java/org/exist/xquery/functions/xmldb/XMLDBGetMimeType.java</include>
<include>src/main/java/org/exist/xquery/functions/xmldb/XMLDBLoadFromPattern.java</include>
<include>src/main/java/org/exist/xquery/functions/xmldb/XMLDBModule.java</include>
Expand Down Expand Up @@ -2249,6 +2250,7 @@
<exclude>src/main/java/org/exist/xquery/functions/validation/Jaxp.java</exclude>
<exclude>src/test/java/org/exist/xquery/functions/xmldb/AbstractXMLDBTest.java</exclude>
<exclude>src/test/java/org/exist/xquery/functions/xmldb/DbStore2Test.java</exclude>
<exclude>src/main/java/org/exist/xquery/functions/xmldb/FunXCollection.java</exclude>
<exclude>src/test/java/org/exist/xquery/functions/xmldb/XMLDBAuthenticateTest.java</exclude>
<exclude>src/main/java/org/exist/xquery/functions/xmldb/XMLDBGetMimeType.java</exclude>
<exclude>src/main/java/org/exist/xquery/functions/xmldb/XMLDBLoadFromPattern.java</exclude>
Expand Down
1 change: 1 addition & 0 deletions exist-core/src/main/java/org/exist/Namespaces.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,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;

Expand Down
12 changes: 10 additions & 2 deletions exist-core/src/main/java/org/exist/client/CommandlineOptions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,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 */
Expand Down Expand Up @@ -193,7 +197,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)
Expand All @@ -215,6 +219,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);
Expand Down Expand Up @@ -259,6 +264,7 @@ public static CommandlineOptions parse(final String[] args) throws ArgumentExcep
embedded,
embeddedConfig,
noEmbeddedMode,
noAutoDeploy,
startGUI,
openQueryGUI,
mkCol,
Expand All @@ -278,7 +284,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;
Expand All @@ -289,6 +295,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;
Expand Down Expand Up @@ -318,6 +325,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;
Expand Down
7 changes: 7 additions & 0 deletions exist-core/src/main/java/org/exist/client/InteractiveClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,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";
Expand All @@ -169,6 +170,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_IMPL_CLASS = "org.exist.xmldb.DatabaseImpl";

Expand All @@ -188,6 +190,7 @@ public class InteractiveClient {
DEFAULT_PROPERTIES.setProperty(PERMISSIONS, "false");
DEFAULT_PROPERTIES.setProperty(EXPAND_XINCLUDES, "true");
DEFAULT_PROPERTIES.setProperty(SSL_ENABLE, SSL_ENABLE_DEFAULT);
DEFAULT_PROPERTIES.setProperty(NO_AUTO_DEPLOY, NO_AUTO_DEPLOY_DEFAULT);
}
protected static final int[] COL_SIZES = new int[]{10, 10, 10, -1};

Expand Down Expand Up @@ -334,6 +337,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);
Expand Down Expand Up @@ -1882,6 +1886,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");
}
}

/**
Expand Down
2 changes: 1 addition & 1 deletion exist-core/src/main/java/org/exist/collections/MutableCollection.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
Loading
Loading