Author: ajaquith
Date: Tue Dec 2 20:32:22 2008
New Revision: 722761
URL: http://svn.apache.org/viewvc?rev=722761&view=rev
Log:
Checked in the Stripes code (about 220 classes, tests, JSPs and other files.
All code compiles clean, but the JSPs do NOT work at the moment. Unit tests run
clean except for some stray failing Stripes-related unit tests. See the file
doc/README - Stripes Migration for some (repeat, SOME) details of what it all
means. I'll sort out the JSP issues later this week.
Modified:
incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/util/AllTests.java
(contents, props changed)
incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/util/MailUtilTest.java
(contents, props changed)
incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/xmlrpc/RPCHandlerTest.java
(contents, props changed)
incubator/jspwiki/trunk/tests/etc/jspwiki.properties.tmpl
incubator/jspwiki/trunk/tests/etc/jspwiki_rcs.properties.tmpl
incubator/jspwiki/trunk/tests/etc/jspwiki_vers.properties.tmpl
Modified: incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/util/AllTests.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/util/AllTests.java?rev=722761&r1=722760&r2=722761&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/util/AllTests.java
(original)
+++ incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/util/AllTests.java Tue Dec
2 20:32:22 2008
@@ -2,6 +2,8 @@
package com.ecyrd.jspwiki.util;
+import com.ecyrd.jspwiki.ui.stripes.JspParserTest;
+
import junit.framework.*;
public class AllTests extends TestCase
@@ -18,6 +20,7 @@
suite.addTest( ClassUtilTest.suite() );
suite.addTest( CommentedPropertiesTest.suite() );
suite.addTest( CryptoUtilTest.suite() );
+ suite.addTest( JspParserTest.suite() );
suite.addTest( MailUtilTest.suite() );
suite.addTest( PriorityListTest.suite() );
suite.addTest( SerializerTest.suite() );
Propchange: incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/util/AllTests.java
('svn:eol-style' removed)
Modified: incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/util/MailUtilTest.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/util/MailUtilTest.java?rev=722761&r1=722760&r2=722761&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/util/MailUtilTest.java
(original)
+++ incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/util/MailUtilTest.java Tue
Dec 2 20:32:22 2008
@@ -52,8 +52,7 @@
TestEngine testEngine = new TestEngine( m_props );
- m_context = new WikiContext( testEngine,
- new WikiPage( testEngine, PAGE_NAME ) );
+ m_context = testEngine.getWikiContextFactory().newViewContext( null,
null, new WikiPage( testEngine, PAGE_NAME ) );
}
public void tearDown()
Propchange:
incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/util/MailUtilTest.java
('svn:eol-style' removed)
Modified:
incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/xmlrpc/RPCHandlerTest.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/xmlrpc/RPCHandlerTest.java?rev=722761&r1=722760&r2=722761&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/xmlrpc/RPCHandlerTest.java
(original)
+++ incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/xmlrpc/RPCHandlerTest.java
Tue Dec 2 20:32:22 2008
@@ -30,7 +30,7 @@
m_engine = new TestEngine( m_props );
m_handler = new RPCHandler();
- WikiContext ctx = new WikiContext( m_engine, new WikiPage(m_engine,
"Dummy") );
+ WikiContext ctx = m_engine.getWikiContextFactory().newViewContext(
null, null, new WikiPage(m_engine, "Dummy") );
m_handler.initialize( ctx );
}
Propchange:
incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/xmlrpc/RPCHandlerTest.java
('svn:eol-style' removed)
Modified: incubator/jspwiki/trunk/tests/etc/jspwiki.properties.tmpl
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/etc/jspwiki.properties.tmpl?rev=722761&r1=722760&r2=722761&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/etc/jspwiki.properties.tmpl (original)
+++ incubator/jspwiki/trunk/tests/etc/jspwiki.properties.tmpl Tue Dec 2
20:32:22 2008
@@ -155,3 +155,6 @@
jspwiki.approver.workflow.saveWikiPage=
jspwiki.approver.workflow.foo=janne
jspwiki.approver.workflow.bar=Admin
+
+# URL Constructor
+jspwiki.urlConstructor = StripesURLConstructor
Modified: incubator/jspwiki/trunk/tests/etc/jspwiki_rcs.properties.tmpl
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/etc/jspwiki_rcs.properties.tmpl?rev=722761&r1=722760&r2=722761&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/etc/jspwiki_rcs.properties.tmpl (original)
+++ incubator/jspwiki/trunk/tests/etc/jspwiki_rcs.properties.tmpl Tue Dec 2
20:32:22 2008
@@ -113,3 +113,6 @@
log4j.appender.SecurityAppender.layout = org.apache.log4j.PatternLayout
log4j.appender.SecurityAppender.layout.ConversionPattern=%d %p - %m%n
log4j.logger.SecurityLog=INFO, SecurityAppender
+
+# URL Constructor
+jspwiki.urlConstructor = StripesURLConstructor
Modified: incubator/jspwiki/trunk/tests/etc/jspwiki_vers.properties.tmpl
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/etc/jspwiki_vers.properties.tmpl?rev=722761&r1=722760&r2=722761&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/etc/jspwiki_vers.properties.tmpl (original)
+++ incubator/jspwiki/trunk/tests/etc/jspwiki_vers.properties.tmpl Tue Dec 2
20:32:22 2008
@@ -115,3 +115,6 @@
log4j.appender.SecurityAppender.layout = org.apache.log4j.PatternLayout
log4j.appender.SecurityAppender.layout.ConversionPattern=%d %p - %m%n
log4j.logger.SecurityLog=INFO, SecurityAppender
+
+# URL Constructor
+jspwiki.urlConstructor = StripesURLConstructor
