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 2012/02/01 18:50:14 UTC
svn commit: r1239235 - in /incubator/jspwiki/trunk: ChangeLog ReleaseNotes
src/org/apache/wiki/Release.java src/org/apache/wiki/util/ClassUtil.java
Author: metskem
Date: Wed Feb 1 17:50:13 2012
New Revision: 1239235
URL: http://svn.apache.org/viewvc?rev=1239235&view=rev
Log:
2012-02-01 Harry Metske <me...@apache.org>
* 2.9.0-svn-3
* fixed JSPWIKI-719 (plugin compatibility with com.ecyrd.jspwiki)
* draft ReleaseNotes
Modified:
incubator/jspwiki/trunk/ChangeLog
incubator/jspwiki/trunk/ReleaseNotes
incubator/jspwiki/trunk/src/org/apache/wiki/Release.java
incubator/jspwiki/trunk/src/org/apache/wiki/util/ClassUtil.java
Modified: incubator/jspwiki/trunk/ChangeLog
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/ChangeLog?rev=1239235&r1=1239234&r2=1239235&view=diff
==============================================================================
--- incubator/jspwiki/trunk/ChangeLog (original)
+++ incubator/jspwiki/trunk/ChangeLog Wed Feb 1 17:50:13 2012
@@ -1,3 +1,11 @@
+2012-02-01 Harry Metske <me...@apache.org>
+
+ * 2.9.0-svn-3
+
+ * fixed JSPWIKI-719 (plugin compatibility with com.ecyrd.jspwiki)
+
+ * draft ReleaseNotes
+
2012-01-29 Florian Holeczek <fl...@apache.org>
* 2.9.0-svn-2
Modified: incubator/jspwiki/trunk/ReleaseNotes
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/ReleaseNotes?rev=1239235&r1=1239234&r2=1239235&view=diff
==============================================================================
--- incubator/jspwiki/trunk/ReleaseNotes (original)
+++ incubator/jspwiki/trunk/ReleaseNotes Wed Feb 1 17:50:13 2012
@@ -1,17 +1,25 @@
+Welcome to the stable version of JSPWiki 2.9!
-Welcome to the stable version of JSPWiki 2.8!
+JSPWiki 2.9 is the first version of JSPWiki which is released completely under
+the Apache License.
-JSPWiki 2.8.4 is a security and stability update to 2.8.x-series. All users
-are encouraged to upgrade.
+Please report any issues at https://issues.apache.org/jira/browse/JSPWIKI
-This is the second major version of JSPWiki which is released completely under
-the Apache License. This is done as a part of the transition to the
-Apache Incubation.
+UPDATES SINCE 2.8.4
+===================
-However, this is NOT an Apache release - JSPWiki 3.0 will be the first
-official Apache release.
+The full list is available in the ChangeLog file. Highlights include
-Please report any issues at https://issues.apache.org/jira/browse/JSPWIKI
+* The java packages have been renamed from com.ecyrd.jspwiki to org.apache.wiki.
+
+
+* Support external properties in WikiEngine (idea from John McKinney)
+ You can now override individual properties in jspwiki.properties using standard
+ Java System properties.
+
+* Extended the list of lucene searchable file suffixes, we now do
+ ".txt", ".ini", ".xml", ".html", "htm", ".mm", ".htm", ".xhtml", ".java", ".c", ".cpp",
+ ".php", ".asm", ".sh", ".properties", ".kml", ".gpx", ".loc"
UPDATES SINCE 2.8.3
===================
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=1239235&r1=1239234&r2=1239235&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/Release.java (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/Release.java Wed Feb 1 17:50:13 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 = "2";
+ public static final String BUILD = "3";
/**
* This is the generic version string you should use
Modified: incubator/jspwiki/trunk/src/org/apache/wiki/util/ClassUtil.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/org/apache/wiki/util/ClassUtil.java?rev=1239235&r1=1239234&r2=1239235&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/org/apache/wiki/util/ClassUtil.java (original)
+++ incubator/jspwiki/trunk/src/org/apache/wiki/util/ClassUtil.java Wed Feb 1 17:50:13 2012
@@ -102,7 +102,7 @@ public final class ClassUtil
* attempt to find the class based on just the className parameter, but
* should that fail, will iterate through the "packages" -list, prefixes
* the package name to the className, and then tries to find the class
- * again.
+ * again. If that still fails, we try the old (pre-2.9) com.ecyrd.jspwiki package.
*
* @param packages A List of Strings, containing different package names.
* @param className The name of the class to find.
@@ -134,6 +134,18 @@ public final class ClassUtil
// This is okay, we go to the next package.
}
}
+
+ // try the old (pre 2.9) package name for compatibility :
+ try
+ {
+ className = className.replaceFirst( "com\\.ecyrd\\.jspwiki", "org.apache.wiki" );
+ return loader.loadClass( className );
+ }
+ catch( ClassNotFoundException ex )
+ {
+ // This is okay, if we fail we throw our own CNFE..
+ }
+
}
throw new ClassNotFoundException("Class '"+className+"' not found in search path!");