Commit Graph

384 Commits

Author SHA1 Message Date
Fay Wang d1feecbc9e OPENJPA-1371: wrong commit. Revert it to the previous version
git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@831627 13f79535-47bb-0310-9956-ffa450edef68
2009-11-01 00:52:48 +00:00
Fay Wang eabd0c9454 OPENJPA-1371: fail to extract correct id from an entity during merge when this entity has compound primary key using IdClass, and some field in the IdClass is a derived identity from a not-yet-managed toOne relation.
git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@831626 13f79535-47bb-0310-9956-ffa450edef68
2009-11-01 00:50:15 +00:00
Pinaki Poddar 5e73ca14ed Consolidate property key-value processings for javax.persistence.* keys. They have been accumulating in OpenJPAConf and now moving to where they belong i.e. PersistenceProductDerivation. The value processing from String/integer/enums for these properties have also been spread across many places and now being localized.
git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@830806 13f79535-47bb-0310-9956-ffa450edef68
2009-10-29 00:22:27 +00:00
Pinaki Poddar 3ec0fbf66f OPENJPA-1354: DBCP getConnection with user/password
git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@830426 13f79535-47bb-0310-9956-ffa450edef68
2009-10-28 03:00:17 +00:00
Pinaki Poddar 59c81b98aa OPENJPA-1121: Load user-defined Enums.
git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@826959 13f79535-47bb-0310-9956-ffa450edef68
2009-10-20 05:40:40 +00:00
Pinaki Poddar 60491eb4d8 Recognize javax.persistence as a valid property prefix
git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@823328 13f79535-47bb-0310-9956-ffa450edef68
2009-10-08 21:17:47 +00:00
Pinaki Poddar 1ff5810e9e OPENJPA-250: Correct MetaDataRepository plug-in configuration.
git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@820804 13f79535-47bb-0310-9956-ffa450edef68
2009-10-01 21:30:39 +00:00
Pinaki Poddar 99844b6b1f OPENJPA-1332: Make some Value "private".
git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@820712 13f79535-47bb-0310-9956-ffa450edef68
2009-10-01 16:43:19 +00:00
Pinaki Poddar baf800f3b0 OPENJPA-1050: Use generics for BrokerFactory
git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@819800 13f79535-47bb-0310-9956-ffa450edef68
2009-09-29 02:43:32 +00:00
Richard G. Curtis eded0dd8fa OPENJPA-1302: Use ContextClassloader in addition to the ProductDeivation's ClassLoader to find/load product derivations. Patch contributed by Rick Curtis.
git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@815447 13f79535-47bb-0310-9956-ffa450edef68
2009-09-15 18:56:55 +00:00
Pinaki Poddar 81065fea3c OPENJPA-703: process RangeResultObjectProvider
git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@814071 13f79535-47bb-0310-9956-ffa450edef68
2009-09-11 22:51:19 +00:00
Pinaki Poddar dc5c7f487a OPENJPA-1285: Use tighter method signature
git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@813982 13f79535-47bb-0310-9956-ffa450edef68
2009-09-11 18:53:34 +00:00
Pinaki Poddar a8640cc5d2 OPENJPA-1285: Dynamic JDBC 4 Wrappers use constructor to save reflection cost
git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@813149 13f79535-47bb-0310-9956-ffa450edef68
2009-09-09 22:43:49 +00:00
Michael Dick b32bf1b730 remove errant TODO
git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@810228 13f79535-47bb-0310-9956-ffa450edef68
2009-09-01 20:47:33 +00:00
Pinaki Poddar 4e6a98f634 OPENJPA-849,OPENJPA-1251: Property management, hidden values
git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@805567 13f79535-47bb-0310-9956-ffa450edef68
2009-08-18 20:27:30 +00:00
Pinaki Poddar 814341420d OPENJPA-849, OPENJPA-1251: property management, hidden values
git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@805565 13f79535-47bb-0310-9956-ffa450edef68
2009-08-18 20:20:26 +00:00
Michael Dick 17da1c9a7e OPENJPA-1089:
Adding EncryptionProvider configuration option.
Submitted By : Rick Curtis

git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@800504 13f79535-47bb-0310-9956-ffa450edef68
2009-08-03 19:25:44 +00:00
Albert Lee d35e668190 OENJPA-1206 - Enable Java 2 security on BV buildDefaultValidatorFactory call.
git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@799155 13f79535-47bb-0310-9956-ffa450edef68
2009-07-30 02:09:02 +00:00
Albert Lee ba84a115bc OENJPA-1206 - Enable Java 2 security on BV validate call.
git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@799013 13f79535-47bb-0310-9956-ffa450edef68
2009-07-29 18:58:00 +00:00
Michael Dick f6413764d5 OPENJPA-1168:
Improved checking for type1 UUID generator is initialized. Reducing
timing window which could result in a NPE.
Submitted by: Rick Curtis
	modified:   openjpa-lib/src/main/java/org/apache/openjpa/lib/util/UUIDGenerator.java
	modified:   openjpa-lib/src/test/java/org/apache/openjpa/lib/util/TestUUIDGenerator.java

