You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jspwiki.apache.org by me...@apache.org on 2009/05/16 15:11:09 UTC
svn commit: r775459 - in /incubator/jspwiki/trunk: ./ etc/
src/java/org/apache/wiki/ src/java/org/apache/wiki/action/
src/java/org/apache/wiki/tags/
Author: metskem
Date: Sat May 16 13:11:08 2009
New Revision: 775459
URL: http://svn.apache.org/viewvc?rev=775459&view=rev
Log:
3.0.0-svn-117
* moved BreadcrumbsTrail code from AbstractPageActionBean
to BreadcrumbsTag. This is an intermediate improvement,
the definite solution is described in JSPWIKI-533
Modified:
incubator/jspwiki/trunk/ChangeLog
incubator/jspwiki/trunk/etc/jspwiki.properties.tmpl
incubator/jspwiki/trunk/src/java/org/apache/wiki/JCRWikiPage.java
incubator/jspwiki/trunk/src/java/org/apache/wiki/Release.java
incubator/jspwiki/trunk/src/java/org/apache/wiki/action/AbstractPageActionBean.java
incubator/jspwiki/trunk/src/java/org/apache/wiki/action/DeleteActionBean.java
incubator/jspwiki/trunk/src/java/org/apache/wiki/action/RenameActionBean.java
incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/BreadcrumbsTag.java
Modified: incubator/jspwiki/trunk/ChangeLog
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/ChangeLog?rev=775459&r1=775458&r2=775459&view=diff
==============================================================================
--- incubator/jspwiki/trunk/ChangeLog (original)
+++ incubator/jspwiki/trunk/ChangeLog Sat May 16 13:11:08 2009
@@ -1,3 +1,11 @@
+2009-05-15 Harry Metske <me...@apache.org>
+
+ * 3.0.0-svn-117
+
+ * moved BreadcrumbsTrail code from AbstractPageActionBean
+ to BreadcrumbsTag. This is an intermediate improvement,
+ the definite solution is described in JSPWIKI-533
+
2009-05-15 Janne Jalkanen <ja...@apache.org>
* 3.0.0-svn-116
Modified: incubator/jspwiki/trunk/etc/jspwiki.properties.tmpl
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/etc/jspwiki.properties.tmpl?rev=775459&r1=775458&r2=775459&view=diff
==============================================================================
--- incubator/jspwiki/trunk/etc/jspwiki.properties.tmpl (original)
+++ incubator/jspwiki/trunk/etc/jspwiki.properties.tmpl Sat May 16 13:11:08 2009
@@ -28,7 +28,7 @@
jspwiki.baseURL=
#
-# What Java Content Rrepository should JSPWiki use to store content?
+# What Java Content Repository should JSPWiki use to store content?
# This value will be consulted only if JSPWiki cannot locate
# a container-managed JCR under the JNDI name jcr/repository.
# Valid values are 'priha' and 'jackrabbit'.
Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/JCRWikiPage.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/JCRWikiPage.java?rev=775459&r1=775458&r2=775459&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/JCRWikiPage.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/JCRWikiPage.java Sat May 16 13:11:08 2009
@@ -438,7 +438,7 @@
/**
* {@inheritDoc}
- * @see org.apache.wiki.WikiPage#compareTo(java.lang.Object)
+ * @see org.apache.wiki.api.WikiPage#compareTo(java.lang.Object)
*/
public int compareTo( WikiPage o )
{
Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/Release.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/Release.java?rev=775459&r1=775458&r2=775459&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/Release.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/Release.java Sat May 16 13:11:08 2009
@@ -77,7 +77,7 @@
* <p>
* If the build identifier is empty, it is not added.
*/
- public static final String BUILD = "116";
+ public static final String BUILD = "117";
/**
* This is the generic version string you should use
Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/action/AbstractPageActionBean.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/action/AbstractPageActionBean.java?rev=775459&r1=775458&r2=775459&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/action/AbstractPageActionBean.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/action/AbstractPageActionBean.java Sat May 16 13:11:08 2009
@@ -68,25 +68,4 @@
{
getContext().setPage( page );
}
-
- /**
- * Removes the deleted page from the breadCrumb trail
- *
- * @param pageName the pageName to be removed from the breadcrumb
- */
- // FIXME: Is this in the right place? Shouldn't this be a static method in BreadcrumbsTag?
- void deleteFromBreadCrumb( String pageName )
- {
- HttpSession session = getContext().getRequest().getSession( false );
- if( session != null )
- {
- FixedQueue trail = (FixedQueue) session.getAttribute( BreadcrumbsTag.BREADCRUMBTRAIL_KEY );
- if( trail != null )
- {
- trail.removeItem( pageName );
- session.setAttribute( BreadcrumbsTag.BREADCRUMBTRAIL_KEY, trail );
- }
- }
- }
-
}
Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/action/DeleteActionBean.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/action/DeleteActionBean.java?rev=775459&r1=775458&r2=775459&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/action/DeleteActionBean.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/action/DeleteActionBean.java Sat May 16 13:11:08 2009
@@ -36,6 +36,7 @@
import org.apache.wiki.log.Logger;
import org.apache.wiki.log.LoggerFactory;
import org.apache.wiki.providers.ProviderException;
+import org.apache.wiki.tags.BreadcrumbsTag;
import org.apache.wiki.ui.stripes.HandlerPermission;
import org.apache.wiki.ui.stripes.WikiRequestContext;
@@ -76,7 +77,7 @@
+ request.getRemoteAddr() );
engine.deletePage( pageName );
- deleteFromBreadCrumb( pageName );
+ BreadcrumbsTag.deleteFromBreadCrumb( request, pageName );
}
// Just delete a single version
else
Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/action/RenameActionBean.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/action/RenameActionBean.java?rev=775459&r1=775458&r2=775459&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/action/RenameActionBean.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/action/RenameActionBean.java Sat May 16 13:11:08 2009
@@ -38,6 +38,7 @@
import org.apache.wiki.content.PageRenamer;
import org.apache.wiki.log.Logger;
import org.apache.wiki.log.LoggerFactory;
+import org.apache.wiki.tags.BreadcrumbsTag;
import org.apache.wiki.ui.stripes.HandlerPermission;
import org.apache.wiki.ui.stripes.WikiRequestContext;
@@ -124,7 +125,7 @@
PageRenamer renamer = engine.getPageRenamer();
String renamedTo = renamer.renamePage( getContext(), renameFrom, m_renameTo, m_changeReferences );
- deleteFromBreadCrumb( renameFrom );
+ BreadcrumbsTag.deleteFromBreadCrumb( request, renameFrom );
log.info( "Page successfully renamed to '" + renamedTo + "'" );
return new RedirectResolution( ViewActionBean.class ).addParameter( "page", renamedTo );
Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/BreadcrumbsTag.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/BreadcrumbsTag.java?rev=775459&r1=775458&r2=775459&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/BreadcrumbsTag.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/BreadcrumbsTag.java Sat May 16 13:11:08 2009
@@ -21,6 +21,7 @@
package org.apache.wiki.tags;
+import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;
import javax.servlet.jsp.JspWriter;
@@ -229,5 +230,23 @@
}
}
+ /**
+ * Removes the deleted page from the breadCrumb trail
+ *
+ * @param pageName the pageName to be removed from the breadcrumb
+ */
+ public static void deleteFromBreadCrumb( HttpServletRequest request, String pageName )
+ {
+ HttpSession session = request.getSession( false );
+ if( session != null )
+ {
+ FixedQueue trail = (FixedQueue) session.getAttribute( BreadcrumbsTag.BREADCRUMBTRAIL_KEY );
+ if( trail != null )
+ {
+ trail.removeItem( pageName );
+ session.setAttribute( BreadcrumbsTag.BREADCRUMBTRAIL_KEY, trail );
+ }
+ }
+ }
}