sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1498513 - in /sis/branches/JDK6: ./ core/sis-build-helper/src/site/apt/ core/sis-metadata/src/test/java/org/apache/sis/xml/ ide-project/NetBeans/ ide-project/NetBeans/nbproject/ ide-project/resources-links/ src/main/docbook/ src/main/docbo...
Date Mon, 01 Jul 2013 15:16:19 GMT
Author: desruisseaux
Date: Mon Jul  1 15:16:19 2013
New Revision: 1498513

URL: http://svn.apache.org/r1498513
Log:
Merge from the JDK7 branch.

Removed:
    sis/branches/JDK6/ide-project/resources-links/
Modified:
    sis/branches/JDK6/   (props changed)
    sis/branches/JDK6/core/sis-build-helper/src/site/apt/index.apt
    sis/branches/JDK6/core/sis-metadata/src/test/java/org/apache/sis/xml/FreeTextMarshallingTest.java
    sis/branches/JDK6/ide-project/NetBeans/build.xml
    sis/branches/JDK6/ide-project/NetBeans/nbproject/build-impl.xml
    sis/branches/JDK6/ide-project/NetBeans/nbproject/genfiles.properties
    sis/branches/JDK6/ide-project/NetBeans/nbproject/project.properties
    sis/branches/JDK6/ide-project/NetBeans/nbproject/project.xml
    sis/branches/JDK6/pom.xml
    sis/branches/JDK6/src/main/docbook/fr.xml
    sis/branches/JDK6/src/main/docbook/fr/XML.xml
    sis/branches/JDK6/src/main/docbook/fr/coverage.xml
    sis/branches/JDK6/src/main/docbook/fr/geoapi.xml
    sis/branches/JDK6/src/main/docbook/fr/geometry.xml
    sis/branches/JDK6/src/main/docbook/fr/introduction.xml
    sis/branches/JDK6/src/main/docbook/fr/standards.xml
    sis/branches/JDK6/src/main/docbook/fr/utility.xml
    sis/branches/JDK6/storage/sis-netcdf/pom.xml
    sis/branches/JDK6/storage/sis-storage/src/main/java/org/apache/sis/storage/StorageConnector.java

Propchange: sis/branches/JDK6/
------------------------------------------------------------------------------
  Merged /sis/branches/JDK7:r1497943-1498512

Modified: sis/branches/JDK6/core/sis-build-helper/src/site/apt/index.apt
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-build-helper/src/site/apt/index.apt?rev=1498513&r1=1498512&r2=1498513&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-build-helper/src/site/apt/index.apt [UTF-8] (original)
+++ sis/branches/JDK6/core/sis-build-helper/src/site/apt/index.apt [UTF-8] Mon Jul  1 15:16:19
2013
@@ -26,21 +26,24 @@ Building Apache SIS
 *----------------------+-------------------------------------------------------------------------------------------+
 || Javadoc tag         || Description                                                   
                         ||
 *----------------------+-------------------------------------------------------------------------------------------+
-| <<<@module>>>        | Create links to the module where the class is
defined, source code and Maven artifacts.   |
-*----------------------+-------------------------------------------------------------------------------------------+
-| <<<\{@website\}>>>   | An inline taglet for the URL to the Apache SIS
web site (Maven reports).                  |
+| <<<\{@example\}>>>   | An inline taglet for an example.             
                                            |
+|                      | Examples appear as indented paragraphs with a smaller font.    
                          |
 *----------------------+-------------------------------------------------------------------------------------------+
-| <<<\{@section\}>>>   | An inline taglet for the title of a new section
in the javadoc.                           |
+| <<<@module>>>        | Create links to the module where the class is
defined, source code and Maven artifacts.   |
 *----------------------+-------------------------------------------------------------------------------------------+
 | <<<\{@note\}>>>      | An inline taglet for a remark that readers can
safely ignore.                             |
 |                      | Notes appear as indented paragraphs with a smaller font.       
                          |
 *----------------------+-------------------------------------------------------------------------------------------+
