Apache
/
openjpa
mirror of https://github.com/apache/openjpa.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

OPENJPA-2410 : Yet another checkstyle update. 

git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@1504984 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Richard G. Curtis 2013-07-19 19:57:28 +00:00
parent 0929f42f83
commit 503e48e8cd
7 changed files with 14 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
openjpa-examples/openbooks/pom.xml
View File

@ -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>

4
openjpa-examples/pom.xml
View File

@ -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>

4
openjpa-examples/simple/pom.xml
View File

@ -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>

4
openjpa-jest/src/main/java/org/apache/openjpa/persistence/jest/JESTServlet.java
View File

@ -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);
}
}

5
openjpa-project/checkstyle.xml
View File

@ -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>

9
openjpa-project/suppressions.xml
View File

@ -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>

3
pom.xml
View File

@ -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>