sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1553788 - in /sis/branches/JDK7: ./ core/sis-build-helper/src/main/java/org/apache/sis/internal/taglet/ core/sis-build-helper/src/site/ core/sis-metadata/src/site/ core/sis-utility/src/site/ core/src/site/ src/site/ storage/sis-netcdf/src/...
Date Sat, 28 Dec 2013 05:49:42 GMT
Author: desruisseaux
Date: Sat Dec 28 05:49:41 2013
New Revision: 1553788

URL: http://svn.apache.org/r1553788
Log:
Maven web site update: list modules explicitely, because links in Jenkins are broken (SIS-112).

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/site/site.xml
    sis/branches/JDK7/core/sis-metadata/src/site/site.xml
    sis/branches/JDK7/core/sis-utility/src/site/site.xml
    sis/branches/JDK7/core/src/site/site.xml
    sis/branches/JDK7/pom.xml
    sis/branches/JDK7/src/site/site.xml
    sis/branches/JDK7/storage/sis-netcdf/src/site/site.xml
    sis/branches/JDK7/storage/sis-storage/src/site/site.xml
    sis/branches/JDK7/storage/src/site/site.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=1553788&r1=1553787&r2=1553788&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] Sat Dec 28 05:49:41 2013
@@ -165,12 +165,10 @@ public final class Module implements Tag
         }
         final StringBuilder buffer = new StringBuilder(128);
         buffer.append("\n<p><font size=\"-1\">");