-| <<<\{@example\}>>>   | An inline taglet for an example.             
                                            |
-|                      | Examples appear as indented paragraphs with a smaller font.    
                          |
-*----------------------+-------------------------------------------------------------------------------------------+
 | <<<\{@preformat\}>>> | An inline taglet for pre-formatted text. The first
word inside the taglet shall be one of |
 |                      | <<<java>>>, <<<xml>>>, <<<sql>>>,
<<<wkt>>>, <<<text>>>, <<<math>>> or
<<<shell>>>.       |
 *----------------------+-------------------------------------------------------------------------------------------+
+| <<<\{@scmUrl\}>>>    | An inline taglet for a URL to the source code
repository. The only word inside the taglet |
+|                      | shall be <<<gmd-data>>>.                     
                                            |
+*----------------------+-------------------------------------------------------------------------------------------+
+| <<<\{@section\}>>>   | An inline taglet for the title of a new section
in the javadoc.                           |
+*----------------------+-------------------------------------------------------------------------------------------+
+| <<<\{@website\}>>>   | An inline taglet for the URL to the Apache SIS
web site (Maven reports).                  |
+*----------------------+-------------------------------------------------------------------------------------------+
 
 
 * Localized resources compiler

Modified: sis/branches/JDK6/core/sis-metadata/src/test/java/org/apache/sis/xml/FreeTextMarshallingTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-metadata/src/test/java/org/apache/sis/xml/FreeTextMarshallingTest.java?rev=1498513&r1=1498512&r2=1498513&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-metadata/src/test/java/org/apache/sis/xml/FreeTextMarshallingTest.java
[UTF-8] (original)
+++ sis/branches/JDK6/core/sis-metadata/src/test/java/org/apache/sis/xml/FreeTextMarshallingTest.java
[UTF-8] Mon Jul  1 15:16:19 2013
@@ -36,7 +36,6 @@ import static org.apache.sis.test.Assert
  *
  * @see <a href="http://jira.geotoolkit.org/browse/GEOTK-107">GEOTK-107</a>
  * @see <a href="http://jira.geotoolkit.org/browse/GEOTK-152">GEOTK-152</a>
