Author: jalkanen
Date: Sun Mar 30 07:25:04 2008
New Revision: 642744

URL: http://svn.apache.org/viewvc?rev=642744&view=rev
Log:
Modified to check for ASF preamble and @author tags.

Modified:
    incubator/jspwiki/trunk/.settings/org.eclipse.jdt.ui.prefs
    incubator/jspwiki/trunk/doc/eclipse/jspwiki-checkstyle.xml

Modified: incubator/jspwiki/trunk/.settings/org.eclipse.jdt.ui.prefs
URL: 
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/.settings/org.eclipse.jdt.ui.prefs?rev=642744&r1=642743&r2=642744&view=diff
==============================================================================
--- incubator/jspwiki/trunk/.settings/org.eclipse.jdt.ui.prefs (original)
+++ incubator/jspwiki/trunk/.settings/org.eclipse.jdt.ui.prefs Sun Mar 30 
07:25:04 2008
@@ -1,10 +1,10 @@
-#Sat Mar 08 18:42:59 EET 2008
+#Sun Mar 30 17:18:27 EEST 2008
 eclipse.preferences.version=1
 formatter_profile=_Janne's coding conventions
-formatter_settings_version=11
+formatter_settings_version=10
 internal.default.compliance=default
 org.eclipse.jdt.ui.ignorelowercasenames=true
 org.eclipse.jdt.ui.importorder=java;javax;org;com;
 org.eclipse.jdt.ui.ondemandthreshold=5
 org.eclipse.jdt.ui.staticondemandthreshold=99
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" 
encoding\="UTF-8"?><templates/>
+org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" 
encoding\="UTF-8"?><templates><template autoinsert\="true" 
context\="gettercomment_context" deleted\="false" description\="Comment for 
getter method" enabled\="true" 
id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" 
name\="gettercomment">/**\n * @return the ${bare_field_name}\n 
*/</template><template autoinsert\="true" context\="settercomment_context" 
deleted\="false" description\="Comment for setter method" enabled\="true" 
id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" 
name\="settercomment">/**\n * @param ${param} the ${bare_field_name} to set\n 
*/</template><template autoinsert\="true" context\="constructorcomment_context" 
deleted\="false" description\="Comment for created constructors" 
enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" 
name\="constructorcomment">/**\n * ${tags}\n */</template><template 
autoinsert\="true" context\="filecomment_context" deleted\
 ="false" description\="Comment for created Java files" enabled\="true" 
id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" 
name\="filecomment">/**\n * \n */</template><template autoinsert\="false" 
context\="typecomment_context" deleted\="false" description\="Comment for 
created types" enabled\="true" 
id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" 
name\="typecomment">/**\n * ${tags}\n */</template><template autoinsert\="true" 
context\="fieldcomment_context" deleted\="false" description\="Comment for 
fields" enabled\="true" 
id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" 
name\="fieldcomment">/**\n * \n */</template><template autoinsert\="true" 
context\="methodcomment_context" deleted\="false" description\="Comment for 
non-overriding methods" enabled\="true" 
id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" 
name\="methodcomment">/**\n * ${tags}\n */</template><template 
autoinsert\="true" context\="overridecomment_context" deleted\="false" descripti
 on\="Comment for overriding methods" enabled\="true" 