git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@792592 13f79535-47bb-0310-9956-ffa450edef68
2009-07-09 16:01:48 +00:00
Donald Woods 8613683843 OPENJPA-1000 Consistent usage of serialVersionUID. Remove all serialVersionUID values that have been added since 1.2.1 as requested by Pinaki to keep the usage consistant (ie. very little use of serialVersionUID in the existing code.)
git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@792312 13f79535-47bb-0310-9956-ffa450edef68
2009-07-08 20:48:46 +00:00
Jeremy Bauer ac12bb4ade OPENJPA-1135 Correct access type related issue with multi-level parsing
git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@790151 13f79535-47bb-0310-9956-ffa450edef68
2009-07-01 12:53:39 +00:00
Jeremy Bauer 62be4544b3 OPENJPA-1135 Apply overrides to deferred embeddable attributes
git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@783966 13f79535-47bb-0310-9956-ffa450edef68
2009-06-12 02:40:14 +00:00
Albert Lee 7b06c5cfbf OPENJPA-932 - Enable test case to be Java 2 security compliance.
git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@783440 13f79535-47bb-0310-9956-ffa450edef68
2009-06-10 18:15:01 +00:00
Pinaki Poddar b961b8baa2 OPENJPA-1013: Aliasing for query nodes, single attribute join support, reorganization of test harness
git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@783166 13f79535-47bb-0310-9956-ffa450edef68
2009-06-10 00:41:35 +00:00
Donald Woods 549115f77c fix missing license header problems found by rat plugin during EA2 creation
git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@781462 13f79535-47bb-0310-9956-ffa450edef68
2009-06-03 16:26:16 +00:00
Albert Lee 35d97a14d3 OPENJPA-5 - Add doPriv around "new BCClassLoader" and "project.loadClass()"
git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@780879 13f79535-47bb-0310-9956-ffa450edef68
2009-06-01 23:23:45 +00:00
Milosz Tylenda e80110bdd1 OPENJPA-847: Enable JDBC 3 way of retrieving generated keys
git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@780258 13f79535-47bb-0310-9956-ffa450edef68
2009-05-30 13:11:24 +00:00
Donald Woods c9e74d4c7a update pom names to better match the module name and add descriptions where missing
git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@779579 13f79535-47bb-0310-9956-ffa450edef68
2009-05-28 12:10:45 +00:00
David Ezzio a224644c4c OpenJPA-1099: Replaced <xmp> tag with <pre> tag in Javadoc comments.
git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@777539 13f79535-47bb-0310-9956-ffa450edef68
2009-05-22 14:16:23 +00:00
Michael Dick 291e27eba9 OPENJPA-1015. Committing patch provided by BJ Reed. Additional testcases have been added which do not conform - I've updated some of them but some still exist so validation is not enabled by default
git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@777135 13f79535-47bb-0310-9956-ffa450edef68
2009-05-21 14:39:31 +00:00
Donald Woods f5ee1130ee OPENJPA-1062 correctly mark log4j as provided, as it is only required at compile time and is optional at runtime
git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@777132 13f79535-47bb-0310-9956-ffa450edef68
2009-05-21 14:34:08 +00:00
Pinaki Poddar 70f55bdee8 OPENJPA-1013: Joins, MetaModel validation, Array type
git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@776951 13f79535-47bb-0310-9956-ffa450edef68
2009-05-21 05:05:39 +00:00
Jeremy Bauer 6bccd91606 OPENJPA-1060 Made userObject transient to correct serialization issue
git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@771726 13f79535-47bb-0310-9956-ffa450edef68
2009-05-05 13:47:56 +00:00
Michael Dick 14ae1c34cf OPENJPA-1025 committing patch provided by B.J. Reed. Removin subList method from AbstractResultList forcing subclasses to override the method
git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@769801 13f79535-47bb-0310-9956-ffa450edef68
2009-04-29 15:37:41 +00:00
Pinaki Poddar 29a5f7acd2 OPENJPA-1050: Use parameterized type whenever applicable
git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@768588 13f79535-47bb-0310-9956-ffa450edef68
2009-04-25 19:29:07 +00:00
Pinaki Poddar 178f0a180a OPENJPA-926: Support explicit access types
git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@767973 13f79535-47bb-0310-9956-ffa450edef68
2009-04-23 16:55:45 +00:00
Michael Dick b6e661e24a OPENJPA-1015 fix line wrapping in source files. Based on patch contributed by B.J. Reed. Updates made to do enforce line wrapping during the process-sources phase of the build.
git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@761509 13f79535-47bb-0310-9956-ffa450edef68
2009-04-03 03:09:53 +00:00
Patrick Linskey 318d408ab7 fixed spacing issue with some localization messages that wrap. This pushes some lines to 81 characters; we could re-wrap these lines if needed.
git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@761417 13f79535-47bb-0310-9956-ffa450edef68
2009-04-02 20:26:09 +00:00
Pinaki Poddar 32796f751b OPENJPA-5: Upgrade to JDK6
git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@758490 13f79535-47bb-0310-9956-ffa450edef68
2009-03-26 01:01:39 +00:00
Michael Dick 90b84c5d73 OPENJPA-896. Setting eol-style:native and removing windows eol characters from source files.
git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@757278 13f79535-47bb-0310-9956-ffa450edef68
2009-03-22 23:37:24 +00:00
Albert Lee 2d9f445cb8 Remove un-needed import.
git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@756698 13f79535-47bb-0310-9956-ffa450edef68
2009-03-20 18:14:45 +00:00
Jeremy Bauer 730ff8813e OPENJPA-927 Committing code contributed by Dianne Richards
git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@750112 13f79535-47bb-0310-9956-ffa450edef68
2009-03-04 19:23:33 +00:00
Pinaki Poddar 8a9595bed4 OPENJPA-900: Consolidate Query Hint related processing. As a byproduct, support new JPA 2.0 getHins() and getSupportedHints().
git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@743396 13f79535-47bb-0310-9956-ffa450edef68
2009-02-11 16:57:26 +00:00
Jeremy Bauer fa86624289 OPENJPA-849 Committing code and corresponding tests contributed by Dianne Richards
git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@740990 13f79535-47bb-0310-9956-ffa450edef68
2009-02-05 03:31:02 +00:00
Michael Dick d61b3b26a9 OPENJPA-772 committing patch provided by Donald Woods
git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@740763 13f79535-47bb-0310-9956-ffa450edef68
2009-02-04 15:12:58 +00:00
Pinaki Poddar f9c94752d7 OPENJPA-857: Extend support for Specification through a more structured type to carry Version information. Will help Compatibitibility (and may be others) that needs to tune their behavior based on current Specification version as well as backward compatibie versions.
git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@740492 13f79535-47bb-0310-9956-ffa450edef68
2009-02-03 22:38:45 +00:00
Pinaki Poddar 1ddbd61042 OPENJPA-703: Cleaning first Prepared Query Cache commit
git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@739425 13f79535-47bb-0310-9956-ffa450edef68
2009-01-30 22:06:30 +00:00
Pinaki Poddar 295442d82f OPENJPA-703: Prepared Query Cache
git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@739123 13f79535-47bb-0310-9956-ffa450edef68
2009-01-30 01:27:35 +00:00
Pinaki Poddar cbbc768673 OPENJPA-850: Add notion of equivalent property keys for configurable Value. Use this facility to support new javax.persistence.* style property keys alongside openjpa.* style property keys.
git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@732443 13f79535-47bb-0310-9956-ffa450edef68
2009-01-07 19:38:45 +00:00
Michael Dick 16b7b1a7f7 OPENJPA-784 committing patch provided by Fernando
git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@728004 13f79535-47bb-0310-9956-ffa450edef68
2008-12-19 11:36:13 +00:00
Jeremy Bauer c1d791f6dd OPENJPA-823 Added new 2.0 schemas and updated persistence and metadata parsers to use per-version schema validation
git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@726144 13f79535-47bb-0310-9956-ffa450edef68
2008-12-12 22:36:30 +00:00
Jeremy Bauer cabd344397 OPENJPA-800 remove version milestone indicator from build artifacts
git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@725817 13f79535-47bb-0310-9956-ffa450edef68
2008-12-11 21:17:55 +00:00
Jeremy Bauer c60a95f77a OPENJPA-800 Change release artifact versions for milestone 1
git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@723373 13f79535-47bb-0310-9956-ffa450edef68
2008-12-04 16:51:03 +00:00
Michael Dick 1617c44f57 OPENJPA-783 committing patch provided by Fernando
git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@720529 13f79535-47bb-0310-9956-ffa450edef68
2008-11-25 16:27:17 +00:00
Fay Wang bb937f3634 OPENJPA-742: add get lineNumber/ColumnNumber to SourceTracker
git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@719314 13f79535-47bb-0310-9956-ffa450edef68
2008-11-20 18:16:46 +00:00
Michael Dick 1ae20fc277 unify doPrivHelpers
git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@713493 13f79535-47bb-0310-9956-ffa450edef68
2008-11-12 20:19:40 +00:00
Michael Dick 995c6a4acc Code cleanup remove compiler warnings
git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@708580 13f79535-47bb-0310-9956-ffa450edef68
2008-10-28 14:15:01 +00:00
Michael Dick b9476a8ae8 Code cleanup
git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@708213 13f79535-47bb-0310-9956-ffa450edef68
2008-10-27 15:07:00 +00:00
Michael Dick e1bd3c4dcb Code cleanup: remove some unnescessary casts
git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@707937 13f79535-47bb-0310-9956-ffa450edef68
2008-10-26 04:31:28 +00:00
Michael Dick 284bd408f8 [maven-release-plugin] prepare release 1.3.x
git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@707728 13f79535-47bb-0310-9956-ffa450edef68
2008-10-24 19:19:49 +00:00
Fay Wang e7867662bd OPENJPA-736 use jdbc api getGeneratedKey to combine insert
and select SQL for generated id strategy = GenerationType.IDENTITY

