Author: florianh
Date: Sat Oct 20 20:49:24 2012
New Revision: 1400511
URL: http://svn.apache.org/viewvc?rev=1400511&view=rev
Log:
some fixes for JSPWIKI-749 and CheckStyle version 5.6
adding Eclipse Mylyn settings file
Added:
incubator/jspwiki/trunk/.settings/org.eclipse.mylyn.tasks.ui.prefs
Removed:
incubator/jspwiki/trunk/doc/eclipse/
Modified:
incubator/jspwiki/trunk/.checkstyle
incubator/jspwiki/trunk/ChangeLog
incubator/jspwiki/trunk/etc/jspwiki-checkstyle.xml
Modified: incubator/jspwiki/trunk/.checkstyle
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/.checkstyle?rev=1400511&r1=1400510&r2=1400511&view=diff
==============================================================================
--- incubator/jspwiki/trunk/.checkstyle (original)
+++ incubator/jspwiki/trunk/.checkstyle Sat Oct 20 20:49:24 2012
@@ -1,15 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
-<fileset-config file-format-version="1.2.0" simple-config="true">
- <local-check-config name="JSPWiki Coding Style"
location="doc/eclipse/jspwiki-checkstyle.xml" type="project" description="">
- <additional-data name="protect-config-file" value="false"/>
- </local-check-config>
- <fileset name="all" enabled="true" check-config-name="JSPWiki Coding
Style" local="true">
- <file-match-pattern match-pattern="." include-pattern="true"/>
- </fileset>
- <filter name="FilesFromPackage" enabled="true">
- <filter-data value="tests"/>
- <filter-data value="tests/etc"/>
- <filter-data value="etc/i18n"/>
- </filter>
- <filter name="NonSrcDirs" enabled="true"/>
+
+<fileset-config file-format-version="1.2.0" simple-config="true"
sync-formatter="false">
+ <local-check-config name="JSPWiki Coding Style"
location="etc/jspwiki-checkstyle.xml" type="project" description="">
+ <additional-data name="protect-config-file" value="false"/>
+ </local-check-config>
+ <fileset name="all" enabled="true" check-config-name="JSPWiki Coding Style"
local="true">
+ <file-match-pattern match-pattern="." include-pattern="true"/>
+ </fileset>
+ <filter name="FilesFromPackage" enabled="true">
+ <filter-data value="tests"/>
+ <filter-data value="tests/etc"/>
+ <filter-data value="etc/i18n"/>
+ </filter>
</fileset-config>
Added: incubator/jspwiki/trunk/.settings/org.eclipse.mylyn.tasks.ui.prefs
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/.settings/org.eclipse.mylyn.tasks.ui.prefs?rev=1400511&view=auto
==============================================================================
--- incubator/jspwiki/trunk/.settings/org.eclipse.mylyn.tasks.ui.prefs (added)
+++ incubator/jspwiki/trunk/.settings/org.eclipse.mylyn.tasks.ui.prefs Sat Oct
20 20:49:24 2012
@@ -0,0 +1,3 @@
+eclipse.preferences.version=1
+project.repository.kind=jira
+project.repository.url=https\://issues.apache.org/jira
Modified: incubator/jspwiki/trunk/ChangeLog
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/ChangeLog?rev=1400511&r1=1400510&r2=1400511&view=diff
==============================================================================
--- incubator/jspwiki/trunk/ChangeLog (original)
+++ incubator/jspwiki/trunk/ChangeLog Sat Oct 20 20:49:24 2012
@@ -1,3 +1,7 @@
+2012-10-20 Florian Holeczek (florianh AT apache DOT org)
+
+ * some fixes for JSPWIKI-749 and CheckStyle version 5.6
+
2012-10-09 Juan Pablo Santos (juanpablo AT apache DOT org)
* added Apache License Header to files which were missing it
Modified: incubator/jspwiki/trunk/etc/jspwiki-checkstyle.xml
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/etc/jspwiki-checkstyle.xml?rev=1400511&r1=1400510&r2=1400511&view=diff
==============================================================================
--- incubator/jspwiki/trunk/etc/jspwiki-checkstyle.xml (original)
+++ incubator/jspwiki/trunk/etc/jspwiki-checkstyle.xml Sat Oct 20 20:49:24 2012
@@ -53,7 +53,9 @@
<module name="ModifierOrder"/>
<module name="CovariantEquals"/>
<module name="DefaultComesLast"/>
- <module name="DoubleCheckedLocking"/>
+ <!-- This has been removed in Checkstyle 5.6, see
http://checkstyle.sourceforge.net/releasenotes.html
+ <module name="DoubleCheckedLocking"/>
+ -->
<module name="EqualsHashCode"/>
<module name="ExplicitInitialization"/>
<module name="FallThrough"/>
