From 503e48e8cde865f5c904170205bfda86d7461af6 Mon Sep 17 00:00:00 2001
From: "Richard G. Curtis" <curtisr7@apache.org>
Date: Fri, 19 Jul 2013 19:57:28 +0000
Subject: [PATCH] OPENJPA-2410 : Yet another checkstyle update.

git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@1504984 13f79535-47bb-0310-9956-ffa450edef68
---
 openjpa-examples/openbooks/pom.xml                       | 4 ----
 openjpa-examples/pom.xml                                 | 4 +++-
 openjpa-examples/simple/pom.xml                          | 4 ----
 .../org/apache/openjpa/persistence/jest/JESTServlet.java | 4 ++++
 openjpa-project/checkstyle.xml                           | 5 ++---
 openjpa-project/suppressions.xml                         | 9 +++------
 pom.xml                                                  | 3 ++-
 7 files changed, 14 insertions(+), 19 deletions(-)

diff --git a/openjpa-examples/openbooks/pom.xml b/openjpa-examples/openbooks/pom.xml
index 18a5937da..8f96e6369 100644
--- a/openjpa-examples/openbooks/pom.xml
+++ b/openjpa-examples/openbooks/pom.xml
@@ -39,10 +39,6 @@
     <name>OpenJPA Examples - OpenBooks</name>
     <description>Apache OpenJPA Examples - OpenBooks</description>
 
-    <properties>
-        <checkstyle.config.location>${project.basedir}/../../openjpa-project/checkstyle.xml</checkstyle.config.location>
-    </properties>
-
     <dependencies>
         <dependency>
             <groupId>org.apache.openjpa</groupId>
diff --git a/openjpa-examples/pom.xml b/openjpa-examples/pom.xml
index 671c6e7d0..906703fce 100644
--- a/openjpa-examples/pom.xml
+++ b/openjpa-examples/pom.xml
@@ -40,7 +40,9 @@
 
     <properties>
         <openjpa.Log>DefaultLevel=WARN</openjpa.Log>
-        <checkstyle.config.location>${project.basedir}/../openjpa-project/checkstyle.xml</checkstyle.config.location>
+        <!-- Not sure if using \ here will cause problems with running on *nix. Windows has a bug when using / -->
+        <checkstyle.config.location>${project.basedir}\..\..\openjpa-project\checkstyle.xml</checkstyle.config.location>
+        <checkstyle.suppressions.location>${project.basedir}\..\..\openjpa-project\suppressions.xml</checkstyle.suppressions.location>
     </properties>
 
     <modules>
diff --git a/openjpa-examples/simple/pom.xml b/openjpa-examples/simple/pom.xml
index 633d7a33c..a7961441c 100644
--- a/openjpa-examples/simple/pom.xml
+++ b/openjpa-examples/simple/pom.xml
@@ -38,10 +38,6 @@
     <name>OpenJPA Examples - Simple</name>
     <description>Apache OpenJPA Examples - Simple</description>
 
-    <properties>
-        <checkstyle.config.location>${project.basedir}/../../openjpa-project/checkstyle.xml</checkstyle.config.location>
-    </properties>
-
     <dependencies>
         <dependency>
             <groupId>org.apache.openjpa</groupId>
diff --git a/openjpa-jest/src/main/java/org/apache/openjpa/persistence/jest/JESTServlet.java b/openjpa-jest/src/main/java/org/apache/openjpa/persistence/jest/JESTServlet.java
index 22ddedf10..697dcb49e 100644
--- a/openjpa-jest/src/main/java/org/apache/openjpa/persistence/jest/JESTServlet.java
+++ b/openjpa-jest/src/main/java/org/apache/openjpa/persistence/jest/JESTServlet.java
@@ -130,6 +130,7 @@ public class JESTServlet extends HttpServlet  {
     }
     
     protected boolean findPersistenceUnit() {
+        // START - ALLOW PRINT STATEMENTS
         if (_emf == null) {
             System.err.println("Discovering auxiliary Persistent Unit  " + _unit);
             BrokerFactory bf = AbstractBrokerFactory.getPooledFactoryForKey(_unit);
@@ -138,6 +139,7 @@ public class JESTServlet extends HttpServlet  {
             }
             System.err.println("Discovered auxiliary Persistent Unit  " + _unit + ":" + _emf);
         }
+        // STOP - ALLOW PRINT STATEMENTS
         return _emf != null;
     }
     