- * @see MetadataMarshallingTest#testTextGroup()
  */
 public final strictfp class FreeTextMarshallingTest extends XMLTestCase {
     /**

Modified: sis/branches/JDK6/ide-project/NetBeans/build.xml
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/ide-project/NetBeans/build.xml?rev=1498513&r1=1498512&r2=1498513&view=diff
==============================================================================
--- sis/branches/JDK6/ide-project/NetBeans/build.xml (original)
+++ sis/branches/JDK6/ide-project/NetBeans/build.xml Mon Jul  1 15:16:19 2013
@@ -7,11 +7,11 @@
   <import file="nbproject/build-impl.xml"/>
 
   <!--
-    Called before JAR creation. Copies the "*.utf" resources files created by Maven.
+    Called after compilation. Copies the "*.utf" resources files created by Maven.
     Note that the Apache SIS project must have been build by Maven at least once it
     can be built by the NetBeans IDE.
   -->
-  <target name="-pre-jar">
+  <target name="-post-compile">
     <copy todir="${build.classes.dir}/org/apache/sis/util/resources">
       <fileset dir="${project.root}/core/sis-utility/target/classes/org/apache/sis/util/resources">
         <include name="*.utf"/>
@@ -22,10 +22,25 @@
     <copy todir="${build.classes.dir}">
       <fileset dir="${project.root}/core/sis-utility/src/main/resources">
         <include name="META-INF/services/*"/>
+        <include name="**/*.properties"/>
       </fileset>
       <fileset dir="${project.root}/core/sis-metadata/src/main/resources">
         <include name="META-INF/services/*"/>
       </fileset>
+      <fileset dir="${project.root}/application/sis-console/src/main/resources">
+        <include name="**/*.properties"/>
+      </fileset>
+    </copy>
+  </target>
+
+  <!--
+    Called after compilation of test classes in order to copy test files.
+  -->
+  <target name="-post-compile-test">
+    <copy todir="${build.test.classes.dir}">
+      <fileset dir="${project.root}/core/sis-metadata/src/test/resources">
+        <include name="**/*.xml"/>
+      </fileset>
     </copy>
   </target>
 </project>

Modified: sis/branches/JDK6/ide-project/NetBeans/nbproject/build-impl.xml
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/ide-project/NetBeans/nbproject/build-impl.xml?rev=1498513&r1=1498512&r2=1498513&view=diff
==============================================================================
--- sis/branches/JDK6/ide-project/NetBeans/nbproject/build-impl.xml (original)
+++ sis/branches/JDK6/ide-project/NetBeans/nbproject/build-impl.xml Mon Jul  1 15:16:19 2013
@@ -153,7 +153,6 @@ is divided into following sections:
                 <available file="${src.referencing.dir}"/>
                 <available file="${src.metadata.dir}"/>
                 <available file="${src.utility.dir}"/>
-                <available file="${src.resources.dir}"/>
             </or>
         </condition>
         <condition property="netbeans.home+have.tests">
@@ -249,7 +248,6 @@ is divided into following sections:
         <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="src.resources.dir">Must set src.resources.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.storage.dir">Must set test.storage.dir</fail>
@@ -276,7 +274,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.storage.dir}:${src.referencing.dir}:${src.metadata.dir}:${src.utility.dir}:${src.resources.dir}"
name="srcdir"/>
+            <attribute default="${src.local-src.dir}:${src.webapp.dir}:${src.console.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"/>
@@ -316,7 +314,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.storage.dir}:${src.referencing.dir}:${src.metadata.dir}:${src.utility.dir}:${src.resources.dir}"
name="srcdir"/>
+            <attribute default="${src.local-src.dir}:${src.webapp.dir}:${src.console.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"/>
@@ -348,7 +346,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.storage.dir}:${src.referencing.dir}:${src.metadata.dir}:${src.utility.dir}:${src.resources.dir}"
name="srcdir"/>
+            <attribute default="${src.local-src.dir}:${src.webapp.dir}:${src.console.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>
@@ -991,7 +989,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.storage.dir}:${src.referencing.dir}:${src.metadata.dir}:${src.utility.dir}:${src.resources.dir}:${build.generated.subdirs}"/>
+        <j2seproject3:depend srcdir="${src.local-src.dir}:${src.webapp.dir}:${src.console.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}"/>
@@ -1004,7 +1002,6 @@ is divided into following sections:
             <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}"/>
-            <fileset dir="${src.resources.dir}" excludes="${build.classes.excludes},${excludes}"
includes="${includes}"/>
         </copy>
     </target>
     <target if="has.persistence.xml" name="-copy-persistence-xml">
@@ -1025,7 +1022,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.storage.dir}:${src.referencing.dir}:${src.metadata.dir}:${src.utility.dir}:${src.resources.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.referencing.dir}:${src.metadata.dir}:${src.utility.dir}"/>
     </target>
     <target name="-post-compile-single">
         <!-- Empty placeholder for easier customization. -->
@@ -1310,9 +1307,6 @@ is divided into following sections:
             <fileset dir="${src.utility.dir}" excludes="*.java,${excludes}" includes="${includes}">
                 <filename name="**/*.java"/>
             </fileset>
-            <fileset dir="${src.resources.dir}" excludes="*.java,${excludes}" includes="${includes}">
-                <filename name="**/*.java"/>
-            </fileset>
             <fileset dir="${build.generated.sources.dir}" erroronmissingdir="false">
                 <include name="**/*.java"/>
                 <exclude name="*.java"/>
@@ -1344,9 +1338,6 @@ is divided into following sections:
             <fileset dir="${src.utility.dir}" excludes="${excludes}" includes="${includes}">
                 <filename name="**/doc-files/**"/>
             </fileset>
-            <fileset dir="${src.resources.dir}" excludes="${excludes}" includes="${includes}">
-                <filename name="**/doc-files/**"/>
-            </fileset>
             <fileset dir="${build.generated.sources.dir}" erroronmissingdir="false">
                 <include name="**/doc-files/**"/>
             </fileset>

