You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by se...@apache.org on 2010/01/14 13:51:25 UTC
svn commit: r899183 - in /jackrabbit/branches/2.0: ./
jackrabbit-webapp/src/main/webapp/META-INF/NOTICE
jackrabbit-webapp/src/main/webapp/about.jsp
jackrabbit-webapp/src/main/webapp/header.jsp
Author: sebastien
Date: Thu Jan 14 12:51:25 2010
New Revision: 899183
URL: http://svn.apache.org/viewvc?rev=899183&view=rev
Log:
2.0: Merged revision 899181 (Update jackrabbit-webapp pages)
- use JR 2.0 javadoc link
Modified:
jackrabbit/branches/2.0/ (props changed)
jackrabbit/branches/2.0/jackrabbit-webapp/src/main/webapp/META-INF/NOTICE
jackrabbit/branches/2.0/jackrabbit-webapp/src/main/webapp/about.jsp
jackrabbit/branches/2.0/jackrabbit-webapp/src/main/webapp/header.jsp
Propchange: jackrabbit/branches/2.0/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jan 14 12:51:25 2010
@@ -2,4 +2,4 @@
/jackrabbit/sandbox/JCR-1456:774917-886178
/jackrabbit/sandbox/JCR-2170:812417-816332
/jackrabbit/sandbox/tripod-JCR-2209:795441-795863
-/jackrabbit/trunk:891595,891629,892253,892263,894150-894151,896408,896513,896532,896857,896870,896876,896908,896940,896942-896943,896969,896977,897071,897836,897842,897858,897935,897983,897992-897993,897996,898002,898042,898267,898325,898540,898677,898699,898701,898715
+/jackrabbit/trunk:891595,891629,892253,892263,894150-894151,896408,896513,896532,896857,896870,896876,896908,896940,896942-896943,896969,896977,897071,897836,897842,897858,897935,897983,897992-897993,897996,898002,898042,898267,898325,898540,898677,898699,898701,898715,899181
Modified: jackrabbit/branches/2.0/jackrabbit-webapp/src/main/webapp/META-INF/NOTICE
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.0/jackrabbit-webapp/src/main/webapp/META-INF/NOTICE?rev=899183&r1=899182&r2=899183&view=diff
==============================================================================
--- jackrabbit/branches/2.0/jackrabbit-webapp/src/main/webapp/META-INF/NOTICE (original)
+++ jackrabbit/branches/2.0/jackrabbit-webapp/src/main/webapp/META-INF/NOTICE Thu Jan 14 12:51:25 2010
@@ -1,5 +1,5 @@
Apache Jackrabbit
-Copyright 2009 The Apache Software Foundation
+Copyright 2010 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
Modified: jackrabbit/branches/2.0/jackrabbit-webapp/src/main/webapp/about.jsp
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.0/jackrabbit-webapp/src/main/webapp/about.jsp?rev=899183&r1=899182&r2=899183&view=diff
==============================================================================
--- jackrabbit/branches/2.0/jackrabbit-webapp/src/main/webapp/about.jsp (original)
+++ jackrabbit/branches/2.0/jackrabbit-webapp/src/main/webapp/about.jsp Thu Jan 14 12:51:25 2010
@@ -59,8 +59,8 @@
<p>
Version 1.0 of the JCR API was specified by the
<a href="http://jcp.org/en/jsr/detail?id=170">Java Specification Request 170</a>
- (JSR 170) and work on the JCR version 2.0 has begun in
- <a href="http://jcp.org/en/jsr/detail?id=170">JSR 283</a>.
+ (JSR 170) and version 2.0 by the
+ <a href="http://jcp.org/en/jsr/detail?id=170">Java Specification Request 283</a>.
</p>
<p>
Apache Jackrabbit is a project of the
Modified: jackrabbit/branches/2.0/jackrabbit-webapp/src/main/webapp/header.jsp
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.0/jackrabbit-webapp/src/main/webapp/header.jsp?rev=899183&r1=899182&r2=899183&view=diff
==============================================================================
--- jackrabbit/branches/2.0/jackrabbit-webapp/src/main/webapp/header.jsp (original)
+++ jackrabbit/branches/2.0/jackrabbit-webapp/src/main/webapp/header.jsp Thu Jan 14 12:51:25 2010
@@ -72,7 +72,7 @@
<li>Apache Jackrabbit
<ul>
<li><a href="http://jackrabbit.apache.org/">Apache Jackrabbit</a></li>
- <li><a href="http://jackrabbit.apache.org/api/1.5/">Jackrabbit API</a></li>
+ <li><a href="http://jackrabbit.apache.org/api/2.0/">Jackrabbit API</a></li>
<li><a href="http://wiki.apache.org/jackrabbit/FrontPage">Jackrabbit Wiki</a></li>
</ul>
</li>
@@ -80,7 +80,7 @@
<ul>
<li><a href="http://jcp.org/en/jsr/detail?id=170">JSR 170</a></li>
<li><a href="http://jcp.org/en/jsr/detail?id=283">JSR 283</a></li>
- <li><a href="http://www.day.com/maven/jsr170/javadocs/jcr-1.0/">JCR API</a></li>
+ <li><a href="http://www.day.com/maven/javax.jcr/javadocs/jcr-2.0/">JCR 2.0 API</a></li>
</ul>
</li>
</ul>