Author: dkulp Date: Tue Dec 18 21:18:52 2012 New Revision: 1423658 URL: http://svn.apache.org/viewvc?rev=1423658&view=rev Log: Merged revisions 1423648 via git cherry-pick from https://svn.apache.org/repos/asf/camel/branches/camel-2.10.x
........ r1423648 | dkulp | 2012-12-18 16:12:06 -0500 (Tue, 18 Dec 2012) | 10 lines Merged revisions 1423619 via git cherry-pick from https://svn.apache.org/repos/asf/camel/trunk ........ r1423619 | dkulp | 2012-12-18 15:26:18 -0500 (Tue, 18 Dec 2012) | 2 lines Latest eclipse checkstyle plugin requires the .checkstyle file to be the latest format. ........ ........ Modified: camel/branches/camel-2.9.x/buildingtools/camel-eclipse-checkstyle camel/branches/camel-2.9.x/buildingtools/src/main/resources/camel-eclipse-checkstyle Modified: camel/branches/camel-2.9.x/buildingtools/camel-eclipse-checkstyle URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/buildingtools/camel-eclipse-checkstyle?rev=1423658&r1=1423657&r2=1423658&view=diff ============================================================================== --- camel/branches/camel-2.9.x/buildingtools/camel-eclipse-checkstyle (original) +++ camel/branches/camel-2.9.x/buildingtools/camel-eclipse-checkstyle Tue Dec 18 21:18:52 2012 @@ -17,14 +17,11 @@ specific language governing permissions and limitations under the License. --> -<fileset-config file-format-version="1.1.0" simple-config="false"> - <fileset name="all" enabled="true" check-config-name="Camel Checks" type="external" description=""> - <file-match-pattern match-pattern="^src[/\\]." include-pattern="true"/> +<fileset-config file-format-version="1.2.0" simple-config="false" sync-formatter="false"> + <fileset name="all" enabled="true" check-config-name="Camel Checks" local="false"> + <file-match-pattern match-pattern="^src[/\\].*java$" include-pattern="true"/> <file-match-pattern match-pattern="^src[/\\]main[/\\]generated[/\\]." include-pattern="false"/> <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/branches/camel-2.9.x/buildingtools/src/main/resources/camel-eclipse-checkstyle URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/buildingtools/src/main/resources/camel-eclipse-checkstyle?rev=1423658&r1=1423657&r2=1423658&view=diff ============================================================================== --- camel/branches/camel-2.9.x/buildingtools/src/main/resources/camel-eclipse-checkstyle (original) +++ camel/branches/camel-2.9.x/buildingtools/src/main/resources/camel-eclipse-checkstyle Tue Dec 18 21:18:52 2012 @@ -17,14 +17,11 @@ specific language governing permissions and limitations under the License. --> -<fileset-config file-format-version="1.1.0" simple-config="false"> - <fileset name="all" enabled="true" check-config-name="Camel Checks" type="external" description=""> - <file-match-pattern match-pattern="^src[/\\]." include-pattern="true"/> +<fileset-config file-format-version="1.2.0" simple-config="false" sync-formatter="false"> + <fileset name="all" enabled="true" check-config-name="Camel Checks" local="false"> + <file-match-pattern match-pattern="^src[/\\].*java$" include-pattern="true"/> <file-match-pattern match-pattern="^src[/\\]main[/\\]generated[/\\]." include-pattern="false"/> <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>
