jspwiki-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mets...@apache.org
Subject svn commit: r1101114 - in /incubator/jspwiki/trunk: ./ src/WebContent/templates/default/ src/java/org/apache/wiki/ src/java/org/apache/wiki/action/ src/java/org/apache/wiki/content/ src/java/org/apache/wiki/tags/
Date Mon, 09 May 2011 17:05:18 GMT
Author: metskem
Date: Mon May  9 17:05:17 2011
New Revision: 1101114

URL: http://svn.apache.org/viewvc?rev=1101114&view=rev
Log:
3.0.0-svn-229
        
        * WikiTagBase sometimes tried to getMessage() on a null exception, added an extra
check on that.
        
        * JavaDoc fixes
        
        * Error.jsp was is own error page causing endless loops, removed the errorPage tag.
        
        * Error.jsp was using  ${error.realCause.class.name} causing :
           javax.el.ELException: The identifier [class] is not a valid Java identifier as
required by 
           section 1.19 of the EL specification (Identifier ::= Java language identifier).

           This check can be disabled by setting the system property org.apache.el.parser.SKIP_IDENTIFIER_CHECK
to true.
           
           An extra getter was added on the MessageActionBean to circumvent this.
           We should now at least get clearer error messages.
        

Modified:
    incubator/jspwiki/trunk/ChangeLog
    incubator/jspwiki/trunk/src/WebContent/templates/default/Error.jsp
    incubator/jspwiki/trunk/src/java/org/apache/wiki/Release.java
    incubator/jspwiki/trunk/src/java/org/apache/wiki/action/MessageActionBean.java
    incubator/jspwiki/trunk/src/java/org/apache/wiki/content/PageRenamer.java
    incubator/jspwiki/trunk/src/java/org/apache/wiki/content/ReferenceManager.java
    incubator/jspwiki/trunk/src/java/org/apache/wiki/content/WikiPathResolver.java
    incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/WikiTagBase.java

Modified: incubator/jspwiki/trunk/ChangeLog
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/ChangeLog?rev=1101114&r1=1101113&r2=1101114&view=diff
==============================================================================
--- incubator/jspwiki/trunk/ChangeLog (original)
+++ incubator/jspwiki/trunk/ChangeLog Mon May  9 17:05:17 2011
@@ -1,3 +1,21 @@
+2011-05-09  Harry Metske <metskem@apache.org>
+
+        * 3.0.0-svn-229
+        
+        * WikiTagBase sometimes tried to getMessage() on a null exception, added an extra
check on that.
+        
+        * JavaDoc fixes
+        
+        * Error.jsp was is own error page causing endless loops, removed the errorPage tag.
+        
+        * Error.jsp was using  ${error.realCause.class.name} causing :
+           javax.el.ELException: The identifier [class] is not a valid Java identifier as
required by 
+           section 1.19 of the EL specification (Identifier ::= Java language identifier).

+           This check can be disabled by setting the system property org.apache.el.parser.SKIP_IDENTIFIER_CHECK
to true.
+           
+           An extra getter was added on the MessageActionBean to circumvent this.
+           We should now at least get clearer error messages.
+        
 2011-05-08  Harry Metske <metskem@apache.org>
 
         * 3.0.0-svn-228

Modified: incubator/jspwiki/trunk/src/WebContent/templates/default/Error.jsp
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/WebContent/templates/default/Error.jsp?rev=1101114&r1=1101113&r2=1101114&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/WebContent/templates/default/Error.jsp (original)
+++ incubator/jspwiki/trunk/src/WebContent/templates/default/Error.jsp Mon May  9 17:05:17
2011
@@ -19,7 +19,6 @@
     under the License.  
 --%>
 <%@ taglib uri="http://stripes.sourceforge.net/stripes.tld" prefix="s" %>
-<%@ page errorPage="/Error.jsp" %>
 <s:useActionBean beanclass="org.apache.wiki.action.MessageActionBean" event="error" id="error"
/>
 <s:layout-render name="${templates['layout/StaticLayout.jsp']}">
 
@@ -37,7 +36,7 @@
       <dt><b>Error</b></dt>
       <dd>${error.message}</dd>      
       <dt><b>Cause</b></dt>