Modified: sis/branches/JDK6/ide-project/NetBeans/nbproject/genfiles.properties
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/ide-project/NetBeans/nbproject/genfiles.properties?rev=1498513&r1=1498512&r2=1498513&view=diff
==============================================================================
--- sis/branches/JDK6/ide-project/NetBeans/nbproject/genfiles.properties [ISO-8859-1] (original)
+++ sis/branches/JDK6/ide-project/NetBeans/nbproject/genfiles.properties [ISO-8859-1] Mon
Jul  1 15:16:19 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=ca153f28
-nbproject/build-impl.xml.script.CRC32=cd693ddf
+nbproject/build-impl.xml.data.CRC32=d45d31b9
+nbproject/build-impl.xml.script.CRC32=bdea8683
 nbproject/build-impl.xml.stylesheet.CRC32=c6d2a60f@1.56.1.46

Modified: sis/branches/JDK6/ide-project/NetBeans/nbproject/project.properties
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/ide-project/NetBeans/nbproject/project.properties?rev=1498513&r1=1498512&r2=1498513&view=diff
==============================================================================
--- sis/branches/JDK6/ide-project/NetBeans/nbproject/project.properties [ISO-8859-1] (original)
+++ sis/branches/JDK6/ide-project/NetBeans/nbproject/project.properties [ISO-8859-1] Mon Jul
 1 15:16:19 2013
@@ -26,7 +26,6 @@ junit.forkmode       = once
 #
 project.root         = ../..
 src.local-src.dir    = ../local-src
-src.resources.dir    = ../resources-links
 src.webapp.dir       = ${project.root}/application/sis-webapp/src/main/java
 src.console.dir      = ${project.root}/application/sis-console/src/main/java
 test.console.dir     = ${project.root}/application/sis-console/src/test/java

Modified: sis/branches/JDK6/ide-project/NetBeans/nbproject/project.xml
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/ide-project/NetBeans/nbproject/project.xml?rev=1498513&r1=1498512&r2=1498513&view=diff
==============================================================================
--- sis/branches/JDK6/ide-project/NetBeans/nbproject/project.xml (original)
+++ sis/branches/JDK6/ide-project/NetBeans/nbproject/project.xml Mon Jul  1 15:16:19 2013
@@ -13,7 +13,6 @@
                 <root id="src.referencing.dir" name="Referencing"/>
                 <root id="src.metadata.dir" name="Metadata"/>
                 <root id="src.utility.dir" name="Utility"/>
-                <root id="src.resources.dir" name="Resources"/>
             </source-roots>
             <test-roots>
                 <root id="test.console.dir" name="Test Console"/>

Modified: sis/branches/JDK6/pom.xml
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/pom.xml?rev=1498513&r1=1498512&r2=1498513&view=diff
==============================================================================
--- sis/branches/JDK6/pom.xml (original)
+++ sis/branches/JDK6/pom.xml Mon Jul  1 15:16:19 2013
@@ -556,18 +556,15 @@ Apache SIS is a free software, Java lang
        ============================================================== -->
   <reporting>
     <plugins>
