svn commit: r418925 - in /struts/shale/trunk/maven/build: LICENSE.CheckStyle shale_checks.xml

[ws...@apache.org]

Author: wsmoak
Date: Mon Jul  3 23:23:30 2006
New Revision: 418925

URL: http://svn.apache.org/viewvc?rev=418925&view=rev
Log:
Copy the Struts LICENCE.CheckStyle config file for reference, and remove the 'Id' keyword.
CheckStyle won't read a headerFile from a URL, so add the expression directly to the shale_checks.xml file.
The expression is formed from the LICENSE.CheckStyle file by replacing newlines with '\n'.
The double quotes around "LICENSE" and "AS IS" caused problems, so I used '.'.
SHALE-207

Added:
    struts/shale/trunk/maven/build/LICENSE.CheckStyle
      - copied, changed from r418922, struts/maven/trunk/build/src/main/resources/org/apache/struts/build/LICENSE.CheckStyle
Modified:
    struts/shale/trunk/maven/build/shale_checks.xml

Copied: struts/shale/trunk/maven/build/LICENSE.CheckStyle (from r418922, struts/maven/trunk/build/src/main/resources/org/apache/struts/build/LICENSE.CheckStyle)
URL: http://svn.apache.org/viewvc/struts/shale/trunk/maven/build/LICENSE.CheckStyle?p2=struts/shale/trunk/maven/build/LICENSE.CheckStyle&p1=struts/maven/trunk/build/src/main/resources/org/apache/struts/build/LICENSE.CheckStyle&r1=418922&r2=418925&rev=418925&view=diff
==============================================================================
--- struts/maven/trunk/build/src/main/resources/org/apache/struts/build/LICENSE.CheckStyle (original)
+++ struts/shale/trunk/maven/build/LICENSE.CheckStyle Mon Jul  3 23:23:30 2006
@@ -1,6 +1,4 @@
 /\*\s*
- \*\s*\$Id.*\$
- \*\s*
  \*\s*Copyright \d{4}(-\d{4}|,\d{4})* The Apache Software Foundation\.
  \*\s*
  \*\s*Licensed under the Apache License, Version 2\.0 \(the "License"\);

Modified: struts/shale/trunk/maven/build/shale_checks.xml
URL: http://svn.apache.org/viewvc/struts/shale/trunk/maven/build/shale_checks.xml?rev=418925&r1=418924&r2=418925&view=diff
==============================================================================
--- struts/shale/trunk/maven/build/shale_checks.xml (original)
+++ struts/shale/trunk/maven/build/shale_checks.xml Mon Jul  3 23:23:30 2006
@@ -134,10 +134,10 @@
 
         <!-- Following interprets the header file as regular expressions. -->
         <!-- <module name="RegexpHeader"/>                                -->
-        <!--module name="RegexpHeader">
-            <property name="headerFile" value="${checkstyle.regexp.header}"/>
-        </module-->
-
+        <module name="RegexpHeader">
+            <property name="header"
+                      value="/\*\s*\n \*\s*Copyright \d{4}(-\d{4}|,\d{4})* The Apache Software Foundation\.\n \*\s*\n \*\s*Licensed under the Apache License, Version 2\.0 \(the .License.\);\n \*\s*you may not use this file except in compliance with the License\.\n \*\s*You may obtain a copy of the License at\n \*\s*\n \*\s*http://www\.apache\.org/licenses/LICENSE\-2\.0\n \*\s*\n \*\s*Unless required by applicable law or agreed to in writing, software\n \*\s*distributed under the License is distributed on an .AS IS. BASIS,\n \*\s*WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied\.\n \*\s*See the License for the specific language governing permissions and\n \*\s*limitations under the License\.\n \*/\s*"/>
+        </module>
 
         <!-- Checks for imports                              -->
         <!-- See http://checkstyle.sf.net/config_import.html -->