You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jspwiki.apache.org by aj...@apache.org on 2008/11/30 23:31:38 UTC
svn commit: r721913 - in
/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH: ChangeLog build.xml
Author: ajaquith
Date: Sun Nov 30 14:31:38 2008
New Revision: 721913
URL: http://svn.apache.org/viewvc?rev=721913&view=rev
Log:
Partial merge with trunk...
Modified:
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/ChangeLog
incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/build.xml
Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/ChangeLog
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/ChangeLog?rev=721913&r1=721912&r2=721913&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/ChangeLog (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/ChangeLog Sun Nov 30 14:31:38 2008
@@ -1,3 +1,83 @@
+2008-11-06 Janne Jalkanen <ja...@apache.org>
+
+ * 3.0.0-svn-17
+
+ * Logging package now implements an varargs interface for
+ faster and more flexible logging. Please see Logger javadocs
+ for further information.
+
+2008-11-30 Harry Metske <me...@apache.org>
+
+ * 3.0.0-svn-16
+
+ * JSPWIKI-447: InstantiationException in PluginManager
+ sneaked in an example log4j override in log4j.properties
+ WatchDog did not have it's Logger final.
+
+2008-11-30 Florian Holeczek <fl...@apache.org>
+
+ * 3.0.0-svn-15
+
+ * german localization update for resources introduced in JSPWIKI-318
+
+
+2008-11-30 Florian Holeczek <fl...@apache.org>
+
+ * corrected a copy & paste error in the newly introduced log4j.properties
+
+2008-11-29 Dirk Frederickx <di...@gmail.com>
+
+ * 3.0.0-svn-14
+
+ * [JSPWIKI-288] CSS fix for the rendering of hash-links.
+
+ * [JSPWIKI-318] You can now show/hide the left-menu, with a click
+ of the mouse. The status of the left-menu is saved in the
+ user-pref cookie.
+
+ New localization resources:
+ javascript.favorites.hide=Click to hide the Favorites
+ javascript.favorites.show=Chick to show the Favorites
+
+ * [JSPWIKI-429] The Slimbox icon has been changed to a magnifying
+ glass. If you don't know what this is, check out the attachement
+ tab. Clicking the slimbox icon provides you with a sneak preview
+ of images like png, gif, jpg.
+
+2008-11-29 Harry Metske <me...@apache.org>
+
+ * 3.0.0-svn-13
+
+ * JSPWIKI-376: move from log4j to slf4j
+ 3 new classes in the new package com.ecyrd.jspwiki.log
+ - LoggerFactory
+ - Logger (interface)
+ - LoggerImpl
+ The LoggerFactory also takes care of registering DynamicMBeans if log4j is used
+ as the underlying logging implementation.
+ Log4j remains the default implementation (Stripes still needs it too)
+ Changes to 34 JSP's
+ Changes to 135 Java classes
+ Additions to WEB-INF/lib : slf4j-log4j12-1.5.6.jar, jul-to-slf4j-1.5.6.jar, jcl-over-slf4j-1.5.6.jar
+ Removals from .classpath: commons-logging-api.jar, log4j-1.2.14.jar
+ Additions to .classpath : slf4j-api-1.5.6.jar, jul-to-slf4j-1.5.6.jar
+ Move log4j config statements from jspwiki.properties to log4j.properties
+ Changes to build.xml (include org.apache.jspwiki in javadoc gen)
+ A few other minor changes.
+
+
+2008-11-21 Harry Metske <me...@apache.org>
+
+ * 3.0.0-svn-12
+
+ * JSPWIKI-440: Plesk installation of war files.
+ JSPWiki (in most cases) fails to install from an unmodified download because
+ the pageDir points to a directory that cannot be created, changed a couple of default
+ values in build.properties.
+
+ * JSPWIKI-424 The famous trailing slash in baseURL
+ Now also fixed in Installer and DefaultURLConstructor.
+
2008-11-21 Harry Metske <me...@apache.org>
* 3.0.0-svn-12
Modified: incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/build.xml
URL: http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/build.xml?rev=721913&r1=721912&r2=721913&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/build.xml (original)
+++ incubator/jspwiki/branches/JSPWIKI_2_9_STRIPES_BRANCH/build.xml Sun Nov 30 14:31:38 2008
@@ -268,6 +268,7 @@
windowtitle="${ant.project.name}">
<packageset dir="${code.src}">
<include name="com/ecyrd/**" />
+ <include name="org/apache/jspwiki/**" />
</packageset>
<link href="http://java.sun.com/j2se/1.5.0/docs/api/"/>
<link href="http://java.sun.com/products/javamail/javadocs/"/>
@@ -437,7 +438,10 @@
<include name="userdatabase.xml" />
<include name="groupdatabase.xml" />
</webinf>
- <classes dir="etc" includes="oscache.properties" />
+ <classes dir="etc">
+ <include name="oscache.properties" />
+ <include name="log4j.properties" />
+ </classes>
</war>
<war warfile="${warfile}"
@@ -881,6 +885,7 @@
<!-- Copy the classes -->
<copy toDir="@{context.dir}/webapp/WEB-INF/classes">
<fileset dir="etc" includes="oscache.properties" />
+ <fileset dir="etc" includes="log4j.properties" />
</copy>
<!-- Copy the libraries -->