Author: metskem
Date: Wed Jun 6 17:25:32 2012
New Revision: 1346994
URL: http://svn.apache.org/viewvc?rev=1346994&view=rev
Log:
2012-06-06 Harry Metske <[email protected]>
* 2.9.0-incubating-2, fixed jsp compile error in rss.jsp ( we forgot one
occurrence of com.ecyrd.jspwiki)
Modified:
incubator/jspwiki/trunk/ChangeLog
incubator/jspwiki/trunk/src/org/apache/wiki/Release.java
incubator/jspwiki/trunk/src/webdocs/rss.jsp
Modified: incubator/jspwiki/trunk/ChangeLog
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/ChangeLog?rev=1346994&r1=1346993&r2=1346994&view=diff
==============================================================================
--- incubator/jspwiki/trunk/ChangeLog (original)
+++ incubator/jspwiki/trunk/ChangeLog Wed Jun 6 17:25:32 2012
@@ -1,3 +1,7 @@
+2012-06-06 Harry Metske <[email protected]>
+
+ * 2.9.0-incubating-2, fixed jsp compile error in rss.jsp ( we forgot
one occurrence of com.ecyrd.jspwiki)
+
2012-05-02 Dirk Frederickx (brushed AT apache DOT org)
* 2.9.0-incubating-1, fixing JSPWIKI-683 Sortable Tables.
Modified: incubator/jspwiki/trunk/src/org/apache/wiki/Release.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/Release.java?rev=1346994&r1=1346993&r2=1346994&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/Release.java (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/Release.java Wed Jun 6
17:25:32 2012
@@ -77,7 +77,7 @@ public final class Release
* <p>
* If the build identifier is empty, it is not added.
*/
- public static final String BUILD = "1";
+ public static final String BUILD = "2";
/**
* This is the generic version string you should use
Modified: incubator/jspwiki/trunk/src/webdocs/rss.jsp
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/rss.jsp?rev=1346994&r1=1346993&r2=1346994&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/rss.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/rss.jsp Wed Jun 6 17:25:32 2012
@@ -63,8 +63,8 @@
SimpleDateFormat iso8601fmt = new
SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'");
Properties properties = wiki.getWikiProperties();
- String channelDescription = wiki.getRequiredProperty( properties,
RSSGenerator.PROP_CHANNEL_DESCRIPTION );
- String channelLanguage = wiki.getRequiredProperty( properties,
RSSGenerator.PROP_CHANNEL_LANGUAGE );
+ String channelDescription = WikiEngine.getRequiredProperty( properties,
RSSGenerator.PROP_CHANNEL_DESCRIPTION );
+ String channelLanguage = WikiEngine.getRequiredProperty( properties,
RSSGenerator.PROP_CHANNEL_LANGUAGE );
//
// Now, list items.
@@ -73,7 +73,7 @@
if( mode.equals("blog") )
{
- org.apache.wiki.plugin.WeblogPlugin plug = new
com.ecyrd.jspwiki.plugin.WeblogPlugin();
+ org.apache.wiki.plugin.WeblogPlugin plug = new
org.apache.wiki.plugin.WeblogPlugin();
changed = plug.findBlogEntries(wiki.getPageManager(),
wikipage.getName(),
new Date(0L),
