Author: desruisseaux
Date: Wed May 29 08:33:51 2013
New Revision: 1487401
URL: http://svn.apache.org/r1487401
Log:
Merge from trunk, and fixed URL to the site.
Added:
sis/branches/JDK7/src/site/resources/images/banner.png
- copied unchanged from r1487399,
sis/trunk/src/site/resources/images/banner.png
Modified:
sis/branches/JDK7/ (props changed)
sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/internal/taglet/WebSite.java
sis/branches/JDK7/pom.xml
sis/branches/JDK7/src/site/site.xml
Propchange: sis/branches/JDK7/
------------------------------------------------------------------------------
Merged /sis/trunk:r1487001-1487399
Modified:
sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/internal/taglet/WebSite.java
URL:
http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/internal/taglet/WebSite.java?rev=1487401&r1=1487400&r2=1487401&view=diff
==============================================================================
---
sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/internal/taglet/WebSite.java
[UTF-8] (original)
+++
sis/branches/JDK7/core/sis-build-helper/src/main/java/org/apache/sis/internal/taglet/WebSite.java
[UTF-8] Wed May 29 08:33:51 2013
@@ -33,7 +33,7 @@ public final class WebSite extends Inlin
/**
* URL to the web site, <strong>without</strong> trailing slash.
*/
- static final String URL = "http://builds.apache.org/job/sis-trunk/site";;
+ static final String URL = "http://builds.apache.org/job/sis-jdk7/site";;
/**
* Register this taglet.
Modified: sis/branches/JDK7/pom.xml
URL:
http://svn.apache.org/viewvc/sis/branches/JDK7/pom.xml?rev=1487401&r1=1487400&r2=1487401&view=diff
==============================================================================
--- sis/branches/JDK7/pom.xml (original)
+++ sis/branches/JDK7/pom.xml Wed May 29 08:33:51 2013
@@ -78,7 +78,7 @@ Apache SIS is a free software, Java lang
<ciManagement>
<system>jenkins</system>
- <url>https://builds.apache.org/job/sis-trunk</url>
+ <url>https://builds.apache.org/job/sis-jdk7</url>
</ciManagement>
<issueManagement>
Modified: sis/branches/JDK7/src/site/site.xml
URL:
http://svn.apache.org/viewvc/sis/branches/JDK7/src/site/site.xml?rev=1487401&r1=1487400&r2=1487401&view=diff
==============================================================================
--- sis/branches/JDK7/src/site/site.xml (original)
+++ sis/branches/JDK7/src/site/site.xml Wed May 29 08:33:51 2013
@@ -29,7 +29,8 @@
==================================================== -->
<bannerLeft>
<name>Apache SIS</name>
- <href>http://builds.apache.org/job/sis-trunk/site/index.html</href>
+ <src>http://builds.apache.org/job/sis-jdk7/site/images/banner.png</src>
+ <href>http://builds.apache.org/job/sis-jdk7/site/index.html</href>
</bannerLeft>
<body>
@@ -42,7 +43,7 @@
<item name="Apache" 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"/>
+ <item name="Javadoc"
href="http://builds.apache.org/job/sis-jdk7/site/apidocs/index.html"/>
<!-- Absolute URL in order to point to the aggregated Javadoc instead
than module Javadoc. -->
</links>
