Skip to content

Commit a241747

Browse files
authored
Merge pull request #304 from marklogic/feature/doc-fixes
Small doc fixes
2 parents a77b029 + 177879a commit a241747

File tree

4 files changed

+23
-9
lines changed

4 files changed

+23
-9
lines changed

docs/export/export-archives.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ You can specify an alternate encoding when exporting archives via the `--encodin
132132
{% tabs log %}
133133
{% tab log Unix %}
134134
```
135-
./bin/flux export-archives \
135+
./bin/flux export-archive-files \
136136
--connection-string "flux-example-user:password@localhost:8004" \
137137
--collections example \
138138
--path destination \
@@ -141,7 +141,7 @@ You can specify an alternate encoding when exporting archives via the `--encodin
141141
{% endtab %}
142142
{% tab log Windows %}
143143
```
144-
bin\flux export-archives ^
144+
bin\flux export-archive-files ^
145145
--connection-string "flux-example-user:password@localhost:8004" ^
146146
--collections example ^
147147
--path destination ^

docs/import/import-files/archives.md

+11
Original file line numberDiff line numberDiff line change
@@ -142,3 +142,14 @@ will result in a URI of `/my%20file.json`. This is due to an
142142
[issue in the MarkLogic REST API endpoint](https://docs.marklogic.com/REST/PUT/v1/documents) that will be resolved in
143143
a future server release.
144144

145+
## Common errors
146+
147+
If you use Flux 1.0.x to import an archive created by Flux 1.1.x or higher, you may receive an error containing the
148+
following message:
149+
150+
```
151+
com.marklogic.spark: Could not find metadata entry for entry
152+
```
153+
154+
To solve this, you should use Flux 1.1.0 or higher to import the archive. Flux 1.1.0 and higher can also import
155+
archives created by Flux 1.0.x.

examples/client-project/build.gradle

+7-4
Original file line numberDiff line numberDiff line change
@@ -32,19 +32,22 @@ dependencies {
3232
}
3333

3434
tasks.register("runApp", JavaExec) {
35-
description = "Verify that the example program can be compiled and run with flux-api as a dependency."
35+
description = "Verify that the example program can be compiled and run with flux-api as a dependency. " +
36+
"Requires using Java 11."
3637
mainClass = "org.example.App"
3738
classpath = sourceSets.main.runtimeClasspath
3839
}
3940

4041
tasks.register("runViaCustomTask") {
41-
description = "Demonstrate how the Flux API can be used via a custom Gradle task."
42+
description = "Demonstrate how the Flux API can be used via a custom Gradle task. " +
43+
"Depends on the example application used in the Getting Started guide. " +
44+
"Requires using Java 11. "
4245
doLast {
4346
Flux.importGenericFiles()
4447
.from("../../flux-cli/src/test/resources/mixed-files")
45-
.connectionString("flux-test-user:password@localhost:8003")
48+
.connectionString("flux-example-user:password@localhost:8004")
4649
.to({
47-
it.permissionsString("flux-test-role,read,flux-test-role,update")
50+
it.permissionsString("flux-example-role,read,flux-example-role,update")
4851
.collections("client-files")
4952
})
5053
.execute()

examples/client-project/src/main/java/org/example/App.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@
55
public class App {
66

77
public static void main(String[] args) {
8-
// Currently depends on flux test-app.
8+
// Depends on the example application created in the Getting Started guide.
99
Flux.importGenericFiles()
10-
.connectionString("flux-test-user:password@localhost:8003")
10+
.connectionString("flux-example-user:password@localhost:8004")
1111
.from(options -> options
1212
.paths("../../flux-cli/src/test/resources/mixed-files"))
1313
.to(options -> options
1414
.collections("client-files")
15-
.permissionsString("flux-test-role,read,flux-test-role,update"))
15+
.permissionsString("flux-example-role,read,flux-example-role,update"))
1616
.execute();
1717
}
1818
}

0 commit comments

Comments
 (0)