sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1592562 - in /sis/branches/JDK8: ./ core/sis-build-helper/src/main/ant/ core/sis-build-helper/src/main/java/org/apache/sis/internal/taglet/ core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/ core/sis-metadata/src/test/java/org/ap...
Date Mon, 05 May 2014 16:01:02 GMT
Author: desruisseaux
Date: Mon May  5 16:01:02 2014
New Revision: 1592562

URL: http://svn.apache.org/r1592562
Log:
Removed the @scmUrl taglet, since JDK 8 does not accept tags inside <a href="..."> element.

Removed:
    sis/branches/JDK8/core/sis-build-helper/src/main/java/org/apache/sis/internal/taglet/SourceRepositoryURL.java
Modified:
    sis/branches/JDK8/core/sis-build-helper/src/main/ant/prepare-release.xml
    sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/DefaultMetadataTest.java
    sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/extent/DefaultExtentTest.java
    sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/lineage/DefaultProcessStepTest.java
    sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/quality/AbstractPositionalAccuracyTest.java
    sis/branches/JDK8/pom.xml

Modified: sis/branches/JDK8/core/sis-build-helper/src/main/ant/prepare-release.xml
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-build-helper/src/main/ant/prepare-release.xml?rev=1592562&r1=1592561&r2=1592562&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-build-helper/src/main/ant/prepare-release.xml (original)
+++ sis/branches/JDK8/core/sis-build-helper/src/main/ant/prepare-release.xml Mon May  5 16:01:02
2014
@@ -44,7 +44,6 @@
     <!-- Replace URL to trunk by URL to the branch on Subversion. -->
     <replace dir="${user.dir}" failOnNoReplacements="true">
       <include name="**/pom.xml"/>
-      <include name="core/sis-build-helper/src/main/java/org/apache/sis/internal/taglet/SourceRepositoryURL.java"/>
       <replacefilter token="svn.apache.org/repos/asf/sis/trunk"
                      value="svn.apache.org/repos/asf/sis/branches/${sis.version}"/>
       <replacefilter token="svn.apache.org/viewvc/sis/trunk"
@@ -60,7 +59,6 @@
     <!-- Replace URL to branch by URL to the branch on Subversion. -->
     <replace dir="${user.dir}" failOnNoReplacements="true">
       <include name="**/pom.xml"/>
-      <include name="core/sis-build-helper/src/main/java/org/apache/sis/internal/taglet/SourceRepositoryURL.java"/>
       <replacefilter token="svn.apache.org/repos/asf/sis/branches/${sis.version}"
                      value="svn.apache.org/repos/asf/sis/tags/${sis.version}"/>
       <replacefilter token="svn.apache.org/viewvc/sis/branches/${sis.version}"

