perfsonar development work

Author: dante.delvaux
Date: 2013-07-01 17:47:42 +0100 (Mon, 01 Jul 2013)
New Revision: 6439

Modified:
   trunk/parent/common/checkstyle.xml
   trunk/parent/pom.xml
   trunk/perfsonar-base/messaging-test-data/
   
trunk/perfsonar-base/messaging/src/test/java/net/geant/perfsonar/AsynchTester.java
   
trunk/perfsonar-base/messaging/src/test/java/net/geant/perfsonar/templates/TemplateEngineTest.java
   trunk/perfsonar-base/sample-service/
Log:
Parent: adding checkstyle config to ignore specific rules on demand, per 
file.  See checkstyle.xml file for the comment style to use and the 
SuppressWithNearbyCommentFilter property in the maven-checkstyle-plugin 
configuration.

Modified: trunk/parent/common/checkstyle.xml
===================================================================
--- trunk/parent/common/checkstyle.xml  2013-06-29 19:57:17 UTC (rev 6438)
+++ trunk/parent/common/checkstyle.xml  2013-07-01 16:47:42 UTC (rev 6439)
@@ -82,6 +82,7 @@
     <module name="SuperFinalize"/>
     <module name="UnnecessaryParentheses"/>
     <module name="LeftCurly"/>
+    <module name="FileContentsHolder"/>
   </module>
   <module name="NewlineAtEndOfFile"/>
   <module name="Translation"/>
@@ -91,4 +92,9 @@
     <property name="format" value="[^[:space:]\*]+\s+$"/>
     <property name="message" value="Line has trailing spaces."/>
   </module>
+  <module name="SuppressWithNearbyCommentFilter">
+     <property name="commentFormat" value="CHECKSTYLE IGNORE (\w+) FOR NEXT 
(\d+) LINES"/>
+     <property name="checkFormat" value="$1"/>
+     <property name="influenceFormat" value="$2"/>
+  </module>
 </module>

Modified: trunk/parent/pom.xml
===================================================================
--- trunk/parent/pom.xml        2013-06-29 19:57:17 UTC (rev 6438)
+++ trunk/parent/pom.xml        2013-07-01 16:47:42 UTC (rev 6439)
@@ -186,7 +186,7 @@
                             
<logViolationsToConsole>true</logViolationsToConsole>
                             <failsOnError>true</failsOnError>
                             <failOnViolation>true</failOnViolation>
-                            
<configLocation>common/checkstyle.xml</configLocation>
+                            
<configLocation>${basedir}/common/checkstyle.xml</configLocation>
                             
<includeTestSourceDirectory>true</includeTestSourceDirectory>
                             
<excludes>${basedir}/target/generated-sources/**/*.java</excludes>
                         </configuration>

Modified: 
trunk/perfsonar-base/messaging/src/test/java/net/geant/perfsonar/AsynchTester.java
===================================================================
--- 
trunk/perfsonar-base/messaging/src/test/java/net/geant/perfsonar/AsynchTester.java
  2013-06-29 19:57:17 UTC (rev 6438)
+++ 
trunk/perfsonar-base/messaging/src/test/java/net/geant/perfsonar/AsynchTester.java
  2013-07-01 16:47:42 UTC (rev 6439)
@@ -16,7 +16,7 @@
             public void run() {
                 try {
                     runnable.run();
-                    // CHECKSTYLE IGNORE IllegalCatch FOR NEXT 3 LINES
+                    // CHECKSTYLE IGNORE IllegalCatch FOR NEXT 1 LINES
                 } catch (Throwable e) {
                     exception = e;
                 }
@@ -32,6 +32,7 @@
      * Wait for the thread to ends before throwing the exceptions
      * @throws InterruptedException
      */
+    // CHECKSTYLE IGNORE IllegalThrow FOR NEXT 1 LINES
     public void test() throws Throwable {
         thread.join();
         if (exception != null) {

Modified: 
trunk/perfsonar-base/messaging/src/test/java/net/geant/perfsonar/templates/TemplateEngineTest.java
===================================================================
--- 
trunk/perfsonar-base/messaging/src/test/java/net/geant/perfsonar/templates/TemplateEngineTest.java
  2013-06-29 19:57:17 UTC (rev 6438)
+++ 
trunk/perfsonar-base/messaging/src/test/java/net/geant/perfsonar/templates/TemplateEngineTest.java
  2013-07-01 16:47:42 UTC (rev 6439)
@@ -37,6 +37,7 @@
     }
     
     @Test
+    // CHECKSTYLE IGNORE IllegalThrow FOR NEXT 1 LINES
     public void processTemplateInThreads() throws Throwable {
         aInt.set(0);
         count.set(0);


Property changes on: trunk/perfsonar-base/messaging-test-data
___________________________________________________________________
Modified: svn:ignore
   - target

.settings

.project

.classpath

.pmd

.pmdruleset

   + target

.settings

.project

.classpath

.pmd

.pmdruleset

.checkstyle



Property changes on: trunk/perfsonar-base/sample-service
___________________________________________________________________
Modified: svn:ignore
   - target
logs
.settings
.project
.classpath
.pmd
.pmdruleset

   + target
logs
.settings
.project
.classpath
.pmd
.pmdruleset

.checkstyle