Skip to content

Commit c47f692

Browse files
committed
fix error preventing users from being created; add windows-friendly bootstrap and teardown scripts
1 parent 143aa34 commit c47f692

File tree

3 files changed

+14
-1
lines changed

3 files changed

+14
-1
lines changed
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
#!/bin/bash
2+
3+
DEFAULT_M2=$USERPROFILE/.m2/repository
4+
M2_REPO=${1:-$DEFAULT_M2}
5+
6+
java -cp "target/test-classes;target/classes;$M2_REPO/org/apache/httpcomponents/httpclient/4.1.1/httpclient-4.1.1.jar;$M2_REPO/org/apache/httpcomponents/httpcore/4.1/httpcore-4.1.jar;$M2_REPO/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar;$M2_REPO/org/slf4j/slf4j-api/1.7.4/slf4j-api-1.7.4.jar" com.marklogic.client.test.util.TestServerBootstrapper

src/test/resources/bootstrap.xqy

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -756,7 +756,7 @@ declare function bootstrap:post(
756756
if (exists($user-id)) then ()
757757
else if ($user eq "valid")
758758
then bootstrap:security-config('sec:create-user("valid", "valid unprivileged user", "x", (), (), (), ())')
759-
else bootstrap:security-config('sec:create-user($user, $user||" user", "x", ($user), (), (), () )'),
759+
else bootstrap:security-config('sec:create-user("'||$user||'", "'||$user||' user", "x", ("'||$user||'"), (), (), () )'),
760760

761761
let $dbid := xdmp:database("java-unittest")
762762
return (
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
#!/bin/bash
2+
3+
DEFAULT_M2=$USERPROFILE/.m2/repository
4+
M2_REPO=${1:-$DEFAULT_M2}
5+
6+
java -cp "target/test-classes;target/classes;$M2_REPO/org/apache/httpcomponents/httpclient/4.1.1/httpclient-4.1.1.jar;$M2_REPO/org/apache/httpcomponents/httpcore/4.1/httpcore-4.1.jar;$M2_REPO/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar;$M2_REPO/org/slf4j/slf4j-api/1.7.4/slf4j-api-1.7.4.jar" com.marklogic.client.test.util.TestServerBootstrapper teardown
7+

0 commit comments

Comments
 (0)