-      <!-- Overwrite the configuration declared in the Apache parent pom.xml
-           in order to use version 2.5.1 instead than 2.5. This is necessary
-           for avoiding a NullPointerException (http://jira.codehaus.org/browse/MPIR-248)
-->
       <plugin>
         <artifactId>maven-project-info-reports-plugin</artifactId>
-        <version>2.6</version>
+        <version>2.7</version>
       </plugin>
 
       <!-- Produce JavaDoc -->
       <plugin>
         <artifactId>maven-javadoc-plugin</artifactId>
-        <version>2.9</version>
+        <version>2.9.1</version>
         <configuration>
           <source>${maven.compile.source}</source>              <!-- Enables
javadoc to handle language constructs present in target JDK. -->
           <encoding>${project.build.sourceEncoding}</encoding>  <!-- Encoding
of Java source file. -->
@@ -636,6 +633,7 @@ Apache SIS is a free software, Java lang
             <taglet><tagletClass>org.apache.sis.internal.taglet.Note</tagletClass></taglet>
             <taglet><tagletClass>org.apache.sis.internal.taglet.Example</tagletClass></taglet>
             <taglet><tagletClass>org.apache.sis.internal.taglet.Preformat</tagletClass></taglet>
+            <taglet><tagletClass>org.apache.sis.internal.taglet.SourceRepositoryURL</tagletClass></taglet>
           </taglets>
           <tagletArtifact>
             <groupId>org.apache.sis</groupId>
@@ -654,7 +652,7 @@ Apache SIS is a free software, Java lang
       <!-- Unit tests report -->
       <plugin>
         <artifactId>maven-surefire-report-plugin</artifactId>
-        <version>2.12.4</version>
+        <version>2.15</version>
       </plugin>
 
       <!-- "Release Audit" report (checks license headers etc.) -->

Modified: sis/branches/JDK6/src/main/docbook/fr.xml
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/src/main/docbook/fr.xml?rev=1498513&r1=1498512&r2=1498513&view=diff
==============================================================================
--- sis/branches/JDK6/src/main/docbook/fr.xml (original)
+++ sis/branches/JDK6/src/main/docbook/fr.xml Mon Jul  1 15:16:19 2013
@@ -1,4 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
+
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License.
+-->
+
 <!DOCTYPE book [
   <!ENTITY % book.entities SYSTEM "book.entities">
   %book.entities;

Modified: sis/branches/JDK6/src/main/docbook/fr/XML.xml
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/src/main/docbook/fr/XML.xml?rev=1498513&r1=1498512&r2=1498513&view=diff
==============================================================================
--- sis/branches/JDK6/src/main/docbook/fr/XML.xml (original)
+++ sis/branches/JDK6/src/main/docbook/fr/XML.xml Mon Jul  1 15:16:19 2013
@@ -1,4 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License.
+-->
+
 <!DOCTYPE book [
   <!ENTITY % book.entities SYSTEM "../book.entities">
   %book.entities;

Modified: sis/branches/JDK6/src/main/docbook/fr/coverage.xml
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/src/main/docbook/fr/coverage.xml?rev=1498513&r1=1498512&r2=1498513&view=diff
==============================================================================
--- sis/branches/JDK6/src/main/docbook/fr/coverage.xml (original)
+++ sis/branches/JDK6/src/main/docbook/fr/coverage.xml Mon Jul  1 15:16:19 2013
@@ -1,4 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License.
+-->
+
 <!DOCTYPE book [
   <!ENTITY % book.entities SYSTEM "../book.entities">
   %book.entities;

Modified: sis/branches/JDK6/src/main/docbook/fr/geoapi.xml
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/src/main/docbook/fr/geoapi.xml?rev=1498513&r1=1498512&r2=1498513&view=diff
==============================================================================
--- sis/branches/JDK6/src/main/docbook/fr/geoapi.xml (original)
+++ sis/branches/JDK6/src/main/docbook/fr/geoapi.xml Mon Jul  1 15:16:19 2013
@@ -1,4 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License.
+-->
+
 <!DOCTYPE book [
   <!ENTITY % book.entities SYSTEM "../book.entities">
   %book.entities;

Modified: sis/branches/JDK6/src/main/docbook/fr/geometry.xml
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/src/main/docbook/fr/geometry.xml?rev=1498513&r1=1498512&r2=1498513&view=diff
==============================================================================
--- sis/branches/JDK6/src/main/docbook/fr/geometry.xml (original)
+++ sis/branches/JDK6/src/main/docbook/fr/geometry.xml Mon Jul  1 15:16:19 2013
@@ -1,4 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License.
+-->
+
 <!DOCTYPE book [
   <!ENTITY % book.entities SYSTEM "../book.entities">
   %book.entities;

Modified: sis/branches/JDK6/src/main/docbook/fr/introduction.xml
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/src/main/docbook/fr/introduction.xml?rev=1498513&r1=1498512&r2=1498513&view=diff
==============================================================================
--- sis/branches/JDK6/src/main/docbook/fr/introduction.xml (original)
+++ sis/branches/JDK6/src/main/docbook/fr/introduction.xml Mon Jul  1 15:16:19 2013
@@ -1,4 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License.
+-->
+
 <!DOCTYPE book [
   <!ENTITY % book.entities SYSTEM "../book.entities">
   %book.entities;

Modified: sis/branches/JDK6/src/main/docbook/fr/standards.xml
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/src/main/docbook/fr/standards.xml?rev=1498513&r1=1498512&r2=1498513&view=diff
==============================================================================
--- sis/branches/JDK6/src/main/docbook/fr/standards.xml (original)
+++ sis/branches/JDK6/src/main/docbook/fr/standards.xml Mon Jul  1 15:16:19 2013
@@ -1,4 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License.
+-->
+
 <!DOCTYPE book [
   <!ENTITY % book.entities SYSTEM "../book.entities">
   %book.entities;

Modified: sis/branches/JDK6/src/main/docbook/fr/utility.xml
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/src/main/docbook/fr/utility.xml?rev=1498513&r1=1498512&r2=1498513&view=diff
==============================================================================
--- sis/branches/JDK6/src/main/docbook/fr/utility.xml (original)
+++ sis/branches/JDK6/src/main/docbook/fr/utility.xml Mon Jul  1 15:16:19 2013
@@ -1,4 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one
+  or more contributor license agreements.  See the NOTICE file
+  distributed with this work for additional information
+  regarding copyright ownership.  The ASF licenses this file
+  to you under the Apache License, Version 2.0 (the
+  "License"); you may not use this file except in compliance
+  with the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied.  See the License for the
+  specific language governing permissions and limitations
+  under the License.
+-->
+
 <!DOCTYPE book [
   <!ENTITY % book.entities SYSTEM "../book.entities">
   %book.entities;

Modified: sis/branches/JDK6/storage/sis-netcdf/pom.xml
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/storage/sis-netcdf/pom.xml?rev=1498513&r1=1498512&r2=1498513&view=diff
==============================================================================
--- sis/branches/JDK6/storage/sis-netcdf/pom.xml (original)
+++ sis/branches/JDK6/storage/sis-netcdf/pom.xml Mon Jul  1 15:16:19 2013
@@ -115,6 +115,7 @@ Bridge between NetCDF Climate and Foreca
     <dependency>
       <groupId>edu.ucar</groupId>
       <artifactId>netcdf</artifactId>
+      <optional>true</optional>
     </dependency>
 
     <!-- Leverage GeoAPI tests. -->

Modified: sis/branches/JDK6/storage/sis-storage/src/main/java/org/apache/sis/storage/StorageConnector.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/storage/sis-storage/src/main/java/org/apache/sis/storage/StorageConnector.java?rev=1498513&r1=1498512&r2=1498513&view=diff
==============================================================================
--- sis/branches/JDK6/storage/sis-storage/src/main/java/org/apache/sis/storage/StorageConnector.java
[UTF-8] (original)
+++ sis/branches/JDK6/storage/sis-storage/src/main/java/org/apache/sis/storage/StorageConnector.java
[UTF-8] Mon Jul  1 15:16:19 2013
@@ -197,7 +197,7 @@ public class StorageConnector implements
      *
      * <ul>
      *   <li>For {@link java.nio.file.Path}, {@link java.io.File}, {@link java.net.URI}
or {@link java.net.URL}
-     *       instances, this method uses dedicated API like {@link Path#getFileName()}.</li>
+     *       instances, this method uses dedicated API like {@link java.nio.file.Path#getFileName()}.</li>
      *   <li>For {@link CharSequence} instances, this method gets a string representation
of the storage object
      *       and returns the part after the last {@code '/'} character or platform-dependent
name separator.</li>
      *   <li>For instances of unknown type, this method builds a string representation
using the class name.



Mime
View raw message