You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openjpa.apache.org by cu...@apache.org on 2013/08/06 17:23:15 UTC
svn commit: r1510994 - in /openjpa/branches/2.2.x: ./ openjpa-examples/
openjpa-examples/openbooks/ openjpa-examples/simple/
openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/
openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/ openjpa-jdb...
Author: curtisr7
Date: Tue Aug 6 15:23:14 2013
New Revision: 1510994
URL: http://svn.apache.org/r1510994
Log:
OPENJPA-2410: Merge checkstyle changes from trunk to 2.2.x .
Added:
openjpa/branches/2.2.x/openjpa-project/suppressions.xml (with props)
Modified:
openjpa/branches/2.2.x/openjpa-examples/openbooks/pom.xml
openjpa/branches/2.2.x/openjpa-examples/pom.xml
openjpa/branches/2.2.x/openjpa-examples/simple/pom.xml
openjpa/branches/2.2.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/ClassTableJDBCSeq.java
openjpa/branches/2.2.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/NativeJDBCSeq.java
openjpa/branches/2.2.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/TableJDBCSeq.java
openjpa/branches/2.2.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/ValueTableJDBCSeq.java
openjpa/branches/2.2.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/MappingTool.java
openjpa/branches/2.2.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/ReverseMappingTool.java
openjpa/branches/2.2.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/SchemaTool.java
openjpa/branches/2.2.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/TableSchemaFactory.java
openjpa/branches/2.2.x/openjpa-jest/src/main/java/org/apache/openjpa/persistence/jest/JESTServlet.java
openjpa/branches/2.2.x/openjpa-jest/src/main/java/org/apache/openjpa/persistence/jest/JSONObject.java
openjpa/branches/2.2.x/openjpa-jest/src/main/java/org/apache/openjpa/persistence/jest/XMLFormatter.java
openjpa/branches/2.2.x/openjpa-kernel/src/main/java/org/apache/openjpa/conf/MetaDataCacheMaintenance.java
openjpa/branches/2.2.x/openjpa-kernel/src/main/java/org/apache/openjpa/conf/OpenJPAVersion.java
openjpa/branches/2.2.x/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/ApplicationIdTool.java
openjpa/branches/2.2.x/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/ManagedClassSubclasser.java
openjpa/branches/2.2.x/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/PCEnhancer.java
openjpa/branches/2.2.x/openjpa-kernel/src/main/java/org/apache/openjpa/meta/MetaDataTool.java
openjpa/branches/2.2.x/openjpa-kernel/src/main/java/org/apache/openjpa/util/ProxyManagerImpl.java
openjpa/branches/2.2.x/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/ProductDerivations.java
openjpa/branches/2.2.x/openjpa-lib/src/main/java/org/apache/openjpa/lib/identifier/IdentifierUtilImpl.java
openjpa/branches/2.2.x/openjpa-lib/src/main/java/org/apache/openjpa/lib/jdbc/SQLFormatter.java
openjpa/branches/2.2.x/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceProductDerivation.java
openjpa/branches/2.2.x/openjpa-project/checkstyle.xml
openjpa/branches/2.2.x/pom.xml
Modified: openjpa/branches/2.2.x/openjpa-examples/openbooks/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/branches/2.2.x/openjpa-examples/openbooks/pom.xml?rev=1510994&r1=1510993&r2=1510994&view=diff
==============================================================================
--- openjpa/branches/2.2.x/openjpa-examples/openbooks/pom.xml (original)
+++ openjpa/branches/2.2.x/openjpa-examples/openbooks/pom.xml Tue Aug 6 15:23:14 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>
@@ -91,7 +87,7 @@
<goal>checkstyle</goal>
</goals>
<configuration>
- <excludes>**/*_.java,**/Java*.java</excludes>
+ <excludes>**/*_.java,**/*.java</excludes>
</configuration>
</execution>
</executions>
Modified: openjpa/branches/2.2.x/openjpa-examples/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/branches/2.2.x/openjpa-examples/pom.xml?rev=1510994&r1=1510993&r2=1510994&view=diff
==============================================================================
--- openjpa/branches/2.2.x/openjpa-examples/pom.xml (original)
+++ openjpa/branches/2.2.x/openjpa-examples/pom.xml Tue Aug 6 15:23:14 2013
@@ -40,7 +40,8 @@
<properties>
<openjpa.Log>DefaultLevel=WARN</openjpa.Log>
- <checkstyle.config.location>${project.basedir}/../openjpa-project/checkstyle.xml</checkstyle.config.location>
+ <checkstyle.config.location>${project.basedir}${file.separator}..${file.separator}..${file.separator}openjpa-project${file.separator}checkstyle.xml</checkstyle.config.location>
+ <checkstyle.suppressions.location>${project.basedir}${file.separator}..${file.separator}..${file.separator}openjpa-project${file.separator}suppressions.xml</checkstyle.suppressions.location>
</properties>
<modules>
Modified: openjpa/branches/2.2.x/openjpa-examples/simple/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/branches/2.2.x/openjpa-examples/simple/pom.xml?rev=1510994&r1=1510993&r2=1510994&view=diff
==============================================================================
--- openjpa/branches/2.2.x/openjpa-examples/simple/pom.xml (original)
+++ openjpa/branches/2.2.x/openjpa-examples/simple/pom.xml Tue Aug 6 15:23:14 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/branches/2.2.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/ClassTableJDBCSeq.java
URL: http://svn.apache.org/viewvc/openjpa/branches/2.2.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/ClassTableJDBCSeq.java?rev=1510994&r1=1510993&r2=1510994&view=diff
==============================================================================
--- openjpa/branches/2.2.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/ClassTableJDBCSeq.java (original)
+++ openjpa/branches/2.2.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/ClassTableJDBCSeq.java Tue Aug 6 15:23:14 2013
@@ -181,7 +181,9 @@ public class ClassTableJDBCSeq
}
});
if (!ret)
+ // START - ALLOW PRINT STATEMENTS
System.out.println(_loc.get("clstable-seq-usage"));
+ // STOP - ALLOW PRINT STATEMENTS
}
/**
@@ -233,7 +235,9 @@ public class ClassTableJDBCSeq
try {
long cur = seq.getSequence(mapping, conn);
if (ACTION_GET.equals(action))
+ // START - ALLOW PRINT STATEMENTS
System.out.println(mapping + ": " + cur);
+ // STOP - ALLOW PRINT STATEMENTS
else {
long set;
if (args.length > 1)
@@ -248,7 +252,9 @@ public class ClassTableJDBCSeq
conn);
set = stat.seq;
}
+ // START - ALLOW PRINT STATEMENTS
System.err.println(mapping + ": " + set);
+ // STOP - ALLOW PRINT STATEMENTS
}
} catch (NumberFormatException nfe) {
return false;
Modified: openjpa/branches/2.2.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/NativeJDBCSeq.java
URL: http://svn.apache.org/viewvc/openjpa/branches/2.2.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/NativeJDBCSeq.java?rev=1510994&r1=1510993&r2=1510994&view=diff
==============================================================================
--- openjpa/branches/2.2.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/NativeJDBCSeq.java (original)
+++ openjpa/branches/2.2.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/NativeJDBCSeq.java Tue Aug 6 15:23:14 2013
@@ -386,7 +386,9 @@ public class NativeJDBCSeq
}
});
if (!ret)
+ // START - ALLOW PRINT STATEMENTS
System.out.println(_loc.get("native-seq-usage"));
+ // STOP - ALLOW PRINT STATEMENTS
}
/**
@@ -421,7 +423,9 @@ public class NativeJDBCSeq
Connection conn = conf.getDataSource2(null).getConnection();
try {
long cur = seq.getSequence(conn);
+ // START - ALLOW PRINT STATEMENTS
System.out.println(cur);
+ // STOP - ALLOW PRINT STATEMENTS
} finally {
try { conn.close(); } catch (SQLException se) {}
}
Modified: openjpa/branches/2.2.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/TableJDBCSeq.java
URL: http://svn.apache.org/viewvc/openjpa/branches/2.2.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/TableJDBCSeq.java?rev=1510994&r1=1510993&r2=1510994&view=diff
==============================================================================
--- openjpa/branches/2.2.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/TableJDBCSeq.java (original)
+++ openjpa/branches/2.2.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/TableJDBCSeq.java Tue Aug 6 15:23:14 2013
@@ -722,7 +722,9 @@ public class TableJDBCSeq extends Abstra
}
});
if (!ret)
+ // START - ALLOW PRINT STATEMENTS
System.out.println(_loc.get("seq-usage"));
+ // STOP - ALLOW PRINT STATEMENTS
}
/**
@@ -759,7 +761,9 @@ public class TableJDBCSeq extends Abstra
try {
long cur = seq.getSequence(null, conn);
if (ACTION_GET.equals(action))
+ // START - ALLOW PRINT STATEMENTS
System.out.println(cur);
+ // STOP - ALLOW PRINT STATEMENTS
else {
long set;
if (args.length > 0)
@@ -774,7 +778,9 @@ public class TableJDBCSeq extends Abstra
conn);
set = stat.seq;
}
+ // START - ALLOW PRINT STATEMENTS
System.err.println(set);
+ // STOP - ALLOW PRINT STATEMENTS
}
}
catch (NumberFormatException nfe) {
Modified: openjpa/branches/2.2.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/ValueTableJDBCSeq.java
URL: http://svn.apache.org/viewvc/openjpa/branches/2.2.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/ValueTableJDBCSeq.java?rev=1510994&r1=1510993&r2=1510994&view=diff
==============================================================================
--- openjpa/branches/2.2.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/ValueTableJDBCSeq.java (original)
+++ openjpa/branches/2.2.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/ValueTableJDBCSeq.java Tue Aug 6 15:23:14 2013
@@ -133,7 +133,9 @@ public class ValueTableJDBCSeq
}
});
if (!ret)
+ // START - ALLOW PRINT STATEMENTS
System.out.println(_loc.get("clstable-seq-usage"));
+ // STOP - ALLOW PRINT STATEMENTS
}
/**
@@ -173,7 +175,9 @@ public class ValueTableJDBCSeq
try {
long cur = seq.getSequence(null, conn);
if (ACTION_GET.equals(action))
+ // START - ALLOW PRINT STATEMENTS
System.out.println(seq.getPrimaryKeyValue() + ": " + cur);
+ // STOP - ALLOW PRINT STATEMENTS
else {
long set;
if (args.length > 1)
@@ -188,7 +192,9 @@ public class ValueTableJDBCSeq
conn);
set = stat.seq;
}
+ // START - ALLOW PRINT STATEMENTS
System.err.println(seq.getPrimaryKeyValue() + ": " + set);
+ // STOP - ALLOW PRINT STATEMENTS
}
}
catch (NumberFormatException nfe) {
Modified: openjpa/branches/2.2.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/MappingTool.java
URL: http://svn.apache.org/viewvc/openjpa/branches/2.2.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/MappingTool.java?rev=1510994&r1=1510993&r2=1510994&view=diff
==============================================================================
--- openjpa/branches/2.2.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/MappingTool.java (original)
+++ openjpa/branches/2.2.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/MappingTool.java Tue Aug 6 15:23:14 2013
@@ -941,7 +941,9 @@ public class MappingTool
}
});
if (!ret)
+ // START - ALLOW PRINT STATEMENTS
System.err.println(_loc.get("tool-usage"));
+ // STOP - ALLOW PRINT STATEMENTS
}
/**
Modified: openjpa/branches/2.2.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/ReverseMappingTool.java
URL: http://svn.apache.org/viewvc/openjpa/branches/2.2.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/ReverseMappingTool.java?rev=1510994&r1=1510993&r2=1510994&view=diff
==============================================================================
--- openjpa/branches/2.2.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/ReverseMappingTool.java (original)
+++ openjpa/branches/2.2.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/ReverseMappingTool.java Tue Aug 6 15:23:14 2013
@@ -1833,7 +1833,9 @@ public class ReverseMappingTool
}
});
if (!ret)
+ // START - ALLOW PRINT STATEMENTS
System.out.println(_loc.get("revtool-usage"));
+ // STOP - ALLOW PRINT STATEMENTS
}
/**
Modified: openjpa/branches/2.2.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/SchemaTool.java
URL: http://svn.apache.org/viewvc/openjpa/branches/2.2.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/SchemaTool.java?rev=1510994&r1=1510993&r2=1510994&view=diff
==============================================================================
--- openjpa/branches/2.2.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/SchemaTool.java (original)
+++ openjpa/branches/2.2.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/SchemaTool.java Tue Aug 6 15:23:14 2013
@@ -1385,7 +1385,9 @@ public class SchemaTool {
}
});
if (!ret)
+ // START - ALLOW PRINT STATEMENTS
System.out.println(_loc.get("tool-usage"));
+ // STOP - ALLOW PRINT STATEMENTS
}
/**
Modified: openjpa/branches/2.2.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/TableSchemaFactory.java
URL: http://svn.apache.org/viewvc/openjpa/branches/2.2.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/TableSchemaFactory.java?rev=1510994&r1=1510993&r2=1510994&view=diff
==============================================================================
--- openjpa/branches/2.2.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/TableSchemaFactory.java (original)
+++ openjpa/branches/2.2.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/TableSchemaFactory.java Tue Aug 6 15:23:14 2013
@@ -471,7 +471,9 @@ public class TableSchemaFactory
}
});
if (!ret)
+ // START - ALLOW PRINT STATEMENTS
System.out.println(_loc.get("sch-usage"));
+ // STOP - ALLOW PRINT STATEMENTS
}
/**
Modified: openjpa/branches/2.2.x/openjpa-jest/src/main/java/org/apache/openjpa/persistence/jest/JESTServlet.java
URL: http://svn.apache.org/viewvc/openjpa/branches/2.2.x/openjpa-jest/src/main/java/org/apache/openjpa/persistence/jest/JESTServlet.java?rev=1510994&r1=1510993&r2=1510994&view=diff
==============================================================================
--- openjpa/branches/2.2.x/openjpa-jest/src/main/java/org/apache/openjpa/persistence/jest/JESTServlet.java (original)
+++ openjpa/branches/2.2.x/openjpa-jest/src/main/java/org/apache/openjpa/persistence/jest/JESTServlet.java Tue Aug 6 15:23:14 2013
@@ -83,7 +83,9 @@ public class JESTServlet extends HttpSer
throw new ServletException(_loc.get("no-persistence-unit-param").toString());
}
boolean standalone = "true".equalsIgnoreCase(config.getInitParameter(INIT_PARA_STANDALONE));
+ // START - ALLOW PRINT STATEMENTS
System.err.println("Standalone Deployment Mode " + standalone);
+ // STOP - ALLOW PRINT STATEMENTS
if (standalone) {
createPersistenceUnit();
}
@@ -114,6 +116,7 @@ public class JESTServlet extends HttpSer
}
protected void createPersistenceUnit() throws ServletException {
+ // START - ALLOW PRINT STATEMENTS
try {
System.err.println("Creating Standalone Persistent Unit " + _unit);
_emf = OpenJPAPersistence.cast(Persistence.createEntityManagerFactory(_unit));
@@ -123,9 +126,11 @@ public class JESTServlet extends HttpSer
e.printStackTrace();
throw new ServletException(_loc.get("no-persistence-unit-standalone", _unit).toString(), e);
}
+ // STOP - ALLOW PRINT STATEMENTS
}
protected boolean findPersistenceUnit() {
+ // START - ALLOW PRINT STATEMENTS
if (_emf == null) {
System.err.println("Discovering auxiliary Persistent Unit " + _unit);
BrokerFactory bf = AbstractBrokerFactory.getPooledFactoryForKey(_unit);
@@ -134,6 +139,7 @@ public class JESTServlet extends HttpSer
}
System.err.println("Discovered auxiliary Persistent Unit " + _unit + ":" + _emf);
}
+ // STOP - ALLOW PRINT STATEMENTS
return _emf != null;
}
@@ -164,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/branches/2.2.x/openjpa-jest/src/main/java/org/apache/openjpa/persistence/jest/JSONObject.java
URL: http://svn.apache.org/viewvc/openjpa/branches/2.2.x/openjpa-jest/src/main/java/org/apache/openjpa/persistence/jest/JSONObject.java?rev=1510994&r1=1510993&r2=1510994&view=diff
==============================================================================
--- openjpa/branches/2.2.x/openjpa-jest/src/main/java/org/apache/openjpa/persistence/jest/JSONObject.java (original)
+++ openjpa/branches/2.2.x/openjpa-jest/src/main/java/org/apache/openjpa/persistence/jest/JSONObject.java Tue Aug 6 15:23:14 2013
@@ -236,6 +236,5 @@ public class JSONObject implements JSON
o.set("friends", a);
o.set("map", map);
- System.err.println(o);
}
}
Modified: openjpa/branches/2.2.x/openjpa-jest/src/main/java/org/apache/openjpa/persistence/jest/XMLFormatter.java
URL: http://svn.apache.org/viewvc/openjpa/branches/2.2.x/openjpa-jest/src/main/java/org/apache/openjpa/persistence/jest/XMLFormatter.java?rev=1510994&r1=1510993&r2=1510994&view=diff
==============================================================================
--- openjpa/branches/2.2.x/openjpa-jest/src/main/java/org/apache/openjpa/persistence/jest/XMLFormatter.java (original)
+++ openjpa/branches/2.2.x/openjpa-jest/src/main/java/org/apache/openjpa/persistence/jest/XMLFormatter.java Tue Aug 6 15:23:14 2013
@@ -400,7 +400,9 @@ public class XMLFormatter implements Obj
case JavaTypes.PC_UNTYPED:
case JavaTypes.OBJECT:
+ // START - ALLOW PRINT STATEMENTS
System.err.println("Not handled " + fmd.getName() + " of type " + fmd.getDeclaredType());
+ // STOP - ALLOW PRINT STATEMENTS
}
if (child != null) {
Modified: openjpa/branches/2.2.x/openjpa-kernel/src/main/java/org/apache/openjpa/conf/MetaDataCacheMaintenance.java
URL: http://svn.apache.org/viewvc/openjpa/branches/2.2.x/openjpa-kernel/src/main/java/org/apache/openjpa/conf/MetaDataCacheMaintenance.java?rev=1510994&r1=1510993&r2=1510994&view=diff
==============================================================================
--- openjpa/branches/2.2.x/openjpa-kernel/src/main/java/org/apache/openjpa/conf/MetaDataCacheMaintenance.java (original)
+++ openjpa/branches/2.2.x/openjpa-kernel/src/main/java/org/apache/openjpa/conf/MetaDataCacheMaintenance.java Tue Aug 6 15:23:14 2013
@@ -102,8 +102,10 @@ public class MetaDataCacheMaintenance {
}
private static int usage() {
+ // START - ALLOW PRINT STATEMENTS
System.err.println("Usage: java MetaDataCacheMaintenance " +
"[-scanDevPath t|f] [-<openjpa.PropertyName> value] store | dump");
+ // STOP - ALLOW PRINT STATEMENTS
return -1;
}
Modified: openjpa/branches/2.2.x/openjpa-kernel/src/main/java/org/apache/openjpa/conf/OpenJPAVersion.java
URL: http://svn.apache.org/viewvc/openjpa/branches/2.2.x/openjpa-kernel/src/main/java/org/apache/openjpa/conf/OpenJPAVersion.java?rev=1510994&r1=1510993&r2=1510994&view=diff
==============================================================================
--- openjpa/branches/2.2.x/openjpa-kernel/src/main/java/org/apache/openjpa/conf/OpenJPAVersion.java (original)
+++ openjpa/branches/2.2.x/openjpa-kernel/src/main/java/org/apache/openjpa/conf/OpenJPAVersion.java Tue Aug 6 15:23:14 2013
@@ -98,7 +98,9 @@ public class OpenJPAVersion {
}
public static void main(String [] args) {
+ // START - ALLOW PRINT STATEMENTS
System.out.println(new OpenJPAVersion().toString());
+ // STOP - ALLOW PRINT STATEMENTS
}
public String toString() {
Modified: openjpa/branches/2.2.x/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/ApplicationIdTool.java
URL: http://svn.apache.org/viewvc/openjpa/branches/2.2.x/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/ApplicationIdTool.java?rev=1510994&r1=1510993&r2=1510994&view=diff
==============================================================================
--- openjpa/branches/2.2.x/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/ApplicationIdTool.java (original)
+++ openjpa/branches/2.2.x/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/ApplicationIdTool.java Tue Aug 6 15:23:14 2013
@@ -1295,7 +1295,9 @@ public class ApplicationIdTool {
}
});
if (!ret)
+ // START - ALLOW PRINT STATEMENTS
System.err.println(_loc.get("appid-usage"));
+ // STOP - ALLOW PRINT STATEMENTS
}
/**
Modified: openjpa/branches/2.2.x/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/ManagedClassSubclasser.java
URL: http://svn.apache.org/viewvc/openjpa/branches/2.2.x/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/ManagedClassSubclasser.java?rev=1510994&r1=1510993&r2=1510994&view=diff
==============================================================================
--- openjpa/branches/2.2.x/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/ManagedClassSubclasser.java (original)
+++ openjpa/branches/2.2.x/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/ManagedClassSubclasser.java Tue Aug 6 15:23:14 2013
@@ -300,7 +300,9 @@ public class ManagedClassSubclasser {
dir.mkdirs();
dir = Files.getPackageFile(dir, bc.getPackageName(), true);
File f = new File(dir, bc.getClassName() + ".class");
+ // START - ALLOW PRINT STATEMENTS
System.err.println("Writing to " + f);
+ // STOP - ALLOW PRINT STATEMENTS
AsmAdaptor.write(bc, f);
}
}
Modified: openjpa/branches/2.2.x/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/PCEnhancer.java
URL: http://svn.apache.org/viewvc/openjpa/branches/2.2.x/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/PCEnhancer.java?rev=1510994&r1=1510993&r2=1510994&view=diff
==============================================================================
--- openjpa/branches/2.2.x/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/PCEnhancer.java (original)
+++ openjpa/branches/2.2.x/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/PCEnhancer.java Tue Aug 6 15:23:14 2013
@@ -4785,7 +4785,9 @@ public class PCEnhancer {
Options opts = new Options();
args = opts.setFromCmdLine(args);
if (!run(args, opts))
+ // START - ALLOW PRINT STATEMENTS
System.err.println(_loc.get("enhance-usage"));
+ // STOP - ALLOW PRINT STATEMENTS
}
/**
Modified: openjpa/branches/2.2.x/openjpa-kernel/src/main/java/org/apache/openjpa/meta/MetaDataTool.java
URL: http://svn.apache.org/viewvc/openjpa/branches/2.2.x/openjpa-kernel/src/main/java/org/apache/openjpa/meta/MetaDataTool.java?rev=1510994&r1=1510993&r2=1510994&view=diff
==============================================================================
--- openjpa/branches/2.2.x/openjpa-kernel/src/main/java/org/apache/openjpa/meta/MetaDataTool.java (original)
+++ openjpa/branches/2.2.x/openjpa-kernel/src/main/java/org/apache/openjpa/meta/MetaDataTool.java Tue Aug 6 15:23:14 2013
@@ -264,7 +264,9 @@ public class MetaDataTool
}
});
if (!ret)
+ // START - ALLOW PRINT STATEMENTS
System.err.println(_loc.get("tool-usage"));
+ // STOP - ALLOW PRINT STATEMENTS
}
/**
Modified: openjpa/branches/2.2.x/openjpa-kernel/src/main/java/org/apache/openjpa/util/ProxyManagerImpl.java
URL: http://svn.apache.org/viewvc/openjpa/branches/2.2.x/openjpa-kernel/src/main/java/org/apache/openjpa/util/ProxyManagerImpl.java?rev=1510994&r1=1510993&r2=1510994&view=diff
==============================================================================
--- openjpa/branches/2.2.x/openjpa-kernel/src/main/java/org/apache/openjpa/util/ProxyManagerImpl.java (original)
+++ openjpa/branches/2.2.x/openjpa-kernel/src/main/java/org/apache/openjpa/util/ProxyManagerImpl.java Tue Aug 6 15:23:14 2013
@@ -1714,7 +1714,9 @@ public class ProxyManagerImpl
});
}
+ // START - ALLOW PRINT STATEMENTS
System.out.println(bc.getName());
+ // STOP - ALLOW PRINT STATEMENTS
AsmAdaptor.write(bc, new File(dir, bc.getClassName() + ".class"));
}
}
Modified: openjpa/branches/2.2.x/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/ProductDerivations.java
URL: http://svn.apache.org/viewvc/openjpa/branches/2.2.x/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/ProductDerivations.java?rev=1510994&r1=1510993&r2=1510994&view=diff
==============================================================================
--- openjpa/branches/2.2.x/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/ProductDerivations.java (original)
+++ openjpa/branches/2.2.x/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/ProductDerivations.java Tue Aug 6 15:23:14 2013
@@ -91,14 +91,18 @@ public class ProductDerivations {
}
// if some derivations weren't instantiable, warn
+ // START - ALLOW PRINT STATEMENTS
if (errors)
System.err.println(_loc.get("bad-product-derivations",
ProductDerivations.class.getName()));
+ // STOP - ALLOW PRINT STATEMENTS
for (int i = 0; i < _derivationErrors.length; i++) {
if (_derivationErrors[i] == null)
continue;
+ // START - ALLOW PRINT STATEMENTS
System.err.println(_derivationNames[i] + ":" +
_derivationErrors[i]);
+ // STOP - ALLOW PRINT STATEMENTS
break;
}
@@ -480,7 +484,9 @@ public class ProductDerivations {
* Prints product derivation information.
*/
public static void main(String[] args) {
+ // START - ALLOW PRINT STATEMENTS
System.err.println(derivationErrorsToString());
+ // STOP - ALLOW PRINT STATEMENTS
}
/**
Modified: openjpa/branches/2.2.x/openjpa-lib/src/main/java/org/apache/openjpa/lib/identifier/IdentifierUtilImpl.java
URL: http://svn.apache.org/viewvc/openjpa/branches/2.2.x/openjpa-lib/src/main/java/org/apache/openjpa/lib/identifier/IdentifierUtilImpl.java?rev=1510994&r1=1510993&r2=1510994&view=diff
==============================================================================
--- openjpa/branches/2.2.x/openjpa-lib/src/main/java/org/apache/openjpa/lib/identifier/IdentifierUtilImpl.java (original)
+++ openjpa/branches/2.2.x/openjpa-lib/src/main/java/org/apache/openjpa/lib/identifier/IdentifierUtilImpl.java Tue Aug 6 15:23:14 2013
@@ -365,7 +365,6 @@ public class IdentifierUtilImpl implemen
*/
public boolean isReservedWord(IdentifierRule rule, String name) {
if (rule == null) {
- System.out.println("NAmingConfig: " + _config.getClass().getName());
throw new IllegalArgumentException("Naming rule is null!");
}
if (rule.getReservedWords() == null) {
Modified: openjpa/branches/2.2.x/openjpa-lib/src/main/java/org/apache/openjpa/lib/jdbc/SQLFormatter.java
URL: http://svn.apache.org/viewvc/openjpa/branches/2.2.x/openjpa-lib/src/main/java/org/apache/openjpa/lib/jdbc/SQLFormatter.java?rev=1510994&r1=1510993&r2=1510994&view=diff
==============================================================================
--- openjpa/branches/2.2.x/openjpa-lib/src/main/java/org/apache/openjpa/lib/jdbc/SQLFormatter.java (original)
+++ openjpa/branches/2.2.x/openjpa-lib/src/main/java/org/apache/openjpa/lib/jdbc/SQLFormatter.java Tue Aug 6 15:23:14 2013
@@ -266,7 +266,9 @@ public class SQLFormatter {
public static void main(String [] args) {
SQLFormatter formatter = new SQLFormatter();
for (int i = 0; i < args.length; i++) {
+ // START - ALLOW PRINT STATEMENTS
System.out.println(formatter.prettyPrint(args[i]));
+ // STOP - ALLOW PRINT STATEMENTS
}
}
}
Modified: openjpa/branches/2.2.x/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceProductDerivation.java
URL: http://svn.apache.org/viewvc/openjpa/branches/2.2.x/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceProductDerivation.java?rev=1510994&r1=1510993&r2=1510994&view=diff
==============================================================================
--- openjpa/branches/2.2.x/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceProductDerivation.java (original)
+++ openjpa/branches/2.2.x/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceProductDerivation.java Tue Aug 6 15:23:14 2013
@@ -651,7 +651,9 @@ public class PersistenceProductDerivatio
*/
private static void log(String msg) {
// at this point logging isn't configured yet
+ // START - ALLOW PRINT STATEMENTS
System.err.println(msg);
+ // STOP - ALLOW PRINT STATEMENTS
}
private void addPuNameCollision(String puName, String file1, String file2){
Modified: openjpa/branches/2.2.x/openjpa-project/checkstyle.xml
URL: http://svn.apache.org/viewvc/openjpa/branches/2.2.x/openjpa-project/checkstyle.xml?rev=1510994&r1=1510993&r2=1510994&view=diff
==============================================================================
--- openjpa/branches/2.2.x/openjpa-project/checkstyle.xml (original)
+++ openjpa/branches/2.2.x/openjpa-project/checkstyle.xml Tue Aug 6 15:23:14 2013
@@ -21,17 +21,27 @@
"-//Puppy Crawl//DTD Check Configuration 1.2//EN"
"http://www.puppycrawl.com/dtds/configuration_1_2.dtd">
-<!-- This is a temporary file.
- As we get closer to enforcing the OpenJPA style to be like the
- default Sun Microsystems Definition default file, then
- we can remove this file and remove the reference from the
- pom.xml -->
+<!-- This is a temporary file. As we get closer to enforcing the OpenJPA
+ style to be like the default Sun Microsystems Definition default file, then
+ we can remove this file and remove the reference from the pom.xml -->
<module name="Checker">
- <module name="NewlineAtEndOfFile"/>
- <module name="TreeWalker">
- <module name="LineLength">
- <property name="max" value="120"/>
- </module>
- </module>
+ <module name="NewlineAtEndOfFile" />
+ <module name="TreeWalker">
+ <module name="FileContentsHolder" />
+ <module name="LineLength">
+ <property name="max" value="120" />
+ </module>
+ <module name="RegexpSinglelineJava">
+ <property name="format" value="System\.(out|err)\.print(ln)?\(" />
+ <property name="ignoreComments" value="true" />
+ </module>
+ </module>
+ <module name="SuppressionCommentFilter">
+ <property name="offCommentFormat" value="// START - ALLOW PRINT STATEMENTS" />
+ <property name="onCommentFormat" value="// STOP - ALLOW PRINT STATEMENTS" />
+ </module>
+
+ <!-- File location is specified in root pom.xml via ${checkstyle.suppressions.location} -->
+ <module name="SuppressionFilter"/>
</module>
Added: openjpa/branches/2.2.x/openjpa-project/suppressions.xml
URL: http://svn.apache.org/viewvc/openjpa/branches/2.2.x/openjpa-project/suppressions.xml?rev=1510994&view=auto
==============================================================================
--- openjpa/branches/2.2.x/openjpa-project/suppressions.xml (added)
+++ openjpa/branches/2.2.x/openjpa-project/suppressions.xml Tue Aug 6 15:23:14 2013
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+
+<!DOCTYPE suppressions PUBLIC
+ "-//Puppy Crawl//DTD Suppressions 1.1//EN"
+ "http://www.puppycrawl.com/dtds/suppressions_1_1.dtd">
+
+<suppressions>
+ <suppress checks="RegexpSinglelineJava" files=".*openjpa-examples\\.*java" />
+ <suppress checks="RegexpSinglelineJava" files="Test.*java" />
+ <suppress checks="RegexpSinglelineJava" files=".*src\\test.*java" />
+ <suppress checks="RegexpSinglelineJava" files=".*src.test.*java" />
+ <suppress checks="RegexpSinglelineJava" files="Main.java" />
+</suppressions>
Propchange: openjpa/branches/2.2.x/openjpa-project/suppressions.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: openjpa/branches/2.2.x/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/branches/2.2.x/pom.xml?rev=1510994&r1=1510993&r2=1510994&view=diff
==============================================================================
--- openjpa/branches/2.2.x/pom.xml (original)
+++ openjpa/branches/2.2.x/pom.xml Tue Aug 6 15:23:14 2013
@@ -46,6 +46,7 @@
<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>
@@ -791,12 +792,12 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
- <version>2.2</version>
+ <version>2.4</version>
<dependencies>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-velocity</artifactId>
- <version>1.1.3</version>
+ <version>1.1.5</version>
</dependency>
</dependencies>
</plugin>
@@ -1085,7 +1086,6 @@
<goal>checkstyle</goal>
</goals>
<configuration>
- <configLocation>${checkstyle.config.location}</configLocation>
<failsOnError>true</failsOnError>
<consoleOutput>true</consoleOutput>
<includeTestSourceDirectory>true</includeTestSourceDirectory>