sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1486860 - in /sis/branches/JDK7: core/sis-metadata/src/test/java/org/apache/sis/test/suite/ core/sis-referencing/src/test/java/org/apache/sis/test/suite/ core/sis-utility/src/test/java/org/apache/sis/test/ core/sis-utility/src/test/java/or...
Date Tue, 28 May 2013 10:42:56 GMT
Author: desruisseaux
Date: Tue May 28 10:42:55 2013
New Revision: 1486860

URL: http://svn.apache.org/r1486860
Log:
Extracted the classes common to all storage modules out of sis-netcdf, and provide them in
a new sis-storage module.
It would have been possible to wait to have a second storage module before to make this move,
however it seems easier
to perform the split soon rather than to wait, in order to allow us to setup the dependencies
in their final form now.

Added:
    sis/branches/JDK7/storage/sis-storage/   (with props)
    sis/branches/JDK7/storage/sis-storage/pom.xml
      - copied, changed from r1486639, sis/branches/JDK7/storage/sis-netcdf/pom.xml
    sis/branches/JDK7/storage/sis-storage/src/
    sis/branches/JDK7/storage/sis-storage/src/main/
    sis/branches/JDK7/storage/sis-storage/src/main/java/
    sis/branches/JDK7/storage/sis-storage/src/main/java/org/
    sis/branches/JDK7/storage/sis-storage/src/main/java/org/apache/
    sis/branches/JDK7/storage/sis-storage/src/main/java/org/apache/sis/
    sis/branches/JDK7/storage/sis-storage/src/main/java/org/apache/sis/internal/
    sis/branches/JDK7/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/
      - copied from r1486639, sis/branches/JDK7/storage/sis-netcdf/src/main/java/org/apache/sis/internal/storage/
    sis/branches/JDK7/storage/sis-storage/src/main/java/org/apache/sis/internal/storage/ChannelDataInput.java
      - copied unchanged from r1486850, sis/branches/JDK7/storage/sis-netcdf/src/main/java/org/apache/sis/internal/storage/ChannelDataInput.java
    sis/branches/JDK7/storage/sis-storage/src/main/java/org/apache/sis/storage/
    sis/branches/JDK7/storage/sis-storage/src/main/java/org/apache/sis/storage/DataStoreException.java
      - copied unchanged from r1486639, sis/branches/JDK7/storage/sis-netcdf/src/main/java/org/apache/sis/storage/DataStoreException.java
    sis/branches/JDK7/storage/sis-storage/src/main/java/org/apache/sis/storage/package-info.java
      - copied unchanged from r1486639, sis/branches/JDK7/storage/sis-netcdf/src/main/java/org/apache/sis/storage/package-info.java
    sis/branches/JDK7/storage/sis-storage/src/test/
    sis/branches/JDK7/storage/sis-storage/src/test/java/
    sis/branches/JDK7/storage/sis-storage/src/test/java/org/
    sis/branches/JDK7/storage/sis-storage/src/test/java/org/apache/
    sis/branches/JDK7/storage/sis-storage/src/test/java/org/apache/sis/
    sis/branches/JDK7/storage/sis-storage/src/test/java/org/apache/sis/internal/
    sis/branches/JDK7/storage/sis-storage/src/test/java/org/apache/sis/internal/storage/
      - copied from r1486639, sis/branches/JDK7/storage/sis-netcdf/src/test/java/org/apache/sis/internal/storage/
    sis/branches/JDK7/storage/sis-storage/src/test/java/org/apache/sis/test/
    sis/branches/JDK7/storage/sis-storage/src/test/java/org/apache/sis/test/suite/
    sis/branches/JDK7/storage/sis-storage/src/test/java/org/apache/sis/test/suite/StorageTestSuite.java
      - copied, changed from r1486639, sis/branches/JDK7/storage/sis-netcdf/src/test/java/org/apache/sis/test/suite/NetcdfTestSuite.java
