db-torque-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From henn...@apache.org
Subject svn commit: r234368 - in /db/torque/branches/svn-reorganisation-branch: common/trunk/checkstyle-license.txt common/trunk/project.properties common/trunk/project.xml common/trunk/turbine-checkstyle.xml runtime/trunk/checkstyle-license.txt
Date Sun, 21 Aug 2005 22:09:07 GMT
Author: henning
Date: Sun Aug 21 15:09:01 2005
New Revision: 234368

URL: http://svn.apache.org/viewcvs?rev=234368&view=rev
Log:
move checkstyle license into common directory
add turbine-specific checkstyle to common (the one included with
maven is buggy)


Added:
    db/torque/branches/svn-reorganisation-branch/common/trunk/checkstyle-license.txt
      - copied unchanged from r234350, db/torque/branches/svn-reorganisation-branch/runtime/trunk/checkstyle-license.txt
    db/torque/branches/svn-reorganisation-branch/common/trunk/turbine-checkstyle.xml   (with
props)
Removed:
    db/torque/branches/svn-reorganisation-branch/runtime/trunk/checkstyle-license.txt
Modified:
    db/torque/branches/svn-reorganisation-branch/common/trunk/project.properties
    db/torque/branches/svn-reorganisation-branch/common/trunk/project.xml

Modified: db/torque/branches/svn-reorganisation-branch/common/trunk/project.properties
URL: http://svn.apache.org/viewcvs/db/torque/branches/svn-reorganisation-branch/common/trunk/project.properties?rev=234368&r1=234367&r2=234368&view=diff
==============================================================================
--- db/torque/branches/svn-reorganisation-branch/common/trunk/project.properties (original)
+++ db/torque/branches/svn-reorganisation-branch/common/trunk/project.properties Sun Aug 21
15:09:01 2005
@@ -49,8 +49,8 @@
 maven.test.ignore.failures=false
 maven.junit.fork=true
 
-maven.checkstyle.format = turbine
-maven.checkstyle.header.file = ${basedir}/checkstyle-license.txt
+maven.checkstyle.header.file = ${basedir}/common/checkstyle-license.txt
+maven.checkstyle.properties = ${basedir}/common/turbine-checkstyle.xml
 
 maven.changes.issue.template = %URL%/issues/id/%ISSUE%
 

Modified: db/torque/branches/svn-reorganisation-branch/common/trunk/project.xml
URL: http://svn.apache.org/viewcvs/db/torque/branches/svn-reorganisation-branch/common/trunk/project.xml?rev=234368&r1=234367&r2=234368&view=diff
==============================================================================
--- db/torque/branches/svn-reorganisation-branch/common/trunk/project.xml (original)
+++ db/torque/branches/svn-reorganisation-branch/common/trunk/project.xml Sun Aug 21 15:09:01
2005
@@ -380,7 +380,7 @@
     <dependency>
       <groupId>maven</groupId>
       <artifactId>maven-xdoc-plugin</artifactId>
-      <version>1.9.1</version>
+      <version>1.9.2</version>
       <type>plugin</type>
     </dependency>
   </dependencies>
@@ -400,7 +400,7 @@
       </excludes>
     </unitTest>
 
-    <resources></resources>
+    <resources/>
   </build>
   <reports>
     <report>maven-jdepend-plugin</report>