@@ -168,7 +170,9 @@ public class JESTServlet extends HttpServlet  {
     }
     
     public void log(String s) {
+        // START - ALLOW PRINT STATEMENTS
         System.err.println(s);
+        // STOP - ALLOW PRINT STATEMENTS
         super.log(s);
     }
 }
diff --git a/openjpa-project/checkstyle.xml b/openjpa-project/checkstyle.xml
index 414ec9bf6..8eb96f6d7 100644
--- a/openjpa-project/checkstyle.xml
+++ b/openjpa-project/checkstyle.xml
@@ -34,7 +34,6 @@
 		<property name="onCommentFormat" value="// STOP - ALLOW PRINT STATEMENTS" />
 	</module>
 
-	<module name="SuppressionFilter">
-		<property name="file" value="openjpa-project/suppressions.xml" />
-	</module>
+	<!-- File location is specified in root pom.xml via ${checkstyle.suppressions.location} -->
+	<module name="SuppressionFilter"/>
 </module>
diff --git a/openjpa-project/suppressions.xml b/openjpa-project/suppressions.xml
index 8ae2ca108..9bbaa8750 100644
--- a/openjpa-project/suppressions.xml
+++ b/openjpa-project/suppressions.xml
@@ -5,11 +5,8 @@
     "http://www.puppycrawl.com/dtds/suppressions_1_1.dtd">
 
 <suppressions>
-	<suppress checks="RegexpSinglelineJava" files=".*openjpa-examples.*tools.*java" />
-	<suppress checks="RegexpSinglelineJava" files=".*openjpa-examples.*client.*java" />
-	<suppress checks="RegexpSinglelineJava" files=".*openjpa-examples.*server.*java" />
-	<suppress checks="RegexpSinglelineJava" files=".*openjpa-examples.*util.*java" />
+	<suppress checks="RegexpSinglelineJava" files=".*openjpa-examples\\.*java" />
 	<suppress checks="RegexpSinglelineJava" files="Test.*java" />
-	<suppress checks="RegexpSinglelineJava" files=".*src/test/.*java" />
-	<suppress checks="RegexpSinglelineJava" files="Main.java" /> 
+	<suppress checks="RegexpSinglelineJava" files=".*src\\test.*java" />
+	<suppress checks="RegexpSinglelineJava" files="Main.java" />
 </suppressions>
diff --git a/pom.xml b/pom.xml
index c222dd95e..c90b5bf04 100644
--- a/pom.xml
+++ b/pom.xml
@@ -47,6 +47,8 @@
         <openjpa.Log>DefaultLevel=INFO</openjpa.Log>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <checkstyle.config.location>${project.basedir}/../openjpa-project/checkstyle.xml</checkstyle.config.location>
+        <checkstyle.suppressions.location>${project.basedir}/../openjpa-project/suppressions.xml</checkstyle.suppressions.location>
+        
         <site.deploy.url>scp://people.apache.org/home/${site.deploy.user.name}/public_html/openjpa/${project.version}/staging-site</site.deploy.url>
         <!-- the test settings can be overridden my specific profiles -->
         <test.jvm.maxpermsize>512m</test.jvm.maxpermsize>
@@ -1086,7 +1088,6 @@
                             <goal>checkstyle</goal>
                         </goals>
                         <configuration>
-                            <configLocation>${checkstyle.config.location}</configLocation>
                             <failsOnError>true</failsOnError>
                             <consoleOutput>true</consoleOutput>
                             <includeTestSourceDirectory>true</includeTestSourceDirectory>