Author: curtisr7
Date: Fri Jul 19 19:57:28 2013
New Revision: 1504984
URL: http://svn.apache.org/r1504984
Log:
OPENJPA-2410 : Yet another checkstyle update.
Modified:
openjpa/trunk/openjpa-examples/openbooks/pom.xml
openjpa/trunk/openjpa-examples/pom.xml
openjpa/trunk/openjpa-examples/simple/pom.xml
openjpa/trunk/openjpa-jest/src/main/java/org/apache/openjpa/persistence/jest/JESTServlet.java
openjpa/trunk/openjpa-project/checkstyle.xml
openjpa/trunk/openjpa-project/suppressions.xml
openjpa/trunk/pom.xml
Modified: openjpa/trunk/openjpa-examples/openbooks/pom.xml
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-examples/openbooks/pom.xml?rev=1504984&r1=1504983&r2=1504984&view=diff
==============================================================================
--- openjpa/trunk/openjpa-examples/openbooks/pom.xml (original)
+++ openjpa/trunk/openjpa-examples/openbooks/pom.xml Fri Jul 19 19:57:28 2013
@@ -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>
Modified: openjpa/trunk/openjpa-examples/pom.xml
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-examples/pom.xml?rev=1504984&r1=1504983&r2=1504984&view=diff
==============================================================================
--- openjpa/trunk/openjpa-examples/pom.xml (original)
+++ openjpa/trunk/openjpa-examples/pom.xml Fri Jul 19 19:57:28 2013
@@ -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>
Modified: openjpa/trunk/openjpa-examples/simple/pom.xml
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-examples/simple/pom.xml?rev=1504984&r1=1504983&r2=1504984&view=diff
==============================================================================
--- openjpa/trunk/openjpa-examples/simple/pom.xml (original)
+++ openjpa/trunk/openjpa-examples/simple/pom.xml Fri Jul 19 19:57:28 2013
@@ -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>
Modified:
openjpa/trunk/openjpa-jest/src/main/java/org/apache/openjpa/persistence/jest/JESTServlet.java
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-jest/src/main/java/org/apache/openjpa/persistence/jest/JESTServlet.java?rev=1504984&r1=1504983&r2=1504984&view=diff
==============================================================================
---
openjpa/trunk/openjpa-jest/src/main/java/org/apache/openjpa/persistence/jest/JESTServlet.java
(original)
+++
openjpa/trunk/openjpa-jest/src/main/java/org/apache/openjpa/persistence/jest/JESTServlet.java
Fri Jul 19 19:57:28 2013
@@ -130,6 +130,7 @@ public class JESTServlet extends HttpSer
}
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 HttpSer
}
System.err.println("Discovered auxiliary Persistent Unit " +
_unit + ":" + _emf);
}
+ // STOP - ALLOW PRINT STATEMENTS
return _emf != null;
}
@@ -168,7 +170,9 @@ public class JESTServlet extends HttpSer
}
public void log(String s) {
+ // START - ALLOW PRINT STATEMENTS
System.err.println(s);
+ // STOP - ALLOW PRINT STATEMENTS
super.log(s);
}
}
Modified: openjpa/trunk/openjpa-project/checkstyle.xml
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-project/checkstyle.xml?rev=1504984&r1=1504983&r2=1504984&view=diff
==============================================================================
--- openjpa/trunk/openjpa-project/checkstyle.xml (original)
+++ openjpa/trunk/openjpa-project/checkstyle.xml Fri Jul 19 19:57:28 2013
@@ -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>
Modified: openjpa/trunk/openjpa-project/suppressions.xml
URL:
http://svn.apache.org/viewvc/openjpa/trunk/openjpa-project/suppressions.xml?rev=1504984&r1=1504983&r2=1504984&view=diff
==============================================================================
--- openjpa/trunk/openjpa-project/suppressions.xml (original)
+++ openjpa/trunk/openjpa-project/suppressions.xml Fri Jul 19 19:57:28 2013
@@ -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>
Modified: openjpa/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/openjpa/trunk/pom.xml?rev=1504984&r1=1504983&r2=1504984&view=diff
==============================================================================
--- openjpa/trunk/pom.xml (original)
+++ openjpa/trunk/pom.xml Fri Jul 19 19:57:28 2013
@@ -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>
