Author: desruisseaux
Date: Tue Feb 3 22:45:28 2015
New Revision: 1656940
URL: http://svn.apache.org/r1656940
Log:
Omit the shapefile module for this release.
Removed:
sis/branches/0.5/storage/sis-shapefile/
Modified:
sis/branches/0.5/ide-project/NetBeans/nbproject/build-impl.xml
sis/branches/0.5/ide-project/NetBeans/nbproject/genfiles.properties
sis/branches/0.5/ide-project/NetBeans/nbproject/project.properties
sis/branches/0.5/ide-project/NetBeans/nbproject/project.xml
sis/branches/0.5/storage/pom.xml
Modified: sis/branches/0.5/ide-project/NetBeans/nbproject/build-impl.xml
URL:
http://svn.apache.org/viewvc/sis/branches/0.5/ide-project/NetBeans/nbproject/build-impl.xml?rev=1656940&r1=1656939&r2=1656940&view=diff
==============================================================================
--- sis/branches/0.5/ide-project/NetBeans/nbproject/build-impl.xml (original)
+++ sis/branches/0.5/ide-project/NetBeans/nbproject/build-impl.xml Tue Feb 3
22:45:28 2015
@@ -124,7 +124,6 @@ is divided into following sections:
<or>
<available file="${test.console.dir}"/>
<available file="${test.netcdf.dir}"/>
- <available file="${test.shapefile.dir}"/>
<available file="${test.storage.dir}"/>
<available file="${test.feature.dir}"/>
<available file="${test.referencing.dir}"/>
@@ -139,7 +138,6 @@ is divided into following sections:
<available file="${src.webapp.dir}"/>
<available file="${src.console.dir}"/>
<available file="${src.netcdf.dir}"/>
- <available file="${src.shapefile.dir}"/>
<available file="${src.storage.dir}"/>
<available file="${src.feature.dir}"/>
<available file="${src.referencing.dir}"/>
@@ -245,7 +243,6 @@ is divided into following sections:
<fail unless="src.webapp.dir">Must set src.webapp.dir</fail>
<fail unless="src.console.dir">Must set src.console.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.storage.dir">Must set src.storage.dir</fail>
<fail unless="src.feature.dir">Must set src.feature.dir</fail>
<fail unless="src.referencing.dir">Must set src.referencing.dir</fail>
@@ -254,7 +251,6 @@ is divided into following sections:
<fail unless="src.fra-profile.dir">Must set src.fra-profile.dir</fail>
<fail unless="test.console.dir">Must set test.console.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.storage.dir">Must set test.storage.dir</fail>
<fail unless="test.feature.dir">Must set test.feature.dir</fail>
<fail unless="test.referencing.dir">Must set
test.referencing.dir</fail>
@@ -281,7 +277,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.netcdf.dir}:${src.shapefile.dir}:${src.storage.dir}:${src.feature.dir}:${src.referencing.dir}:${src.metadata.dir}:${src.utility.dir}:${src.fra-profile.dir}"
name="srcdir"/>
+ <attribute
default="${src.local-src.dir}:${src.webapp.dir}:${src.console.dir}:${src.netcdf.dir}:${src.storage.dir}:${src.feature.dir}:${src.referencing.dir}:${src.metadata.dir}:${src.utility.dir}:${src.fra-profile.dir}"
name="srcdir"/>
<attribute default="${build.classes.dir}" name="destdir"/>
<attribute default="${javac.classpath}" name="classpath"/>
<attribute default="${javac.processorpath}" name="processorpath"/>
@@ -322,7 +318,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.netcdf.dir}:${src.shapefile.dir}:${src.storage.dir}:${src.feature.dir}:${src.referencing.dir}:${src.metadata.dir}:${src.utility.dir}:${src.fra-profile.dir}"
name="srcdir"/>
+ <attribute
default="${src.local-src.dir}:${src.webapp.dir}:${src.console.dir}:${src.netcdf.dir}:${src.storage.dir}:${src.feature.dir}:${src.referencing.dir}:${src.metadata.dir}:${src.utility.dir}:${src.fra-profile.dir}"
name="srcdir"/>
<attribute default="${build.classes.dir}" name="destdir"/>
<attribute default="${javac.classpath}" name="classpath"/>
<attribute default="${javac.processorpath}" name="processorpath"/>
@@ -355,7 +351,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.netcdf.dir}:${src.shapefile.dir}:${src.storage.dir}:${src.feature.dir}:${src.referencing.dir}:${src.metadata.dir}:${src.utility.dir}:${src.fra-profile.dir}"
name="srcdir"/>
+ <attribute
default="${src.local-src.dir}:${src.webapp.dir}:${src.console.dir}:${src.netcdf.dir}:${src.storage.dir}:${src.feature.dir}:${src.referencing.dir}:${src.metadata.dir}:${src.utility.dir}:${src.fra-profile.dir}"
name="srcdir"/>
<attribute default="${build.classes.dir}" name="destdir"/>
<attribute default="${javac.classpath}" name="classpath"/>
<sequential>
@@ -448,9 +444,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.storage.dir}"
excludes="@{excludes},${excludes}" includes="@{includes}">
<filename name="@{testincludes}"/>
</fileset>
@@ -504,9 +497,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.storage.dir}"
excludes="@{excludes},**/*.xml,${excludes}" includes="@{includes}">
<filename name="@{testincludes}"/>
</fileset>
@@ -640,9 +630,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.storage.dir}"
excludes="@{excludes},${excludes}" includes="@{includes}">
<filename name="@{testincludes}"/>
</fileset>
@@ -1025,7 +1012,7 @@ is divided into following sections:
<include name="*"/>
</dirset>
</pathconvert>
- <j2seproject3:depend
srcdir="${src.local-src.dir}:${src.webapp.dir}:${src.console.dir}:${src.netcdf.dir}:${src.shapefile.dir}:${src.storage.dir}:${src.feature.dir}:${src.referencing.dir}:${src.metadata.dir}:${src.utility.dir}:${src.fra-profile.dir}:${build.generated.subdirs}"/>
+ <j2seproject3:depend
srcdir="${src.local-src.dir}:${src.webapp.dir}:${src.console.dir}:${src.netcdf.dir}:${src.storage.dir}:${src.feature.dir}:${src.referencing.dir}:${src.metadata.dir}:${src.utility.dir}:${src.fra-profile.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}"/>
@@ -1034,7 +1021,6 @@ is divided into following sections:
<fileset dir="${src.webapp.dir}"
excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
<fileset dir="${src.console.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.storage.dir}"
excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
<fileset dir="${src.feature.dir}"
excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
<fileset dir="${src.referencing.dir}"
excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
@@ -1061,7 +1047,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.netcdf.dir}:${src.shapefile.dir}:${src.storage.dir}:${src.feature.dir}:${src.referencing.dir}:${src.metadata.dir}:${src.utility.dir}:${src.fra-profile.dir}"/>
+ <j2seproject3:javac excludes=""
gensrcdir="${build.generated.sources.dir}" includes="${javac.includes}"
sourcepath="${src.local-src.dir}:${src.webapp.dir}:${src.console.dir}:${src.netcdf.dir}:${src.storage.dir}:${src.feature.dir}:${src.referencing.dir}:${src.metadata.dir}:${src.utility.dir}:${src.fra-profile.dir}"/>
</target>
<target name="-post-compile-single">
<!-- Empty placeholder for easier customization. -->
@@ -1339,9 +1325,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.storage.dir}"
excludes="${bug5101868workaround},${excludes}" includes="${includes}">
<filename name="**/*.java"/>
</fileset>
@@ -1379,9 +1362,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.storage.dir}" excludes="${excludes}"
includes="${includes}">
<filename name="**/doc-files/**"/>
</fileset>
@@ -1422,14 +1402,13 @@ 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.console.dir}:${test.netcdf.dir}:${test.shapefile.dir}:${test.storage.dir}:${test.feature.dir}:${test.referencing.dir}:${test.metadata.dir}:${test.utility.dir}:${test.fra-profile.dir}"/>
+ <j2seproject3:depend classpath="${javac.test.classpath}"
destdir="${build.test.classes.dir}"
srcdir="${test.console.dir}:${test.netcdf.dir}:${test.storage.dir}:${test.feature.dir}:${test.referencing.dir}:${test.metadata.dir}:${test.utility.dir}:${test.fra-profile.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.console.dir}:${test.netcdf.dir}:${test.shapefile.dir}:${test.storage.dir}:${test.feature.dir}:${test.referencing.dir}:${test.metadata.dir}:${test.utility.dir}:${test.fra-profile.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.console.dir}:${test.netcdf.dir}:${test.storage.dir}:${test.feature.dir}:${test.referencing.dir}:${test.metadata.dir}:${test.utility.dir}:${test.fra-profile.dir}"/>
<copy todir="${build.test.classes.dir}">
<fileset dir="${test.console.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.storage.dir}"
excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
<fileset dir="${test.feature.dir}"
excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
<fileset dir="${test.referencing.dir}"
excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
@@ -1450,11 +1429,10 @@ 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.console.dir}:${test.netcdf.dir}:${test.shapefile.dir}:${test.storage.dir}:${test.feature.dir}:${test.referencing.dir}:${test.metadata.dir}:${test.utility.dir}:${test.fra-profile.dir}"
srcdir="${test.console.dir}:${test.netcdf.dir}:${test.shapefile.dir}:${test.storage.dir}:${test.feature.dir}:${test.referencing.dir}:${test.metadata.dir}:${test.utility.dir}:${test.fra-profile.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.console.dir}:${test.netcdf.dir}:${test.storage.dir}:${test.feature.dir}:${test.referencing.dir}:${test.metadata.dir}:${test.utility.dir}:${test.fra-profile.dir}"
srcdir="${test.console.dir}:${test.netcdf.dir}:${test.storage.dir}:${test.feature.dir}:${test.referencing.dir}:${test.metadata.dir}:${test.utility.dir}:${test.fra-profile.dir}"/>
<copy todir="${build.test.classes.dir}">
<fileset dir="${test.console.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.storage.dir}"
excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
<fileset dir="${test.feature.dir}"
excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
<fileset dir="${test.referencing.dir}"
excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
Modified: sis/branches/0.5/ide-project/NetBeans/nbproject/genfiles.properties
URL:
http://svn.apache.org/viewvc/sis/branches/0.5/ide-project/NetBeans/nbproject/genfiles.properties?rev=1656940&r1=1656939&r2=1656940&view=diff
==============================================================================
--- sis/branches/0.5/ide-project/NetBeans/nbproject/genfiles.properties
[ISO-8859-1] (original)
+++ sis/branches/0.5/ide-project/NetBeans/nbproject/genfiles.properties
[ISO-8859-1] Tue Feb 3 22:45:28 2015
@@ -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=94a2aa6e
-nbproject/build-impl.xml.script.CRC32=2fa0fa9a
-nbproject/build-impl.xml.stylesheet.CRC32=876e7a8f@1.74.1.48
+nbproject/build-impl.xml.data.CRC32=381418ed
+nbproject/build-impl.xml.script.CRC32=77576dce
+nbproject/build-impl.xml.stylesheet.CRC32=876e7a8f@1.75.2.48
Modified: sis/branches/0.5/ide-project/NetBeans/nbproject/project.properties
URL:
http://svn.apache.org/viewvc/sis/branches/0.5/ide-project/NetBeans/nbproject/project.properties?rev=1656940&r1=1656939&r2=1656940&view=diff
==============================================================================
--- sis/branches/0.5/ide-project/NetBeans/nbproject/project.properties
[ISO-8859-1] (original)
+++ sis/branches/0.5/ide-project/NetBeans/nbproject/project.properties
[ISO-8859-1] Tue Feb 3 22:45:28 2015
@@ -50,8 +50,6 @@ src.console.dir = ${project.root}/a
test.console.dir = ${project.root}/application/sis-console/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.storage.dir = ${project.root}/storage/sis-storage/src/main/java
test.storage.dir = ${project.root}/storage/sis-storage/src/test/java
src.feature.dir = ${project.root}/core/sis-feature/src/main/java
Modified: sis/branches/0.5/ide-project/NetBeans/nbproject/project.xml
URL:
http://svn.apache.org/viewvc/sis/branches/0.5/ide-project/NetBeans/nbproject/project.xml?rev=1656940&r1=1656939&r2=1656940&view=diff
==============================================================================
--- sis/branches/0.5/ide-project/NetBeans/nbproject/project.xml (original)
+++ sis/branches/0.5/ide-project/NetBeans/nbproject/project.xml Tue Feb 3
22:45:28 2015
@@ -27,7 +27,6 @@
<root id="src.webapp.dir" name="Web application"/>
<root id="src.console.dir" name="Console"/>
<root id="src.netcdf.dir" name="NetCDF"/>
- <root id="src.shapefile.dir" name="Shapefile"/>
<root id="src.storage.dir" name="Storage"/>
<root id="src.feature.dir" name="Feature"/>
<root id="src.referencing.dir" name="Referencing"/>
@@ -38,7 +37,6 @@
<test-roots>
<root id="test.console.dir" name="Test Console"/>
<root id="test.netcdf.dir" name="Test NetCDF"/>
- <root id="test.shapefile.dir" name="Test Shapefile"/>
<root id="test.storage.dir" name="Test Storage"/>
<root id="test.feature.dir" name="Test Feature"/>
<root id="test.referencing.dir" name="Test Referencing"/>
Modified: sis/branches/0.5/storage/pom.xml
URL:
http://svn.apache.org/viewvc/sis/branches/0.5/storage/pom.xml?rev=1656940&r1=1656939&r2=1656940&view=diff
==============================================================================
--- sis/branches/0.5/storage/pom.xml (original)
+++ sis/branches/0.5/storage/pom.xml Tue Feb 3 22:45:28 2015
@@ -136,7 +136,6 @@
=========================================================== -->
<modules>
<module>sis-storage</module>
- <module>sis-shapefile</module>
<module>sis-netcdf</module>
</modules>
