You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sis.apache.org by de...@apache.org on 2023/11/21 20:20:09 UTC
(sis) 03/04: Replace our custom `JAVA_OPTS` environment variable by the standard `JDK_JAVA_OPTIONS`. https://docs.oracle.com/en/java/javase/21/docs/specs/man/java.html#using-the-jdk_java_options-launcher-environment-variable
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 465d9245586397d25d03cd25875db8114a7e9e21
Author: Martin Desruisseaux <ma...@geomatys.com>
AuthorDate: Tue Nov 21 16:04:17 2023 +0100
Replace our custom `JAVA_OPTS` environment variable by the standard `JDK_JAVA_OPTIONS`.
https://docs.oracle.com/en/java/javase/21/docs/specs/man/java.html#using-the-jdk_java_options-launcher-environment-variable
---
endorsed/src/org.apache.sis.console/main/module-info.java | 1 +
.../main/org/apache/sis/console/package-info.java | 9 +++++++++
.../main/org/apache/sis/metadata/sql/util/package-info.java | 2 +-
optional/src/org.apache.sis.gui/bundle/bin/sis | 2 +-
optional/src/org.apache.sis.gui/bundle/bin/sis.bat | 2 +-
optional/src/org.apache.sis.gui/bundle/bin/sisfx | 2 +-
optional/src/org.apache.sis.gui/bundle/bin/sisfx.bat | 2 +-
7 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/endorsed/src/org.apache.sis.console/main/module-info.java b/endorsed/src/org.apache.sis.console/main/module-info.java
index 7062473f92..15fc19aa76 100644
--- a/endorsed/src/org.apache.sis.console/main/module-info.java
+++ b/endorsed/src/org.apache.sis.console/main/module-info.java
@@ -17,6 +17,7 @@
/**
* Command line interface for Apache SIS.
+ * An introduction is available in the <a href="https://sis.apache.org/command-line.html">Apache SIS web site</a>.
*
* @author Martin Desruisseaux (Geomatys)
* @version 1.4
diff --git a/endorsed/src/org.apache.sis.console/main/org/apache/sis/console/package-info.java b/endorsed/src/org.apache.sis.console/main/org/apache/sis/console/package-info.java
index 825c4615dd..778211da37 100644
--- a/endorsed/src/org.apache.sis.console/main/org/apache/sis/console/package-info.java
+++ b/endorsed/src/org.apache.sis.console/main/org/apache/sis/console/package-info.java
@@ -18,6 +18,15 @@
/**
* Command line interface for Apache SIS.
* See {@link org.apache.sis.console.Command} for the list of supported commands.
+ * See the <a href="https://sis.apache.org/command-line.html">Apache SIS web site</a> for usage examples.
+ *
+ * <h2>Debugging</h2>
+ * For debugging an application launched on the command-line by the {@code bin/sis} shell script,
+ * the following environment variable can be set:
+ *
+ * {@snippet lang="shell" :
+ * export JDK_JAVA_OPTIONS=-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=127.0.0.1:8000
+ * }
*
* <h2>SIS installation on remote machines</h2>
* Some sub-commands can operate on SIS installation on remote machines, provided that Apache SIS
diff --git a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/sql/util/package-info.java b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/sql/util/package-info.java
index 41e5b15d7b..a1fa73ef88 100644
--- a/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/sql/util/package-info.java
+++ b/endorsed/src/org.apache.sis.metadata/main/org/apache/sis/metadata/sql/util/package-info.java
@@ -37,7 +37,7 @@
* <li><p>If using Derby, copy {@code derby.war} into the {@code $CATALINA_HOME/webapps} directory
* and specify the directory where the Derby databases are located:</p>
* {@snippet lang="shell" :
- * export JAVA_OPTS=-Dderby.system.home=$SIS_DATA/Databases
+ * export JDK_JAVA_OPTIONS=-Dderby.system.home=$SIS_DATA/Databases
* }
* </li>
*
diff --git a/optional/src/org.apache.sis.gui/bundle/bin/sis b/optional/src/org.apache.sis.gui/bundle/bin/sis
index 3843ebf533..07f7afd957 100755
--- a/optional/src/org.apache.sis.gui/bundle/bin/sis
+++ b/optional/src/org.apache.sis.gui/bundle/bin/sis
@@ -27,5 +27,5 @@ java --module-path "$BASE_DIR/lib:$BASE_DIR/lib/app/org.apache.sis.console.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" \
- $JAVA_OPTS --module org.apache.sis.console/org.apache.sis.console.Command \
+ --module org.apache.sis.console/org.apache.sis.console.Command \
$SIS_OPTS "$@"
diff --git a/optional/src/org.apache.sis.gui/bundle/bin/sis.bat b/optional/src/org.apache.sis.gui/bundle/bin/sis.bat
index 2e8bb0af9e..25a55363b3 100644
--- a/optional/src/org.apache.sis.gui/bundle/bin/sis.bat
+++ b/optional/src/org.apache.sis.gui/bundle/bin/sis.bat
@@ -24,5 +24,5 @@ java --module-path "%BASE_DIR%\lib;%BASE_DIR%\lib\app\org.apache.sis.console.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"^
- %JAVA_OPTS% --module org.apache.sis.console/org.apache.sis.console.Command^
+ --module org.apache.sis.console/org.apache.sis.console.Command^
%SIS_OPTS% %*
diff --git a/optional/src/org.apache.sis.gui/bundle/bin/sisfx b/optional/src/org.apache.sis.gui/bundle/bin/sisfx
index 8286d0505c..5a8cda7447 100755
--- a/optional/src/org.apache.sis.gui/bundle/bin/sisfx
+++ b/optional/src/org.apache.sis.gui/bundle/bin/sisfx
@@ -40,5 +40,5 @@ 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" \
- $JAVA_OPTS --module org.apache.sis.gui/org.apache.sis.gui.DataViewer \
+ --module org.apache.sis.gui/org.apache.sis.gui.DataViewer \
$SIS_OPTS "$@"
diff --git a/optional/src/org.apache.sis.gui/bundle/bin/sisfx.bat b/optional/src/org.apache.sis.gui/bundle/bin/sisfx.bat
index 5dc74c24e2..1517a2b985 100644
--- a/optional/src/org.apache.sis.gui/bundle/bin/sisfx.bat
+++ b/optional/src/org.apache.sis.gui/bundle/bin/sisfx.bat
@@ -31,5 +31,5 @@ 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"^
- %JAVA_OPTS% --module org.apache.sis.gui/org.apache.sis.gui.DataViewer^
+ --module org.apache.sis.gui/org.apache.sis.gui.DataViewer^
%SIS_OPTS%