This is an automated email from the ASF dual-hosted git repository.
desruisseaux pushed a commit to branch geoapi-4.0
in repository https://gitbox.apache.org/repos/asf/sis.git
commit 123f05ebc0ba5b76d205b840fe1e68446755990d
Author: Martin Desruisseaux <martin.desruisse...@geomatys.com>
AuthorDate: Sat Dec 10 14:04:39 2022 +0100
Post-release cleanup.
---
application/sis-javafx/src/main/artifact/README | 4 ++--
application/sis-javafx/src/main/artifact/bin/sis | 2 +-
application/sis-javafx/src/main/artifact/bin/sis.bat | 2 +-
application/sis-javafx/src/main/artifact/bin/sisfx | 2 +-
application/sis-javafx/src/main/artifact/bin/sisfx.bat | 2 +-
.../src/main/java/org/apache/sis/internal/book/Assembler.java | 10 +++++-----
.../main/java/org/apache/sis/internal/book/package-info.java | 4 ++--
7 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/application/sis-javafx/src/main/artifact/README
b/application/sis-javafx/src/main/artifact/README
index 4f18b53f88..e6f159db15 100644
--- a/application/sis-javafx/src/main/artifact/README
+++ b/application/sis-javafx/src/main/artifact/README
@@ -17,8 +17,8 @@ For developing applications using the SIS library or for
using on command-line,
the only requirement is Java 8 or later. For launching the desktop application,
requirements are Java 16 or later and JavaFX 13 or later.
-1) Unzip `apache-sis-1.3-bin.zip` in any directory.
-2) Add the `apache-sis-1.3/bin` directory to the path.
+1) Unzip `apache-sis-1.4-bin.zip` in any directory.
+2) Add the `apache-sis-1.4/bin` directory to the path.
3) Invoke `sis` or `sisfx` on the command line.
diff --git a/application/sis-javafx/src/main/artifact/bin/sis
b/application/sis-javafx/src/main/artifact/bin/sis
index f91aaab288..111845cfd5 100755
--- a/application/sis-javafx/src/main/artifact/bin/sis
+++ b/application/sis-javafx/src/main/artifact/bin/sis
@@ -27,4 +27,4 @@ java -classpath "$BASE_DIR/lib/sis-console-2.0-SNAPSHOT.jar" \
-Djava.util.logging.config.class="org.apache.sis.util.logging.Initializer" \
-Djava.util.logging.config.file="$BASE_DIR/conf/logging.properties" \
-Dderby.stream.error.file="$BASE_DIR/log/derby.log" \
- org.apache.sis.console.Command $SIS_OPTS "$@"
+ $JAVA_OPTS org.apache.sis.console.Command $SIS_OPTS "$@"
diff --git a/application/sis-javafx/src/main/artifact/bin/sis.bat
b/application/sis-javafx/src/main/artifact/bin/sis.bat
index a71f977170..1cbf1ea342 100644
--- a/application/sis-javafx/src/main/artifact/bin/sis.bat
+++ b/application/sis-javafx/src/main/artifact/bin/sis.bat
@@ -24,4 +24,4 @@ java -classpath "%BASE_DIR%\lib\sis-console-2.0-SNAPSHOT.jar"^
-Djava.util.logging.config.class=org.apache.sis.util.logging.Initializer^
-Djava.util.logging.config.file="%BASE_DIR%\conf\logging.properties"^
-Dderby.stream.error.file="%BASE_DIR%\log\derby.log"^
- org.apache.sis.console.Command %SIS_OPTS% %*
+ %JAVA_OPTS% org.apache.sis.console.Command %SIS_OPTS% %*
diff --git a/application/sis-javafx/src/main/artifact/bin/sisfx
b/application/sis-javafx/src/main/artifact/bin/sisfx
index a24781167d..14fe48096a 100755
--- a/application/sis-javafx/src/main/artifact/bin/sisfx
+++ b/application/sis-javafx/src/main/artifact/bin/sisfx
@@ -42,4 +42,4 @@ java -splash:"$BASE_DIR/lib/logo.jpg" \
-Djava.util.logging.config.class="org.apache.sis.util.logging.Initializer" \
-Djava.util.logging.config.file="$BASE_DIR/conf/logging.properties" \
-Dderby.stream.error.file="$BASE_DIR/log/derby.log" \
- org.apache.sis.gui.DataViewer $SIS_OPTS "$@"
+ $JAVA_OPTS org.apache.sis.gui.DataViewer $SIS_OPTS "$@"
diff --git a/application/sis-javafx/src/main/artifact/bin/sisfx.bat
b/application/sis-javafx/src/main/artifact/bin/sisfx.bat
index 08887fe358..1c74e786e8 100644
--- a/application/sis-javafx/src/main/artifact/bin/sisfx.bat
+++ b/application/sis-javafx/src/main/artifact/bin/sisfx.bat
@@ -33,4 +33,4 @@ java -splash:"%BASE_DIR%\lib\logo.jpg"^
-Djava.util.logging.config.class=org.apache.sis.util.logging.Initializer^
-Djava.util.logging.config.file="%BASE_DIR%\conf\logging.properties"^
-Dderby.stream.error.file="%BASE_DIR%\log\derby.log"^
- org.apache.sis.gui.DataViewer %SIS_OPTS%
+ %JAVA_OPTS% org.apache.sis.gui.DataViewer %SIS_OPTS%
diff --git
a/core/sis-build-helper/src/main/java/org/apache/sis/internal/book/Assembler.java
b/core/sis-build-helper/src/main/java/org/apache/sis/internal/book/Assembler.java
index ff0fb61dcd..d1c21313b9 100644
---
a/core/sis-build-helper/src/main/java/org/apache/sis/internal/book/Assembler.java
+++
b/core/sis-build-helper/src/main/java/org/apache/sis/internal/book/Assembler.java
@@ -79,7 +79,7 @@ public final class Assembler {
/**
* Relative path to be replaced by {@code "../"} path. We perform this
substitution because the source files
- * defined in the {@code source/developer-guide/<chapter>} directories
reference directly the images in their
+ * defined in the {@code content/developer-guide/<chapter>} directories
reference directly the images in their
* final {@code static/book/images} directory.
*/
private static final String[] PATHS_TO_REPLACE = {
@@ -138,7 +138,7 @@ public final class Assembler {
/**
* Creates a new assembler for the given input and output files.
*
- * @param input the input file (e.g. {@code
"sis-site/main/source/developer-guide/index.html"}).
+ * @param input the input file (e.g. {@code
"sis-site/main/content/developer-guide/index.html"}).
* @throws ParserConfigurationException if this constructor cannot build
the XML document.
* @throws IOException if an error occurred while reading the file.
* @throws SAXException if an error occurred while parsing the XML.
@@ -172,7 +172,7 @@ public final class Assembler {
" http://www.apache.org/licenses/LICENSE-2.0"; +
LINE_SEPARATOR +
LINE_SEPARATOR +
" This is an automatically generated file. DO NOT
EDIT." + LINE_SEPARATOR +
- " See the files in the `source/developer-guide`
directory instead." + LINE_SEPARATOR +
+ " See the files in the `content/developer-guide`
directory instead." + LINE_SEPARATOR +
LINE_SEPARATOR);
break;
}
@@ -530,7 +530,7 @@ public final class Assembler {
/**
* Generates the {@code "static/book/en|fr/developer-guide.html"} files
- * from {@code "source/developer-guide/[fr/]index.html"} files.
+ * from {@code "content/developer-guide/[fr/]index.html"} files.
* The only argument expected by this method is the root of {@code
sis-site} project.
*
* @param args command-line arguments. Should contain exactly on value,
which is the site root directory.
@@ -549,7 +549,7 @@ public final class Assembler {
System.err.println("Not a directory: " + directory);
System.exit(1);
}
- final File source = new File(directory, "main/source");
+ final File source = new File(directory, "main/content");
final File target = new File(directory, "asf-staging/book");
final File input = new File(source, "developer-guide/index.html");
if (!input.isFile()) {
diff --git
a/core/sis-build-helper/src/main/java/org/apache/sis/internal/book/package-info.java
b/core/sis-build-helper/src/main/java/org/apache/sis/internal/book/package-info.java
index 7cad5fc6c9..304e62cdc1 100644
---
a/core/sis-build-helper/src/main/java/org/apache/sis/internal/book/package-info.java
+++
b/core/sis-build-helper/src/main/java/org/apache/sis/internal/book/package-info.java
@@ -16,7 +16,7 @@
*/
/**
- * Takes the source HTML files in the {@code
sis-site/main/source/developer-guide/} directory
+ * Takes the source HTML files in the {@code
sis-site/main/content/developer-guide/} directory
* and assembles them in a single file to be published in the {@code
asf-staging/book/} directory.
*
* <p>The main class in this package is {@link
org.apache.sis.internal.book.Assembler}.
@@ -28,7 +28,7 @@
* │ └─ sis-build-helper
* └─ site
* ├─ main
- * │ └─ source
+ * │ └─ content
* └─ asf-staging
* └─ book
* </pre>
