Menu
▾
▴
[Equanda-svn-commit] SF.net SVN: equanda:[1187] trunk
|
From: <tri...@us...> - 2009-12-13 19:31:41
|
Revision: 1187
http://equanda.svn.sourceforge.net/equanda/?rev=1187&view=rev
Author: triathlon98
Date: 2009-12-13 19:31:33 +0000 (Sun, 13 Dec 2009)
Log Message:
-----------
EQ-367 upgrade to using checkstyle 5
Modified Paths:
--------------
trunk/equanda-checkstyle/pom.xml
trunk/equanda-checkstyle/src/main/resources/config/equanda-checkstyle.xml
trunk/equanda-maven-plugin/src/main/resources/archetype-resources/config/checkstyle.xml
trunk/equanda-maven-plugin/src/main/resources/archetype-resources/pom.xml
trunk/equanda-util/src/main/java/org/equanda/util/security/SslUtil.java
trunk/pom.xml
Modified: trunk/equanda-checkstyle/pom.xml
===================================================================
--- trunk/equanda-checkstyle/pom.xml 2009-12-13 19:24:19 UTC (rev 1186)
+++ trunk/equanda-checkstyle/pom.xml 2009-12-13 19:31:33 UTC (rev 1187)
@@ -3,7 +3,7 @@
<groupId>org.equanda</groupId>
<artifactId>equanda-checkstyle</artifactId>
<packaging>jar</packaging>
- <version>1.0.0</version>
+ <version>1.0.1</version>
<name>equanda-checkstyle</name>
<description>checkstyle configuration for equanda</description>
@@ -14,4 +14,15 @@
<url>dav:http://maven.progs.be/m2repo</url>
</repository>
</distributionManagement>
+
+ <build>
+ <extensions>
+ <extension>
+ <groupId>org.apache.maven.wagon</groupId>
+ <artifactId>wagon-webdav</artifactId>
+ <version>1.0-beta-2</version>
+ </extension>
+ </extensions>
+ </build>
+
</project>
Modified: trunk/equanda-checkstyle/src/main/resources/config/equanda-checkstyle.xml
===================================================================
--- trunk/equanda-checkstyle/src/main/resources/config/equanda-checkstyle.xml 2009-12-13 19:24:19 UTC (rev 1186)
+++ trunk/equanda-checkstyle/src/main/resources/config/equanda-checkstyle.xml 2009-12-13 19:31:33 UTC (rev 1187)
@@ -10,6 +10,8 @@
<module name="Checker">
+ <property name="charset" value="UTF-8"/>
+
<!-- Checks that a package.html file exists for each package. -->
<!-- See http://checkstyle.sf.net/config_javadoc.html#PackageHtml -->
<!--<module name="PackageHtml"/>-->
@@ -27,11 +29,28 @@
<!-- duplicate code, see http://checkstyle.sourceforge.net/config_duplicates.html -->
<!--<module name="StrictDuplicateCode"/>-->
+ <!-- header, see http://checkstyle.sourceforge.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="config/equanda-header.txt"/>-->
+ <property name="header" value="/**\n * This file is part of the equanda project.\n *\n * The contents of this file are subject to the Mozilla Public License Version 1.1 (the "License");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at http://www.mozilla.org/MPL/\n *\n * Software distributed under the License is distributed on an "AS IS" basis, WITHOUT WARRANTY OF\n * ANY KIND, either express or implied. See the License for the specific language governing rights and\n * limitations under the License.\n *\n * Alternatively, the contents of this file may be used under the terms of\n * either the GNU General Public License Version 2 or later (the "GPL"), or\n * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),\n * in which case the provisions of the GPL or the LGPL are applicable instead\n * of those above. If you wish to allow use of your version of this file only\n * under the terms of either the GPL or the LGPL, and not to allow others to\n * use your version of this file under the terms of the MPL, indicate your\n * decision by deleting the provisions above and replace them with the notice\n * and other provisions required by the GPL or the LGPL. If you do not delete\n * the provisions above, a recipient may use your version of this file under\n * the terms of any one of the MPL, the GPL or the LGPL.\n */"/>
+ </module>
+
+ <module name="FileTabCharacter"/>
+ <module name="RegexpSingleline">
+ <property name="severity" value="info"/>
+ <!-- \s matches whitespace character, $ matches end of line. -->
+ <property name="format" value="\s+$"/>
+ </module>
+
<module name="TreeWalker">
<property name="cacheFile" value="${checkstyle.cache.file}"/>
<property name="tabWidth" value="4"/>
- <property name="charset" value="UTF-8"/>
<!-- Block checks, see http://checkstyle.sourceforge.net/config_blocks.html -->
@@ -76,17 +95,6 @@
</module>
<module name="TypeName"/>
- <!-- header, see http://checkstyle.sourceforge.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="config/equanda-header.txt"/>-->
- <property name="header" value="/**\n * This file is part of the equanda project.\n *\n * The contents of this file are subject to the Mozilla Public License Version 1.1 (the "License");\n * you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at http://www.mozilla.org/MPL/\n *\n * Software distributed under the License is distributed on an "AS IS" basis, WITHOUT WARRANTY OF\n * ANY KIND, either express or implied. See the License for the specific language governing rights and\n * limitations under the License.\n *\n * Alternatively, the contents of this file may be used under the terms of\n * either the GNU General Public License Version 2 or later (the "GPL"), or\n * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),\n * in which case the provisions of the GPL or the LGPL are applicable instead\n * of those above. If you wish to allow use of your version of this file only\n * under the terms of either the GPL or the LGPL, and not to allow others to\n * use your version of this file under the terms of the MPL, indicate your\n * decision by deleting the provisions above and replace them with the notice\n * and other provisions required by the GPL or the LGPL. If you do not delete\n * the provisions above, a recipient may use your version of this file under\n * the terms of any one of the MPL, the GPL or the LGPL.\n */"/>
- </module>
-
<!-- imports, see http://checkstyle.sourceforge.net/config_imports.html -->
<!--<module name="AvoidStarImport"/>-->
@@ -134,7 +142,7 @@
<property name="tokens" value="BNOT, DEC, DOT, INC, LNOT, UNARY_MINUS, UNARY_PLUS, GENERIC_START"/>
</module>
<module name="NoWhitespaceBefore">
- <property name="severity" value="info"/>
+ <!--<property name="severity" value="info"/>-->
<!-- Default tokens and additional GENERIC_START and GENERIC_END -->
<property name="tokens" value="POST_DEC, POST_INC, GENERIC_START, GENERIC_END"/>
</module>
@@ -143,23 +151,19 @@
<property name="option" value="space"/>
</module>
<module name="TypecastParenPad"/>
- <module name="TabCharacter"/>
<module name="WhitespaceAfter">
<property name="severity" value="info"/>
- <!-- Default tokens and additional GENERIC_END -->
- <property name="tokens" value="COMMA, SEMI, TYPECAST, GENERIC_END"/>
+ <!-- Default tokens and additional GENERIC_END, RCURLY -->
+ <property name="tokens" value="COMMA, SEMI, TYPECAST, GENERIC_END, RCURLY"/>
</module>
<module name="WhitespaceAround">
- <property name="severity" value="info"/>
- <!-- Default tokens without GENERIC_START and GENERIC_END -->
+ <!--<property name="severity" value="info"/>-->
+ <!-- Default tokens without GENERIC_START, GENERIC_END, LCURLY, RCURLY, SLIST -->
<property name="tokens"
- value="ASSIGN, BAND, BAND_ASSIGN, BOR, BOR_ASSIGN, BSR, BSR_ASSIGN, BXOR, BXOR_ASSIGN, COLON, DIV, DIV_ASSIGN, EQUAL, GE, GT, LAND, LCURLY, LE, LITERAL_ASSERT, LITERAL_CATCH, LITERAL_DO, LITERAL_ELSE, LITERAL_FINALLY, LITERAL_FOR, LITERAL_IF, LITERAL_RETURN, LITERAL_SYNCHRONIZED, LITERAL_TRY, LITERAL_WHILE, LOR, LT, MINUS, MINUS_ASSIGN, MOD, MOD_ASSIGN, NOT_EQUAL, PLUS, PLUS_ASSIGN, QUESTION, RCURLY, SL, SLIST, SL_ASSIGN, SR, SR_ASSIGN, STAR, STAR_ASSIGN, TYPE_EXTENSION_AND, WILDCARD_TYPE"/>
+ value="ASSIGN, BAND, BAND_ASSIGN, BOR, BOR_ASSIGN, BSR, BSR_ASSIGN, BXOR, BXOR_ASSIGN, COLON, DIV, DIV_ASSIGN, EQUAL, GE, GT, LAND, LE, LITERAL_ASSERT, LITERAL_CATCH, LITERAL_DO, LITERAL_ELSE, LITERAL_FINALLY, LITERAL_FOR, LITERAL_IF, LITERAL_RETURN, LITERAL_SYNCHRONIZED, LITERAL_TRY, LITERAL_WHILE, LOR, LT, MINUS, MINUS_ASSIGN, MOD, MOD_ASSIGN, NOT_EQUAL, PLUS, PLUS_ASSIGN, QUESTION, SL, SL_ASSIGN, SR, SR_ASSIGN, STAR, STAR_ASSIGN, TYPE_EXTENSION_AND, WILDCARD_TYPE"/>
<property name="allowEmptyConstructors" value="true"/>
<property name="allowEmptyMethods" value="true"/>
</module>
- <module name="TabCharacter">
- <property name="severity" value="info"/>
- </module>
<!-- modifiers, see http://checkstyle.sourceforge.net/config_modifier.html -->
@@ -245,11 +249,6 @@
<!-- misc, see http://checkstyle.sourceforge.net/config_misc.html -->
- <module name="GenericIllegalRegexp">
- <property name="severity" value="info"/>
- <property name="format" value="\s+$"/>
- <property name="message" value="Line has trailing spaces."/>
- </module>
<!--<module name="TodoComment"/>-->
<!--<module name="UncommentedMain"/>-->
<module name="UpperEll"/>
Modified: trunk/equanda-maven-plugin/src/main/resources/archetype-resources/config/checkstyle.xml
===================================================================
--- trunk/equanda-maven-plugin/src/main/resources/archetype-resources/config/checkstyle.xml 2009-12-13 19:24:19 UTC (rev 1186)
+++ trunk/equanda-maven-plugin/src/main/resources/archetype-resources/config/checkstyle.xml 2009-12-13 19:31:33 UTC (rev 1187)
@@ -10,6 +10,8 @@
<module name="Checker">
+ <property name="charset" value="UTF-8"/>
+
<!-- Checks that a package.html file exists for each package. -->
<!-- See http://checkstyle.sf.net/config_javadoc.html#PackageHtml -->
<!--<module name="PackageHtml"/>-->
@@ -27,11 +29,27 @@
<!-- duplicate code, see http://checkstyle.sourceforge.net/config_duplicates.html -->
<!--<module name="StrictDuplicateCode"/>-->
+ <!-- header, see http://checkstyle.sourceforge.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="config/header.txt"/>
+ </module>
+
+ <module name="FileTabCharacter"/>
+ <module name="RegexpSingleline">
+ <property name="severity" value="info"/>
+ <!-- \s matches whitespace character, $ matches end of line. -->
+ <property name="format" value="\s+$"/>
+ </module>
+
<module name="TreeWalker">
<property name="cacheFile" value="${checkstyle.cache.file}"/>
<property name="tabWidth" value="4"/>
- <property name="charset" value="UTF-8"/>
<!-- Block checks, see http://checkstyle.sourceforge.net/config_blocks.html -->
@@ -76,16 +94,6 @@
</module>
<module name="TypeName"/>
- <!-- header, see http://checkstyle.sourceforge.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="config/header.txt"/>
- </module>
-
<!-- imports, see http://checkstyle.sourceforge.net/config_imports.html -->
<!--<module name="AvoidStarImport"/>-->
@@ -133,7 +141,7 @@
<property name="tokens" value="BNOT, DEC, DOT, INC, LNOT, UNARY_MINUS, UNARY_PLUS, GENERIC_START"/>
</module>
<module name="NoWhitespaceBefore">
- <property name="severity" value="info"/>
+ <!--<property name="severity" value="info"/>-->
<!-- Default tokens and additional GENERIC_START and GENERIC_END -->
<property name="tokens" value="POST_DEC, POST_INC, GENERIC_START, GENERIC_END"/>
</module>
@@ -142,23 +150,19 @@
<property name="option" value="space"/>
</module>
<module name="TypecastParenPad"/>
- <module name="TabCharacter"/>
<module name="WhitespaceAfter">
<property name="severity" value="info"/>
- <!-- Default tokens and additional GENERIC_END -->
- <property name="tokens" value="COMMA, SEMI, TYPECAST, GENERIC_END"/>
+ <!-- Default tokens and additional GENERIC_END, RCURLY -->
+ <property name="tokens" value="COMMA, SEMI, TYPECAST, GENERIC_END, RCURLY"/>
</module>
<module name="WhitespaceAround">
- <property name="severity" value="info"/>
- <!-- Default tokens without GENERIC_START and GENERIC_END -->
+ <!--<property name="severity" value="info"/>-->
+ <!-- Default tokens without GENERIC_START, GENERIC_END, LCURLY, RCURLY, SLIST -->
<property name="tokens"
- value="ASSIGN, BAND, BAND_ASSIGN, BOR, BOR_ASSIGN, BSR, BSR_ASSIGN, BXOR, BXOR_ASSIGN, COLON, DIV, DIV_ASSIGN, EQUAL, GE, GT, LAND, LCURLY, LE, LITERAL_ASSERT, LITERAL_CATCH, LITERAL_DO, LITERAL_ELSE, LITERAL_FINALLY, LITERAL_FOR, LITERAL_IF, LITERAL_RETURN, LITERAL_SYNCHRONIZED, LITERAL_TRY, LITERAL_WHILE, LOR, LT, MINUS, MINUS_ASSIGN, MOD, MOD_ASSIGN, NOT_EQUAL, PLUS, PLUS_ASSIGN, QUESTION, RCURLY, SL, SLIST, SL_ASSIGN, SR, SR_ASSIGN, STAR, STAR_ASSIGN, TYPE_EXTENSION_AND, WILDCARD_TYPE"/>
+ value="ASSIGN, BAND, BAND_ASSIGN, BOR, BOR_ASSIGN, BSR, BSR_ASSIGN, BXOR, BXOR_ASSIGN, COLON, DIV, DIV_ASSIGN, EQUAL, GE, GT, LAND, LE, LITERAL_ASSERT, LITERAL_CATCH, LITERAL_DO, LITERAL_ELSE, LITERAL_FINALLY, LITERAL_FOR, LITERAL_IF, LITERAL_RETURN, LITERAL_SYNCHRONIZED, LITERAL_TRY, LITERAL_WHILE, LOR, LT, MINUS, MINUS_ASSIGN, MOD, MOD_ASSIGN, NOT_EQUAL, PLUS, PLUS_ASSIGN, QUESTION, SL, SL_ASSIGN, SR, SR_ASSIGN, STAR, STAR_ASSIGN, TYPE_EXTENSION_AND, WILDCARD_TYPE"/>
<property name="allowEmptyConstructors" value="true"/>
<property name="allowEmptyMethods" value="true"/>
</module>
- <module name="TabCharacter">
- <property name="severity" value="info"/>
- </module>
<!-- modifiers, see http://checkstyle.sourceforge.net/config_modifier.html -->
@@ -244,11 +248,6 @@
<!-- misc, see http://checkstyle.sourceforge.net/config_misc.html -->
- <module name="GenericIllegalRegexp">
- <property name="severity" value="info"/>
- <property name="format" value="\s+$"/>
- <property name="message" value="Line has trailing spaces."/>
- </module>
<!--<module name="TodoComment"/>-->
<!--<module name="UncommentedMain"/>-->
<module name="UpperEll"/>
Modified: trunk/equanda-maven-plugin/src/main/resources/archetype-resources/pom.xml
===================================================================
--- trunk/equanda-maven-plugin/src/main/resources/archetype-resources/pom.xml 2009-12-13 19:24:19 UTC (rev 1186)
+++ trunk/equanda-maven-plugin/src/main/resources/archetype-resources/pom.xml 2009-12-13 19:31:33 UTC (rev 1187)
@@ -87,6 +87,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
+ <version>2.4</version>
<configuration>
<configLocation>config/checkstyle.xml</configLocation>
</configuration>
@@ -480,7 +481,7 @@
<equanda-version>0.9.4</equanda-version>
<staticwiki-version>0.9</staticwiki-version>
<tapestry-version>5.1.0.3</tapestry-version>
- <chenillekit-version>1.0.0</chenillekit-version>
+ <chenillekit-version>1.0.0</chenillekit-version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
Modified: trunk/equanda-util/src/main/java/org/equanda/util/security/SslUtil.java
===================================================================
--- trunk/equanda-util/src/main/java/org/equanda/util/security/SslUtil.java 2009-12-13 19:24:19 UTC (rev 1186)
+++ trunk/equanda-util/src/main/java/org/equanda/util/security/SslUtil.java 2009-12-13 19:31:33 UTC (rev 1187)
@@ -40,8 +40,8 @@
public static final TrustManager[] TRUST_MANAGERS = new TrustManager[]{ new TrustAllX509TrustManager() };
private SslUtil() {}
-
- /** Set the default Hostname Verifier to an instance of a fake class that trust all hostnames. */
+
+ /** Set the default hostname verifier to an instance of a fake class that trusts all hostnames. */
public static void trustAllHostnames()
{
HttpsURLConnection.setDefaultHostnameVerifier( HOSTNAME_VERIFIER );
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2009-12-13 19:24:19 UTC (rev 1186)
+++ trunk/pom.xml 2009-12-13 19:31:33 UTC (rev 1187)
@@ -123,7 +123,7 @@
<extension>
<groupId>org.equanda</groupId>
<artifactId>equanda-checkstyle</artifactId>
- <version>1.0.0</version>
+ <version>1.0.1</version>
</extension>
</extensions>
<plugins>
@@ -152,6 +152,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
+ <version>2.4</version>
<configuration>
<configLocation>config/equanda-checkstyle.xml</configLocation>
</configuration>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
