[jira] [Created] (SIS-518) Update EPSG geodetic dataset to version 10.x
Martin Desruisseaux created SIS-518:
---
Summary: Update EPSG geodetic dataset to version 10.x
Key: SIS-518
URL: https://issues.apache.org/jira/browse/SIS-518
Project: Spatial Information Systems
Issue Type: Task
Components: Referencing
Affects Versions: 1.1
Reporter: Martin Desruisseaux
Assignee: Martin Desruisseaux
Fix For: 1.2
EPSG geodetic dataset version 10 and later uses a new SQL schema different than
the one supported by Apache SIS until now. The new SQL schema aims to support
dynamic datum. The {{EPSGDataAccess}} class needs to be adapter before we can
support latest EPSG datasets.
--
This message was sent by Atlassian Jira
(v8.3.4#803005)
[jira] [Created] (SIS-517) Update EPSG geodetic dataset to version 9.9.1
Martin Desruisseaux created SIS-517: --- Summary: Update EPSG geodetic dataset to version 9.9.1 Key: SIS-517 URL: https://issues.apache.org/jira/browse/SIS-517 Project: Spatial Information Systems Issue Type: Task Components: Referencing Affects Versions: 1.0 Reporter: Martin Desruisseaux Assignee: Martin Desruisseaux Fix For: 1.1 EPSG dataset 9.9.1 (September 2020) is the last version before the 10._x_ series of EPSG dataset. The 10._x_ series have changes in SQL schema and can not be integrated immediately in Apache SIS. Consequently EPSG 9.9.1 is the last version we can support until we do necessary adaptation work for the new EPSG schema. -- This message was sent by Atlassian Jira (v8.3.4#803005)
svn commit: r1893515 - in /sis/data/non-free: pom.xml sis-embedded-data/pom.xml sis-embedded-data/src/main/java/org/apache/sis/resources/embedded/Generator.java sis-epsg/pom.xml
Author: desruisseaux
Date: Wed Sep 22 16:27:26 2021
New Revision: 1893515
URL: http://svn.apache.org/viewvc?rev=1893515&view=rev
Log:
Prepare for upgrade to 1.1 release.
Modified:
sis/data/non-free/pom.xml
sis/data/non-free/sis-embedded-data/pom.xml
sis/data/non-free/sis-embedded-data/src/main/java/org/apache/sis/resources/embedded/Generator.java
sis/data/non-free/sis-epsg/pom.xml
Modified: sis/data/non-free/pom.xml
URL:
http://svn.apache.org/viewvc/sis/data/non-free/pom.xml?rev=1893515&r1=1893514&r2=1893515&view=diff
==
--- sis/data/non-free/pom.xml (original)
+++ sis/data/non-free/pom.xml Wed Sep 22 16:27:26 2021
@@ -27,7 +27,7 @@
org.apache.sis
parent
-1.0
+1.1-SNAPSHOT
@@ -105,7 +105,11 @@ The "non-free" modules contain data that
-
+
+
+
@@ -121,10 +125,26 @@ The "non-free" modules contain data that
+
+maven-remote-resources-plugin
+
+ true
+
+
+
+
+org.apache.maven.plugins
+maven-resources-plugin
+2.7
+
+
Modified: sis/data/non-free/sis-embedded-data/pom.xml
URL:
http://svn.apache.org/viewvc/sis/data/non-free/sis-embedded-data/pom.xml?rev=1893515&r1=1893514&r2=1893515&view=diff
==
--- sis/data/non-free/sis-embedded-data/pom.xml (original)
+++ sis/data/non-free/sis-embedded-data/pom.xml Wed Sep 22 16:27:26 2021
@@ -27,7 +27,7 @@
org.apache.sis
non-free
-1.0
+1.1-SNAPSHOT
Modified:
sis/data/non-free/sis-embedded-data/src/main/java/org/apache/sis/resources/embedded/Generator.java
URL:
http://svn.apache.org/viewvc/sis/data/non-free/sis-embedded-data/src/main/java/org/apache/sis/resources/embedded/Generator.java?rev=1893515&r1=1893514&r2=1893515&view=diff
==
---
sis/data/non-free/sis-embedded-data/src/main/java/org/apache/sis/resources/embedded/Generator.java
[UTF-8] (original)
+++
sis/data/non-free/sis-embedded-data/src/main/java/org/apache/sis/resources/embedded/Generator.java
[UTF-8] Wed Sep 22 16:27:26 2021
@@ -38,6 +38,7 @@ import org.opengis.util.FactoryException
import org.opengis.referencing.crs.GeographicCRS;
import org.apache.derby.jdbc.EmbeddedDataSource;
import org.apache.sis.internal.metadata.sql.Initializer;
+import org.apache.sis.internal.metadata.sql.LocalDataSource;
import org.apache.sis.internal.system.Shutdown;
import org.apache.sis.internal.util.Constants;
import org.apache.sis.metadata.MetadataStandard;
@@ -223,7 +224,7 @@ final class Generator {
try {
dataSource.getConnection().close();
} catch (SQLException e) {
-if (Initializer.isSuccessfulShutdown(e)) {
+if (LocalDataSource.isSuccessfulShutdown(e)) {
return;
}
throw e;
Modified: sis/data/non-free/sis-epsg/pom.xml
URL:
http://svn.apache.org/viewvc/sis/data/non-free/sis-epsg/pom.xml?rev=1893515&r1=1893514&r2=1893515&view=diff
==
--- sis/data/non-free/sis-epsg/pom.xml (original)
+++ sis/data/non-free/sis-epsg/pom.xml Wed Sep 22 16:27:26 2021
@@ -27,7 +27,7 @@
org.apache.sis
non-free
-1.0
+1.1-SNAPSHOT
[sis] 02/07: Move `WraparoundAdjustment` outside of `sis-referencing` module. It is specific to grid coverage support.
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 75db362d129b25074c9e88990970d69ecd5cc945
Author: Martin Desruisseaux
AuthorDate: Wed Sep 22 14:54:24 2021 +0200
Move `WraparoundAdjustment` outside of `sis-referencing` module.
It is specific to grid coverage support.
---
.../apache/sis/coverage/grid/GridDerivation.java | 1 -
.../sis/coverage/grid}/WraparoundAdjustment.java | 47 +++---
.../sis/coverage/grid/GridDerivationTest.java | 2 +-
.../coverage/grid}/WraparoundAdjustmentTest.java | 19 ++---
.../apache/sis/test/suite/FeatureTestSuite.java| 1 +
.../internal/referencing/WraparoundApplicator.java | 37 -
.../referencing/WraparoundApplicatorTest.java | 44
.../sis/test/suite/ReferencingTestSuite.java | 2 +-
8 files changed, 92 insertions(+), 61 deletions(-)
diff --git
a/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/GridDerivation.java
b/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/GridDerivation.java
index e6cd64a..feed88f 100644
---
a/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/GridDerivation.java
+++
b/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/GridDerivation.java
@@ -35,7 +35,6 @@ import
org.apache.sis.referencing.operation.transform.LinearTransform;
import org.apache.sis.referencing.operation.transform.TransformSeparator;
import org.apache.sis.referencing.operation.matrix.Matrices;
import org.apache.sis.referencing.CRS;
-import org.apache.sis.internal.referencing.WraparoundAdjustment;
import org.apache.sis.internal.referencing.DirectPositionView;
import org.apache.sis.geometry.GeneralDirectPosition;
import org.apache.sis.geometry.GeneralEnvelope;
diff --git
a/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/WraparoundAdjustment.java
b/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/WraparoundAdjustment.java
similarity index 92%
rename from
core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/WraparoundAdjustment.java
rename to
core/sis-feature/src/main/java/org/apache/sis/coverage/grid/WraparoundAdjustment.java
index 6ebf80d..32017c2 100644
---
a/core/sis-referencing/src/main/java/org/apache/sis/internal/referencing/WraparoundAdjustment.java
+++
b/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/WraparoundAdjustment.java
@@ -14,27 +14,21 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.sis.internal.referencing;
+package org.apache.sis.coverage.grid;
-import javax.measure.Unit;
import org.opengis.geometry.DirectPosition;
import org.opengis.geometry.Envelope;
-import org.opengis.referencing.cs.AxisDirection;
import org.opengis.referencing.cs.CoordinateSystem;
-import org.opengis.referencing.cs.CoordinateSystemAxis;
-import org.opengis.referencing.cs.EllipsoidalCS;
-import org.opengis.referencing.cs.RangeMeaning;
import org.opengis.referencing.crs.CoordinateReferenceSystem;
import org.opengis.referencing.crs.ProjectedCRS;
import org.opengis.referencing.operation.MathTransform;
import org.opengis.referencing.operation.TransformException;
import org.apache.sis.referencing.operation.transform.MathTransforms;
-import org.apache.sis.measure.Longitude;
-import org.apache.sis.measure.Units;
import org.apache.sis.math.MathFunctions;
import org.apache.sis.geometry.Envelopes;
import org.apache.sis.geometry.GeneralEnvelope;
import org.apache.sis.geometry.GeneralDirectPosition;
+import org.apache.sis.internal.referencing.WraparoundApplicator;
/**
@@ -43,11 +37,11 @@ import org.apache.sis.geometry.GeneralDirectPosition;
* to move an envelope or a position inside a given domain of validity.
*
* @author Martin Desruisseaux (Geomatys)
- * @version 1.0
+ * @version 1.1
* @since 1.0
* @module
*/
-public final class WraparoundAdjustment {
+final class WraparoundAdjustment {
/**
* The region inside which a given Area Of Interest (AOI) or Point Of
Interest (POI) should be located.
* This envelope may be initially in a projected CRS and converted later
to geographic CRS in order to
@@ -116,35 +110,6 @@ public final class WraparoundAdjustment {
}
/**
- * Returns the range (maximum - minimum) of axis in specified dimension if
it has wraparound meaning,
- * or {@link Double#NaN} otherwise. This method implements a fallback for
longitude axis if it does
- * not declare the minimum and maximum values as expected.
- *
- * @param cs the coordinate system for which to get wraparound
range.
- * @param dimension dimension of the axis to test.
- * @return the wraparound range, or {@link Double#NaN} if none.
- */
-static double range(final CoordinateSystem cs, fina
[sis] 06/07: Remove link to UCAR Javadoc. The link seems to not work anymore.
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 c3bb6f3130e6c2b5b21a6c8e8f00129513bee64e Author: Martin Desruisseaux AuthorDate: Wed Sep 22 17:05:35 2021 +0200 Remove link to UCAR Javadoc. The link seems to not work anymore. --- pom.xml | 1 - .../main/java/org/apache/sis/internal/netcdf/ucar/package-info.java | 5 + 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index d5f89bb..a23908b 100644 --- a/pom.xml +++ b/pom.xml @@ -878,7 +878,6 @@ https://docs.oracle.com/javase/8/docs/api http://unitsofmeasurement.github.io/unit-api/site/apidocs http://www.geoapi.org/snapshot/javadoc - https://docs.unidata.ucar.edu/netcdf-java/current/javadoc diff --git a/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/ucar/package-info.java b/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/ucar/package-info.java index 3138597..105353e 100644 --- a/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/ucar/package-info.java +++ b/storage/sis-netcdf/src/main/java/org/apache/sis/internal/netcdf/ucar/package-info.java @@ -21,10 +21,7 @@ * * @author Martin Desruisseaux (IRD, Geomatys) * @version 1.1 - * - * @see https://docs.unidata.ucar.edu/netcdf-java/current/javadoc/index.html";>UCAR javadoc - * - * @since 0.3 + * @since 0.3 * @module */ package org.apache.sis.internal.netcdf.ucar;
[sis] branch geoapi-4.0 updated (19acaac -> a493472)
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 19acaac Fix unmarshalling of .
new 7485605 Move `RasterLoadingStrategy` to public API.
new 75db362 Move `WraparoundAdjustment` outside of `sis-referencing`
module. It is specific to grid coverage support.
new 93868d7 Rename `FolderStoreProvider` as `StoreProvider` for
consistency with other internal store provider. The `Folder` prefix is
redundant with package names and these providers are no expected to be used
directly.
new 63a6974 Use better method names for some `SQLBuilder` methods.
new 975a191 Rename `insert(…)` as `insertDimension` and `reduce(…)` as
`reduceDimension`.
new c3bb6f3 Remove link to UCAR Javadoc. The link seems to not work
anymore.
new a493472 Remove provided in declarations of Jakarta API
dependency. Environments providing JAXB by default are rare now.
The 7 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:
application/sis-console/pom.xml| 4 --
application/sis-javafx/pom.xml | 5 ---
application/sis-openoffice/pom.xml | 5 ---
.../apache/sis/coverage/grid/GridDerivation.java | 1 -
.../org/apache/sis/coverage/grid/GridExtent.java | 34
.../org/apache/sis/coverage/grid/GridGeometry.java | 2 +-
.../apache/sis/coverage/grid/SliceGeometry.java| 2 +-
.../sis/coverage/grid}/WraparoundAdjustment.java | 47 +++---
.../sis/coverage/grid/GridDerivationTest.java | 2 +-
.../apache/sis/coverage/grid/GridExtentTest.java | 16
.../coverage/grid}/WraparoundAdjustmentTest.java | 19 ++---
.../apache/sis/test/suite/FeatureTestSuite.java| 1 +
.../sis/internal/metadata/sql/SQLBuilder.java | 10 ++---
.../sis/metadata/sql/IdentifierGenerator.java | 2 +-
.../apache/sis/metadata/sql/MetadataSource.java| 2 +-
.../apache/sis/metadata/sql/MetadataWriter.java| 2 +-
.../internal/referencing/WraparoundApplicator.java | 37 -
.../referencing/WraparoundApplicatorTest.java} | 22 +-
.../sis/test/suite/ReferencingTestSuite.java | 2 +-
pom.xml| 7
.../sis/internal/netcdf/ucar/package-info.java | 5 +--
.../sis/internal/sql/feature/FeatureIterator.java | 2 +-
.../sis/internal/storage/AbstractGridResource.java | 30 +-
.../sis/internal/storage/TiledGridResource.java| 1 +
.../apache/sis/internal/storage/folder/Store.java | 4 +-
...FolderStoreProvider.java => StoreProvider.java} | 8 ++--
.../sis/internal/storage/folder/WritableStore.java | 4 +-
.../apache/sis/storage/GridCoverageResource.java | 32 +++
.../storage/RasterLoadingStrategy.java | 6 +--
.../org.apache.sis.storage.DataStoreProvider | 2 +-
.../sis/internal/storage/folder/StoreTest.java | 4 +-
.../sis/test/storage/CoverageReadConsistency.java | 2 +-
32 files changed, 153 insertions(+), 169 deletions(-)
rename core/{sis-referencing/src/main/java/org/apache/sis/internal/referencing
=>
sis-feature/src/main/java/org/apache/sis/coverage/grid}/WraparoundAdjustment.java
(92%)
rename core/{sis-referencing/src/test/java/org/apache/sis/internal/referencing
=>
sis-feature/src/test/java/org/apache/sis/coverage/grid}/WraparoundAdjustmentTest.java
(93%)
copy
core/sis-referencing/src/test/java/org/apache/sis/{referencing/operation/DefaultFormulaTest.java
=> internal/referencing/WraparoundApplicatorTest.java} (62%)
rename
storage/sis-storage/src/main/java/org/apache/sis/internal/storage/folder/{FolderStoreProvider.java
=> StoreProvider.java} (98%)
rename storage/sis-storage/src/main/java/org/apache/sis/{internal =>
}/storage/RasterLoadingStrategy.java (95%)
[sis] 01/07: Move `RasterLoadingStrategy` to public API.
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 7485605ecd9697c4e80d4c0ecdb5741cc3053746
Author: Martin Desruisseaux
AuthorDate: Wed Sep 22 13:56:57 2021 +0200
Move `RasterLoadingStrategy` to public API.
---
.../sis/internal/storage/AbstractGridResource.java | 28 ---
.../sis/internal/storage/TiledGridResource.java| 1 +
.../apache/sis/storage/GridCoverageResource.java | 32 ++
.../storage/RasterLoadingStrategy.java | 6 +---
.../sis/test/storage/CoverageReadConsistency.java | 2 +-
5 files changed, 35 insertions(+), 34 deletions(-)
diff --git
a/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/AbstractGridResource.java
b/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/AbstractGridResource.java
index 4bbf543..0e60107 100644
---
a/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/AbstractGridResource.java
+++
b/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/AbstractGridResource.java
@@ -484,34 +484,6 @@ public abstract class AbstractGridResource extends
AbstractResource implements G
}
/**
- * Returns an indication about when the "physical" loading of raster data
will happen.
- * This is the strategy actually applied by this resource implementation,
not necessarily
- * the strategy given in the last call to {@link
#setLoadingStrategy(RasterLoadingStrategy)
- * setLoadingStrategy(…)}.
- *
- * The default strategy is to load raster data at {@link #read read(…)}
method invocation time.
- *
- * @return current raster data loading strategy for this resource.
- */
-public RasterLoadingStrategy getLoadingStrategy() {
-return RasterLoadingStrategy.AT_READ_TIME;
-}
-
-/**
- * Sets the preferred strategy about when to do the "physical" loading of
raster data.
- * Implementations are free to ignore this parameter or to replace the
given strategy
- * by the closest alternative that this resource can support.
- *
- * @param strategy the desired strategy for loading raster data.
- * @return {@code true} if the given strategy has been accepted, or {@code
false}
- * if this implementation replaced the given strategy by an
alternative.
- */
-public boolean setLoadingStrategy(final RasterLoadingStrategy strategy) {
-ArgumentChecks.ensureNonNull("strategy", strategy);
-return strategy == getLoadingStrategy();
-}
-
-/**
* Logs the execution of a {@link #read(GridGeometry, int...)} operation.
* The log level will be {@link Level#FINE} if the operation was quick
enough,
* or {@link PerformanceLevel#SLOW} or higher level otherwise.
diff --git
a/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/TiledGridResource.java
b/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/TiledGridResource.java
index 0a2bad4..bb67d36 100644
---
a/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/TiledGridResource.java
+++
b/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/TiledGridResource.java
@@ -36,6 +36,7 @@ import org.apache.sis.coverage.grid.GridGeometry;
import org.apache.sis.coverage.grid.GridRoundingMode;
import org.apache.sis.storage.DataStore;
import org.apache.sis.storage.DataStoreException;
+import org.apache.sis.storage.RasterLoadingStrategy;
import org.apache.sis.storage.event.StoreListeners;
import org.apache.sis.util.collection.WeakValueHashMap;
import org.apache.sis.util.ArraysExt;
diff --git
a/storage/sis-storage/src/main/java/org/apache/sis/storage/GridCoverageResource.java
b/storage/sis-storage/src/main/java/org/apache/sis/storage/GridCoverageResource.java
index e30cf6b..ce2fe89 100644
---
a/storage/sis-storage/src/main/java/org/apache/sis/storage/GridCoverageResource.java
+++
b/storage/sis-storage/src/main/java/org/apache/sis/storage/GridCoverageResource.java
@@ -160,4 +160,36 @@ public interface GridCoverageResource extends DataSet {
* @throws DataStoreException if an error occurred while reading the grid
coverage data.
*/
GridCoverage read(GridGeometry domain, int... range) throws
DataStoreException;
+
+/**
+ * Returns an indication about when the "physical" loading of raster data
will happen.
+ * This is the strategy actually applied by this resource implementation,
not necessarily
+ * the strategy given in the last call to {@link
#setLoadingStrategy(RasterLoadingStrategy)
+ * setLoadingStrategy(…)}.
+ *
+ * The default strategy is to load raster data at {@link #read read(…)}
method invocation time.
+ *
+ * @return current raster data loading strategy for this resource.
+ *
+ * @since 1.1
+ */
+default RasterLoadingStrategy getLoadingStrate
[sis] 03/07: Rename `FolderStoreProvider` as `StoreProvider` for consistency with other internal store provider. The `Folder` prefix is redundant with package names and these providers are no expected
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 93868d77c9613c67ed22a1c75925043c9b4a7739
Author: Martin Desruisseaux
AuthorDate: Wed Sep 22 15:09:30 2021 +0200
Rename `FolderStoreProvider` as `StoreProvider` for consistency with other
internal store provider.
The `Folder` prefix is redundant with package names and these providers are
no expected to be used directly.
---
.../main/java/org/apache/sis/internal/storage/folder/Store.java | 4 ++--
.../folder/{FolderStoreProvider.java => StoreProvider.java} | 8
.../org/apache/sis/internal/storage/folder/WritableStore.java | 4 ++--
.../META-INF/services/org.apache.sis.storage.DataStoreProvider| 2 +-
.../java/org/apache/sis/internal/storage/folder/StoreTest.java| 4 ++--
5 files changed, 11 insertions(+), 11 deletions(-)
diff --git
a/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/folder/Store.java
b/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/folder/Store.java
index 524c206..d03cbf3 100644
---
a/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/folder/Store.java
+++
b/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/folder/Store.java
@@ -90,7 +90,7 @@ class Store extends DataStore implements StoreResource,
Aggregate, DirectoryStre
private final Store originator;
/**
- * The {@link FolderStoreProvider#LOCATION} parameter value.
+ * The {@link StoreProvider#LOCATION} parameter value.
*/
protected final Path location;
@@ -213,7 +213,7 @@ class Store extends DataStore implements StoreResource,
Aggregate, DirectoryStre
@Override
public Optional getOpenParameters() {
final String format = StoreUtilities.getFormatName(componentProvider);
-final ParameterValueGroup pg = (provider != null ?
provider.getOpenParameters() : FolderStoreProvider.PARAMETERS).createValue();
+final ParameterValueGroup pg = (provider != null ?
provider.getOpenParameters() : StoreProvider.PARAMETERS).createValue();
pg.parameter(DataStoreProvider.LOCATION).setValue(location);
if (locale != null) pg.parameter("locale" ).setValue(locale );
if (timezone != null) pg.parameter("timezone").setValue(timezone);
diff --git
a/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/folder/FolderStoreProvider.java
b/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/folder/StoreProvider.java
similarity index 98%
rename from
storage/sis-storage/src/main/java/org/apache/sis/internal/storage/folder/FolderStoreProvider.java
rename to
storage/sis-storage/src/main/java/org/apache/sis/internal/storage/folder/StoreProvider.java
index f85f93e..9561f58 100644
---
a/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/folder/FolderStoreProvider.java
+++
b/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/folder/StoreProvider.java
@@ -62,11 +62,11 @@ import org.apache.sis.setup.OptionKey;
* @since 0.8
* @module
*/
-@StoreMetadata(formatName= FolderStoreProvider.NAME,
+@StoreMetadata(formatName= StoreProvider.NAME,
capabilities = {Capability.READ, Capability.WRITE},
resourceTypes = {Aggregate.class, FeatureSet.class,
GridCoverageResource.class},
yieldPriority = true)
-public final class FolderStoreProvider extends DataStoreProvider {
+public final class StoreProvider extends DataStoreProvider {
/**
* A short name or abbreviation for the data format.
*/
@@ -119,7 +119,7 @@ public final class FolderStoreProvider extends
DataStoreProvider {
/**
* Creates a new provider.
*/
-public FolderStoreProvider() {
+public StoreProvider() {
}
/**
@@ -159,7 +159,7 @@ public final class FolderStoreProvider extends
DataStoreProvider {
return ProbeResult.SUPPORTED;
}
} catch (FileSystemNotFoundException e) {
-Logging.recoverableException(getLogger(),
FolderStoreProvider.class, "probeContent", e);
+Logging.recoverableException(getLogger(), StoreProvider.class,
"probeContent", e);
// Nothing we can do, may happen often.
}
return ProbeResult.UNSUPPORTED_STORAGE;
diff --git
a/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/folder/WritableStore.java
b/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/folder/WritableStore.java
index 8a53cc2..add465c 100644
---
a/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/folder/WritableStore.java
+++
b/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/folder/WritableStore.java
@@ -62,7 +62,7 @@ final class WritableStore extends Store implements
WritableAggregate {
/**
* Creates a new folder stor
[sis] 07/07: Remove provided in declarations of Jakarta API dependency. Environments providing JAXB by default are rare now.
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 a493472a10ae595f06aa9d38a4b2a5b39d08ddf6
Author: Martin Desruisseaux
AuthorDate: Wed Sep 22 18:24:15 2021 +0200
Remove provided in declarations of Jakarta API dependency.
Environments providing JAXB by default are rare now.
---
application/sis-console/pom.xml| 4
application/sis-javafx/pom.xml | 5 -
application/sis-openoffice/pom.xml | 5 -
pom.xml| 6 --
4 files changed, 20 deletions(-)
diff --git a/application/sis-console/pom.xml b/application/sis-console/pom.xml
index 7b12425..bdf2bda 100644
--- a/application/sis-console/pom.xml
+++ b/application/sis-console/pom.xml
@@ -139,10 +139,6 @@
${project.version}
runtime
-
- jakarta.xml.bind
- jakarta.xml.bind-api
-
diff --git a/application/sis-javafx/pom.xml b/application/sis-javafx/pom.xml
index fa2e2a9..995a99f 100644
--- a/application/sis-javafx/pom.xml
+++ b/application/sis-javafx/pom.xml
@@ -151,11 +151,6 @@
runtime
- jakarta.xml.bind
- jakarta.xml.bind-api
- compile
-
-
org.glassfish.jaxb
jaxb-runtime
runtime
diff --git a/application/sis-openoffice/pom.xml
b/application/sis-openoffice/pom.xml
index 4e2f8a2..b2138f2 100644
--- a/application/sis-openoffice/pom.xml
+++ b/application/sis-openoffice/pom.xml
@@ -100,11 +100,6 @@
sis-utility
${project.version}
-
- jakarta.xml.bind
- jakarta.xml.bind-api
- compile
-
diff --git a/pom.xml b/pom.xml
index a23908b..715f72d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -469,7 +469,6 @@
jakarta.xml.bind
jakarta.xml.bind-api
${jaxb.version}
-provided
org.glassfish.jaxb
@@ -534,11 +533,6 @@
junit
test
-
- jakarta.xml.bind
- jakarta.xml.bind-api
- test
-
[sis] 05/07: Rename `insert(…)` as `insertDimension` and `reduce(…)` as `reduceDimension`.
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 975a19153ba0e9d30096cec9b995f46d7125b62b
Author: Martin Desruisseaux
AuthorDate: Wed Sep 22 17:04:16 2021 +0200
Rename `insert(…)` as `insertDimension` and `reduce(…)` as
`reduceDimension`.
---
.../org/apache/sis/coverage/grid/GridExtent.java | 34 +-
.../org/apache/sis/coverage/grid/GridGeometry.java | 2 +-
.../apache/sis/coverage/grid/SliceGeometry.java| 2 +-
.../apache/sis/coverage/grid/GridExtentTest.java | 16 +-
.../sis/internal/storage/AbstractGridResource.java | 2 +-
5 files changed, 38 insertions(+), 18 deletions(-)
diff --git
a/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/GridExtent.java
b/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/GridExtent.java
index 2e967b1..7368d8e 100644
---
a/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/GridExtent.java
+++
b/core/sis-feature/src/main/java/org/apache/sis/coverage/grid/GridExtent.java
@@ -314,7 +314,7 @@ public class GridExtent implements GridEnvelope,
LenientComparable, Serializable
*
* @see #getLow()
* @see #getHigh()
- * @see #insert(int, DimensionNameType, long, long, boolean)
+ * @see #insertDimension(int, DimensionNameType, long, long, boolean)
*/
public GridExtent(final DimensionNameType[] axisTypes, final long[] low,
final long[] high, final boolean isHighIncluded) {
ArgumentChecks.ensureNonNull("high", high);
@@ -625,7 +625,7 @@ public class GridExtent implements GridEnvelope,
LenientComparable, Serializable
*
* @return the number of dimensions.
*
- * @see #reduce(int...)
+ * @see #reduceDimension(int[])
*/
@Override
public final int getDimension() {
@@ -1049,6 +1049,14 @@ public class GridExtent implements GridEnvelope,
LenientComparable, Serializable
}
/**
+ * @deprecated Renamed {@link #insertDimension(int, DimensionNameType,
long, long, boolean)}.
+ */
+@Deprecated
+public GridExtent insert(final int offset, final DimensionNameType
axisType, final long low, long high, final boolean isHighIncluded) {
+return insertDimension(offset, axisType, low, high, isHighIncluded);
+}
+
+/**
* Returns a new grid envelope with the specified dimension inserted at
the given index in this grid envelope.
* To append a new dimension after all existing dimensions, set {@code
offset} to {@link #getDimension()}.
*
@@ -1061,8 +1069,10 @@ public class GridExtent implements GridEnvelope,
LenientComparable, Serializable
* This argument does not apply to {@code low}
value, which is always inclusive.
* @return a new grid envelope with the specified dimension added.
* @throws IllegalArgumentException if the low coordinate value is greater
than the high coordinate value.
+ *
+ * @since 1.1
*/
-public GridExtent insert(final int offset, final DimensionNameType
axisType, final long low, long high, final boolean isHighIncluded) {
+public GridExtent insertDimension(final int offset, final
DimensionNameType axisType, final long low, long high, final boolean
isHighIncluded) {
final int dimension = getDimension();
ArgumentChecks.ensureBetween("offset", 0, dimension, offset);
if (!isHighIncluded) {
@@ -1231,13 +1241,21 @@ public class GridExtent implements GridEnvelope,
LenientComparable, Serializable
}
/**
+ * @deprecated Renamed {@link #reduceDimension(int...)}.
+ */
+@Deprecated
+public GridExtent reduce(int... dimensions) {
+return reduceDimension(dimensions);
+}
+
+/**
* Returns a grid extent that encompass only some dimensions of this grid
extent.
* This method copies the specified dimensions of this grid extent into a
new grid extent.
* The given dimensions must be in strictly ascending order without
duplicated values.
* The number of dimensions of the sub grid envelope will be {@code
dimensions.length}.
*
* This method performs a dimensionality reduction and can
be used as the
- * converse of {@link #insert(int, DimensionNameType, long, long,
boolean)}.
+ * converse of {@link #insertDimension(int, DimensionNameType, long, long,
boolean)}.
* This method can not be used for changing dimension order.
*
* @param dimensions the dimensions to select, in strictly increasing
order.
@@ -1246,8 +1264,10 @@ public class GridExtent implements GridEnvelope,
LenientComparable, Serializable
*
* @see #getSubspaceDimensions(int)
* @see GridGeometry#reduce(int...)
+ *
+ * @since 1.1
*/
-public GridExtent reduce(int... dimensions) {
+public GridExtent reduceDimension(int... dimensions) {
dimensions
[sis] 04/07: Use better method names for some `SQLBuilder` methods.
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 63a69747639deed1f2750469f2412fc0635a74b9
Author: Martin Desruisseaux
AuthorDate: Wed Sep 22 16:31:09 2021 +0200
Use better method names for some `SQLBuilder` methods.
---
.../java/org/apache/sis/internal/metadata/sql/SQLBuilder.java | 10 +-
.../java/org/apache/sis/metadata/sql/IdentifierGenerator.java | 2 +-
.../main/java/org/apache/sis/metadata/sql/MetadataSource.java | 2 +-
.../main/java/org/apache/sis/metadata/sql/MetadataWriter.java | 2 +-
.../org/apache/sis/internal/sql/feature/FeatureIterator.java | 2 +-
5 files changed, 9 insertions(+), 9 deletions(-)
diff --git
a/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/sql/SQLBuilder.java
b/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/sql/SQLBuilder.java
index 25f8b16..e08fdb9 100644
---
a/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/sql/SQLBuilder.java
+++
b/core/sis-metadata/src/main/java/org/apache/sis/internal/metadata/sql/SQLBuilder.java
@@ -183,13 +183,13 @@ public class SQLBuilder extends Syntax {
}
/**
- * Appends a value in a {@code SELECT} statement.
- * The {@code "="} string will be inserted before the value.
+ * Appends a {@code "= "} string in a {@code SELECT} statement.
+ * The value is written between quotes, except if it is a number or a
boolean.
*
* @param value the value to append, or {@code null}.
* @return this builder, for method call chaining.
*/
-public final SQLBuilder appendCondition(final Object value) {
+public final SQLBuilder appendEqualsValue(final Object value) {
if (value == null) {
buffer.append(" IS NULL");
return this;
@@ -243,7 +243,7 @@ public class SQLBuilder extends Syntax {
* @param value the value to append.
* @return this builder, for method call chaining.
*/
-public final SQLBuilder appendEscaped(final String value) {
+public final SQLBuilder appendWildcardEscaped(final String value) {
final StringTokenizer tokens = new StringTokenizer(value, "_%", true);
while (tokens.hasMoreTokens()) {
buffer.append(tokens.nextToken());
@@ -283,7 +283,7 @@ public class SQLBuilder extends Syntax {
*
* @return this builder, for method call chaining.
*/
-public final SQLBuilder insertDistinct() {
+public final SQLBuilder insertDistinctAfterSelect() {
assert CharSequences.startsWith(buffer, SELECT, false) : buffer;
buffer.insert(SELECT.length(), "DISTINCT ");
return this;
diff --git
a/core/sis-metadata/src/main/java/org/apache/sis/metadata/sql/IdentifierGenerator.java
b/core/sis-metadata/src/main/java/org/apache/sis/metadata/sql/IdentifierGenerator.java
index 4bc1677..aae4366 100644
---
a/core/sis-metadata/src/main/java/org/apache/sis/metadata/sql/IdentifierGenerator.java
+++
b/core/sis-metadata/src/main/java/org/apache/sis/metadata/sql/IdentifierGenerator.java
@@ -115,7 +115,7 @@ final class IdentifierGenerator implements AutoCloseable {
* @throws SQLException if an error occurred while searching for an
identifier.
*/
final String identifier(String proposal) throws SQLException {
-statement.setString(1,
buffer.clear().appendEscaped(proposal).append('%').toString());
+statement.setString(1,
buffer.clear().appendWildcardEscaped(proposal).append('%').toString());
try (ResultSet rs = statement.executeQuery()) {
if (rs.next()) {
String current = rs.getString(1);
diff --git
a/core/sis-metadata/src/main/java/org/apache/sis/metadata/sql/MetadataSource.java
b/core/sis-metadata/src/main/java/org/apache/sis/metadata/sql/MetadataSource.java
index 3326476..34b6530 100644
---
a/core/sis-metadata/src/main/java/org/apache/sis/metadata/sql/MetadataSource.java
+++
b/core/sis-metadata/src/main/java/org/apache/sis/metadata/sql/MetadataSource.java
@@ -752,7 +752,7 @@ public class MetadataSource implements AutoCloseable {
} else {
helper.append(" AND ");
}
-
helper.appendIdentifier(column).appendCondition(toStorableValue(value));
+
helper.appendIdentifier(column).appendEqualsValue(toStorableValue(value));
}
/*
* The SQL statement is ready, with metadata dependency (if any)
resolved. We can now execute it.
diff --git
a/core/sis-metadata/src/main/java/org/apache/sis/metadata/sql/MetadataWriter.java
b/core/sis-metadata/src/main/java/org/apache/sis/metadata/sql/MetadataWriter.java
index a7c8794..f7be613 100644
---
a/core/sis-metadata/src/main/java/org/apache/sis/metadata/sql/MetadataWriter.java
+++
b/core/sis-metadata/src/main/java/org/apache/sis/metadata/sql/MetadataWriter.java
@@ -663,7 +663,7
[jira] [Created] (SIS-516) Read and write filters in XML and KVP formats
Martin Desruisseaux created SIS-516: --- Summary: Read and write filters in XML and KVP formats Key: SIS-516 URL: https://issues.apache.org/jira/browse/SIS-516 Project: Spatial Information Systems Issue Type: Task Components: Features Affects Versions: 1.1 Reporter: Martin Desruisseaux The [OGC® Filter Encoding 2.0 Encoding Standard|http://docs.opengeospatial.org/is/09-026r2/09-026r2.html] standard has been used for dering a conceptual model (the set of interfaces and methods) for filters and expressions in GeoAPI and Apache SIS. But that standard defines also en encoding in XML and in Key-Value Pairs (KVP) formats. Parsing and formatting of filters in those 2 formats should be supported. Note: Common Query Language (CQL) format is the topic of a separated specification. -- This message was sent by Atlassian Jira (v8.3.4#803005)
[jira] [Resolved] (SIS-511) build failed on AArch64, Fedora 33
[
https://issues.apache.org/jira/browse/SIS-511?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
]
Martin Desruisseaux resolved SIS-511.
-
Resolution: Cannot Reproduce
Can not reproduce the issue. The error message said that
{{9}} configuration is invalid, but the actual configuration
in the root {{pom.xml}} file is {{8}} (a LTS Java version).
> build failed on AArch64, Fedora 33
> ---
>
> Key: SIS-511
> URL: https://issues.apache.org/jira/browse/SIS-511
> Project: Spatial Information Systems
> Issue Type: Bug
> Components: Build process
>Reporter: Lutz Weischer
>Assignee: Martin Desruisseaux
>Priority: Major
> Fix For: 1.1
>
>
> {noformat}
> (base) [jw@cn06 sis]$ mvn install -DskipTests
> [INFO] Scanning for projects...
> [WARNING]
> [WARNING] Some problems were encountered while building the effective model
> for org.apache.sis:parent:pom:1.1-SNAPSHOT
> [WARNING] 'parent.relativePath' of POM org.apache.sis:parent:1.1-SNAPSHOT
> (/data/jw/apache/samoa/sis/pom.xml) points at org.apache.samoa:samoa instead
> of org.apache:apache, please verify your project structure @ line 38, column
> 11
> [WARNING]
> [WARNING] It is highly recommended to fix these problems because they
> threaten the stability of your build.
> [WARNING]
> [WARNING] For this reason, future Maven versions might no longer support
> building such malformed projects.
> [WARNING]
> [INFO]
>
> [INFO] Reactor Build Order:
> [INFO]
> [INFO] Apache SIS [pom]
> [INFO] Apache SIS build helper [maven-plugin]
> [INFO] Apache SIS core modules [pom]
> [INFO] Apache SIS utilities [jar]
> [INFO] Apache SIS metadata [jar]
> [INFO] Apache SIS referencing [jar]
> [INFO] Apache SIS referencing by geographic identifiers [jar]
> [INFO] Apache SIS features [jar]
> [INFO] Apache SIS storage [pom]
> [INFO] Apache SIS common storage [jar]
> [INFO] Apache SIS portrayal [jar]
> [INFO] Apache SIS Shapefile storage [jar]
> [INFO] Apache SIS XML storage [jar]
> [INFO] Apache SIS SQL storage [jar]
> [INFO] Apache SIS netCDF storage [jar]
> [INFO] Apache SIS GeoTIFF storage [jar]
> [INFO] Apache SIS Earth Observation storage [jar]
> [INFO] Apache SIS bindings for Proj4 [jar]
> [INFO] Apache SIS applications [pom]
> [INFO] Apache SIS console [jar]
> [INFO] Apache SIS web services layer [war]
> [INFO] Bridges to Apache OpenOffice or LibreOffice [jar]
> [INFO] Apache SIS profiles [pom]
> [INFO] Apache SIS French profiles [jar]
> [INFO] Apache SIS Japanese profiles [jar]
> [INFO]
> [INFO] ---< org.apache.sis:parent
> >
> [INFO] Building Apache SIS 1.1-SNAPSHOT [1/25]
> [INFO] [ pom
> ]-
> [INFO]
> [INFO] — maven-enforcer-plugin:3.0.0-M2:enforce (enforce-maven-version) @
> parent —
> [INFO]
> [INFO] — maven-enforcer-plugin:3.0.0-M2:enforce (enforce) @ parent —
> [INFO]
> [INFO] — maven-remote-resources-plugin:1.5:process
> (process-resource-bundles) @ parent —
> [INFO]
> [INFO] — build-helper-maven-plugin:3.0.0:remove-project-artifact
> (remove-old-artifacts) @ parent —
> [INFO] /home/jw/.m2/repository/org/apache/sis/parent/1.1-SNAPSHOT removed.
> [INFO]
> [INFO] — maven-jar-plugin:3.1.2:test-jar (default) @ parent —
> [INFO] Skipping packaging of the test-jar
> [INFO]
> [INFO] — maven-site-plugin:3.7.1:attach-descriptor (attach-descriptor) @
> parent —
> [INFO] No site descriptor found: nothing to attach.
> [INFO]
> [INFO] — maven-checkstyle-plugin:3.1.0:check (default) @ parent —
> [INFO]
> [INFO] — maven-install-plugin:2.5.2:install (default-install) @ parent —
> [INFO] Installing /data/jw/apache/samoa/sis/pom.xml to
> /home/jw/.m2/repository/org/apache/sis/parent/1.1-SNAPSHOT/parent-1.1-SNAPSHOT.pom
> [INFO]
> [INFO] < org.apache.sis.core:sis-build-helper
> >
> [INFO] Building Apache SIS build helper 1.1-SNAPSHOT [2/25]
> [INFO] [ maven-plugin
> ]
> [INFO]
> [INFO] — maven-enforcer-plugin:3.0.0-M2:enforce (enforce-maven-version) @
> sis-build-helper —
> [INFO]
> [INFO] — maven-enforcer-plugin:3.0.0-M2:enforce (enforce) @ sis-build-helper
> —
> [INFO]
> [INFO] — maven-remote-resources-plugin:1.5:process
> (process-resource-bundles) @ sis-build-helper —
> [INFO]
> [INFO] — maven-resources-plugin:3.1.0:resources (default-resources) @
> sis-build-helper —
> [INFO] Using 'UTF-8' encoding to copy filtered resources.
> [INFO] Copying 5 resources
> [INFO] Copying 3 resources
> [INFO]
> [INFO] — maven-compiler-plugin:3.8.1:compile (default-compile) @
> sis-build-helper —
> [INFO] Compiling 24 source files to
[jira] [Updated] (SIS-511) build failed on AArch64, Fedora 33
[
https://issues.apache.org/jira/browse/SIS-511?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
]
Martin Desruisseaux updated SIS-511:
Component/s: Build process
Fix Version/s: 1.1
Description:
{noformat}
(base) [jw@cn06 sis]$ mvn install -DskipTests
[INFO] Scanning for projects...
[WARNING]
[WARNING] Some problems were encountered while building the effective model
for org.apache.sis:parent:pom:1.1-SNAPSHOT
[WARNING] 'parent.relativePath' of POM org.apache.sis:parent:1.1-SNAPSHOT
(/data/jw/apache/samoa/sis/pom.xml) points at org.apache.samoa:samoa instead of
org.apache:apache, please verify your project structure @ line 38, column 11
[WARNING]
[WARNING] It is highly recommended to fix these problems because they threaten
the stability of your build.
[WARNING]
[WARNING] For this reason, future Maven versions might no longer support
building such malformed projects.
[WARNING]
[INFO]
[INFO] Reactor Build Order:
[INFO]
[INFO] Apache SIS [pom]
[INFO] Apache SIS build helper [maven-plugin]
[INFO] Apache SIS core modules [pom]
[INFO] Apache SIS utilities [jar]
[INFO] Apache SIS metadata [jar]
[INFO] Apache SIS referencing [jar]
[INFO] Apache SIS referencing by geographic identifiers [jar]
[INFO] Apache SIS features [jar]
[INFO] Apache SIS storage [pom]
[INFO] Apache SIS common storage [jar]
[INFO] Apache SIS portrayal [jar]
[INFO] Apache SIS Shapefile storage [jar]
[INFO] Apache SIS XML storage [jar]
[INFO] Apache SIS SQL storage [jar]
[INFO] Apache SIS netCDF storage [jar]
[INFO] Apache SIS GeoTIFF storage [jar]
[INFO] Apache SIS Earth Observation storage [jar]
[INFO] Apache SIS bindings for Proj4 [jar]
[INFO] Apache SIS applications [pom]
[INFO] Apache SIS console [jar]
[INFO] Apache SIS web services layer [war]
[INFO] Bridges to Apache OpenOffice or LibreOffice [jar]
[INFO] Apache SIS profiles [pom]
[INFO] Apache SIS French profiles [jar]
[INFO] Apache SIS Japanese profiles [jar]
[INFO]
[INFO] ---< org.apache.sis:parent >
[INFO] Building Apache SIS 1.1-SNAPSHOT [1/25]
[INFO] [ pom ]-
[INFO]
[INFO] — maven-enforcer-plugin:3.0.0-M2:enforce (enforce-maven-version) @
parent —
[INFO]
[INFO] — maven-enforcer-plugin:3.0.0-M2:enforce (enforce) @ parent —
[INFO]
[INFO] — maven-remote-resources-plugin:1.5:process (process-resource-bundles)
@ parent —
[INFO]
[INFO] — build-helper-maven-plugin:3.0.0:remove-project-artifact
(remove-old-artifacts) @ parent —
[INFO] /home/jw/.m2/repository/org/apache/sis/parent/1.1-SNAPSHOT removed.
[INFO]
[INFO] — maven-jar-plugin:3.1.2:test-jar (default) @ parent —
[INFO] Skipping packaging of the test-jar
[INFO]
[INFO] — maven-site-plugin:3.7.1:attach-descriptor (attach-descriptor) @
parent —
[INFO] No site descriptor found: nothing to attach.
[INFO]
[INFO] — maven-checkstyle-plugin:3.1.0:check (default) @ parent —
[INFO]
[INFO] — maven-install-plugin:2.5.2:install (default-install) @ parent —
[INFO] Installing /data/jw/apache/samoa/sis/pom.xml to
/home/jw/.m2/repository/org/apache/sis/parent/1.1-SNAPSHOT/parent-1.1-SNAPSHOT.pom
[INFO]
[INFO] < org.apache.sis.core:sis-build-helper >
[INFO] Building Apache SIS build helper 1.1-SNAPSHOT [2/25]
[INFO] [ maven-plugin ]
[INFO]
[INFO] — maven-enforcer-plugin:3.0.0-M2:enforce (enforce-maven-version) @
sis-build-helper —
[INFO]
[INFO] — maven-enforcer-plugin:3.0.0-M2:enforce (enforce) @ sis-build-helper —
[INFO]
[INFO] — maven-remote-resources-plugin:1.5:process (process-resource-bundles)
@ sis-build-helper —
[INFO]
[INFO] — maven-resources-plugin:3.1.0:resources (default-resources) @
sis-build-helper —
[INFO] Using 'UTF-8' encoding to copy filtered resources.
[INFO] Copying 5 resources
[INFO] Copying 3 resources
[INFO]
[INFO] — maven-compiler-plugin:3.8.1:compile (default-compile) @
sis-build-helper —
[INFO] Compiling 24 source files to
/data/jw/apache/samoa/sis/core/sis-build-helper/target/classes
[INFO]
[INFO] Reactor Summary for Apache SIS 1.1-SNAPSHOT:
[INFO]
[INFO] Apache SIS . SUCCESS [ 6.804 s]
[INFO] Apache SIS build helper FAILURE [ 2.915 s]
[INFO] Apache SIS core modules SKIPPED
[INFO] Apache SIS utilities ... SKIPPED
[INFO] Apache SIS metadata SKIPPED
[INFO] Apache SIS referencing . SKIPPED
[INFO] Apache SIS referencing by geographic identifiers ... SKIPPED
[INFO] Apache SIS features SKIPPED
[INFO
[sis] branch geoapi-4.0 updated (8a6d8c3 -> 19acaac)
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 8a6d8c3 `MD_Scope` should be marshalled as `DQ_Scope` when writing legacy ISO 19139 document. new d4b8541 Rename the `metadata` parameter for avoiding confusion with the `metadata` field. They do not always have the same value because of the same class being used both as a `XmlAdapter` and a wrapper object. new 8d0380b Update SIS version number. new 138552b Compatibility with Java 17 and upgrade to NetBeans 12.5. new 19acaac Fix unmarshalling of . The 4 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: application/sis-console/src/main/artifact/README | 6 +- .../src/main/unopkg/build-instruction.html | 2 +- .../sis/internal/jaxb/metadata/CI_Address.java | 16 +-- .../sis/internal/jaxb/metadata/CI_Citation.java| 16 +-- .../sis/internal/jaxb/metadata/CI_Contact.java | 16 +-- .../apache/sis/internal/jaxb/metadata/CI_Date.java | 16 +-- .../internal/jaxb/metadata/CI_OnlineResource.java | 16 +-- .../sis/internal/jaxb/metadata/CI_Party.java | 16 +-- .../internal/jaxb/metadata/CI_Responsibility.java | 16 +-- .../jaxb/metadata/CI_ResponsibleParty.java | 22 ++-- .../sis/internal/jaxb/metadata/CI_Series.java | 16 +-- .../sis/internal/jaxb/metadata/CI_Telephone.java | 16 +-- .../sis/internal/jaxb/metadata/DQ_DataQuality.java | 16 +-- .../sis/internal/jaxb/metadata/DQ_Element.java | 16 +-- .../jaxb/metadata/DQ_PositionalAccuracy.java | 16 +-- .../sis/internal/jaxb/metadata/DQ_Result.java | 16 +-- .../sis/internal/jaxb/metadata/EX_Extent.java | 16 +-- .../jaxb/metadata/EX_GeographicExtent.java | 16 +-- .../internal/jaxb/metadata/EX_TemporalExtent.java | 16 +-- .../internal/jaxb/metadata/EX_VerticalExtent.java | 16 +-- .../sis/internal/jaxb/metadata/LE_Algorithm.java | 16 +-- .../jaxb/metadata/LE_NominalResolution.java| 16 +-- .../jaxb/metadata/LE_ProcessStepReport.java| 16 +-- .../sis/internal/jaxb/metadata/LE_Processing.java | 16 +-- .../sis/internal/jaxb/metadata/LI_Lineage.java | 16 +-- .../sis/internal/jaxb/metadata/LI_ProcessStep.java | 16 +-- .../sis/internal/jaxb/metadata/LI_Source.java | 16 +-- .../jaxb/metadata/MD_AggregateInformation.java | 16 +-- .../metadata/MD_ApplicationSchemaInformation.java | 16 +-- .../jaxb/metadata/MD_AssociatedResource.java | 16 +-- .../internal/jaxb/metadata/MD_AttributeGroup.java | 16 +-- .../internal/jaxb/metadata/MD_BrowseGraphic.java | 16 +-- .../sis/internal/jaxb/metadata/MD_Constraints.java | 16 +-- .../jaxb/metadata/MD_ContentInformation.java | 16 +-- .../jaxb/metadata/MD_DataIdentification.java | 16 +-- .../jaxb/metadata/MD_DigitalTransferOptions.java | 16 +-- .../sis/internal/jaxb/metadata/MD_Dimension.java | 16 +-- .../internal/jaxb/metadata/MD_Distribution.java| 16 +-- .../sis/internal/jaxb/metadata/MD_Distributor.java | 16 +-- .../metadata/MD_ExtendedElementInformation.java| 16 +-- .../internal/jaxb/metadata/MD_FeatureTypeInfo.java | 16 +-- .../sis/internal/jaxb/metadata/MD_Format.java | 16 +-- .../jaxb/metadata/MD_GeometricObjects.java | 16 +-- .../internal/jaxb/metadata/MD_Identification.java | 16 +-- .../sis/internal/jaxb/metadata/MD_Identifier.java | 16 +-- .../internal/jaxb/metadata/MD_KeywordClass.java| 16 +-- .../sis/internal/jaxb/metadata/MD_Keywords.java| 16 +-- .../jaxb/metadata/MD_MaintenanceInformation.java | 16 +-- .../sis/internal/jaxb/metadata/MD_Medium.java | 16 +-- .../sis/internal/jaxb/metadata/MD_Metadata.java| 16 +-- .../metadata/MD_MetadataExtensionInformation.java | 16 +-- .../internal/jaxb/metadata/MD_MetadataScope.java | 16 +-- .../metadata/MD_PortrayalCatalogueReference.java | 16 +-- .../internal/jaxb/metadata/MD_RangeDimension.java | 16 +-- .../internal/jaxb/metadata/MD_Releasability.java | 16 +-- .../jaxb/metadata/MD_RepresentativeFraction.java | 16 +-- .../sis/internal/jaxb/metadata/MD_Resolution.java | 16 +-- .../sis/internal/jaxb/metadata/MD_Scope.java | 16 +-- .../jaxb/metadata/MD_ScopeDescription.java | 16 +-- .../jaxb/metadata/MD_SpatialRepresentation.java| 16 +-- .../jaxb/metadata/MD_StandardOrderProcess.java | 16 +-- .../sis/internal/jaxb/metadata/MD_Usage.java | 16 +-- .../jaxb/metadata/MI_AcquisitionInformation.java | 16 +-- .../jaxb/metadata/MI_EnvironmentalRecord.java | 16 +-- .../sis/internal/jaxb/metadata/MI_Event.java | 16 +-- .../apache/sis/internal/jaxb/metadata/MI_GCP.ja
[sis] 02/04: Update SIS version number.
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 8d0380b46c1d926bf87acf475f2b4156bdecfa34 Author: Martin Desruisseaux AuthorDate: Mon Sep 20 10:58:22 2021 +0200 Update SIS version number. --- application/sis-console/src/main/artifact/README | 6 +++--- application/sis-openoffice/src/main/unopkg/build-instruction.html | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/application/sis-console/src/main/artifact/README b/application/sis-console/src/main/artifact/README index cc8330c..ec0b4ba 100644 --- a/application/sis-console/src/main/artifact/README +++ b/application/sis-console/src/main/artifact/README @@ -19,8 +19,8 @@ See http://sis.apache.org/epsg.html#command-line Unix -1) Unzip 'apache-sis-1.0-bin.zip' in any directory. -2) Add the 'apache-sis-1.0/bin' directory to the path. +1) Unzip 'apache-sis-1.1-bin.zip' in any directory. +2) Add the 'apache-sis-1.1/bin' directory to the path. 3) Invoke 'sis' on the command line. Windows @@ -28,7 +28,7 @@ Windows There is not yet 'sis.bat' file for Windows. The following steps need to be done manually: -1) Unzip 'apache-sis-1.0-bin.zip' in any directory. +1) Unzip 'apache-sis-1.1-bin.zip' in any directory. 2) Invoke 'java -jar lib/sis.jar' on the command line. diff --git a/application/sis-openoffice/src/main/unopkg/build-instruction.html b/application/sis-openoffice/src/main/unopkg/build-instruction.html index 0f6af24..1bfbd75 100644 --- a/application/sis-openoffice/src/main/unopkg/build-instruction.html +++ b/application/sis-openoffice/src/main/unopkg/build-instruction.html @@ -100,7 +100,7 @@ mvn install Test in Apache OpenOffice: Launch: cd target -unopkg add apache-sis-1.0-SNAPSHOT.oxt --log-file log.txt +unopkg add apache-sis-1.1-SNAPSHOT.oxt --log-file log.txt scalc -env:RTL_LOGFILE=log.txt If not already done, configure Java runtime with
[sis] 04/04: Fix unmarshalling of .
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 19acaac2f0002dc11fc91a92945ed772425eea80
Author: Martin Desruisseaux
AuthorDate: Wed Sep 22 12:43:35 2021 +0200
Fix unmarshalling of .
---
.../org/apache/sis/xml/RenameOnImport.lst | 1 +
.../sis/metadata/iso/content/DefaultBandTest.java | 141 +
.../apache/sis/test/suite/MetadataTestSuite.java | 1 +
3 files changed, 143 insertions(+)
diff --git
a/core/sis-metadata/src/main/resources/org/apache/sis/xml/RenameOnImport.lst
b/core/sis-metadata/src/main/resources/org/apache/sis/xml/RenameOnImport.lst
index 42ad3cf..93ead50 100644
--- a/core/sis-metadata/src/main/resources/org/apache/sis/xml/RenameOnImport.lst
+++ b/core/sis-metadata/src/main/resources/org/apache/sis/xml/RenameOnImport.lst
@@ -406,6 +406,7 @@ http://standards.iso.org/iso/19115/-3/mrc/1.0
MI_BandDefinition
MI_CoverageDescription : MD_CoverageDescription
MI_ImageDescription : MD_ImageDescription
+ MI_PolarizationOrientationCode/MI_PolarisationOrientationCode
MI_RangeElementDescription
definition
name
diff --git
a/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/content/DefaultBandTest.java
b/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/content/DefaultBandTest.java
new file mode 100644
index 000..b359fa5
--- /dev/null
+++
b/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/content/DefaultBandTest.java
@@ -0,0 +1,141 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.
+ */
+package org.apache.sis.metadata.iso.content;
+
+import javax.xml.bind.JAXBException;
+import org.opengis.metadata.content.PolarisationOrientation;
+import org.apache.sis.util.Version;
+import org.apache.sis.test.xml.TestCase;
+import org.junit.Test;
+
+import static org.apache.sis.test.MetadataAssert.*;
+
+
+/**
+ * Tests {@link DefaultBand}.
+ *
+ * @author Martin Desruisseaux (Geomatys)
+ * @version 1.1
+ * @since 1.1
+ * @module
+ */
+public final strictfp class DefaultBandTest extends TestCase {
+/**
+ * The XML fragment used for testing.
+ */
+private static final String XML =
+ "http://standards.iso.org/iso/19115/-3/mrc/1.0\";
xmlns:gco=\"http://standards.iso.org/iso/19115/-3/gco/1.0\";>\n"
++ " \n"
++ "1000\n" // Only in 2014
schema.
++ " \n"
++ " \n"
++ "10.0\n"
++ " \n"
++ " \n"
++ "http://standards.iso.org/iso/19115/resources/Codelist/cat/codelists.xml#MI_PolarisationOrientationCode\";
codeListValue=\"vertical\">"
++ "Vertical"
++ "\n"
++ " \n"
++ "\n";
+
+/**
+ * XML fragment using legacy schema. This XML contains an {@link
PolarisationOrientation} code list,
+ * which was spell with a "z" in the 2003 version of ISO 19115 standard.
This XML is used for testing
+ * that the legacy spelling is handled when (un)marshalling a legacy
document.
+ */
+private static final String XML_LEGACY =
+ "http://standards.iso.org/iso/19115/-2/gmi/1.0\";
xmlns:gco=\"http://www.isotc211.org/2005/gco\";>\n"
++ " \n"
++ "10.0\n"
++ " \n"
++ " \n"
++ "http://www.isotc211.org/2005/resources/Codelist/gmxCodelists.xml#MI_PolarisationOrientationCode\";
codeListValue=\"vertical\">" +
+"Vertical"
++ "\n"
++ " \n"
++ "\n";
+
+/**
+ * Tests marshalling a small metadata containing a {@link
PolarisationOrientation}.
+ *
+ * @throws JAXBException if an error occurred during XML marshalling.
+ */
+@Test
+public void testMarshalling() throws JAXBException {
+marshal(VERSION_2014, XML);
+}
+
+/**
+ * Tests marshalling a small metadata in legacy XML schema.
+ *
+ * @throws JAXBException if an error occurred during XML marshalling.
+ */
+@Test
+public void testMarshallingLegacy() throws JAXBException {
+marshal(VERSIO
[sis] 03/04: Compatibility with Java 17 and upgrade to NetBeans 12.5.
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 138552bb4d484ed98850b22d91da3a37f76c7e5e
Author: Martin Desruisseaux
AuthorDate: Wed Sep 22 12:08:57 2021 +0200
Compatibility with Java 17 and upgrade to NetBeans 12.5.
---
ide-project/NetBeans/nbproject/build-impl.xml | 4 ++--
ide-project/NetBeans/nbproject/genfiles.properties| 4 ++--
.../src/main/java/org/apache/sis/storage/netcdf/AttributeNames.java | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/ide-project/NetBeans/nbproject/build-impl.xml
b/ide-project/NetBeans/nbproject/build-impl.xml
index a00a7f6..26f5723 100644
--- a/ide-project/NetBeans/nbproject/build-impl.xml
+++ b/ide-project/NetBeans/nbproject/build-impl.xml
@@ -46,8 +46,8 @@ is divided into following sections:
-
-
+
+
diff --git a/ide-project/NetBeans/nbproject/genfiles.properties
b/ide-project/NetBeans/nbproject/genfiles.properties
index 8278bf2..c909012 100644
--- a/ide-project/NetBeans/nbproject/genfiles.properties
+++ b/ide-project/NetBeans/nbproject/genfiles.properties
@@ -4,5 +4,5 @@ build.xml.data.CRC32=58e6b21c
build.xml.script.CRC32=462eaba0
build.xml.stylesheet.CRC32=28e38971@1.53.1.46
nbproject/build-impl.xml.data.CRC32=7361a050
-nbproject/build-impl.xml.script.CRC32=ec6b192e
-nbproject/build-impl.xml.stylesheet.CRC32=d549e5cc@1.99.0.48
+nbproject/build-impl.xml.script.CRC32=6b1e829a
+nbproject/build-impl.xml.stylesheet.CRC32=12e0a6c2@1.100.0.48
diff --git
a/storage/sis-netcdf/src/main/java/org/apache/sis/storage/netcdf/AttributeNames.java
b/storage/sis-netcdf/src/main/java/org/apache/sis/storage/netcdf/AttributeNames.java
index 9310d27..1c6591a 100644
---
a/storage/sis-netcdf/src/main/java/org/apache/sis/storage/netcdf/AttributeNames.java
+++
b/storage/sis-netcdf/src/main/java/org/apache/sis/storage/netcdf/AttributeNames.java
@@ -59,7 +59,7 @@ import org.opengis.metadata.extent.GeographicDescription;
*
*
* List of all netCDF attributes
- *
+ *
* {@value #ACCESS_CONSTRAINT}
* {@value #ACKNOWLEDGEMENT}
* {@value #COMMENT}