Removed:
    sis/branches/JDK7/storage/sis-netcdf/src/main/java/org/apache/sis/internal/storage/
    sis/branches/JDK7/storage/sis-netcdf/src/main/java/org/apache/sis/storage/DataStoreException.java
    sis/branches/JDK7/storage/sis-netcdf/src/main/java/org/apache/sis/storage/package-info.java
    sis/branches/JDK7/storage/sis-netcdf/src/test/java/org/apache/sis/internal/storage/
Modified:
    sis/branches/JDK7/core/sis-metadata/src/test/java/org/apache/sis/test/suite/MetadataTestSuite.java
    sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/test/suite/ReferencingTestSuite.java
    sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/test/TestSuite.java
    sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/test/suite/UtilityTestSuite.java
    sis/branches/JDK7/ide-project/NetBeans/nbproject/build-impl.xml
    sis/branches/JDK7/ide-project/NetBeans/nbproject/genfiles.properties
    sis/branches/JDK7/ide-project/NetBeans/nbproject/project.properties
    sis/branches/JDK7/ide-project/NetBeans/nbproject/project.xml
    sis/branches/JDK7/storage/pom.xml
    sis/branches/JDK7/storage/sis-netcdf/pom.xml
    sis/branches/JDK7/storage/sis-netcdf/src/test/java/org/apache/sis/test/suite/NetcdfTestSuite.java

