diff --git a/openjpa-jdbc/src/main/resources/org/apache/openjpa/jdbc/conf/localizer.properties b/openjpa-jdbc/src/main/resources/org/apache/openjpa/jdbc/conf/localizer.properties index d48c00946..401cd51bb 100644 --- a/openjpa-jdbc/src/main/resources/org/apache/openjpa/jdbc/conf/localizer.properties +++ b/openjpa-jdbc/src/main/resources/org/apache/openjpa/jdbc/conf/localizer.properties @@ -69,7 +69,7 @@ EagerFetchMode-expert: true SubclassFetchMode-name: Subclass fetch mode SubclassFetchMode-desc: Specifies the default subclass fetch mode to use. \ - Eitehr "none" to always select data in base class tables only, "join" to \ + Either "none" to always select data in base class tables only, "join" to \ outer-join to tables for all subclasses, or "parallel" to execute a \ separate select in parallel for each possible subclass. Parallel mode is \ only applicable to Query execution; in other situations it mirrors \ diff --git a/openjpa-jdbc/src/main/resources/org/apache/openjpa/jdbc/meta/localizer.properties b/openjpa-jdbc/src/main/resources/org/apache/openjpa/jdbc/meta/localizer.properties index e53d1361e..815e939ed 100644 --- a/openjpa-jdbc/src/main/resources/org/apache/openjpa/jdbc/meta/localizer.properties +++ b/openjpa-jdbc/src/main/resources/org/apache/openjpa/jdbc/meta/localizer.properties @@ -129,7 +129,7 @@ generic-no-fkcol-target-adapt: "{0}" does not supply a target for column \ generic-bad-fktarget: "{0}" defines a target of "{1}" for column "{2}", but \ that target does not exist in table "{3}". generic-bad-fktargetcls: "{0}" defines target field "{1}" for column \ - "{2}", but OpenJPA cannot deterimine the owning class for that field. + "{2}", but OpenJPA cannot determine the owning class for that field. generic-bad-fktargetfield: "{0}" defines target field "{1}" for column \ "{2}", but that field does not exist in type "{3}". generic-fktargetfield-cols: "{0}" defines target field "{1}" for column \ @@ -146,7 +146,7 @@ generic-create-defer-fk: "{0}" marks its columns as having a deferred foreign \ deferred constraints. Creating an undeferred constraint. generic-unsupported-fk-action: "{0}" uses an unsupported foreign key delete or \ update action on its columns. Reverting to a logical foreign key. -generic-const-join: "{0}" attmpts to join a constant value to another constant \ +generic-const-join: "{0}" attempts to join a constant value to another constant \ value. superclass-no-fk-cols: Type "{0}" is missing information on how to join to \ its superclass. @@ -169,7 +169,7 @@ superclass-no-fkcol-target-adapt: Type "{0}" does not supply a target for \ superclass-bad-fktarget: Type "{0}" defines a target of "{1}" for superclass \ join column "{2}", but that target does not exist in table "{3}". superclass-bad-fktargetcls: "{0}" defines target field "{1}" for superclass \ - join column "{2}", but OpenJPA cannot deterimine the owning class for that \ + join column "{2}", but OpenJPA cannot determine the owning class for that \ field. superclass-bad-fktargetfield: Type "{0}" defines target field of "{1}" for \ superclass join column "{2}", but that field does not exist in type "{3}". @@ -191,7 +191,7 @@ superclass-create-defer-fk: Type "{0}" marks its superclass join columns as \ superclass-unsupported-fk-action: Type "{0}" uses an unsupported foreign key \ delete or update action on its superclass join columns. Reverting to a \ logical foreign key. -superclass-const-join: "{0}" attmpts to join a constant value to another \ +superclass-const-join: "{0}" attempts to join a constant value to another \ constant value. join-no-index-cols: "{0}" declares a join index, but has no join columns. join-index-exists: "{0}" marks its join columns as explicitly not indexed, but \ @@ -237,7 +237,7 @@ join-no-fkcol-target-adapt: "{0}" does not supply a target for join column \ join-bad-fktarget: "{0}" defines a target of "{1}" for join column "{2}", but \ that target does not exist in table "{3}". join-bad-fktargetcls: "{0}" defines target field "{1}" for join column "{2}", \ - but OpenJPA cannot deterimine the owning class for that field. + but OpenJPA cannot determine the owning class for that field. join-bad-fktargetfield: "{0}" defines target field of "{1}" for join column \ "{2}", but that field does not exist in type "{3}". join-fktargetfield-cols: "{0}" defines target field "{1}" for join column \ @@ -255,7 +255,7 @@ join-create-defer-fk: "{0}" marks its join columns as having a deferred \ support deferred constraints. Creating an undeferred constraint. join-unsupported-fk-action: "{0}" uses an unsupported foreign key delete or \ update action on its join columns. Reverting to a logical foreign key. -join-const-join: "{0}" attmpts to join a constant value to another constant \ +join-const-join: "{0}" attempts to join a constant value to another constant \ value. unmapped: Attempt to map "{0}" failed: the owning entity is not mapped. col-wrong-table: When mapping "{0}" to table "{1}", found a column mapped to \ 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 f441b19ff..7a12b9fb2 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 @@ -126,7 +126,7 @@ outer-join-support: The subclass-join class indicator mapped to "{0}" requires \ "traditional" join syntax, which does not support outer joins. To \ use SQL 92 joins instead, set the following property:\n\ openjpa.jdbc.DBDictionary: JoinSyntax=sql92 -unknown-discrim-value: Could not map disciminator value "{0}" to any \ +unknown-discrim-value: Could not map discriminator value "{0}" to any \ known subclasses of the requested class "{1}" (known discriminator \ values: {2}). bad-unmapped-rel: "{0}" cannot be mapped without stringifying the oid of \ diff --git a/openjpa-jdbc/src/main/resources/org/apache/openjpa/jdbc/sql/localizer.properties b/openjpa-jdbc/src/main/resources/org/apache/openjpa/jdbc/sql/localizer.properties index 6b6a103ec..01fff7654 100644 --- a/openjpa-jdbc/src/main/resources/org/apache/openjpa/jdbc/sql/localizer.properties +++ b/openjpa-jdbc/src/main/resources/org/apache/openjpa/jdbc/sql/localizer.properties @@ -157,9 +157,9 @@ illegal-method: {0}.{1}() is illegal to be invoked column-not-mapped: SQLResultSetMapping "{0}" does not map the columns "{1}" \ that are selected by the SQL query\r\n "{2}" dictionary-configuration: DBDictionary configuration: \n{0} -oracle-timestamp-bug: An ArrayIndexOutOfBoundsException has occured when \ +oracle-timestamp-bug: An ArrayIndexOutOfBoundsException has occurred when \ getting a timestamp value. This can happen when using versions of the \ - Oracle JDBC driver greater than 9.2 in conjuncion with a server version \ + Oracle JDBC driver greater than 9.2 in conjunction with a server version \ less than 9.2. Downgrading the driver will solve this, or it can be \ worked around by setting the "SupportsTimestampNanos" DBDictionary \ property to "true". diff --git a/openjpa-kernel/src/main/resources/org/apache/openjpa/conf/localizer.properties b/openjpa-kernel/src/main/resources/org/apache/openjpa/conf/localizer.properties index 0606930f3..a02bf86a8 100644 --- a/openjpa-kernel/src/main/resources/org/apache/openjpa/conf/localizer.properties +++ b/openjpa-kernel/src/main/resources/org/apache/openjpa/conf/localizer.properties @@ -129,7 +129,7 @@ MaxFetchDepth-displayorder: 50 MaxFetchDepth-expert: true FetchGroups-name: Fetch groups to add to default fetch group -FetchGroups-desc: A comma-separated list of fetch group names that wll be \ +FetchGroups-desc: A comma-separated list of fetch group names that will be \ loaded by default when fetching data from the data store. FetchGroups-type: Optimization FetchGroups-cat: Fetching diff --git a/openjpa-kernel/src/main/resources/org/apache/openjpa/ee/localizer.properties b/openjpa-kernel/src/main/resources/org/apache/openjpa/ee/localizer.properties index db6ae7bd1..014e0aca1 100644 --- a/openjpa-kernel/src/main/resources/org/apache/openjpa/ee/localizer.properties +++ b/openjpa-kernel/src/main/resources/org/apache/openjpa/ee/localizer.properties @@ -29,7 +29,7 @@ was-transaction-id-exception: Unable to determine identity of the current \ WebSphere managed transaction. Please ensure that your are running the \ application from within WebSphere Application Server (version 5.0.2 or \ newer). -was-reflection-exception: An error occured reflecting WebSphere proprietary \ +was-reflection-exception: An error occurred reflecting WebSphere proprietary \ interfaces. Please ensure that you are running the application from within \ WebSphere Application Server (version 5.0.2 or newer). was-lookup-error: An error occurred looking up the WebSphere extended JTA \ 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 3ad9b279b..d82698b08 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 @@ -78,7 +78,7 @@ enhance-adddefaultconst: The type "{0}" must have a no-args constructor. \ Adding a {1} no-args constructor. enhance-cloneable:The type "{0}" implements Cloneable but does not call \ super.clone (). Adding protected super.clone () invocation. -enhance-uid-access: An IllegalAccessException occured when trying to \ +enhance-uid-access: An IllegalAccessException occurred when trying to \ obtain the serialVersionUID field for the class "{0}". This is a known \ bug in JDK 1.4+ when using a custom ClassLoader to enhance a \ class that implements java.io.Serializable. If compatibility with \ @@ -91,7 +91,7 @@ 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}" \ +str-cons: The id type "{0}" specified 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 \ 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 c0baf2807..e2824a140 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 @@ -311,8 +311,8 @@ scan-found-names: Scan of "{1}" found persistent types {0}. parse-found-names: parsePersistentTypeNames() found {0}. interface-load: Dynamic implementation of managed "{0}" can not be defined \ using classloader "{1}". See nested exception for details. -interface-load2: Enhanced dynamic implementaion of managed "{0}" can not be \ +interface-load2: Enhanced dynamic implementation of managed "{0}" can not be \ defined using classloader "{1}". See nested exception for details. -interface-badenhance: Dynamic implementaion of "{0}" can not be enhanced. +interface-badenhance: Dynamic implementation of "{0}" can not be enhanced. bad-externalized-value: Value "{0}" was not found in the list of \ ExternalValues for field "{2}". Valid values are {1} diff --git a/openjpa-kernel/src/main/resources/org/apache/openjpa/util/localizer.properties b/openjpa-kernel/src/main/resources/org/apache/openjpa/util/localizer.properties index 0ae6930f2..ef55f95f8 100644 --- a/openjpa-kernel/src/main/resources/org/apache/openjpa/util/localizer.properties +++ b/openjpa-kernel/src/main/resources/org/apache/openjpa/util/localizer.properties @@ -34,7 +34,7 @@ lock-timeout: Could not obtain a lock on object "{0}" in {1} milliseconds. not-found: The instance "{0}" does not exist in the data store. obj-exists: The instance "{0}" cannot be persisted, because it conflicts with \ an existing instance. -not-found-multi: The follwing instnaces do not exist in the data store: {0} +not-found-multi: The following instances do not exist in the data store: {0} opt-lock: An optimistic lock violation was detected when flushing object \ instance "{0}" to the data store. This indicates that the \ object was concurrently modified in another transaction. @@ -44,7 +44,7 @@ opt-lock-multi: Optimistic locking errors were detected when flushing to the \ opt-lock-nested: Optimistic locking errors were detected when \ flushing to the data store. This indicates that some objects were \ concurrently modified in another transaction. Each exception in \ - the nested throwables array contains a failed object representing \ + the nested Throwables array contains a failed object representing \ a concurrently modified object. bad-array: Unable to copy array: {0}. no-proxy-final: Unable to create a second class object proxy for final class \ diff --git a/openjpa-lib/src/main/resources/org/apache/openjpa/lib/conf/localizer.properties b/openjpa-lib/src/main/resources/org/apache/openjpa/lib/conf/localizer.properties index e9a98f316..8ddc13c3f 100644 --- a/openjpa-lib/src/main/resources/org/apache/openjpa/lib/conf/localizer.properties +++ b/openjpa-lib/src/main/resources/org/apache/openjpa/lib/conf/localizer.properties @@ -21,7 +21,7 @@ obj-create: An instance of the class "{0}" could not be instantiated. Make \ sure the class has a public no-args constructor. prop-parse: There was an error parsing the properties string "{0}". Please \ check that the format is: "= = ...". -naming-err: There was an error duing JNDI lookup of the name "{0}". +naming-err: There was an error during JNDI lookup of the name "{0}". invalid-config-params: There was an error while setting up the configuration \ plugin option "{0}". The plugin was of type "{1}". Setter methods for the \ following plugin properties were not available in that type: {2}. \ diff --git a/openjpa-lib/src/main/resources/org/apache/openjpa/lib/jdbc/localizer.properties b/openjpa-lib/src/main/resources/org/apache/openjpa/lib/jdbc/localizer.properties index 897b1ce4b..18fa11811 100644 --- a/openjpa-lib/src/main/resources/org/apache/openjpa/lib/jdbc/localizer.properties +++ b/openjpa-lib/src/main/resources/org/apache/openjpa/lib/jdbc/localizer.properties @@ -35,7 +35,7 @@ tracker-total: total tracker-max: max tracker-average: average tracker-ms: ms -tracker-occurances: occurances +tracker-occurances: occurrences tracker-slowest-statements: slowest statements rsrc-closed: The connection "{0}" has already been closed. The embedded \ stack trace for this exception details the closure point. diff --git a/openjpa-persistence/src/main/resources/org/apache/openjpa/persistence/localizer.properties b/openjpa-persistence/src/main/resources/org/apache/openjpa/persistence/localizer.properties index 9427d7245..b1e58e959 100644 --- a/openjpa-persistence/src/main/resources/org/apache/openjpa/persistence/localizer.properties +++ b/openjpa-persistence/src/main/resources/org/apache/openjpa/persistence/localizer.properties @@ -59,7 +59,7 @@ unnamed-fg: "{0}" declares an unnamed fetch group. All fetch groups \ bad-fg-field: Fetch group "{0}" in type "{1}" includes field "{2}", but \ this field is not declared in "{1}", or is not persistent. Currently, \ OpenJPA only supports declared fields in fetch groups. -missing-included-fg:"{0}" declares a fecth group "{1}" includes "{2}". But \ +missing-included-fg:"{0}" declares a fetch group "{1}" includes "{2}". But \ the included fetch group "{2}" can not be found in "{0}". Currently, all \ included fetch groups must be declared within the same entity scope. not-update-delete-query: Cannot perform an update or delete operation \