You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@struts.apache.org by hu...@apache.org on 2006/02/10 21:59:36 UTC
svn commit: r376839 - in /struts/taglib/trunk/src/conf:
merge/global-forwards.xml merge/servlet-mappings.xml merge/servlets.xml
merge/struts-actions.xml merge/struts-forms.xml
merge/struts-message-resources.xml qa/CheckStyle.xml
Author: husted
Date: Fri Feb 10 12:59:34 2006
New Revision: 376839
URL: http://svn.apache.org/viewcvs?rev=376839&view=rev
Log:
Checkstyle Roundup
* Taglib conf package reformatted with latest Jalopy settings. Stylistic changes only.
Modified:
struts/taglib/trunk/src/conf/merge/global-forwards.xml
struts/taglib/trunk/src/conf/merge/servlet-mappings.xml
struts/taglib/trunk/src/conf/merge/servlets.xml
struts/taglib/trunk/src/conf/merge/struts-actions.xml
struts/taglib/trunk/src/conf/merge/struts-forms.xml
struts/taglib/trunk/src/conf/merge/struts-message-resources.xml
struts/taglib/trunk/src/conf/qa/CheckStyle.xml
Modified: struts/taglib/trunk/src/conf/merge/global-forwards.xml
URL: http://svn.apache.org/viewcvs/struts/taglib/trunk/src/conf/merge/global-forwards.xml?rev=376839&r1=376838&r2=376839&view=diff
==============================================================================
--- struts/taglib/trunk/src/conf/merge/global-forwards.xml (original)
+++ struts/taglib/trunk/src/conf/merge/global-forwards.xml Fri Feb 10 12:59:34 2006
@@ -1,10 +1,10 @@
<global-forwards>
- <forward name="simpleForward"
- path="/path/to/non/existing/jsp.jsp"/>
-
- <forward name="testIncludeTagForward"
- path="/org/apache/struts/taglib/bean/resources/IncludeTagTest.jsp"/>
+ <forward name="simpleForward"
+ path="/path/to/non/existing/jsp.jsp"/>
+
+ <forward name="testIncludeTagForward"
+ path="/org/apache/struts/taglib/bean/resources/IncludeTagTest.jsp"/>
</global-forwards>
Modified: struts/taglib/trunk/src/conf/merge/servlet-mappings.xml
URL: http://svn.apache.org/viewcvs/struts/taglib/trunk/src/conf/merge/servlet-mappings.xml?rev=376839&r1=376838&r2=376839&view=diff
==============================================================================
--- struts/taglib/trunk/src/conf/merge/servlet-mappings.xml (original)
+++ struts/taglib/trunk/src/conf/merge/servlet-mappings.xml Fri Feb 10 12:59:34 2006
@@ -1,5 +1,4 @@
-
<servlet-mapping>
- <servlet-name>action</servlet-name>
- <url-pattern>*.do</url-pattern>
+ <servlet-name>action</servlet-name>
+ <url-pattern>*.do</url-pattern>
</servlet-mapping>
Modified: struts/taglib/trunk/src/conf/merge/servlets.xml
URL: http://svn.apache.org/viewcvs/struts/taglib/trunk/src/conf/merge/servlets.xml?rev=376839&r1=376838&r2=376839&view=diff
==============================================================================
--- struts/taglib/trunk/src/conf/merge/servlets.xml (original)
+++ struts/taglib/trunk/src/conf/merge/servlets.xml Fri Feb 10 12:59:34 2006
@@ -1,13 +1,12 @@
-
- <servlet>
+<servlet>
<servlet-name>action</servlet-name>
<servlet-class>org.apache.struts.action.ActionServlet</servlet-class>
<init-param>
- <param-name>config</param-name>
- <param-value>/WEB-INF/struts-config.xml</param-value>
+ <param-name>config</param-name>
+ <param-value>/WEB-INF/struts-config.xml</param-value>
</init-param>
<load-on-startup>1</load-on-startup>
- </servlet>
-
-<!-- [INSERT FRAGMENT HERE] -->
+</servlet>
+
+ <!-- [INSERT FRAGMENT HERE] -->
Modified: struts/taglib/trunk/src/conf/merge/struts-actions.xml
URL: http://svn.apache.org/viewcvs/struts/taglib/trunk/src/conf/merge/struts-actions.xml?rev=376839&r1=376838&r2=376839&view=diff
==============================================================================
--- struts/taglib/trunk/src/conf/merge/struts-actions.xml (original)
+++ struts/taglib/trunk/src/conf/merge/struts-actions.xml Fri Feb 10 12:59:34 2006
@@ -1,20 +1,19 @@
+<action path="/testIncludeTagTransaction"
+ type="org.apache.struts.taglib.bean.resources.IncludeTagTransactionTestAction">
+ <forward name="success"
+ path="/org/apache/struts/taglib/bean/resources/IncludeTagTest.jsp"/>
+</action>
- <action path="/testIncludeTagTransaction"
- type="org.apache.struts.taglib.bean.resources.IncludeTagTransactionTestAction">
- <forward name="success"
- path="/org/apache/struts/taglib/bean/resources/IncludeTagTest.jsp"/>
- </action>
+<action path="/simpleAction"
+ type="does.not.exist.SimpleAction">
+ <forward name="success"
+ path="/does/not/exist/jsp.jsp"/>
+</action>
- <action path="/simpleAction"
- type="does.not.exist.SimpleAction">
- <forward name="success"
- path="/does/not/exist/jsp.jsp"/>
- </action>
-
- <action path="/testFormTag"
- type="org.apache.struts.taglib.html.resources.FormTagTestAction"
- name="testFormBean"
- scope="request">
- <forward name="success"
- path="/org/apache/struts/taglib/html/TestFormTag1.jsp"/>
- </action>
+<action path="/testFormTag"
+ type="org.apache.struts.taglib.html.resources.FormTagTestAction"
+ name="testFormBean"
+ scope="request">
+ <forward name="success"
+ path="/org/apache/struts/taglib/html/TestFormTag1.jsp"/>
+</action>
Modified: struts/taglib/trunk/src/conf/merge/struts-forms.xml
URL: http://svn.apache.org/viewcvs/struts/taglib/trunk/src/conf/merge/struts-forms.xml?rev=376839&r1=376838&r2=376839&view=diff
==============================================================================
--- struts/taglib/trunk/src/conf/merge/struts-forms.xml (original)
+++ struts/taglib/trunk/src/conf/merge/struts-forms.xml Fri Feb 10 12:59:34 2006
@@ -1,13 +1,12 @@
+<form-bean name="testDynaFormBean"
+ type="org.apache.struts.validator.DynaValidatorForm">
+ <form-property name="field1" type="java.lang.String"/>
+ <form-property name="field2" type="java.lang.String"/>
+</form-bean>
- <form-bean name="testDynaFormBean"
- type="org.apache.struts.validator.DynaValidatorForm">
- <form-property name="field1" type="java.lang.String"/>
- <form-property name="field2" type="java.lang.String"/>
- </form-bean>
-
- <!-- Registration form bean -->
- <form-bean name="testFormBean"
- type="org.apache.struts.taglib.SimpleBeanForTesting"/>
+ <!-- Registration form bean -->
+<form-bean name="testFormBean"
+ type="org.apache.struts.taglib.SimpleBeanForTesting"/>
Modified: struts/taglib/trunk/src/conf/merge/struts-message-resources.xml
URL: http://svn.apache.org/viewcvs/struts/taglib/trunk/src/conf/merge/struts-message-resources.xml?rev=376839&r1=376838&r2=376839&view=diff
==============================================================================
--- struts/taglib/trunk/src/conf/merge/struts-message-resources.xml (original)
+++ struts/taglib/trunk/src/conf/merge/struts-message-resources.xml Fri Feb 10 12:59:34 2006
@@ -1,7 +1,6 @@
+<message-resources
+ parameter="org.apache.struts.taglib.bean.resources.ApplicationResources"/>
- <message-resources
- parameter="org.apache.struts.taglib.bean.resources.ApplicationResources"/>
-
- <message-resources
- parameter="org.apache.struts.taglib.bean.resources.AlternateApplicationResources"
- key="alternate"/>
+<message-resources
+ parameter="org.apache.struts.taglib.bean.resources.AlternateApplicationResources"
+ key="alternate"/>
Modified: struts/taglib/trunk/src/conf/qa/CheckStyle.xml
URL: http://svn.apache.org/viewcvs/struts/taglib/trunk/src/conf/qa/CheckStyle.xml?rev=376839&r1=376838&r2=376839&view=diff
==============================================================================
--- struts/taglib/trunk/src/conf/qa/CheckStyle.xml (original)
+++ struts/taglib/trunk/src/conf/qa/CheckStyle.xml Fri Feb 10 12:59:34 2006
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<!DOCTYPE module PUBLIC
- "-//Puppy Crawl//DTD Check Configuration 1.1//EN"
- "http://www.puppycrawl.com/dtds/configuration_1_1.dtd">
+ "-//Puppy Crawl//DTD Check Configuration 1.1//EN"
+ "http://www.puppycrawl.com/dtds/configuration_1_1.dtd">
<!--
@@ -25,106 +25,107 @@
<module name="Checker">
- <module name="TreeWalker">
+ <module name="TreeWalker">
- <!-- Item 4 - Avoid creating duplicate objects -->
- <module name="IllegalInstantiation">
- <property name="classes" value="java.lang.Boolean, java.lang.String"/>
- </module>
-
- <!-- Item 6 - Avoid finalizers -->
- <!-- this will not find violations that contain linebreaks -->
- <module name="GenericIllegalRegexp">
- <property name="format"
- value="((public)|(protected))\s+void\s+finalize\(\s*\)"/>
- </module>
-
- <!-- Item 8 - Always override hashCode when you override equals -->
- <module name="EqualsHashCode"/>
-
- <!-- Item 12 - Make all fields private -->
- <module name="VisibilityModifier"/>
-
- <!-- Item 15 - Design and document for inheritance or else prohibit it -->
- <!-- the module actually implements a very strict rule, it would be
- interesting to know whether Joshua meant what checkstyle implements.
- We feel this implementation is well suited as a warning,
- i.e. if you get error messages from this check you should be
- able to name a good reason to implement your code the way you do it,
- especially if you are designing a library and not an application. -->
- <module name="DesignForExtension">
- <property name="severity" value="warning"/>
- </module>
-
- <!-- Item 17 - Use interfaces only to define types -->
- <module name="InterfaceIsType"/>
+ <!-- Item 4 - Avoid creating duplicate objects -->
+ <module name="IllegalInstantiation">
+ <property name="classes"
+ value="java.lang.Boolean, java.lang.String"/>
+ </module>
+
+ <!-- Item 6 - Avoid finalizers -->
+ <!-- this will not find violations that contain linebreaks -->
+ <module name="GenericIllegalRegexp">
+ <property name="format"
+ value="((public)|(protected))\s+void\s+finalize\(\s*\)"/>
+ </module>
+
+ <!-- Item 8 - Always override hashCode when you override equals -->
+ <module name="EqualsHashCode"/>
+
+ <!-- Item 12 - Make all fields private -->
+ <module name="VisibilityModifier"/>
+
+ <!-- Item 15 - Design and document for inheritance or else prohibit it -->
+ <!-- the module actually implements a very strict rule, it would be
+interesting to know whether Joshua meant what checkstyle implements.
+We feel this implementation is well suited as a warning,
+i.e. if you get error messages from this check you should be
+able to name a good reason to implement your code the way you do it,
+especially if you are designing a library and not an application. -->
+ <module name="DesignForExtension">
+ <property name="severity" value="warning"/>
+ </module>
+
+ <!-- Item 17 - Use interfaces only to define types -->
+ <module name="InterfaceIsType"/>
+
+ <!-- Item 25 - Design method signatures carefully -->
+ <!-- Avoid long parameter lists -->
+ <module name="ParameterNumber">
+ <property name="max" value="3"/>
+ </module>
+
+ <!-- Item 26 - Use overloading judiciously -->
+ <!-- rfe #659735 -->
+
+ <!-- Item 27 - Return zero-length array, not nulls -->
+ <!-- no rfe yet -->
+
+ <!-- Item 28 - Write doc comments for all exposed API elements -->
+ <module name="JavadocType">
+ <property name="scope" value="protected"/>
+ </module>
+ <module name="JavadocMethod"> <!-- also covers Item 44 -->
+ <property name="scope" value="protected"/>
+ </module>
+ <module name="JavadocVariable">
+ <property name="scope" value="protected"/>
+ </module>
+
+ <!-- Item 29 - Minimize the scope of local variables -->
+ <!-- no rfe yet -->
+
+
+ <!-- Item 38 - Adhere to generally accepted naming conventions -->
+ <module name="PackageName">
+ <!-- no uppercase letters, between 2 and 10 characters -->
+ <property name="format" value="^[a-z]+(\.[a-z][a-z0-9]{1,9})*$"/>
+ </module>
+ <module name="TypeName"/>
+ <module name="ConstantName"/>
+ <module name="LocalFinalVariableName"/>
+ <module name="LocalVariableName"/>
+ <module name="MemberName"/>
+ <module name="MethodName"/>
+ <module name="ParameterName"/>
+ <module name="StaticVariableName"/>
+
+ <!-- Item 47 - Don't ignore exceptions -->
+ <module name="EmptyBlock">
+ <property name="tokens" value="LITERAL_CATCH"/>
+ <!-- require a comment, change to stmt to require a statement -->
+ <property name="option" value="text"/>
+ </module>
+
+ <!-- Item 50 - Never invoke wait outside a loop -->
+ <!-- rfe #712798 -->
+
+ <!-- Item 57 - Provide a readResolve method when necessary -->
+ <!-- no rfe yet -->
+
+ <!-- don't allow tabs -->
+ <module name="TabCharacter"/>
+
+ <!-- enforce License Header using a RegExp file to allow some variations
+like the years in copyrights or values of SVN variables. -->
+ <module name="RegexpHeader">
+ <property name="headerFile" value="LICENSE.CheckStyle"/>
+ </module>
- <!-- Item 25 - Design method signatures carefully -->
- <!-- Avoid long parameter lists -->
- <module name="ParameterNumber">
- <property name="max" value="3"/>
</module>
- <!-- Item 26 - Use overloading judiciously -->
- <!-- rfe #659735 -->
-
- <!-- Item 27 - Return zero-length array, not nulls -->
- <!-- no rfe yet -->
+ <!-- enforce package documentation -->
+ <module name="PackageHtml"/>
- <!-- Item 28 - Write doc comments for all exposed API elements -->
- <module name="JavadocType">
- <property name="scope" value="protected"/>
- </module>
- <module name="JavadocMethod"> <!-- also covers Item 44 -->
- <property name="scope" value="protected"/>
- </module>
- <module name="JavadocVariable">
- <property name="scope" value="protected"/>
- </module>
-
- <!-- Item 29 - Minimize the scope of local variables -->
- <!-- no rfe yet -->
-
-
- <!-- Item 38 - Adhere to generally accepted naming conventions -->
- <module name="PackageName">
- <!-- no uppercase letters, between 2 and 10 characters -->
- <property name="format" value="^[a-z]+(\.[a-z][a-z0-9]{1,9})*$"/>
- </module>
- <module name="TypeName"/>
- <module name="ConstantName"/>
- <module name="LocalFinalVariableName"/>
- <module name="LocalVariableName"/>
- <module name="MemberName"/>
- <module name="MethodName"/>
- <module name="ParameterName"/>
- <module name="StaticVariableName"/>
-
- <!-- Item 47 - Don't ignore exceptions -->
- <module name="EmptyBlock">
- <property name="tokens" value="LITERAL_CATCH"/>
- <!-- require a comment, change to stmt to require a statement -->
- <property name="option" value="text"/>
- </module>
-
- <!-- Item 50 - Never invoke wait outside a loop -->
- <!-- rfe #712798 -->
-
- <!-- Item 57 - Provide a readResolve method when necessary -->
- <!-- no rfe yet -->
-
- <!-- don't allow tabs -->
- <module name="TabCharacter"/>
-
- <!-- enforce License Header using a RegExp file to allow some variations
- like the years in copyrights or values of SVN variables. -->
- <module name="RegexpHeader">
- <property name="headerFile" value="LICENSE.CheckStyle"/>
- </module>
-
- </module>
-
- <!-- enforce package documentation -->
- <module name="PackageHtml"/>
-
</module>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@struts.apache.org
For additional commands, e-mail: dev-help@struts.apache.org