You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tapestry.apache.org by jk...@apache.org on 2006/11/22 05:44:38 UTC
svn commit: r478032 - in /tapestry/tapestry4/trunk: ./
tapestry-framework/src/descriptor/META-INF/
tapestry-framework/src/java/org/apache/tapestry/asset/
tapestry-framework/src/test/org/apache/tapestry/asset/
Author: jkuhnert
Date: Tue Nov 21 20:44:38 2006
New Revision: 478032
URL: http://svn.apache.org/viewvc?view=rev&rev=478032
Log:
Fixed regexp issues found only when running server on windows. :(
Modified:
tapestry/tapestry4/trunk/tapestry-checkstyle.xml
tapestry/tapestry4/trunk/tapestry-framework/src/descriptor/META-INF/tapestry.asset.xml
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/asset/ResourceMatcherImpl.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/asset/TestUnprotectedAsset.java
Modified: tapestry/tapestry4/trunk/tapestry-checkstyle.xml
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-checkstyle.xml?view=diff&rev=478032&r1=478031&r2=478032
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-checkstyle.xml (original)
+++ tapestry/tapestry4/trunk/tapestry-checkstyle.xml Tue Nov 21 20:44:38 2006
@@ -1,96 +1,98 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!--
This configuration file was written by the eclipse-cs plugin configuration editor
--->
+-->
<!--
Checkstyle-Configuration: tapestry
Description:
The core tapestry checkstyle configuration
--->
-<!DOCTYPE module PUBLIC "-//Puppy Crawl//DTD Check Configuration 1.2//EN" "http://www.puppycrawl.com/dtds/configuration_1_2.dtd">
-<module name="Checker">
- <property name="severity" value="warning"/>
- <module name="TreeWalker">
- <module name="FileContentsHolder"/>
- <module name="JavadocStyle"/>
- <module name="ConstantName">
- <property name="format" value="^[A-Z][A-Z0-9]|[a-z][a-z0-9]*(_[A-Z0-9]|[a-z0-9]+)*$"/>
- </module>
- <module name="LocalFinalVariableName"/>
- <module name="LocalVariableName"/>
- <module name="MemberName">
- <metadata name="com.atlassw.tools.eclipse.checkstyle.comment" value="Normal naming, but allow either "m_" or "_" as a prefix."/>
- <property name="format" value="^(m_|_)?[a-z][a-zA-Z0-9]*$"/>
- </module>
- <module name="MethodName"/>
- <module name="PackageName">
- <property name="format" value="^[a-z]+(\.[a-z][a-z0-9]*)*$"/>
- </module>
- <module name="ParameterName">
- <metadata name="com.atlassw.tools.eclipse.checkstyle.comment" value="Either a normal name (w/o underscores) or an all uppercase acronym (rarely used)"/>
- <property name="format" value="^([a-z][a-zA-Z0-9]*|[A-Z]+)$"/>
- </module>
- <module name="StaticVariableName">
- <property name="format" value="^_?[a-z][a-zA-Z0-9]*$"/>
- </module>
- <module name="TypeName"/>
- <module name="AvoidStarImport"/>
- <module name="ImportOrder"/>
- <module name="RedundantImport"/>
- <module name="UnusedImports">
- <property name="severity" value="ignore"/>
- </module>
- <module name="TabCharacter"/>
- <module name="ModifierOrder"/>
- <module name="RedundantModifier"/>
- <module name="DefaultComesLast"/>
- <module name="DeclarationOrder"/>
- <module name="DoubleCheckedLocking">
- <property name="severity" value="error"/>
- </module>
- <module name="EmptyStatement"/>
- <module name="HiddenField"/>
- <module name="JUnitTestCase"/>
- <module name="MissingSwitchDefault">
- <metadata name="com.atlassw.tools.eclipse.checkstyle.lastEnabledSeverity" value="error"/>
- <property name="severity" value="ignore"/>
- </module>
- <module name="PackageDeclaration">
- <property name="severity" value="error"/>
- </module>
- <module name="ParameterAssignment">
- <property name="severity" value="info"/>
- </module>
- <module name="RedundantThrows"/>
- <module name="SimplifyBooleanExpression">
- <property name="severity" value="info"/>
- </module>
- <module name="SimplifyBooleanReturn">
- <property name="severity" value="info"/>
- </module>
- <module name="StringLiteralEquality">
- <property name="severity" value="error"/>
- </module>
- <module name="SuperClone">
- <property name="severity" value="info"/>
- </module>
- <module name="SuperFinalize"/>
- <module name="FinalClass"/>
- <module name="HideUtilityClassConstructor"/>
- <module name="InterfaceIsType"/>
- <module name="MutableException"/>
- <module name="ArrayTypeStyle"/>
- <module name="UpperEll"/>
- <module name="JavadocType">
- <property name="excludeScope" value="private"/>
- <property name="scope" value="public"/>
- </module>
- <module name="JavadocStyle"/>
- <module name="WriteTag"/>
- </module>
- <module name="PackageHtml"/>
- <module name="NewlineAtEndOfFile"/>
- <module name="SuppressionCommentFilter">
- <metadata name="com.atlassw.tools.eclipse.checkstyle.comment" value="Enables ignoring checkstyle errors in sepecific blocks"/>
- </module>
-</module>
+-->
+<!DOCTYPE module PUBLIC "-//Puppy Crawl//DTD Check Configuration 1.2//EN" "http://www.puppycrawl.com/dtds/configuration_1_2.dtd">
+<module name="Checker">
+ <property name="severity" value="warning"/>
+ <module name="TreeWalker">
+ <module name="FileContentsHolder"/>
+ <module name="JavadocStyle"/>
+ <module name="ConstantName">
+ <property name="format" value="^[A-Z][A-Z0-9]|[a-z][a-z0-9]*(_[A-Z0-9]|[a-z0-9]+)*$"/>
+ </module>
+ <module name="LocalFinalVariableName"/>
+ <module name="LocalVariableName"/>
+ <module name="MemberName">
+ <metadata name="com.atlassw.tools.eclipse.checkstyle.comment" value="Normal naming, but allow either "m_" or "_" as a prefix."/>
+ <property name="format" value="^(m_|_)?[a-z][a-zA-Z0-9]*$"/>
+ </module>
+ <module name="MethodName"/>
+ <module name="PackageName">
+ <property name="format" value="^[a-z]+(\.[a-z][a-z0-9]*)*$"/>
+ </module>
+ <module name="ParameterName">
+ <metadata name="com.atlassw.tools.eclipse.checkstyle.comment" value="Either a normal name (w/o underscores) or an all uppercase acronym (rarely used)"/>
+ <property name="format" value="^([a-z][a-zA-Z0-9]*|[A-Z]+)$"/>
+ </module>
+ <module name="StaticVariableName">
+ <property name="format" value="^_?[a-z][a-zA-Z0-9]*$"/>
+ </module>
+ <module name="TypeName"/>
+ <module name="AvoidStarImport"/>
+ <module name="ImportOrder"/>
+ <module name="RedundantImport"/>
+ <module name="UnusedImports">
+ <property name="severity" value="ignore"/>
+ </module>
+ <module name="TabCharacter"/>
+ <module name="ModifierOrder"/>
+ <module name="RedundantModifier"/>
+ <module name="DefaultComesLast"/>
+ <module name="DeclarationOrder"/>
+ <module name="DoubleCheckedLocking">
+ <property name="severity" value="error"/>
+ </module>
+ <module name="EmptyStatement"/>
+ <module name="HiddenField"/>
+ <module name="JUnitTestCase"/>
+ <module name="MissingSwitchDefault">
+ <metadata name="com.atlassw.tools.eclipse.checkstyle.lastEnabledSeverity" value="error"/>
+ <property name="severity" value="ignore"/>
+ </module>
+ <module name="PackageDeclaration">
+ <property name="severity" value="error"/>
+ </module>
+ <module name="ParameterAssignment">
+ <property name="severity" value="info"/>
+ </module>
+ <module name="RedundantThrows"/>
+ <module name="SimplifyBooleanExpression">
+ <property name="severity" value="info"/>
+ </module>
+ <module name="SimplifyBooleanReturn">
+ <property name="severity" value="info"/>
+ </module>
+ <module name="StringLiteralEquality">
+ <property name="severity" value="error"/>
+ </module>
+ <module name="SuperClone">
+ <property name="severity" value="info"/>
+ </module>
+ <module name="SuperFinalize"/>
+ <module name="FinalClass"/>
+ <module name="HideUtilityClassConstructor"/>
+ <module name="InterfaceIsType"/>
+ <module name="MutableException"/>
+ <module name="ArrayTypeStyle"/>
+ <module name="UpperEll"/>
+ <module name="JavadocType">
+ <property name="excludeScope" value="private"/>
+ <property name="scope" value="public"/>
+ </module>
+ <module name="JavadocStyle"/>
+ <module name="WriteTag"/>
+ </module>
+ <module name="PackageHtml"/>
+ <module name="NewlineAtEndOfFile">
+ <property name="lineSeparator" value="lf"/>
+ </module>
+ <module name="SuppressionCommentFilter">
+ <metadata name="com.atlassw.tools.eclipse.checkstyle.comment" value="Enables ignoring checkstyle errors in sepecific blocks"/>
+ </module>
+</module>
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/descriptor/META-INF/tapestry.asset.xml
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/descriptor/META-INF/tapestry.asset.xml?view=diff&rev=478032&r1=478031&r2=478032
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/descriptor/META-INF/tapestry.asset.xml (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/descriptor/META-INF/tapestry.asset.xml Tue Nov 21 20:44:38 2006
@@ -169,8 +169,8 @@
<contribution configuration-id="UnprotectedAssets">
List of unprotected asset regexps for ResourceMatcher service.
- <unprotected-resource contains="tapestry/*" />
- <unprotected-resource contains="dojo/*" />
+ <unprotected-resource contains="/tapestry/" />
+ <unprotected-resource contains="/dojo/" />
</contribution>
<service-point id="UnprotectedResourceMatcher" interface="ResourceMatcher" >
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/asset/ResourceMatcherImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/asset/ResourceMatcherImpl.java?view=diff&rev=478032&r1=478031&r2=478032
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/asset/ResourceMatcherImpl.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/asset/ResourceMatcherImpl.java Tue Nov 21 20:44:38 2006
@@ -56,11 +56,12 @@
*/
public boolean containsResource(String path)
{
- if (_contributions == null || _contributions.size() < 1)
+ if (_contributions == null || _contributions.size() < 1 || path == null)
return false;
for (int i = 0; i < _contributions.size(); i++) {
String pattern = (String)_contributions.get(i);
+
if (_matcher.contains(pattern, path))
return true;
}
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/asset/TestUnprotectedAsset.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/asset/TestUnprotectedAsset.java?view=diff&rev=478032&r1=478031&r2=478032
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/asset/TestUnprotectedAsset.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/asset/TestUnprotectedAsset.java Tue Nov 21 20:44:38 2006
@@ -160,6 +160,18 @@
assertTrue(rm.containsResource("/org/apache/tapestry/html/dojo/src/test.png"));
}
+ public void test_Configured_Paths()
+ {
+ ResourceMatcherImpl rm = new ResourceMatcherImpl();
+ List patterns = new ArrayList();
+ patterns.add("/tapestry/");
+ patterns.add("/dojo/");
+ rm.setContributions(patterns);
+ rm.initializeService();
+
+ assertTrue(rm.containsResource("/assets/static/dojo/src/widget/templates/DatePicker.css"));
+ }
+
public void test_Css_Paths()
{
AssetService service = new AssetService();