Commit Graph

3326 Commits

Author SHA1 Message Date
Donald Woods 6e1906988e OPENJPA-1712 Fix test-java5 profile failures by explicitly adding maven-compiler-plugin into build settings. Revert required maven level to 2.0.9 for developers, but you still need 2.2.1 for releasing signed artifacts.
git-svn-id: https://svn.apache.org/repos/asf/openjpa/branches/2.0.x@987187 13f79535-47bb-0310-9956-ffa450edef68
2010-08-19 15:22:04 +00:00
Donald Woods 77da50942f OPENJPA-1712 Default apache-7.pom level of maven-compiler-plugin-2.0.2 doesn't work for forking off our JDK5 tests, so upgrade to the latest
git-svn-id: https://svn.apache.org/repos/asf/openjpa/branches/2.0.x@986945 13f79535-47bb-0310-9956-ffa450edef68
2010-08-18 21:16:20 +00:00
Donald Woods 4d9c4ea5ca OPENJPA-1712 Fix creation of openjpa-all jar
git-svn-id: https://svn.apache.org/repos/asf/openjpa/branches/2.0.x@986905 13f79535-47bb-0310-9956-ffa450edef68
2010-08-18 20:15:50 +00:00
Donald Woods 41c67a0354 OPENJPA-1712 revert to original test-java5 profile setup
git-svn-id: https://svn.apache.org/repos/asf/openjpa/branches/2.0.x@986829 13f79535-47bb-0310-9956-ffa450edef68
2010-08-18 18:14:19 +00:00
Donald Woods 820a7bf245 OPENJPA-1712 test-java5 profile is failing
git-svn-id: https://svn.apache.org/repos/asf/openjpa/branches/2.0.x@986809 13f79535-47bb-0310-9956-ffa450edef68
2010-08-18 17:33:00 +00:00
Donald Woods 0082fa48cd OPENJPA-1712 Split creation of o-p-j-test-base.jar into its own build, as jar:test-jar doesn't allow creation of 2 tests.jar in the same module and maven can't get the dependency scope right if jar:jar is used to create the artifact.
git-svn-id: https://svn.apache.org/repos/asf/openjpa/branches/2.0.x@986552 13f79535-47bb-0310-9956-ffa450edef68
2010-08-18 02:40:39 +00:00
Donald Woods 84320dacb1 OPENJPA-1712 try another test-jar workaround
git-svn-id: https://svn.apache.org/repos/asf/openjpa/branches/2.0.x@986464 13f79535-47bb-0310-9956-ffa450edef68
2010-08-17 19:44:22 +00:00
Donald Woods 419899a387 OPENJPA-1712 Try using classifier again for o-p-j-test-base depend
git-svn-id: https://svn.apache.org/repos/asf/openjpa/branches/2.0.x@986460 13f79535-47bb-0310-9956-ffa450edef68
2010-08-17 19:32:49 +00:00
Pinaki Poddar 4283d0d840 Documentaion edit on CriteriaQuery API
git-svn-id: https://svn.apache.org/repos/asf/openjpa/branches/2.0.x@986441 13f79535-47bb-0310-9956-ffa450edef68
2010-08-17 18:29:58 +00:00
Donald Woods f51ead3fb5 OPENJPA-1712 more openjpa-maven-plugin tweaks
git-svn-id: https://svn.apache.org/repos/asf/openjpa/branches/2.0.x@986357 13f79535-47bb-0310-9956-ffa450edef68
2010-08-17 15:25:27 +00:00
Donald Woods 934143df65 OPENJPA-1712 fix exclusion
git-svn-id: https://svn.apache.org/repos/asf/openjpa/branches/2.0.x@986337 13f79535-47bb-0310-9956-ffa450edef68
2010-08-17 14:50:36 +00:00
Donald Woods 1ba05bac06 OPENJPA-1712 remove cyclical depend in openjpa-maven-plugin
git-svn-id: https://svn.apache.org/repos/asf/openjpa/branches/2.0.x@986334 13f79535-47bb-0310-9956-ffa450edef68
2010-08-17 14:47:03 +00:00
Donald Woods 620dcb9a0b OPENJPA-1712 remove duplicate openjpa-parent pom entries that are defined in apache-7.pom and simplify build to always run full apache-rat and source.jar targets
git-svn-id: https://svn.apache.org/repos/asf/openjpa/branches/2.0.x@986328 13f79535-47bb-0310-9956-ffa450edef68
2010-08-17 14:33:26 +00:00
Donald Woods aa2cbe7623 OPENJPA-1712 add missing license header
git-svn-id: https://svn.apache.org/repos/asf/openjpa/branches/2.0.x@986326 13f79535-47bb-0310-9956-ffa450edef68
2010-08-17 14:32:04 +00:00
Donald Woods 5e38145fa1 OPENJPA-1712 use project.version instead of pom.version
git-svn-id: https://svn.apache.org/repos/asf/openjpa/branches/2.0.x@986294 13f79535-47bb-0310-9956-ffa450edef68
2010-08-17 12:30:40 +00:00
Donald Woods 5185b5900f updating release notes for 2.0.1
git-svn-id: https://svn.apache.org/repos/asf/openjpa/branches/2.0.x@986134 13f79535-47bb-0310-9956-ffa450edef68
2010-08-16 21:39:30 +00:00
Donald Woods 315a0d0e43 OPENJPA-1712 Move common test-java5 profile depends to the parent pom
git-svn-id: https://svn.apache.org/repos/asf/openjpa/branches/2.0.x@986101 13f79535-47bb-0310-9956-ffa450edef68
2010-08-16 19:22:06 +00:00
Michael Dick 4560ddf64f get lock clause from DBDictionary
git-svn-id: https://svn.apache.org/repos/asf/openjpa/branches/2.0.x@985574 13f79535-47bb-0310-9956-ffa450edef68
2010-08-14 19:39:01 +00:00
Michael Dick 212bfb1a4a OPENJPA-1752: TestPessimisticLocks JUNIT test produced inconsistent behavior with various backends.
Submitted By: Catalina Wei