-        for (int i=0; i<tags.length; i++) {
-            final Tag tag = tags[i];
+        for (final Tag tag : tags) {
             File file = tag.position().file();
             module = file.getName();
-            while (file != null) {
-                file = file.getParentFile();
+            while ((file = file.getParentFile()) != null) {
                 if (file.getName().equals("src")) {
                     file = file.getParentFile();
                     if (file != null) {

Modified: sis/branches/JDK7/core/sis-build-helper/src/site/site.xml
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-build-helper/src/site/site.xml?rev=1553788&r1=1553787&r2=1553788&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-build-helper/src/site/site.xml (original)
+++ sis/branches/JDK7/core/sis-build-helper/src/site/site.xml Sat Dec 28 05:49:41 2013
@@ -30,10 +30,10 @@
   <body>
     <menu name="Quick links">
       <item name="Apache SIS home"    href="http://sis.apache.org"/>
-      <item name="Maven reports home" href="../index.html"/>
       <item name="Aggregated Javadoc" href="../apidocs/index.html"/>
     </menu>
 
+    <menu ref="parent"/>  <!-- Replaced by a link to the parent. -->
     <menu ref="reports"/> <!-- Replaced by menus for any configured reports (mailing
lists, etc.) -->
   </body>
 </project>

Modified: sis/branches/JDK7/core/sis-metadata/src/site/site.xml
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-metadata/src/site/site.xml?rev=1553788&r1=1553787&r2=1553788&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-metadata/src/site/site.xml (original)
+++ sis/branches/JDK7/core/sis-metadata/src/site/site.xml Sat Dec 28 05:49:41 2013
@@ -29,12 +29,12 @@
        ==================================================== -->
   <body>
     <menu name="Quick links">
-      <item name="FAQ"                href="http://sis.apache.org/faq.html#metadata"/>
-      <item name="Apache SIS home"    href="http://sis.apache.org"/>
-      <item name="Maven reports home" href="../index.html"/>
-      <item name="Aggregated Javadoc" href="../apidocs/index.html"/>
+      <item name="Apache SIS home" href="http://sis.apache.org"/>
+      <item name="Package Javadoc" href="../apidocs/org/apache/sis/metadata/iso/package-summary.html"/>
+      <item name="FAQ"             href="http://sis.apache.org/faq.html#metadata"/>
     </menu>
 
+    <menu ref="parent"/>  <!-- Replaced by a link to the parent. -->
     <menu ref="reports"/> <!-- Replaced by menus for any configured reports (mailing
lists, etc.) -->
   </body>
 </project>

Modified: sis/branches/JDK7/core/sis-utility/src/site/site.xml
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/site/site.xml?rev=1553788&r1=1553787&r2=1553788&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/site/site.xml (original)
+++ sis/branches/JDK7/core/sis-utility/src/site/site.xml Sat Dec 28 05:49:41 2013
@@ -29,11 +29,11 @@
        ==================================================== -->
   <body>
     <menu name="Quick links">
-      <item name="Apache SIS home"    href="http://sis.apache.org"/>
-      <item name="Maven reports home" href="../index.html"/>
-      <item name="Aggregated Javadoc" href="../apidocs/index.html"/>
+      <item name="Apache SIS home" href="http://sis.apache.org"/>
+      <item name="Package Javadoc" href="../apidocs/org/apache/sis/util/package-summary.html"/>
     </menu>
 
+    <menu ref="parent"/>  <!-- Replaced by a link to the parent. -->
     <menu ref="reports"/> <!-- Replaced by menus for any configured reports (mailing
lists, etc.) -->
   </body>
 </project>

Modified: sis/branches/JDK7/core/src/site/site.xml
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/src/site/site.xml?rev=1553788&r1=1553787&r2=1553788&view=diff
==============================================================================
--- sis/branches/JDK7/core/src/site/site.xml (original)
+++ sis/branches/JDK7/core/src/site/site.xml Sat Dec 28 05:49:41 2013
@@ -34,7 +34,6 @@
     -->
     <menu name="Quick links" inherit="none">
       <item name="Apache SIS home"    href="http://sis.apache.org"/>
-      <item name="Maven reports home" href="../index.html"/>
       <item name="Aggregated Javadoc" href="../apidocs/index.html"/>
       <item name="License"            href="license.html"/>
     </menu>

Modified: sis/branches/JDK7/pom.xml
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/pom.xml?rev=1553788&r1=1553787&r2=1553788&view=diff
==============================================================================
--- sis/branches/JDK7/pom.xml (original)
+++ sis/branches/JDK7/pom.xml Sat Dec 28 05:49:41 2013
@@ -550,13 +550,16 @@ Apache SIS is a free software, Java lang
         </executions>
       </plugin>
 
-      <!-- Create web site -->
+      <!-- Create web site. The Maven generated site is not deployed at the URL
+           declared in this pom.xml (namely http://sis.apache.org). Consequently,
+           we disable links relativization for avoiding confusing behavior. -->
       <plugin>
         <artifactId>maven-site-plugin</artifactId>
         <configuration>
           <locales>${website.locale}</locales>
           <inputEncoding>${project.build.sourceEncoding}</inputEncoding>
           <outputEncoding>${website.encoding}</outputEncoding>
+          <relativizeDecorationLinks>false</relativizeDecorationLinks>
         </configuration>
       </plugin>
 
@@ -612,15 +615,14 @@ Apache SIS is a free software, Java lang
               <report>index</report>
               <report>summary</report>
               <report>license</report>
-              <report>dependencies</report>
               <report>dependency-info</report>
+              <report>dependencies</report>
               <report>dependency-convergence</report>
               <report>issue-tracking</report>
               <report>mailing-list</report>
               <report>project-team</report>
               <report>scm</report>
               <report>cim</report>
-              <report>modules</report>
             </reports>
           </reportSet>
         </reportSets>

Modified: sis/branches/JDK7/src/site/site.xml
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/src/site/site.xml?rev=1553788&r1=1553787&r2=1553788&view=diff
==============================================================================
--- sis/branches/JDK7/src/site/site.xml (original)
+++ sis/branches/JDK7/src/site/site.xml Sat Dec 28 05:49:41 2013
@@ -61,7 +61,26 @@
       <item name="License"            href="license.html"/>
     </menu>
 
-    <menu ref="modules"/> <!-- Replaced by menu for submodules. -->
+    <!--
+        List the modules ourselves instead of relying on <menu ref="modules"/> because
we
+        want to list directly the modules producing the JAR files (we omit the sub-groups
+        like "core" and "application"), we do not want to list all modules  (e.g. we omit
+        sis-build-helper), and the links generated by maven-site-plugin do not match the
+        directory layout created by Jenkins (http://issues.apache.org/jira/browse/SIS-112).
+    -->
+    <menu name="Modules" inherit="none">
+      <item name="Utilities"      href="sis-utility/index.html"/>
+      <item name="Metadata"       href="sis-metadata/index.html"/>
+      <item name="Referencing"    href="sis-referencing/index.html"/>
+      <item name="Features"       href="sis-features/index.html"/>
+      <item name="Storage"        href="sis-storage/index.html"/>
+      <item name="Shapefile"      href="sis-shapefile/index.html"/>
+      <item name="NetCDF"         href="sis-netcdf/index.html"/>
+      <item name="Web services"   href="sis-webapp/index.html"/>
+      <item name="Command line"   href="sis-console/index.html"/>
+      <item name="French profile" href="sis-french-profile/index.html"/>
+    </menu>
+
     <menu ref="reports"/> <!-- Replaced by menus for any configured reports (mailing
lists, etc.) -->
 
   </body>

Modified: sis/branches/JDK7/storage/sis-netcdf/src/site/site.xml
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/storage/sis-netcdf/src/site/site.xml?rev=1553788&r1=1553787&r2=1553788&view=diff
==============================================================================
--- sis/branches/JDK7/storage/sis-netcdf/src/site/site.xml (original)
+++ sis/branches/JDK7/storage/sis-netcdf/src/site/site.xml Sat Dec 28 05:49:41 2013
@@ -29,11 +29,11 @@
        ============================================================ -->
   <body>
     <menu name="Quick links">
-      <item name="Apache SIS home"    href="http://sis.apache.org"/>
-      <item name="Maven reports home" href="../index.html"/>
-      <item name="Aggregated Javadoc" href="../apidocs/index.html"/>
+      <item name="Apache SIS home" href="http://sis.apache.org"/>
+      <item name="Package Javadoc" href="../apidocs/org/apache/sis/storage/netcdf/package-summary.html"/>
     </menu>
 
+    <menu ref="parent"/>  <!-- Replaced by a link to the parent. -->
     <menu ref="reports"/> <!-- Replaced by menus for any configured reports (mailing
lists, etc.) -->
   </body>
 </project>

Modified: sis/branches/JDK7/storage/sis-storage/src/site/site.xml
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/storage/sis-storage/src/site/site.xml?rev=1553788&r1=1553787&r2=1553788&view=diff
==============================================================================
--- sis/branches/JDK7/storage/sis-storage/src/site/site.xml (original)
+++ sis/branches/JDK7/storage/sis-storage/src/site/site.xml Sat Dec 28 05:49:41 2013
@@ -29,11 +29,11 @@
        ========================================================== -->
   <body>
     <menu name="Quick links">
-      <item name="Apache SIS home"    href="http://sis.apache.org"/>
-      <item name="Maven reports home" href="../index.html"/>
-      <item name="Aggregated Javadoc" href="../apidocs/index.html"/>
+      <item name="Apache SIS home" href="http://sis.apache.org"/>
+      <item name="Package Javadoc" href="../apidocs/org/apache/sis/storage/package-summary.html"/>
     </menu>
 
+    <menu ref="parent"/>  <!-- Replaced by a link to the parent. -->
     <menu ref="reports"/> <!-- Replaced by menus for any configured reports (mailing
lists, etc.) -->
   </body>
 </project>

Modified: sis/branches/JDK7/storage/src/site/site.xml
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/storage/src/site/site.xml?rev=1553788&r1=1553787&r2=1553788&view=diff
==============================================================================
--- sis/branches/JDK7/storage/src/site/site.xml (original)
+++ sis/branches/JDK7/storage/src/site/site.xml Sat Dec 28 05:49:41 2013
@@ -34,7 +34,6 @@
     -->
     <menu name="Quick links" inherit="none">
       <item name="Apache SIS home"    href="http://sis.apache.org"/>
-      <item name="Maven reports home" href="../index.html"/>
       <item name="Aggregated Javadoc" href="../apidocs/index.html"/>
       <item name="License"            href="license.html"/>
     </menu>



Mime
View raw message