You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jspwiki.apache.org by ju...@apache.org on 2020/01/28 20:34:20 UTC
[jspwiki] 19/32: JSPWIKI-1127: propagate changes on JSPs
This is an automated email from the ASF dual-hosted git repository.
juanpablo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jspwiki.git
commit f5701c0df029f0afbdfdbc9b99f404fe1a5eff04
Author: juanpablo <ju...@apache.org>
AuthorDate: Wed Jan 22 23:23:09 2020 +0100
JSPWIKI-1127: propagate changes on JSPs
---
jspwiki-war/src/main/webapp/Comment.jsp | 6 +++---
jspwiki-war/src/main/webapp/Delete.jsp | 10 +++-------
jspwiki-war/src/main/webapp/Edit.jsp | 8 ++++----
jspwiki-war/src/main/webapp/Login.jsp | 6 +++---
jspwiki-war/src/main/webapp/LostPassword.jsp | 2 +-
jspwiki-war/src/main/webapp/SisterSites.jsp | 2 +-
jspwiki-war/src/main/webapp/UserPreferences.jsp | 12 +++++-------
7 files changed, 20 insertions(+), 26 deletions(-)
diff --git a/jspwiki-war/src/main/webapp/Comment.jsp b/jspwiki-war/src/main/webapp/Comment.jsp
index 0ca43c5..071eea6 100644
--- a/jspwiki-war/src/main/webapp/Comment.jsp
+++ b/jspwiki-war/src/main/webapp/Comment.jsp
@@ -238,12 +238,12 @@
response.sendRedirect( e.getRedirect() );
return;
}
- response.sendRedirect(wiki.getViewURL(pagereq));
+ response.sendRedirect(wikiContext.getViewURL(pagereq));
return;
} else if( preview != null ) {
log.debug("Previewing "+pagereq);
session.setAttribute(EditorManager.REQ_EDITEDTEXT, EditorManager.getEditedText(pageContext));
- response.sendRedirect( TextUtil.replaceString( wiki.getURL(WikiContext.PREVIEW, pagereq, "action=comment", false),"&","&") );
+ response.sendRedirect( TextUtil.replaceString( wiki.getURL(WikiContext.PREVIEW, pagereq, "action=comment"),"&","&") );
return;
} else if( cancel != null ) {
log.debug("Cancelled editing "+pagereq);
@@ -253,7 +253,7 @@
wiki.getPageManager().unlockPage( lock );
session.removeAttribute( "lock-"+pagereq );
}
- response.sendRedirect( wiki.getViewURL(pagereq) );
+ response.sendRedirect( wikiContext.getViewURL(pagereq) );
return;
}
diff --git a/jspwiki-war/src/main/webapp/Delete.jsp b/jspwiki-war/src/main/webapp/Delete.jsp
index 7dbe7d8..f2bfbda 100644
--- a/jspwiki-war/src/main/webapp/Delete.jsp
+++ b/jspwiki-war/src/main/webapp/Delete.jsp
@@ -74,7 +74,7 @@
session.setAttribute( BreadcrumbsTag.BREADCRUMBTRAIL_KEY, trail );
}
- response.sendRedirect( TextUtil.replaceString( wiki.getURL( WikiContext.VIEW, redirTo, "tab="+request.getParameter("tab"), false ),"&","&" ));
+ response.sendRedirect( TextUtil.replaceString( wiki.getURL( WikiContext.VIEW, redirTo, "tab="+request.getParameter("tab") ),"&","&" ));
return;
}
else if( delete != null )
@@ -98,9 +98,7 @@
response.sendRedirect(
TextUtil.replaceString(
- wiki.getURL(
- WikiContext.VIEW, redirTo, "tab="+request.getParameter("tab"), false
- ),"&","&"
+ wiki.getURL( WikiContext.VIEW, redirTo, "tab=" + request.getParameter( "tab" ) ),"&","&"
)
);
@@ -111,8 +109,6 @@
// Set the content type and include the response content
// FIXME: not so.
response.setContentType("text/html; charset="+wiki.getContentEncoding() );
- String contentPage = wiki.getTemplateManager().findJSP( pageContext,
- wikiContext.getTemplate(),
- "EditTemplate.jsp" );
+ String contentPage = wiki.getTemplateManager().findJSP( pageContext, wikiContext.getTemplate(), "EditTemplate.jsp" );
%><wiki:Include page="<%=contentPage%>" />
diff --git a/jspwiki-war/src/main/webapp/Edit.jsp b/jspwiki-war/src/main/webapp/Edit.jsp
index 3972ff3..fbcd6ea 100644
--- a/jspwiki-war/src/main/webapp/Edit.jsp
+++ b/jspwiki-war/src/main/webapp/Edit.jsp
@@ -133,7 +133,7 @@
log.info("Page changed, warning user.");
session.setAttribute( EditorManager.REQ_EDITEDTEXT, EditorManager.getEditedText(pageContext) );
- response.sendRedirect( wiki.getURL(WikiContext.CONFLICT, pagereq, null, false) );
+ response.sendRedirect( wiki.getURL(WikiContext.CONFLICT, pagereq, null ) );
return;
}
@@ -206,7 +206,7 @@
return;
}
- response.sendRedirect(wiki.getViewURL(pagereq));
+ response.sendRedirect(wikiContext.getViewURL(pagereq));
return;
} else if( preview != null ) {
log.debug("Previewing "+pagereq);
@@ -219,7 +219,7 @@
}
session.setAttribute("changenote", changenote != null ? changenote : "" );
- response.sendRedirect( wiki.getURL(WikiContext.PREVIEW,pagereq,null,false) );
+ response.sendRedirect( wiki.getURL( WikiContext.PREVIEW, pagereq, null ) );
return;
} else if( cancel != null ) {
log.debug("Cancelled editing "+pagereq);
@@ -228,7 +228,7 @@
wiki.getPageManager().unlockPage( lock );
session.removeAttribute( "lock-"+pagereq );
}
- response.sendRedirect( wiki.getViewURL(pagereq) );
+ response.sendRedirect( wikiContext.getViewURL(pagereq) );
return;
}
diff --git a/jspwiki-war/src/main/webapp/Login.jsp b/jspwiki-war/src/main/webapp/Login.jsp
index 7cbd41e..38313fb 100644
--- a/jspwiki-war/src/main/webapp/Login.jsp
+++ b/jspwiki-war/src/main/webapp/Login.jsp
@@ -69,7 +69,7 @@
Preferences.getLocale( wikiContext ),
due.getMessage(), due.getArgs() ) );
} catch( DecisionRequiredException e ) {
- String redirect = wiki.getURL(WikiContext.VIEW,"ApprovalRequiredForUserProfiles",null,true);
+ String redirect = wiki.getURL( WikiContext.VIEW, "ApprovalRequiredForUserProfiles", null );
response.sendRedirect( redirect );
return;
} catch( WikiSecurityException e ) {
@@ -79,7 +79,7 @@
}
if ( wikiSession.getMessages( "profile" ).length == 0 ) {
String redirectPage = request.getParameter( "redirect" );
- response.sendRedirect( wiki.getViewURL(redirectPage) );
+ response.sendRedirect( wikiContext.getViewURL(redirectPage) );
return;
}
}
@@ -153,7 +153,7 @@
if( !wiki.getPageManager().wikiPageExists( redirectPage ) ) {
redirectPage = wiki.getFrontPage();
}
- String viewUrl = ( "Login".equals( redirectPage ) ) ? "Wiki.jsp" : wiki.getViewURL( redirectPage );
+ String viewUrl = ( "Login".equals( redirectPage ) ) ? "Wiki.jsp" : wikiContext.getViewURL( redirectPage );
// Redirect!
log.info( "Redirecting user to " + viewUrl );
diff --git a/jspwiki-war/src/main/webapp/LostPassword.jsp b/jspwiki-war/src/main/webapp/LostPassword.jsp
index 5c15297..b5ce908 100644
--- a/jspwiki-war/src/main/webapp/LostPassword.jsp
+++ b/jspwiki-war/src/main/webapp/LostPassword.jsp
@@ -61,7 +61,7 @@
// Try sending email first, as that is more likely to fail.
Object[] args = { profile.getLoginName(), randomPassword, request.getScheme() + "://"+ request.getServerName() + ":" + request.getServerPort() +
- wiki.getURLConstructor().makeURL( WikiContext.NONE, "Login.jsp", true, "" ), wiki.getApplicationName() };
+ wiki.getURLConstructor().makeURL( WikiContext.NONE, "Login.jsp", "" ), wiki.getApplicationName() };
String mailMessage = MessageFormat.format( rb.getString( "lostpwd.newpassword.email" ), args );
diff --git a/jspwiki-war/src/main/webapp/SisterSites.jsp b/jspwiki-war/src/main/webapp/SisterSites.jsp
index 067d9ef..d7fc719 100644
--- a/jspwiki-war/src/main/webapp/SisterSites.jsp
+++ b/jspwiki-war/src/main/webapp/SisterSites.jsp
@@ -49,7 +49,7 @@
// TODO: This is a kludge and not forward-compatible.
if( pageName.indexOf("/") != -1 ) continue;
- String url = wiki.getViewURL( pageName );
+ String url = wikiContext.getViewURL( pageName );
out.write( url + " " + pageName + "\n" );
}
diff --git a/jspwiki-war/src/main/webapp/UserPreferences.jsp b/jspwiki-war/src/main/webapp/UserPreferences.jsp
index 101acb9..1cc5b89 100644
--- a/jspwiki-war/src/main/webapp/UserPreferences.jsp
+++ b/jspwiki-war/src/main/webapp/UserPreferences.jsp
@@ -49,7 +49,7 @@
UserManager userMgr = wiki.getUserManager();
WikiSession wikiSession = wikiContext.getWikiSession();
-/* FIXME: Obsoslete
+/* FIXME: Obsolete
if( request.getParameter(EditorManager.PARA_EDITOR) != null )
{
String editor = request.getParameter(EditorManager.PARA_EDITOR);
@@ -83,7 +83,7 @@
}
catch( DecisionRequiredException e )
{
- String redirect = wiki.getURL(WikiContext.VIEW,"ApprovalRequiredForUserProfiles",null,true);
+ String redirect = wiki.getURL( WikiContext.VIEW, "ApprovalRequiredForUserProfiles", null );
response.sendRedirect( redirect );
return;
}
@@ -102,7 +102,7 @@
redirectPage = wiki.getFrontPage();
}
- String viewUrl = ( "UserPreferences".equals( redirectPage ) ) ? "Wiki.jsp" : wiki.getViewURL( redirectPage );
+ String viewUrl = ( "UserPreferences".equals( redirectPage ) ) ? "Wiki.jsp" : wikiContext.getViewURL( redirectPage );
log.info( "Redirecting user to " + viewUrl );
response.sendRedirect( viewUrl );
return;
@@ -120,7 +120,7 @@
{
redirectPage = wiki.getFrontPage();
}
- String viewUrl = ( "UserPreferences".equals( redirectPage ) ) ? "Wiki.jsp" : wiki.getViewURL( redirectPage );
+ String viewUrl = ( "UserPreferences".equals( redirectPage ) ) ? "Wiki.jsp" : wikiContext.getViewURL( redirectPage );
log.info( "Redirecting user to " + viewUrl );
response.sendRedirect( viewUrl );
@@ -133,8 +133,6 @@
return;
}
response.setContentType("text/html; charset="+wiki.getContentEncoding() );
- String contentPage = wiki.getTemplateManager().findJSP( pageContext,
- wikiContext.getTemplate(),
- "ViewTemplate.jsp" );
+ String contentPage = wiki.getTemplateManager().findJSP( pageContext, wikiContext.getTemplate(), "ViewTemplate.jsp" );
%><wiki:Include page="<%=contentPage%>" />