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/12/03 14:13:13 UTC
svn commit: r722877 - in /incubator/jspwiki/trunk: ./ src/com/ecyrd/jspwiki/
src/webdocs/ src/webdocs/templates/default/
Author: ajaquith
Date: Wed Dec 3 05:13:12 2008
New Revision: 722877
URL: http://svn.apache.org/viewvc?rev=722877&view=rev
Log:
Fixed JSPs so that they compile. They still don't work, though.
Modified:
incubator/jspwiki/trunk/ChangeLog
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/Release.java
incubator/jspwiki/trunk/src/webdocs/Error.jsp
incubator/jspwiki/trunk/src/webdocs/LoginForm.jsp
incubator/jspwiki/trunk/src/webdocs/Message.jsp
incubator/jspwiki/trunk/src/webdocs/Wiki.jsp
incubator/jspwiki/trunk/src/webdocs/templates/default/AJAXPreview.jsp
incubator/jspwiki/trunk/src/webdocs/templates/default/LoginContent.jsp
incubator/jspwiki/trunk/src/webdocs/templates/default/UserBox.jsp
Modified: incubator/jspwiki/trunk/ChangeLog
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/ChangeLog?rev=722877&r1=722876&r2=722877&view=diff
==============================================================================
--- incubator/jspwiki/trunk/ChangeLog (original)
+++ incubator/jspwiki/trunk/ChangeLog Wed Dec 3 05:13:12 2008
@@ -1,4 +1,10 @@
-2008-10-14 Andrew Jaquith <ajaquith AT apache DOT org>
+2008-12-02 Andrew Jaquith <ajaquith AT apache DOT org>
+
+ * 3.0.0-svn-19
+
+ * Fixed JSPs so that they compile. They still don't work, though.
+
+2008-12-02 Andrew Jaquith <ajaquith AT apache DOT org>
* 3.0.0-svn-18
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=722877&r1=722876&r2=722877&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/Release.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/Release.java Wed Dec 3 05:13:12 2008
@@ -77,7 +77,7 @@
* <p>
* If the build identifier is empty, it is not added.
*/
- public static final String BUILD = "18";
+ public static final String BUILD = "19";
/**
* This is the generic version string you should use
Modified: incubator/jspwiki/trunk/src/webdocs/Error.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/Error.jsp?rev=722877&r1=722876&r2=722877&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/Error.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/Error.jsp Wed Dec 3 05:13:12 2008
@@ -11,7 +11,7 @@
<stripes:useActionBean beanclass="com.ecyrd.jspwiki.action.ErrorActionBean" />
<%
WikiEngine wiki = WikiEngine.getInstance( getServletConfig() );
- WikiActionBean wikiContext = WikiActionBeanFactory.findActionBean( request );
+ WikiContext wikiContext = WikiContextFactory.findContext( pageContext );
response.setContentType("text/html; charset="+wiki.getContentEncoding() );
Modified: incubator/jspwiki/trunk/src/webdocs/LoginForm.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/LoginForm.jsp?rev=722877&r1=722876&r2=722877&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/LoginForm.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/LoginForm.jsp Wed Dec 3 05:13:12 2008
@@ -22,7 +22,7 @@
WikiEngine wiki = WikiEngine.getInstance( getServletConfig() );
// Retrieve the Login page context, then go and find the login form
- WikiActionBean wikiContext = WikiActionBeanFactory.findActionBean( request );
+ WikiContext wikiContext = WikiContextFactory.findContext( pageContext );
wikiContext.setVariable( "contentTemplate", "LoginContent.jsp" );
response.setContentType("text/html; charset="+wiki.getContentEncoding() );
String contentPage = wiki.getTemplateManager().findJSP( pageContext,
Modified: incubator/jspwiki/trunk/src/webdocs/Message.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/Message.jsp?rev=722877&r1=722876&r2=722877&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/Message.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/Message.jsp Wed Dec 3 05:13:12 2008
@@ -12,9 +12,10 @@
<stripes:useActionBean beanclass="com.ecyrd.jspwiki.action.MessageActionBean" />
<%
WikiEngine wiki = WikiEngine.getInstance( getServletConfig() );
- MessageActionBean wikiContext = (MessageActionBean)WikiActionBeanFactory.findActionBean( request );
+ WikiContext wikiContext = WikiContextFactory.findContext( pageContext );
+ MessageActionBean bean = (MessageActionBean)WikiInterceptor.findActionBean( request );
- request.setAttribute( "message", wikiContext.getMessage() );
+ request.setAttribute( "message", bean.getMessage() );
// Set the content type and include the response content
response.setContentType("text/html; charset="+wiki.getContentEncoding() );
Modified: incubator/jspwiki/trunk/src/webdocs/Wiki.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/Wiki.jsp?rev=722877&r1=722876&r2=722877&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/Wiki.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/Wiki.jsp Wed Dec 3 05:13:12 2008
@@ -1,6 +1,7 @@
<%@ page import="com.ecyrd.jspwiki.log.Logger" %>
<%@ page import="com.ecyrd.jspwiki.log.LoggerFactory" %>
<%@ page import="com.ecyrd.jspwiki.*" %>
+<%@ page import="com.ecyrd.jspwiki.action.*" %>
<%@ page import="com.ecyrd.jspwiki.util.*" %>
<%@ page import="org.apache.commons.lang.time.StopWatch" %>
<%@ page errorPage="/Error.jsp" %>
@@ -14,11 +15,11 @@
<%
WikiEngine wiki = WikiEngine.getInstance( getServletConfig() );
// Create wiki context and check for authorization
- WikiContext wikiContext = wiki.createContext( request, WikiContext.VIEW );
+ WikiContext wikiContext = WikiContextFactory.findContext( pageContext );
String pagereq = wikiContext.getPage().getName();
// Redirect if the request was for a special page
- String redirect = wiki.getWikiActionBeanFactory().getSpecialPageReference( pagereq );
+ String redirect = wiki.getWikiContextFactory().getSpecialPageReference( pagereq );
if( redirect != null )
{
response.sendRedirect( wikiContext.getViewURL( redirect ) );
Modified: incubator/jspwiki/trunk/src/webdocs/templates/default/AJAXPreview.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/AJAXPreview.jsp?rev=722877&r1=722876&r2=722877&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/AJAXPreview.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/AJAXPreview.jsp Wed Dec 3 05:13:12 2008
@@ -18,7 +18,6 @@
<%
// Copied from a top-level jsp -- which would be a better place to put this
WikiContext wikiContext = wiki.createContext( request, WikiContext.VIEW );
- if( !wikiContext.hasAccess( response ) ) return;
response.setContentType("text/html; charset="+wiki.getContentEncoding() );
Modified: incubator/jspwiki/trunk/src/webdocs/templates/default/LoginContent.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/LoginContent.jsp?rev=722877&r1=722876&r2=722877&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/LoginContent.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/LoginContent.jsp Wed Dec 3 05:13:12 2008
@@ -9,7 +9,7 @@
<%@ page import="javax.servlet.jsp.jstl.fmt.*" %>
<%
String postURL = "";
- WikiActionBean ctx = WikiContextFactory.findContext( pageContext );
+ WikiContext ctx = WikiContextFactory.findContext( pageContext );
AuthenticationManager mgr = ctx.getEngine().getAuthenticationManager();
if( mgr.isContainerAuthenticated() )
Modified: incubator/jspwiki/trunk/src/webdocs/templates/default/UserBox.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/webdocs/templates/default/UserBox.jsp?rev=722877&r1=722876&r2=722877&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/webdocs/templates/default/UserBox.jsp (original)
+++ incubator/jspwiki/trunk/src/webdocs/templates/default/UserBox.jsp Wed Dec 3 05:13:12 2008
@@ -33,7 +33,7 @@
<wiki:CheckRequestContext context='!login'>
<wiki:Permission permission="login">
<a href="<wiki:Link jsp='Login.jsp' format='url'><wiki:Param
- name='redirect' value='<%=c.getEngine().encodeName(c.getName())%>'/></wiki:Link>"
+ name='redirect' value='<%=c.getEngine().encodeName(c.getPage().getName())%>'/></wiki:Link>"
class="action login"
title="<fmt:message key='actions.login.title'/>"><fmt:message key="actions.login"/></a>
</wiki:Permission>
@@ -50,7 +50,7 @@
<wiki:CheckRequestContext context='!prefs'>
<wiki:CheckRequestContext context='!preview'>
<a href="<wiki:Link jsp='UserPreferences.jsp' format='url' ><wiki:Param name='redirect'
- value='<%=c.getEngine().encodeName(c.getName())%>'/></wiki:Link>"
+ value='<%=c.getEngine().encodeName(c.getPage().getName())%>'/></wiki:Link>"
class="action prefs" accesskey="p"
title="<fmt:message key='actions.prefs.title'/>"><fmt:message key="actions.prefs" />
</a>