You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jspwiki.apache.org by me...@apache.org on 2009/04/23 19:03:51 UTC
svn commit: r767979 - in /incubator/jspwiki/trunk: ./
src/java/org/apache/wiki/ src/java/org/apache/wiki/plugin/
tests/java/org/apache/wiki/ tests/java/org/apache/wiki/plugin/
Author: metskem
Date: Thu Apr 23 17:03:50 2009
New Revision: 767979
URL: http://svn.apache.org/viewvc?rev=767979&view=rev
Log:
3.0.0-svn-104
* JSPWIKI-523 Change TableOfContentsPlugin so it generates (more) relative links
so it properly displays when used in EditHelpPage (reported by Stefan Bohn.
* Added two (dummy) methods to TestJDBCDataSource so it also compiles with JDK 6
Modified:
incubator/jspwiki/trunk/ChangeLog
incubator/jspwiki/trunk/src/java/org/apache/wiki/Release.java
incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/TableOfContents.java
incubator/jspwiki/trunk/tests/java/org/apache/wiki/TestJDBCDataSource.java
incubator/jspwiki/trunk/tests/java/org/apache/wiki/plugin/TableOfContentsTest.java
Modified: incubator/jspwiki/trunk/ChangeLog
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/ChangeLog?rev=767979&r1=767978&r2=767979&view=diff
==============================================================================
--- incubator/jspwiki/trunk/ChangeLog (original)
+++ incubator/jspwiki/trunk/ChangeLog Thu Apr 23 17:03:50 2009
@@ -1,3 +1,12 @@
+2009-04-23 Harry Metske <me...@apache.org>
+
+ * 3.0.0-svn-104
+
+ * JSPWIKI-523 Change TableOfContentsPlugin so it generates (more) relative links
+ so it properly displays when used in EditHelpPage (reported by Stefan Bohn.
+
+ * Added two (dummy) methods to TestJDBCDataSource so it also compiles with JDK 6
+
2009-04-19 Andrew Jaquith <ajaquith AT apache DOT org>
* 3.0.0-svn-103
@@ -659,7 +668,7 @@
* 3.0.0-svn-45
- * JSPWIKI-466 - FileSystemProviderTest rücksichtslos empties java.io.tmpdir
+ * JSPWIKI-466 - FileSystemProviderTest r�cksichtslos empties java.io.tmpdir
2009-01-03 Harry Metske <me...@apache.org>
Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/Release.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/Release.java?rev=767979&r1=767978&r2=767979&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/Release.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/Release.java Thu Apr 23 17:03:50 2009
@@ -77,7 +77,7 @@
* <p>
* If the build identifier is empty, it is not added.
*/
- public static final String BUILD = "103";
+ public static final String BUILD = "104";
/**
* This is the generic version string you should use
Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/TableOfContents.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/TableOfContents.java?rev=767979&r1=767978&r2=767979&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/TableOfContents.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/plugin/TableOfContents.java Thu Apr 23 17:03:50 2009
@@ -120,10 +120,9 @@
String titleSection = hd.m_titleSection.replace( '%', '_' );
String pageName = context.getEngine().encodeName(context.getPage().getName()).replace( '%', '_' );
- String url = context.getURL( WikiContext.VIEW, context.getPage().getName() );
String sectref = "#section-"+pageName+"-"+titleSection;
- m_buf.append( "<a class=\"wikipage\" href=\""+url+sectref+"\">");
+ m_buf.append( "<a class=\"wikipage\" href=\"" + sectref + "\">" );
if (m_usingNumberedList)
{
switch( hd.m_level )
Modified: incubator/jspwiki/trunk/tests/java/org/apache/wiki/TestJDBCDataSource.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/TestJDBCDataSource.java?rev=767979&r1=767978&r2=767979&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/org/apache/wiki/TestJDBCDataSource.java (original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/TestJDBCDataSource.java Thu Apr 23 17:03:50 2009
@@ -181,4 +181,16 @@
m_driver = (Driver) driverClass.newInstance();
}
+ public boolean isWrapperFor( Class<?> arg0 ) throws SQLException
+ {
+ // unused interface methods required for JDK 6
+ return false;
+ }
+
+ public <T> T unwrap( Class<T> arg0 ) throws SQLException
+ {
+ // unused interface methods required for JDK 6
+ return null;
+ }
+
}
Modified: incubator/jspwiki/trunk/tests/java/org/apache/wiki/plugin/TableOfContentsTest.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/java/org/apache/wiki/plugin/TableOfContentsTest.java?rev=767979&r1=767978&r2=767979&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/java/org/apache/wiki/plugin/TableOfContentsTest.java (original)
+++ incubator/jspwiki/trunk/tests/java/org/apache/wiki/plugin/TableOfContentsTest.java Thu Apr 23 17:03:50 2009
@@ -79,7 +79,7 @@
assertEquals( "<p><div class=\"toc\">\n<div class=\"collapsebox\">\n"+
"<h4 id=\"section-TOC\">Table of Contents</h4>\n"+
"<ul>\n"+
- "<li class=\"toclevel-1\"><a class=\"wikipage\" href=\"/Wiki.jsp?page=Test#section-Test-HeadingBar\">Heading bar</a></li>\n"+
+ "<li class=\"toclevel-1\"><a class=\"wikipage\" href=\"#section-Test-HeadingBar\">Heading bar</a></li>\n"+
"</ul>\n</div>\n</div>\n\n</p>"+
"\n<h2 id=\"section-Test-HeadingBar\">Heading bar<a class=\"hashlink\" href=\"#section-Test-HeadingBar\">#</a></h2>\n",
res );
@@ -98,9 +98,9 @@
String expecting = "<p><div class=\"toc\">\n<div class=\"collapsebox\">\n"+
"<h4 id=\"section-TOC\">Table of Contents</h4>\n"+
"<ul>\n"+
- "<li class=\"toclevel-1\"><a class=\"wikipage\" href=\"/Wiki.jsp?page=Test#section-Test-HeadingBar\">3 Heading bar</a></li>\n"+
- "<li class=\"toclevel-2\"><a class=\"wikipage\" href=\"/Wiki.jsp?page=Test#section-Test-Subheading\">3.1 Subheading</a></li>\n"+
- "<li class=\"toclevel-3\"><a class=\"wikipage\" href=\"/Wiki.jsp?page=Test#section-Test-Subsubheading\">3.1.1 Subsubheading</a></li>\n"+
+ "<li class=\"toclevel-1\"><a class=\"wikipage\" href=\"#section-Test-HeadingBar\">3 Heading bar</a></li>\n"+
+ "<li class=\"toclevel-2\"><a class=\"wikipage\" href=\"#section-Test-Subheading\">3.1 Subheading</a></li>\n"+
+ "<li class=\"toclevel-3\"><a class=\"wikipage\" href=\"#section-Test-Subsubheading\">3.1.1 Subsubheading</a></li>\n"+
"</ul>\n</div>\n</div>\n\n</p>"+
"\n<h2 id=\"section-Test-HeadingBar\">Heading bar<a class=\"hashlink\" href=\"#section-Test-HeadingBar\">#</a></h2>"+
"\n<h3 id=\"section-Test-Subheading\">Subheading<a class=\"hashlink\" href=\"#section-Test-Subheading\">#</a></h3>"+
@@ -123,14 +123,14 @@
String expecting = "<p><div class=\"toc\">\n<div class=\"collapsebox\">\n"+
"<h4 id=\"section-TOC\">Table of Contents</h4>\n"+
"<ul>\n"+
- "<li class=\"toclevel-1\"><a class=\"wikipage\" href=\"/Wiki.jsp?page=Test#section-Test-HeadingBar\">3 Heading bar</a></li>\n"+
- "<li class=\"toclevel-2\"><a class=\"wikipage\" href=\"/Wiki.jsp?page=Test#section-Test-Subheading\">3.1 Subheading</a></li>\n"+
- "<li class=\"toclevel-3\"><a class=\"wikipage\" href=\"/Wiki.jsp?page=Test#section-Test-Subsubheading\">3.1.1 Subsubheading</a></li>\n"+
- "<li class=\"toclevel-3\"><a class=\"wikipage\" href=\"/Wiki.jsp?page=Test#section-Test-Subsubheading2\">3.1.2 Subsubheading2</a></li>\n"+
- "<li class=\"toclevel-2\"><a class=\"wikipage\" href=\"/Wiki.jsp?page=Test#section-Test-Subheading2\">3.2 Subheading2</a></li>\n"+
- "<li class=\"toclevel-3\"><a class=\"wikipage\" href=\"/Wiki.jsp?page=Test#section-Test-Subsubheading3\">3.2.1 Subsubheading3</a></li>\n"+
- "<li class=\"toclevel-1\"><a class=\"wikipage\" href=\"/Wiki.jsp?page=Test#section-Test-Heading\">4 Heading</a></li>\n"+
- "<li class=\"toclevel-2\"><a class=\"wikipage\" href=\"/Wiki.jsp?page=Test#section-Test-Subheading3\">4.1 Subheading3</a></li>\n"+
+ "<li class=\"toclevel-1\"><a class=\"wikipage\" href=\"#section-Test-HeadingBar\">3 Heading bar</a></li>\n"+
+ "<li class=\"toclevel-2\"><a class=\"wikipage\" href=\"#section-Test-Subheading\">3.1 Subheading</a></li>\n"+
+ "<li class=\"toclevel-3\"><a class=\"wikipage\" href=\"#section-Test-Subsubheading\">3.1.1 Subsubheading</a></li>\n"+
+ "<li class=\"toclevel-3\"><a class=\"wikipage\" href=\"#section-Test-Subsubheading2\">3.1.2 Subsubheading2</a></li>\n"+
+ "<li class=\"toclevel-2\"><a class=\"wikipage\" href=\"#section-Test-Subheading2\">3.2 Subheading2</a></li>\n"+
+ "<li class=\"toclevel-3\"><a class=\"wikipage\" href=\"#section-Test-Subsubheading3\">3.2.1 Subsubheading3</a></li>\n"+
+ "<li class=\"toclevel-1\"><a class=\"wikipage\" href=\"#section-Test-Heading\">4 Heading</a></li>\n"+
+ "<li class=\"toclevel-2\"><a class=\"wikipage\" href=\"#section-Test-Subheading3\">4.1 Subheading3</a></li>\n"+
"</ul>\n</div>\n</div>\n\n</p>"+
"\n<h2 id=\"section-Test-HeadingBar\">Heading bar<a class=\"hashlink\" href=\"#section-Test-HeadingBar\">#</a></h2>"+
"\n<h3 id=\"section-Test-Subheading\">Subheading<a class=\"hashlink\" href=\"#section-Test-Subheading\">#</a></h3>"+
@@ -158,15 +158,15 @@
String expecting = "<p><div class=\"toc\">\n<div class=\"collapsebox\">\n"+
"<h4 id=\"section-TOC\">Table of Contents</h4>\n"+
"<ul>\n"+
- "<li class=\"toclevel-2\"><a class=\"wikipage\" href=\"/Wiki.jsp?page=Test#section-Test-Subheading0\">3.1 Subheading0</a></li>\n"+
- "<li class=\"toclevel-1\"><a class=\"wikipage\" href=\"/Wiki.jsp?page=Test#section-Test-HeadingBar\">4 Heading bar</a></li>\n"+
- "<li class=\"toclevel-2\"><a class=\"wikipage\" href=\"/Wiki.jsp?page=Test#section-Test-Subheading\">4.1 Subheading</a></li>\n"+
- "<li class=\"toclevel-3\"><a class=\"wikipage\" href=\"/Wiki.jsp?page=Test#section-Test-Subsubheading\">4.1.1 Subsubheading</a></li>\n"+
- "<li class=\"toclevel-3\"><a class=\"wikipage\" href=\"/Wiki.jsp?page=Test#section-Test-Subsubheading2\">4.1.2 Subsubheading2</a></li>\n"+
- "<li class=\"toclevel-2\"><a class=\"wikipage\" href=\"/Wiki.jsp?page=Test#section-Test-Subheading2\">4.2 Subheading2</a></li>\n"+
- "<li class=\"toclevel-3\"><a class=\"wikipage\" href=\"/Wiki.jsp?page=Test#section-Test-Subsubheading3\">4.2.1 Subsubheading3</a></li>\n"+
- "<li class=\"toclevel-1\"><a class=\"wikipage\" href=\"/Wiki.jsp?page=Test#section-Test-Heading\">5 Heading</a></li>\n"+
- "<li class=\"toclevel-2\"><a class=\"wikipage\" href=\"/Wiki.jsp?page=Test#section-Test-Subheading3\">5.1 Subheading3</a></li>\n"+
+ "<li class=\"toclevel-2\"><a class=\"wikipage\" href=\"#section-Test-Subheading0\">3.1 Subheading0</a></li>\n"+
+ "<li class=\"toclevel-1\"><a class=\"wikipage\" href=\"#section-Test-HeadingBar\">4 Heading bar</a></li>\n"+
+ "<li class=\"toclevel-2\"><a class=\"wikipage\" href=\"#section-Test-Subheading\">4.1 Subheading</a></li>\n"+
+ "<li class=\"toclevel-3\"><a class=\"wikipage\" href=\"#section-Test-Subsubheading\">4.1.1 Subsubheading</a></li>\n"+
+ "<li class=\"toclevel-3\"><a class=\"wikipage\" href=\"#section-Test-Subsubheading2\">4.1.2 Subsubheading2</a></li>\n"+
+ "<li class=\"toclevel-2\"><a class=\"wikipage\" href=\"#section-Test-Subheading2\">4.2 Subheading2</a></li>\n"+
+ "<li class=\"toclevel-3\"><a class=\"wikipage\" href=\"#section-Test-Subsubheading3\">4.2.1 Subsubheading3</a></li>\n"+
+ "<li class=\"toclevel-1\"><a class=\"wikipage\" href=\"#section-Test-Heading\">5 Heading</a></li>\n"+
+ "<li class=\"toclevel-2\"><a class=\"wikipage\" href=\"#section-Test-Subheading3\">5.1 Subheading3</a></li>\n"+
"</ul>\n</div>\n</div>\n\n</p>"+
"\n<h3 id=\"section-Test-Subheading0\">Subheading0<a class=\"hashlink\" href=\"#section-Test-Subheading0\">#</a></h3>"+
"\n<h2 id=\"section-Test-HeadingBar\">Heading bar<a class=\"hashlink\" href=\"#section-Test-HeadingBar\">#</a></h2>"+
@@ -195,9 +195,9 @@
String expecting = "<p><div class=\"toc\">\n<div class=\"collapsebox\">\n"+
"<h4 id=\"section-TOC\">Table of Contents</h4>\n"+
"<ul>\n"+
- "<li class=\"toclevel-1\"><a class=\"wikipage\" href=\"/Wiki.jsp?page=Test#section-Test-HeadingBar\">FooBar-3 Heading bar</a></li>\n"+
- "<li class=\"toclevel-2\"><a class=\"wikipage\" href=\"/Wiki.jsp?page=Test#section-Test-Subheading\">FooBar-3.1 Subheading</a></li>\n"+
- "<li class=\"toclevel-3\"><a class=\"wikipage\" href=\"/Wiki.jsp?page=Test#section-Test-Subsubheading\">FooBar-3.1.1 Subsubheading</a></li>\n"+
+ "<li class=\"toclevel-1\"><a class=\"wikipage\" href=\"#section-Test-HeadingBar\">FooBar-3 Heading bar</a></li>\n"+
+ "<li class=\"toclevel-2\"><a class=\"wikipage\" href=\"#section-Test-Subheading\">FooBar-3.1 Subheading</a></li>\n"+
+ "<li class=\"toclevel-3\"><a class=\"wikipage\" href=\"#section-Test-Subsubheading\">FooBar-3.1.1 Subsubheading</a></li>\n"+
"</ul>\n</div>\n</div>\n\n</p>"+
"\n<h2 id=\"section-Test-HeadingBar\">Heading bar<a class=\"hashlink\" href=\"#section-Test-HeadingBar\">#</a></h2>"+
"\n<h3 id=\"section-Test-Subheading\">Subheading<a class=\"hashlink\" href=\"#section-Test-Subheading\">#</a></h3>"+
@@ -249,8 +249,8 @@
assertTrue( "Final HTML 1", res.indexOf( "id=\"section-Test-Test\"" ) != -1 );
assertTrue( "Final HTML 2", res.indexOf( "id=\"section-Test-Test-2\"" ) != -1 );
- assertTrue( "First test", res.indexOf( "Wiki.jsp?page=Test#section-Test-Test" ) != -1 );
- assertTrue( "2nd test", res.indexOf( "Wiki.jsp?page=Test#section-Test-Test-2" ) != -1 );
+ assertTrue( "First test", res.indexOf( "#section-Test-Test" ) != -1 );
+ assertTrue( "2nd test", res.indexOf( "#section-Test-Test-2" ) != -1 );
}
public static Test suite()