Author: desruisseaux
Date: Thu Feb 27 20:25:40 2014
New Revision: 1572721
URL: http://svn.apache.org/r1572721
Log:
Merge from the JDK7 branch.
Removed:
sis/branches/JDK6/application/sis-console/src/site/
sis/branches/JDK6/application/sis-webapp/src/site/
sis/branches/JDK6/application/src/
sis/branches/JDK6/core/sis-build-helper/src/site/resources/
sis/branches/JDK6/core/sis-build-helper/src/site/site.xml
sis/branches/JDK6/core/sis-feature/src/site/
sis/branches/JDK6/core/sis-metadata/src/site/
sis/branches/JDK6/core/sis-referencing/src/site/
sis/branches/JDK6/core/sis-utility/src/site/resources/
sis/branches/JDK6/core/sis-utility/src/site/site.xml
sis/branches/JDK6/core/src/
sis/branches/JDK6/profiles/sis-french-profile/src/site/
sis/branches/JDK6/profiles/src/
sis/branches/JDK6/src/main/link-target/
sis/branches/JDK6/storage/sis-netcdf/src/site/
sis/branches/JDK6/storage/sis-shapefile/src/site/
sis/branches/JDK6/storage/sis-storage/src/site/
sis/branches/JDK6/storage/src/
Modified:
sis/branches/JDK6/ (props changed)
sis/branches/JDK6/src/site/apt/index.apt
sis/branches/JDK6/src/site/site.xml
Propchange: sis/branches/JDK6/
------------------------------------------------------------------------------
Merged /sis/branches/JDK7:r1572528-1572717
Modified: sis/branches/JDK6/src/site/apt/index.apt
URL:
http://svn.apache.org/viewvc/sis/branches/JDK6/src/site/apt/index.apt?rev=1572721&r1=1572720&r2=1572721&view=diff
==============================================================================
--- sis/branches/JDK6/src/site/apt/index.apt [UTF-8] (original)
+++ sis/branches/JDK6/src/site/apt/index.apt [UTF-8] Thu Feb 27 20:25:40 2014
@@ -43,14 +43,41 @@ The Apache SIS™ library
The project home is {{http://sis.apache.org}}.
-* Documentation
+* Modules
-** User documentation
+ Maven-generated reports for SIS modules are available at the following
locations:
- * {{{./apidocs/index.html}Aggregated Javadoc}}
+ * Core
- * Developer Guide (English - translation to be provided later)
({{{./book/fr.xhtml}Français}})
+ * {{{./sis-build-helper/index.html}Build helper}} — Maven Mojos and
Javadoc taglets for SIS build.
+ * {{{./sis-utility/index.html}Utilities}} — simple data objects and
miscellaneous utilities.
+
+ * {{{./sis-metadata/index.html}Metadata}} — metadata classes derived from
ISO 19115.
+
+ * {{{./sis-referencing/index.html}Referencing}} — Coordinate Reference
Systems (CRS), conversion and transformation services derived from ISO 19111.
+
+ * {{{./sis-feature/index.html}Features}} — Representations of geographic
features.
+
+ * Storage
+
+ * {{{./sis-storage/index.html}Storage}} — Base classes to be implemented
by various storage formats.
+
+ * {{{./sis-shapefile/index.html}Shapefile}} — Read and write files in the
Shapefile format.
+
+ * {{{./sis-netcdf/index.html}NetCDF}} — Bridge between NetCDF Climate and
Forecast (CF) convention and ISO 19115 metadata.
+
+ * Applications
+
+ * {{{./sis-webapp/index.html}Wep application}} — Web application.
+
+ * {{{./sis-console/index.html}Console application}} — Console application.
+
+ * Profiles
+
+ * {{{./sis-french-profile/index.html}French profile}} — Extensions to
ISO-19115 metadata mandated by the French government.
+
+ []
Apache SIS, Apache, the Apache feather logo, and the Apache SIS project logo
are trademarks of
The Apache Software Foundation.
Modified: sis/branches/JDK6/src/site/site.xml
URL:
http://svn.apache.org/viewvc/sis/branches/JDK6/src/site/site.xml?rev=1572721&r1=1572720&r2=1572721&view=diff
==============================================================================
--- sis/branches/JDK6/src/site/site.xml (original)
+++ sis/branches/JDK6/src/site/site.xml Thu Feb 27 20:25:40 2014
@@ -29,59 +29,37 @@
==================================================== -->
<bannerLeft>
<name>Apache SIS</name>
- <src>http://builds.apache.org/job/sis-trunk/site/images/banner.png</src>
- <href>http://builds.apache.org/job/sis-trunk/site/index.html</href>
+ <src>http://builds.apache.org/job/sis-jdk6/site/images/banner.png</src>
+ <href>http://builds.apache.org/job/sis-jdk6/site/index.html</href>
</bannerLeft>
<body>
<!--
Links to appears just below the right banner.
- Those links will be inherited by all modules;
- they will not be repeated.
+ Those links will be inherited by all modules.
-->
<links>
- <item name="Apache" href="http://www.apache.org"/>
- <item name="SIS home" href="http://sis.apache.org"/>
+ <item name="Apache Software Foundation (ASF)"
href="http://www.apache.org"/>
<item name="Open Geospatial Consortium (OGC)"
href="http://www.opengeospatial.org"/>
<item name="GeoAPI" href="http://www.geoapi.org"/>
- <item name="Javadoc"
href="http://builds.apache.org/job/sis-trunk/site/apidocs/index.html"/>
- <!-- Absolute URL in order to point to the aggregated Javadoc instead
than module Javadoc. -->
+ <item name="SIS home" href="http://sis.apache.org"/>
</links>
<!--
Menus to appears on the left side of home page.
- Those menus are NOT inherited - all modules must defines their own.
- We proceeded that way because the content will vary: some modules
- have FAQ sections, other not, etc.
-->
- <menu name="Quick links" inherit="none">
- <item name="Aggregated Javadoc" href="apidocs/index.html"/>
- <item name="Mailing list" href="mail-lists.html"/>
- <item name="Who we are" href="team-list.html"/>
- <item name="License" href="license.html"/>
+ <menu name="Quick links" inherit="top">
+ <item name="Aggregated Javadoc"
href="http://builds.apache.org/job/sis-jdk6/site/apidocs/index.html"/>
+ <!-- Absolute URL in order to point to the aggregated Javadoc instead
than module Javadoc. -->
</menu>
<!--
- 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
+ Do not list the modules because 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-feature/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.) -->
+ <menu ref="parent" inherit="top"/> <!-- Replaced by a link to the parent.
-->
+ <menu ref="reports" inherit="top"/> <!-- Replaced by menus for any
configured reports (mailing lists, etc.) -->
</body>
</project>