git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@701537 13f79535-47bb-0310-9956-ffa450edef68
2008-10-03 21:16:50 +00:00
Albert Lee 07c6b1e5dd OPENJPA-719 - Ensure English locale is used in toUpperCase/toLowerCase for locale insensitive code.
git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@698813 13f79535-47bb-0310-9956-ffa450edef68
2008-09-25 04:45:48 +00:00
Kevin W. Sutter 079aa06091 OPENJPA-646. Migrate this change from the 1.2.x branch to trunk.
git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@693233 13f79535-47bb-0310-9956-ffa450edef68
2008-09-08 20:11:35 +00:00
A. Abram White 8fc909c19c Apply patch for OPENJPA-699.
git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@689518 13f79535-47bb-0310-9956-ffa450edef68
2008-08-27 16:39:29 +00:00
Pinaki Poddar 04c292c761 OPENJPA-698: Decorate callable statements with logging. Added a new inner class LoggingConnection.LoggingCallableStatement which is almost a duplicate of LoggingPreparedStatement -- but existing hierarchy prohibits a direct inheritance. The logging with parameter tracking code needs to be refactored for a cleaner and less duplicated code, but has not be done with this commit.
git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@688111 13f79535-47bb-0310-9956-ffa450edef68
2008-08-22 16:19:07 +00:00
Albert Lee a7b9f8f7f3 Minor typo corrections in message files.
git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@686401 13f79535-47bb-0310-9956-ffa450edef68
2008-08-15 22:19:24 +00:00
Michael Dick 64dbe4c924 [maven-release-plugin] prepare release 1.2.x
git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@680508 13f79535-47bb-0310-9956-ffa450edef68
2008-07-28 21:20:09 +00:00
Pinaki Poddar 13e4897173 OPENJPA-647: Change cardinality of listeners for Value update so that ClassMetaData (and others) can sync with dynamic configuration changes
git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@673484 13f79535-47bb-0310-9956-ffa450edef68
2008-07-02 20:26:48 +00:00
Kevin W. Sutter 82e61ba0d5 OPENJPA-637. Reverting ConcurrentHashMap implementation per the patch provided by Jeremy Bauer. A more complete, configurable implementation is being tracked via the related sub-task OPENJPA-643.
git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@672003 13f79535-47bb-0310-9956-ffa450edef68
2008-06-26 19:31:20 +00:00
Michael Dick fb78813259 OPENJPA-545 committing patch provided by Jeremy Bauer
git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@671319 13f79535-47bb-0310-9956-ffa450edef68
2008-06-24 19:48:23 +00:00
Pinaki Poddar 37cb4af35d OPENJPA-581: Print WARN level message on JNDI lookup failure
git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@669356 13f79535-47bb-0310-9956-ffa450edef68
2008-06-19 01:41:32 +00:00
Patrick Linskey f17afddbd6 Merge from ../active. svn merge -c 652930 ../active
git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@666903 13f79535-47bb-0310-9956-ffa450edef68
2008-06-11 23:43:11 +00:00
Patrick Linskey 8db8e5302e OPENJPA-544. Merge from ../active. svn merge -c 652523 ../active
git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@666897 13f79535-47bb-0310-9956-ffa450edef68
2008-06-11 23:27:18 +00:00
Michael Dick 981c023e0e OPENJPA-633 updating pom.xml files to be compatible with the maven-release-plugin. There are a lot of formatting changes which are needed to prevent the plugin from removing our copyright header.
git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@666731 13f79535-47bb-0310-9956-ffa450edef68
2008-06-11 16:48:56 +00:00
Albert Lee 11f4d0d7ad OPENJPA-604 - Use English only locale for TRACE, INFO, WARN, ERROR and FATAL keywords in Log specification.
git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@658714 13f79535-47bb-0310-9956-ffa450edef68
2008-05-21 14:41:02 +00:00
Michael Dick bd2afc3f70 OPENJPA-149 OPENJPA-159 Moving suspendJTA code to ManagedRuntime
git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@651441 13f79535-47bb-0310-9956-ffa450edef68
2008-04-24 22:28:42 +00:00
Michael Dick 316ced44c4 fix line wrapping
git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@649244 13f79535-47bb-0310-9956-ffa450edef68
2008-04-17 19:30:14 +00:00
Michael Dick fe45f77f03 OPENJPA-542
git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@649221 13f79535-47bb-0310-9956-ffa450edef68
2008-04-17 18:41:25 +00:00
Patrick Linskey 8803104f41 moved release number to 1.2.0-SNAPSHOT now that we've made a 1.1.x branch
git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@646049 13f79535-47bb-0310-9956-ffa450edef68
2008-04-08 19:40:02 +00:00
Patrick Linskey b2c1e8f16f OPENJPA-544. Get rid of JDK1.4 support, fold the jdk1.5 modules into their siblings, get rid of some ugly reflection that was there for 1.5 support, and move to the java.util.concurrent collections classes. This includes a wrapper around ConcurrentHashMap that allows nulls, since the old OpenJPA concurrent map allowed nulls and we rely on that behavior. The implication is that putIfAbsent() and some of the other special JDK1.5 methods don't obey the same contracts as in the java.util.concurrent package.
git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@640685 13f79535-47bb-0310-9956-ffa450edef68
2008-03-25 03:37:56 +00:00
Albert Lee d93ac261ad OPENJPA-535 - fix comment typos.
git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@636090 13f79535-47bb-0310-9956-ffa450edef68
2008-03-11 20:05:00 +00:00
Patrick Linskey 282c8e0c5b Improve product derivation debugging; add test case.
git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@636052 13f79535-47bb-0310-9956-ffa450edef68
2008-03-11 18:29:19 +00:00
Albert Lee ba5d11b43b OPENJPA-532 This patch enables command runnable to process once when no persistence unit is found by the tool commands. This allows command option(s) which does not require pu definition to function properly.
git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@634150 13f79535-47bb-0310-9956-ffa450edef68
2008-03-06 04:12:11 +00:00
Albert Lee b4d72d5843 After OPENJPA-9, -help option in scripts is not working anymore. This is caused by Configurations.runAgainstAllAnchors returns true if no error is encountered (including no operation) during function execution. Since the check of the -help option is in the command's run method and if no anchor is found, the help check is skipped.
git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@633921 13f79535-47bb-0310-9956-ffa450edef68
2008-03-05 16:38:46 +00:00
Albert Lee c4af04617e OPENJPA-359 Improve Timestamp resolution for use by versioning.
git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@631028 13f79535-47bb-0310-9956-ffa450edef68
2008-02-25 22:59:29 +00:00
Michael Dick ec7bd83e1a OPENJPA-518 Committing code changes suggested by Adam Toback
git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@629492 13f79535-47bb-0310-9956-ffa450edef68
2008-02-20 15:02:30 +00:00
Patrick Linskey 325aa77bc1 New test cases, currently disabled.
git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@627979 13f79535-47bb-0310-9956-ffa450edef68
2008-02-15 09:19:55 +00:00
Patrick Linskey 92d1334e52 OPENJPA-498. Resolve this by not removing if the prop is not set; the prop in question is only ever set internally anyways when EMF pooling is enabled.
git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@613332 13f79535-47bb-0310-9956-ffa450edef68
2008-01-19 00:55:19 +00:00
Patrick Linskey 6f29454e48 Small log clarification.
git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@609775 13f79535-47bb-0310-9956-ffa450edef68
2008-01-07 20:56:22 +00:00
Patrick Linskey ab88266f2a OPENJPA-470. Added test case for custom sequence implementations, and updated docs with the current parentheses limitation.
git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@605679 13f79535-47bb-0310-9956-ffa450edef68
2007-12-19 20:19:49 +00:00
Patrick Linskey 485372b3f6 Change Services.getImplementorClasses(Class) and Services.getImplementorClasses(Class,ClassLoader) to filter out implementations that are not assignable to the Class argument. This allows the Services call to be more fault-tolerant in environments with odd classloader configurations.
git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@603666 13f79535-47bb-0310-9956-ffa450edef68
2007-12-12 16:32:28 +00:00
Marc Prud'hommeaux c97cd70b3e Added nested stack trace to the MissingResourceException as an additional diagnostic for issues around ProductDerivations.
git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@599239 13f79535-47bb-0310-9956-ffa450edef68
2007-11-29 01:17:47 +00:00
Patrick Linskey 5018dfaa88 OPENJPA-126: EntityManager serializability. Also includes a fix to make LoadListener.afterRefresh() work. Committing directly (not via remote queue) as I'm about to lose my internet connection for a while. Hopefully, my local testing is accurate.
git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@597155 13f79535-47bb-0310-9956-ffa450edef68
2007-11-21 17:40:54 +00:00
Patrick Linskey 634bdc5c92 OPENJPA-9
git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@595508 13f79535-47bb-0310-9956-ffa450edef68
2007-11-16 00:51:07 +00:00
Patrick Linskey 3ca7d9d4d6 OPENJPA-428. Clarification that 'openjpa.Id' is a configuration property, not a JPA property.
git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@592102 13f79535-47bb-0310-9956-ffa450edef68
2007-11-05 17:41:50 +00:00
Patrick Linskey 98ef3d9063 OPENJPA-407. Assorted performance improvements found while working on this issue. This change does not include any SQL caching work.
git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@590150 13f79535-47bb-0310-9956-ffa450edef68
2007-10-30 16:56:47 +00:00
Albert Lee 1af3d93ca7 OPENJPA-415 remove AbstractResultList.finalize() method.
git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@588089 13f79535-47bb-0310-9956-ffa450edef68
2007-10-25 00:04:51 +00:00
Albert Lee cc5e5a36fa OPENJPA-402 Complete .class file read in ZipFileMetaDataIterator
git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@584420 13f79535-47bb-0310-9956-ffa450edef68
2007-10-13 16:12:35 +00:00
Marc Prud'hommeaux abff87ef35 OPENJPA345 The last patch had the side effect that the artifact zip doesn't contain most of the required dependency jars (e.g., commons-lang), since the transitive dependencies are not followed to pick up these jars. Resolved this by explicitly listing the required jars in the openjpa-all dependencies. Also moved most of the dependency version numbers into the parent pom.xml dependencyManagement section to ensure that all dependency versions are the same.
git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@581536 13f79535-47bb-0310-9956-ffa450edef68
2007-10-03 09:10:54 +00:00
Kevin W. Sutter 5a48e90100 OPENJPA-387. Committing the latest patch from Daniel (with slight modifications by me).
git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@581082 13f79535-47bb-0310-9956-ffa450edef68
2007-10-01 21:44:51 +00:00
Patrick Linskey bb527a1e88 OPENJPA-369. Committing Albert's 1.5-supporting changes.
git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@580451 13f79535-47bb-0310-9956-ffa450edef68
2007-09-28 18:23:48 +00:00
Kevin W. Sutter 6f43ce7d40 OPENJPA-385. Committing changes for both 1.0.x and 1.1.0 to properly skip and optionally log malformed .class files.
git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@580087 13f79535-47bb-0310-9956-ffa450edef68
2007-09-27 16:36:48 +00:00
Srinivasa Segu 91917c406c OPENJPA-379. Creating the statement with the resultSetType, resultSetConcurrency specified consistent with the Kodos internal pool.
git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@577991 13f79535-47bb-0310-9956-ffa450edef68
2007-09-21 05:54:55 +00:00
Pinaki Poddar cea8ab57d1 OPENJPA-305: Add originalValue for Value and modify Configuration equality/hashCode to base on Value equality/hashCode
git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@577164 13f79535-47bb-0310-9956-ffa450edef68
2007-09-19 05:39:17 +00:00
Kevin W. Sutter 7524219f6a OPENJPA-369. Committed Albert's changes for the Java 2 Security updates for the Solaris platform.
git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@577029 13f79535-47bb-0310-9956-ffa450edef68
2007-09-18 19:44:06 +00:00
Kevin W. Sutter 3d8748c427 OPENJPA-361. Committing Albert's patch for the incorrect GREG_OFFSET (Gregorian Offset).
git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@574398 13f79535-47bb-0310-9956-ffa450edef68
2007-09-10 23:01:39 +00:00
Patrick Linskey d022b18ad5 OPENJPA-130. Committing Ignacio's patch, with a few whitespace and method name tweaks.
git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@574143 13f79535-47bb-0310-9956-ffa450edef68
2007-09-10 06:11:29 +00:00
Srinivasa Segu 1242abf2d5 OPENJPA-363
git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@574077 13f79535-47bb-0310-9956-ffa450edef68
2007-09-09 21:11:40 +00:00
Craig Russell 7d9724ac00 OPENJPA-355 Fix checking for log levels; patch submitted by Adrian Co"
git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@573653 13f79535-47bb-0310-9956-ffa450edef68
2007-09-07 18:10:43 +00:00
Kevin W. Sutter 4dae2231cc OPENJPA-339. Committing Albert's Java 2 Security changes. Hopefully, this is the last batch of changes... :-)
git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@571522 13f79535-47bb-0310-9956-ffa450edef68
2007-08-31 16:53:43 +00:00
Pinaki Poddar 44db5768cd Allow dynamic configuration property. Changes include
1. Add getter/setter for boolean 'dynamic' field of Value 
2. Add Value.assertChangeable() that Value subclasses must invoke prior to set
new internal state
3. Changes Configuration readOnly state from a boolean to a simple 3-step state 
variable INIT_STATE_LIQUID/FREEZING/FROZEN. This is done to allow lazy
instantiation of some PluginValues after the BrokerFactory freezes configuration.
4. Removes assertNotReadOnly() check from Configuration implementations' setX() 
methods.
5. Removes dynamic Value related methods from Configuration API and its
implementations