git-svn-id: https://svn.apache.org/repos/asf/openjpa/branches/2.0.x@985560 13f79535-47bb-0310-9956-ffa450edef68
2010-08-14 18:37:41 +00:00
Michael Dick 0a0d7f7810 Check if database supports query timeouts, merged from Fay's changes for OPENJPA-1726
git-svn-id: https://svn.apache.org/repos/asf/openjpa/branches/2.0.x@985551 13f79535-47bb-0310-9956-ffa450edef68
2010-08-14 18:09:18 +00:00
Michael Dick 83560d0854 OPENJPA-1424: Adding testcase.
Submitted By: Heath Thomann and Daryl Stultz

git-svn-id: https://svn.apache.org/repos/asf/openjpa/branches/2.0.x@985343 13f79535-47bb-0310-9956-ffa450edef68
2010-08-13 20:18:48 +00:00
Albert Lee d1ed604dc1 OPENJPA-1753 Update same test case changes from trunk to 2.0.x.
git-svn-id: https://svn.apache.org/repos/asf/openjpa/branches/2.0.x@985280 13f79535-47bb-0310-9956-ffa450edef68
2010-08-13 16:50:34 +00:00
Michael Dick 077f9d7f82 OPENJPA-1668: Allow custom sequence SQL strings for DB2 on z/os and iseries.
Submitted By: Heath Thomann

