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 16b8ea256133740743af4081aab9225a2154baef
Author: Martin Desruisseaux <martin.desruisseaux@geomatys.com>
AuthorDate: Mon Jun 3 17:13:08 2019 +0200
Move netCDF extensions GCOM_C and GCOM_W into a new "sis-japan-profile" module.
https://lists.apache.org/thread.html/95edcfee0b4029b7ceb37f587c9c03f37d9dda4594639bd7abe3d21a@%3Cdev.sis.apache.org%3E
---
ide-project/NetBeans/nbproject/build-impl.xml | 47 ++++++++++++++------
ide-project/NetBeans/nbproject/genfiles.properties | 6 +--
ide-project/NetBeans/nbproject/project.properties | 2 +
ide-project/NetBeans/nbproject/project.xml | 2 +
profiles/pom.xml | 1 +
.../sis-japan-profile}/pom.xml | 51 +++-------------------
.../apache/sis/internal/earth/netcdf/GCOM_C.java | 0
.../apache/sis/internal/earth/netcdf/GCOM_W.java | 0
.../sis/internal/earth/netcdf/package-info.java | 0
.../org.apache.sis.internal.netcdf.Convention | 0
storage/sis-earth-observation/pom.xml | 6 ---
11 files changed, 47 insertions(+), 68 deletions(-)
diff --git a/ide-project/NetBeans/nbproject/build-impl.xml b/ide-project/NetBeans/nbproject/build-impl.xml
index 1fdcce1..09fea23 100644
--- a/ide-project/NetBeans/nbproject/build-impl.xml
+++ b/ide-project/NetBeans/nbproject/build-impl.xml
@@ -90,7 +90,7 @@ is divided into following sections:
</not>
</condition>
</fail>
- <j2seproject3:modulename property="module.name" sourcepath="${src.local-src.dir}:${src.webapp.dir}:${src.javafx.dir}:${src.console.dir}:${src.portrayal.dir}:${src.earth-obs.dir}:${src.geotiff.dir}:${src.netcdf.dir}:${src.shapefile.dir}:${src.sql.dir}:${src.xmlstore.dir}:${src.storage.dir}:${src.feature.dir}:${src.raster.dir}:${src.referencing.dir}:${src.ref-by-id.dir}:${src.metadata.dir}:${src.utility.dir}:${src.fra-profile.dir}:${src.gdal.dir}:${src.c.gdal.dir}"/>
+ <j2seproject3:modulename property="module.name" sourcepath="${src.local-src.dir}:${src.webapp.dir}:${src.javafx.dir}:${src.console.dir}:${src.portrayal.dir}:${src.earth-obs.dir}:${src.geotiff.dir}:${src.netcdf.dir}:${src.shapefile.dir}:${src.sql.dir}:${src.xmlstore.dir}:${src.storage.dir}:${src.feature.dir}:${src.raster.dir}:${src.referencing.dir}:${src.ref-by-id.dir}:${src.metadata.dir}:${src.utility.dir}:${src.fra-profile.dir}:${src.jpn-profile.dir}:${src.gdal.dir}:${src.c.gdal
[...]
<condition property="named.module.internal">
<and>
<isset property="module.name"/>
@@ -210,6 +210,7 @@ is divided into following sections:
<available file="${test.metadata.dir}"/>
<available file="${test.utility.dir}"/>
<available file="${test.fra-profile.dir}"/>
+ <available file="${test.jpn-profile.dir}"/>
<available file="${test.gdal.dir}"/>
</or>
</condition>
@@ -234,6 +235,7 @@ is divided into following sections:
<available file="${src.metadata.dir}"/>
<available file="${src.utility.dir}"/>
<available file="${src.fra-profile.dir}"/>
+ <available file="${src.jpn-profile.dir}"/>
<available file="${src.gdal.dir}"/>
<available file="${src.c.gdal.dir}"/>
</or>
@@ -357,6 +359,7 @@ is divided into following sections:
<fail unless="src.metadata.dir">Must set src.metadata.dir</fail>
<fail unless="src.utility.dir">Must set src.utility.dir</fail>
<fail unless="src.fra-profile.dir">Must set src.fra-profile.dir</fail>
+ <fail unless="src.jpn-profile.dir">Must set src.jpn-profile.dir</fail>
<fail unless="src.gdal.dir">Must set src.gdal.dir</fail>
<fail unless="src.c.gdal.dir">Must set src.c.gdal.dir</fail>
<fail unless="test.webapp.dir">Must set test.webapp.dir</fail>
@@ -377,6 +380,7 @@ is divided into following sections:
<fail unless="test.metadata.dir">Must set test.metadata.dir</fail>
<fail unless="test.utility.dir">Must set test.utility.dir</fail>
<fail unless="test.fra-profile.dir">Must set test.fra-profile.dir</fail>
+ <fail unless="test.jpn-profile.dir">Must set test.jpn-profile.dir</fail>
<fail unless="test.gdal.dir">Must set test.gdal.dir</fail>
<fail unless="build.dir">Must set build.dir</fail>
<fail unless="dist.dir">Must set dist.dir</fail>
@@ -398,7 +402,7 @@ is divided into following sections:
</target>
<target depends="-init-ap-cmdline-properties,-init-source-module-properties" if="modules.supported.internal"
name="-init-macrodef-javac-with-module">
<macrodef name="javac" uri="http://www.netbeans.org/ns/j2se-project/3">
- <attribute default="${src.local-src.dir}:${src.webapp.dir}:${src.javafx.dir}:${src.console.dir}:${src.portrayal.dir}:${src.earth-obs.dir}:${src.geotiff.dir}:${src.netcdf.dir}:${src.shapefile.dir}:${src.sql.dir}:${src.xmlstore.dir}:${src.storage.dir}:${src.feature.dir}:${src.raster.dir}:${src.referencing.dir}:${src.ref-by-id.dir}:${src.metadata.dir}:${src.utility.dir}:${src.fra-profile.dir}:${src.gdal.dir}:${src.c.gdal.dir}"
name="srcdir"/>
+ <attribute default="${src.local-src.dir}:${src.webapp.dir}:${src.javafx.dir}:${src.console.dir}:${src.portrayal.dir}:${src.earth-obs.dir}:${src.geotiff.dir}:${src.netcdf.dir}:${src.shapefile.dir}:${src.sql.dir}:${src.xmlstore.dir}:${src.storage.dir}:${src.feature.dir}:${src.raster.dir}:${src.referencing.dir}:${src.ref-by-id.dir}:${src.metadata.dir}:${src.utility.dir}:${src.fra-profile.dir}:${src.jpn-profile.dir}:${src.gdal.dir}:${src.c.gdal.dir}"
name="srcdir"/>
<attribute default="${build.classes.dir}" name="destdir"/>
<attribute default="${javac.classpath}" name="classpath"/>
<attribute default="${javac.modulepath}" name="modulepath"/>
@@ -410,7 +414,7 @@ is divided into following sections:
<attribute default="${excludes}" name="excludes"/>
<attribute default="${javac.debug}" name="debug"/>
<attribute default="${empty.dir}" name="sourcepath" unless:set="named.module.internal"/>
- <attribute default="${src.local-src.dir}:${src.webapp.dir}:${src.javafx.dir}:${src.console.dir}:${src.portrayal.dir}:${src.earth-obs.dir}:${src.geotiff.dir}:${src.netcdf.dir}:${src.shapefile.dir}:${src.sql.dir}:${src.xmlstore.dir}:${src.storage.dir}:${src.feature.dir}:${src.raster.dir}:${src.referencing.dir}:${src.ref-by-id.dir}:${src.metadata.dir}:${src.utility.dir}:${src.fra-profile.dir}:${src.gdal.dir}:${src.c.gdal.dir}"
if:set="named.module.internal" name="sourcepath"/>
+ <attribute default="${src.local-src.dir}:${src.webapp.dir}:${src.javafx.dir}:${src.console.dir}:${src.portrayal.dir}:${src.earth-obs.dir}:${src.geotiff.dir}:${src.netcdf.dir}:${src.shapefile.dir}:${src.sql.dir}:${src.xmlstore.dir}:${src.storage.dir}:${src.feature.dir}:${src.raster.dir}:${src.referencing.dir}:${src.ref-by-id.dir}:${src.metadata.dir}:${src.utility.dir}:${src.fra-profile.dir}:${src.jpn-profile.dir}:${src.gdal.dir}:${src.c.gdal.dir}"
if:set="named.module.internal [...]
<attribute default="${empty.dir}" name="gensrcdir"/>
<element name="customize" optional="true"/>
<sequential>
@@ -465,7 +469,7 @@ is divided into following sections:
</target>
<target depends="-init-ap-cmdline-properties,-init-source-module-properties" if="ap.supported.internal"
name="-init-macrodef-javac-with-processors" unless="modules.supported.internal">
<macrodef name="javac" uri="http://www.netbeans.org/ns/j2se-project/3">
- <attribute default="${src.local-src.dir}:${src.webapp.dir}:${src.javafx.dir}:${src.console.dir}:${src.portrayal.dir}:${src.earth-obs.dir}:${src.geotiff.dir}:${src.netcdf.dir}:${src.shapefile.dir}:${src.sql.dir}:${src.xmlstore.dir}:${src.storage.dir}:${src.feature.dir}:${src.raster.dir}:${src.referencing.dir}:${src.ref-by-id.dir}:${src.metadata.dir}:${src.utility.dir}:${src.fra-profile.dir}:${src.gdal.dir}:${src.c.gdal.dir}"
name="srcdir"/>
+ <attribute default="${src.local-src.dir}:${src.webapp.dir}:${src.javafx.dir}:${src.console.dir}:${src.portrayal.dir}:${src.earth-obs.dir}:${src.geotiff.dir}:${src.netcdf.dir}:${src.shapefile.dir}:${src.sql.dir}:${src.xmlstore.dir}:${src.storage.dir}:${src.feature.dir}:${src.raster.dir}:${src.referencing.dir}:${src.ref-by-id.dir}:${src.metadata.dir}:${src.utility.dir}:${src.fra-profile.dir}:${src.jpn-profile.dir}:${src.gdal.dir}:${src.c.gdal.dir}"
name="srcdir"/>
<attribute default="${build.classes.dir}" name="destdir"/>
<attribute default="${javac.classpath}" name="classpath"/>
<attribute default="${javac.modulepath}" name="modulepath"/>
@@ -508,7 +512,7 @@ is divided into following sections:
</target>
<target depends="-init-ap-cmdline-properties,-init-source-module-properties" name="-init-macrodef-javac-without-processors"
unless="ap.supported.internal">
<macrodef name="javac" uri="http://www.netbeans.org/ns/j2se-project/3">
- <attribute default="${src.local-src.dir}:${src.webapp.dir}:${src.javafx.dir}:${src.console.dir}:${src.portrayal.dir}:${src.earth-obs.dir}:${src.geotiff.dir}:${src.netcdf.dir}:${src.shapefile.dir}:${src.sql.dir}:${src.xmlstore.dir}:${src.storage.dir}:${src.feature.dir}:${src.raster.dir}:${src.referencing.dir}:${src.ref-by-id.dir}:${src.metadata.dir}:${src.utility.dir}:${src.fra-profile.dir}:${src.gdal.dir}:${src.c.gdal.dir}"
name="srcdir"/>
+ <attribute default="${src.local-src.dir}:${src.webapp.dir}:${src.javafx.dir}:${src.console.dir}:${src.portrayal.dir}:${src.earth-obs.dir}:${src.geotiff.dir}:${src.netcdf.dir}:${src.shapefile.dir}:${src.sql.dir}:${src.xmlstore.dir}:${src.storage.dir}:${src.feature.dir}:${src.raster.dir}:${src.referencing.dir}:${src.ref-by-id.dir}:${src.metadata.dir}:${src.utility.dir}:${src.fra-profile.dir}:${src.jpn-profile.dir}:${src.gdal.dir}:${src.c.gdal.dir}"
name="srcdir"/>
<attribute default="${build.classes.dir}" name="destdir"/>
<attribute default="${javac.classpath}" name="classpath"/>
<attribute default="${javac.modulepath}" name="modulepath"/>
@@ -543,7 +547,7 @@ is divided into following sections:
</target>
<target depends="-init-macrodef-javac-with-module,-init-macrodef-javac-with-processors,-init-macrodef-javac-without-processors"
name="-init-macrodef-javac">
<macrodef name="depend" uri="http://www.netbeans.org/ns/j2se-project/3">
- <attribute default="${src.local-src.dir}:${src.webapp.dir}:${src.javafx.dir}:${src.console.dir}:${src.portrayal.dir}:${src.earth-obs.dir}:${src.geotiff.dir}:${src.netcdf.dir}:${src.shapefile.dir}:${src.sql.dir}:${src.xmlstore.dir}:${src.storage.dir}:${src.feature.dir}:${src.raster.dir}:${src.referencing.dir}:${src.ref-by-id.dir}:${src.metadata.dir}:${src.utility.dir}:${src.fra-profile.dir}:${src.gdal.dir}:${src.c.gdal.dir}"
name="srcdir"/>
+ <attribute default="${src.local-src.dir}:${src.webapp.dir}:${src.javafx.dir}:${src.console.dir}:${src.portrayal.dir}:${src.earth-obs.dir}:${src.geotiff.dir}:${src.netcdf.dir}:${src.shapefile.dir}:${src.sql.dir}:${src.xmlstore.dir}:${src.storage.dir}:${src.feature.dir}:${src.raster.dir}:${src.referencing.dir}:${src.ref-by-id.dir}:${src.metadata.dir}:${src.utility.dir}:${src.fra-profile.dir}:${src.jpn-profile.dir}:${src.gdal.dir}:${src.c.gdal.dir}"
name="srcdir"/>
<attribute default="${build.classes.dir}" name="destdir"/>
<attribute default="${javac.classpath}" name="classpath"/>
<sequential>
@@ -730,6 +734,9 @@ is divided into following sections:
<fileset dir="${test.fra-profile.dir}" excludes="@{excludes},${excludes}"
includes="@{includes}">
<filename name="@{testincludes}"/>
</fileset>
+ <fileset dir="${test.jpn-profile.dir}" excludes="@{excludes},${excludes}"
includes="@{includes}">
+ <filename name="@{testincludes}"/>
+ </fileset>
<fileset dir="${test.gdal.dir}" excludes="@{excludes},${excludes}"
includes="@{includes}">
<filename name="@{testincludes}"/>
</fileset>
@@ -810,6 +817,9 @@ is divided into following sections:
<fileset dir="${test.fra-profile.dir}" excludes="@{excludes},**/*.xml,${excludes}"
includes="@{includes}">
<filename name="@{testincludes}"/>
</fileset>
+ <fileset dir="${test.jpn-profile.dir}" excludes="@{excludes},**/*.xml,${excludes}"
includes="@{includes}">
+ <filename name="@{testincludes}"/>
+ </fileset>
<fileset dir="${test.gdal.dir}" excludes="@{excludes},**/*.xml,${excludes}"
includes="@{includes}">
<filename name="@{testincludes}"/>
</fileset>
@@ -1295,7 +1305,7 @@ is divided into following sections:
<include name="*"/>
</dirset>
</pathconvert>
- <j2seproject3:depend srcdir="${src.local-src.dir}:${src.webapp.dir}:${src.javafx.dir}:${src.console.dir}:${src.portrayal.dir}:${src.earth-obs.dir}:${src.geotiff.dir}:${src.netcdf.dir}:${src.shapefile.dir}:${src.sql.dir}:${src.xmlstore.dir}:${src.storage.dir}:${src.feature.dir}:${src.raster.dir}:${src.referencing.dir}:${src.ref-by-id.dir}:${src.metadata.dir}:${src.utility.dir}:${src.fra-profile.dir}:${src.gdal.dir}:${src.c.gdal.dir}:${build.generated.subdirs}"/>
+ <j2seproject3:depend srcdir="${src.local-src.dir}:${src.webapp.dir}:${src.javafx.dir}:${src.console.dir}:${src.portrayal.dir}:${src.earth-obs.dir}:${src.geotiff.dir}:${src.netcdf.dir}:${src.shapefile.dir}:${src.sql.dir}:${src.xmlstore.dir}:${src.storage.dir}:${src.feature.dir}:${src.raster.dir}:${src.referencing.dir}:${src.ref-by-id.dir}:${src.metadata.dir}:${src.utility.dir}:${src.fra-profile.dir}:${src.jpn-profile.dir}:${src.gdal.dir}:${src.c.gdal.dir}:${build.generated.subdirs}"/>
</target>
<target depends="init,deps-jar,-pre-pre-compile,-pre-compile, -copy-persistence-xml,-compile-depend"
if="have.sources" name="-do-compile">
<j2seproject3:javac gensrcdir="${build.generated.sources.dir}"/>
@@ -1319,6 +1329,7 @@ is divided into following sections:
<fileset dir="${src.metadata.dir}" excludes="${build.classes.excludes},${excludes}"
includes="${includes}"/>
<fileset dir="${src.utility.dir}" excludes="${build.classes.excludes},${excludes}"
includes="${includes}"/>
<fileset dir="${src.fra-profile.dir}" excludes="${build.classes.excludes},${excludes}"
includes="${includes}"/>
+ <fileset dir="${src.jpn-profile.dir}" excludes="${build.classes.excludes},${excludes}"
includes="${includes}"/>
<fileset dir="${src.gdal.dir}" excludes="${build.classes.excludes},${excludes}"
includes="${includes}"/>
<fileset dir="${src.c.gdal.dir}" excludes="${build.classes.excludes},${excludes}"
includes="${includes}"/>
</copy>
@@ -1341,7 +1352,7 @@ is divided into following sections:
<target depends="init,deps-jar,-pre-pre-compile" name="-do-compile-single">
<fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
<j2seproject3:force-recompile/>
- <j2seproject3:javac excludes="" gensrcdir="${build.generated.sources.dir}" includes="${javac.includes},
module-info.java" sourcepath="${src.local-src.dir}:${src.webapp.dir}:${src.javafx.dir}:${src.console.dir}:${src.portrayal.dir}:${src.earth-obs.dir}:${src.geotiff.dir}:${src.netcdf.dir}:${src.shapefile.dir}:${src.sql.dir}:${src.xmlstore.dir}:${src.storage.dir}:${src.feature.dir}:${src.raster.dir}:${src.referencing.dir}:${src.ref-by-id.dir}:${src.metadata.dir}:${src.utility.dir}:
[...]
+ <j2seproject3:javac excludes="" gensrcdir="${build.generated.sources.dir}" includes="${javac.includes},
module-info.java" sourcepath="${src.local-src.dir}:${src.webapp.dir}:${src.javafx.dir}:${src.console.dir}:${src.portrayal.dir}:${src.earth-obs.dir}:${src.geotiff.dir}:${src.netcdf.dir}:${src.shapefile.dir}:${src.sql.dir}:${src.xmlstore.dir}:${src.storage.dir}:${src.feature.dir}:${src.raster.dir}:${src.referencing.dir}:${src.ref-by-id.dir}:${src.metadata.dir}:${src.utility.dir}:
[...]
</target>
<target name="-post-compile-single">
<!-- Empty placeholder for easier customization. -->
@@ -1776,6 +1787,9 @@ is divided into following sections:
<fileset dir="${src.fra-profile.dir}" excludes="${bug5101868workaround},${excludes}"
includes="${includes}">
<filename name="**/*.java"/>
</fileset>
+ <fileset dir="${src.jpn-profile.dir}" excludes="${bug5101868workaround},${excludes}"
includes="${includes}">
+ <filename name="**/*.java"/>
+ </fileset>
<fileset dir="${src.gdal.dir}" excludes="${bug5101868workaround},${excludes}"
includes="${includes}">
<filename name="**/*.java"/>
</fileset>
@@ -1847,6 +1861,9 @@ is divided into following sections:
<fileset dir="${src.fra-profile.dir}" excludes="${excludes}" includes="${includes}">
<filename name="**/doc-files/**"/>
</fileset>
+ <fileset dir="${src.jpn-profile.dir}" excludes="${excludes}" includes="${includes}">
+ <filename name="**/doc-files/**"/>
+ </fileset>
<fileset dir="${src.gdal.dir}" excludes="${excludes}" includes="${includes}">
<filename name="**/doc-files/**"/>
</fileset>
@@ -1875,14 +1892,14 @@ is divided into following sections:
<!-- You can override this target in the ../build.xml file. -->
</target>
<target depends="-init-source-module-properties" if="named.module.internal" name="-init-test-javac-module-properties-with-module">
- <j2seproject3:modulename property="test.module.name" sourcepath="${test.webapp.dir}:${test.javafx.dir}:${test.console.dir}:${test.portrayal.dir}:${test.earth-obs.dir}:${test.geotiff.dir}:${test.netcdf.dir}:${test.shapefile.dir}:${test.sql.dir}:${test.xmlstore.dir}:${test.storage.dir}:${test.feature.dir}:${test.raster.dir}:${test.referencing.dir}:${test.ref-by-id.dir}:${test.metadata.dir}:${test.utility.dir}:${test.fra-profile.dir}:${test.gdal.dir}"/>
- <condition else="${empty.dir}" property="javac.test.sourcepath" value="${test.webapp.dir}:${test.javafx.dir}:${test.console.dir}:${test.portrayal.dir}:${test.earth-obs.dir}:${test.geotiff.dir}:${test.netcdf.dir}:${test.shapefile.dir}:${test.sql.dir}:${test.xmlstore.dir}:${test.storage.dir}:${test.feature.dir}:${test.raster.dir}:${test.referencing.dir}:${test.ref-by-id.dir}:${test.metadata.dir}:${test.utility.dir}:${test.fra-profile.dir}:${test.gdal.dir}">
+ <j2seproject3:modulename property="test.module.name" sourcepath="${test.webapp.dir}:${test.javafx.dir}:${test.console.dir}:${test.portrayal.dir}:${test.earth-obs.dir}:${test.geotiff.dir}:${test.netcdf.dir}:${test.shapefile.dir}:${test.sql.dir}:${test.xmlstore.dir}:${test.storage.dir}:${test.feature.dir}:${test.raster.dir}:${test.referencing.dir}:${test.ref-by-id.dir}:${test.metadata.dir}:${test.utility.dir}:${test.fra-profile.dir}:${test.jpn-profile.dir}:${test.gdal.dir}"/>
+ <condition else="${empty.dir}" property="javac.test.sourcepath" value="${test.webapp.dir}:${test.javafx.dir}:${test.console.dir}:${test.portrayal.dir}:${test.earth-obs.dir}:${test.geotiff.dir}:${test.netcdf.dir}:${test.shapefile.dir}:${test.sql.dir}:${test.xmlstore.dir}:${test.storage.dir}:${test.feature.dir}:${test.raster.dir}:${test.referencing.dir}:${test.ref-by-id.dir}:${test.metadata.dir}:${test.utility.dir}:${test.fra-profile.dir}:${test.jpn-profile.dir}:${test.gdal.dir}">
<and>
<isset property="test.module.name"/>
<length length="0" string="${test.module.name}" when="greater"/>
</and>
</condition>
- <condition else="--patch-module ${module.name}=${test.webapp.dir}:${test.javafx.dir}:${test.console.dir}:${test.portrayal.dir}:${test.earth-obs.dir}:${test.geotiff.dir}:${test.netcdf.dir}:${test.shapefile.dir}:${test.sql.dir}:${test.xmlstore.dir}:${test.storage.dir}:${test.feature.dir}:${test.raster.dir}:${test.referencing.dir}:${test.ref-by-id.dir}:${test.metadata.dir}:${test.utility.dir}:${test.fra-profile.dir}:${test.gdal.dir}
--add-reads ${module.name}=ALL-UNNAMED" property=" [...]
+ <condition else="--patch-module ${module.name}=${test.webapp.dir}:${test.javafx.dir}:${test.console.dir}:${test.portrayal.dir}:${test.earth-obs.dir}:${test.geotiff.dir}:${test.netcdf.dir}:${test.shapefile.dir}:${test.sql.dir}:${test.xmlstore.dir}:${test.storage.dir}:${test.feature.dir}:${test.raster.dir}:${test.referencing.dir}:${test.ref-by-id.dir}:${test.metadata.dir}:${test.utility.dir}:${test.fra-profile.dir}:${test.jpn-profile.dir}:${test.gdal.dir}
--add-reads ${module.name} [...]
<and>
<isset property="test.module.name"/>
<length length="0" string="${test.module.name}" when="greater"/>
@@ -1923,10 +1940,10 @@ is divided into following sections:
</target>
<target depends="-init-test-javac-module-properties-with-module,-init-test-module-properties-without-module"
name="-init-test-module-properties"/>
<target if="do.depend.true" name="-compile-test-depend">
- <j2seproject3:depend classpath="${javac.test.classpath}" destdir="${build.test.classes.dir}"
srcdir="${test.webapp.dir}:${test.javafx.dir}:${test.console.dir}:${test.portrayal.dir}:${test.earth-obs.dir}:${test.geotiff.dir}:${test.netcdf.dir}:${test.shapefile.dir}:${test.sql.dir}:${test.xmlstore.dir}:${test.storage.dir}:${test.feature.dir}:${test.raster.dir}:${test.referencing.dir}:${test.ref-by-id.dir}:${test.metadata.dir}:${test.utility.dir}:${test.fra-profile.dir}:${test.gdal.dir}"/>
+ <j2seproject3:depend classpath="${javac.test.classpath}" destdir="${build.test.classes.dir}"
srcdir="${test.webapp.dir}:${test.javafx.dir}:${test.console.dir}:${test.portrayal.dir}:${test.earth-obs.dir}:${test.geotiff.dir}:${test.netcdf.dir}:${test.shapefile.dir}:${test.sql.dir}:${test.xmlstore.dir}:${test.storage.dir}:${test.feature.dir}:${test.raster.dir}:${test.referencing.dir}:${test.ref-by-id.dir}:${test.metadata.dir}:${test.utility.dir}:${test.fra-profile.dir}:${test.jpn-pr
[...]
</target>
<target depends="init,deps-jar,compile,-init-test-module-properties,-pre-pre-compile-test,-pre-compile-test,-compile-test-depend"
if="have.tests" name="-do-compile-test">
- <j2seproject3:javac apgeneratedsrcdir="${build.test.classes.dir}" classpath="${javac.test.classpath}"
debug="true" destdir="${build.test.classes.dir}" modulepath="${javac.test.modulepath}" processorpath="${javac.test.processorpath}"
sourcepath="${javac.test.sourcepath}" srcdir="${test.webapp.dir}:${test.javafx.dir}:${test.console.dir}:${test.portrayal.dir}:${test.earth-obs.dir}:${test.geotiff.dir}:${test.netcdf.dir}:${test.shapefile.dir}:${test.sql.dir}:${test.xmlstore.dir}:${tes
[...]
+ <j2seproject3:javac apgeneratedsrcdir="${build.test.classes.dir}" classpath="${javac.test.classpath}"
debug="true" destdir="${build.test.classes.dir}" modulepath="${javac.test.modulepath}" processorpath="${javac.test.processorpath}"
sourcepath="${javac.test.sourcepath}" srcdir="${test.webapp.dir}:${test.javafx.dir}:${test.console.dir}:${test.portrayal.dir}:${test.earth-obs.dir}:${test.geotiff.dir}:${test.netcdf.dir}:${test.shapefile.dir}:${test.sql.dir}:${test.xmlstore.dir}:${tes
[...]
<customize>
<compilerarg line="${javac.test.compilerargs}"/>
</customize>
@@ -1950,6 +1967,7 @@ is divided into following sections:
<fileset dir="${test.metadata.dir}" excludes="${build.classes.excludes},${excludes}"
includes="${includes}"/>
<fileset dir="${test.utility.dir}" excludes="${build.classes.excludes},${excludes}"
includes="${includes}"/>
<fileset dir="${test.fra-profile.dir}" excludes="${build.classes.excludes},${excludes}"
includes="${includes}"/>
+ <fileset dir="${test.jpn-profile.dir}" excludes="${build.classes.excludes},${excludes}"
includes="${includes}"/>
<fileset dir="${test.gdal.dir}" excludes="${build.classes.excludes},${excludes}"
includes="${includes}"/>
</copy>
</target>
@@ -1965,7 +1983,7 @@ is divided into following sections:
<target depends="init,deps-jar,compile,-init-test-module-properties,-pre-pre-compile-test,-pre-compile-test-single"
if="have.tests" name="-do-compile-test-single">
<fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
<j2seproject3:force-recompile destdir="${build.test.classes.dir}"/>
- <j2seproject3:javac apgeneratedsrcdir="${build.test.classes.dir}" classpath="${javac.test.classpath}"
debug="true" destdir="${build.test.classes.dir}" excludes="" includes="${javac.includes},
module-info.java" modulepath="${javac.test.modulepath}" processorpath="${javac.test.processorpath}"
sourcepath="${test.webapp.dir}:${test.javafx.dir}:${test.console.dir}:${test.portrayal.dir}:${test.earth-obs.dir}:${test.geotiff.dir}:${test.netcdf.dir}:${test.shapefile.dir}:${test.sql.dir}:$
[...]
+ <j2seproject3:javac apgeneratedsrcdir="${build.test.classes.dir}" classpath="${javac.test.classpath}"
debug="true" destdir="${build.test.classes.dir}" excludes="" includes="${javac.includes},
module-info.java" modulepath="${javac.test.modulepath}" processorpath="${javac.test.processorpath}"
sourcepath="${test.webapp.dir}:${test.javafx.dir}:${test.console.dir}:${test.portrayal.dir}:${test.earth-obs.dir}:${test.geotiff.dir}:${test.netcdf.dir}:${test.shapefile.dir}:${test.sql.dir}:$
[...]
<customize>
<compilerarg line="${javac.test.compilerargs}"/>
</customize>
@@ -1989,6 +2007,7 @@ is divided into following sections:
<fileset dir="${test.metadata.dir}" excludes="${build.classes.excludes},${excludes}"
includes="${includes}"/>
<fileset dir="${test.utility.dir}" excludes="${build.classes.excludes},${excludes}"
includes="${includes}"/>
<fileset dir="${test.fra-profile.dir}" excludes="${build.classes.excludes},${excludes}"
includes="${includes}"/>
+ <fileset dir="${test.jpn-profile.dir}" excludes="${build.classes.excludes},${excludes}"
includes="${includes}"/>
<fileset dir="${test.gdal.dir}" excludes="${build.classes.excludes},${excludes}"
includes="${includes}"/>
</copy>
</target>
diff --git a/ide-project/NetBeans/nbproject/genfiles.properties b/ide-project/NetBeans/nbproject/genfiles.properties
index 89d141d..2ef5d3f 100644
--- a/ide-project/NetBeans/nbproject/genfiles.properties
+++ b/ide-project/NetBeans/nbproject/genfiles.properties
@@ -3,6 +3,6 @@
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=15917a2f
-nbproject/build-impl.xml.script.CRC32=a7689f96
-nbproject/build-impl.xml.stylesheet.CRC32=3a2fa800@1.89.1.48
+nbproject/build-impl.xml.data.CRC32=a63b4991
+nbproject/build-impl.xml.script.CRC32=28dd6934
+nbproject/build-impl.xml.stylesheet.CRC32=3a2fa800@1.91.1.48
diff --git a/ide-project/NetBeans/nbproject/project.properties b/ide-project/NetBeans/nbproject/project.properties
index 29cf29b..c04328c 100644
--- a/ide-project/NetBeans/nbproject/project.properties
+++ b/ide-project/NetBeans/nbproject/project.properties
@@ -92,6 +92,8 @@ src.utility.dir = ${project.root}/core/sis-utility/src/main/java
test.utility.dir = ${project.root}/core/sis-utility/src/test/java
src.fra-profile.dir = ${project.root}/profiles/sis-french-profile/src/main/java
test.fra-profile.dir = ${project.root}/profiles/sis-french-profile/src/test/java
+src.jpn-profile.dir = ${project.root}/profiles/sis-japan-profile/src/main/java
+test.jpn-profile.dir = ${project.root}/profiles/sis-japan-profile/src/test/java
#
# Dependencies on other NetBeans projects. The path is relative to the "NetBeans" parent
directory.
diff --git a/ide-project/NetBeans/nbproject/project.xml b/ide-project/NetBeans/nbproject/project.xml
index c22b81f..c5f952c 100644
--- a/ide-project/NetBeans/nbproject/project.xml
+++ b/ide-project/NetBeans/nbproject/project.xml
@@ -42,6 +42,7 @@
<root id="src.metadata.dir" name="Metadata"/>
<root id="src.utility.dir" name="Utility"/>
<root id="src.fra-profile.dir" name="French profile"/>
+ <root id="src.jpn-profile.dir" name="Japanese profile"/>
<root id="src.gdal.dir" name="GDAL/Proj4"/>
<root id="src.c.gdal.dir" name="GDAL/Proj4 JNI"/>
</source-roots>
@@ -64,6 +65,7 @@
<root id="test.metadata.dir" name="Test Metadata"/>
<root id="test.utility.dir" name="Test Utility"/>
<root id="test.fra-profile.dir" name="Test French profile"/>
+ <root id="test.jpn-profile.dir" name="Test Japanese profile"/>
<root id="test.gdal.dir" name="Test GDAL/Proj4"/>
</test-roots>
</data>
diff --git a/profiles/pom.xml b/profiles/pom.xml
index be578e3..9b9ea3b 100644
--- a/profiles/pom.xml
+++ b/profiles/pom.xml
@@ -117,6 +117,7 @@
=========================================================== -->
<modules>
<module>sis-french-profile</module>
+ <module>sis-japan-profile</module>
</modules>
</project>
diff --git a/storage/sis-earth-observation/pom.xml b/profiles/sis-japan-profile/pom.xml
similarity index 66%
copy from storage/sis-earth-observation/pom.xml
copy to profiles/sis-japan-profile/pom.xml
index e8b7841..ddaae12 100644
--- a/storage/sis-earth-observation/pom.xml
+++ b/profiles/sis-japan-profile/pom.xml
@@ -27,7 +27,7 @@
<parent>
<groupId>org.apache.sis</groupId>
- <artifactId>storage</artifactId>
+ <artifactId>profiles</artifactId>
<version>2.0-SNAPSHOT</version>
</parent>
@@ -35,11 +35,11 @@
<!-- ===========================================================
Module Description
=========================================================== -->
- <groupId>org.apache.sis.storage</groupId>
- <artifactId>sis-earth-observation</artifactId>
- <name>Apache SIS Earth Observation storage</name>
+ <groupId>org.apache.sis.profiles</groupId>
+ <artifactId>sis-japan-profile</artifactId>
+ <name>Apache SIS Japanese profiles</name>
<description>
- Landsat and MODIS metadata files to ISO 19115 metadata.
+ Extensions to netCDF reader for file formats published by Japanese Aerospace Exploration
Agency (JAXA).
</description>
@@ -48,27 +48,6 @@
=========================================================== -->
<developers>
<developer>
- <name>Thi Phuong Hao Nguyen</name>
- <id>haonguyen</id>
- <email>nguyenthiphuonghao243@gmail.com</email>
- <organization>VNSC</organization>
- <organizationUrl>http://vnsc.org.vn</organizationUrl>
- <timezone>+7</timezone>
- <roles>
- <role>developer</role>
- </roles>
- </developer>
- <developer>
- <name>Rémi Maréchal</name>
- <email>remi.marechal@geomatys.com</email>
- <organization>Geomatys</organization>
- <organizationUrl>http://www.geomatys.com</organizationUrl>
- <timezone>+1</timezone>
- <roles>
- <role>developer</role>
- </roles>
- </developer>
- <developer>
<name>Martin Desruisseaux</name>
<id>desruisseaux</id>
<email>desruisseaux@apache.org</email>
@@ -80,18 +59,6 @@
</roles>
</developer>
</developers>
- <contributors>
- <contributor>
- <name>Minh Chinh Vu</name>
- <email>chinhvm.uet.1995@gmail.com</email>
- <organization>VNSC</organization>
- <organizationUrl>http://vnsc.org.vn</organizationUrl>
- <timezone>+7</timezone>
- <roles>
- <role>developer</role>
- </roles>
- </contributor>
- </contributors>
<!-- ===========================================================
@@ -106,7 +73,7 @@
<archive>
<manifestEntries>
<Automatic-Module-Name>
- org.apache.sis.storage.earthobservation
+ org.apache.sis.profile.japan
</Automatic-Module-Name>
</manifestEntries>
</archive>
@@ -122,14 +89,8 @@
<dependencies>
<dependency>
<groupId>org.apache.sis.storage</groupId>
- <artifactId>sis-storage</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.sis.storage</groupId>
<artifactId>sis-netcdf</artifactId>
<version>${project.version}</version>
- <optional>true</optional>
</dependency>
</dependencies>
diff --git a/storage/sis-earth-observation/src/main/java/org/apache/sis/internal/earth/netcdf/GCOM_C.java
b/profiles/sis-japan-profile/src/main/java/org/apache/sis/internal/earth/netcdf/GCOM_C.java
similarity index 100%
rename from storage/sis-earth-observation/src/main/java/org/apache/sis/internal/earth/netcdf/GCOM_C.java
rename to profiles/sis-japan-profile/src/main/java/org/apache/sis/internal/earth/netcdf/GCOM_C.java
diff --git a/storage/sis-earth-observation/src/main/java/org/apache/sis/internal/earth/netcdf/GCOM_W.java
b/profiles/sis-japan-profile/src/main/java/org/apache/sis/internal/earth/netcdf/GCOM_W.java
similarity index 100%
rename from storage/sis-earth-observation/src/main/java/org/apache/sis/internal/earth/netcdf/GCOM_W.java
rename to profiles/sis-japan-profile/src/main/java/org/apache/sis/internal/earth/netcdf/GCOM_W.java
diff --git a/storage/sis-earth-observation/src/main/java/org/apache/sis/internal/earth/netcdf/package-info.java
b/profiles/sis-japan-profile/src/main/java/org/apache/sis/internal/earth/netcdf/package-info.java
similarity index 100%
rename from storage/sis-earth-observation/src/main/java/org/apache/sis/internal/earth/netcdf/package-info.java
rename to profiles/sis-japan-profile/src/main/java/org/apache/sis/internal/earth/netcdf/package-info.java
diff --git a/storage/sis-earth-observation/src/main/resources/META-INF/services/org.apache.sis.internal.netcdf.Convention
b/profiles/sis-japan-profile/src/main/resources/META-INF/services/org.apache.sis.internal.netcdf.Convention
similarity index 100%
rename from storage/sis-earth-observation/src/main/resources/META-INF/services/org.apache.sis.internal.netcdf.Convention
rename to profiles/sis-japan-profile/src/main/resources/META-INF/services/org.apache.sis.internal.netcdf.Convention
diff --git a/storage/sis-earth-observation/pom.xml b/storage/sis-earth-observation/pom.xml
index e8b7841..b0bd5cd 100644
--- a/storage/sis-earth-observation/pom.xml
+++ b/storage/sis-earth-observation/pom.xml
@@ -125,12 +125,6 @@
<artifactId>sis-storage</artifactId>
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.sis.storage</groupId>
- <artifactId>sis-netcdf</artifactId>
- <version>${project.version}</version>
- <optional>true</optional>
- </dependency>
</dependencies>
</project>
|