git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@571294 13f79535-47bb-0310-9956-ffa450edef68
2007-08-30 20:19:44 +00:00
Patrick Linskey ba7de16762 Changed OpenJPAVersion to load version information from a resource (like how we load svn data) so that current version info (as of the last mvn compile) will be available for code built and run from source.
git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@570487 13f79535-47bb-0310-9956-ffa450edef68
2007-08-28 17:00:16 +00:00
Marc Prud'hommeaux c70bee2898 Changed trunk version to be 1.1.0-SNAPSHOT (was 1.0.0-SNAPSHOT)
git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@570465 13f79535-47bb-0310-9956-ffa450edef68
2007-08-28 16:03:23 +00:00
Patrick Linskey 8e629a1071 Fixed typo.
git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@570312 13f79535-47bb-0310-9956-ffa450edef68
2007-08-28 05:45:18 +00:00
Michael Dick 62b3725596 OPENJPA-339 committing on behalf of Albert
git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@570288 13f79535-47bb-0310-9956-ffa450edef68
2007-08-28 01:05:18 +00:00
Patrick Linskey dda1e8ef6f OPENJPA-293. Allow runtime redefinition to be disabled via a configuration setting. We really should sweep through the code and change ImplHelper to take a Configuration as an argument, but that won't change the behavior; it'll just make some of the validations more eager.
git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@567886 13f79535-47bb-0310-9956-ffa450edef68
2007-08-21 00:45:23 +00:00
Pinaki Poddar 8d1dacad82 Adding support for change of configuration properties after the configuration has been frozen.
Three methods have been added to Configuration:
  i) Configuration.getDynamicValues() returns list of Values that are dynamically modifiable.
 ii) Configuration.isDynamic(String property) affirms if the named property is dynamically modifiable.
