From commits-return-4729-apmail-tapestry-dev-archive=tapestry.apache.org@tapestry.apache.org Tue Mar 03 18:32:04 2009
Return-Path: <commits-return-4729-apmail-tapestry-dev-archive=tapestry.apache.org@tapestry.apache.org>
Delivered-To: apmail-tapestry-dev-archive@www.apache.org
Received: (qmail 67695 invoked from network); 3 Mar 2009 18:32:04 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 3 Mar 2009 18:32:04 -0000
Received: (qmail 25425 invoked by uid 500); 3 Mar 2009 18:32:03 -0000
Delivered-To: apmail-tapestry-dev-archive@tapestry.apache.org
Received: (qmail 25398 invoked by uid 500); 3 Mar 2009 18:32:03 -0000
Mailing-List: contact commits-help@tapestry.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@tapestry.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@tapestry.apache.org>
List-Post: <mailto:commits@tapestry.apache.org>
List-Id: <commits.tapestry.apache.org>
Reply-To: dev@tapestry.apache.org
Delivered-To: mailing list commits@tapestry.apache.org
Received: (qmail 25389 invoked by uid 99); 3 Mar 2009 18:32:03 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 03 Mar 2009 10:32:03 -0800
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 03 Mar 2009 18:32:03 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id D447723888F4; Tue,  3 Mar 2009 18:31:42 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r749677 - in /tapestry/tapestry5/trunk/tapestry-core/src/main:
 java/org/apache/tapestry5/corelib/pages/ExceptionReport.java
 resources/org/apache/tapestry5/corelib/pages/ExceptionReport.tml
Date: Tue, 03 Mar 2009 18:31:42 -0000
To: commits@tapestry.apache.org
From: hlship@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20090303183142.D447723888F4@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: hlship
Date: Tue Mar  3 18:31:41 2009
New Revision: 749677

URL: http://svn.apache.org/viewvc?rev=749677&view=rev
Log:
TAP5-547: In the exception report page, JVM system property org.apache.catalina.jsp_classpath should be displayed as a list, like other .path value

Modified:
    tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/pages/ExceptionReport.java
    tapestry/tapestry5/trunk/tapestry-core/src/main/resources/org/apache/tapestry5/corelib/pages/ExceptionReport.tml

Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/pages/ExceptionReport.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/pages/ExceptionReport.java?rev=749677&r1=749676&r2=749677&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/pages/ExceptionReport.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/corelib/pages/ExceptionReport.java Tue Mar  3 18:31:41 2009
@@ -25,6 +25,7 @@
 import org.apache.tapestry5.services.Session;
 
 import java.util.List;
+import java.util.regex.Pattern;
 
 /**
  * Responsible for reporting runtime exceptions. This page is quite verbose and is usually overridden in a production
@@ -37,6 +38,10 @@
 {
     private static final String PATH_SEPARATOR_PROPERTY = "path.separator";
 
+    // Match anything ending in .(something?)path.
+
+    private static final Pattern PATH_RECOGNIZER = Pattern.compile("\\..*path$");
+
     @Property
     private String attributeName;
 
@@ -100,9 +105,9 @@
         return System.getProperty(propertyName);
     }
 
-    public boolean isSimpleProperty()
+    public boolean isComplexProperty()
     {
-        return ! (propertyName.endsWith(".path") && getPropertyValue().contains(pathSeparator));
+        return PATH_RECOGNIZER.matcher(propertyName).find() && getPropertyValue().contains(pathSeparator);
     }
 
     public String[] getComplexPropertyValue()

Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/resources/org/apache/tapestry5/corelib/pages/ExceptionReport.tml
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/resources/org/apache/tapestry5/corelib/pages/ExceptionReport.tml?rev=749677&r1=749676&r2=749677&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/resources/org/apache/tapestry5/corelib/pages/ExceptionReport.tml (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/resources/org/apache/tapestry5/corelib/pages/ExceptionReport.tml Tue Mar  3 18:31:41 2009
@@ -40,7 +40,7 @@
                         <t:loop source="systemProperties" value="propertyName">
                             <dt>${propertyName}</dt>
                             <dd>
-                                <t:if test="simpleProperty">
+                                <t:if test="! complexProperty">
                                     ${propertyValue}
                                     <p:else>
                                         <ul>