svn commit: r915439 - in /openjpa/trunk: openjpa-kernel/src/main/resources/org/apache/openjpa/datacache/ openjpa-kernel/src/main/resources/org/apache/openjpa/kernel/ openjpa-persistence/src/main/resources/org/apache/openjpa/persistence/ openjpa-persist...

[al...@apache.org]

Author: allee8285
Date: Tue Feb 23 17:10:18 2010
New Revision: 915439

URL: http://svn.apache.org/viewvc?rev=915439&view=rev
Log:
OPENJPA-1498 - Commit contribution by Cathy Nordstrom.

Modified:
    openjpa/trunk/openjpa-kernel/src/main/resources/org/apache/openjpa/datacache/localizer.properties
    openjpa/trunk/openjpa-kernel/src/main/resources/org/apache/openjpa/kernel/localizer.properties
    openjpa/trunk/openjpa-persistence/src/main/resources/org/apache/openjpa/persistence/localizer.properties
    openjpa/trunk/openjpa-persistence/src/main/resources/org/apache/openjpa/persistence/meta/localizer.properties

Modified: openjpa/trunk/openjpa-kernel/src/main/resources/org/apache/openjpa/datacache/localizer.properties
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-kernel/src/main/resources/org/apache/openjpa/datacache/localizer.properties?rev=915439&r1=915438&r2=915439&view=diff
==============================================================================
--- openjpa/trunk/openjpa-kernel/src/main/resources/org/apache/openjpa/datacache/localizer.properties (original)
+++ openjpa/trunk/openjpa-kernel/src/main/resources/org/apache/openjpa/datacache/localizer.properties Tue Feb 23 17:10:18 2010
@@ -90,13 +90,13 @@
 partition-cache-parse-error-paren: Failed to configure cache partitions from the \
 	supplied configuration "{0}" while parsing the part "{1}" because this part \
 	is not enclosed by parentheses. The proper \
-	configuration string for cache partitions is '(p1),(p2),(p3)' i.e. each \
+	configuration string for cache partitions is ''(p1),(p2),(p3)'' i.e. each \
 	partition plug-in is enclosed in parentheses, separated by comma and the \
 	final string is enclosed by single quote.
 partition-cache-parse-error-comma: Failed to configure cache partitions from the \
 	supplied configuration "{0}" while parsing the part "{1}" because this part \
 	is not separated by comma. The proper \
-	configuration string for cache partitions is '(p1),(p2),(p3)' i.e. each \
+	configuration string for cache partitions is ''(p1),(p2),(p3)'' i.e. each \
 	partition plug-in is enclosed in parentheses, separated by comma and the \
 	final string is enclosed by single quote.	
 partition-cache-null-partition: You have not specified any name for a partition in \

Modified: openjpa/trunk/openjpa-kernel/src/main/resources/org/apache/openjpa/kernel/localizer.properties
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-kernel/src/main/resources/org/apache/openjpa/kernel/localizer.properties?rev=915439&r1=915438&r2=915439&view=diff
==============================================================================
--- openjpa/trunk/openjpa-kernel/src/main/resources/org/apache/openjpa/kernel/localizer.properties (original)
+++ openjpa/trunk/openjpa-kernel/src/main/resources/org/apache/openjpa/kernel/localizer.properties Tue Feb 23 17:10:18 2010
@@ -33,7 +33,6 @@
 	require the in-progress flush to complete.
 rolled-back: The transaction has been rolled back.  See the nested exceptions \
 	for details on the errors that occurred.
-bad-lock-level: This lock manager does not recognize lock level "{0}".
 pessimistic-mutate: You are attempting to directly mutate a persistent second \
 	class object (such as a collection or map field) that you obtained before \
 	the transaction began.  After beginning a datastore transaction, you \

Modified: openjpa/trunk/openjpa-persistence/src/main/resources/org/apache/openjpa/persistence/localizer.properties
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence/src/main/resources/org/apache/openjpa/persistence/localizer.properties?rev=915439&r1=915438&r2=915439&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence/src/main/resources/org/apache/openjpa/persistence/localizer.properties (original)
+++ openjpa/trunk/openjpa-persistence/src/main/resources/org/apache/openjpa/persistence/localizer.properties Tue Feb 23 17:10:18 2010
@@ -163,7 +163,7 @@
 param-style-mismatch: Query "{0}" is declared with named parameters "{1}" but \
 	actual parameters "{2}" are bound by position.
 param-missing: Parameter "{0}" declared in "{1}" but is missing from the bound \
-	parameters "{2}".
+	parameter keys "{2}".
 param-extra: Parameter "{0}" is bound to "{1}" but is missing from the \
 	declared parameters "{2}".
 param-type-mismatch: Parameter "{0}" declared in "{1}" is set to value of \
@@ -198,8 +198,6 @@
 vlem-creation-info: OpenJPA dynamically loaded a validation provider.
 no-embeddable-metadata: Unable to load metadata for embeddable class "{0}".
 
-param-missing: {0} is not declared in query "{1}". \
-    Declared parameter keys are "{2}".
 param-missing-pos: Parameter position {0} is not declared in query "{1}". \
 	Declared parameter keys are "{2}".
 param-missing-name: Parameter named "{0}" is not declared in query "{1}". \
@@ -217,7 +215,7 @@
 param-pos-named-mix: {0} can not be used in query " {1}" because JPA does \
     not allow to mix named and positional parameters in a query. Existing \
 	parameters are "{2}".
-param-no-key: {0} has either a name nor a position as identifier. 	
+param-no-key: {0} has neither a name nor a position as identifier. 	
 tuple-element-not-found: TupleElement "{0}" "{1}"  was not found in this Tuple. Contents of the Tuple: {2}.
 tuple-was-null: Input argument {0} was null. Unable to proceed.
 tuple-element-wrong-type: TupleElement {0} of value {1} of actual type {2} can not be converted to {3}.

Modified: openjpa/trunk/openjpa-persistence/src/main/resources/org/apache/openjpa/persistence/meta/localizer.properties
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence/src/main/resources/org/apache/openjpa/persistence/meta/localizer.properties?rev=915439&r1=915438&r2=915439&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence/src/main/resources/org/apache/openjpa/persistence/meta/localizer.properties (original)
+++ openjpa/trunk/openjpa-persistence/src/main/resources/org/apache/openjpa/persistence/meta/localizer.properties Tue Feb 23 17:10:18 2010
@@ -47,7 +47,7 @@
 	positive number. Setting default value as Java {1} compiler.
 mmg-bad-naming: Naming policy for meta-model classes specified in -Anaming \
 	option "{0}" can not be used due to "{1}". Using default naming policy.
-mmg-bad-log: Log level specified is -Alog option "{0}" is not recognized. \
+mmg-bad-log: Log level specified in -Alog option "{0}" is not recognized. \
 	Logging at default "{1}" level.  
 
 meta-class-no-anno: Meta class "{0}" registered for "{1}" is not annotated \