iii) Configuration.modifyDynamic(String property, Object value) modifies the named property value even when Configuration.isReadOnly().

  Currently, OpenJPAConfigurationImpl.getDynamicValues() return 3 simple IntValue properties {dataCacheTimeout, fetchBatchSize, lockTimeout) 
 
  


git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@566494 13f79535-47bb-0310-9956-ffa450edef68
2007-08-16 05:52:17 +00:00
Patrick Linskey e59b9deab9 OPENJPA-293. Updated to latest serp dependency now that it's in the maven repository. Needed for interface-ordering issues in JDK1.5 + redefinition.
git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@565999 13f79535-47bb-0310-9956-ffa450edef68
2007-08-15 01:48:13 +00:00
Marc Prud'hommeaux ecc36a0f37 Build system work in preparation for 1.0.0 release; fixed some missing license headers; added maven ARAT plugin
git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@565955 13f79535-47bb-0310-9956-ffa450edef68
2007-08-14 22:39:55 +00:00
Kevin W. Sutter 5c9642d5f4 OPENJPA-244. Committing Albert's changes for Java 2 Security (minus the white space).
git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@564408 13f79535-47bb-0310-9956-ffa450edef68
2007-08-09 22:27:17 +00:00
Pinaki Poddar 3c17af7351 Fatal Bootstarp exception raised by any ProductDerivation will abandon bootstrapping process
git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@562584 13f79535-47bb-0310-9956-ffa450edef68
2007-08-03 21:17:24 +00:00
Kevin W. Sutter 872d00888d OPENJPA-304. Changes to DepthFirstAnalysis and associated classes and testcases to resolve IBM JDK and Sun JDK differences.
git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@561363 13f79535-47bb-0310-9956-ffa450edef68
2007-07-31 15:43:39 +00:00
Patrick Linskey 747226b1d6 OPENJPA-293. All tests pass, but only because we don't currently test Java 5 + redefinition (only Java 5 + no redef). We need a new version of serp (1.13.1) to support that configuration; the new version has not yet made it into ibiblio.
git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@560016 13f79535-47bb-0310-9956-ffa450edef68
2007-07-26 22:08:37 +00:00
Patrick Linskey 7a6a81d713 Attempt to resolve high-load UUIDGenerator problem. I was not able to reproduce the issue, but code inspection seems to indicate that this fix should work.
git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@559540 13f79535-47bb-0310-9956-ffa450edef68
2007-07-25 17:56:20 +00:00
Pinaki Poddar f12af8d977 Adding BootstrapException that ProductDerivations recognize during beforeConfigurationConstruct()/load()
git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@557798 13f79535-47bb-0310-9956-ffa450edef68
2007-07-19 22:32:26 +00:00
Craig Russell b8bb8404a9 OPENJPA-235 break-nullable-patch contributed by Markus Fuchs
git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@557089 13f79535-47bb-0310-9956-ffa450edef68
2007-07-17 23:56:45 +00:00
Marc Prud'hommeaux 8b5a7f68a0 OPENJPA-244 Fixed some formatting inconsistencies with the patch for OPENJPA-244
git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@553010 13f79535-47bb-0310-9956-ffa450edef68
2007-07-03 22:42:39 +00:00
Michael Dick 0c517d163e OPENJPA-244 committing on behalf of Albert
git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@552996 13f79535-47bb-0310-9956-ffa450edef68
2007-07-03 21:55:29 +00:00
Patrick Linskey 21909df2ec Guarantee that remote commit events are fired against OpenJPA internal data structures before externally-registered listeners. This means that externally-registered listeners can rely on the OpenJPA data structures being up-to-date by the time that they are fired.
git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@552850 13f79535-47bb-0310-9956-ffa450edef68
2007-07-03 14:26:09 +00:00
Marc Prud'hommeaux 85b2e766ca OPENJPA-239 Patch to support the generation of annotation mappings using the reverse mapping tool
git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@552358 13f79535-47bb-0310-9956-ffa450edef68
2007-07-01 19:37:04 +00:00
Patrick Linskey 39f1071085 OPENJPA-262
git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@550185 13f79535-47bb-0310-9956-ffa450edef68
2007-06-24 09:16:57 +00:00
Marc Prud'hommeaux 0091bcabe3 Added a 'java14.jar' property that can be used to specify the location of the JDK 1.4 runtime jar, against which we will compile the JDK 1.4-specific modules. This can be used to ensure that JDK 1.5-specific methods and classes don't slip into the JDK 1.4 modules.
git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@546768 13f79535-47bb-0310-9956-ffa450edef68
2007-06-13 07:50:11 +00:00
Patrick Linskey 5463700d6c OPENJPA-235
git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@544918 13f79535-47bb-0310-9956-ffa450edef68
2007-06-06 18:49:30 +00:00
Marc Prud'hommeaux 3599a48964 Moving version to 1.0.0-SNAPSHOT as a result of mailing list vote
git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@541929 13f79535-47bb-0310-9956-ffa450edef68
2007-05-26 19:18:37 +00:00
Marc Prud'hommeaux 0e19b714ac Changed version from 0.9.8-incubating-SNAPSHOT to 0.9.8-SNAPSHOT to reflect move from incubation to TLP
git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@540829 13f79535-47bb-0310-9956-ffa450edef68
2007-05-23 03:36:05 +00:00
Marc Prud'hommeaux e041fe0d4d OPENJPA-237 Copy aliases array so it can't get modified by reference
git-svn-id: https://svn.apache.org/repos/asf/incubator/openjpa/trunk@540199 13f79535-47bb-0310-9956-ffa450edef68
2007-05-21 16:35:28 +00:00
Marc Prud'hommeaux a92785fea6 OPENJPA-194 Changed openjpa-all-VERSION.jar to be just openjpa-VERSION.jar, and changes openjpa-project-VERSION.zip to be apache-openjpa-VERSION.zip
git-svn-id: https://svn.apache.org/repos/asf/incubator/openjpa/trunk@536693 13f79535-47bb-0310-9956-ffa450edef68
2007-05-09 22:23:54 +00:00
Marc Prud'hommeaux 640cddad04 Updated license headers to be in accordance with http://www.apache.org/legal/src-headers.html
git-svn-id: https://svn.apache.org/repos/asf/incubator/openjpa/trunk@528881 13f79535-47bb-0310-9956-ffa450edef68
2007-04-14 21:50:17 +00:00
Michael Dick 4ea1c3f738 adding license to java files
git-svn-id: https://svn.apache.org/repos/asf/incubator/openjpa/trunk@527728 13f79535-47bb-0310-9956-ffa450edef68
2007-04-11 23:52:54 +00:00
Michael Dick 7fd119e840 updating trunk version
git-svn-id: https://svn.apache.org/repos/asf/incubator/openjpa/trunk@526476 13f79535-47bb-0310-9956-ffa450edef68
2007-04-07 19:54:18 +00:00
Patrick Linskey dc797ab923 OPENJPA-160. Non-finalizing implementation is automatically selected when createContainerEntityManagerFactory() is invoked; clarified some method signatures.
git-svn-id: https://svn.apache.org/repos/asf/incubator/openjpa/trunk@513183 13f79535-47bb-0310-9956-ffa450edef68
2007-03-01 06:31:50 +00:00
Kevin W. Sutter 7303bcd5d5 Slight update for the changes introduced via svn revision 506230 (OPENJPA-138). Instead of just skipping the "null ClassLoader" (which indicates the SystemClassLoader), we'll use the static ClassLoader.getSystemClassLoader() method in order to populate the cache.
This change will help the non-container-managed environment (whereas the original change only benefitted the container-managed environment).