-      <dd>${error.realCause.class.name}</dd>
+      <dd>${error.realCauseClass.name}</dd>
       <dt><b>Detailed message</b></dt>
       <dd>${error.realCause.message}</dd>
       <dt><b>Place where detected</b></dt>

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=1101114&r1=1101113&r2=1101114&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/Release.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/Release.java Mon May  9 17:05:17 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         = "228";
+    public static final String     BUILD         = "229";
 
     /**
      *  This is the generic version string you should use

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=1101114&r1=1101113&r2=1101114&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 Mon May
 9 17:05:17 2011
@@ -105,7 +105,7 @@ public class MessageActionBean extends A
     }
 
     /**
-     * If the {@code error} event method is executed, returns the Exception that
+     * If the {@code error} event method is executed, returns the Throwable that
      * caused the error.
      * 
      * @return the Exception, or {@code null}
@@ -114,6 +114,17 @@ public class MessageActionBean extends A
     {
         return m_realcause;
     }
+    
+    /**
+     * If the {@code error} event method is executed, returns the class in which the
+     * exception occured.
+     * 
+     * @return the {@link Class}, or {@code null}
+     */
+    public Class<? extends Throwable> getRealCauseClass()
+    {
+        return m_realcause.getClass();
+    }
 
     /**
      * If the {@code error} event method is executed, returns the Class, Method

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/content/PageRenamer.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/content/PageRenamer.java?rev=1101114&r1=1101113&r2=1101114&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/content/PageRenamer.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/content/PageRenamer.java Mon May  9 17:05:17
2011
@@ -35,7 +35,7 @@ import org.apache.wiki.api.WikiException
 public class PageRenamer
 {
     /**
-     *  Renames a page. Delegates to {@link ContentManager#renamePage(WikiContext, String,
String, boolean)}.
+     *  Renames a page. Delegates to {@link ContentManager#renamePage(WikiContext, String,
String)}.
      *  
      *  @param context The current context.
      *  @param renameFrom The name from which to rename.

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/content/ReferenceManager.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/content/ReferenceManager.java?rev=1101114&r1=1101113&r2=1101114&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/content/ReferenceManager.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/content/ReferenceManager.java Mon May
 9 17:05:17 2011
@@ -786,7 +786,7 @@ public class ReferenceManager implements
      * {@code to} to the {@code refersTo} attribute of {@code from}. It
      * adds a reciprocal reverse link to {@code to} by adding to its 
      * {@code referredBy} attribute the UUID of {@code from}.
-     * @param the UUID of the page that refers to another
+     * @param from the UUID of the page that refers to another
      * @param to the UIUD that {@code from} refers to
      * @throws RepositoryException 
      * @throws LoginException 
@@ -810,7 +810,7 @@ public class ReferenceManager implements
      * attribute of {@code from}. It removes a reciprocal reverse link
      * from {@code to} by removing to its {@code referredBy} attribute
      * the UUID of {@code from}.
-     * @param the UUID of the page that refers to another
+     * @param from the UUID of the page that refers to another
      * @param to the UIUD that {@code from} refers to
      * @throws RepositoryException if the the JCR cannot obtain a Session,
      * retrieve either Node from the repository, or add required

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/content/WikiPathResolver.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/content/WikiPathResolver.java?rev=1101114&r1=1101113&r2=1101114&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/content/WikiPathResolver.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/content/WikiPathResolver.java Mon May
 9 17:05:17 2011
@@ -62,7 +62,7 @@ public class WikiPathResolver
          * Returns the JCR path prefix; will always start and end with a slash
          * (/);
          * 
-         * @return
+         * @return the JCR path prefix.
          */
         public String path()
         {

Modified: incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/WikiTagBase.java
URL: http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/WikiTagBase.java?rev=1101114&r1=1101113&r2=1101114&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/WikiTagBase.java (original)
+++ incubator/jspwiki/trunk/src/java/org/apache/wiki/tags/WikiTagBase.java Mon May  9 17:05:17
2011
@@ -136,7 +136,7 @@ public abstract class WikiTagBase
         catch( Exception e )
         {
             log.error( "Tag failed", e );
-            throw new JspException( "Tag failed, check logs: "+e.getMessage() );
+            throw new JspException( "Tag failed, check logs: " + ((e.getMessage() == null)
? e : e.getMessage()) );
         }
     }
 



Mime
View raw message