commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From simonetrip...@apache.org
Subject svn commit: r1171813 - in /commons/proper/dbutils/trunk: checkstyle.xml license-header.txt pom.xml
Date Fri, 16 Sep 2011 21:49:35 GMT
Author: simonetripodi
Date: Fri Sep 16 21:49:35 2011
New Revision: 1171813

URL: http://svn.apache.org/viewvc?rev=1171813&view=rev
Log:
upgraded checkstyle plugin

Added:
    commons/proper/dbutils/trunk/license-header.txt   (with props)
Modified:
    commons/proper/dbutils/trunk/checkstyle.xml
    commons/proper/dbutils/trunk/pom.xml

Modified: commons/proper/dbutils/trunk/checkstyle.xml
URL: http://svn.apache.org/viewvc/commons/proper/dbutils/trunk/checkstyle.xml?rev=1171813&r1=1171812&r2=1171813&view=diff
==============================================================================
--- commons/proper/dbutils/trunk/checkstyle.xml (original)
+++ commons/proper/dbutils/trunk/checkstyle.xml Fri Sep 16 21:49:35 2011
@@ -1,43 +1,188 @@
 <?xml version="1.0"?>
 <!--
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements.  See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to You under the Apache License, Version 2.0
-(the "License"); you may not use this file except in compliance with
-the License.  You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
+   Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
 
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+-->
 <!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">
+  
+  <!--
+    Checkstyle checks configured for Maven.
+  -->
+  
+  <module name="Checker">
+  
+      <!-- Checks that a package.html file exists for each package.     -->
+      <!-- See http://checkstyle.sf.net/config_javadoc.html#PackageHtml -->
+      <module name="JavadocPackage">
+          <!-- setting allowLegacy means it will check for package.html instead of just
package-info.java -->
+          <property name="allowLegacy" value="true"/>
+      </module>
+  
+      <!-- Checks whether files end with a new line.                        -->
+      <!-- See http://checkstyle.sf.net/config_misc.html#NewlineAtEndOfFile -->
+      <!-- module name="NewlineAtEndOfFile"/-->
+  
+      <!-- Checks that property files contain the same keys.         -->
+      <!-- See http://checkstyle.sf.net/config_misc.html#Translation -->
+      <module name="Translation"/>
+  
+      <module name="Header">
+          <property name="headerFile" value="${checkstyle.header.file}"/>
+      </module>
+
+      <module name="FileLength"/>
+
+      <module name="FileTabCharacter">
+          <property name="fileExtensions" value="java,xml"/>
+      </module>
+
+      <module name="RegexpSingleline">
+          <property name="format" value="\s+$"/>
+          <property name="message" value="Line has trailing spaces."/>
+      </module>
 