Added: db/torque/branches/svn-reorganisation-branch/common/trunk/turbine-checkstyle.xml
URL: http://svn.apache.org/viewcvs/db/torque/branches/svn-reorganisation-branch/common/trunk/turbine-checkstyle.xml?rev=234368&view=auto
==============================================================================
--- db/torque/branches/svn-reorganisation-branch/common/trunk/turbine-checkstyle.xml (added)
+++ db/torque/branches/svn-reorganisation-branch/common/trunk/turbine-checkstyle.xml Sun Aug
21 15:09:01 2005
@@ -0,0 +1,213 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+ * Copyright 2001-2004 The Apache Software Foundation.
+ * 
+ * Licensed 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">
+
+<!--
+
+  Checkstyle configuration that checks the sun coding conventions from:
+
+    - the Java Language Specification at
+      http://java.sun.com/docs/books/jls/second_edition/html/index.html
+
+    - the Sun Code Conventions at http://java.sun.com/docs/codeconv/
+
+    - the Javadoc guidelines at
+      http://java.sun.com/j2se/javadoc/writingdoccomments/index.html
+
+    - the JDK Api documentation http://java.sun.com/j2se/docs/api/index.html
+
+    - some best practices
+
+  Checkstyle is very configurable. Be sure to read the documentation at
+  http://checkstyle.sf.net (or in your downloaded distribution).
+
+  Most Checks are configurable, be sure to consult the documentation.
+
+  To completely disable a check, just comment it out or delete it from the file.
+
+  Finally, it is worth reading the documentation.
+
+-->
+
+<module name="Checker">
+
+    <!-- Checks that a package.html file exists for each package.     -->
+    <!-- See http://checkstyle.sf.net/config_javadoc.html#PackageHtml -->
+    <module name="PackageHtml"/>
+
+    <!-- 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="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="nl"/>
+        </module>
+        <module name="RightCurly">
+          <property name="option" value="alone"/>
+        </module>
+        <module name="LineLength">
+          <property name="ignorePattern" value="@version"/>
+          <property name="max" value="132"/>
+        </module>
+        <module name="MemberName">
+          <property name="format" value="^[a-z]+_*[a-zA-Z0-9]*$"/>
+        </module>
+        <module name="StaticVariableName">
+          <property name="format" value="^[a-z]+_*[a-zA-Z0-9]*$"/>
+        </module>
+        <module name="ConstantName">
+          <property name="format" value="^(([A-Z][A-Z0-9]*(_[A-Z0-9]+)*)|log)$"/>
+        </module>
+        <module name="ParameterName">
+          <property name="format" value="^[a-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="excludeScope" value="private"/>
+        </module>
+        <module name="JavadocType"/>
+        <module name="JavadocVariable"/>
+
+
+        <!-- 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="TypeName"/>
+
+
+        <!-- Checks for Headers                              -->
+        <!-- See http://checkstyle.sf.net/config_header.html -->
+        <module name="Header">
+            <!-- The follow property value demonstrates the ability     -->
+            <!-- to have access to ANT properties. In this case it uses -->
+            <!-- the ${basedir} property to allow Checkstyle to be run  -->
+            <!-- from any directory within a project.                   -->
+            <property name="headerFile" value="${checkstyle.header.file}"/>
+            <property name="ignoreLines" value="1,6"/>
+        </module>
+
+        <!-- Following interprets the header file as regular expressions. -->
+        <!-- <module name="RegexpHeader"/>                                -->
+
+
+        <!-- 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="FileLength"/>
+        <module name="MethodLength"/>
+        <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="ParenPad"/>
+        <module name="TabCharacter"/>
+        <module name="WhitespaceAfter"/>
+        <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"/>
+        
+        <module name="NeedBraces"/>
+
+
+        <!-- Checks for common coding problems               -->
+        <!-- See http://checkstyle.sf.net/config_coding.html -->
+        <module name="DoubleCheckedLocking"/>    <!-- MY FAVOURITE -->
+        <module name="EmptyStatement"/>
+        <module name="EqualsHashCode"/>
+        <module name="FallThrough"/>
+        <module name="HiddenField"/>
+        <module name="IllegalInstantiation"/>
+        <module name="InnerAssignment"/>
+        <module name="MagicNumber"/>
+        <module name="MissingSwitchDefault"/>
+<!--        <module name="OneMethodPrivateField" /> -->
+        <module name="RedundantThrows"/>
+        <module name="SimplifyBooleanExpression"/>
+        <module name="SimplifyBooleanReturn"/>
+
+        <!-- Checks for class design                         -->
+        <!-- See http://checkstyle.sf.net/config_design.html -->
+        <module name="FinalClass"/>
+        <module name="HideUtilityClassConstructor"/>
+        <module name="VisibilityModifier">
+        <module name="MissingSwitchDefault"/>
+          <property name="protectedAllowed" value="true"/>
+        </module>
+
+
+        <!-- Miscellaneous other checks.                   -->
+        <!-- See http://checkstyle.sf.net/config_misc.html -->
+        <module name="ArrayTypeStyle"/>
+<!--         <module name="FinalParameters"/> -->
+        <module name="GenericIllegalRegexp">
+            <property name="format" value="\s+$"/>
+            <property name="message" value="Line has trailing spaces."/>
+        </module>
+        <module name="TodoComment"/>
+        <module name="UpperEll"/>
+
+    </module>
+
+</module>

Propchange: db/torque/branches/svn-reorganisation-branch/common/trunk/turbine-checkstyle.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: db/torque/branches/svn-reorganisation-branch/common/trunk/turbine-checkstyle.xml
------------------------------------------------------------------------------
    svn:keywords = Id Author



---------------------------------------------------------------------
To unsubscribe, e-mail: torque-dev-unsubscribe@db.apache.org
For additional commands, e-mail: torque-dev-help@db.apache.org


Mime
View raw message