From 6316c57e975766d06575ad8a0a9b4dab9561bc1e Mon Sep 17 00:00:00 2001 From: "Kevin W. Sutter" Date: Mon, 20 Aug 2007 16:50:20 +0000 Subject: [PATCH] OPENJPA-323. Committing message updates per Teresa's patch. Thanks, Teresa! git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@567748 13f79535-47bb-0310-9956-ffa450edef68 --- .../apache/openjpa/jdbc/meta/strats/localizer.properties | 6 +++--- .../org/apache/openjpa/enhance/localizer.properties | 4 ++-- .../org/apache/openjpa/kernel/localizer.properties | 2 +- .../resources/org/apache/openjpa/meta/localizer.properties | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/openjpa-jdbc/src/main/resources/org/apache/openjpa/jdbc/meta/strats/localizer.properties b/openjpa-jdbc/src/main/resources/org/apache/openjpa/jdbc/meta/strats/localizer.properties index 9b93323ac..6672b8d31 100644 --- a/openjpa-jdbc/src/main/resources/org/apache/openjpa/jdbc/meta/strats/localizer.properties +++ b/openjpa-jdbc/src/main/resources/org/apache/openjpa/jdbc/meta/strats/localizer.properties @@ -59,8 +59,8 @@ not-embed: "{0}" specifies an embedded mapping strategy, but it is not \ embedded. not-oid: "{0}" species an object id mapping strategy, but it is not \ an object id field. -oid-not-joinable: Field "{0}" embedded within object id field "{1}" cannot be \ - a primary key value. Its mapping does not it to be a join target. +# oid-not-joinable: Field "{0}" embedded within object id field "{1}" cannot be \ +# a primary key value. Its mapping does not allow it to be a join target. flat-table: Type "{0}" uses a flat inheritance mapping, but declares a table \ name of "{1}", which does not match the superclass table "{2}". not-string: Field "{0}" declares a string field mapping strategy, but is not \ @@ -95,7 +95,7 @@ class-crit-owner: Field "{0}" declares that it uses class criteria for joins, \ impossible to correctly null the inverse foreign keys when the field is \ deleted. OpenJPA may leave orphan key values in the database if you do \ not provide an owning inverse relation using the "mapped-by" attribute. -not-map: Field "{0}" declares a map mapping strategy, but is not a map type. +not-map: Field "{0}" declares a Map mapping strategy, but it is not a Map type. mapped-by-key: Map field "{0}" is attempting to use a map table, but its key \ is mapped by another field. Use an inverse key or join table mapping. not-mapped-by-key: Map field "{0}" is attempting to use an inverse key or join \ diff --git a/openjpa-kernel/src/main/resources/org/apache/openjpa/enhance/localizer.properties b/openjpa-kernel/src/main/resources/org/apache/openjpa/enhance/localizer.properties index 9df55adc5..961d3b30d 100644 --- a/openjpa-kernel/src/main/resources/org/apache/openjpa/enhance/localizer.properties +++ b/openjpa-kernel/src/main/resources/org/apache/openjpa/enhance/localizer.properties @@ -88,8 +88,8 @@ pcdata-created: Dynamic PCData created: name="{0}", for type="{1}" factory-not-oidloader: Attempt to run the application id tool under metadata \ configuration that does not support it. The application id tool can only \ run under certain metadata factory settings. -str-cons: The id type "{0}" specfied by persistent type "{1}" does not have a \ - public string or class + string constructor. +str-cons: The id type "{0}" specfied by persistent type "{1}" \ + does not have a public {0}(String) or {0}(Class, String) constructor. appid-start: Generating an application id for type "{0}". appid-invalid: Type "{0}" does not have metadata, does not use application \ identity, uses a built-in identity type, or inherits the identity class \ diff --git a/openjpa-kernel/src/main/resources/org/apache/openjpa/kernel/localizer.properties b/openjpa-kernel/src/main/resources/org/apache/openjpa/kernel/localizer.properties index 7486fc338..fce4adb4f 100644 --- a/openjpa-kernel/src/main/resources/org/apache/openjpa/kernel/localizer.properties +++ b/openjpa-kernel/src/main/resources/org/apache/openjpa/kernel/localizer.properties @@ -109,7 +109,7 @@ non-trans-read: To perform reads on persistent data outside of a transaction, \ the "NontransactionalRead" property must be set on the Transaction. non-trans-write: To perform writes on persistent data outside of a \ transaction, the "NontransactionalWrite" property must be set to true. -write-operation: To perform this operation, you must be withing a transaction, \ +write-operation: To perform this operation, it must be written within a transaction, \ or your settings must allow nontransactional writes and must not detach \ all nontransactional reads. not-managed: The given instance "{0}" is not managed by this context. diff --git a/openjpa-kernel/src/main/resources/org/apache/openjpa/meta/localizer.properties b/openjpa-kernel/src/main/resources/org/apache/openjpa/meta/localizer.properties index cc473f0d5..19f11a95a 100644 --- a/openjpa-kernel/src/main/resources/org/apache/openjpa/meta/localizer.properties +++ b/openjpa-kernel/src/main/resources/org/apache/openjpa/meta/localizer.properties @@ -202,7 +202,7 @@ bad-update-strategy-hint: "{0}" declares a read only value of \ "{1}". This is not a recognized strategy, though it closely resembles \ the standard strategy "{2}". Available strategies are: {3} not-interface: Cannot set type "{0}" to be a managed interface as it is not \ - and interface. + an interface. interface: The type "{0}" is an unmanaged interface and therefore cannot be \ made persistent. enum: Type "{0}" is an enumeration and therefore cannot be made persistent. @@ -238,7 +238,7 @@ bad-access-type: The ClassMetaData access type must be set to either \ set it to "{0}" failed. val-not-pc: The map value type of field "{0}" with a derived key must be a \ persistent class. -val-not-one-pk: The map value type of field "{0}" a derived key must be a \ +val-not-one-pk: The map value type of field "{0}" with a derived key must be a \ persistent class with exactly one primary key field. # this is a comma-separated set of prefixes that we want to # exclude from top-level validation, so that extensions that