-<!-- commons lang customization of default Checkstyle behavior -->
-<module name="Checker">
-  <property name="localeLanguage" value="en"/>
-  <module name="PackageHtml"/>
-  <module name="TreeWalker">
-    <module name="TabCharacter"/>
-    <module name="AvoidStarImport"/>
-    <module name="RedundantImport"/>
-    <module name="UnusedImports"/>
-    <module name="NeedBraces"/>
-    <module name="RedundantThrows">
-      <property name="allowUnchecked" value="true"/>
-    </module>
-    <module name="LineLength">
-      <property name="max" value="120"/>
-    </module>
-    <module name="JavadocMethod">
-      <property name="allowUndeclaredRTE" value="true"/>
-    </module>
- </module>
-</module>
+      <module name="TreeWalker">
+  
+          <property name="cacheFile" value="${checkstyle.cache.file}"/>
+  
+          <!-- ************************************************************** -->
+          <!-- Checks that are different from the sun coding conventions ones -->
+          <!-- ************************************************************** -->
+          <property name="tabWidth" value="4"/>
+          <module name="LeftCurly">
+            <property name="option" value="eol"/>
+          </module>
+          <module name="RightCurly">
+            <property name="option" value="same"/>
+          </module>
+          <module name="LineLength">
+            <property name="max" value="132"/>
+          </module>
+          <module name="MethodLength">
+            <property name="max" value="175"/>
+          </module>
+          <!-- No Paren pad check
+          <module name="ParenPad"/>
+          -->
+          <module name="ConstantName">
+            <property name="format" value="log|^[a-zA-Z][a-zA-Z0-9_]*$"/>
+          </module>
+          
+          <!-- ************************************************************** -->
+          <!-- Default Sun coding conventions checks                          -->
+          <!-- ************************************************************** -->
+  
+          <!-- Checks for Javadoc comments.                     -->
+          <!-- See http://checkstyle.sf.net/config_javadoc.html -->
+          <module name="JavadocMethod">
+              <property name="scope" value="protected"/>
+              <property name="allowUndeclaredRTE" value="true"/>
+          </module>
+          <module name="JavadocType">
+              <property name="scope" value="protected"/>
+          </module>
+          <module name="JavadocVariable">
+              <property name="scope" value="protected"/>
+          </module>
+  
+  
+          <!-- Checks for Naming Conventions.                  -->
+          <!-- See http://checkstyle.sf.net/config_naming.html -->
+          <module name="LocalFinalVariableName"/>
+          <module name="LocalVariableName"/>
+          <module name="MethodName"/>
+          <module name="PackageName"/>
+          <module name="ParameterName"/>
+          <module name="StaticVariableName"/>
+          <module name="TypeName"/>
+          <module name="MemberName"/>
+  
+          <!-- Checks for imports                              -->
+          <!-- See http://checkstyle.sf.net/config_import.html -->
+          <module name="AvoidStarImport"/>
+          <module name="IllegalImport"/> <!-- defaults to sun.* packages -->
+          <module name="RedundantImport"/>
+          <module name="UnusedImports"/>
+  
+  
+          <!-- Checks for Size Violations.                    -->
+          <!-- See http://checkstyle.sf.net/config_sizes.html -->
+          <module name="ParameterNumber"/>
+  
+  
+          <!-- Checks for whitespace                               -->
+          <!-- See http://checkstyle.sf.net/config_whitespace.html -->
+          <module name="EmptyForIteratorPad"/>
+          <module name="NoWhitespaceAfter"/>
+          <module name="NoWhitespaceBefore"/>
+          <!-- module name="OperatorWrap"/ -->
+          <module name="WhitespaceAfter">
+             <property name="tokens" value="COMMA, SEMI"/>
+          </module>
+          <module name="WhitespaceAround"/>
+  
+  
+          <!-- Modifier Checks                                    -->
+          <!-- See http://checkstyle.sf.net/config_modifiers.html -->
+          <module name="ModifierOrder"/>
+          <!-- module name="RedundantModifier"/ -->
+  
+  
+          <!-- Checks for blocks. You know, those {}'s         -->
+          <!-- See http://checkstyle.sf.net/config_blocks.html -->
+          <module name="AvoidNestedBlocks"/>
+          <module name="EmptyBlock">
+             <property name="option" value="text"/>
+          </module>
+          
+          <module name="NeedBraces"/>
+  
+  
+          <!-- Checks for common coding problems               -->
+          <!-- See http://checkstyle.sf.net/config_coding.html -->
+          <!-- module name="AvoidInlineConditionals"/ -->
+          <module name="DoubleCheckedLocking"/>    <!-- MY FAVOURITE -->
+          <module name="EmptyStatement"/>
+          <module name="EqualsHashCode"/>
+          <!-- module name="HiddenField"/ -->
+          <module name="IllegalInstantiation"/>
+          <module name="InnerAssignment"/>
+          <module name="MagicNumber"/>
+          <module name="MissingSwitchDefault"/>
+          <module name="RedundantThrows"/>
+          <module name="SimplifyBooleanExpression"/>
+          <module name="SimplifyBooleanReturn"/>
+  
+          <!-- Checks for class design                         -->
+          <!-- See http://checkstyle.sf.net/config_design.html -->
+          <!-- module name="DesignForExtension"/ -->
+          <module name="FinalClass"/>
+          <module name="HideUtilityClassConstructor"/>
+          <module name="InterfaceIsType"/>
+          <module name="VisibilityModifier"/>
+  
+  
+          <!-- Miscellaneous other checks.                   -->
+          <!-- See http://checkstyle.sf.net/config_misc.html -->
+          <module name="ArrayTypeStyle"/>
+          <!-- module name="FinalParameters"/ -->
+          <module name="TodoComment"/>
+          <module name="UpperEll"/>
+  
+      </module>
+  
+  </module>

Added: commons/proper/dbutils/trunk/license-header.txt
URL: http://svn.apache.org/viewvc/commons/proper/dbutils/trunk/license-header.txt?rev=1171813&view=auto
==============================================================================
--- commons/proper/dbutils/trunk/license-header.txt (added)
+++ commons/proper/dbutils/trunk/license-header.txt Fri Sep 16 21:49:35 2011
@@ -0,0 +1,16 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */

Propchange: commons/proper/dbutils/trunk/license-header.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: commons/proper/dbutils/trunk/license-header.txt
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: commons/proper/dbutils/trunk/license-header.txt
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: commons/proper/dbutils/trunk/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/dbutils/trunk/pom.xml?rev=1171813&r1=1171812&r2=1171813&view=diff
==============================================================================
--- commons/proper/dbutils/trunk/pom.xml [utf-8] (original)
+++ commons/proper/dbutils/trunk/pom.xml [utf-8] Fri Sep 16 21:49:35 2011
@@ -261,10 +261,11 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-checkstyle-plugin</artifactId>
-        <version>2.1</version>
+        <version>2.7</version>
         <configuration>
           <configLocation>${basedir}/checkstyle.xml</configLocation>
           <enableRulesSummary>false</enableRulesSummary>
+          <headerFile>${basedir}/license-header.txt</headerFile>
         </configuration>
       </plugin>
       <plugin>



Mime
View raw message