Craig, Albert has committed the same fix to the 1.1.0 trunk also under #587688
Teresa On 10/24/07, Craig L Russell <[EMAIL PROTECTED]> wrote: > > Hi Albert, > > Are these changes only for the maintenance branch? Were they > previously committed to the trunk? > > Craig > > On Oct 23, 2007, at 3:48 PM, [EMAIL PROTECTED] wrote: > > > Author: allee8285 > > Date: Tue Oct 23 15:48:48 2007 > > New Revision: 587683 > > > > URL: http://svn.apache.org/viewvc?rev=587683&view=rev > > Log: > > OPENJPA-413, commit localizer.properties files for Teresa. > > > > Modified: > > openjpa/branches/1.0.x/openjpa-jdbc/src/main/resources/org/ > > apache/openjpa/jdbc/meta/localizer.properties > > openjpa/branches/1.0.x/openjpa-kernel/src/main/resources/org/ > > apache/openjpa/kernel/localizer.properties > > openjpa/branches/1.0.x/openjpa-kernel/src/main/resources/org/ > > apache/openjpa/meta/localizer.properties > > > > Modified: openjpa/branches/1.0.x/openjpa-jdbc/src/main/resources/ > > org/apache/openjpa/jdbc/meta/localizer.properties > > URL: http://svn.apache.org/viewvc/openjpa/branches/1.0.x/openjpa- > > jdbc/src/main/resources/org/apache/openjpa/jdbc/meta/ > > localizer.properties?rev=587683&r1=587682&r2=587683&view=diff > > ====================================================================== > > ======== > > --- openjpa/branches/1.0.x/openjpa-jdbc/src/main/resources/org/ > > apache/openjpa/jdbc/meta/localizer.properties (original) > > +++ openjpa/branches/1.0.x/openjpa-jdbc/src/main/resources/org/ > > apache/openjpa/jdbc/meta/localizer.properties Tue Oct 23 15:48:48 2007 > > @@ -56,7 +56,7 @@ > > generic-no-col-name: No column name was given for "{0}". > > generic-bad-col-name: "{0}" declares column "{1}", but this column > > does not \ > > exist in table "{2}". > > -generic-incompat-col: "{0}" declares a column "{1}" whose jdbc- > > type is not \ > > +generic-incompat-col: "{0}" declares a column "{1}" whose JDBC > > type is not \ > > compatible with the expected type "{2}". > > generic-bad-col: "{0}" declares a column that is not compatible > > with the \ > > expected type "{1}". Column details:\n{2} > > @@ -66,7 +66,7 @@ > > datastoreid-bad-col-name: Type "{0}" declares datastore identity > > column "{1}", \ > > but this column does not exist in table "{2}". > > datastoreid-incompat-col: Type "{0}" declares a datastore identity > > column \ > > - "{1}" whose jdbc-type is not compatible with the expected type > > "{2}". > > + "{1}" whose JDBC type is not compatible with the expected type > > "{2}". > > datastoreid-bad-col: Type "{0}" declares a datastore identity > > column that is \ > > not compatible with the expected type "{1}". Column details:\n{2} > > nondfg-field-orderable: Cannot order "{0}" on "{1}", because that > > field is not \ > > @@ -77,16 +77,16 @@ > > order-no-col-name: No order column name was given for "{0}". > > order-bad-col-name: "{0}" declares order column "{1}", but this > > column does \ > > not exist in table "{2}". > > -order-incompat-col: "{0}" declares an order column "{1}" whose > > jdbc-type is \ > > +order-incompat-col: "{0}" declares an order column "{1}" whose > > JDBC type is \ > > not compatible with the expected type "{2}". > > order-bad-col: "{0}" declares an order column column that is not > > compatible \ > > with the expected type "{1}". Column details:\n{2} > > -null-ind-no-col-name: No null-indicator column name was given for > > "{0}". > > -null-ind-bad-col-name: "{0}" declares null-indicator column "{1}", > > but this \ > > +null-ind-no-col-name: No null indicator column name was given for > > "{0}". > > +null-ind-bad-col-name: "{0}" declares null indicator column "{1}", > > but this \ > > column does not exist in table "{2}". > > -null-ind-incompat-col: "{0}" declares a null-indicator column > > "{1}" whose \ > > - jdbc-type is not compatible with the expected type "{2}". > > -null-ind-bad-col: "{0}" declares a null-indicator column column > > that is not \ > > +null-ind-incompat-col: "{0}" declares a null indicator column > > "{1}" whose \ > > + JDBC type is not compatible with the expected type "{2}". > > +null-ind-bad-col: "{0}" declares a null indicator column column > > that is not \ > > compatible with the expected type "{1}". Column details:\n{2} > > generic-no-index-cols: "{0}" declares an index, but has no columns. > > generic-index-exists: "{0}" marks its columns as explicitly not > > indexed, but \ > > @@ -262,7 +262,7 @@ > > illegal table "{2}". > > target-wrong-cls: When mapping "{0}", found join with a target- > > field in class \ > > "{1}". This class does not match the expected source or target > > mappings \ > > - for the join ("{2}", "{3}"). > > + for the join of ("{2}", "{3}"). > > no-equiv-mapped-by: "{0}" does not have a valid mapping. It > > declares that it \ > > is mapped by "{2}", but "{1}", a subclass of its declared type, > > does not \ > > inherit that relation field. > > @@ -355,7 +355,7 @@ > > is gathering schema information; this process may take some > > time. Enable \ > > the org.apache.openjpa.jdbc.Schema logging category to see > > messages about schema data. > > revtool-running-file: The reverse mapping tool will run on schema > > file "{0}". > > -revtool-map: Calculating reverse mappings. > > +revtool-map: ReverseMappingTool : generating classes. > > revtool-write-code: Writing generated class source code. > > revtool-write-appid: Writing generated application identity classes. > > revtool-write-metadata: Writing generated metadata. > > > > Modified: openjpa/branches/1.0.x/openjpa-kernel/src/main/resources/ > > org/apache/openjpa/kernel/localizer.properties > > URL: http://svn.apache.org/viewvc/openjpa/branches/1.0.x/openjpa- > > kernel/src/main/resources/org/apache/openjpa/kernel/ > > localizer.properties?rev=587683&r1=587682&r2=587683&view=diff > > ====================================================================== > > ======== > > --- openjpa/branches/1.0.x/openjpa-kernel/src/main/resources/org/ > > apache/openjpa/kernel/localizer.properties (original) > > +++ openjpa/branches/1.0.x/openjpa-kernel/src/main/resources/org/ > > apache/openjpa/kernel/localizer.properties Tue Oct 23 15:48:48 2007 > > @@ -151,7 +151,7 @@ > > default value. > > attach-wrongclass: Attempted to attach instance "{0}" of type > > "{1}", but this \ > > instance is already in the datastore as type "{2}". > > -sjvm-acquired-lock: Acquired an exclusive lock on oid "{0}": "{1}". > > +sjvm-acquired-lock: Acquired an exclusive lock "{0}" on oid "{1}". > > sjvm-released-lock: Released lock "{0}". > > conn-not-supported: This data store cannot return connections. > > incremental-flush-not-supported: This data store does not support > > incremental \ > > @@ -213,10 +213,10 @@ > > no-field-index: "{0}" is not the index of any managed field in "{1}". > > cant-cascade-persist: Encountered unmanaged object "{0}" in > > persistent field \ > > "{1}" of managed object "{2}" during flush. However, this field > > does not \ > > - allow cascade persist. You cannot flush unmanaged objects. > > + allow to be CascadeType.PERSIST. You cannot flush unmanaged > > objects. > > cant-cascade-attach: Encountered new object "{0}" in persistent > > field \ > > "{1}" of managed object "{2}" during attach. However, this field > > does not \ > > - allow cascade attach. You cannot attach a reference to a new > > object \ > > + allow to cascade during attach. You cannot attach a reference to > > a new object \ > > without cascading. > > ref-to-deleted: Encountered deleted object "{0}" in persistent > > field \ > > "{1}" of managed object "{2}" during flush. > > @@ -314,7 +314,8 @@ > > generic put(Object,Object) method that can be used, nor does it > > have a \ > > public constructor that takes the types {2}. > > pack-err: There was an error packing the projection and/or > > aggregate results \ > > - of the query into result type "{0}". See the nested throwable > > for details. > > + of the query into result type "{0}". See the nested Throwable > > exception \ > > + for details. > > pack-instantiation-err: There was an error creating an instance of > > type "{0}" \ > > when packing the projection and/or aggregate results of the > > query. Ensure \ > > that you have defined a public no-args constructor in "{0}". > > @@ -324,7 +325,7 @@ > > OpenJPA is attempting to execute this query in-memory; if you > > implemented \ > > the datastore method instead (a method with the same signature > > but without \ > > the Object argument) and want this query to execute in the > > datastore, \ > > - either make the query before modifying objects in the current > > transaction, \ > > + either create the query before modifying objects in the > > current transaction, \ > > set IgnoreCache to true, or set the openjpa.FlushBeforeQueries > > property to \ > > true. > > bad-datastore-method: Method "{0}(StoreContext, ClassMetaData, > > boolean, Map, \ > > > > Modified: openjpa/branches/1.0.x/openjpa-kernel/src/main/resources/ > > org/apache/openjpa/meta/localizer.properties > > URL: http://svn.apache.org/viewvc/openjpa/branches/1.0.x/openjpa- > > kernel/src/main/resources/org/apache/openjpa/meta/ > > localizer.properties?rev=587683&r1=587682&r2=587683&view=diff > > ====================================================================== > > ======== > > --- openjpa/branches/1.0.x/openjpa-kernel/src/main/resources/org/ > > apache/openjpa/meta/localizer.properties (original) > > +++ openjpa/branches/1.0.x/openjpa-kernel/src/main/resources/org/ > > apache/openjpa/meta/localizer.properties Tue Oct 23 15:48:48 2007 > > @@ -37,7 +37,7 @@ > > found-pcs: Found {0} classes with metadata in {1} milliseconds. > > not-managed-interface: Cannot set type "{1}" as interface "{0}" > > implementor. \ > > "{0}" is not a managed interface. > > -declare-non-interface: Cannot declare on type "{0}" interface > > "{1}" as it is \ > > +declare-non-interface: Cannot declare type "{0}" on "{1}" as it is \ > > not an interface. > > unmanaged-sup-field: Superclass field "{0}" is mapped in the > > metadata for \ > > subclass "{1}", but is not a persistent field. > > @@ -210,7 +210,7 @@ > > been dropped: {0} > > bad-store: Your configured MetaDataIO cannot create metadata. You \ > > must create it by hand. > > -tool-running: Metadata tool running on type "{0}" with action "{1}". > > +tool-running: MetaData Tool running on type "{0}" with action "{1}". > > tool-record: Recording metadata changes. > > tool-usage: Usage: java org.apache.openjpa.meta.MetaDataTool\n\ > > \t[-properties/-p <properties file or resource>]\n\ > > > > > > Craig Russell > Architect, Sun Java Enterprise System http://java.sun.com/products/jdo > 408 276-5638 mailto:[EMAIL PROTECTED] > P.S. A good JDO? O, Gasp! > > >
