jspwiki-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ajaqu...@apache.org
Subject svn commit: r728290 - in /incubator/jspwiki/trunk: ChangeLog build.xml src/com/ecyrd/jspwiki/Release.java src/com/ecyrd/jspwiki/ui/stripes/HandlerInfo.java tests/etc/WEB-INF/
Date Sat, 20 Dec 2008 15:42:33 GMT
Author: ajaquith
Date: Sat Dec 20 07:42:32 2008
New Revision: 728290

URL: http://svn.apache.org/viewvc?rev=728290&view=rev
Log:
Fixed some failing unit tests due to prefs refactoring.

Modified:
    incubator/jspwiki/trunk/ChangeLog
    incubator/jspwiki/trunk/build.xml
    incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/Release.java
    incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/ui/stripes/HandlerInfo.java
    incubator/jspwiki/trunk/tests/etc/WEB-INF/   (props changed)

Modified: incubator/jspwiki/trunk/ChangeLog
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/ChangeLog?rev=728290&r1=728289&r2=728290&view=diff
==============================================================================
--- incubator/jspwiki/trunk/ChangeLog (original)
+++ incubator/jspwiki/trunk/ChangeLog Sat Dec 20 07:42:32 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 <jalkanen@apache.org>
 
         * 3.0.0-svn-35

Modified: incubator/jspwiki/trunk/build.xml
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/build.xml?rev=728290&r1=728289&r2=728290&view=diff
==============================================================================
--- incubator/jspwiki/trunk/build.xml (original)
+++ incubator/jspwiki/trunk/build.xml Sat Dec 20 07:42:32 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/trunk/src/com/ecyrd/jspwiki/Release.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/Release.java?rev=728290&r1=728289&r2=728290&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/Release.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/Release.java Sat Dec 20 07:42:32 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/trunk/src/com/ecyrd/jspwiki/ui/stripes/HandlerInfo.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/ui/stripes/HandlerInfo.java?rev=728290&r1=728289&r2=728290&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/ui/stripes/HandlerInfo.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/ui/stripes/HandlerInfo.java Sat Dec 20 07:42:32
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/trunk/tests/etc/WEB-INF/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sat Dec 20 07:42:32 2008
@@ -1,3 +1,4 @@
 jspwiki.policy
 web.xml
 dtd
+jspwiki.properties



Mime
View raw message