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 2015/08/13 21:37:38 UTC
svn commit: r1695764 - in /sis/trunk: ./ core/sis-metadata/
core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/constraint/
core/sis-referencing/
core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/
core/sis-referencing/src/ma...
Author: desruisseaux
Date: Thu Aug 13 19:37:38 2015
New Revision: 1695764
URL: http://svn.apache.org/r1695764
Log:
Merge from JDK6 branch:
- OSGi configuration
- GIGS tests: omitted because GIGS tests are not available in GeoAPI 3.0.
- Checkstyle rules: omitted from the JDK6 branch because Checkstyle requires a higher JDK version.
Added:
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/package-info.java
- copied unchanged from r1695760, sis/branches/JDK6/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/package-info.java
Modified:
sis/trunk/ (props changed)
sis/trunk/core/sis-metadata/pom.xml
sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/constraint/DefaultConstraints.java
sis/trunk/core/sis-referencing/pom.xml
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/GeodeticObjectFactory.java
sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/ConcatenatedTransform.java
sis/trunk/core/sis-utility/pom.xml
sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/Utilities.java
sis/trunk/ide-project/NetBeans/nbproject/project.properties
sis/trunk/pom.xml
sis/trunk/profiles/sis-french-profile/pom.xml
sis/trunk/storage/sis-netcdf/pom.xml
sis/trunk/storage/sis-shapefile/src/main/resources/org/apache/sis/internal/shapefile/jdbc/AbstractJDBC_fr.properties
sis/trunk/storage/sis-shapefile/src/main/resources/org/apache/sis/internal/shapefile/jdbc/DBase3FieldDescriptor_fr.properties
sis/trunk/storage/sis-shapefile/src/main/resources/org/apache/sis/internal/shapefile/jdbc/resultset/AbstractResultSet.properties
sis/trunk/storage/sis-shapefile/src/main/resources/org/apache/sis/internal/shapefile/jdbc/resultset/AbstractResultSet_fr.properties
sis/trunk/storage/sis-storage/pom.xml
Propchange: sis/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Aug 13 19:37:38 2015
@@ -1,4 +1,4 @@
/sis/branches/Android:1430670-1480699
-/sis/branches/JDK6:1394364-1693911
-/sis/branches/JDK7:1394913-1693908
-/sis/branches/JDK8:1584960-1693906
+/sis/branches/JDK6:1394364-1695760
+/sis/branches/JDK7:1394913-1695758
+/sis/branches/JDK8:1584960-1695754
Modified: sis/trunk/core/sis-metadata/pom.xml
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/pom.xml?rev=1695764&r1=1695763&r2=1695764&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/pom.xml (original)
+++ sis/trunk/core/sis-metadata/pom.xml Thu Aug 13 19:37:38 2015
@@ -116,6 +116,11 @@ Implementations of metadata derived from
<configuration>
<instructions>
<Bundle-SymbolicName>org.apache.sis.metadata</Bundle-SymbolicName>
+ <Export-Package>org.apache.sis.internal.jaxb.metadata, *</Export-Package>
+ <Require-Capability>osgi.extender;
+ filter:="(osgi.extender=osgi.serviceloader.registrar)"</Require-Capability>
+ <Provide-Capability>osgi.serviceloader;
+ osgi.serviceloader=org.apache.sis.internal.jaxb.TypeRegistration</Provide-Capability>
</instructions>
</configuration>
</plugin>
Modified: sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/constraint/DefaultConstraints.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/constraint/DefaultConstraints.java?rev=1695764&r1=1695763&r2=1695764&view=diff
==============================================================================
--- sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/constraint/DefaultConstraints.java [UTF-8] (original)
+++ sis/trunk/core/sis-metadata/src/main/java/org/apache/sis/metadata/iso/constraint/DefaultConstraints.java [UTF-8] Thu Aug 13 19:37:38 2015
@@ -201,7 +201,7 @@ public class DefaultConstraints extends
*
* @param newValues The new use limitations.
*/
- public void setUseLimitations(final Collection< ? extends InternationalString> newValues) {
+ public void setUseLimitations(final Collection<? extends InternationalString> newValues) {
useLimitations = writeCollection(newValues, useLimitations, InternationalString.class);
}
Modified: sis/trunk/core/sis-referencing/pom.xml
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/pom.xml?rev=1695764&r1=1695763&r2=1695764&view=diff
==============================================================================
--- sis/trunk/core/sis-referencing/pom.xml (original)
+++ sis/trunk/core/sis-referencing/pom.xml Thu Aug 13 19:37:38 2015
@@ -86,6 +86,11 @@ Implementations of Coordinate Reference
<configuration>
<instructions>
<Bundle-SymbolicName>org.apache.sis.referencing</Bundle-SymbolicName>
+ <Export-Package>org.apache.sis.internal.referencing, *</Export-Package>
+ <Require-Capability>osgi.extender;
+ filter:="(osgi.extender=osgi.serviceloader.registrar)"</Require-Capability>
+ <Provide-Capability>osgi.serviceloader;
+ osgi.serviceloader=org.apache.sis.internal.jaxb.TypeRegistration; osgi.serviceloader=org.apache.sis.internal.jaxb.AdapterReplacement,org.opengis.referencing.operation.MathTransformFactory,org.opengis.referencing.operation.OperationMethod,org.opengis.temporal.TemporalFactory</Provide-Capability>
</instructions>
</configuration>
</plugin>
Modified: sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/GeodeticObjectFactory.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/GeodeticObjectFactory.java?rev=1695764&r1=1695763&r2=1695764&view=diff
==============================================================================
--- sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/GeodeticObjectFactory.java [UTF-8] (original)
+++ sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/factory/GeodeticObjectFactory.java [UTF-8] Thu Aug 13 19:37:38 2015
@@ -43,7 +43,9 @@ import org.opengis.referencing.operation
import org.apache.sis.referencing.cs.*;
import org.apache.sis.referencing.crs.*;
import org.apache.sis.referencing.datum.*;
+import org.apache.sis.referencing.NamedIdentifier;
import org.apache.sis.referencing.IdentifiedObjects;
+import org.apache.sis.referencing.AbstractReferenceSystem;
import org.apache.sis.referencing.AbstractIdentifiedObject;
import org.apache.sis.internal.metadata.ReferencingServices;
import org.apache.sis.internal.referencing.MergedProperties;
Modified: sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/ConcatenatedTransform.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/ConcatenatedTransform.java?rev=1695764&r1=1695763&r2=1695764&view=diff
==============================================================================
--- sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/ConcatenatedTransform.java [UTF-8] (original)
+++ sis/trunk/core/sis-referencing/src/main/java/org/apache/sis/referencing/operation/transform/ConcatenatedTransform.java [UTF-8] Thu Aug 13 19:37:38 2015
@@ -66,11 +66,8 @@ class ConcatenatedTransform extends Abst
/**
* Tolerance threshold for considering a matrix as identity. Since the value used here is smaller
- * than 1 ULP (about 2.22E-16), it applies only the the zero terms in the matrix. The terms on the
+ * than 1 ULP (about 2.22E-16), it applies only to the zero terms in the matrix. The terms on the
* diagonal are still expected to be exactly 1.
- *
- * @deprecated Try to remove completely this tolerance threshold after we applied double-double arithmetic
- * to all matrices.
*/
private static final double IDENTITY_TOLERANCE = 1E-16;
Modified: sis/trunk/core/sis-utility/pom.xml
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/pom.xml?rev=1695764&r1=1695763&r2=1695764&view=diff
==============================================================================
--- sis/trunk/core/sis-utility/pom.xml (original)
+++ sis/trunk/core/sis-utility/pom.xml Thu Aug 13 19:37:38 2015
@@ -136,6 +136,15 @@ Miscellaneous utilities.
<instructions>
<Bundle-SymbolicName>org.apache.sis.util</Bundle-SymbolicName>
<Bundle-Activator>org.apache.sis.internal.system.OSGiActivator</Bundle-Activator>
+ <Export-Package>*</Export-Package>
+ <Require-Capability>
+ osgi.extender;
+ filter:="(osgi.extender=osgi.serviceloader.registrar)",
+ osgi.serviceloader;
+ ;cardinality:=multiple,osgi.extender;
+ filter:="(osgi.extender=osgi.serviceloader.processor)"
+ </Require-Capability>
+ <SPI-Producer>*</SPI-Producer>
</instructions>
</configuration>
</plugin>
Modified: sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/Utilities.java
URL: http://svn.apache.org/viewvc/sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/Utilities.java?rev=1695764&r1=1695763&r2=1695764&view=diff
==============================================================================
--- sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/Utilities.java [UTF-8] (original)
+++ sis/trunk/core/sis-utility/src/main/java/org/apache/sis/util/Utilities.java [UTF-8] Thu Aug 13 19:37:38 2015
@@ -55,8 +55,8 @@ public final class Utilities extends Sta
*
* <li>If the two given objects are
* {@linkplain org.apache.sis.referencing.crs.AbstractCRS Coordinate Reference Systems} (CRS), then a call to
- * <code>{@linkplain org.apache.sis.referencing.CRS#findMathTransform findMathTransform}(crs1, crs2)</code>
- * will return an identity transform.</li>
+ * <code>{@linkplain org.apache.sis.referencing.CRS#findOperation findOperation}(crs1, crs2)</code>
+ * will return an identity operation.</li>
* </ul>
*
* If a more lenient comparison allowing slight differences in numerical values is wanted,
@@ -92,8 +92,8 @@ public final class Utilities extends Sta
*
* <li>If the two given objects are
* {@linkplain org.apache.sis.referencing.crs.AbstractCRS Coordinate Reference Systems} (CRS), then a call to
- * <code>{@linkplain org.apache.sis.referencing.CRS#findMathTransform findMathTransform}(crs1, crs2)</code>
- * will return a transform close to the identity transform.</li>
+ * <code>{@linkplain org.apache.sis.referencing.CRS#findOperation findOperation}(crs1, crs2)</code>
+ * will return an operation close to identity.</li>
* </ul>
*
* <div class="section">Implementation note</div>
Modified: sis/trunk/ide-project/NetBeans/nbproject/project.properties
URL: http://svn.apache.org/viewvc/sis/trunk/ide-project/NetBeans/nbproject/project.properties?rev=1695764&r1=1695763&r2=1695764&view=diff
==============================================================================
--- sis/trunk/ide-project/NetBeans/nbproject/project.properties [ISO-8859-1] (original)
+++ sis/trunk/ide-project/NetBeans/nbproject/project.properties [ISO-8859-1] Thu Aug 13 19:37:38 2015
@@ -74,7 +74,7 @@ geoapi.version = 3.0.0
unit-api.version = 0.6.1
jsr275.version = 0.9.3
jama.version = 1.0.3
-geometry.version = 1.2
+geometry.version = 1.2.1
georss.version = 0.9.8
rome.version = 0.9
jdom1.version = 1.0
@@ -85,7 +85,7 @@ netcdf.version = 4.4.2
joda-time.version = 2.2
httpclient.version = 4.2.6
slf4j.version = 1.7.5
-junit.version = 4.11
+junit.version = 4.12
hamcrest.version = 1.3
jaxb-ns-mapper = 2.2.4
Modified: sis/trunk/pom.xml
URL: http://svn.apache.org/viewvc/sis/trunk/pom.xml?rev=1695764&r1=1695763&r2=1695764&view=diff
==============================================================================
--- sis/trunk/pom.xml (original)
+++ sis/trunk/pom.xml Thu Aug 13 19:37:38 2015
@@ -341,7 +341,7 @@ Apache SIS is a free software, Java lang
<dependency>
<groupId>com.esri.geometry</groupId>
<artifactId>esri-geometry-api</artifactId>
- <version>1.2</version>
+ <version>1.2.1</version>
</dependency>
<dependency>
<groupId>gov.nist.math</groupId>
@@ -553,9 +553,10 @@ Apache SIS is a free software, Java lang
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>2.4.0</version>
+ <version>2.5.0</version>
<extensions>true</extensions>
<configuration>
+ <excludeDependencies>true</excludeDependencies>
<instructions>
<Bundle-DocURL>${project.url}</Bundle-DocURL>
</instructions>
@@ -563,42 +564,12 @@ Apache SIS is a free software, Java lang
</plugin>
<!-- Checkstype configuration
- Legal note: Checkstyle is under LGPL license, but it is okay to use it only for
- the build if it is downloaded by Maven (not included in Apache SIS distribution).
- See http://www.apache.org/legal/resolved.html#prohibited
- -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <version>2.13</version>
- <executions>
- <execution>
- <goals>
- <goal>check</goal>
- </goals>
- <configuration>
- <skip>${skipTests}</skip> <!-- When skipping tests, skip also checkstyle verification. -->
- <encoding>${project.build.sourceEncoding}</encoding>
- <consoleOutput>true</consoleOutput>
- <checkstyleRules>
- <module name="Checker">
- <module name="FileTabCharacter"/> <!-- Checks that there are no tab characters in the file. -->
-<!-- <module name="NewlineAtEndOfFile"/> <!- Checks that there is a newline at the end of each file. ->
- <module name="TreeWalker">
- <module name="RedundantImport"/> <!- Checks for redundant import statements. ->
- <module name="GenericWhitespace"/> <!- Checks that the whitespace around the Generic tokens follow the typical convention. ->
- </module> -->
- </module>
- </checkstyleRules>
- </configuration>
- </execution>
- </executions>
- </plugin>
+ Omitted from the JDK6 branch because Checkstyle requires a higher JDK version. -->
<!-- JavaDoc configuration. -->
<plugin>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.10.1</version>
+ <version>2.10.3</version>
<configuration>
<source>${maven.compile.source}</source> <!-- Enables javadoc to handle language constructs present in target JDK. -->
<encoding>${project.build.sourceEncoding}</encoding> <!-- Encoding of Java source file. -->
@@ -636,11 +607,11 @@ Apache SIS is a free software, Java lang
</group>
<group>
<title>Referencing</title>
- <packages>org.apache.sis.referencing*:org.apache.sis.parameter*</packages>
+ <packages>org.apache.sis.referencing*:org.apache.sis.parameter*:org.apache.sis.distance*</packages>
</group>
<group>
<title>Metadata</title>
- <packages>org.apache.sis.metadata*</packages>
+ <packages>org.apache.sis.metadata*:org.apache.sis.io.wkt</packages>
</group>
<group>
<title>Utilities</title>
Modified: sis/trunk/profiles/sis-french-profile/pom.xml
URL: http://svn.apache.org/viewvc/sis/trunk/profiles/sis-french-profile/pom.xml?rev=1695764&r1=1695763&r2=1695764&view=diff
==============================================================================
--- sis/trunk/profiles/sis-french-profile/pom.xml (original)
+++ sis/trunk/profiles/sis-french-profile/pom.xml Thu Aug 13 19:37:38 2015
@@ -97,6 +97,7 @@ Extensions to ISO-19115 metadata mandate
<configuration>
<instructions>
<Bundle-SymbolicName>org.apache.sis.metadata.fra</Bundle-SymbolicName>
+ <Export-Package>*</Export-Package>
</instructions>
</configuration>
</plugin>
Modified: sis/trunk/storage/sis-netcdf/pom.xml
URL: http://svn.apache.org/viewvc/sis/trunk/storage/sis-netcdf/pom.xml?rev=1695764&r1=1695763&r2=1695764&view=diff
==============================================================================
--- sis/trunk/storage/sis-netcdf/pom.xml (original)
+++ sis/trunk/storage/sis-netcdf/pom.xml Thu Aug 13 19:37:38 2015
@@ -96,6 +96,7 @@ Bridge between NetCDF Climate and Foreca
<configuration>
<instructions>
<Bundle-SymbolicName>org.apache.sis.storage.netcdf</Bundle-SymbolicName>
+ <Import-Package>!ucar.*, *</Import-Package>
</instructions>
</configuration>
</plugin>
Modified: sis/trunk/storage/sis-shapefile/src/main/resources/org/apache/sis/internal/shapefile/jdbc/AbstractJDBC_fr.properties
URL: http://svn.apache.org/viewvc/sis/trunk/storage/sis-shapefile/src/main/resources/org/apache/sis/internal/shapefile/jdbc/AbstractJDBC_fr.properties?rev=1695764&r1=1695763&r2=1695764&view=diff
==============================================================================
--- sis/trunk/storage/sis-shapefile/src/main/resources/org/apache/sis/internal/shapefile/jdbc/AbstractJDBC_fr.properties [ISO-8859-1] (original)
+++ sis/trunk/storage/sis-shapefile/src/main/resources/org/apache/sis/internal/shapefile/jdbc/AbstractJDBC_fr.properties [ISO-8859-1] Thu Aug 13 19:37:38 2015
@@ -0,0 +1 @@
+
Modified: sis/trunk/storage/sis-shapefile/src/main/resources/org/apache/sis/internal/shapefile/jdbc/DBase3FieldDescriptor_fr.properties
URL: http://svn.apache.org/viewvc/sis/trunk/storage/sis-shapefile/src/main/resources/org/apache/sis/internal/shapefile/jdbc/DBase3FieldDescriptor_fr.properties?rev=1695764&r1=1695763&r2=1695764&view=diff
==============================================================================
--- sis/trunk/storage/sis-shapefile/src/main/resources/org/apache/sis/internal/shapefile/jdbc/DBase3FieldDescriptor_fr.properties [ISO-8859-1] (original)
+++ sis/trunk/storage/sis-shapefile/src/main/resources/org/apache/sis/internal/shapefile/jdbc/DBase3FieldDescriptor_fr.properties [ISO-8859-1] Thu Aug 13 19:37:38 2015
@@ -0,0 +1 @@
+
Modified: sis/trunk/storage/sis-shapefile/src/main/resources/org/apache/sis/internal/shapefile/jdbc/resultset/AbstractResultSet.properties
URL: http://svn.apache.org/viewvc/sis/trunk/storage/sis-shapefile/src/main/resources/org/apache/sis/internal/shapefile/jdbc/resultset/AbstractResultSet.properties?rev=1695764&r1=1695763&r2=1695764&view=diff
==============================================================================
--- sis/trunk/storage/sis-shapefile/src/main/resources/org/apache/sis/internal/shapefile/jdbc/resultset/AbstractResultSet.properties [ISO-8859-1] (original)
+++ sis/trunk/storage/sis-shapefile/src/main/resources/org/apache/sis/internal/shapefile/jdbc/resultset/AbstractResultSet.properties [ISO-8859-1] Thu Aug 13 19:37:38 2015
@@ -0,0 +1 @@
+
Modified: sis/trunk/storage/sis-shapefile/src/main/resources/org/apache/sis/internal/shapefile/jdbc/resultset/AbstractResultSet_fr.properties
URL: http://svn.apache.org/viewvc/sis/trunk/storage/sis-shapefile/src/main/resources/org/apache/sis/internal/shapefile/jdbc/resultset/AbstractResultSet_fr.properties?rev=1695764&r1=1695763&r2=1695764&view=diff
==============================================================================
--- sis/trunk/storage/sis-shapefile/src/main/resources/org/apache/sis/internal/shapefile/jdbc/resultset/AbstractResultSet_fr.properties [ISO-8859-1] (original)
+++ sis/trunk/storage/sis-shapefile/src/main/resources/org/apache/sis/internal/shapefile/jdbc/resultset/AbstractResultSet_fr.properties [ISO-8859-1] Thu Aug 13 19:37:38 2015
@@ -0,0 +1 @@
+
Modified: sis/trunk/storage/sis-storage/pom.xml
URL: http://svn.apache.org/viewvc/sis/trunk/storage/sis-storage/pom.xml?rev=1695764&r1=1695763&r2=1695764&view=diff
==============================================================================
--- sis/trunk/storage/sis-storage/pom.xml (original)
+++ sis/trunk/storage/sis-storage/pom.xml Thu Aug 13 19:37:38 2015
@@ -109,6 +109,7 @@ Provides the interfaces and base classes
<configuration>
<instructions>
<Bundle-SymbolicName>org.apache.sis.storage</Bundle-SymbolicName>
+ <Export-Package>org.apache.sis.internal.storage; x-friends=org.apache.sis.storage.netcdf, *</Export-Package>
</instructions>
</configuration>
</plugin>