diff --git a/jOOQ-codegen-maven-example/.classpath b/jOOQ-codegen-maven-example/.classpath index 6a3e92751f..72f5ee4f7b 100644 --- a/jOOQ-codegen-maven-example/.classpath +++ b/jOOQ-codegen-maven-example/.classpath @@ -2,7 +2,11 @@ + + + + diff --git a/jOOQ-codegen-maven-example/.project b/jOOQ-codegen-maven-example/.project index 8c8d1bdd5a..dcdaacc59b 100644 --- a/jOOQ-codegen-maven-example/.project +++ b/jOOQ-codegen-maven-example/.project @@ -15,8 +15,14 @@ + + org.maven.ide.eclipse.maven2Builder + + + + org.maven.ide.eclipse.maven2Nature org.eclipse.m2e.core.maven2Nature org.eclipse.jdt.core.javanature diff --git a/jOOQ-codegen-maven/.classpath b/jOOQ-codegen-maven/.classpath index 8fe0193eb9..b6fe6934a6 100644 --- a/jOOQ-codegen-maven/.classpath +++ b/jOOQ-codegen-maven/.classpath @@ -3,6 +3,7 @@ + diff --git a/jOOQ-codegen-maven/.project b/jOOQ-codegen-maven/.project index cff8979e7c..804e86415c 100644 --- a/jOOQ-codegen-maven/.project +++ b/jOOQ-codegen-maven/.project @@ -15,8 +15,14 @@ + + org.maven.ide.eclipse.maven2Builder + + + + org.maven.ide.eclipse.maven2Nature org.eclipse.m2e.core.maven2Nature org.eclipse.jdt.core.javanature diff --git a/jOOQ-codegen/.classpath b/jOOQ-codegen/.classpath index 8fe0193eb9..b936bae138 100644 --- a/jOOQ-codegen/.classpath +++ b/jOOQ-codegen/.classpath @@ -2,7 +2,8 @@ - - + + + diff --git a/jOOQ-codegen/.project b/jOOQ-codegen/.project index 85cac7c62a..c03314e4fe 100644 --- a/jOOQ-codegen/.project +++ b/jOOQ-codegen/.project @@ -15,8 +15,14 @@ + + org.maven.ide.eclipse.maven2Builder + + + + org.maven.ide.eclipse.maven2Nature org.eclipse.m2e.core.maven2Nature org.eclipse.jdt.core.javanature diff --git a/jOOQ-console/.classpath b/jOOQ-console/.classpath index 8fe0193eb9..b6fe6934a6 100644 --- a/jOOQ-console/.classpath +++ b/jOOQ-console/.classpath @@ -3,6 +3,7 @@ + diff --git a/jOOQ-console/.project b/jOOQ-console/.project index fe48822793..64cfe0e677 100644 --- a/jOOQ-console/.project +++ b/jOOQ-console/.project @@ -15,8 +15,14 @@ + + org.maven.ide.eclipse.maven2Builder + + + + org.maven.ide.eclipse.maven2Nature org.eclipse.m2e.core.maven2Nature org.eclipse.jdt.core.javanature diff --git a/jOOQ-meta/.classpath b/jOOQ-meta/.classpath index 8fe0193eb9..5f214def43 100644 --- a/jOOQ-meta/.classpath +++ b/jOOQ-meta/.classpath @@ -1,8 +1,10 @@ + - - + + + diff --git a/jOOQ-meta/.project b/jOOQ-meta/.project index 4fc0081f56..6ed447bd12 100644 --- a/jOOQ-meta/.project +++ b/jOOQ-meta/.project @@ -15,8 +15,14 @@ + + org.maven.ide.eclipse.maven2Builder + + + + org.maven.ide.eclipse.maven2Nature org.eclipse.m2e.core.maven2Nature org.eclipse.jdt.core.javanature diff --git a/jOOQ-test/.classpath b/jOOQ-test/.classpath index 03f0d4466d..e4a80ef6f8 100644 --- a/jOOQ-test/.classpath +++ b/jOOQ-test/.classpath @@ -28,5 +28,6 @@ + diff --git a/jOOQ-test/launch/Console.launch b/jOOQ-test/launch/Console.launch index c010b76e77..e7a6fdb989 100644 --- a/jOOQ-test/launch/Console.launch +++ b/jOOQ-test/launch/Console.launch @@ -10,9 +10,9 @@ - + - + diff --git a/jOOQ-test/launch/GenerationTool CUBRID demodb.launch b/jOOQ-test/launch/GenerationTool CUBRID demodb.launch index 5b4a7d5f64..cdf23db757 100644 --- a/jOOQ-test/launch/GenerationTool CUBRID demodb.launch +++ b/jOOQ-test/launch/GenerationTool CUBRID demodb.launch @@ -23,11 +23,11 @@ - + - + diff --git a/jOOQ-test/launch/GenerationTool CUBRID test.launch b/jOOQ-test/launch/GenerationTool CUBRID test.launch index 57c5a3c1d5..8a4b7131cf 100644 --- a/jOOQ-test/launch/GenerationTool CUBRID test.launch +++ b/jOOQ-test/launch/GenerationTool CUBRID test.launch @@ -23,11 +23,11 @@ - + - + diff --git a/jOOQ-test/launch/GenerationTool DB2 test.launch b/jOOQ-test/launch/GenerationTool DB2 test.launch index b7cdf8533d..66d22387a0 100644 --- a/jOOQ-test/launch/GenerationTool DB2 test.launch +++ b/jOOQ-test/launch/GenerationTool DB2 test.launch @@ -25,11 +25,11 @@ - + - + diff --git a/jOOQ-test/launch/GenerationTool Derby test.launch b/jOOQ-test/launch/GenerationTool Derby test.launch index 14b48bed5c..68bb9883d1 100644 --- a/jOOQ-test/launch/GenerationTool Derby test.launch +++ b/jOOQ-test/launch/GenerationTool Derby test.launch @@ -32,11 +32,11 @@ - + - + diff --git a/jOOQ-test/launch/GenerationTool H2 test.launch b/jOOQ-test/launch/GenerationTool H2 test.launch index b1fcdf559d..ef74685440 100644 --- a/jOOQ-test/launch/GenerationTool H2 test.launch +++ b/jOOQ-test/launch/GenerationTool H2 test.launch @@ -41,11 +41,11 @@ - + - + diff --git a/jOOQ-test/launch/GenerationTool HSQLDB test.launch b/jOOQ-test/launch/GenerationTool HSQLDB test.launch index ee86b7ac0e..be6c247009 100644 --- a/jOOQ-test/launch/GenerationTool HSQLDB test.launch +++ b/jOOQ-test/launch/GenerationTool HSQLDB test.launch @@ -24,12 +24,12 @@ - + - + diff --git a/jOOQ-test/launch/GenerationTool Ingres test.launch b/jOOQ-test/launch/GenerationTool Ingres test.launch index 1d57bfc744..feb56de741 100644 --- a/jOOQ-test/launch/GenerationTool Ingres test.launch +++ b/jOOQ-test/launch/GenerationTool Ingres test.launch @@ -36,11 +36,11 @@ - + - + diff --git a/jOOQ-test/launch/GenerationTool MySQL sakila.launch b/jOOQ-test/launch/GenerationTool MySQL sakila.launch index a2b8d8f3cb..3e35e3d2f8 100644 --- a/jOOQ-test/launch/GenerationTool MySQL sakila.launch +++ b/jOOQ-test/launch/GenerationTool MySQL sakila.launch @@ -25,11 +25,11 @@ - + - + diff --git a/jOOQ-test/launch/GenerationTool MySQL test.launch b/jOOQ-test/launch/GenerationTool MySQL test.launch index 38dba72ca9..987dce037a 100644 --- a/jOOQ-test/launch/GenerationTool MySQL test.launch +++ b/jOOQ-test/launch/GenerationTool MySQL test.launch @@ -25,11 +25,11 @@ - + - + diff --git a/jOOQ-test/launch/GenerationTool MySQL test2 (schema-rewrite).launch b/jOOQ-test/launch/GenerationTool MySQL test2 (schema-rewrite).launch index 153d850679..a0a5e6af88 100644 --- a/jOOQ-test/launch/GenerationTool MySQL test2 (schema-rewrite).launch +++ b/jOOQ-test/launch/GenerationTool MySQL test2 (schema-rewrite).launch @@ -25,11 +25,11 @@ - + - + diff --git a/jOOQ-test/launch/GenerationTool Oracle sys-test.launch b/jOOQ-test/launch/GenerationTool Oracle sys-test.launch index 763ac4eae1..3b0e7bbe8c 100644 --- a/jOOQ-test/launch/GenerationTool Oracle sys-test.launch +++ b/jOOQ-test/launch/GenerationTool Oracle sys-test.launch @@ -20,11 +20,11 @@ - + - + diff --git a/jOOQ-test/launch/GenerationTool Oracle test (custom strategy).launch b/jOOQ-test/launch/GenerationTool Oracle test (custom strategy).launch index 0b50dc2cef..7f870b7f14 100644 --- a/jOOQ-test/launch/GenerationTool Oracle test (custom strategy).launch +++ b/jOOQ-test/launch/GenerationTool Oracle test (custom strategy).launch @@ -21,11 +21,11 @@ - + - + diff --git a/jOOQ-test/launch/GenerationTool Oracle test (map date to timestamp).launch b/jOOQ-test/launch/GenerationTool Oracle test (map date to timestamp).launch index df62ee0f5f..c1b92e98de 100644 --- a/jOOQ-test/launch/GenerationTool Oracle test (map date to timestamp).launch +++ b/jOOQ-test/launch/GenerationTool Oracle test (map date to timestamp).launch @@ -22,11 +22,11 @@ - + - + diff --git a/jOOQ-test/launch/GenerationTool Oracle test.launch b/jOOQ-test/launch/GenerationTool Oracle test.launch index 6d40a209bc..639c027c5a 100644 --- a/jOOQ-test/launch/GenerationTool Oracle test.launch +++ b/jOOQ-test/launch/GenerationTool Oracle test.launch @@ -21,11 +21,11 @@ - + - + diff --git a/jOOQ-test/launch/GenerationTool Postgres test.launch b/jOOQ-test/launch/GenerationTool Postgres test.launch index 47b5791326..e86bfedfd1 100644 --- a/jOOQ-test/launch/GenerationTool Postgres test.launch +++ b/jOOQ-test/launch/GenerationTool Postgres test.launch @@ -31,11 +31,11 @@ - + - + diff --git a/jOOQ-test/launch/GenerationTool SQLServer AdventureWorks.launch b/jOOQ-test/launch/GenerationTool SQLServer AdventureWorks.launch index 56eb9e7c88..35a3a77a59 100644 --- a/jOOQ-test/launch/GenerationTool SQLServer AdventureWorks.launch +++ b/jOOQ-test/launch/GenerationTool SQLServer AdventureWorks.launch @@ -32,12 +32,12 @@ - + - + diff --git a/jOOQ-test/launch/GenerationTool SQLServer test.launch b/jOOQ-test/launch/GenerationTool SQLServer test.launch index 158554cbac..8eac000eb5 100644 --- a/jOOQ-test/launch/GenerationTool SQLServer test.launch +++ b/jOOQ-test/launch/GenerationTool SQLServer test.launch @@ -32,12 +32,12 @@ - + - + diff --git a/jOOQ-test/launch/GenerationTool SQLite test.launch b/jOOQ-test/launch/GenerationTool SQLite test.launch index 1cef7c2705..7c6d75701b 100644 --- a/jOOQ-test/launch/GenerationTool SQLite test.launch +++ b/jOOQ-test/launch/GenerationTool SQLite test.launch @@ -31,11 +31,11 @@ - + - + diff --git a/jOOQ-test/launch/GenerationTool Sybase ASE test.launch b/jOOQ-test/launch/GenerationTool Sybase ASE test.launch index 9d48179cca..1de69a82dc 100644 --- a/jOOQ-test/launch/GenerationTool Sybase ASE test.launch +++ b/jOOQ-test/launch/GenerationTool Sybase ASE test.launch @@ -25,11 +25,11 @@ - + - + diff --git a/jOOQ-test/launch/GenerationTool Sybase test.launch b/jOOQ-test/launch/GenerationTool Sybase test.launch index d1ba16ef94..ad8af09d89 100644 --- a/jOOQ-test/launch/GenerationTool Sybase test.launch +++ b/jOOQ-test/launch/GenerationTool Sybase test.launch @@ -24,11 +24,11 @@ - + - + diff --git a/jOOQ-test/launch/Meta-Generate CUBRID dba.launch b/jOOQ-test/launch/Meta-Generate CUBRID dba.launch index 62ef1b24ff..5bc925a83a 100644 --- a/jOOQ-test/launch/Meta-Generate CUBRID dba.launch +++ b/jOOQ-test/launch/Meta-Generate CUBRID dba.launch @@ -21,11 +21,11 @@ - + - + diff --git a/jOOQ-test/launch/Meta-Generate DB2 syscat.launch b/jOOQ-test/launch/Meta-Generate DB2 syscat.launch index 038e6138ea..176a944d2d 100644 --- a/jOOQ-test/launch/Meta-Generate DB2 syscat.launch +++ b/jOOQ-test/launch/Meta-Generate DB2 syscat.launch @@ -20,11 +20,11 @@ - + - + diff --git a/jOOQ-test/launch/Meta-Generate Derby sys.launch b/jOOQ-test/launch/Meta-Generate Derby sys.launch index 811ef6f7e4..4178717297 100644 --- a/jOOQ-test/launch/Meta-Generate Derby sys.launch +++ b/jOOQ-test/launch/Meta-Generate Derby sys.launch @@ -29,11 +29,11 @@ - + - + diff --git a/jOOQ-test/launch/Meta-Generate H2 information_schema.launch b/jOOQ-test/launch/Meta-Generate H2 information_schema.launch index e6f5ad0ff1..98b404cbfe 100644 --- a/jOOQ-test/launch/Meta-Generate H2 information_schema.launch +++ b/jOOQ-test/launch/Meta-Generate H2 information_schema.launch @@ -32,11 +32,11 @@ - + - + diff --git a/jOOQ-test/launch/Meta-Generate HSQLDB information_schema.launch b/jOOQ-test/launch/Meta-Generate HSQLDB information_schema.launch index 24467c92f6..0f76db2d0e 100644 --- a/jOOQ-test/launch/Meta-Generate HSQLDB information_schema.launch +++ b/jOOQ-test/launch/Meta-Generate HSQLDB information_schema.launch @@ -24,11 +24,11 @@ - + - + diff --git a/jOOQ-test/launch/Meta-Generate Ingres $ingres.launch b/jOOQ-test/launch/Meta-Generate Ingres $ingres.launch index ae86a2fb3a..1abebb1a00 100644 --- a/jOOQ-test/launch/Meta-Generate Ingres $ingres.launch +++ b/jOOQ-test/launch/Meta-Generate Ingres $ingres.launch @@ -36,11 +36,11 @@ - + - + diff --git a/jOOQ-test/launch/Meta-Generate MySQL information_schema.launch b/jOOQ-test/launch/Meta-Generate MySQL information_schema.launch index 88cb0a9eb9..194eab72f3 100644 --- a/jOOQ-test/launch/Meta-Generate MySQL information_schema.launch +++ b/jOOQ-test/launch/Meta-Generate MySQL information_schema.launch @@ -22,11 +22,11 @@ - + - + diff --git a/jOOQ-test/launch/Meta-Generate MySQL mysql.launch b/jOOQ-test/launch/Meta-Generate MySQL mysql.launch index 1e4406d51b..c8479c63a7 100644 --- a/jOOQ-test/launch/Meta-Generate MySQL mysql.launch +++ b/jOOQ-test/launch/Meta-Generate MySQL mysql.launch @@ -22,11 +22,11 @@ - + - + diff --git a/jOOQ-test/launch/Meta-Generate Oracle sys.launch b/jOOQ-test/launch/Meta-Generate Oracle sys.launch index 7785a86b8a..9f7dabce85 100644 --- a/jOOQ-test/launch/Meta-Generate Oracle sys.launch +++ b/jOOQ-test/launch/Meta-Generate Oracle sys.launch @@ -20,11 +20,11 @@ - + - + diff --git a/jOOQ-test/launch/Meta-Generate Postgres information_schema.launch b/jOOQ-test/launch/Meta-Generate Postgres information_schema.launch index 07f11f9e41..69b4f794b0 100644 --- a/jOOQ-test/launch/Meta-Generate Postgres information_schema.launch +++ b/jOOQ-test/launch/Meta-Generate Postgres information_schema.launch @@ -23,11 +23,11 @@ - + - + diff --git a/jOOQ-test/launch/Meta-Generate Postgres pg_catalog.launch b/jOOQ-test/launch/Meta-Generate Postgres pg_catalog.launch index 2c6a5eec51..cd450923c0 100644 --- a/jOOQ-test/launch/Meta-Generate Postgres pg_catalog.launch +++ b/jOOQ-test/launch/Meta-Generate Postgres pg_catalog.launch @@ -20,11 +20,11 @@ - + - + diff --git a/jOOQ-test/launch/Meta-Generate SQLServer information_schema.launch b/jOOQ-test/launch/Meta-Generate SQLServer information_schema.launch index c11a0a995d..b0806b36c8 100644 --- a/jOOQ-test/launch/Meta-Generate SQLServer information_schema.launch +++ b/jOOQ-test/launch/Meta-Generate SQLServer information_schema.launch @@ -21,11 +21,11 @@ - + - + diff --git a/jOOQ-test/launch/Meta-Generate Sybase ASE sys.launch b/jOOQ-test/launch/Meta-Generate Sybase ASE sys.launch index 165e9726a4..7a0711c7a6 100644 --- a/jOOQ-test/launch/Meta-Generate Sybase ASE sys.launch +++ b/jOOQ-test/launch/Meta-Generate Sybase ASE sys.launch @@ -22,10 +22,10 @@ - + - + diff --git a/jOOQ-test/launch/Meta-Generate Sybase sys.launch b/jOOQ-test/launch/Meta-Generate Sybase sys.launch index a48617d0f8..f60f7f3a5a 100644 --- a/jOOQ-test/launch/Meta-Generate Sybase sys.launch +++ b/jOOQ-test/launch/Meta-Generate Sybase sys.launch @@ -21,10 +21,10 @@ - + - + diff --git a/jOOQ-website/.classpath b/jOOQ-website/.classpath index 8fe0193eb9..e24c95c89d 100644 --- a/jOOQ-website/.classpath +++ b/jOOQ-website/.classpath @@ -2,7 +2,8 @@ - + + diff --git a/jOOQ-website/.project b/jOOQ-website/.project index c06b9f3812..08bfce2bfb 100644 --- a/jOOQ-website/.project +++ b/jOOQ-website/.project @@ -15,8 +15,14 @@ + + org.maven.ide.eclipse.maven2Builder + + + + org.maven.ide.eclipse.maven2Nature org.eclipse.m2e.core.maven2Nature org.eclipse.jdt.core.javanature diff --git a/jOOQ-website/.settings/org.eclipse.jdt.core.prefs b/jOOQ-website/.settings/org.eclipse.jdt.core.prefs index 26fd9da7dd..bb300a788a 100644 --- a/jOOQ-website/.settings/org.eclipse.jdt.core.prefs +++ b/jOOQ-website/.settings/org.eclipse.jdt.core.prefs @@ -1,8 +1,8 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.compiler.compliance=1.5 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -73,7 +73,7 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disa org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.source=1.6 +org.eclipse.jdt.core.compiler.source=1.5 org.eclipse.jdt.core.formatter.align_type_members_on_columns=true org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 diff --git a/jOOQ-website/community.php b/jOOQ-website/community.php index cb69053287..abb762b5db 100644 --- a/jOOQ-website/community.php +++ b/jOOQ-website/community.php @@ -53,7 +53,7 @@ Telling the world:
  • Check out the codebase from sourceforge: SVN. GitHub is also available but may be incomplete and not up to date!
  • Import the jOOQ projects into Eclipse
    • -
  • If you haven't already, get M2E, the Eclipse Maven plugin to build jOOQ with Maven in Eclipse
    • +
  • If you haven't already, get M2E, the Eclipse Maven plugin to build jOOQ with Maven in Eclipse (The one from Sonatype, NOT the one from Eclipse)
  • Use the Eclipse formatting settings that have been checked in with the projects. Keeps the code nice and clean. Your code should not change (not much), if formatted with Ctrl-Shift-F. But don't format jOOQ DSL query code!
  • Send me your changes directly to the user group or in a trac ticket.
  • Send your changes as an Eclipse-compatible .patch file (or the sum of the modified Java classes). Ideally, the .patch file can be applied to the latest version of jOOQ on the SVN trunk.
    • diff --git a/jOOQ-website/launch/Transform.launch b/jOOQ-website/launch/Transform.launch index 237927b025..458f2eeff3 100644 --- a/jOOQ-website/launch/Transform.launch +++ b/jOOQ-website/launch/Transform.launch @@ -6,8 +6,8 @@ - + - + diff --git a/jOOQ/.classpath b/jOOQ/.classpath index d90b9173dc..2394961b40 100644 --- a/jOOQ/.classpath +++ b/jOOQ/.classpath @@ -1,9 +1,11 @@ + - - + + + diff --git a/jOOQ/.project b/jOOQ/.project index 1fad3267b2..9d363fb501 100644 --- a/jOOQ/.project +++ b/jOOQ/.project @@ -15,8 +15,14 @@ + + org.maven.ide.eclipse.maven2Builder + + + + org.maven.ide.eclipse.maven2Nature org.eclipse.m2e.core.maven2Nature org.eclipse.jdt.core.javanature diff --git a/jOOQ/pom.xml b/jOOQ/pom.xml index cbd1e45f43..49e6ff6fb1 100644 --- a/jOOQ/pom.xml +++ b/jOOQ/pom.xml @@ -45,6 +45,10 @@ maven-jaxb2-plugin 0.8.1 + generate