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 20:51:22 UTC
svn commit: r1511071 - in /openjpa/branches/1.2.x: ./ openjpa-examples/
openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/
openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/
openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/ openj...
Author: curtisr7
Date: Tue Aug 6 18:51:22 2013
New Revision: 1511071
URL: http://svn.apache.org/r1511071
Log:
OPENJPA-2410: Merge checkstyle changes from trunk.
Added:
openjpa/branches/1.2.x/openjpa-project/suppressions.xml
- copied unchanged from r1511055, openjpa/branches/2.0.x/openjpa-project/suppressions.xml
Modified:
openjpa/branches/1.2.x/openjpa-examples/pom.xml
openjpa/branches/1.2.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/ClassTableJDBCSeq.java
openjpa/branches/1.2.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/NativeJDBCSeq.java
openjpa/branches/1.2.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/TableJDBCSeq.java
openjpa/branches/1.2.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/ValueTableJDBCSeq.java
openjpa/branches/1.2.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/MappingTool.java
openjpa/branches/1.2.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/ReverseMappingTool.java
openjpa/branches/1.2.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/SchemaTool.java
openjpa/branches/1.2.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/TableSchemaFactory.java
openjpa/branches/1.2.x/openjpa-kernel/src/main/java/org/apache/openjpa/conf/MetaDataCacheMaintenance.java
openjpa/branches/1.2.x/openjpa-kernel/src/main/java/org/apache/openjpa/conf/OpenJPAVersion.java
openjpa/branches/1.2.x/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/ApplicationIdTool.java
openjpa/branches/1.2.x/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/ManagedClassSubclasser.java
openjpa/branches/1.2.x/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/PCEnhancer.java
openjpa/branches/1.2.x/openjpa-kernel/src/main/java/org/apache/openjpa/meta/MetaDataTool.java
openjpa/branches/1.2.x/openjpa-kernel/src/main/java/org/apache/openjpa/util/ProxyManagerImpl.java
openjpa/branches/1.2.x/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/ProductDerivations.java
openjpa/branches/1.2.x/openjpa-lib/src/main/java/org/apache/openjpa/lib/jdbc/SQLFormatter.java
openjpa/branches/1.2.x/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/JavaVersions.java
openjpa/branches/1.2.x/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceProductDerivation.java
openjpa/branches/1.2.x/openjpa-project/checkstyle.xml
openjpa/branches/1.2.x/openjpa-slice/src/main/java/org/apache/openjpa/slice/jdbc/DistributedStoreManager.java
openjpa/branches/1.2.x/pom.xml
Modified: openjpa/branches/1.2.x/openjpa-examples/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/branches/1.2.x/openjpa-examples/pom.xml?rev=1511071&r1=1511070&r2=1511071&view=diff
==============================================================================
--- openjpa/branches/1.2.x/openjpa-examples/pom.xml (original)
+++ openjpa/branches/1.2.x/openjpa-examples/pom.xml Tue Aug 6 18:51:22 2013
@@ -39,6 +39,7 @@
<properties>
<openjpa.Log>DefaultLevel=WARN</openjpa.Log>
+ <checkstyle.suppressions.location>${project.basedir}/../openjpa-project/suppressions.xml</checkstyle.suppressions.location>
</properties>
<dependencies>
Modified: openjpa/branches/1.2.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/ClassTableJDBCSeq.java
URL: http://svn.apache.org/viewvc/openjpa/branches/1.2.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/ClassTableJDBCSeq.java?rev=1511071&r1=1511070&r2=1511071&view=diff
==============================================================================
--- openjpa/branches/1.2.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/ClassTableJDBCSeq.java (original)
+++ openjpa/branches/1.2.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/ClassTableJDBCSeq.java Tue Aug 6 18:51:22 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/1.2.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/NativeJDBCSeq.java
URL: http://svn.apache.org/viewvc/openjpa/branches/1.2.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/NativeJDBCSeq.java?rev=1511071&r1=1511070&r2=1511071&view=diff
==============================================================================
--- openjpa/branches/1.2.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/NativeJDBCSeq.java (original)
+++ openjpa/branches/1.2.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/NativeJDBCSeq.java Tue Aug 6 18:51:22 2013
@@ -387,7 +387,9 @@ public class NativeJDBCSeq
}
});
if (!ret)
+ // START - ALLOW PRINT STATEMENTS
System.out.println(_loc.get("native-seq-usage"));
+ // STOP - ALLOW PRINT STATEMENTS
}
/**
@@ -422,7 +424,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/1.2.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/TableJDBCSeq.java
URL: http://svn.apache.org/viewvc/openjpa/branches/1.2.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/TableJDBCSeq.java?rev=1511071&r1=1511070&r2=1511071&view=diff
==============================================================================
--- openjpa/branches/1.2.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/TableJDBCSeq.java (original)
+++ openjpa/branches/1.2.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/TableJDBCSeq.java Tue Aug 6 18:51:22 2013
@@ -672,7 +672,9 @@ public class TableJDBCSeq
}
});
if (!ret)
+ // START - ALLOW PRINT STATEMENTS
System.out.println(_loc.get("seq-usage"));
+ // STOP - ALLOW PRINT STATEMENTS
}
/**
@@ -709,7 +711,9 @@ public class TableJDBCSeq
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)
@@ -724,7 +728,9 @@ public class TableJDBCSeq
conn);
set = stat.seq;
}
+ // START - ALLOW PRINT STATEMENTS
System.err.println(set);
+ // STOP - ALLOW PRINT STATEMENTS
}
}
catch (NumberFormatException nfe) {
Modified: openjpa/branches/1.2.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/ValueTableJDBCSeq.java
URL: http://svn.apache.org/viewvc/openjpa/branches/1.2.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/ValueTableJDBCSeq.java?rev=1511071&r1=1511070&r2=1511071&view=diff
==============================================================================
--- openjpa/branches/1.2.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/ValueTableJDBCSeq.java (original)
+++ openjpa/branches/1.2.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/ValueTableJDBCSeq.java Tue Aug 6 18:51:22 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/1.2.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/MappingTool.java
URL: http://svn.apache.org/viewvc/openjpa/branches/1.2.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/MappingTool.java?rev=1511071&r1=1511070&r2=1511071&view=diff
==============================================================================
--- openjpa/branches/1.2.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/MappingTool.java (original)
+++ openjpa/branches/1.2.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/MappingTool.java Tue Aug 6 18:51:22 2013
@@ -931,7 +931,9 @@ public class MappingTool
}
});
if (!ret)
+ // START - ALLOW PRINT STATEMENTS
System.err.println(_loc.get("tool-usage"));
+ // STOP - ALLOW PRINT STATEMENTS
}
/**
Modified: openjpa/branches/1.2.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/ReverseMappingTool.java
URL: http://svn.apache.org/viewvc/openjpa/branches/1.2.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/ReverseMappingTool.java?rev=1511071&r1=1511070&r2=1511071&view=diff
==============================================================================
--- openjpa/branches/1.2.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/ReverseMappingTool.java (original)
+++ openjpa/branches/1.2.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/meta/ReverseMappingTool.java Tue Aug 6 18:51:22 2013
@@ -1832,7 +1832,9 @@ public class ReverseMappingTool
}
});
if (!ret)
+ // START - ALLOW PRINT STATEMENTS
System.out.println(_loc.get("revtool-usage"));
+ // STOP - ALLOW PRINT STATEMENTS
}
/**
Modified: openjpa/branches/1.2.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/SchemaTool.java
URL: http://svn.apache.org/viewvc/openjpa/branches/1.2.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/SchemaTool.java?rev=1511071&r1=1511070&r2=1511071&view=diff
==============================================================================
--- openjpa/branches/1.2.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/SchemaTool.java (original)
+++ openjpa/branches/1.2.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/SchemaTool.java Tue Aug 6 18:51:22 2013
@@ -1352,7 +1352,9 @@ public class SchemaTool {
}
});
if (!ret)
+ // START - ALLOW PRINT STATEMENTS
System.out.println(_loc.get("tool-usage"));
+ // STOP - ALLOW PRINT STATEMENTS
}
/**
Modified: openjpa/branches/1.2.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/TableSchemaFactory.java
URL: http://svn.apache.org/viewvc/openjpa/branches/1.2.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/TableSchemaFactory.java?rev=1511071&r1=1511070&r2=1511071&view=diff
==============================================================================
--- openjpa/branches/1.2.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/TableSchemaFactory.java (original)
+++ openjpa/branches/1.2.x/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/schema/TableSchemaFactory.java Tue Aug 6 18:51:22 2013
@@ -462,7 +462,9 @@ public class TableSchemaFactory
}
});
if (!ret)
+ // START - ALLOW PRINT STATEMENTS
System.out.println(_loc.get("sch-usage"));
+ // STOP - ALLOW PRINT STATEMENTS
}
/**
Modified: openjpa/branches/1.2.x/openjpa-kernel/src/main/java/org/apache/openjpa/conf/MetaDataCacheMaintenance.java
URL: http://svn.apache.org/viewvc/openjpa/branches/1.2.x/openjpa-kernel/src/main/java/org/apache/openjpa/conf/MetaDataCacheMaintenance.java?rev=1511071&r1=1511070&r2=1511071&view=diff
==============================================================================
--- openjpa/branches/1.2.x/openjpa-kernel/src/main/java/org/apache/openjpa/conf/MetaDataCacheMaintenance.java (original)
+++ openjpa/branches/1.2.x/openjpa-kernel/src/main/java/org/apache/openjpa/conf/MetaDataCacheMaintenance.java Tue Aug 6 18:51:22 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/1.2.x/openjpa-kernel/src/main/java/org/apache/openjpa/conf/OpenJPAVersion.java
URL: http://svn.apache.org/viewvc/openjpa/branches/1.2.x/openjpa-kernel/src/main/java/org/apache/openjpa/conf/OpenJPAVersion.java?rev=1511071&r1=1511070&r2=1511071&view=diff
==============================================================================
--- openjpa/branches/1.2.x/openjpa-kernel/src/main/java/org/apache/openjpa/conf/OpenJPAVersion.java (original)
+++ openjpa/branches/1.2.x/openjpa-kernel/src/main/java/org/apache/openjpa/conf/OpenJPAVersion.java Tue Aug 6 18:51:22 2013
@@ -95,7 +95,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/1.2.x/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/ApplicationIdTool.java
URL: http://svn.apache.org/viewvc/openjpa/branches/1.2.x/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/ApplicationIdTool.java?rev=1511071&r1=1511070&r2=1511071&view=diff
==============================================================================
--- openjpa/branches/1.2.x/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/ApplicationIdTool.java (original)
+++ openjpa/branches/1.2.x/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/ApplicationIdTool.java Tue Aug 6 18:51:22 2013
@@ -1296,7 +1296,9 @@ public class ApplicationIdTool {
}
});
if (!ret)
+ // START - ALLOW PRINT STATEMENTS
System.err.println(_loc.get("appid-usage"));
+ // STOP - ALLOW PRINT STATEMENTS
}
/**
Modified: openjpa/branches/1.2.x/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/ManagedClassSubclasser.java
URL: http://svn.apache.org/viewvc/openjpa/branches/1.2.x/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/ManagedClassSubclasser.java?rev=1511071&r1=1511070&r2=1511071&view=diff
==============================================================================
--- openjpa/branches/1.2.x/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/ManagedClassSubclasser.java (original)
+++ openjpa/branches/1.2.x/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/ManagedClassSubclasser.java Tue Aug 6 18:51:22 2013
@@ -278,8 +278,10 @@ 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);
bc.write(f);
+ // STOP - ALLOW PRINT STATEMENTS
}
}
Modified: openjpa/branches/1.2.x/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/PCEnhancer.java
URL: http://svn.apache.org/viewvc/openjpa/branches/1.2.x/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/PCEnhancer.java?rev=1511071&r1=1511070&r2=1511071&view=diff
==============================================================================
--- openjpa/branches/1.2.x/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/PCEnhancer.java (original)
+++ openjpa/branches/1.2.x/openjpa-kernel/src/main/java/org/apache/openjpa/enhance/PCEnhancer.java Tue Aug 6 18:51:22 2013
@@ -4469,7 +4469,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/1.2.x/openjpa-kernel/src/main/java/org/apache/openjpa/meta/MetaDataTool.java
URL: http://svn.apache.org/viewvc/openjpa/branches/1.2.x/openjpa-kernel/src/main/java/org/apache/openjpa/meta/MetaDataTool.java?rev=1511071&r1=1511070&r2=1511071&view=diff
==============================================================================
--- openjpa/branches/1.2.x/openjpa-kernel/src/main/java/org/apache/openjpa/meta/MetaDataTool.java (original)
+++ openjpa/branches/1.2.x/openjpa-kernel/src/main/java/org/apache/openjpa/meta/MetaDataTool.java Tue Aug 6 18:51:22 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/1.2.x/openjpa-kernel/src/main/java/org/apache/openjpa/util/ProxyManagerImpl.java
URL: http://svn.apache.org/viewvc/openjpa/branches/1.2.x/openjpa-kernel/src/main/java/org/apache/openjpa/util/ProxyManagerImpl.java?rev=1511071&r1=1511070&r2=1511071&view=diff
==============================================================================
--- openjpa/branches/1.2.x/openjpa-kernel/src/main/java/org/apache/openjpa/util/ProxyManagerImpl.java (original)
+++ openjpa/branches/1.2.x/openjpa-kernel/src/main/java/org/apache/openjpa/util/ProxyManagerImpl.java Tue Aug 6 18:51:22 2013
@@ -1655,8 +1655,10 @@ public class ProxyManagerImpl
});
}
+ // START - ALLOW PRINT STATEMENTS
System.out.println(bc.getName());
bc.write(new File(dir, bc.getClassName() + ".class"));
+ // STOP - ALLOW PRINT STATEMENTS
}
}
}
Modified: openjpa/branches/1.2.x/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/ProductDerivations.java
URL: http://svn.apache.org/viewvc/openjpa/branches/1.2.x/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/ProductDerivations.java?rev=1511071&r1=1511070&r2=1511071&view=diff
==============================================================================
--- openjpa/branches/1.2.x/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/ProductDerivations.java (original)
+++ openjpa/branches/1.2.x/openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/ProductDerivations.java Tue Aug 6 18:51:22 2013
@@ -85,8 +85,10 @@ public class ProductDerivations {
for (int i = 0; i < _derivationErrors.length; i++) {
if (_derivationErrors[i] == null)
continue;
+ // START - ALLOW PRINT STATEMENTS
System.err.println(_loc.get("bad-product-derivations",
ProductDerivations.class.getName()));
+ // STOP - ALLOW PRINT STATEMENTS
break;
}
@@ -451,7 +453,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/1.2.x/openjpa-lib/src/main/java/org/apache/openjpa/lib/jdbc/SQLFormatter.java
URL: http://svn.apache.org/viewvc/openjpa/branches/1.2.x/openjpa-lib/src/main/java/org/apache/openjpa/lib/jdbc/SQLFormatter.java?rev=1511071&r1=1511070&r2=1511071&view=diff
==============================================================================
--- openjpa/branches/1.2.x/openjpa-lib/src/main/java/org/apache/openjpa/lib/jdbc/SQLFormatter.java (original)
+++ openjpa/branches/1.2.x/openjpa-lib/src/main/java/org/apache/openjpa/lib/jdbc/SQLFormatter.java Tue Aug 6 18:51:22 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/1.2.x/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/JavaVersions.java
URL: http://svn.apache.org/viewvc/openjpa/branches/1.2.x/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/JavaVersions.java?rev=1511071&r1=1511070&r2=1511071&view=diff
==============================================================================
--- openjpa/branches/1.2.x/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/JavaVersions.java (original)
+++ openjpa/branches/1.2.x/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/JavaVersions.java Tue Aug 6 18:51:22 2013
@@ -258,6 +258,8 @@ public class JavaVersions {
}
public static void main(String[] args) {
+ // START - ALLOW PRINT STATEMENTS
System.out.println("Java version is: " + VERSION);
+ // STOP - ALLOW PRINT STATEMENTS
}
}
Modified: openjpa/branches/1.2.x/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceProductDerivation.java
URL: http://svn.apache.org/viewvc/openjpa/branches/1.2.x/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceProductDerivation.java?rev=1511071&r1=1511070&r2=1511071&view=diff
==============================================================================
--- openjpa/branches/1.2.x/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceProductDerivation.java (original)
+++ openjpa/branches/1.2.x/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceProductDerivation.java Tue Aug 6 18:51:22 2013
@@ -432,7 +432,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
}
/**
Modified: openjpa/branches/1.2.x/openjpa-project/checkstyle.xml
URL: http://svn.apache.org/viewvc/openjpa/branches/1.2.x/openjpa-project/checkstyle.xml?rev=1511071&r1=1511070&r2=1511071&view=diff
==============================================================================
--- openjpa/branches/1.2.x/openjpa-project/checkstyle.xml (original)
+++ openjpa/branches/1.2.x/openjpa-project/checkstyle.xml Tue Aug 6 18:51:22 2013
@@ -21,17 +21,23 @@
"-//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="TreeWalker">
+ <module name="FileContentsHolder" />
+ <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>
Modified: openjpa/branches/1.2.x/openjpa-slice/src/main/java/org/apache/openjpa/slice/jdbc/DistributedStoreManager.java
URL: http://svn.apache.org/viewvc/openjpa/branches/1.2.x/openjpa-slice/src/main/java/org/apache/openjpa/slice/jdbc/DistributedStoreManager.java?rev=1511071&r1=1511070&r2=1511071&view=diff
==============================================================================
--- openjpa/branches/1.2.x/openjpa-slice/src/main/java/org/apache/openjpa/slice/jdbc/DistributedStoreManager.java (original)
+++ openjpa/branches/1.2.x/openjpa-slice/src/main/java/org/apache/openjpa/slice/jdbc/DistributedStoreManager.java Tue Aug 6 18:51:22 2013
@@ -415,7 +415,9 @@ class DistributedStoreManager extends JD
}
void log(String s) {
+ // START - ALLOW PRINT STATEMENTS
System.out.println("["+Thread.currentThread().getName()+"] " + this + s);
+ // STOP - ALLOW PRINT STATEMENTS
}
private static class Flusher implements Callable<Collection> {
Modified: openjpa/branches/1.2.x/pom.xml
URL: http://svn.apache.org/viewvc/openjpa/branches/1.2.x/pom.xml?rev=1511071&r1=1511070&r2=1511071&view=diff
==============================================================================
--- openjpa/branches/1.2.x/pom.xml (original)
+++ openjpa/branches/1.2.x/pom.xml Tue Aug 6 18:51:22 2013
@@ -42,6 +42,8 @@
<openjpa.version>${project.version}</openjpa.version>
<openjpa.Log>DefaultLevel=INFO</openjpa.Log>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <checkstyle.config.location>${project.basedir}${file.separator}..${file.separator}openjpa-project${file.separator}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/${user.name}/public_html/openjpa/${project.version}/staging-site</site.deploy.url>
<!-- the test settings can be overridden my specific profiles -->
<test.jvm.maxpermsize>256m</test.jvm.maxpermsize>
@@ -554,6 +556,18 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <version>2.4</version>
+ <dependencies>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-velocity</artifactId>
+ <version>1.1.5</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<executions>
<execution>
@@ -652,6 +666,24 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>process-sources</phase>
+ <goals>
+ <goal>checkstyle</goal>
+ </goals>
+ <configuration>
+ <failsOnError>true</failsOnError>
+ <consoleOutput>true</consoleOutput>
+ <includeTestSourceDirectory>true</includeTestSourceDirectory>
+ <excludes>**/*_.java</excludes>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<executions>
<execution>