Author: metskem
Date: Sun Aug 7 17:21:58 2011
New Revision: 1154732
URL: http://svn.apache.org/viewvc?rev=1154732&view=rev
Log:
2011-08-07 Harry Metske <[email protected]>
* 3.0.0-svn-231
* fixed JSPWIKI-699 (JBoss complaining about jspwiki.tld and
oscache.tld).
* a few minor Stripes bugs
Modified:
incubator/jspwiki/trunk/ChangeLog
incubator/jspwiki/trunk/src/WebContent/WEB-INF/jspwiki.tld
incubator/jspwiki/trunk/src/WebContent/templates/default/Message.jsp
incubator/jspwiki/trunk/src/java/org/apache/wiki/Release.java
incubator/jspwiki/trunk/src/java/org/apache/wiki/action/AdminActionBean.java
incubator/jspwiki/trunk/src/java/org/apache/wiki/action/MessageActionBean.java
Modified: incubator/jspwiki/trunk/ChangeLog
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/ChangeLog?rev=1154732&r1=1154731&r2=1154732&view=diff
==============================================================================
--- incubator/jspwiki/trunk/ChangeLog (original)
+++ incubator/jspwiki/trunk/ChangeLog Sun Aug 7 17:21:58 2011
@@ -1,3 +1,10 @@
+2011-08-07 Harry Metske <[email protected]>
+
+ * 3.0.0-svn-231
+
+ * fixed JSPWIKI-699 (JBoss complaining about jspwiki.tld and
oscache.tld).
+ * a few minor Stripes bugs
+
2011-07-13 Janne Jalkanen ([email protected])
* 3.0.0-incubating-230
Modified: incubator/jspwiki/trunk/src/WebContent/WEB-INF/jspwiki.tld
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/WEB-INF/jspwiki.tld?rev=1154732&r1=1154731&r2=1154732&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/WEB-INF/jspwiki.tld (original)
+++ incubator/jspwiki/trunk/src/WebContent/WEB-INF/jspwiki.tld Sun Aug 7
17:21:58 2011
@@ -639,16 +639,6 @@
</tag>
<tag>
- <name>RSSUserlandLink</name>
- <tagclass>org.apache.wiki.tags.RSSCoffeeCupLinkTag</tagclass>
- <bodycontent>empty</bodycontent>
- <attribute>
- <name>title</name>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
- </tag>
-
- <tag>
<name>SearchResultIterator</name>
<tagclass>org.apache.wiki.tags.SearchResultIteratorTag</tagclass>
<teiclass>org.apache.wiki.tags.SearchResultIteratorInfo</teiclass>
Modified: incubator/jspwiki/trunk/src/WebContent/templates/default/Message.jsp
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/templates/default/Message.jsp?rev=1154732&r1=1154731&r2=1154732&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/templates/default/Message.jsp
(original)
+++ incubator/jspwiki/trunk/src/WebContent/templates/default/Message.jsp Sun
Aug 7 17:21:58 2011
@@ -21,8 +21,11 @@
<%@ taglib uri="http://jakarta.apache.org/jspwiki.tld"; prefix="wiki" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core"; prefix="c" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt"; prefix="fmt" %>
+<%@ taglib uri="http://stripes.sourceforge.net/stripes.tld"; prefix="s" %>
<%@ page errorPage="/Error.jsp" %>
<div class="error">
<c:out value="${message}" />
+ <s:messages/>
+ <s:errors/>
</div>
<br clear="all" />
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=1154732&r1=1154731&r2=1154732&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/Release.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/Release.java Sun Aug 7
17:21:58 2011
@@ -77,7 +77,7 @@ public final class Release
* <p>
* If the build identifier is empty, it is not added.
*/
- public static final String BUILD = "230";
+ public static final String BUILD = "231";
/**
* This is the generic version string you should use
Modified:
incubator/jspwiki/trunk/src/java/org/apache/wiki/action/AdminActionBean.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/action/AdminActionBean.java?rev=1154732&r1=1154731&r2=1154732&view=diff
==============================================================================
---
incubator/jspwiki/trunk/src/java/org/apache/wiki/action/AdminActionBean.java
(original)
+++
incubator/jspwiki/trunk/src/java/org/apache/wiki/action/AdminActionBean.java
Sun Aug 7 17:21:58 2011
@@ -38,7 +38,7 @@ public class AdminActionBean extends Abs
public Resolution security()
{
WikiEngine engine = getContext().getEngine();
- if( TextUtil.isPositive( engine.getWikiProperties().getProperty(
"jspwiki-x.securityconfig.enable" ) ) )
+ if( !TextUtil.isPositive( engine.getWikiProperties().getProperty(
"jspwiki-x.securityconfig.enable" ) ) )
{
return new StreamingResolution( "text/html" ) {
public void stream( HttpServletResponse response ) throws
Exception
@@ -49,7 +49,7 @@ public class AdminActionBean extends Abs
};
}
m_securityVerifier = new SecurityVerifier( engine,
getContext().getWikiSession() );
- return new TemplateResolution( "admin/Security.jsp" ).addParameter(
"tab", "security" );
+ return new TemplateResolution( "admin/tabs/Security.jsp"
).addParameter( "tab", "security" );
}
/**
Modified:
incubator/jspwiki/trunk/src/java/org/apache/wiki/action/MessageActionBean.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/action/MessageActionBean.java?rev=1154732&r1=1154731&r2=1154732&view=diff
==============================================================================
---
incubator/jspwiki/trunk/src/java/org/apache/wiki/action/MessageActionBean.java
(original)
+++
incubator/jspwiki/trunk/src/java/org/apache/wiki/action/MessageActionBean.java
Sun Aug 7 17:21:58 2011
@@ -36,7 +36,7 @@ import org.apache.wiki.util.FileUtil;
@UrlBinding( "/Message.jsp" )
public class MessageActionBean extends AbstractActionBean
{
- private static final Logger LOG = LoggerFactory.getLogger( "JSPWiki" );
+ private static final Logger LOG = LoggerFactory.getLogger(
MessageActionBean.class );
private String m_message = null;
