650 Commits

Author SHA1 Message Date
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
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
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
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
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
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
Donald Woods
b31de158c8 update license files to include full CDDL+GPL license text for persistence schemas, even though we're choosing CDDL. this was based on recent discussions between legal-discuss@apache, Aries and Geronimo projects.
git-svn-id: https://svn.apache.org/repos/asf/openjpa/branches/2.0.x@939893 13f79535-47bb-0310-9956-ffa450edef68
2010-05-01 01:17:51 +00:00
Donald Woods
14b6a637de [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/openjpa/branches/2.0.x@935684 13f79535-47bb-0310-9956-ffa450edef68
2010-04-19 17:33:42 +00:00
Donald Woods
e52c11be3b [maven-release-plugin] prepare release 2.0.0
git-svn-id: https://svn.apache.org/repos/asf/openjpa/branches/2.0.x@935682 13f79535-47bb-0310-9956-ffa450edef68
2010-04-19 17:33:22 +00:00
Pinaki Poddar
7312e27fde OPENJPA-703: Ignore prepared query if query is locking. Merged from trunk revision 935231
git-svn-id: https://svn.apache.org/repos/asf/openjpa/branches/2.0.x@935232 13f79535-47bb-0310-9956-ffa450edef68
2010-04-17 19:30:56 +00:00
Pinaki Poddar
31cd0eb04e OPENJPA-1628: Usability changes. Merged from trunk revision 934507
git-svn-id: https://svn.apache.org/repos/asf/openjpa/branches/2.0.x@934511 13f79535-47bb-0310-9956-ffa450edef68
2010-04-15 18:33:24 +00:00
Richard G. Curtis
5c3737fce1 OPENJPA-1631: Add synchronization to AnnotationPersistenceXMLMetaDataParser.parse() method to make it thread safe.
git-svn-id: https://svn.apache.org/repos/asf/openjpa/branches/2.0.x@934480 13f79535-47bb-0310-9956-ffa450edef68
2010-04-15 16:40:23 +00:00
Donald Woods
a0f8422e87 [maven-release-plugin] rollback the release of 2.0.0
git-svn-id: https://svn.apache.org/repos/asf/openjpa/branches/2.0.x@934094 13f79535-47bb-0310-9956-ffa450edef68
2010-04-14 18:30:19 +00:00
Donald Woods
de472e50c3 [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/openjpa/branches/2.0.x@932977 13f79535-47bb-0310-9956-ffa450edef68
2010-04-11 19:30:54 +00:00
Donald Woods
561022df8e [maven-release-plugin] prepare release 2.0.0
git-svn-id: https://svn.apache.org/repos/asf/openjpa/branches/2.0.x@932975 13f79535-47bb-0310-9956-ffa450edef68
2010-04-11 19:30:38 +00:00
Donald Woods
f43015857b OPENJPA-1611: fix EMBEDDED attr type. Merged in from trunk r930721 commit by Fay.
git-svn-id: https://svn.apache.org/repos/asf/openjpa/branches/2.0.x@932663 13f79535-47bb-0310-9956-ffa450edef68
2010-04-10 02:32:07 +00:00
Donald Woods
be2195b1a4 OPENJPA-1622 Invoking MetaModel generator. Merged in from trunk. Contributed by Pinaki.
git-svn-id: https://svn.apache.org/repos/asf/openjpa/branches/2.0.x@932560 13f79535-47bb-0310-9956-ffa450edef68
2010-04-09 19:46:24 +00:00
Donald Woods
62f17567af merge in r932206 from trunk by Pinaki
git-svn-id: https://svn.apache.org/repos/asf/openjpa/branches/2.0.x@932559 13f79535-47bb-0310-9956-ffa450edef68
2010-04-09 19:32:15 +00:00
Richard G. Curtis
cf752cbc09 OPENJPA-1604: Override default lock level for NamedQueries when using the pessimistic lock manager. Code contributed by Pinaki Poddar and Rick Curtis
git-svn-id: https://svn.apache.org/repos/asf/openjpa/branches/2.0.x@932095 13f79535-47bb-0310-9956-ffa450edef68
2010-04-08 20:34:17 +00:00
Donald Woods
8fb266f9f6 OPENJPA-1618: Convert the value not the key. Merged in from trunk r932054.
git-svn-id: https://svn.apache.org/repos/asf/openjpa/branches/2.0.x@932079 13f79535-47bb-0310-9956-ffa450edef68
2010-04-08 19:49:00 +00:00
Donald Woods
e3f20dddcf OPENJPA-1602 Ignore prepared queries that use locks. Merged in from trunk r928897. Original patch by Pinaki.
git-svn-id: https://svn.apache.org/repos/asf/openjpa/branches/2.0.x@929358 13f79535-47bb-0310-9956-ffa450edef68
2010-03-31 01:41:08 +00:00
Donald Woods
071e698899 OPENJPA-1597 Revert code added to DetachManager to unproxy objects when detached in-place. Updated tests to verify old behavior of detached entites still having references, but that they are removed during serialization.
git-svn-id: https://svn.apache.org/repos/asf/openjpa/branches/2.0.x@928271 13f79535-47bb-0310-9956-ffa450edef68
2010-03-27 20:53:53 +00:00
Albert Lee
d81cbbd8bb OPENJPA-1599 - Retain em method user input property map content from modifications.
git-svn-id: https://svn.apache.org/repos/asf/openjpa/branches/2.0.x@927630 13f79535-47bb-0310-9956-ffa450edef68
2010-03-25 22:53:14 +00:00
Albert Lee
1c2f4470a2 OPENJPA-1599 - Push Cache*Mode value(s) in fetch configuration set from property making the property value(s) only valid during the em method call.
git-svn-id: https://svn.apache.org/repos/asf/openjpa/branches/2.0.x@927442 13f79535-47bb-0310-9956-ffa450edef68
2010-03-25 15:09:00 +00:00
Michael Dick
8987041469 OPENJPA-1550:
Set failedObject on RollbackException.
Submitted By: Heath Thomann

git-svn-id: https://svn.apache.org/repos/asf/openjpa/branches/2.0.x@927266 13f79535-47bb-0310-9956-ffa450edef68
2010-03-25 03:55:39 +00:00
Donald Woods
deeb5d59ff [maven-release-plugin] prepare for next development iteration
git-svn-id: https://svn.apache.org/repos/asf/openjpa/branches/2.0.x@926798 13f79535-47bb-0310-9956-ffa450edef68
2010-03-23 21:39:32 +00:00
Donald Woods
78020af127 [maven-release-plugin] prepare release 2.0.0-beta3
git-svn-id: https://svn.apache.org/repos/asf/openjpa/branches/2.0.x@926796 13f79535-47bb-0310-9956-ffa450edef68
2010-03-23 21:39:15 +00:00
Kevin W. Sutter
43c4cff942 OPENJPA-1588. Removed the processing of the CacheStoreMode property from the convertToKernelValue method. Also, corrected the spelling of this method.
git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@925703 13f79535-47bb-0310-9956-ffa450edef68
2010-03-21 00:19:27 +00:00
Pinaki Poddar
1b9d80003a Allow user to set the cache mode enum values on EntityManager.setProperty() by String
git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@925451 13f79535-47bb-0310-9956-ffa450edef68
2010-03-19 21:55:44 +00:00
Pinaki Poddar
73b7d4748b OPENJPA-1491: Add OpenJPA-OSGi package description.
git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@925293 13f79535-47bb-0310-9956-ffa450edef68
2010-03-19 16:05:36 +00:00
Michael Dick
bd9b59c90f OPENJPA-1581:
make assertOpen public and call assertOpen before returning JPA cache

git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@924868 13f79535-47bb-0310-9956-ffa450edef68
2010-03-18 15:44:25 +00:00
Pinaki Poddar
1b20902b50 OPENJPA-1565,OPENJPA-1578:
Modify tests to raise correct lock/query exception
Fill in details in exception
Use retreive mode while initializing not store mode 

git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@924626 13f79535-47bb-0310-9956-ffa450edef68
2010-03-18 03:42:50 +00:00
Pinaki Poddar
63079316a0 THrow IllegalArg exception on null argument
git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@924518 13f79535-47bb-0310-9956-ffa450edef68
2010-03-17 22:11:02 +00:00
Pinaki Poddar
992ba73a71 OPENJPA-1565: Raise correct Query/LockTimeout exception
git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@923928 13f79535-47bb-0310-9956-ffa450edef68
2010-03-16 18:39:02 +00:00
Jeremy Bauer
6d87bbdbb0 OPENJPA-1562 Committing code and test updates contributed by Dianne Richards. Refresh after remove was not throwing exception dictated by spec.
git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@923849 13f79535-47bb-0310-9956-ffa450edef68
2010-03-16 16:32:14 +00:00
Pinaki Poddar
845f9b5018 OPENJPA-1578: Set CacheMode properties properly
git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@923755 13f79535-47bb-0310-9956-ffa450edef68
2010-03-16 14:30:53 +00:00
Donald Woods
7c748e62df OPENJPA-1491 When used in an OSGi environment with Apache Aries, the org.apache.openjpa.kernel.Bootstrap should use the OpenJPA bundle classloader instead of the application bundle classloader to instatiate a BrokerFactory. Also moved our BundleActivator from the openjpa module to openjpa-persistence module with a BundleUtils wrapper to remove direct OSGi class refs, so the BundleContext in it could be accessed by PersistenceProviderImpl.
git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@922397 13f79535-47bb-0310-9956-ffa450edef68
2010-03-12 19:05:30 +00:00
Pinaki Poddar
4be5a5a194 OPENJPA-1565: Raise correct time out exception
git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@922288 13f79535-47bb-0310-9956-ffa450edef68
2010-03-12 15:08:16 +00:00
Pinaki Poddar
572d593427 OPENJPA-1561: Cache criteria query
git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@922123 13f79535-47bb-0310-9956-ffa450edef68
2010-03-12 02:35:03 +00:00
Pinaki Poddar
f0f89c7e0e OPENJPA-1561: Cache criteria query
git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@922119 13f79535-47bb-0310-9956-ffa450edef68
2010-03-12 02:25:52 +00:00
Fay Wang
f69da24268 OPENJPA-1505: allow duplicate entity listeners to be configurable
git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@921538 13f79535-47bb-0310-9956-ffa450edef68
2010-03-10 20:05:09 +00:00
Pinaki Poddar
5cb14fe384 OPENJPA-1053:: unwrap() query failure to throw correct exception and set rollback
git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@920981 13f79535-47bb-0310-9956-ffa450edef68
2010-03-09 16:54:55 +00:00
Michael Dick
c58af533fb OPENJPA-1178:
Remove uneeded imports

git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@920540 13f79535-47bb-0310-9956-ffa450edef68
2010-03-08 22:07:27 +00:00
Michael Dick
62092d763a OPENJPA-1118:
Remove Numbers.valueOf() - prefer autoboxing

git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@920503 13f79535-47bb-0310-9956-ffa450edef68
2010-03-08 20:43:37 +00:00
Donald Woods
14996dfd40 OPENJPA-1360 ReverseMappingTool omits nullable, length, etc. when ClassMapping.setEmbedded(true) is called
git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@920464 13f79535-47bb-0310-9956-ffa450edef68
2010-03-08 19:20:32 +00:00
Albert Lee
04b5e77c9e Removed un-used import.
git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@920028 13f79535-47bb-0310-9956-ffa450edef68
2010-03-07 16:37:50 +00:00
Albert Lee
1c992feeb7 OPENJPA-1552 Add proper QueryImpl creation in EntityManagerImpl subclass.
git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@920024 13f79535-47bb-0310-9956-ffa450edef68
2010-03-07 16:16:06 +00:00
Michael Dick
4dc0267629 OPENJPA-1551:
Storing connectionFactoryName in BrokerImpl - this factory will be used at JDBCStore creation time to override the value from the configuration

git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@919557 13f79535-47bb-0310-9956-ffa450edef68
2010-03-05 19:35:53 +00:00