This was discussed on the dev mailing list between Patrick, Marc, and myself.

git-svn-id: https://svn.apache.org/repos/asf/incubator/openjpa/trunk@512357 13f79535-47bb-0310-9956-ffa450edef68
2007-02-27 18:48:19 +00:00
Patrick Linskey 7db81e3d6c OPENJPA-158 -- reduced log level to TRACE for a variety of enhancement and metadata related messages
git-svn-id: https://svn.apache.org/repos/asf/incubator/openjpa/trunk@512107 13f79535-47bb-0310-9956-ffa450edef68
2007-02-27 01:59:42 +00:00
A. Abram White 65bd1f02e3 Second attempt at serializing to full properties, including defaults, rather
than just user-defined properties.  This ensures that on deserialization we
get the proper settings despite not running product derivations.  Previous
attempt caused problems on SunONE.



git-svn-id: https://svn.apache.org/repos/asf/incubator/openjpa/trunk@510638 13f79535-47bb-0310-9956-ffa450edef68
2007-02-22 20:11:00 +00:00
Patrick Linskey 0b8bf2818c OPENJPA-156. Applied Michael Dick's patch (thanks). Updated symbolic constant to use OpenJPA norms, changed references to external symbolic constants to use constants from the map impl being used, and reduced if-else statements for readability.
git-svn-id: https://svn.apache.org/repos/asf/incubator/openjpa/trunk@509793 13f79535-47bb-0310-9956-ffa450edef68
2007-02-20 22:51:50 +00:00
A. Abram White 4efc5d6997 Revert "full properties caching" changes made to ConfigurationImpl -- they're
causing problems on some appservers.