git-svn-id: https://svn.apache.org/repos/asf/openjpa/branches/2.0.x@985013 13f79535-47bb-0310-9956-ffa450edef68
2010-08-12 22:05:27 +00:00
Donald Woods 78fe423ce1 OPENJPA-1712 BVAL requires commons-lang 2.4 or later
git-svn-id: https://svn.apache.org/repos/asf/openjpa/branches/2.0.x@984151 13f79535-47bb-0310-9956-ffa450edef68
2010-08-10 18:04:38 +00:00
Donald Woods c39937c68f OPENJPA-1712 add validation build notes for Java SE 5 testing
git-svn-id: https://svn.apache.org/repos/asf/openjpa/branches/2.0.x@983986 13f79535-47bb-0310-9956-ffa450edef68
2010-08-10 13:17:25 +00:00
Donald Woods 0a7765ecaf OPENJPA-1712 switch validation providers from Hibernate to Apache BVAL to match trunk and to fix Java SE 5 testing
git-svn-id: https://svn.apache.org/repos/asf/openjpa/branches/2.0.x@983972 13f79535-47bb-0310-9956-ffa450edef68
2010-08-10 12:48:15 +00:00
Donald Woods df61400a8c OPENJPA-1712 cleanup some whitespace formatting
git-svn-id: https://svn.apache.org/repos/asf/openjpa/branches/2.0.x@983965 13f79535-47bb-0310-9956-ffa450edef68
2010-08-10 12:41:55 +00:00
Donald Woods 697b34b9ee OPENJPA-1712 Upgrade builds to use Apache hosted Nexus repo. Backported from trunk.
git-svn-id: https://svn.apache.org/repos/asf/openjpa/branches/2.0.x@983230 13f79535-47bb-0310-9956-ffa450edef68
2010-08-07 14:00:37 +00:00
Donald Woods 010870ed56 OPENJPA-1712 Some POM cleanup
git-svn-id: https://svn.apache.org/repos/asf/openjpa/branches/2.0.x@983095 13f79535-47bb-0310-9956-ffa450edef68
2010-08-06 18:49:38 +00:00
Michael Dick 4a1501ed9d OPENJPA-1749: Throw exception when incompatible configuration options are set
git-svn-id: https://svn.apache.org/repos/asf/openjpa/branches/2.0.x@980199 13f79535-47bb-0310-9956-ffa450edef68
2010-07-28 20:32:42 +00:00
Michael Dick dba341a7d9 Fix timing window with TestTimestampVerson and MySQL
git-svn-id: https://svn.apache.org/repos/asf/openjpa/branches/2.0.x@979755 13f79535-47bb-0310-9956-ffa450edef68
2010-07-27 15:45:13 +00:00
Michael Dick d20e84a294 OPENJPA-1722, OPENJPA-1690: Make DistinctResultList serializable, and add writeReplace method.
Submitted by: Dianne Richards and Pinaki Poddar

git-svn-id: https://svn.apache.org/repos/asf/openjpa/branches/2.0.x@979418 13f79535-47bb-0310-9956-ffa450edef68
2010-07-26 19:43:36 +00:00
Michael Dick 426db6e2b6 OPENJPA-1719: Prepared SQL cache user parameter ordering problem with subqueries. Merged from Catalina's changes for trunk.
git-svn-id: https://svn.apache.org/repos/asf/openjpa/branches/2.0.x@979375 13f79535-47bb-0310-9956-ffa450edef68
2010-07-26 17:32:01 +00:00
Michael Dick 2b92c3586a OPENJPA-1742: setting eol-style native
git-svn-id: https://svn.apache.org/repos/asf/openjpa/branches/2.0.x@966730 13f79535-47bb-0310-9956-ffa450edef68
2010-07-22 16:22:16 +00:00
Michael Dick f847c41369 OPENJPA-1742: add documentation
git-svn-id: https://svn.apache.org/repos/asf/openjpa/branches/2.0.x@966702 13f79535-47bb-0310-9956-ffa450edef68
2010-07-22 15:06:07 +00:00
Michael Dick d39c580688 OPENJPA-1742: move cfName logic to JDBCConfiguration, add tests for nonJTADataSource
git-svn-id: https://svn.apache.org/repos/asf/openjpa/branches/2.0.x@966602 13f79535-47bb-0310-9956-ffa450edef68
2010-07-22 11:58:16 +00:00
Michael Dick 51805b02f0 OPENJPA-1743: reverting in 2.0.x at least for now.
git-svn-id: https://svn.apache.org/repos/asf/openjpa/branches/2.0.x@966496 13f79535-47bb-0310-9956-ffa450edef68
2010-07-22 03:49:38 +00:00
Patrick Linskey a6f62b829c resolves OPENJPA-1743: anchors in mappingtool config invocation
git-svn-id: https://svn.apache.org/repos/asf/openjpa/branches/2.0.x@966482 13f79535-47bb-0310-9956-ffa450edef68
2010-07-22 02:43:16 +00:00
Donald Woods b0b74b2b58 OPENJPA-1735 Mark commons-logging as provided in the build to remove transient maven dependency
git-svn-id: https://svn.apache.org/repos/asf/openjpa/branches/2.0.x@966426 13f79535-47bb-0310-9956-ffa450edef68
2010-07-21 21:32:05 +00:00
Donald Woods 6595dac6b0 OPENJPA-1637 Upgrade to latest Geronimo Specs for JPA2 and Bean Validation which fixes some OSGi metadata and service registry for Apache Aries.
git-svn-id: https://svn.apache.org/repos/asf/openjpa/branches/2.0.x@966391 13f79535-47bb-0310-9956-ffa450edef68
2010-07-21 19:55:59 +00:00
Donald Woods 3a993a604e OPENJPA-1737 Fix the openjpa bundle creation so MANIFEST.MF is the first artifact entry
git-svn-id: https://svn.apache.org/repos/asf/openjpa/branches/2.0.x@966359 13f79535-47bb-0310-9956-ffa450edef68
2010-07-21 18:56:25 +00:00
Michael Dick bfffc19ab6 OPENJPA-1714 Added Optimistic check as part the logic for setting the default lock mode for named queries in order to retain 1.x behavior.
Original changes made in trunk by Jeremy Bauer