Modified: sis/branches/JDK7/core/sis-metadata/src/test/java/org/apache/sis/test/suite/MetadataTestSuite.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/test/java/org/apache/sis/test/suite/MetadataTestSuite.java?rev=1486860&r1=1486859&r2=1486860&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/test/java/org/apache/sis/test/suite/MetadataTestSuite.java
[UTF-8] (original)
+++ sis/branches/JDK7/core/sis-metadata/src/test/java/org/apache/sis/test/suite/MetadataTestSuite.java
[UTF-8] Tue May 28 10:42:55 2013
@@ -56,7 +56,7 @@ import org.junit.BeforeClass;
 public final strictfp class MetadataTestSuite extends TestSuite {
     /**
      * Verifies the list of tests before to run the suite.
-     * See {@link #verifyTestList(Class)} for more information.
+     * See {@link #verifyTestList(Class, Class<?>[])} for more information.
      */
     @BeforeClass
     public static void verifyTestList() {

Modified: sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/test/suite/ReferencingTestSuite.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/test/suite/ReferencingTestSuite.java?rev=1486860&r1=1486859&r2=1486860&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/test/suite/ReferencingTestSuite.java
[UTF-8] (original)
+++ sis/branches/JDK7/core/sis-referencing/src/test/java/org/apache/sis/test/suite/ReferencingTestSuite.java
[UTF-8] Tue May 28 10:42:55 2013
@@ -43,7 +43,7 @@ import org.junit.BeforeClass;
 public final strictfp class ReferencingTestSuite extends TestSuite {
     /**
      * Verifies the list of tests before to run the suite.
-     * See {@link #verifyTestList(Class)} for more information.
+     * See {@link #verifyTestList(Class, Class<?>[])} for more information.
      */
     @BeforeClass
     public static void verifyTestList() {

Modified: sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/test/TestSuite.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/test/TestSuite.java?rev=1486860&r1=1486859&r2=1486860&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/test/TestSuite.java [UTF-8]
(original)
+++ sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/test/TestSuite.java [UTF-8]
Tue May 28 10:42:55 2013
@@ -65,7 +65,7 @@ public abstract strictfp class TestSuite
      * {@preformat java
      *    &#64;BeforeClass
      *    public static void verifyTestList() {
-     *        verifyTestList(MetadataTestSuite.class);
+     *        verifyTestList(MetadataTestSuite.class, BASE_TEST_CLASSES);
      *    }
      * }
      *

Modified: sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/test/suite/UtilityTestSuite.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/test/suite/UtilityTestSuite.java?rev=1486860&r1=1486859&r2=1486860&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/test/suite/UtilityTestSuite.java
[UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/test/suite/UtilityTestSuite.java
[UTF-8] Tue May 28 10:42:55 2013
@@ -114,7 +114,7 @@ import org.junit.BeforeClass;
 public final strictfp class UtilityTestSuite extends TestSuite {
     /**
      * Verifies the list of tests before to run the suite.
-     * See {@link #verifyTestList(Class)} for more information.
+     * See {@link #verifyTestList(Class, Class<?>[])} for more information.
      */
     @BeforeClass
     public static void verifyTestList() {

Modified: sis/branches/JDK7/ide-project/NetBeans/nbproject/build-impl.xml
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/ide-project/NetBeans/nbproject/build-impl.xml?rev=1486860&r1=1486859&r2=1486860&view=diff
==============================================================================
--- sis/branches/JDK7/ide-project/NetBeans/nbproject/build-impl.xml (original)
+++ sis/branches/JDK7/ide-project/NetBeans/nbproject/build-impl.xml Tue May 28 10:42:55 2013
@@ -136,6 +136,7 @@ is divided into following sections:
         <condition property="have.tests">
             <or>
                 <available file="${test.netcdf.dir}"/>
+                <available file="${test.storage.dir}"/>
                 <available file="${test.referencing.dir}"/>
                 <available file="${test.metadata.dir}"/>
                 <available file="${test.utility.dir}"/>
@@ -147,6 +148,7 @@ is divided into following sections:
                 <available file="${src.webapp.dir}"/>
                 <available file="${src.app.dir}"/>
                 <available file="${src.netcdf.dir}"/>
+                <available file="${src.storage.dir}"/>
                 <available file="${src.referencing.dir}"/>
                 <available file="${src.metadata.dir}"/>
                 <available file="${src.utility.dir}"/>
@@ -241,10 +243,12 @@ is divided into following sections:
         <fail unless="src.webapp.dir">Must set src.webapp.dir</fail>
         <fail unless="src.app.dir">Must set src.app.dir</fail>
         <fail unless="src.netcdf.dir">Must set src.netcdf.dir</fail>
+        <fail unless="src.storage.dir">Must set src.storage.dir</fail>
         <fail unless="src.referencing.dir">Must set src.referencing.dir</fail>
         <fail unless="src.metadata.dir">Must set src.metadata.dir</fail>
         <fail unless="src.utility.dir">Must set src.utility.dir</fail>
         <fail unless="test.netcdf.dir">Must set test.netcdf.dir</fail>
+        <fail unless="test.storage.dir">Must set test.storage.dir</fail>
         <fail unless="test.referencing.dir">Must set test.referencing.dir</fail>
         <fail unless="test.metadata.dir">Must set test.metadata.dir</fail>
         <fail unless="test.utility.dir">Must set test.utility.dir</fail>
@@ -268,7 +272,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.app.dir}:${src.netcdf.dir}:${src.referencing.dir}:${src.metadata.dir}:${src.utility.dir}"
name="srcdir"/>
+            <attribute default="${src.local-src.dir}:${src.webapp.dir}:${src.app.dir}:${src.netcdf.dir}:${src.storage.dir}:${src.referencing.dir}:${src.metadata.dir}:${src.utility.dir}"
name="srcdir"/>
             <attribute default="${build.classes.dir}" name="destdir"/>
             <attribute default="${javac.classpath}" name="classpath"/>
             <attribute default="${javac.processorpath}" name="processorpath"/>
@@ -308,7 +312,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.app.dir}:${src.netcdf.dir}:${src.referencing.dir}:${src.metadata.dir}:${src.utility.dir}"
name="srcdir"/>
+            <attribute default="${src.local-src.dir}:${src.webapp.dir}:${src.app.dir}:${src.netcdf.dir}:${src.storage.dir}:${src.referencing.dir}:${src.metadata.dir}:${src.utility.dir}"
name="srcdir"/>
             <attribute default="${build.classes.dir}" name="destdir"/>
             <attribute default="${javac.classpath}" name="classpath"/>
             <attribute default="${javac.processorpath}" name="processorpath"/>
@@ -340,7 +344,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.app.dir}:${src.netcdf.dir}:${src.referencing.dir}:${src.metadata.dir}:${src.utility.dir}"
name="srcdir"/>
+            <attribute default="${src.local-src.dir}:${src.webapp.dir}:${src.app.dir}:${src.netcdf.dir}:${src.storage.dir}:${src.referencing.dir}:${src.metadata.dir}:${src.utility.dir}"
name="srcdir"/>
             <attribute default="${build.classes.dir}" name="destdir"/>
             <attribute default="${javac.classpath}" name="classpath"/>
             <sequential>
@@ -430,6 +434,9 @@ is divided into following sections:
                         <fileset dir="${test.netcdf.dir}" excludes="@{excludes},${excludes}"
includes="@{includes}">
                             <filename name="@{testincludes}"/>
                         </fileset>
+                        <fileset dir="${test.storage.dir}" excludes="@{excludes},${excludes}"
includes="@{includes}">
+                            <filename name="@{testincludes}"/>
+                        </fileset>
                         <fileset dir="${test.referencing.dir}" excludes="@{excludes},${excludes}"
includes="@{includes}">
                             <filename name="@{testincludes}"/>
                         </fileset>
@@ -471,6 +478,9 @@ is divided into following sections:
                     <fileset dir="${test.netcdf.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>
                     <fileset dir="${test.referencing.dir}" excludes="@{excludes},**/*.xml,${excludes}"
includes="@{includes}">
                         <filename name="@{testincludes}"/>
                     </fileset>
@@ -592,6 +602,9 @@ is divided into following sections:
                         <fileset dir="${test.netcdf.dir}" excludes="@{excludes},${excludes}"
includes="@{includes}">
                             <filename name="@{testincludes}"/>
                         </fileset>
+                        <fileset dir="${test.storage.dir}" excludes="@{excludes},${excludes}"
includes="@{includes}">
+                            <filename name="@{testincludes}"/>
+                        </fileset>
                         <fileset dir="${test.referencing.dir}" excludes="@{excludes},${excludes}"
includes="@{includes}">
                             <filename name="@{testincludes}"/>
                         </fileset>
@@ -965,7 +978,7 @@ is divided into following sections:
                 <include name="*"/>
             </dirset>
         </pathconvert>
-        <j2seproject3:depend srcdir="${src.local-src.dir}:${src.webapp.dir}:${src.app.dir}:${src.netcdf.dir}:${src.referencing.dir}:${src.metadata.dir}:${src.utility.dir}:${build.generated.subdirs}"/>
+        <j2seproject3:depend srcdir="${src.local-src.dir}:${src.webapp.dir}:${src.app.dir}:${src.netcdf.dir}:${src.storage.dir}:${src.referencing.dir}:${src.metadata.dir}:${src.utility.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}"/>
@@ -974,6 +987,7 @@ is divided into following sections:
             <fileset dir="${src.webapp.dir}" excludes="${build.classes.excludes},${excludes}"
includes="${includes}"/>
             <fileset dir="${src.app.dir}" excludes="${build.classes.excludes},${excludes}"
includes="${includes}"/>
             <fileset dir="${src.netcdf.dir}" excludes="${build.classes.excludes},${excludes}"
includes="${includes}"/>
+            <fileset dir="${src.storage.dir}" excludes="${build.classes.excludes},${excludes}"
includes="${includes}"/>
             <fileset dir="${src.referencing.dir}" excludes="${build.classes.excludes},${excludes}"
includes="${includes}"/>
             <fileset dir="${src.metadata.dir}" excludes="${build.classes.excludes},${excludes}"
includes="${includes}"/>
             <fileset dir="${src.utility.dir}" excludes="${build.classes.excludes},${excludes}"
includes="${includes}"/>
@@ -997,7 +1011,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.app.dir}:${src.netcdf.dir}:${src.referencing.dir}:${src.metadata.dir}:${src.utility.dir}"/>
+        <j2seproject3:javac excludes="" gensrcdir="${build.generated.sources.dir}" includes="${javac.includes}"
sourcepath="${src.local-src.dir}:${src.webapp.dir}:${src.app.dir}:${src.netcdf.dir}:${src.storage.dir}:${src.referencing.dir}:${src.metadata.dir}:${src.utility.dir}"/>
     </target>
     <target name="-post-compile-single">
         <!-- Empty placeholder for easier customization. -->
@@ -1270,6 +1284,9 @@ is divided into following sections:
             <fileset dir="${src.netcdf.dir}" excludes="*.java,${excludes}" includes="${includes}">
                 <filename name="**/*.java"/>
             </fileset>
+            <fileset dir="${src.storage.dir}" excludes="*.java,${excludes}" includes="${includes}">
+                <filename name="**/*.java"/>
+            </fileset>
             <fileset dir="${src.referencing.dir}" excludes="*.java,${excludes}" includes="${includes}">
                 <filename name="**/*.java"/>
             </fileset>
@@ -1298,6 +1315,9 @@ is divided into following sections:
             <fileset dir="${src.netcdf.dir}" excludes="${excludes}" includes="${includes}">
                 <filename name="**/doc-files/**"/>
             </fileset>
+            <fileset dir="${src.storage.dir}" excludes="${excludes}" includes="${includes}">
+                <filename name="**/doc-files/**"/>
+            </fileset>
             <fileset dir="${src.referencing.dir}" excludes="${excludes}" includes="${includes}">
                 <filename name="**/doc-files/**"/>
             </fileset>
@@ -1329,12 +1349,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.netcdf.dir}:${test.referencing.dir}:${test.metadata.dir}:${test.utility.dir}"/>
+        <j2seproject3:depend classpath="${javac.test.classpath}" destdir="${build.test.classes.dir}"
srcdir="${test.netcdf.dir}:${test.storage.dir}:${test.referencing.dir}:${test.metadata.dir}:${test.utility.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.netcdf.dir}:${test.referencing.dir}:${test.metadata.dir}:${test.utility.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.netcdf.dir}:${test.storage.dir}:${test.referencing.dir}:${test.metadata.dir}:${test.utility.dir}"/>
         <copy todir="${build.test.classes.dir}">
             <fileset dir="${test.netcdf.dir}" excludes="${build.classes.excludes},${excludes}"
includes="${includes}"/>
+            <fileset dir="${test.storage.dir}" excludes="${build.classes.excludes},${excludes}"
includes="${includes}"/>
             <fileset dir="${test.referencing.dir}" excludes="${build.classes.excludes},${excludes}"
includes="${includes}"/>
             <fileset dir="${test.metadata.dir}" excludes="${build.classes.excludes},${excludes}"
includes="${includes}"/>
             <fileset dir="${test.utility.dir}" excludes="${build.classes.excludes},${excludes}"
includes="${includes}"/>
@@ -1352,9 +1373,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.netcdf.dir}:${test.referencing.dir}:${test.metadata.dir}:${test.utility.dir}"
srcdir="${test.netcdf.dir}:${test.referencing.dir}:${test.metadata.dir}:${test.utility.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.netcdf.dir}:${test.storage.dir}:${test.referencing.dir}:${test.metadata.dir}:${test.utility.dir}"
srcdir="${test.netcdf.dir}:${test.storage.dir}:${test.referencing.dir}:${test.metadata.dir}:${test.utility.dir}"/>
         <copy todir="${build.test.classes.dir}">
             <fileset dir="${test.netcdf.dir}" excludes="${build.classes.excludes},${excludes}"
includes="${includes}"/>
+            <fileset dir="${test.storage.dir}" excludes="${build.classes.excludes},${excludes}"
includes="${includes}"/>
             <fileset dir="${test.referencing.dir}" excludes="${build.classes.excludes},${excludes}"
includes="${includes}"/>
             <fileset dir="${test.metadata.dir}" excludes="${build.classes.excludes},${excludes}"
includes="${includes}"/>
             <fileset dir="${test.utility.dir}" excludes="${build.classes.excludes},${excludes}"
includes="${includes}"/>

Modified: sis/branches/JDK7/ide-project/NetBeans/nbproject/genfiles.properties
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/ide-project/NetBeans/nbproject/genfiles.properties?rev=1486860&r1=1486859&r2=1486860&view=diff
==============================================================================
--- sis/branches/JDK7/ide-project/NetBeans/nbproject/genfiles.properties [ISO-8859-1] (original)
+++ sis/branches/JDK7/ide-project/NetBeans/nbproject/genfiles.properties [ISO-8859-1] Tue
May 28 10:42:55 2013
@@ -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=08945aac
-nbproject/build-impl.xml.script.CRC32=3e302f66
+nbproject/build-impl.xml.data.CRC32=8ee4ca76
+nbproject/build-impl.xml.script.CRC32=3ef3d339
 nbproject/build-impl.xml.stylesheet.CRC32=c6d2a60f@1.56.1.46

Modified: sis/branches/JDK7/ide-project/NetBeans/nbproject/project.properties
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/ide-project/NetBeans/nbproject/project.properties?rev=1486860&r1=1486859&r2=1486860&view=diff
==============================================================================
--- sis/branches/JDK7/ide-project/NetBeans/nbproject/project.properties [ISO-8859-1] (original)
+++ sis/branches/JDK7/ide-project/NetBeans/nbproject/project.properties [ISO-8859-1] Tue May
28 10:42:55 2013
@@ -30,6 +30,8 @@ src.webapp.dir       = ${project.root}/a
 src.app.dir          = ${project.root}/application/sis-app/src/main/java
 src.netcdf.dir       = ${project.root}/storage/sis-netcdf/src/main/java
 test.netcdf.dir      = ${project.root}/storage/sis-netcdf/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.referencing.dir  = ${project.root}/core/sis-referencing/src/main/java
 test.referencing.dir = ${project.root}/core/sis-referencing/src/test/java
 src.metadata.dir     = ${project.root}/core/sis-metadata/src/main/java

Modified: sis/branches/JDK7/ide-project/NetBeans/nbproject/project.xml
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/ide-project/NetBeans/nbproject/project.xml?rev=1486860&r1=1486859&r2=1486860&view=diff
==============================================================================
--- sis/branches/JDK7/ide-project/NetBeans/nbproject/project.xml (original)
+++ sis/branches/JDK7/ide-project/NetBeans/nbproject/project.xml Tue May 28 10:42:55 2013
@@ -9,12 +9,14 @@
                 <root id="src.webapp.dir" name="Web application"/>
                 <root id="src.app.dir" name="Application"/>
                 <root id="src.netcdf.dir" name="NetCDF"/>
+                <root id="src.storage.dir" name="Storage"/>
                 <root id="src.referencing.dir" name="Referencing"/>
                 <root id="src.metadata.dir" name="Metadata"/>
                 <root id="src.utility.dir" name="Utility"/>
             </source-roots>
             <test-roots>
                 <root id="test.netcdf.dir" name="NetCDF tests"/>
+                <root id="test.storage.dir" name="Storage tests"/>
                 <root id="test.referencing.dir" name="Referencing tests"/>
                 <root id="test.metadata.dir" name="Metadata tests"/>
                 <root id="test.utility.dir" name="Utility tests"/>

Modified: sis/branches/JDK7/storage/pom.xml
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/storage/pom.xml?rev=1486860&r1=1486859&r2=1486860&view=diff
==============================================================================
--- sis/branches/JDK7/storage/pom.xml (original)
+++ sis/branches/JDK7/storage/pom.xml Tue May 28 10:42:55 2013
@@ -107,6 +107,7 @@
            Sub-modules included in the build
        =========================================================== -->
   <modules>
+    <module>sis-storage</module>
     <module>sis-netcdf</module>
   </modules>
 

Modified: sis/branches/JDK7/storage/sis-netcdf/pom.xml
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/storage/sis-netcdf/pom.xml?rev=1486860&r1=1486859&r2=1486860&view=diff
==============================================================================
--- sis/branches/JDK7/storage/sis-netcdf/pom.xml (original)
+++ sis/branches/JDK7/storage/sis-netcdf/pom.xml Tue May 28 10:42:55 2013
@@ -90,6 +90,11 @@ Bridge between NetCDF Climate and Foreca
        =========================================================== -->
   <dependencies>
     <dependency>
+      <groupId>org.apache.sis.storage</groupId>
+      <artifactId>sis-storage</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
       <groupId>edu.ucar</groupId>
       <artifactId>netcdf</artifactId>
     </dependency>

Modified: sis/branches/JDK7/storage/sis-netcdf/src/test/java/org/apache/sis/test/suite/NetcdfTestSuite.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/storage/sis-netcdf/src/test/java/org/apache/sis/test/suite/NetcdfTestSuite.java?rev=1486860&r1=1486859&r2=1486860&view=diff
==============================================================================
--- sis/branches/JDK7/storage/sis-netcdf/src/test/java/org/apache/sis/test/suite/NetcdfTestSuite.java
[UTF-8] (original)
+++ sis/branches/JDK7/storage/sis-netcdf/src/test/java/org/apache/sis/test/suite/NetcdfTestSuite.java
[UTF-8] Tue May 28 10:42:55 2013
@@ -24,7 +24,7 @@ import org.junit.BeforeClass;
 
 
 /**
- * All tests from the {@code sis-referencing} module, in approximative dependency order.
+ * All tests from the {@code sis-netcdf} module, in approximative dependency order.
  *
  * @author  Martin Desruisseaux (Geomatys)
  * @since   0.3
@@ -32,7 +32,6 @@ import org.junit.BeforeClass;
  * @module
  */
 @Suite.SuiteClasses({
-    org.apache.sis.internal.storage.ChannelDataInputTest.class,
     org.apache.sis.internal.netcdf.DecoderTest.class,
     org.apache.sis.internal.netcdf.VariableTest.class,
     org.apache.sis.internal.netcdf.GridGeometryTest.class,
@@ -45,7 +44,7 @@ import org.junit.BeforeClass;
 public final strictfp class NetcdfTestSuite extends TestSuite {
     /**
      * Verifies the list of tests before to run the suite.
-     * See {@link #verifyTestList(Class)} for more information.
+     * See {@link #verifyTestList(Class, Class<?>[])} for more information.
      */
     @BeforeClass
     public static void verifyTestList() {

Propchange: sis/branches/JDK7/storage/sis-storage/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue May 28 10:42:55 2013
@@ -0,0 +1 @@
+target

Copied: sis/branches/JDK7/storage/sis-storage/pom.xml (from r1486639, sis/branches/JDK7/storage/sis-netcdf/pom.xml)
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/storage/sis-storage/pom.xml?p2=sis/branches/JDK7/storage/sis-storage/pom.xml&p1=sis/branches/JDK7/storage/sis-netcdf/pom.xml&r1=1486639&r2=1486860&rev=1486860&view=diff
==============================================================================
--- sis/branches/JDK7/storage/sis-netcdf/pom.xml (original)
+++ sis/branches/JDK7/storage/sis-storage/pom.xml Tue May 28 10:42:55 2013
@@ -36,13 +36,13 @@
            Module Description
        =========================================================== -->
   <groupId>org.apache.sis.storage</groupId>
-  <artifactId>sis-netcdf</artifactId>
+  <artifactId>sis-storage</artifactId>
   <packaging>bundle</packaging>
-  <name>Apache SIS NetCDF storage</name>
+  <name>Apache SIS common storage</name>
   <description>
   <!-- Left alignment because this description will be copied in META-INF/MANIFEST.MF
        The leading space after the first line is necessary for proper formatting. -->
-Bridge between NetCDF Climate and Forecast (CF) convention and ISO 19115 metadata.
+DataStore API and base storage classes.
   </description>
 
 
@@ -64,15 +64,6 @@ Bridge between NetCDF Climate and Foreca
   </developers>
   <contributors>
     <contributor>
-      <name>Antoine Hnawia</name>
-      <organization>Institut de Recherche pour le Développement</organization>
-      <organizationUrl>http://www.ird.fr/</organizationUrl>
-      <timezone>+11</timezone>
-      <roles>
-        <role>developer</role>
-      </roles>
-    </contributor>
-    <contributor>
       <name>Johann Sorel</name>
       <email>johann.sorel@geomatys.com</email>
       <organization>Geomatys</organization>
@@ -84,44 +75,4 @@ Bridge between NetCDF Climate and Foreca
     </contributor>
   </contributors>
 
-
-  <!-- ===========================================================
-           Dependencies
-       =========================================================== -->
-  <dependencies>
-    <dependency>
-      <groupId>edu.ucar</groupId>
-      <artifactId>netcdf</artifactId>
-    </dependency>
-
-    <!-- Leverage GeoAPI tests. -->
-    <dependency>
-      <groupId>org.opengis.wrapper</groupId>
-      <artifactId>geoapi-netcdf</artifactId>
-      <version>${geoapi.version}</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.opengis.wrapper</groupId>
-      <artifactId>geoapi-netcdf</artifactId>
-      <version>${geoapi.version}</version>
-      <type>test-jar</type>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-jdk14</artifactId>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-
-  <!--  UCAR repository from which to download the NetCDF library. -->
-  <repositories>
-    <repository>
-      <id>UCAR</id>
-      <name>UCAR repository</name>
-      <url>https://artifacts.unidata.ucar.edu/content/repositories/unidata-releases</url>
-    </repository>
-  </repositories>
-
 </project>

Copied: sis/branches/JDK7/storage/sis-storage/src/test/java/org/apache/sis/test/suite/StorageTestSuite.java
(from r1486639, sis/branches/JDK7/storage/sis-netcdf/src/test/java/org/apache/sis/test/suite/NetcdfTestSuite.java)
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/storage/sis-storage/src/test/java/org/apache/sis/test/suite/StorageTestSuite.java?p2=sis/branches/JDK7/storage/sis-storage/src/test/java/org/apache/sis/test/suite/StorageTestSuite.java&p1=sis/branches/JDK7/storage/sis-netcdf/src/test/java/org/apache/sis/test/suite/NetcdfTestSuite.java&r1=1486639&r2=1486860&rev=1486860&view=diff
==============================================================================
--- sis/branches/JDK7/storage/sis-netcdf/src/test/java/org/apache/sis/test/suite/NetcdfTestSuite.java
[UTF-8] (original)
+++ sis/branches/JDK7/storage/sis-storage/src/test/java/org/apache/sis/test/suite/StorageTestSuite.java
[UTF-8] Tue May 28 10:42:55 2013
@@ -16,15 +16,13 @@
  */
 package org.apache.sis.test.suite;
 
-import org.opengis.wrapper.netcdf.IOTestCase;
 import org.apache.sis.test.TestSuite;
-import org.apache.sis.test.TestCase;
 import org.junit.runners.Suite;
 import org.junit.BeforeClass;
 
 
 /**
- * All tests from the {@code sis-referencing} module, in approximative dependency order.
+ * All tests from the {@code sis-storage} module, in approximative dependency order.
  *
  * @author  Martin Desruisseaux (Geomatys)
  * @since   0.3
@@ -32,26 +30,15 @@ import org.junit.BeforeClass;
  * @module
  */
 @Suite.SuiteClasses({
-    org.apache.sis.internal.storage.ChannelDataInputTest.class,
-    org.apache.sis.internal.netcdf.DecoderTest.class,
-    org.apache.sis.internal.netcdf.VariableTest.class,
-    org.apache.sis.internal.netcdf.GridGeometryTest.class,
-    org.apache.sis.internal.netcdf.impl.ChannelDecoderTest.class,
-    org.apache.sis.internal.netcdf.impl.VariableInfoTest.class,
-    org.apache.sis.internal.netcdf.impl.GridGeometryInfoTest.class,
-    org.apache.sis.storage.netcdf.MetadataReaderTest.class,
-    org.apache.sis.storage.netcdf.ConformanceTest.class
+    org.apache.sis.internal.storage.ChannelDataInputTest.class
 })
-public final strictfp class NetcdfTestSuite extends TestSuite {
+public final strictfp class StorageTestSuite extends TestSuite {
     /**
      * Verifies the list of tests before to run the suite.
-     * See {@link #verifyTestList(Class)} for more information.
+     * See {@link #verifyTestList(Class, Class<?>[])} for more information.
      */
     @BeforeClass
     public static void verifyTestList() {
-        verifyTestList(NetcdfTestSuite.class, new Class<?>[] {
-            TestCase.class,
-            IOTestCase.class
-        });
+        verifyTestList(StorageTestSuite.class, BASE_TEST_CLASSES);
     }
 }



Mime
View raw message