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 2017/10/30 10:16:02 UTC
svn commit: r1813745 - in /sis/branches/0.8: application/sis-javafx/ core/
core/sis-raster/ ide-project/NetBeans/ ide-project/NetBeans/nbproject/
storage/ storage/sis-shapefile/
Author: desruisseaux
Date: Mon Oct 30 10:16:02 2017
New Revision: 1813745
URL: http://svn.apache.org/viewvc?rev=1813745&view=rev
Log:
Remove sis-javafx, sis-raster and sis-shapefile modules from 0.8 branch.
Removed:
sis/branches/0.8/application/sis-javafx/
sis/branches/0.8/core/sis-raster/
sis/branches/0.8/storage/sis-shapefile/
Modified:
sis/branches/0.8/core/pom.xml
sis/branches/0.8/ide-project/NetBeans/build.xml
sis/branches/0.8/ide-project/NetBeans/nbproject/build-impl.xml
sis/branches/0.8/ide-project/NetBeans/nbproject/genfiles.properties
sis/branches/0.8/ide-project/NetBeans/nbproject/project.properties
sis/branches/0.8/ide-project/NetBeans/nbproject/project.xml
sis/branches/0.8/storage/pom.xml
Modified: sis/branches/0.8/core/pom.xml
URL: http://svn.apache.org/viewvc/sis/branches/0.8/core/pom.xml?rev=1813745&r1=1813744&r2=1813745&view=diff
==============================================================================
--- sis/branches/0.8/core/pom.xml (original)
+++ sis/branches/0.8/core/pom.xml Mon Oct 30 10:16:02 2017
@@ -192,7 +192,6 @@
<module>sis-referencing</module>
<module>sis-referencing-by-identifiers</module>
<module>sis-feature</module>
- <module>sis-raster</module>
</modules>
</project>
Modified: sis/branches/0.8/ide-project/NetBeans/build.xml
URL: http://svn.apache.org/viewvc/sis/branches/0.8/ide-project/NetBeans/build.xml?rev=1813745&r1=1813744&r2=1813745&view=diff
==============================================================================
--- sis/branches/0.8/ide-project/NetBeans/build.xml (original)
+++ sis/branches/0.8/ide-project/NetBeans/build.xml Mon Oct 30 10:16:02 2017
@@ -50,9 +50,6 @@
<fileset dir="${project.root}/core/sis-feature/target/generated-resources">
<include name="**/*.utf"/>
</fileset>
- <fileset dir="${project.root}/core/sis-raster/target/generated-resources">
- <include name="**/*.utf"/>
- </fileset>
<fileset dir="${project.root}/storage/sis-storage/target/generated-resources">
<include name="**/*.utf"/>
</fileset>
@@ -62,11 +59,6 @@
<fileset dir="${project.root}/storage/sis-geotiff/target/generated-resources">
<include name="**/*.utf"/>
</fileset>
- <!-- Pending discussion about how to handle resources in the Shapefile module.
- <fileset dir="${project.root}/storage/sis-shapefile/target/generated-resources">
- <include name="**/*.utf"/>
- </fileset>
- -->
<!-- Other resources (properties files, SQL scripts, native libraries). -->
<fileset dir="${project.root}/core/sis-utility/src/main/resources">
@@ -242,12 +234,6 @@
<fileset dir="${project.root}/storage/sis-earth-observation/src/test/resources">
<include name="**/*.txt"/>
</fileset>
- <fileset dir="${project.root}/storage/sis-shapefile/src/test/resources">
- <include name="**/*.dbf"/>
- <include name="**/*.prj"/>
- <include name="**/*.shp"/>
- <include name="**/*.shx"/>
- </fileset>
<fileset dir="${project.root}/profiles/sis-french-profile/src/test/resources">
<include name="**/*.xml"/>
</fileset>
Modified: sis/branches/0.8/ide-project/NetBeans/nbproject/build-impl.xml
URL: http://svn.apache.org/viewvc/sis/branches/0.8/ide-project/NetBeans/nbproject/build-impl.xml?rev=1813745&r1=1813744&r2=1813745&view=diff
==============================================================================
--- sis/branches/0.8/ide-project/NetBeans/nbproject/build-impl.xml (original)
+++ sis/branches/0.8/ide-project/NetBeans/nbproject/build-impl.xml Mon Oct 30 10:16:02 2017
@@ -127,11 +127,9 @@ is divided into following sections:
<available file="${test.earth-obs.dir}"/>
<available file="${test.geotiff.dir}"/>
<available file="${test.netcdf.dir}"/>
- <available file="${test.shapefile.dir}"/>
<available file="${test.xmlstore.dir}"/>
<available file="${test.storage.dir}"/>
<available file="${test.feature.dir}"/>
- <available file="${test.raster.dir}"/>
<available file="${test.referencing.dir}"/>
<available file="${test.ref-by-id.dir}"/>
<available file="${test.metadata.dir}"/>
@@ -148,11 +146,9 @@ is divided into following sections:
<available file="${src.earth-obs.dir}"/>
<available file="${src.geotiff.dir}"/>
<available file="${src.netcdf.dir}"/>
- <available file="${src.shapefile.dir}"/>
<available file="${src.xmlstore.dir}"/>
<available file="${src.storage.dir}"/>
<available file="${src.feature.dir}"/>
- <available file="${src.raster.dir}"/>
<available file="${src.referencing.dir}"/>
<available file="${src.ref-by-id.dir}"/>
<available file="${src.metadata.dir}"/>
@@ -268,11 +264,9 @@ is divided into following sections:
<fail unless="src.earth-obs.dir">Must set src.earth-obs.dir</fail>
<fail unless="src.geotiff.dir">Must set src.geotiff.dir</fail>
<fail unless="src.netcdf.dir">Must set src.netcdf.dir</fail>
- <fail unless="src.shapefile.dir">Must set src.shapefile.dir</fail>
<fail unless="src.xmlstore.dir">Must set src.xmlstore.dir</fail>
<fail unless="src.storage.dir">Must set src.storage.dir</fail>
<fail unless="src.feature.dir">Must set src.feature.dir</fail>
- <fail unless="src.raster.dir">Must set src.raster.dir</fail>
<fail unless="src.referencing.dir">Must set src.referencing.dir</fail>
<fail unless="src.ref-by-id.dir">Must set src.ref-by-id.dir</fail>
<fail unless="src.metadata.dir">Must set src.metadata.dir</fail>
@@ -285,11 +279,9 @@ is divided into following sections:
<fail unless="test.earth-obs.dir">Must set test.earth-obs.dir</fail>
<fail unless="test.geotiff.dir">Must set test.geotiff.dir</fail>
<fail unless="test.netcdf.dir">Must set test.netcdf.dir</fail>
- <fail unless="test.shapefile.dir">Must set test.shapefile.dir</fail>
<fail unless="test.xmlstore.dir">Must set test.xmlstore.dir</fail>
<fail unless="test.storage.dir">Must set test.storage.dir</fail>
<fail unless="test.feature.dir">Must set test.feature.dir</fail>
- <fail unless="test.raster.dir">Must set test.raster.dir</fail>
<fail unless="test.referencing.dir">Must set test.referencing.dir</fail>
<fail unless="test.ref-by-id.dir">Must set test.ref-by-id.dir</fail>
<fail unless="test.metadata.dir">Must set test.metadata.dir</fail>
@@ -316,7 +308,7 @@ is divided into following sections:
</target>
<target depends="-init-ap-cmdline-properties" if="ap.supported.internal" name="-init-macrodef-javac-with-processors">
<macrodef name="javac" uri="http://www.netbeans.org/ns/j2se-project/3">
- <attribute default="${src.local-src.dir}:${src.webapp.dir}:${src.console.dir}:${src.earth-obs.dir}:${src.geotiff.dir}:${src.netcdf.dir}:${src.shapefile.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.console.dir}:${src.earth-obs.dir}:${src.geotiff.dir}:${src.netcdf.dir}:${src.xmlstore.dir}:${src.storage.dir}:${src.feature.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="${build.classes.dir}" name="destdir"/>
<attribute default="${javac.classpath}" name="classpath"/>
<attribute default="${javac.processorpath}" name="processorpath"/>
@@ -357,7 +349,7 @@ is divided into following sections:
</target>
<target depends="-init-ap-cmdline-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.console.dir}:${src.earth-obs.dir}:${src.geotiff.dir}:${src.netcdf.dir}:${src.shapefile.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.console.dir}:${src.earth-obs.dir}:${src.geotiff.dir}:${src.netcdf.dir}:${src.xmlstore.dir}:${src.storage.dir}:${src.feature.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="${build.classes.dir}" name="destdir"/>
<attribute default="${javac.classpath}" name="classpath"/>
<attribute default="${javac.processorpath}" name="processorpath"/>
@@ -390,7 +382,7 @@ is divided into following sections:
</target>
<target depends="-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.console.dir}:${src.earth-obs.dir}:${src.geotiff.dir}:${src.netcdf.dir}:${src.shapefile.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.console.dir}:${src.earth-obs.dir}:${src.geotiff.dir}:${src.netcdf.dir}:${src.xmlstore.dir}:${src.storage.dir}:${src.feature.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="${build.classes.dir}" name="destdir"/>
<attribute default="${javac.classpath}" name="classpath"/>
<sequential>
@@ -492,9 +484,6 @@ is divided into following sections:
<fileset dir="${test.netcdf.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
<filename name="@{testincludes}"/>
</fileset>
- <fileset dir="${test.shapefile.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
- <filename name="@{testincludes}"/>
- </fileset>
<fileset dir="${test.xmlstore.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
<filename name="@{testincludes}"/>
</fileset>
@@ -504,9 +493,6 @@ is divided into following sections:
<fileset dir="${test.feature.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
<filename name="@{testincludes}"/>
</fileset>
- <fileset dir="${test.raster.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
- <filename name="@{testincludes}"/>
- </fileset>
<fileset dir="${test.referencing.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
<filename name="@{testincludes}"/>
</fileset>
@@ -569,9 +555,6 @@ is divided into following sections:
<fileset dir="${test.netcdf.dir}" excludes="@{excludes},**/*.xml,${excludes}" includes="@{includes}">
<filename name="@{testincludes}"/>
</fileset>
- <fileset dir="${test.shapefile.dir}" excludes="@{excludes},**/*.xml,${excludes}" includes="@{includes}">
- <filename name="@{testincludes}"/>
- </fileset>
<fileset dir="${test.xmlstore.dir}" excludes="@{excludes},**/*.xml,${excludes}" includes="@{includes}">
<filename name="@{testincludes}"/>
</fileset>
@@ -581,9 +564,6 @@ is divided into following sections:
<fileset dir="${test.feature.dir}" excludes="@{excludes},**/*.xml,${excludes}" includes="@{includes}">
<filename name="@{testincludes}"/>
</fileset>
- <fileset dir="${test.raster.dir}" excludes="@{excludes},**/*.xml,${excludes}" includes="@{includes}">
- <filename name="@{testincludes}"/>
- </fileset>
<fileset dir="${test.referencing.dir}" excludes="@{excludes},**/*.xml,${excludes}" includes="@{includes}">
<filename name="@{testincludes}"/>
</fileset>
@@ -726,9 +706,6 @@ is divided into following sections:
<fileset dir="${test.netcdf.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
<filename name="@{testincludes}"/>
</fileset>
- <fileset dir="${test.shapefile.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
- <filename name="@{testincludes}"/>
- </fileset>
<fileset dir="${test.xmlstore.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
<filename name="@{testincludes}"/>
</fileset>
@@ -738,9 +715,6 @@ is divided into following sections:
<fileset dir="${test.feature.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
<filename name="@{testincludes}"/>
</fileset>
- <fileset dir="${test.raster.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
- <filename name="@{testincludes}"/>
- </fileset>
<fileset dir="${test.referencing.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
<filename name="@{testincludes}"/>
</fileset>
@@ -1123,7 +1097,7 @@ is divided into following sections:
<include name="*"/>
</dirset>
</pathconvert>
- <j2seproject3:depend srcdir="${src.local-src.dir}:${src.webapp.dir}:${src.console.dir}:${src.earth-obs.dir}:${src.geotiff.dir}:${src.netcdf.dir}:${src.shapefile.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.console.dir}:${src.earth-obs.dir}:${src.geotiff.dir}:${src.netcdf.dir}:${src.xmlstore.dir}:${src.storage.dir}:${src.feature.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}"/>
</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}"/>
@@ -1134,11 +1108,9 @@ is divided into following sections:
<fileset dir="${src.earth-obs.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
<fileset dir="${src.geotiff.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
<fileset dir="${src.netcdf.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
- <fileset dir="${src.shapefile.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
<fileset dir="${src.xmlstore.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
<fileset dir="${src.storage.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
<fileset dir="${src.feature.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
- <fileset dir="${src.raster.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
<fileset dir="${src.referencing.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
<fileset dir="${src.ref-by-id.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
<fileset dir="${src.metadata.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
@@ -1166,7 +1138,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}" sourcepath="${src.local-src.dir}:${src.webapp.dir}:${src.console.dir}:${src.earth-obs.dir}:${src.geotiff.dir}:${src.netcdf.dir}:${src.shapefile.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:javac excludes="" gensrcdir="${build.generated.sources.dir}" includes="${javac.includes}" sourcepath="${src.local-src.dir}:${src.webapp.dir}:${src.console.dir}:${src.earth-obs.dir}:${src.geotiff.dir}:${src.netcdf.dir}:${src.xmlstore.dir}:${src.storage.dir}:${src.feature.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}"/>
</target>
<target name="-post-compile-single">
<!-- Empty placeholder for easier customization. -->
@@ -1450,9 +1422,6 @@ is divided into following sections:
<fileset dir="${src.netcdf.dir}" excludes="${bug5101868workaround},${excludes}" includes="${includes}">
<filename name="**/*.java"/>
</fileset>
- <fileset dir="${src.shapefile.dir}" excludes="${bug5101868workaround},${excludes}" includes="${includes}">
- <filename name="**/*.java"/>
- </fileset>
<fileset dir="${src.xmlstore.dir}" excludes="${bug5101868workaround},${excludes}" includes="${includes}">
<filename name="**/*.java"/>
</fileset>
@@ -1462,9 +1431,6 @@ is divided into following sections:
<fileset dir="${src.feature.dir}" excludes="${bug5101868workaround},${excludes}" includes="${includes}">
<filename name="**/*.java"/>
</fileset>
- <fileset dir="${src.raster.dir}" excludes="${bug5101868workaround},${excludes}" includes="${includes}">
- <filename name="**/*.java"/>
- </fileset>
<fileset dir="${src.referencing.dir}" excludes="${bug5101868workaround},${excludes}" includes="${includes}">
<filename name="**/*.java"/>
</fileset>
@@ -1511,9 +1477,6 @@ is divided into following sections:
<fileset dir="${src.netcdf.dir}" excludes="${excludes}" includes="${includes}">
<filename name="**/doc-files/**"/>
</fileset>
- <fileset dir="${src.shapefile.dir}" excludes="${excludes}" includes="${includes}">
- <filename name="**/doc-files/**"/>
- </fileset>
<fileset dir="${src.xmlstore.dir}" excludes="${excludes}" includes="${includes}">
<filename name="**/doc-files/**"/>
</fileset>
@@ -1523,9 +1486,6 @@ is divided into following sections:
<fileset dir="${src.feature.dir}" excludes="${excludes}" includes="${includes}">
<filename name="**/doc-files/**"/>
</fileset>
- <fileset dir="${src.raster.dir}" excludes="${excludes}" includes="${includes}">
- <filename name="**/doc-files/**"/>
- </fileset>
<fileset dir="${src.referencing.dir}" excludes="${excludes}" includes="${includes}">
<filename name="**/doc-files/**"/>
</fileset>
@@ -1569,21 +1529,19 @@ is divided into following sections:
<!-- You can override this target in the ../build.xml file. -->
</target>
<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.console.dir}:${test.earth-obs.dir}:${test.geotiff.dir}:${test.netcdf.dir}:${test.shapefile.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.console.dir}:${test.earth-obs.dir}:${test.geotiff.dir}:${test.netcdf.dir}:${test.xmlstore.dir}:${test.storage.dir}:${test.feature.dir}:${test.referencing.dir}:${test.ref-by-id.dir}:${test.metadata.dir}:${test.utility.dir}:${test.fra-profile.dir}:${test.gdal.dir}"/>
</target>
<target depends="init,deps-jar,compile,-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}" processorpath="${javac.test.processorpath}" srcdir="${test.webapp.dir}:${test.console.dir}:${test.earth-obs.dir}:${test.geotiff.dir}:${test.netcdf.dir}:${test.shapefile.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:javac apgeneratedsrcdir="${build.test.classes.dir}" classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" processorpath="${javac.test.processorpath}" srcdir="${test.webapp.dir}:${test.console.dir}:${test.earth-obs.dir}:${test.geotiff.dir}:${test.netcdf.dir}:${test.xmlstore.dir}:${test.storage.dir}:${test.feature.dir}:${test.referencing.dir}:${test.ref-by-id.dir}:${test.metadata.dir}:${test.utility.dir}:${test.fra-profile.dir}:${test.gdal.dir}"/>
<copy todir="${build.test.classes.dir}">
<fileset dir="${test.webapp.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
<fileset dir="${test.console.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
<fileset dir="${test.earth-obs.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
<fileset dir="${test.geotiff.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
<fileset dir="${test.netcdf.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
- <fileset dir="${test.shapefile.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
<fileset dir="${test.xmlstore.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
<fileset dir="${test.storage.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
<fileset dir="${test.feature.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
- <fileset dir="${test.raster.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
<fileset dir="${test.referencing.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
<fileset dir="${test.ref-by-id.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
<fileset dir="${test.metadata.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
@@ -1604,18 +1562,16 @@ is divided into following sections:
<target depends="init,deps-jar,compile,-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}" processorpath="${javac.test.processorpath}" sourcepath="${test.webapp.dir}:${test.console.dir}:${test.earth-obs.dir}:${test.geotiff.dir}:${test.netcdf.dir}:${test.shapefile.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}" srcdir="${test.webapp.dir}:${test.console.dir}:${test.earth-obs.dir}:${test.geotiff.dir}:${test.netcdf.dir}:${test.shapefile.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:javac apgeneratedsrcdir="${build.test.classes.dir}" classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" excludes="" includes="${javac.includes}" processorpath="${javac.test.processorpath}" sourcepath="${test.webapp.dir}:${test.console.dir}:${test.earth-obs.dir}:${test.geotiff.dir}:${test.netcdf.dir}:${test.xmlstore.dir}:${test.storage.dir}:${test.feature.dir}:${test.referencing.dir}:${test.ref-by-id.dir}:${test.metadata.dir}:${test.utility.dir}:${test.fra-profile.dir}:${test.gdal.dir}" srcdir="${test.webapp.dir}:${test.console.dir}:${test.earth-obs.dir}:${test.geotiff.dir}:${test.netcdf.dir}:${test.xmlstore.dir}:${test.storage.dir}:${test.feature.dir}:${test.referencing.dir}:${test.ref-by-id.dir}:${test.metadata.dir}:${test.utility.dir}:${test.fra-profile.dir}:${test.gdal.dir}"/>
<copy todir="${build.test.classes.dir}">
<fileset dir="${test.webapp.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
<fileset dir="${test.console.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
<fileset dir="${test.earth-obs.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
<fileset dir="${test.geotiff.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
<fileset dir="${test.netcdf.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
- <fileset dir="${test.shapefile.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
<fileset dir="${test.xmlstore.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
<fileset dir="${test.storage.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
<fileset dir="${test.feature.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
- <fileset dir="${test.raster.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
<fileset dir="${test.referencing.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
<fileset dir="${test.ref-by-id.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
<fileset dir="${test.metadata.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
Modified: sis/branches/0.8/ide-project/NetBeans/nbproject/genfiles.properties
URL: http://svn.apache.org/viewvc/sis/branches/0.8/ide-project/NetBeans/nbproject/genfiles.properties?rev=1813745&r1=1813744&r2=1813745&view=diff
==============================================================================
--- sis/branches/0.8/ide-project/NetBeans/nbproject/genfiles.properties [ISO-8859-1] (original)
+++ sis/branches/0.8/ide-project/NetBeans/nbproject/genfiles.properties [ISO-8859-1] Mon Oct 30 10:16:02 2017
@@ -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=f8f4bfbb
-nbproject/build-impl.xml.script.CRC32=3d5816ed
+nbproject/build-impl.xml.data.CRC32=5cd8e010
+nbproject/build-impl.xml.script.CRC32=6e39470f
nbproject/build-impl.xml.stylesheet.CRC32=830a3534@1.80.1.48
Modified: sis/branches/0.8/ide-project/NetBeans/nbproject/project.properties
URL: http://svn.apache.org/viewvc/sis/branches/0.8/ide-project/NetBeans/nbproject/project.properties?rev=1813745&r1=1813744&r2=1813745&view=diff
==============================================================================
--- sis/branches/0.8/ide-project/NetBeans/nbproject/project.properties [ISO-8859-1] (original)
+++ sis/branches/0.8/ide-project/NetBeans/nbproject/project.properties [ISO-8859-1] Mon Oct 30 10:16:02 2017
@@ -57,8 +57,6 @@ src.geotiff.dir = ${project.root}/s
test.geotiff.dir = ${project.root}/storage/sis-geotiff/src/test/java
src.netcdf.dir = ${project.root}/storage/sis-netcdf/src/main/java
test.netcdf.dir = ${project.root}/storage/sis-netcdf/src/test/java
-src.shapefile.dir = ${project.root}/storage/sis-shapefile/src/main/java
-test.shapefile.dir = ${project.root}/storage/sis-shapefile/src/test/java
src.xmlstore.dir = ${project.root}/storage/sis-xmlstore/src/main/java
test.xmlstore.dir = ${project.root}/storage/sis-xmlstore/src/test/java
src.gdal.dir = ${project.root}/storage/sis-gdal/src/main/java
@@ -68,8 +66,6 @@ src.storage.dir = ${project.root}/s
test.storage.dir = ${project.root}/storage/sis-storage/src/test/java
src.feature.dir = ${project.root}/core/sis-feature/src/main/java
test.feature.dir = ${project.root}/core/sis-feature/src/test/java
-src.raster.dir = ${project.root}/core/sis-raster/src/main/java
-test.raster.dir = ${project.root}/core/sis-raster/src/test/java
src.referencing.dir = ${project.root}/core/sis-referencing/src/main/java
test.referencing.dir = ${project.root}/core/sis-referencing/src/test/java
src.ref-by-id.dir = ${project.root}/core/sis-referencing-by-identifiers/src/main/java
Modified: sis/branches/0.8/ide-project/NetBeans/nbproject/project.xml
URL: http://svn.apache.org/viewvc/sis/branches/0.8/ide-project/NetBeans/nbproject/project.xml?rev=1813745&r1=1813744&r2=1813745&view=diff
==============================================================================
--- sis/branches/0.8/ide-project/NetBeans/nbproject/project.xml (original)
+++ sis/branches/0.8/ide-project/NetBeans/nbproject/project.xml Mon Oct 30 10:16:02 2017
@@ -29,11 +29,9 @@
<root id="src.earth-obs.dir" name="Earth observation"/>
<root id="src.geotiff.dir" name="GeoTIFF"/>
<root id="src.netcdf.dir" name="NetCDF"/>
- <root id="src.shapefile.dir" name="Shapefile"/>
<root id="src.xmlstore.dir" name="XMLStore"/>
<root id="src.storage.dir" name="Storage"/>
<root id="src.feature.dir" name="Feature"/>
- <root id="src.raster.dir" name="Raster"/>
<root id="src.referencing.dir" name="Referencing"/>
<root id="src.ref-by-id.dir" name="Referencing by identifiers"/>
<root id="src.metadata.dir" name="Metadata"/>
@@ -48,11 +46,9 @@
<root id="test.earth-obs.dir" name="Test Earth observation"/>
<root id="test.geotiff.dir" name="Test GeoTIFF"/>
<root id="test.netcdf.dir" name="Test NetCDF"/>
- <root id="test.shapefile.dir" name="Test Shapefile"/>
<root id="test.xmlstore.dir" name="Test XMLStore"/>
<root id="test.storage.dir" name="Test Storage"/>
<root id="test.feature.dir" name="Test Feature"/>
- <root id="test.raster.dir" name="Test Raster"/>
<root id="test.referencing.dir" name="Test Referencing"/>
<root id="test.ref-by-id.dir" name="Test Referencing by identifiers"/>
<root id="test.metadata.dir" name="Test Metadata"/>
Modified: sis/branches/0.8/storage/pom.xml
URL: http://svn.apache.org/viewvc/sis/branches/0.8/storage/pom.xml?rev=1813745&r1=1813744&r2=1813745&view=diff
==============================================================================
--- sis/branches/0.8/storage/pom.xml (original)
+++ sis/branches/0.8/storage/pom.xml Mon Oct 30 10:16:02 2017
@@ -159,7 +159,6 @@
=========================================================== -->
<modules>
<module>sis-storage</module>
- <module>sis-shapefile</module>
<module>sis-netcdf</module>
<module>sis-geotiff</module>
<module>sis-xmlstore</module>