Modified: sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/DefaultMetadataTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/DefaultMetadataTest.java?rev=1592562&r1=1592561&r2=1592562&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/DefaultMetadataTest.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/DefaultMetadataTest.java
[UTF-8] Mon May  5 16:01:02 2014
@@ -32,7 +32,11 @@ import static org.apache.sis.test.Assert
 /**
  * Tests XML (un)marshalling of various metadata objects.
  * For every metadata objects tested by this class, the expected XML representation
- * is provided by {@code *.xml} files <a href="{@scmUrl metadata}/">here</a>.
+ * is provided by {@code *.xml} files in the following directory:
+ *
+ * <ul>
+ *   <li>{@code "core/sis-metadata/src/test/resources/org/apache/sis/metadata/iso"}</li>
+ * </ul>
  *
  * @author  Cédric Briançon (Geomatys)
  * @author  Martin Desruisseaux (Geomatys)

Modified: sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/extent/DefaultExtentTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/extent/DefaultExtentTest.java?rev=1592562&r1=1592561&r2=1592562&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/extent/DefaultExtentTest.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/extent/DefaultExtentTest.java
[UTF-8] Mon May  5 16:01:02 2014
@@ -41,7 +41,11 @@ import static org.apache.sis.test.TestUt
 public final strictfp class DefaultExtentTest extends XMLTestCase {
     /**
      * Returns the URL to the XML file of the given name.
-     * The argument shall be one of the files listed <a href="{@scmUrl metadata}/extent/">here</a>.
+     * The argument shall be one of the files listed in the following directory:
+     *
+     * <ul>
+     *   <li>{@code "core/sis-metadata/src/test/resources/org/apache/sis/metadata/iso/extent"}</li>
+     * </ul>
      *
      * @param  filename The name of the XML file.
      * @return The URL to the given XML file.
@@ -57,7 +61,7 @@ public final strictfp class DefaultExten
      * This test opportunistically tests setting {@code "gml:id"} value.
      *
      * <p><b>XML test file:</b>
-     * <a href="{@scmUrl metadata}/extent/Extent.xml">Extent.xml</a></p>
+     * {@code "core/sis-metadata/src/test/resources/org/apache/sis/metadata/iso/extent/Extent.xml"}</p>
      *
      * @throws IOException   If an error occurred while reading the XML file.
      * @throws JAXBException If an error occurred during the during marshalling / unmarshalling
processes.

Modified: sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/lineage/DefaultProcessStepTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/lineage/DefaultProcessStepTest.java?rev=1592562&r1=1592561&r2=1592562&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/lineage/DefaultProcessStepTest.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/lineage/DefaultProcessStepTest.java
[UTF-8] Mon May  5 16:01:02 2014
@@ -43,7 +43,7 @@ public final strictfp class DefaultProce
      * Tests the (un)marshalling of a metadata mixing elements from ISO 19115 and ISO 19115-2
standards.
      *
      * <p><b>XML test file:</b>
-     * <a href="{@scmUrl metadata}/lineage/ProcessStep.xml">ProcessStep.xml</a></p>
+     * {@code "core/sis-metadata/src/test/resources/org/apache/sis/metadata/iso/lineage/ProcessStep.xml"}</p>
      *
      * @throws JAXBException If an error occurred during the during marshalling / unmarshalling
processes.
      */

Modified: sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/quality/AbstractPositionalAccuracyTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/quality/AbstractPositionalAccuracyTest.java?rev=1592562&r1=1592561&r2=1592562&view=diff
==============================================================================
--- sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/quality/AbstractPositionalAccuracyTest.java
[UTF-8] (original)
+++ sis/branches/JDK8/core/sis-metadata/src/test/java/org/apache/sis/metadata/iso/quality/AbstractPositionalAccuracyTest.java
[UTF-8] Mon May  5 16:01:02 2014
@@ -50,7 +50,7 @@ public final strictfp class AbstractPosi
      * elaborated.
      *
      * <p><b>XML test file:</b>
-     * <a href="{@scmUrl metadata}/quality/PositionalAccuracy.xml">PositionalAccuracy.xml</a></p>
+     * {@code "core/sis-metadata/src/test/resources/org/apache/sis/metadata/iso/quality/PositionalAccuracy.xml"}</p>
      *
      * @throws JAXBException If an error occurred during the during marshalling / unmarshalling
processes.
      *

Modified: sis/branches/JDK8/pom.xml
URL: http://svn.apache.org/viewvc/sis/branches/JDK8/pom.xml?rev=1592562&r1=1592561&r2=1592562&view=diff
==============================================================================
--- sis/branches/JDK8/pom.xml (original)
+++ sis/branches/JDK8/pom.xml Mon May  5 16:01:02 2014
@@ -651,7 +651,6 @@ Apache SIS is a free software, Java lang
             <taglet><tagletClass>org.apache.sis.internal.taglet.Section</tagletClass></taglet>
             <taglet><tagletClass>org.apache.sis.internal.taglet.Include</tagletClass></taglet>
             <taglet><tagletClass>org.apache.sis.internal.taglet.Preformat</tagletClass></taglet>
-            <taglet><tagletClass>org.apache.sis.internal.taglet.SourceRepositoryURL</tagletClass></taglet>
           </taglets>
           <doclet>org.apache.sis.internal.doclet.Doclet</doclet>
           <tagletArtifact>



Mime
View raw message