You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sis.apache.org by de...@apache.org on 2014/02/26 17:09:31 UTC
svn commit: r1572126 - in /sis/branches/JDK7: ./
core/sis-build-helper/src/main/java/org/apache/sis/internal/taglet/
core/sis-build-helper/src/main/java/org/apache/sis/util/resources/
core/sis-build-helper/src/main/javadoc/ core/sis-build-helper/src/si...
Author: desruisseaux
Date: Wed Feb 26 16:09:30 2014
New Revision: 1572126
URL: http://svn.apache.org/r1572126
Log:
Removed the @website taglet, because the Maven generated site is not the SIS main web site.
The javadoc to be released should not contain links to the Jenkins builds.
Removed:
sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/internal/taglet/WebSite.java
Modified:
sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/internal/taglet/Module.java
sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/util/resources/ResourceCompilerMojo.java
sis/branches/JDK7/core/sis-build-helper/src/main/javadoc/overview.html
sis/branches/JDK7/core/sis-build-helper/src/site/apt/index.apt
sis/branches/JDK7/core/sis-metadata/src/main/javadoc/overview.html
sis/branches/JDK7/core/sis-referencing/src/main/javadoc/overview.html
sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/resources/package-info.java
sis/branches/JDK7/core/sis-utility/src/main/javadoc/overview.html
sis/branches/JDK7/pom.xml
Modified: sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/internal/taglet/Module.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/internal/taglet/Module.java?rev=1572126&r1=1572125&r2=1572126&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/internal/taglet/Module.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/internal/taglet/Module.java [UTF-8] Wed Feb 26 16:09:30 2014
@@ -27,7 +27,7 @@ import com.sun.tools.doclets.Taglet;
*
* @author Martin Desruisseaux (IRD, Geomatys)
* @since 0.3 (derived from geotk-2.2)
- * @version 0.3
+ * @version 0.4
* @module
*/
public final class Module implements Taglet {
@@ -42,11 +42,6 @@ public final class Module implements Tag
}
/**
- * The base URL for Maven reports, with a trailing slash.
- */
- private static final String MAVEN_REPORTS_BASE_URL = WebSite.URL + '/';
-
- /**
* The SIS module in which the <code>@module</code> taglet has been found.
*/
private String module;
@@ -180,8 +175,7 @@ public final class Module implements Tag
/*
* Appends the module link.
*/
- buffer.append("Defined in the <a href=\"").append(MAVEN_REPORTS_BASE_URL).append(module)
- .append("/index.html\">").append(module).append("</a> module");
+ buffer.append("Defined in the <code>").append(module).append("</code> module");
}
return buffer.append("</font></p>\n").toString();
}
Modified: sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/util/resources/ResourceCompilerMojo.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/util/resources/ResourceCompilerMojo.java?rev=1572126&r1=1572125&r2=1572126&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/util/resources/ResourceCompilerMojo.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/util/resources/ResourceCompilerMojo.java [UTF-8] Wed Feb 26 16:09:30 2014
@@ -30,8 +30,7 @@ import org.sonatype.plexus.build.increme
/**
* Compiles the international resources that are found in the module from which this mojo is invoked.
- * See the <code><a href="{@website}/sis-build-helper/index.html">sis-build-helper</a></code> module
- * for more information.
+ * See the <code>sis-build-helper</code> module for more information.
*
* @author Martin Desruisseaux (Geomatys)
* @author Olivier Nouguier (Geomatys)
Modified: sis/branches/JDK7/core/sis-build-helper/src/main/javadoc/overview.html
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-build-helper/src/main/javadoc/overview.html?rev=1572126&r1=1572125&r2=1572126&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-build-helper/src/main/javadoc/overview.html (original)
+++ sis/branches/JDK7/core/sis-build-helper/src/main/javadoc/overview.html Wed Feb 26 16:09:30 2014
@@ -25,7 +25,7 @@
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
</head>
<body>
- Overview of Apache <a href="{@website}/sis-build-helper">sis-build-helper</a> module.
+ Overview of Apache <code>sis-build-helper</code> module.
This module is for internal use by Apache SIS only and may change in incompatible way
in any SIS version.
</body>
Modified: sis/branches/JDK7/core/sis-build-helper/src/site/apt/index.apt
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-build-helper/src/site/apt/index.apt?rev=1572126&r1=1572125&r2=1572126&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-build-helper/src/site/apt/index.apt [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-build-helper/src/site/apt/index.apt [UTF-8] Wed Feb 26 16:09:30 2014
@@ -55,8 +55,6 @@ Building Apache SIS
*----------------------+-------------------------------------------------------------------------------------------+
| <<<\{@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/JDK7/core/sis-metadata/src/main/javadoc/overview.html
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/main/javadoc/overview.html?rev=1572126&r1=1572125&r2=1572126&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/main/javadoc/overview.html (original)
+++ sis/branches/JDK7/core/sis-metadata/src/main/javadoc/overview.html Wed Feb 26 16:09:30 2014
@@ -25,7 +25,7 @@
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
</head>
<body>
- Overview of Apache <a href="{@website}/sis-metadata">sis-metadata</a> module.
+ Overview of Apache <code>sis-metadata</code> module.
This Javadoc is only about one specific module. For the full Apache SIS project,
see the <a href="http://sis.apache.org/apidocs/overview-summary.html">aggregated Javadoc</a>.
</body>
Modified: sis/branches/JDK7/core/sis-referencing/src/main/javadoc/overview.html
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-referencing/src/main/javadoc/overview.html?rev=1572126&r1=1572125&r2=1572126&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-referencing/src/main/javadoc/overview.html (original)
+++ sis/branches/JDK7/core/sis-referencing/src/main/javadoc/overview.html Wed Feb 26 16:09:30 2014
@@ -25,7 +25,7 @@
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
</head>
<body>
- Overview of Apache <a href="{@website}/sis-referencing">sis-referencing</a> module.
+ Overview of Apache <code>sis-referencing</code> module.
This Javadoc is only about one specific module. For the full Apache SIS project,
see the <a href="http://sis.apache.org/apidocs/overview-summary.html">aggregated Javadoc</a>.
</body>
Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/resources/package-info.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/resources/package-info.java?rev=1572126&r1=1572125&r2=1572126&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/resources/package-info.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/resources/package-info.java [UTF-8] Wed Feb 26 16:09:30 2014
@@ -41,9 +41,8 @@
* Furthermore, the <code>java.util.logging</code> framework is designed for use with
* <code>MessageFormat</code> (see the <code>Formatter.formatMessage(LogRecord)</code> method).}
*
- * Apache SIS developers can add resources by editing the {@code *.properties} file
- * in the source code directory, then run the localized resources compiler provided in the
- * <code><a href="{@website}/sis-build-helper/index.html">sis-build-helper</a></code> module.
+ * Apache SIS developers can add resources by editing the {@code *.properties} file in the source code directory,
+ * then run the localized resources compiler provided in the {@code sis-build-helper} module.
* Developers shall <strong>not</strong> apply the {@code MessageFormat} rules for using quotes,
* since the resources compiler will apply itself the <cite>doubled single quotes</cite> when
* necessary. This avoid the unfortunate confusion documented in the warning section of
Modified: sis/branches/JDK7/core/sis-utility/src/main/javadoc/overview.html
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/javadoc/overview.html?rev=1572126&r1=1572125&r2=1572126&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/javadoc/overview.html (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/javadoc/overview.html Wed Feb 26 16:09:30 2014
@@ -25,7 +25,7 @@
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
</head>
<body>
- Overview of Apache <a href="{@website}/sis-utility">sis-utility</a> module.
+ Overview of Apache <code>sis-utility</code> module.
This Javadoc is only about one specific module. For the full Apache SIS project,
see the <a href="http://sis.apache.org/apidocs/overview-summary.html">aggregated Javadoc</a>.
</body>
Modified: sis/branches/JDK7/pom.xml
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/pom.xml?rev=1572126&r1=1572125&r2=1572126&view=diff
==============================================================================
--- sis/branches/JDK7/pom.xml (original)
+++ sis/branches/JDK7/pom.xml Wed Feb 26 16:09:30 2014
@@ -704,7 +704,6 @@ Apache SIS is a free software, Java lang
</tags>
<taglets>
<taglet><tagletClass>org.apache.sis.internal.taglet.Module</tagletClass></taglet>
- <taglet><tagletClass>org.apache.sis.internal.taglet.WebSite</tagletClass></taglet>
<taglet><tagletClass>org.apache.sis.internal.taglet.Section</tagletClass></taglet>
<taglet><tagletClass>org.apache.sis.internal.taglet.Note</tagletClass></taglet>
<taglet><tagletClass>org.apache.sis.internal.taglet.Example</tagletClass></taglet>