id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" 
name\="overridecomment">/* (non-Javadoc)\n * ${see_to_overridden}\n 
*/</template><template autoinsert\="true" context\="delegatecomment_context" 
deleted\="false" description\="Comment for delegate methods" enabled\="true" 
id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" 
name\="delegatecomment">/**\n * ${tags}\n * ${see_to_target}\n 
*/</template><template autoinsert\="true" context\="newtype_context" 
deleted\="false" description\="Newly created files" enabled\="true" 
id\="org.eclipse.jdt.ui.text.codetemplates.newtype" 
name\="newtype">${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template
 autoinsert\="true" context\="classbody_context" deleted\="false" 
description\="Code in new class type bodies" enabled\="true" 
id\="org.eclipse.jdt.ui.text.codetemplates.classbody" 
name\="classbody">\n</template><template autoins
 ert\="true" context\="interfacebody_context" deleted\="false" 
description\="Code in new interface type bodies" enabled\="true" 
id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" 
name\="interfacebody">\n</template><template autoinsert\="true" 
context\="enumbody_context" deleted\="false" description\="Code in new enum 
type bodies" enabled\="true" 
id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" 
name\="enumbody">\n</template><template autoinsert\="true" 
context\="annotationbody_context" deleted\="false" description\="Code in new 
annotation type bodies" enabled\="true" 
id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" 
name\="annotationbody">\n</template><template autoinsert\="true" 
context\="catchblock_context" deleted\="false" description\="Code in new catch 
blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" 
name\="catchblock">// ${todo} Auto-generated catch 
block\n${exception_var}.printStackTrace();</template><template autoinsert
 \="true" context\="methodbody_context" deleted\="false" description\="Code in 
created method stubs" enabled\="true" 
id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// 
${todo} Auto-generated method stub\n${body_statement}</template><template 
autoinsert\="true" context\="constructorbody_context" deleted\="false" 
description\="Code in created constructor stubs" enabled\="true" 
id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" 
name\="constructorbody">${body_statement}\n// ${todo} Auto-generated 
constructor stub</template><template autoinsert\="true" 
context\="getterbody_context" deleted\="false" description\="Code in created 
getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" 
name\="getterbody">return ${field};</template><template autoinsert\="true" 
context\="setterbody_context" deleted\="false" description\="Code in created 
setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" 
name\="sette
 rbody">${field} \= ${param};</template></templates>

Modified: incubator/jspwiki/trunk/doc/eclipse/jspwiki-checkstyle.xml
URL: 
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/doc/eclipse/jspwiki-checkstyle.xml?rev=642744&r1=642743&r2=642744&view=diff
==============================================================================
--- incubator/jspwiki/trunk/doc/eclipse/jspwiki-checkstyle.xml (original)
+++ incubator/jspwiki/trunk/doc/eclipse/jspwiki-checkstyle.xml Sun Mar 30 
07:25:04 2008
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-       This configuration file was written by the eclipse-cs plugin 
configuration editor
+    This configuration file was written by the eclipse-cs plugin configuration 
editor
 -->
 <!--
-Checkstyle-Configuration: JSPWiki Coding Style
-Description:
-
+    Checkstyle-Configuration: JSPWiki Coding Style
+    Description: none
 -->
 <!DOCTYPE module PUBLIC "-//Puppy Crawl//DTD Check Configuration 1.2//EN" 
"http://www.puppycrawl.com/dtds/configuration_1_2.dtd";>
 <module name="Checker">
@@ -86,8 +85,8 @@
         <module name="UpperEll"/>
         <module name="j2ee.FinalStatic"/>
         <module name="RequiredRegexp">
-            <metadata name="com.atlassw.tools.eclipse.checkstyle.comment" 
value="LGPL missing"/>
-            <property name="format" value="^.*GNU Lesser General Public 
License.*$"/>
+            <metadata name="com.atlassw.tools.eclipse.checkstyle.comment" 
value="No ASF copyright"/>
+            <property name="format" value="^.*Copyright 20\d\d The Apache 
Software Foundation.*$"/>
         </module>
         <module name="JavadocType">
             <property name="scope" value="package"/>
@@ -97,6 +96,11 @@
         </module>
         <module name="JavadocMethod">
             <property name="scope" value="protected"/>
+        </module>
+        <module name="GenericIllegalRegexp">
+            <metadata name="com.atlassw.tools.eclipse.checkstyle.comment" 
value="@author tags should not be used"/>
+            <property name="severity" value="info"/>
+            <property name="format" value="[EMAIL PROTECTED]"/>
         </module>
     </module>
     <module name="NewlineAtEndOfFile"/>


Reply via email to