Author: hadrian Date: Fri Apr 29 18:34:55 2011 New Revision: 1097908 URL: http://svn.apache.org/viewvc?rev=1097908&view=rev Log: CAMEL-3918. Checkstyle update patch applied with thanks to Dan Kulp
Modified: camel/trunk/buildingtools/camel-eclipse-checkstyle camel/trunk/buildingtools/src/main/resources/camel-checkstyle.xml camel/trunk/buildingtools/src/main/resources/camel-eclipse-checkstyle camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/WriteXmlDeclarationInterceptor.java camel/trunk/components/camel-ejb/src/test/java/org/apache/camel/component/ejb/GreaterImpl.java camel/trunk/components/camel-ejb/src/test/java/org/apache/camel/component/ejb/GreaterLocal.java camel/trunk/components/camel-protobuf/src/test/java/org/apache/camel/dataformat/protobuf/generated/AddressBookProtos.java camel/trunk/components/camel-spring/src/test/java/org/apache/camel/component/xslt/MyXPath.java camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/processor/scattergather/LowestQuoteAggregationStrategy.java camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/processor/scattergather/MyVendor.java camel/trunk/examples/camel-example-loan-broker/src/main/java/org/apache/camel/loanbroker/queue/version/Translator.java camel/trunk/examples/camel-example-loan-broker/src/main/java/org/apache/camel/loanbroker/webservice/version/Client.java camel/trunk/examples/camel-example-loan-broker/src/main/java/org/apache/camel/loanbroker/webservice/version/bank/BankWS.java camel/trunk/examples/camel-example-loan-broker/src/main/java/org/apache/camel/loanbroker/webservice/version/credit/CreditAgencyWS.java camel/trunk/examples/camel-example-pojo-messaging/src/main/java/org/apache/camel/example/pojo_messaging/DistributeRecordsBean.java camel/trunk/examples/camel-example-pojo-messaging/src/main/java/org/apache/camel/example/pojo_messaging/SendFileRecordsToQueueBean.java camel/trunk/examples/camel-example-spring-javaconfig/src/main/java/org/apache/camel/example/spring/javaconfig/MyRouteConfig.java camel/trunk/parent/pom.xml camel/trunk/pom.xml Modified: camel/trunk/buildingtools/camel-eclipse-checkstyle URL: http://svn.apache.org/viewvc/camel/trunk/buildingtools/camel-eclipse-checkstyle?rev=1097908&r1=1097907&r2=1097908&view=diff ============================================================================== --- camel/trunk/buildingtools/camel-eclipse-checkstyle (original) +++ camel/trunk/buildingtools/camel-eclipse-checkstyle Fri Apr 29 18:34:55 2011 @@ -24,4 +24,7 @@ <file-match-pattern match-pattern="^src[/\\]test[/\\]generated[/\\]." include-pattern="false"/> <file-match-pattern match-pattern="^src[/\\]main[/\\]resources[/\\]archetype-resources[/\\]." include-pattern="false"/> </fileset> + <filter name="FileTypesFilter" enabled="true"> + <filter-data value="java"/> + </filter> </fileset-config> Modified: camel/trunk/buildingtools/src/main/resources/camel-checkstyle.xml URL: http://svn.apache.org/viewvc/camel/trunk/buildingtools/src/main/resources/camel-checkstyle.xml?rev=1097908&r1=1097907&r2=1097908&view=diff ============================================================================== --- camel/trunk/buildingtools/src/main/resources/camel-checkstyle.xml (original) +++ camel/trunk/buildingtools/src/main/resources/camel-checkstyle.xml Fri Apr 29 18:34:55 2011 @@ -22,7 +22,7 @@ "http://www.puppycrawl.com/dtds/configuration_1_2.dtd"> <!-- -Checks to make sure the code meets the ActiveMQ coding guidelines which +Checks to make sure the code meets the Camel coding guidelines which It also enforces a bunch of other "BestPractices like method lengths, if/try depths, etc... @@ -69,6 +69,8 @@ lengths, if/try depths, etc... --> <module name="TreeWalker"> + <!-- Enable FileContentsHolder to allow us to in turn turn on suppression comments --> + <module name="FileContentsHolder" /> <!-- Checks for Javadoc comments. --> <!-- See http://checkstyle.sf.net/config_javadoc.html --> @@ -100,6 +102,7 @@ lengths, if/try depths, etc... <!-- See http://checkstyle.sf.net/config_import.html --> <module name="AvoidStarImport"> <property name="excludes" value="java.io,java.util,java.net,java.nio,java.nio.channels,java.lang.reflect,org.w3c.dom,org.xml.sax,java.awt,javax.swing,junit.framework"/> + <property name="allowStaticMemberImports" value="true"/> </module> <!-- <module name="ConstantName"/> Modified: camel/trunk/buildingtools/src/main/resources/camel-eclipse-checkstyle URL: http://svn.apache.org/viewvc/camel/trunk/buildingtools/src/main/resources/camel-eclipse-checkstyle?rev=1097908&r1=1097907&r2=1097908&view=diff ============================================================================== --- camel/trunk/buildingtools/src/main/resources/camel-eclipse-checkstyle (original) +++ camel/trunk/buildingtools/src/main/resources/camel-eclipse-checkstyle Fri Apr 29 18:34:55 2011 @@ -24,4 +24,7 @@ <file-match-pattern match-pattern="^src[/\\]test[/\\]generated[/\\]." include-pattern="false"/> <file-match-pattern match-pattern="^src[/\\]main[/\\]resources[/\\]archetype-resources[/\\]." include-pattern="false"/> </fileset> + <filter name="FileTypesFilter" enabled="true"> + <filter-data value="java"/> + </filter> </fileset-config> Modified: camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/WriteXmlDeclarationInterceptor.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/WriteXmlDeclarationInterceptor.java?rev=1097908&r1=1097907&r2=1097908&view=diff ============================================================================== --- camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/WriteXmlDeclarationInterceptor.java (original) +++ camel/trunk/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/WriteXmlDeclarationInterceptor.java Fri Apr 29 18:34:55 2011 @@ -34,4 +34,4 @@ public class WriteXmlDeclarationIntercep } } -//END SNIPPET: example \ No newline at end of file +//END SNIPPET: example Modified: camel/trunk/components/camel-ejb/src/test/java/org/apache/camel/component/ejb/GreaterImpl.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ejb/src/test/java/org/apache/camel/component/ejb/GreaterImpl.java?rev=1097908&r1=1097907&r2=1097908&view=diff ============================================================================== --- camel/trunk/components/camel-ejb/src/test/java/org/apache/camel/component/ejb/GreaterImpl.java (original) +++ camel/trunk/components/camel-ejb/src/test/java/org/apache/camel/component/ejb/GreaterImpl.java Fri Apr 29 18:34:55 2011 @@ -34,4 +34,4 @@ public class GreaterImpl implements Grea } } -// END SNIPPET: e1 \ No newline at end of file +// END SNIPPET: e1 Modified: camel/trunk/components/camel-ejb/src/test/java/org/apache/camel/component/ejb/GreaterLocal.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-ejb/src/test/java/org/apache/camel/component/ejb/GreaterLocal.java?rev=1097908&r1=1097907&r2=1097908&view=diff ============================================================================== --- camel/trunk/components/camel-ejb/src/test/java/org/apache/camel/component/ejb/GreaterLocal.java (original) +++ camel/trunk/components/camel-ejb/src/test/java/org/apache/camel/component/ejb/GreaterLocal.java Fri Apr 29 18:34:55 2011 @@ -27,4 +27,4 @@ public interface GreaterLocal { String bye(String name); } -// END SNIPPET: e1 \ No newline at end of file +// END SNIPPET: e1 Modified: camel/trunk/components/camel-protobuf/src/test/java/org/apache/camel/dataformat/protobuf/generated/AddressBookProtos.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-protobuf/src/test/java/org/apache/camel/dataformat/protobuf/generated/AddressBookProtos.java?rev=1097908&r1=1097907&r2=1097908&view=diff ============================================================================== --- camel/trunk/components/camel-protobuf/src/test/java/org/apache/camel/dataformat/protobuf/generated/AddressBookProtos.java (original) +++ camel/trunk/components/camel-protobuf/src/test/java/org/apache/camel/dataformat/protobuf/generated/AddressBookProtos.java Fri Apr 29 18:34:55 2011 @@ -1,8 +1,25 @@ +/** + * 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. + */ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: addressbook.proto package org.apache.camel.dataformat.protobuf.generated; +//CHECKSTYLE:OFF public final class AddressBookProtos { private AddressBookProtos() {} public static void registerAllExtensions( Modified: camel/trunk/components/camel-spring/src/test/java/org/apache/camel/component/xslt/MyXPath.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/component/xslt/MyXPath.java?rev=1097908&r1=1097907&r2=1097908&view=diff ============================================================================== --- camel/trunk/components/camel-spring/src/test/java/org/apache/camel/component/xslt/MyXPath.java (original) +++ camel/trunk/components/camel-spring/src/test/java/org/apache/camel/component/xslt/MyXPath.java Fri Apr 29 18:34:55 2011 @@ -41,4 +41,4 @@ public @interface MyXPath { Class<?> resultType() default NodeList.class; } -//END SNIPPET: example \ No newline at end of file +//END SNIPPET: example Modified: camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/processor/scattergather/LowestQuoteAggregationStrategy.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/processor/scattergather/LowestQuoteAggregationStrategy.java?rev=1097908&r1=1097907&r2=1097908&view=diff ============================================================================== --- camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/processor/scattergather/LowestQuoteAggregationStrategy.java (original) +++ camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/processor/scattergather/LowestQuoteAggregationStrategy.java Fri Apr 29 18:34:55 2011 @@ -34,4 +34,4 @@ public class LowestQuoteAggregationStrat } } } -// END SNIPPET: e1 \ No newline at end of file +// END SNIPPET: e1 Modified: camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/processor/scattergather/MyVendor.java URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/processor/scattergather/MyVendor.java?rev=1097908&r1=1097907&r2=1097908&view=diff ============================================================================== --- camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/processor/scattergather/MyVendor.java (original) +++ camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/processor/scattergather/MyVendor.java Fri Apr 29 18:34:55 2011 @@ -41,4 +41,4 @@ public class MyVendor { } } } -//END SNIPPET: e1 \ No newline at end of file +//END SNIPPET: e1 Modified: camel/trunk/examples/camel-example-loan-broker/src/main/java/org/apache/camel/loanbroker/queue/version/Translator.java URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-loan-broker/src/main/java/org/apache/camel/loanbroker/queue/version/Translator.java?rev=1097908&r1=1097907&r2=1097908&view=diff ============================================================================== --- camel/trunk/examples/camel-example-loan-broker/src/main/java/org/apache/camel/loanbroker/queue/version/Translator.java (original) +++ camel/trunk/examples/camel-example-loan-broker/src/main/java/org/apache/camel/loanbroker/queue/version/Translator.java Fri Apr 29 18:34:55 2011 @@ -31,4 +31,5 @@ public class Translator implements Proce } } -//END SNIPPET: translator \ No newline at end of file +//END SNIPPET: translator + Modified: camel/trunk/examples/camel-example-loan-broker/src/main/java/org/apache/camel/loanbroker/webservice/version/Client.java URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-loan-broker/src/main/java/org/apache/camel/loanbroker/webservice/version/Client.java?rev=1097908&r1=1097907&r2=1097908&view=diff ============================================================================== --- camel/trunk/examples/camel-example-loan-broker/src/main/java/org/apache/camel/loanbroker/webservice/version/Client.java (original) +++ camel/trunk/examples/camel-example-loan-broker/src/main/java/org/apache/camel/loanbroker/webservice/version/Client.java Fri Apr 29 18:34:55 2011 @@ -58,4 +58,5 @@ public class Client { } } -//END SNIPPET: client \ No newline at end of file +//END SNIPPET: client + Modified: camel/trunk/examples/camel-example-loan-broker/src/main/java/org/apache/camel/loanbroker/webservice/version/bank/BankWS.java URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-loan-broker/src/main/java/org/apache/camel/loanbroker/webservice/version/bank/BankWS.java?rev=1097908&r1=1097907&r2=1097908&view=diff ============================================================================== --- camel/trunk/examples/camel-example-loan-broker/src/main/java/org/apache/camel/loanbroker/webservice/version/bank/BankWS.java (original) +++ camel/trunk/examples/camel-example-loan-broker/src/main/java/org/apache/camel/loanbroker/webservice/version/bank/BankWS.java Fri Apr 29 18:34:55 2011 @@ -29,4 +29,5 @@ public interface BankWS { BankQuote getQuote(String ssn, double loanAmount, int loanDuration, int creditHistory, int creditScore); } -//END SNIPPET: bank \ No newline at end of file +//END SNIPPET: bank + Modified: camel/trunk/examples/camel-example-loan-broker/src/main/java/org/apache/camel/loanbroker/webservice/version/credit/CreditAgencyWS.java URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-loan-broker/src/main/java/org/apache/camel/loanbroker/webservice/version/credit/CreditAgencyWS.java?rev=1097908&r1=1097907&r2=1097908&view=diff ============================================================================== --- camel/trunk/examples/camel-example-loan-broker/src/main/java/org/apache/camel/loanbroker/webservice/version/credit/CreditAgencyWS.java (original) +++ camel/trunk/examples/camel-example-loan-broker/src/main/java/org/apache/camel/loanbroker/webservice/version/credit/CreditAgencyWS.java Fri Apr 29 18:34:55 2011 @@ -27,4 +27,5 @@ public interface CreditAgencyWS { int getCreditHistoryLength(String ssn); } -//END SNIPPET: creditAgency \ No newline at end of file +//END SNIPPET: creditAgency + Modified: camel/trunk/examples/camel-example-pojo-messaging/src/main/java/org/apache/camel/example/pojo_messaging/DistributeRecordsBean.java URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-pojo-messaging/src/main/java/org/apache/camel/example/pojo_messaging/DistributeRecordsBean.java?rev=1097908&r1=1097907&r2=1097908&view=diff ============================================================================== --- camel/trunk/examples/camel-example-pojo-messaging/src/main/java/org/apache/camel/example/pojo_messaging/DistributeRecordsBean.java (original) +++ camel/trunk/examples/camel-example-pojo-messaging/src/main/java/org/apache/camel/example/pojo_messaging/DistributeRecordsBean.java Fri Apr 29 18:34:55 2011 @@ -34,4 +34,5 @@ public class DistributeRecordsBean { } } } -//END SNIPPET: ex \ No newline at end of file +//END SNIPPET: ex + Modified: camel/trunk/examples/camel-example-pojo-messaging/src/main/java/org/apache/camel/example/pojo_messaging/SendFileRecordsToQueueBean.java URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-pojo-messaging/src/main/java/org/apache/camel/example/pojo_messaging/SendFileRecordsToQueueBean.java?rev=1097908&r1=1097907&r2=1097908&view=diff ============================================================================== --- camel/trunk/examples/camel-example-pojo-messaging/src/main/java/org/apache/camel/example/pojo_messaging/SendFileRecordsToQueueBean.java (original) +++ camel/trunk/examples/camel-example-pojo-messaging/src/main/java/org/apache/camel/example/pojo_messaging/SendFileRecordsToQueueBean.java Fri Apr 29 18:34:55 2011 @@ -30,4 +30,5 @@ public class SendFileRecordsToQueueBean producer.sendBody(body); } } -//END SNIPPET: ex \ No newline at end of file +//END SNIPPET: ex + Modified: camel/trunk/examples/camel-example-spring-javaconfig/src/main/java/org/apache/camel/example/spring/javaconfig/MyRouteConfig.java URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-spring-javaconfig/src/main/java/org/apache/camel/example/spring/javaconfig/MyRouteConfig.java?rev=1097908&r1=1097907&r2=1097908&view=diff ============================================================================== --- camel/trunk/examples/camel-example-spring-javaconfig/src/main/java/org/apache/camel/example/spring/javaconfig/MyRouteConfig.java (original) +++ camel/trunk/examples/camel-example-spring-javaconfig/src/main/java/org/apache/camel/example/spring/javaconfig/MyRouteConfig.java Fri Apr 29 18:34:55 2011 @@ -116,4 +116,5 @@ public class MyRouteConfig extends Singl // just to make SpringDM happy do nothing here } } -//END SNIPPET: RouteConfig \ No newline at end of file +//END SNIPPET: RouteConfig + Modified: camel/trunk/parent/pom.xml URL: http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=1097908&r1=1097907&r2=1097908&view=diff ============================================================================== --- camel/trunk/parent/pom.xml (original) +++ camel/trunk/parent/pom.xml Fri Apr 29 18:34:55 2011 @@ -1509,11 +1509,11 @@ <configuration> <buildcommands> <java.lang.String>org.eclipse.jdt.core.javabuilder</java.lang.String> - <java.lang.String>com.atlassw.tools.eclipse.checkstyle.CheckstyleBuilder</java.lang.String> + <java.lang.String>net.sf.eclipsecs.core.CheckstyleBuilder</java.lang.String> </buildcommands> <projectnatures> <nature>org.eclipse.jdt.core.javanature</nature> - <nature>com.atlassw.tools.eclipse.checkstyle.CheckstyleNature</nature> + <nature>net.sf.eclipsecs.core.CheckstyleNature</nature> </projectnatures> <additionalConfig> <file> @@ -1529,6 +1529,17 @@ <artifactId>maven-checkstyle-plugin</artifactId> <dependencies> <dependency> + <groupId>com.puppycrawl.tools</groupId> + <artifactId>checkstyle</artifactId> + <version>5.3</version> + <exclusions> + <exclusion> + <groupId>com.sun</groupId> + <artifactId>tools</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-buildtools</artifactId> <version>${project.version}</version> @@ -1544,6 +1555,7 @@ <failsOnError>true</failsOnError> <linkXRef>false</linkXRef> <suppressionsLocation>camel-checkstyle-suppressions.xml</suppressionsLocation> + <encoding>UTF-8</encoding> <sourceDirectory>${basedir}/src</sourceDirectory> <excludes>**/archetype-resources/**/*.java</excludes> </configuration> Modified: camel/trunk/pom.xml URL: http://svn.apache.org/viewvc/camel/trunk/pom.xml?rev=1097908&r1=1097907&r2=1097908&view=diff ============================================================================== --- camel/trunk/pom.xml (original) +++ camel/trunk/pom.xml Fri Apr 29 18:34:55 2011 @@ -652,23 +652,23 @@ <whichresource resource="/camel-checkstyle.xml" property="checkstyle.url" /> <mkdir dir="${full.eclipse.workspace}/.metadata/.plugins/org.eclipse.core.runtime/.settings" /> - <mkdir dir="${full.eclipse.workspace}/.metadata/.plugins/com.atlassw.tools.eclipse.checkstyle" /> + <mkdir dir="${full.eclipse.workspace}/.metadata/.plugins/net.sf.eclipsecs.core" /> <mkdir dir="${full.eclipse.workspace}/.metadata/.plugins/net.sourceforge.pmd.eclipse" /> <get src="${checkstyle.url}" dest="${full.eclipse.workspace}/camel-checkstyle.xml" /> <!-- Add checkstyle config --> - <copy file="${basedir}/etc/eclipse/template.checkstyle-config.xml" tofile="${full.eclipse.workspace}/.metadata/.plugins/com.atlassw.tools.eclipse.checkstyle/checkstyle-config.xml" overwrite="no"> + <copy file="${basedir}/etc/eclipse/template.checkstyle-config.xml" tofile="${full.eclipse.workspace}/.metadata/.plugins/net.sf.eclipsecs.core/checkstyle-config.xml" overwrite="no"> <filterset> <filter token="CHECKSTYLE_CONFIG_FILE" value="${full.eclipse.workspace}/camel-checkstyle.xml" /> <filter token="APACHE_HEADER_FILE" value="${full.eclipse.workspace}/apache-header.txt" /> </filterset> </copy> - <xslt style="${basedir}/etc/eclipse/addcheckstyle.xsl" in="${full.eclipse.workspace}/.metadata/.plugins/com.atlassw.tools.eclipse.checkstyle/checkstyle-config.xml" out="${full.eclipse.workspace}/.metadata/.plugins/com.atlassw.tools.eclipse.checkstyle/checkstyle-config.xml.new"> + <xslt style="${basedir}/etc/eclipse/addcheckstyle.xsl" in="${full.eclipse.workspace}/.metadata/.plugins/net.sf.eclipsecs.core/checkstyle-config.xml" out="${full.eclipse.workspace}/.metadata/.plugins/net.sf.eclipsecs.core/checkstyle-config.xml.new"> <param name="checkstyleconfig" expression="${full.eclipse.workspace}/camel-checkstyle.xml" /> </xslt> - <copy file="${full.eclipse.workspace}/.metadata/.plugins/com.atlassw.tools.eclipse.checkstyle/checkstyle-config.xml.new" tofile="${full.eclipse.workspace}/.metadata/.plugins/com.atlassw.tools.eclipse.checkstyle/checkstyle-config.xml" overwrite="yes" /> + <copy file="${full.eclipse.workspace}/.metadata/.plugins/net.sf.eclipsecs.core/checkstyle-config.xml.new" tofile="${full.eclipse.workspace}/.metadata/.plugins/net.sf.eclipsecs.core/checkstyle-config.xml" overwrite="yes" /> <!-- Add warning flags that we want --> <propertyfile file="${full.eclipse.workspace}/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.core.prefs">