git-svn-id: https://svn.apache.org/repos/asf/incubator/openjpa/trunk@508445 13f79535-47bb-0310-9956-ffa450edef68
2007-02-16 15:23:09 +00:00
A. Abram White 7a2330ce3b Compare Configuration instances on their full properties, including defaults.
Also serialize the full properties because product derivations aren't re-run
on deserialize, so we need to know the complete defaults, etc.  We still track
the user-given properties separately so they can be used in factory pooling.



git-svn-id: https://svn.apache.org/repos/asf/incubator/openjpa/trunk@507643 13f79535-47bb-0310-9956-ffa450edef68
2007-02-14 17:53:13 +00:00
Kevin W. Sutter e14378f7f3 OPENJPA-138. Some updates to help with performance of OpenJPA in an application server environment. Details can be found in the OPENJPA-138 Issue.
git-svn-id: https://svn.apache.org/repos/asf/incubator/openjpa/trunk@506230 13f79535-47bb-0310-9956-ffa450edef68
2007-02-12 02:33:05 +00:00
Marc Prud'hommeaux 2ac1bcccbb OPENJPA-118: Implemented patch provided by David Ezzio for broken openjpa.AutoDetach behavior
git-svn-id: https://svn.apache.org/repos/asf/incubator/openjpa/trunk@502022 13f79535-47bb-0310-9956-ffa450edef68
2007-01-31 22:27:29 +00:00