Author: jalkanen
Date: Sat Dec 20 08:51:04 2008
New Revision: 728299
URL: http://svn.apache.org/viewvc?rev=728299&view=rev
Log:
Merged with trunk r728289
Modified:
incubator/jspwiki/branches/JSPWIKI_JCR_BRANCH/ChangeLog
incubator/jspwiki/branches/JSPWIKI_JCR_BRANCH/build.xml
incubator/jspwiki/branches/JSPWIKI_JCR_BRANCH/src/com/ecyrd/jspwiki/Release.java
incubator/jspwiki/branches/JSPWIKI_JCR_BRANCH/src/com/ecyrd/jspwiki/ui/stripes/HandlerInfo.java
incubator/jspwiki/branches/JSPWIKI_JCR_BRANCH/tests/etc/WEB-INF/ (props
changed)
Modified: incubator/jspwiki/branches/JSPWIKI_JCR_BRANCH/ChangeLog
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_JCR_BRANCH/ChangeLog?rev=728299&r1=728298&r2=728299&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_JCR_BRANCH/ChangeLog (original)
+++ incubator/jspwiki/branches/JSPWIKI_JCR_BRANCH/ChangeLog Sat Dec 20 08:51:04
2008
@@ -1,3 +1,9 @@
+2008-12-20 Andrew Jaquith <ajaquith AT apache DOT org>
+
+ * 3.0.0-svn-36
+
+ * Fixed some failing unit tests due to prefs refactoring.
+
2008-12-20 Janne Jalkanen <[email protected]>
* 3.0.0-svn-35
Modified: incubator/jspwiki/branches/JSPWIKI_JCR_BRANCH/build.xml
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_JCR_BRANCH/build.xml?rev=728299&r1=728298&r2=728299&view=diff
==============================================================================
--- incubator/jspwiki/branches/JSPWIKI_JCR_BRANCH/build.xml (original)
+++ incubator/jspwiki/branches/JSPWIKI_JCR_BRANCH/build.xml Sat Dec 20 08:51:04
2008
@@ -640,11 +640,13 @@
<copy file="${webtests.build}/web.xml.container"
tofile="tests/etc/WEB-INF/web.xml" overwrite="true" />
- <!-- Copy the DTDs to the test WEB-INF -->
+ <!-- Copy the DTDs and jspwiki.properties to the test WEB-INF -->
<mkdir dir="tests/etc/WEB-INF/dtd" />
<copy toDir="tests/etc/WEB-INF/dtd">
<fileset dir="${basedir}/etc/dtd/" />
</copy>
+ <copy file="${basedir}/etc/jspwiki.properties"
+ tofile="tests/etc/WEB-INF/jspwiki.properties" overwrite="true" />
</target>
<!-- This target runs the JUnit tests that are available
Modified:
incubator/jspwiki/branches/JSPWIKI_JCR_BRANCH/src/com/ecyrd/jspwiki/Release.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_JCR_BRANCH/src/com/ecyrd/jspwiki/Release.java?rev=728299&r1=728298&r2=728299&view=diff
==============================================================================
---
incubator/jspwiki/branches/JSPWIKI_JCR_BRANCH/src/com/ecyrd/jspwiki/Release.java
(original)
+++
incubator/jspwiki/branches/JSPWIKI_JCR_BRANCH/src/com/ecyrd/jspwiki/Release.java
Sat Dec 20 08:51:04 2008
@@ -77,7 +77,7 @@
* <p>
* If the build identifier is empty, it is not added.
*/
- public static final String BUILD = "35";
+ public static final String BUILD = "36";
/**
* This is the generic version string you should use
Modified:
incubator/jspwiki/branches/JSPWIKI_JCR_BRANCH/src/com/ecyrd/jspwiki/ui/stripes/HandlerInfo.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/branches/JSPWIKI_JCR_BRANCH/src/com/ecyrd/jspwiki/ui/stripes/HandlerInfo.java?rev=728299&r1=728298&r2=728299&view=diff
==============================================================================
---
incubator/jspwiki/branches/JSPWIKI_JCR_BRANCH/src/com/ecyrd/jspwiki/ui/stripes/HandlerInfo.java
(original)
+++
incubator/jspwiki/branches/JSPWIKI_JCR_BRANCH/src/com/ecyrd/jspwiki/ui/stripes/HandlerInfo.java
Sat Dec 20 08:51:04 2008
@@ -117,7 +117,7 @@
// Identify the wiki request context identified by @WikiRequestContext
// (if supplied)
WikiRequestContext requestContext = method.getAnnotation(
WikiRequestContext.class );
- String defaultRequestContext = m_handlerMethod.getClass().getName() +
"." + eventHandler;
+ String defaultRequestContext = m_beanClass.getName() + "." +
eventHandler;
m_requestContext = requestContext != null ? requestContext.value() :
defaultRequestContext;
// Store the Stripes event handler name
Propchange: incubator/jspwiki/branches/JSPWIKI_JCR_BRANCH/tests/etc/WEB-INF/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sat Dec 20 08:51:04 2008
@@ -1,3 +1,4 @@
jspwiki.policy
web.xml
dtd
+jspwiki.properties
