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 2021/09/17 17:05:05 UTC
[sis] branch geoapi-4.0 updated (f05d801 -> 2bdcb91)
This is an automated email from the ASF dual-hosted git repository.
desruisseaux pushed a change to branch geoapi-4.0
in repository https://gitbox.apache.org/repos/asf/sis.git.
from f05d801 Upgrade OpenOffice dependency. Four JAR files are replaced by a single one.
new 7dead6c Add JAXB dependency (required for avoiding a ClassNotFoundError). Update debug instruction, reformat license text on multi-lines.
new 2bdcb91 Fix type and wrong path to a runtime dependency.
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../org/apache/sis/internal/setup/FXFinder.java | 2 +-
application/sis-openoffice/pom.xml | 5 +++++
.../src/main/unopkg/build-instruction.html | 18 ++++++++++++++----
.../sis-openoffice/src/main/unopkg/license.txt | 21 +++++++++++++++++----
ide-project/NetBeans/nbproject/project.properties | 2 +-
5 files changed, 38 insertions(+), 10 deletions(-)
[sis] 01/02: Add JAXB dependency (required for avoiding a
ClassNotFoundError). Update debug instruction,
reformat license text on multi-lines.
Posted by de...@apache.org.
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 7dead6c42b9824fdd13820c0503156be131f052a
Author: Martin Desruisseaux <ma...@geomatys.com>
AuthorDate: Fri Sep 17 17:29:35 2021 +0200
Add JAXB dependency (required for avoiding a ClassNotFoundError).
Update debug instruction, reformat license text on multi-lines.
---
application/sis-openoffice/pom.xml | 5 +++++
.../src/main/unopkg/build-instruction.html | 18 ++++++++++++++----
.../sis-openoffice/src/main/unopkg/license.txt | 21 +++++++++++++++++----
3 files changed, 36 insertions(+), 8 deletions(-)
diff --git a/application/sis-openoffice/pom.xml b/application/sis-openoffice/pom.xml
index b2138f2..4e2f8a2 100644
--- a/application/sis-openoffice/pom.xml
+++ b/application/sis-openoffice/pom.xml
@@ -100,6 +100,11 @@
<artifactId>sis-utility</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>jakarta.xml.bind</groupId>
+ <artifactId>jakarta.xml.bind-api</artifactId>
+ <scope>compile</scope>
+ </dependency>
<!-- Following dependencies are included in LibreOffice runtime environment. -->
<dependency>
diff --git a/application/sis-openoffice/src/main/unopkg/build-instruction.html b/application/sis-openoffice/src/main/unopkg/build-instruction.html
index 27fffa1..0f6af24 100644
--- a/application/sis-openoffice/src/main/unopkg/build-instruction.html
+++ b/application/sis-openoffice/src/main/unopkg/build-instruction.html
@@ -26,9 +26,6 @@
</head>
<body>
<h1>OpenOffice add-in build instructions</h1>
- <p style="font-size:smaller">
- This page is adapted from the <a href="http://www.geoapi.org/geoapi-openoffice/build.html">GeoAPI build page</a>.
- </p>
<p>
All <code>XFoo</code> Java interfaces are generated from IDL files with the same name.
As long as <code>XFoo</code> Java/IDL interfaces are not modified, there is no need for the OpenOffice SDK.
@@ -101,9 +98,22 @@ mvn install</pre></blockquote>
<h2>Test in Apache OpenOffice:</h2>
+<p>Launch:</p>
<blockquote><pre>cd target
unopkg add apache-sis-1.0-SNAPSHOT.oxt --log-file log.txt
-scalc -Xdebug -env:RTL_LOGFILE=log.txt</pre></blockquote>
+scalc -env:RTL_LOGFILE=log.txt</pre></blockquote>
+
+<p>If not already done, configure Java runtime with
+ <i>Tools</i> → <i>Options…</i> → <i>Advanced</i> → <i>Java options</i> → <i>Parameters</i>
+ and specify the following parameters:
+</p>
+<blockquote><pre>-agentlib:jdwp=transport=dt_socket,server=y,address=8000,suspend=n</pre></blockquote>
+
+<p>
+ It allows to attach the IDE debugger to the Java virtual machine running in LibreOffice.
+ For example with NetBeans, use <i>Debug</i> → <i>Attach debugger…</i>,
+ select "Socket attach" as the transport and 8000 as the port number.
+</p>
</body>
</html>
diff --git a/application/sis-openoffice/src/main/unopkg/license.txt b/application/sis-openoffice/src/main/unopkg/license.txt
index 43547b5..a42b118 100644
--- a/application/sis-openoffice/src/main/unopkg/license.txt
+++ b/application/sis-openoffice/src/main/unopkg/license.txt
@@ -1,13 +1,26 @@
-Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
-Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+either express or implied. See the License for the specific
+language governing permissions and limitations under the
+License.
───────────────────────────────────────────────────────
-This software may contain geodetic dataset distributed under EPSG terms of use. You may not use the EPSG Facilities or any of them in whole or in part unless you agree to these Terms of Use. You may obtain a copy of EPSG terms of use at
+This software may contain geodetic dataset distributed under
+EPSG terms of use. You may not use the EPSG Facilities or any of
+them in whole or in part unless you agree to these Terms of Use.
+You may obtain a copy of EPSG terms of use at
https://epsg.org/terms-of-use.html
-Data and information provided in the EPSG facilities are provided "as is" without warranty of any kind, either expressed or implied, including but not limited to the implied warranties of merchantability and/or fitness for a particular purpose.
+Data and information provided in the EPSG facilities are provided
+"as is" without warranty of any kind, either expressed or implied,
+including but not limited to the implied warranties of
+merchantability and/or fitness for a particular purpose.
[sis] 02/02: Fix type and wrong path to a runtime dependency.
Posted by de...@apache.org.
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 2bdcb9145c5b4b258b0f5a739c6d71f91b83ef3f
Author: Martin Desruisseaux <ma...@geomatys.com>
AuthorDate: Fri Sep 17 17:44:52 2021 +0200
Fix type and wrong path to a runtime dependency.
---
.../src/main/java/org/apache/sis/internal/setup/FXFinder.java | 2 +-
ide-project/NetBeans/nbproject/project.properties | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/application/sis-javafx/src/main/java/org/apache/sis/internal/setup/FXFinder.java b/application/sis-javafx/src/main/java/org/apache/sis/internal/setup/FXFinder.java
index 2f6dae4..27798d8 100644
--- a/application/sis-javafx/src/main/java/org/apache/sis/internal/setup/FXFinder.java
+++ b/application/sis-javafx/src/main/java/org/apache/sis/internal/setup/FXFinder.java
@@ -31,7 +31,7 @@ import java.util.zip.ZipFile;
/**
* Ask user to specify the path to JavaFX installation directory.
- * This is used one JavaFX can not be found on the classpath.
+ * This is used when JavaFX can not be found on the classpath.
*
* @author Martin Desruisseaux (Geomatys)
* @version 1.1
diff --git a/ide-project/NetBeans/nbproject/project.properties b/ide-project/NetBeans/nbproject/project.properties
index 2187e55..d218403 100644
--- a/ide-project/NetBeans/nbproject/project.properties
+++ b/ide-project/NetBeans/nbproject/project.properties
@@ -159,7 +159,7 @@ javac.test.classpath=\
javac.test.processorpath=\
${javac.test.classpath}
run.jaxb.classpath=\
- ${maven.repository}/javax/activation/activation/${activation.version}/activation-${activation.version}.jar:\
+ ${maven.repository}/jakarta/activation/jakarta.activation-api/${activation.version}/jakarta.activation-api-${activation.version}.jar:\
${maven.repository}/org/glassfish/jaxb/jaxb-runtime/${jaxb.version}/jaxb-runtime-${jaxb.version}.jar:\
${maven.repository}/org/glassfish/jaxb/txw2/${jaxb.version}/txw2-${jaxb.version}.jar:\
${maven.repository}/com/sun/istack/istack-commons-runtime/${istack.version}/istack-commons-runtime-${istack.version}.jar