git-svn-id: https://svn.apache.org/repos/asf/openjpa/branches/2.0.x@966333 13f79535-47bb-0310-9956-ffa450edef68
2010-07-21 18:00:18 +00:00
Michael Dick 1d667e8d67 OPENJPA-1719: Prepared SQL cache user parameter ordering problem with subqueries.
Originally fixed in trunk by Catalina Wei

git-svn-id: https://svn.apache.org/repos/asf/openjpa/branches/2.0.x@966307 13f79535-47bb-0310-9956-ffa450edef68
2010-07-21 16:42:02 +00:00
Michael Dick e34e85396e OPENJPA-1501: trim trailing whitespace for entities with String IDs
git-svn-id: https://svn.apache.org/repos/asf/openjpa/branches/2.0.x@966225 13f79535-47bb-0310-9956-ffa450edef68
2010-07-21 13:42:53 +00:00
Michael Dick a2d0e05649 OPENJPA-1704: Fix PCEnhancer to generate proper readExternal method. Merged to 2.0.x - submitted by Rick Curtis
git-svn-id: https://svn.apache.org/repos/asf/openjpa/branches/2.0.x@965610 13f79535-47bb-0310-9956-ffa450edef68
2010-07-19 20:02:23 +00:00
Michael Dick dcb8e626a3 OPENJPA-1713: correct the push/pop clean up processing in EntityManagerImpl _plans map.
Submitted By: Albert Lee

git-svn-id: https://svn.apache.org/repos/asf/openjpa/branches/2.0.x@961473 13f79535-47bb-0310-9956-ffa450edef68
2010-07-07 18:40:10 +00:00
Catalina Wei 5f2d51e23e OPENJPA-1715: OpenJPA generates wrong SQL if a result variable that references an aggregate expression is used in ORDER BY clause
fix testcase.

git-svn-id: https://svn.apache.org/repos/asf/openjpa/branches/2.0.x@961472 13f79535-47bb-0310-9956-ffa450edef68
2010-07-07 18:37:29 +00:00
Catalina Wei d7a9cdf3de OPENJPA-1715: OpenJPA generates wrong SQL if a result variable that references an aggregate expression is used in ORDER BY clause
add testcase.

git-svn-id: https://svn.apache.org/repos/asf/openjpa/branches/2.0.x@961449 13f79535-47bb-0310-9956-ffa450edef68
2010-07-07 18:10:25 +00:00
Michael Dick ae5c2c881e OPENJPA-1678: Update documentation re: PrintParameters
git-svn-id: https://svn.apache.org/repos/asf/openjpa/branches/2.0.x@955385 13f79535-47bb-0310-9956-ffa450edef68
2010-06-16 21:08:46 +00:00
Michael Dick 939b1b5a95 OPENJPA-1678: add printParameters property to prevent SQL parameter values from being logged in exceptions or trace
git-svn-id: https://svn.apache.org/repos/asf/openjpa/branches/2.0.x@955073 13f79535-47bb-0310-9956-ffa450edef68
2010-06-15 22:26:47 +00:00