================================================================================ Merge Diffs: /ade/gpelleti_main/tldev/source/essentials/oracle/toplink/essentials/internal/ejb/cmp3/metadata/MetadataProcessor.java vs. /net/ottnfs1.ca.oracle.com/vol/vol1/ade_ottawa_txn/gpelleti/gpelleti_ri_gf647_060509/ade_storage/000001/AB0952363AC40CBFE034080020E8C54E.42 Report generated at Tue May 9 14:33:48 2006 -------------------------------------------------------------------------------- *** /ade/gpelleti_main/tldev/source/essentials/oracle/toplink/essentials/internal/ejb/cmp3/metadata/MetadataProcessor.java Tue May 9 14:33:48 2006 --- /net/ottnfs1.ca.oracle.com/vol/vol1/ade_ottawa_txn/gpelleti/gpelleti_ri_gf647_060509/ade_storage/000001/AB0952363AC40CBFE034080020E8C54E.42 Tue May 9 13:11:32 2006 *************** *** 50,58 **** import oracle.toplink.essentials.mappings.AggregateObjectMapping; import oracle.toplink.essentials.mappings.ForeignReferenceMapping; - import oracle.toplink.essentials.descriptors.VersionLockingPolicy; - import oracle.toplink.essentials.descriptors.TimestampLockingPolicy; - import oracle.toplink.essentials.mappings.converters.EnumTypeConverter; import oracle.toplink.essentials.mappings.converters.TypeConversionConverter; import oracle.toplink.essentials.mappings.converters.SerializedObjectConverter; --- 50,55 ---- *************** *** 530,536 **** // Project XML merging. XML wins, ignore annotations/orm xml getLogger().logWarningMessage(MetadataLogger.IGNORE_VERSION_LOCKING, accessor); } else { ! processVersion(field, accessor); } } else { // Process an @Id or id element if there is one. --- 527,534 ---- // Project XML merging. XML wins, ignore annotations/orm xml getLogger().logWarningMessage(MetadataLogger.IGNORE_VERSION_LOCKING, accessor); } else { ! field.setType(accessor.getRawClass()); ! accessor.getMetadataDescriptor().setOptimisticLockingPolicy(field); } } else { // Process an @Id or id element if there is one. *************** *** 548,554 **** } } } ! /** * INTERNAL: */ --- 546,552 ---- } } } ! /** * INTERNAL: */ *************** *** 1729,1751 **** * INTERNAL: */ protected abstract void processUniqueConstraints(Object[] uniqueConstraints, DatabaseTable dbTable); ! ! /** ! * INTERNAL: ! */ ! protected void processVersion(DatabaseField field, MetadataAccessor accessor) { ! Class lockType = accessor.getRawClass(); ! field.setType(lockType); ! ! if (MetadataHelper.isValidVersionLockingType(lockType)) { ! accessor.getMetadataDescriptor().setOptimisticLockingPolicy(new VersionLockingPolicy(field)); ! } else if (MetadataHelper.isValidTimstampVersionLockingType(lockType)) { ! accessor.getMetadataDescriptor().setOptimisticLockingPolicy(new TimestampLockingPolicy(field)); ! } else { ! getValidator().throwInvalidTypeForVersionAttribute(accessor.getJavaClass(), accessor.getAttributeName(), lockType); ! } ! } ! /** * INTERNAL: * Set the getter and setter access methods on a mapping. --- 1727,1733 ---- * INTERNAL: */ protected abstract void processUniqueConstraints(Object[] uniqueConstraints, DatabaseTable dbTable); ! /** * INTERNAL: * Set the getter and setter access methods on a mapping. ================================================================================ Merge Diffs: /ade/gpelleti_main/tldev/source/essentials/oracle/toplink/essentials/internal/ejb/cmp3/metadata/MetadataDescriptor.java vs. /net/ottnfs1.ca.oracle.com/vol/vol1/ade_ottawa_txn/gpelleti/gpelleti_ri_gf647_060509/ade_storage/000002/AB0952363AC40CBFE034080020E8C54E.36 Report generated at Tue May 9 14:33:48 2006 -------------------------------------------------------------------------------- *** /ade/gpelleti_main/tldev/source/essentials/oracle/toplink/essentials/internal/ejb/cmp3/metadata/MetadataDescriptor.java Tue May 9 14:33:48 2006 --- /net/ottnfs1.ca.oracle.com/vol/vol1/ade_ottawa_txn/gpelleti/gpelleti_ri_gf647_060509/ade_storage/000002/AB0952363AC40CBFE034080020E8C54E.36 Tue May 9 13:11:32 2006 *************** *** 37,44 **** import oracle.toplink.essentials.exceptions.ValidationException; import oracle.toplink.essentials.descriptors.ClassDescriptor; - import oracle.toplink.essentials.descriptors.RelationalDescriptor; import oracle.toplink.essentials.descriptors.VersionLockingPolicy; import oracle.toplink.essentials.internal.helper.DatabaseField; import oracle.toplink.essentials.internal.helper.DatabaseTable; --- 37,44 ---- import oracle.toplink.essentials.exceptions.ValidationException; import oracle.toplink.essentials.descriptors.ClassDescriptor; import oracle.toplink.essentials.descriptors.VersionLockingPolicy; + import oracle.toplink.essentials.descriptors.RelationalDescriptor; import oracle.toplink.essentials.internal.helper.DatabaseField; import oracle.toplink.essentials.internal.helper.DatabaseTable; *************** *** 1138,1146 **** /** * INTERNAL: */ ! public void setOptimisticLockingPolicy(VersionLockingPolicy policy) { ! policy.storeInObject(); ! m_descriptor.setOptimisticLockingPolicy(policy); } /** --- 1138,1148 ---- /** * INTERNAL: */ ! public void setOptimisticLockingPolicy(DatabaseField field) { ! VersionLockingPolicy vlp = new VersionLockingPolicy(); ! vlp.setWriteLockField(field); ! vlp.storeInObject(); ! m_descriptor.setOptimisticLockingPolicy(vlp); } /** ================================================================================ Merge Diffs: /ade/gpelleti_main/tldev/source/essentials/oracle/toplink/essentials/internal/ejb/cmp3/metadata/MetadataHelper.java vs. /net/ottnfs1.ca.oracle.com/vol/vol1/ade_ottawa_txn/gpelleti/gpelleti_ri_gf647_060509/ade_storage/000003/AB0952363AC40CBFE034080020E8C54E.44 Report generated at Tue May 9 14:33:48 2006 -------------------------------------------------------------------------------- *** /ade/gpelleti_main/tldev/source/essentials/oracle/toplink/essentials/internal/ejb/cmp3/metadata/MetadataHelper.java Tue May 9 14:33:48 2006 --- /net/ottnfs1.ca.oracle.com/vol/vol1/ade_ottawa_txn/gpelleti/gpelleti_ri_gf647_060509/ade_storage/000003/AB0952363AC40CBFE034080020E8C54E.44 Tue May 9 13:15:28 2006 *************** *** 656,688 **** * Returns true if the given class is a valid temporal type and must be * marked temporal. */ ! public static boolean isValidTemporalType(Class cls) { return (cls.equals(java.util.Date.class) || cls.equals(java.util.Calendar.class) || cls.equals(java.util.GregorianCalendar.class)); } - /** - * INTERNAL: - * Returns true if the given class is a valid timestamp locking type. - */ - public static boolean isValidTimstampVersionLockingType(Class cls) { - return (cls.equals(java.sql.Timestamp.class)); - } - - /** - * INTERNAL: - * Returns true if the given class is a valid version locking type. - */ - public static boolean isValidVersionLockingType(Class cls) { - return (cls.equals(int.class) || - cls.equals(Integer.class) || - cls.equals(short.class) || - cls.equals(Short.class) || - cls.equals(long.class) || - cls.equals(Long.class)); - } - /** * INTERNAL: * Set the correct indirection policy on the collection mapping. Method --- 656,667 ---- * Returns true if the given class is a valid temporal type and must be * marked temporal. */ ! public static boolean isValidTemporalType(Class cls) { return (cls.equals(java.util.Date.class) || cls.equals(java.util.Calendar.class) || cls.equals(java.util.GregorianCalendar.class)); } /** * INTERNAL: * Set the correct indirection policy on the collection mapping. Method ================================================================================ Merge Diffs: /ade/gpelleti_main/tldev/source/essentials/oracle/toplink/essentials/internal/ejb/cmp3/metadata/MetadataValidator.java vs. /net/ottnfs1.ca.oracle.com/vol/vol1/ade_ottawa_txn/gpelleti/gpelleti_ri_gf647_060509/ade_storage/000004/AB0952363AC40CBFE034080020E8C54E.2 Report generated at Tue May 9 14:33:48 2006 -------------------------------------------------------------------------------- *** /ade/gpelleti_main/tldev/source/essentials/oracle/toplink/essentials/internal/ejb/cmp3/metadata/MetadataValidator.java Tue May 9 14:33:48 2006 --- /net/ottnfs1.ca.oracle.com/vol/vol1/ade_ottawa_txn/gpelleti/gpelleti_ri_gf647_060509/ade_storage/000004/AB0952363AC40CBFE034080020E8C54E.2 Tue May 9 13:36:08 2006 *************** *** 33,154 **** */ public abstract class MetadataValidator { /** ! * INTERNAL: */ public void throwCouldNotFindMapKey(String fieldOrPropertyName, Class referenceClass, DatabaseMapping mapping) { throw ValidationException.couldNotFindMapKey(fieldOrPropertyName, referenceClass, mapping); } /** ! * INTERNAL: */ abstract public void throwEmbeddedIdAndIdFound(Class entityClass, String attributeName, String idAttributeName); /** ! * INTERNAL: */ abstract public void throwExcessiveJoinColumnsSpecified(Class entityClass, Object element); /** ! * INTERNAL: */ abstract public void throwExcessivePrimaryKeyJoinColumnsSpecified(Object Element); /** ! * INTERNAL: */ abstract public void throwIncompleteJoinColumnsSpecified(Class entityClass, Object element); /** ! * INTERNAL: */ abstract public void throwIncompletePrimaryKeyJoinColumnsSpecified(Class entityClass); /** ! * INTERNAL: */ public void throwInvalidCompositePKSpecification(Class entityClass, String idClassName) { throw ValidationException.invalidCompositePKSpecification(entityClass, idClassName); } /** ! * INTERNAL: */ public void throwInvalidEmbeddableAttribute(Class entityClass, String attributeName, Class embeddedClass, String embeddedAttributeName) { throw ValidationException.invalidEmbeddableAttribute(embeddedClass, embeddedAttributeName, entityClass, attributeName); } /** ! * INTERNAL: */ public void throwInvalidOrderByValue(Class entityClass, String propertyOrFieldName, Class referenceClass, String attributeName) { throw ValidationException.invalidOrderByValue(propertyOrFieldName, referenceClass, attributeName, entityClass); } /** ! * INTERNAL: */ public void throwInvalidTypeForEnumeratedAttribute(Class entityClass, String attributeName, Class referenceClass) { throw ValidationException.invalidTypeForEnumeratedAttribute(attributeName, referenceClass, entityClass); } /** ! * INTERNAL: */ public void throwInvalidTypeForLOBAttribute(Class entityClass, String attributeName, Class referenceClass) { throw ValidationException.invalidTypeForLOBAttribute(attributeName, referenceClass, entityClass); } /** ! * INTERNAL: */ public void throwInvalidTypeForSerializedAttribute(Class entityClass, String attributeName, Class referenceClass) { ValidationException.invalidTypeForSerializedAttribute(attributeName, referenceClass, entityClass); } /** ! * INTERNAL: */ public void throwInvalidTypeForTemporalAttribute(Class entityClass, String attributeName, Class referenceClass) { throw ValidationException.invalidTypeForTemporalAttribute(attributeName, referenceClass, entityClass); ! } ! ! /** ! * INTERNAL: ! */ ! public void throwInvalidTypeForVersionAttribute(Class entityClass, String attributeName, Class lockingType) { ! throw ValidationException.invalidTypeForVersionAttribute(attributeName, lockingType, entityClass); ! } /** ! * INTERNAL: */ public void throwNonUniqueEntityName(String clsName1, String clsName2, String name) { throw ValidationException.nonUniqueEntityName(clsName1, clsName2, name); } /** ! * INTERNAL: */ abstract public void throwMultipleEmbeddedIdsFound(Class entityClass, String attributeName, String embeddedIdAttributeName); /** ! * INTERNAL: */ abstract public void throwNoMappedByAttributeFound(Class owningClass, String owningAttributeName, Class entityClass, String attributeName); /** ! * INTERNAL: */ abstract public void throwNoTemporalTypeSpecified(Class entityClass, String attributeName); /** ! * INTERNAL: */ abstract public void throwRelationshipHasColumnSpecified(Class entityClass, String attributeName); /** ! * INTERNAL: */ abstract public void throwUniDirectionalOneToManyHasJoinColumnSpecified(Class entityClass, String attributeName); } --- 33,147 ---- */ public abstract class MetadataValidator { /** ! * INTERNAL */ public void throwCouldNotFindMapKey(String fieldOrPropertyName, Class referenceClass, DatabaseMapping mapping) { throw ValidationException.couldNotFindMapKey(fieldOrPropertyName, referenceClass, mapping); } /** ! * INTERNAL */ abstract public void throwEmbeddedIdAndIdFound(Class entityClass, String attributeName, String idAttributeName); /** ! * INTERNAL */ abstract public void throwExcessiveJoinColumnsSpecified(Class entityClass, Object element); /** ! * INTERNAL */ abstract public void throwExcessivePrimaryKeyJoinColumnsSpecified(Object Element); /** ! * INTERNAL */ abstract public void throwIncompleteJoinColumnsSpecified(Class entityClass, Object element); /** ! * INTERNAL */ abstract public void throwIncompletePrimaryKeyJoinColumnsSpecified(Class entityClass); /** ! * INTERNAL */ public void throwInvalidCompositePKSpecification(Class entityClass, String idClassName) { throw ValidationException.invalidCompositePKSpecification(entityClass, idClassName); } /** ! * INTERNAL */ public void throwInvalidEmbeddableAttribute(Class entityClass, String attributeName, Class embeddedClass, String embeddedAttributeName) { throw ValidationException.invalidEmbeddableAttribute(embeddedClass, embeddedAttributeName, entityClass, attributeName); } /** ! * INTERNAL */ public void throwInvalidOrderByValue(Class entityClass, String propertyOrFieldName, Class referenceClass, String attributeName) { throw ValidationException.invalidOrderByValue(propertyOrFieldName, referenceClass, attributeName, entityClass); } /** ! * INTERNAL */ public void throwInvalidTypeForEnumeratedAttribute(Class entityClass, String attributeName, Class referenceClass) { throw ValidationException.invalidTypeForEnumeratedAttribute(attributeName, referenceClass, entityClass); } /** ! * INTERNAL */ public void throwInvalidTypeForLOBAttribute(Class entityClass, String attributeName, Class referenceClass) { throw ValidationException.invalidTypeForLOBAttribute(attributeName, referenceClass, entityClass); } /** ! * INTERNAL */ public void throwInvalidTypeForSerializedAttribute(Class entityClass, String attributeName, Class referenceClass) { ValidationException.invalidTypeForSerializedAttribute(attributeName, referenceClass, entityClass); } /** ! * INTERNAL */ public void throwInvalidTypeForTemporalAttribute(Class entityClass, String attributeName, Class referenceClass) { throw ValidationException.invalidTypeForTemporalAttribute(attributeName, referenceClass, entityClass); ! } /** ! * INTERNAL */ public void throwNonUniqueEntityName(String clsName1, String clsName2, String name) { throw ValidationException.nonUniqueEntityName(clsName1, clsName2, name); } /** ! * INTERNAL */ abstract public void throwMultipleEmbeddedIdsFound(Class entityClass, String attributeName, String embeddedIdAttributeName); /** ! * INTERNAL */ abstract public void throwNoMappedByAttributeFound(Class owningClass, String owningAttributeName, Class entityClass, String attributeName); /** ! * INTERNAL */ abstract public void throwNoTemporalTypeSpecified(Class entityClass, String attributeName); /** ! * INTERNAL */ abstract public void throwRelationshipHasColumnSpecified(Class entityClass, String attributeName); /** ! * INTERNAL */ abstract public void throwUniDirectionalOneToManyHasJoinColumnSpecified(Class entityClass, String attributeName); } ================================================================================ Merge Diffs: /ade/gpelleti_main/tldev/source/essentials/oracle/toplink/essentials/exceptions/ValidationException.java vs. /net/ottnfs1.ca.oracle.com/vol/vol1/ade_ottawa_txn/gpelleti/gpelleti_ri_gf647_060509/ade_storage/000005/AB0952363AC40CBFE034080020E8C54E.51 Report generated at Tue May 9 14:33:48 2006 -------------------------------------------------------------------------------- *** /ade/gpelleti_main/tldev/source/essentials/oracle/toplink/essentials/exceptions/ValidationException.java Tue May 9 14:33:48 2006 --- /net/ottnfs1.ca.oracle.com/vol/vol1/ade_ottawa_txn/gpelleti/gpelleti_ri_gf647_060509/ade_storage/000005/AB0952363AC40CBFE034080020E8C54E.51 Tue May 9 13:39:29 2006 *************** *** 207,213 **** public static final int INVALID_TYPE_FOR_TEMPORAL_ATTRIBUTE = 7165; public static final int ANNOTATIONS_CONFLICT = 7166; public static final int RESERVED_NAME = 7167; ! public static final int INVALID_TYPE_FOR_VERSION_ATTRIBUTE = 7168; public static final int ONLY_ONE_GENERATED_VALURE_IS_ALLOWED = 7169; public static final int ERROR_INSTANTIATING_ENTITY_LISTENER = 7172; --- 207,213 ---- public static final int INVALID_TYPE_FOR_TEMPORAL_ATTRIBUTE = 7165; public static final int ANNOTATIONS_CONFLICT = 7166; public static final int RESERVED_NAME = 7167; ! // 7168 is free ... public static final int ONLY_ONE_GENERATED_VALURE_IS_ALLOWED = 7169; public static final int ERROR_INSTANTIATING_ENTITY_LISTENER = 7172; *************** *** 934,946 **** validationException.setErrorCode(INVALID_TYPE_FOR_TEMPORAL_ATTRIBUTE); return validationException; } - - public static ValidationException invalidTypeForVersionAttribute(String attributeName, Class lockingType, Class entityClass) { - Object[] args = { attributeName, lockingType, entityClass }; - ValidationException validationException = new ValidationException(ExceptionMessageGenerator.buildMessage(ValidationException.class, INVALID_TYPE_FOR_VERSION_ATTRIBUTE, args)); - validationException.setErrorCode(INVALID_TYPE_FOR_VERSION_ATTRIBUTE); - return validationException; - } public static ValidationException invalidCollectionTypeForRelationship(Class rawClass, Object annotatedElement) { Object[] args = { rawClass, annotatedElement }; --- 934,939 ---- ================================================================================ Merge Diffs: /ade/gpelleti_main/tldev/source/essentials/oracle/toplink/essentials/exceptions/i18n/ValidationExceptionResource.java vs. /net/ottnfs1.ca.oracle.com/vol/vol1/ade_ottawa_txn/gpelleti/gpelleti_ri_gf647_060509/ade_storage/000006/AB0952363AC40CBFE034080020E8C54E.51 Report generated at Tue May 9 14:33:48 2006 -------------------------------------------------------------------------------- *** /ade/gpelleti_main/tldev/source/essentials/oracle/toplink/essentials/exceptions/i18n/ValidationExceptionResource.java Tue May 9 14:33:48 2006 --- /net/ottnfs1.ca.oracle.com/vol/vol1/ade_ottawa_txn/gpelleti/gpelleti_ri_gf647_060509/ade_storage/000006/AB0952363AC40CBFE034080020E8C54E.51 Tue May 9 13:39:39 2006 *************** *** 172,178 **** { "7165", "The type [{1}] for the attribute [{0}] on the entity class [{2}] is not a valid type for a temporal mapping. The attribute must be defined as java.util.Date or java.util.Calendar."}, { "7166", "Conflict between annotations [{0}] and [{1}]."}, { "7167", "[{0}] cannot use the name [{1}] - it's reserved for a [{2}]."}, - { "7168", "The attribute [{0}] of type [{1}] on the entity class [{2}] is not valid for a version property. The following types are supported: int, Integer, short, Short, long, Long, Timestamp."}, { "7169", "Class [{0}] has two @GeneratedValues: for fields [{1}] and [{2}]. Only one is allowed."} , { "7172", "Could not instantiate the @EntityListener [{0}]."}, { "7173", "A property change event has been fired on a property with name [{1}] in [{0}]. However this property does not exist."}, --- 172,177 ---- ================================================================================ Merge Diffs: /ade/gpelleti_main/tltest/source/entity-persistence-tests/src/java/oracle/toplink/essentials/testing/models/cmp3/inherited/Beer.java vs. /net/ottnfs1.ca.oracle.com/vol/vol1/ade_ottawa_txn/gpelleti/gpelleti_ri_gf647_060509/ade_storage/000007/AB0952363AC40CBFE034080020E8C54E.8 Report generated at Tue May 9 14:33:48 2006 -------------------------------------------------------------------------------- *** /ade/gpelleti_main/tltest/source/entity-persistence-tests/src/java/oracle/toplink/essentials/testing/models/cmp3/inherited/Beer.java Tue May 9 14:33:48 2006 --- /net/ottnfs1.ca.oracle.com/vol/vol1/ade_ottawa_txn/gpelleti/gpelleti_ri_gf647_060509/ade_storage/000007/AB0952363AC40CBFE034080020E8C54E.8 Tue May 9 15:20:36 2006 *************** *** 19,39 **** * [name of copyright owner] */ // Copyright (c) 1998, 2006, Oracle. All rights reserved. package oracle.toplink.essentials.testing.models.cmp3.inherited; import javax.persistence.Basic; import javax.persistence.Column; - import javax.persistence.Version; import javax.persistence.ManyToOne; import javax.persistence.JoinColumn; import javax.persistence.MappedSuperclass; import static javax.persistence.FetchType.LAZY; - import java.sql.Timestamp; - @MappedSuperclass public class Beer extends Beverage { - private Timestamp version; private double alcoholContent; private BeerConsumer beerConsumer; --- 19,37 ---- * [name of copyright owner] */ // Copyright (c) 1998, 2006, Oracle. All rights reserved. + + package oracle.toplink.essentials.testing.models.cmp3.inherited; import javax.persistence.Basic; import javax.persistence.Column; import javax.persistence.ManyToOne; import javax.persistence.JoinColumn; import javax.persistence.MappedSuperclass; import static javax.persistence.FetchType.LAZY; @MappedSuperclass public class Beer extends Beverage { private double alcoholContent; private BeerConsumer beerConsumer; *************** *** 51,61 **** return beerConsumer; } - @Version - public Timestamp getVersion() { - return version; - } - public void setAlcoholContent(double alcoholContent) { this.alcoholContent = alcoholContent; } --- 49,54 ---- *************** *** 63,70 **** public void setBeerConsumer(BeerConsumer beerConsumer) { this.beerConsumer = beerConsumer; } - - public void setVersion(Timestamp version) { - this.version = version; - } } --- 56,59 ---- ================================================================================ Merge Diffs: /ade/gpelleti_main/tltest/source/entity-persistence-tests/src/java/oracle/toplink/essentials/testing/models/cmp3/inherited/InheritedTableManager.java vs. /net/ottnfs1.ca.oracle.com/vol/vol1/ade_ottawa_txn/gpelleti/gpelleti_ri_gf647_060509/ade_storage/000008/AB0952363AC40CBFE034080020E8C54E.10 Report generated at Tue May 9 14:33:48 2006 -------------------------------------------------------------------------------- *** /ade/gpelleti_main/tltest/source/entity-persistence-tests/src/java/oracle/toplink/essentials/testing/models/cmp3/inherited/InheritedTableManager.java Tue May 9 14:33:48 2006 --- /net/ottnfs1.ca.oracle.com/vol/vol1/ade_ottawa_txn/gpelleti/gpelleti_ri_gf647_060509/ade_storage/000008/AB0952363AC40CBFE034080020E8C54E.10 Tue May 9 15:20:43 2006 *************** *** 98,113 **** BEER_CONSUMER_ID_field.setShouldAllowNull(true); BEER_CONSUMER_ID_field.setForeignKeyFieldName("CMP3_CONSUMER.ID"); table.addField(BEER_CONSUMER_ID_field); - - FieldDefinition VERSION_field = new FieldDefinition(); - VERSION_field.setName("VERSION"); - VERSION_field.setTypeName("DATETIME"); - VERSION_field.setSize(23); - VERSION_field.setIsPrimaryKey(false); - VERSION_field.setUnique(false); - VERSION_field.setIsIdentity(false); - VERSION_field.setShouldAllowNull(true); - table.addField(VERSION_field); return table; } --- 98,103 ---- *************** *** 202,217 **** BEER_CONSUMER_ID_field.setShouldAllowNull(true); BEER_CONSUMER_ID_field.setForeignKeyFieldName("CMP3_CONSUMER.ID"); table.addField(BEER_CONSUMER_ID_field); - - FieldDefinition VERSION_field = new FieldDefinition(); - VERSION_field.setName("VERSION"); - VERSION_field.setTypeName("DATETIME"); - VERSION_field.setSize(23); - VERSION_field.setIsPrimaryKey(false); - VERSION_field.setUnique(false); - VERSION_field.setIsIdentity(false); - VERSION_field.setShouldAllowNull(true); - table.addField(VERSION_field); return table; } --- 192,197 ---- *************** *** 271,286 **** BEER_CONSUMER_ID_field.setForeignKeyFieldName("CMP3_CONSUMER.ID"); table.addField(BEER_CONSUMER_ID_field); - FieldDefinition VERSION_field = new FieldDefinition(); - VERSION_field.setName("VERSION"); - VERSION_field.setTypeName("DATETIME"); - VERSION_field.setSize(23); - VERSION_field.setIsPrimaryKey(false); - VERSION_field.setUnique(false); - VERSION_field.setIsIdentity(false); - VERSION_field.setShouldAllowNull(true); - table.addField(VERSION_field); - return table; } --- 251,256 ---- ================================================================================ Merge Diffs: /ade/gpelleti_main/tldev/source/essentials/oracle/toplink/essentials/internal/ejb/cmp3/metadata/MetadataProcessor.java vs. /net/ottnfs1.ca.oracle.com/vol/vol1/ade_ottawa_txn/gpelleti/gpelleti_ri_gf647_060509/ade_storage/000001/AB0952363AC40CBFE034080020E8C54E.42 Report generated at Tue May 9 14:42:23 2006 -------------------------------------------------------------------------------- *** /ade/gpelleti_main/tldev/source/essentials/oracle/toplink/essentials/internal/ejb/cmp3/metadata/MetadataProcessor.java Tue May 9 14:33:48 2006 --- /net/ottnfs1.ca.oracle.com/vol/vol1/ade_ottawa_txn/gpelleti/gpelleti_ri_gf647_060509/ade_storage/000001/AB0952363AC40CBFE034080020E8C54E.42 Tue May 9 13:11:32 2006 *************** *** 50,58 **** import oracle.toplink.essentials.mappings.AggregateObjectMapping; import oracle.toplink.essentials.mappings.ForeignReferenceMapping; - import oracle.toplink.essentials.descriptors.VersionLockingPolicy; - import oracle.toplink.essentials.descriptors.TimestampLockingPolicy; - import oracle.toplink.essentials.mappings.converters.EnumTypeConverter; import oracle.toplink.essentials.mappings.converters.TypeConversionConverter; import oracle.toplink.essentials.mappings.converters.SerializedObjectConverter; --- 50,55 ---- *************** *** 530,536 **** // Project XML merging. XML wins, ignore annotations/orm xml getLogger().logWarningMessage(MetadataLogger.IGNORE_VERSION_LOCKING, accessor); } else { ! processVersion(field, accessor); } } else { // Process an @Id or id element if there is one. --- 527,534 ---- // Project XML merging. XML wins, ignore annotations/orm xml getLogger().logWarningMessage(MetadataLogger.IGNORE_VERSION_LOCKING, accessor); } else { ! field.setType(accessor.getRawClass()); ! accessor.getMetadataDescriptor().setOptimisticLockingPolicy(field); } } else { // Process an @Id or id element if there is one. *************** *** 548,554 **** } } } ! /** * INTERNAL: */ --- 546,552 ---- } } } ! /** * INTERNAL: */ *************** *** 1729,1751 **** * INTERNAL: */ protected abstract void processUniqueConstraints(Object[] uniqueConstraints, DatabaseTable dbTable); ! ! /** ! * INTERNAL: ! */ ! protected void processVersion(DatabaseField field, MetadataAccessor accessor) { ! Class lockType = accessor.getRawClass(); ! field.setType(lockType); ! ! if (MetadataHelper.isValidVersionLockingType(lockType)) { ! accessor.getMetadataDescriptor().setOptimisticLockingPolicy(new VersionLockingPolicy(field)); ! } else if (MetadataHelper.isValidTimstampVersionLockingType(lockType)) { ! accessor.getMetadataDescriptor().setOptimisticLockingPolicy(new TimestampLockingPolicy(field)); ! } else { ! getValidator().throwInvalidTypeForVersionAttribute(accessor.getJavaClass(), accessor.getAttributeName(), lockType); ! } ! } ! /** * INTERNAL: * Set the getter and setter access methods on a mapping. --- 1727,1733 ---- * INTERNAL: */ protected abstract void processUniqueConstraints(Object[] uniqueConstraints, DatabaseTable dbTable); ! /** * INTERNAL: * Set the getter and setter access methods on a mapping. ================================================================================ Merge Diffs: /ade/gpelleti_main/tldev/source/essentials/oracle/toplink/essentials/internal/ejb/cmp3/metadata/MetadataDescriptor.java vs. /net/ottnfs1.ca.oracle.com/vol/vol1/ade_ottawa_txn/gpelleti/gpelleti_ri_gf647_060509/ade_storage/000002/AB0952363AC40CBFE034080020E8C54E.36 Report generated at Tue May 9 14:42:24 2006 -------------------------------------------------------------------------------- *** /ade/gpelleti_main/tldev/source/essentials/oracle/toplink/essentials/internal/ejb/cmp3/metadata/MetadataDescriptor.java Tue May 9 14:33:48 2006 --- /net/ottnfs1.ca.oracle.com/vol/vol1/ade_ottawa_txn/gpelleti/gpelleti_ri_gf647_060509/ade_storage/000002/AB0952363AC40CBFE034080020E8C54E.36 Tue May 9 13:11:32 2006 *************** *** 37,44 **** import oracle.toplink.essentials.exceptions.ValidationException; import oracle.toplink.essentials.descriptors.ClassDescriptor; - import oracle.toplink.essentials.descriptors.RelationalDescriptor; import oracle.toplink.essentials.descriptors.VersionLockingPolicy; import oracle.toplink.essentials.internal.helper.DatabaseField; import oracle.toplink.essentials.internal.helper.DatabaseTable; --- 37,44 ---- import oracle.toplink.essentials.exceptions.ValidationException; import oracle.toplink.essentials.descriptors.ClassDescriptor; import oracle.toplink.essentials.descriptors.VersionLockingPolicy; + import oracle.toplink.essentials.descriptors.RelationalDescriptor; import oracle.toplink.essentials.internal.helper.DatabaseField; import oracle.toplink.essentials.internal.helper.DatabaseTable; *************** *** 1138,1146 **** /** * INTERNAL: */ ! public void setOptimisticLockingPolicy(VersionLockingPolicy policy) { ! policy.storeInObject(); ! m_descriptor.setOptimisticLockingPolicy(policy); } /** --- 1138,1148 ---- /** * INTERNAL: */ ! public void setOptimisticLockingPolicy(DatabaseField field) { ! VersionLockingPolicy vlp = new VersionLockingPolicy(); ! vlp.setWriteLockField(field); ! vlp.storeInObject(); ! m_descriptor.setOptimisticLockingPolicy(vlp); } /** ================================================================================ Merge Diffs: /ade/gpelleti_main/tldev/source/essentials/oracle/toplink/essentials/internal/ejb/cmp3/metadata/MetadataHelper.java vs. /net/ottnfs1.ca.oracle.com/vol/vol1/ade_ottawa_txn/gpelleti/gpelleti_ri_gf647_060509/ade_storage/000003/AB0952363AC40CBFE034080020E8C54E.44 Report generated at Tue May 9 14:42:24 2006 -------------------------------------------------------------------------------- *** /ade/gpelleti_main/tldev/source/essentials/oracle/toplink/essentials/internal/ejb/cmp3/metadata/MetadataHelper.java Tue May 9 14:33:48 2006 --- /net/ottnfs1.ca.oracle.com/vol/vol1/ade_ottawa_txn/gpelleti/gpelleti_ri_gf647_060509/ade_storage/000003/AB0952363AC40CBFE034080020E8C54E.44 Tue May 9 13:15:28 2006 *************** *** 656,688 **** * Returns true if the given class is a valid temporal type and must be * marked temporal. */ ! public static boolean isValidTemporalType(Class cls) { return (cls.equals(java.util.Date.class) || cls.equals(java.util.Calendar.class) || cls.equals(java.util.GregorianCalendar.class)); } - /** - * INTERNAL: - * Returns true if the given class is a valid timestamp locking type. - */ - public static boolean isValidTimstampVersionLockingType(Class cls) { - return (cls.equals(java.sql.Timestamp.class)); - } - - /** - * INTERNAL: - * Returns true if the given class is a valid version locking type. - */ - public static boolean isValidVersionLockingType(Class cls) { - return (cls.equals(int.class) || - cls.equals(Integer.class) || - cls.equals(short.class) || - cls.equals(Short.class) || - cls.equals(long.class) || - cls.equals(Long.class)); - } - /** * INTERNAL: * Set the correct indirection policy on the collection mapping. Method --- 656,667 ---- * Returns true if the given class is a valid temporal type and must be * marked temporal. */ ! public static boolean isValidTemporalType(Class cls) { return (cls.equals(java.util.Date.class) || cls.equals(java.util.Calendar.class) || cls.equals(java.util.GregorianCalendar.class)); } /** * INTERNAL: * Set the correct indirection policy on the collection mapping. Method ================================================================================ Merge Diffs: /ade/gpelleti_main/tldev/source/essentials/oracle/toplink/essentials/internal/ejb/cmp3/metadata/MetadataValidator.java vs. /net/ottnfs1.ca.oracle.com/vol/vol1/ade_ottawa_txn/gpelleti/gpelleti_ri_gf647_060509/ade_storage/000004/AB0952363AC40CBFE034080020E8C54E.2 Report generated at Tue May 9 14:42:24 2006 -------------------------------------------------------------------------------- *** /ade/gpelleti_main/tldev/source/essentials/oracle/toplink/essentials/internal/ejb/cmp3/metadata/MetadataValidator.java Tue May 9 14:33:48 2006 --- /net/ottnfs1.ca.oracle.com/vol/vol1/ade_ottawa_txn/gpelleti/gpelleti_ri_gf647_060509/ade_storage/000004/AB0952363AC40CBFE034080020E8C54E.2 Tue May 9 13:36:08 2006 *************** *** 33,154 **** */ public abstract class MetadataValidator { /** ! * INTERNAL: */ public void throwCouldNotFindMapKey(String fieldOrPropertyName, Class referenceClass, DatabaseMapping mapping) { throw ValidationException.couldNotFindMapKey(fieldOrPropertyName, referenceClass, mapping); } /** ! * INTERNAL: */ abstract public void throwEmbeddedIdAndIdFound(Class entityClass, String attributeName, String idAttributeName); /** ! * INTERNAL: */ abstract public void throwExcessiveJoinColumnsSpecified(Class entityClass, Object element); /** ! * INTERNAL: */ abstract public void throwExcessivePrimaryKeyJoinColumnsSpecified(Object Element); /** ! * INTERNAL: */ abstract public void throwIncompleteJoinColumnsSpecified(Class entityClass, Object element); /** ! * INTERNAL: */ abstract public void throwIncompletePrimaryKeyJoinColumnsSpecified(Class entityClass); /** ! * INTERNAL: */ public void throwInvalidCompositePKSpecification(Class entityClass, String idClassName) { throw ValidationException.invalidCompositePKSpecification(entityClass, idClassName); } /** ! * INTERNAL: */ public void throwInvalidEmbeddableAttribute(Class entityClass, String attributeName, Class embeddedClass, String embeddedAttributeName) { throw ValidationException.invalidEmbeddableAttribute(embeddedClass, embeddedAttributeName, entityClass, attributeName); } /** ! * INTERNAL: */ public void throwInvalidOrderByValue(Class entityClass, String propertyOrFieldName, Class referenceClass, String attributeName) { throw ValidationException.invalidOrderByValue(propertyOrFieldName, referenceClass, attributeName, entityClass); } /** ! * INTERNAL: */ public void throwInvalidTypeForEnumeratedAttribute(Class entityClass, String attributeName, Class referenceClass) { throw ValidationException.invalidTypeForEnumeratedAttribute(attributeName, referenceClass, entityClass); } /** ! * INTERNAL: */ public void throwInvalidTypeForLOBAttribute(Class entityClass, String attributeName, Class referenceClass) { throw ValidationException.invalidTypeForLOBAttribute(attributeName, referenceClass, entityClass); } /** ! * INTERNAL: */ public void throwInvalidTypeForSerializedAttribute(Class entityClass, String attributeName, Class referenceClass) { ValidationException.invalidTypeForSerializedAttribute(attributeName, referenceClass, entityClass); } /** ! * INTERNAL: */ public void throwInvalidTypeForTemporalAttribute(Class entityClass, String attributeName, Class referenceClass) { throw ValidationException.invalidTypeForTemporalAttribute(attributeName, referenceClass, entityClass); ! } ! ! /** ! * INTERNAL: ! */ ! public void throwInvalidTypeForVersionAttribute(Class entityClass, String attributeName, Class lockingType) { ! throw ValidationException.invalidTypeForVersionAttribute(attributeName, lockingType, entityClass); ! } /** ! * INTERNAL: */ public void throwNonUniqueEntityName(String clsName1, String clsName2, String name) { throw ValidationException.nonUniqueEntityName(clsName1, clsName2, name); } /** ! * INTERNAL: */ abstract public void throwMultipleEmbeddedIdsFound(Class entityClass, String attributeName, String embeddedIdAttributeName); /** ! * INTERNAL: */ abstract public void throwNoMappedByAttributeFound(Class owningClass, String owningAttributeName, Class entityClass, String attributeName); /** ! * INTERNAL: */ abstract public void throwNoTemporalTypeSpecified(Class entityClass, String attributeName); /** ! * INTERNAL: */ abstract public void throwRelationshipHasColumnSpecified(Class entityClass, String attributeName); /** ! * INTERNAL: */ abstract public void throwUniDirectionalOneToManyHasJoinColumnSpecified(Class entityClass, String attributeName); } --- 33,147 ---- */ public abstract class MetadataValidator { /** ! * INTERNAL */ public void throwCouldNotFindMapKey(String fieldOrPropertyName, Class referenceClass, DatabaseMapping mapping) { throw ValidationException.couldNotFindMapKey(fieldOrPropertyName, referenceClass, mapping); } /** ! * INTERNAL */ abstract public void throwEmbeddedIdAndIdFound(Class entityClass, String attributeName, String idAttributeName); /** ! * INTERNAL */ abstract public void throwExcessiveJoinColumnsSpecified(Class entityClass, Object element); /** ! * INTERNAL */ abstract public void throwExcessivePrimaryKeyJoinColumnsSpecified(Object Element); /** ! * INTERNAL */ abstract public void throwIncompleteJoinColumnsSpecified(Class entityClass, Object element); /** ! * INTERNAL */ abstract public void throwIncompletePrimaryKeyJoinColumnsSpecified(Class entityClass); /** ! * INTERNAL */ public void throwInvalidCompositePKSpecification(Class entityClass, String idClassName) { throw ValidationException.invalidCompositePKSpecification(entityClass, idClassName); } /** ! * INTERNAL */ public void throwInvalidEmbeddableAttribute(Class entityClass, String attributeName, Class embeddedClass, String embeddedAttributeName) { throw ValidationException.invalidEmbeddableAttribute(embeddedClass, embeddedAttributeName, entityClass, attributeName); } /** ! * INTERNAL */ public void throwInvalidOrderByValue(Class entityClass, String propertyOrFieldName, Class referenceClass, String attributeName) { throw ValidationException.invalidOrderByValue(propertyOrFieldName, referenceClass, attributeName, entityClass); } /** ! * INTERNAL */ public void throwInvalidTypeForEnumeratedAttribute(Class entityClass, String attributeName, Class referenceClass) { throw ValidationException.invalidTypeForEnumeratedAttribute(attributeName, referenceClass, entityClass); } /** ! * INTERNAL */ public void throwInvalidTypeForLOBAttribute(Class entityClass, String attributeName, Class referenceClass) { throw ValidationException.invalidTypeForLOBAttribute(attributeName, referenceClass, entityClass); } /** ! * INTERNAL */ public void throwInvalidTypeForSerializedAttribute(Class entityClass, String attributeName, Class referenceClass) { ValidationException.invalidTypeForSerializedAttribute(attributeName, referenceClass, entityClass); } /** ! * INTERNAL */ public void throwInvalidTypeForTemporalAttribute(Class entityClass, String attributeName, Class referenceClass) { throw ValidationException.invalidTypeForTemporalAttribute(attributeName, referenceClass, entityClass); ! } /** ! * INTERNAL */ public void throwNonUniqueEntityName(String clsName1, String clsName2, String name) { throw ValidationException.nonUniqueEntityName(clsName1, clsName2, name); } /** ! * INTERNAL */ abstract public void throwMultipleEmbeddedIdsFound(Class entityClass, String attributeName, String embeddedIdAttributeName); /** ! * INTERNAL */ abstract public void throwNoMappedByAttributeFound(Class owningClass, String owningAttributeName, Class entityClass, String attributeName); /** ! * INTERNAL */ abstract public void throwNoTemporalTypeSpecified(Class entityClass, String attributeName); /** ! * INTERNAL */ abstract public void throwRelationshipHasColumnSpecified(Class entityClass, String attributeName); /** ! * INTERNAL */ abstract public void throwUniDirectionalOneToManyHasJoinColumnSpecified(Class entityClass, String attributeName); } ================================================================================ Merge Diffs: /ade/gpelleti_main/tldev/source/essentials/oracle/toplink/essentials/exceptions/ValidationException.java vs. /net/ottnfs1.ca.oracle.com/vol/vol1/ade_ottawa_txn/gpelleti/gpelleti_ri_gf647_060509/ade_storage/000005/AB0952363AC40CBFE034080020E8C54E.51 Report generated at Tue May 9 14:42:24 2006 -------------------------------------------------------------------------------- *** /ade/gpelleti_main/tldev/source/essentials/oracle/toplink/essentials/exceptions/ValidationException.java Tue May 9 14:33:48 2006 --- /net/ottnfs1.ca.oracle.com/vol/vol1/ade_ottawa_txn/gpelleti/gpelleti_ri_gf647_060509/ade_storage/000005/AB0952363AC40CBFE034080020E8C54E.51 Tue May 9 13:39:29 2006 *************** *** 207,213 **** public static final int INVALID_TYPE_FOR_TEMPORAL_ATTRIBUTE = 7165; public static final int ANNOTATIONS_CONFLICT = 7166; public static final int RESERVED_NAME = 7167; ! public static final int INVALID_TYPE_FOR_VERSION_ATTRIBUTE = 7168; public static final int ONLY_ONE_GENERATED_VALURE_IS_ALLOWED = 7169; public static final int ERROR_INSTANTIATING_ENTITY_LISTENER = 7172; --- 207,213 ---- public static final int INVALID_TYPE_FOR_TEMPORAL_ATTRIBUTE = 7165; public static final int ANNOTATIONS_CONFLICT = 7166; public static final int RESERVED_NAME = 7167; ! // 7168 is free ... public static final int ONLY_ONE_GENERATED_VALURE_IS_ALLOWED = 7169; public static final int ERROR_INSTANTIATING_ENTITY_LISTENER = 7172; *************** *** 934,946 **** validationException.setErrorCode(INVALID_TYPE_FOR_TEMPORAL_ATTRIBUTE); return validationException; } - - public static ValidationException invalidTypeForVersionAttribute(String attributeName, Class lockingType, Class entityClass) { - Object[] args = { attributeName, lockingType, entityClass }; - ValidationException validationException = new ValidationException(ExceptionMessageGenerator.buildMessage(ValidationException.class, INVALID_TYPE_FOR_VERSION_ATTRIBUTE, args)); - validationException.setErrorCode(INVALID_TYPE_FOR_VERSION_ATTRIBUTE); - return validationException; - } public static ValidationException invalidCollectionTypeForRelationship(Class rawClass, Object annotatedElement) { Object[] args = { rawClass, annotatedElement }; --- 934,939 ---- ================================================================================ Merge Diffs: /ade/gpelleti_main/tldev/source/essentials/oracle/toplink/essentials/exceptions/i18n/ValidationExceptionResource.java vs. /net/ottnfs1.ca.oracle.com/vol/vol1/ade_ottawa_txn/gpelleti/gpelleti_ri_gf647_060509/ade_storage/000006/AB0952363AC40CBFE034080020E8C54E.51 Report generated at Tue May 9 14:42:24 2006 -------------------------------------------------------------------------------- *** /ade/gpelleti_main/tldev/source/essentials/oracle/toplink/essentials/exceptions/i18n/ValidationExceptionResource.java Tue May 9 14:33:48 2006 --- /net/ottnfs1.ca.oracle.com/vol/vol1/ade_ottawa_txn/gpelleti/gpelleti_ri_gf647_060509/ade_storage/000006/AB0952363AC40CBFE034080020E8C54E.51 Tue May 9 13:39:39 2006 *************** *** 172,178 **** { "7165", "The type [{1}] for the attribute [{0}] on the entity class [{2}] is not a valid type for a temporal mapping. The attribute must be defined as java.util.Date or java.util.Calendar."}, { "7166", "Conflict between annotations [{0}] and [{1}]."}, { "7167", "[{0}] cannot use the name [{1}] - it's reserved for a [{2}]."}, - { "7168", "The attribute [{0}] of type [{1}] on the entity class [{2}] is not valid for a version property. The following types are supported: int, Integer, short, Short, long, Long, Timestamp."}, { "7169", "Class [{0}] has two @GeneratedValues: for fields [{1}] and [{2}]. Only one is allowed."} , { "7172", "Could not instantiate the @EntityListener [{0}]."}, { "7173", "A property change event has been fired on a property with name [{1}] in [{0}]. However this property does not exist."}, --- 172,177 ---- ================================================================================ Merge Diffs: /ade/gpelleti_main/tltest/source/entity-persistence-tests/src/java/oracle/toplink/essentials/testing/models/cmp3/inherited/Beer.java vs. /net/ottnfs1.ca.oracle.com/vol/vol1/ade_ottawa_txn/gpelleti/gpelleti_ri_gf647_060509/ade_storage/000007/AB0952363AC40CBFE034080020E8C54E.8 Report generated at Tue May 9 14:42:24 2006 -------------------------------------------------------------------------------- *** /ade/gpelleti_main/tltest/source/entity-persistence-tests/src/java/oracle/toplink/essentials/testing/models/cmp3/inherited/Beer.java Tue May 9 14:33:48 2006 --- /net/ottnfs1.ca.oracle.com/vol/vol1/ade_ottawa_txn/gpelleti/gpelleti_ri_gf647_060509/ade_storage/000007/AB0952363AC40CBFE034080020E8C54E.8 Tue May 9 15:20:36 2006 *************** *** 19,39 **** * [name of copyright owner] */ // Copyright (c) 1998, 2006, Oracle. All rights reserved. package oracle.toplink.essentials.testing.models.cmp3.inherited; import javax.persistence.Basic; import javax.persistence.Column; - import javax.persistence.Version; import javax.persistence.ManyToOne; import javax.persistence.JoinColumn; import javax.persistence.MappedSuperclass; import static javax.persistence.FetchType.LAZY; - import java.sql.Timestamp; - @MappedSuperclass public class Beer extends Beverage { - private Timestamp version; private double alcoholContent; private BeerConsumer beerConsumer; --- 19,37 ---- * [name of copyright owner] */ // Copyright (c) 1998, 2006, Oracle. All rights reserved. + + package oracle.toplink.essentials.testing.models.cmp3.inherited; import javax.persistence.Basic; import javax.persistence.Column; import javax.persistence.ManyToOne; import javax.persistence.JoinColumn; import javax.persistence.MappedSuperclass; import static javax.persistence.FetchType.LAZY; @MappedSuperclass public class Beer extends Beverage { private double alcoholContent; private BeerConsumer beerConsumer; *************** *** 51,61 **** return beerConsumer; } - @Version - public Timestamp getVersion() { - return version; - } - public void setAlcoholContent(double alcoholContent) { this.alcoholContent = alcoholContent; } --- 49,54 ---- *************** *** 63,70 **** public void setBeerConsumer(BeerConsumer beerConsumer) { this.beerConsumer = beerConsumer; } - - public void setVersion(Timestamp version) { - this.version = version; - } } --- 56,59 ---- ================================================================================ Merge Diffs: /ade/gpelleti_main/tltest/source/entity-persistence-tests/src/java/oracle/toplink/essentials/testing/models/cmp3/inherited/InheritedTableManager.java vs. /net/ottnfs1.ca.oracle.com/vol/vol1/ade_ottawa_txn/gpelleti/gpelleti_ri_gf647_060509/ade_storage/000008/AB0952363AC40CBFE034080020E8C54E.10 Report generated at Tue May 9 14:42:24 2006 -------------------------------------------------------------------------------- *** /ade/gpelleti_main/tltest/source/entity-persistence-tests/src/java/oracle/toplink/essentials/testing/models/cmp3/inherited/InheritedTableManager.java Tue May 9 14:33:48 2006 --- /net/ottnfs1.ca.oracle.com/vol/vol1/ade_ottawa_txn/gpelleti/gpelleti_ri_gf647_060509/ade_storage/000008/AB0952363AC40CBFE034080020E8C54E.10 Tue May 9 15:20:43 2006 *************** *** 98,113 **** BEER_CONSUMER_ID_field.setShouldAllowNull(true); BEER_CONSUMER_ID_field.setForeignKeyFieldName("CMP3_CONSUMER.ID"); table.addField(BEER_CONSUMER_ID_field); - - FieldDefinition VERSION_field = new FieldDefinition(); - VERSION_field.setName("VERSION"); - VERSION_field.setTypeName("DATETIME"); - VERSION_field.setSize(23); - VERSION_field.setIsPrimaryKey(false); - VERSION_field.setUnique(false); - VERSION_field.setIsIdentity(false); - VERSION_field.setShouldAllowNull(true); - table.addField(VERSION_field); return table; } --- 98,103 ---- *************** *** 202,217 **** BEER_CONSUMER_ID_field.setShouldAllowNull(true); BEER_CONSUMER_ID_field.setForeignKeyFieldName("CMP3_CONSUMER.ID"); table.addField(BEER_CONSUMER_ID_field); - - FieldDefinition VERSION_field = new FieldDefinition(); - VERSION_field.setName("VERSION"); - VERSION_field.setTypeName("DATETIME"); - VERSION_field.setSize(23); - VERSION_field.setIsPrimaryKey(false); - VERSION_field.setUnique(false); - VERSION_field.setIsIdentity(false); - VERSION_field.setShouldAllowNull(true); - table.addField(VERSION_field); return table; } --- 192,197 ---- *************** *** 271,286 **** BEER_CONSUMER_ID_field.setForeignKeyFieldName("CMP3_CONSUMER.ID"); table.addField(BEER_CONSUMER_ID_field); - FieldDefinition VERSION_field = new FieldDefinition(); - VERSION_field.setName("VERSION"); - VERSION_field.setTypeName("DATETIME"); - VERSION_field.setSize(23); - VERSION_field.setIsPrimaryKey(false); - VERSION_field.setUnique(false); - VERSION_field.setIsIdentity(false); - VERSION_field.setShouldAllowNull(true); - table.addField(VERSION_field); - return table; } --- 251,256 ----