================================================================================ Merge Diffs: /ade/lhillis_main/tldev/source/essentials/oracle/toplink/essentials/internal/ejb/cmp3/metadata/accessors/OneToManyAccessor.java vs. /net/stottnfs2.ca.oracle.com/vol/vol1/ade_ottawa_txn/lhillis/lhillis_essentials_gf730_060725/ade_storage/000001/AB0952363AC40CBFE034080020E8C54E.6 Report generated at Wed Jul 26 16:12:49 2006 -------------------------------------------------------------------------------- *** /ade/lhillis_main/tldev/source/essentials/oracle/toplink/essentials/internal/ejb/cmp3/metadata/accessors/OneToManyAccessor.java Wed Jul 26 16:12:49 2006 --- /net/stottnfs2.ca.oracle.com/vol/vol1/ade_ottawa_txn/lhillis/lhillis_essentials_gf730_060725/ade_storage/000001/AB0952363AC40CBFE034080020E8C54E.6 Tue Jul 25 10:11:58 2006 *************** *** 100,112 **** populateCollectionMapping(mapping, m_logger.ONE_TO_MANY_MAPPING_REFERENCE_CLASS); // Non-owning side, process the foreign keys from the owner. ! OneToOneMapping ownerMapping = null; ! if (getOwningMapping().isOneToOneMapping()){ ! ownerMapping = (OneToOneMapping)getOwningMapping(); ! }else { ! //gf730 - If improper mapping encountered, throw an exception ! getValidator().throwIvalidMappingEncountered(getJavaClass(), getReferenceClass()); ! } Map keys = ownerMapping.getSourceToTargetKeyFields(); for (DatabaseField fkField : keys.keySet()) { --- 100,106 ---- populateCollectionMapping(mapping, m_logger.ONE_TO_MANY_MAPPING_REFERENCE_CLASS); // Non-owning side, process the foreign keys from the owner. ! OneToOneMapping ownerMapping = (OneToOneMapping) getOwningMapping(); Map keys = ownerMapping.getSourceToTargetKeyFields(); for (DatabaseField fkField : keys.keySet()) { ================================================================================ Merge Diffs: /ade/lhillis_main/tldev/source/essentials/oracle/toplink/essentials/internal/ejb/cmp3/metadata/MetadataValidator.java vs. /net/stottnfs2.ca.oracle.com/vol/vol1/ade_ottawa_txn/lhillis/lhillis_essentials_gf730_060725/ade_storage/000003/AB0952363AC40CBFE034080020E8C54E.5 Report generated at Wed Jul 26 16:12:49 2006 -------------------------------------------------------------------------------- *** /ade/lhillis_main/tldev/source/essentials/oracle/toplink/essentials/internal/ejb/cmp3/metadata/MetadataValidator.java Wed Jul 26 16:12:49 2006 --- /net/stottnfs2.ca.oracle.com/vol/vol1/ade_ottawa_txn/lhillis/lhillis_essentials_gf730_060725/ade_storage/000003/AB0952363AC40CBFE034080020E8C54E.5 Tue Jul 25 15:00:18 2006 *************** *** 21,30 **** // Copyright (c) 1998, 2006, Oracle. All rights reserved. package oracle.toplink.essentials.internal.ejb.cmp3.metadata; ! import java.lang.reflect.*; - import oracle.toplink.essentials.exceptions.ValidationException; import oracle.toplink.essentials.mappings.DatabaseMapping; /** * Validator class for the metadata processors. It defines the common --- 21,31 ---- // Copyright (c) 1998, 2006, Oracle. All rights reserved. package oracle.toplink.essentials.internal.ejb.cmp3.metadata; ! import java.lang.reflect.Method; ! import java.lang.reflect.AnnotatedElement; import oracle.toplink.essentials.mappings.DatabaseMapping; + import oracle.toplink.essentials.exceptions.ValidationException; /** * Validator class for the metadata processors. It defines the common *************** *** 77,83 **** } /** ! * INTERNAL: */ public void throwErrorProcessingNamedQueryAnnotation(Class entityClass, String name, Exception exception) { throw ValidationException.errorProcessingNamedQueryAnnotation(entityClass, name, exception); --- 78,84 ---- } /** ! * INTERNAL */ public void throwErrorProcessingNamedQueryAnnotation(Class entityClass, String name, Exception exception) { throw ValidationException.errorProcessingNamedQueryAnnotation(entityClass, name, exception); *************** *** 98,111 **** } /** ! * INTERNAL: */ public void throwIncompleteJoinColumnsSpecified(Class entityClass, Object element) { throw ValidationException.incompleteJoinColumnsSpecified((AnnotatedElement) element, entityClass); } /** ! * INTERNAL: */ public void throwIncompletePrimaryKeyJoinColumnsSpecified(Class entityClass, AnnotatedElement annotatedElement) { throw ValidationException.incompletePrimaryKeyJoinColumnsSpecified(annotatedElement); --- 99,112 ---- } /** ! * INTERNAL */ public void throwIncompleteJoinColumnsSpecified(Class entityClass, Object element) { throw ValidationException.incompleteJoinColumnsSpecified((AnnotatedElement) element, entityClass); } /** ! * INTERNAL */ public void throwIncompletePrimaryKeyJoinColumnsSpecified(Class entityClass, AnnotatedElement annotatedElement) { throw ValidationException.incompletePrimaryKeyJoinColumnsSpecified(annotatedElement); *************** *** 169,196 **** } /** ! * INTERNAL: */ public void throwMappingAnnotationsAppliedToTransientAttribute(AnnotatedElement annotatedElement) { throw ValidationException.mappingAnnotationsAppliedToTransientAttribute(annotatedElement); } /** ! * INTERNAL: */ public void throwMultipleEmbeddedIdsFound(Class entityClass, String attributeName, String embeddedIdAttributeName) { throw ValidationException.multipleEmbeddedIdAnnotationsFound(entityClass, attributeName, embeddedIdAttributeName); } /** ! * INTERNAL: */ public void throwNoCorrespondingSetterMethodDefined(Class entityClass, Method method) { throw ValidationException.noCorrespondingSetterMethodDefined(entityClass, method); } /** ! * INTERNAL: */ public void throwNoMappedByAttributeFound(Class owningClass, String owningAttributeName, Class entityClass, String attributeName) { throw ValidationException.noMappedByAttributeFound(owningClass, owningAttributeName, entityClass, attributeName); --- 170,197 ---- } /** ! * INTERNAL */ public void throwMappingAnnotationsAppliedToTransientAttribute(AnnotatedElement annotatedElement) { throw ValidationException.mappingAnnotationsAppliedToTransientAttribute(annotatedElement); } /** ! * INTERNAL */ public void throwMultipleEmbeddedIdsFound(Class entityClass, String attributeName, String embeddedIdAttributeName) { throw ValidationException.multipleEmbeddedIdAnnotationsFound(entityClass, attributeName, embeddedIdAttributeName); } /** ! * INTERNAL */ public void throwNoCorrespondingSetterMethodDefined(Class entityClass, Method method) { throw ValidationException.noCorrespondingSetterMethodDefined(entityClass, method); } /** ! * INTERNAL */ public void throwNoMappedByAttributeFound(Class owningClass, String owningAttributeName, Class entityClass, String attributeName) { throw ValidationException.noMappedByAttributeFound(owningClass, owningAttributeName, entityClass, attributeName); *************** *** 204,217 **** } /** ! * INTERNAL: */ public void throwNoPrimaryKeyAnnotationsFound(Class entityClass) { throw ValidationException.noPrimaryKeyAnnotationsFound(entityClass); } /** ! * INTERNAL: */ public void throwNoTemporalTypeSpecified(Class entityClass, String attributeName) { throw ValidationException.noTemporalTypeSpecified(attributeName, entityClass); --- 205,218 ---- } /** ! * INTERNAL */ public void throwNoPrimaryKeyAnnotationsFound(Class entityClass) { throw ValidationException.noPrimaryKeyAnnotationsFound(entityClass); } /** ! * INTERNAL */ public void throwNoTemporalTypeSpecified(Class entityClass, String attributeName) { throw ValidationException.noTemporalTypeSpecified(attributeName, entityClass); *************** *** 225,231 **** } /** ! * INTERNAL: */ public void throwRelationshipHasColumnSpecified(Class entityClass, String attributeName) { throw ValidationException.invalidColumnAnnotationOnRelationship(entityClass, attributeName); --- 226,232 ---- } /** ! * INTERNAL */ public void throwRelationshipHasColumnSpecified(Class entityClass, String attributeName) { throw ValidationException.invalidColumnAnnotationOnRelationship(entityClass, attributeName); *************** *** 260,266 **** } /** ! * INTERNAL: */ public void throwUniDirectionalOneToManyHasJoinColumnSpecified(Class entityClass, String attributeName) { throw ValidationException.uniDirectionalOneToManyHasJoinColumnAnnotations(entityClass, attributeName); --- 261,267 ---- } /** ! * INTERNAL */ public void throwUniDirectionalOneToManyHasJoinColumnSpecified(Class entityClass, String attributeName) { throw ValidationException.uniDirectionalOneToManyHasJoinColumnAnnotations(entityClass, attributeName); *************** *** 268,283 **** // How about these?? /** ! * INTERNAL: */ //public void throwUnspecifiedCompositePrimaryKeyNotSupported(Class entityClass) { // throw ValidationException.unspecifiedCompositePKNotSupported(entityClass); //} - - /** - * INTERNAL: - */ - public void throwIvalidMappingEncountered(Class entityClass, Class targetClass){ - throw ValidationException.invalidMapping(entityClass, targetClass); - } } --- 269,277 ---- // How about these?? /** ! * INTERNAL */ //public void throwUnspecifiedCompositePrimaryKeyNotSupported(Class entityClass) { // throw ValidationException.unspecifiedCompositePKNotSupported(entityClass); //} } ================================================================================ Merge Diffs: /ade/lhillis_main/tldev/source/essentials/oracle/toplink/essentials/exceptions/ValidationException.java vs. /net/stottnfs2.ca.oracle.com/vol/vol1/ade_ottawa_txn/lhillis/lhillis_essentials_gf730_060725/ade_storage/000004/AB0952363AC40CBFE034080020E8C54E.55 Report generated at Wed Jul 26 16:12:49 2006 -------------------------------------------------------------------------------- *** /ade/lhillis_main/tldev/source/essentials/oracle/toplink/essentials/exceptions/ValidationException.java Wed Jul 26 16:12:49 2006 --- /net/stottnfs2.ca.oracle.com/vol/vol1/ade_ottawa_txn/lhillis/lhillis_essentials_gf730_060725/ade_storage/000004/AB0952363AC40CBFE034080020E8C54E.55 Tue Jul 25 15:03:26 2006 *************** *** 22,32 **** package oracle.toplink.essentials.exceptions; import java.util.Vector; ! import java.lang.reflect.*; import oracle.toplink.essentials.mappings.DatabaseMapping; import oracle.toplink.essentials.internal.queryframework.*; import oracle.toplink.essentials.internal.identitymaps.*; - import oracle.toplink.essentials.internal.ejb.cmp3.metadata.accessors.objects.MetadataAccessibleObject; import oracle.toplink.essentials.queryframework.*; import oracle.toplink.essentials.exceptions.i18n.ExceptionMessageGenerator; import oracle.toplink.essentials.internal.sessions.UnitOfWorkImpl; --- 22,32 ---- package oracle.toplink.essentials.exceptions; import java.util.Vector; ! import java.lang.reflect.Type; ! import java.lang.reflect.Method; import oracle.toplink.essentials.mappings.DatabaseMapping; import oracle.toplink.essentials.internal.queryframework.*; import oracle.toplink.essentials.internal.identitymaps.*; import oracle.toplink.essentials.queryframework.*; import oracle.toplink.essentials.exceptions.i18n.ExceptionMessageGenerator; import oracle.toplink.essentials.internal.sessions.UnitOfWorkImpl; *************** *** 299,306 **** public static final int CLASS_NOT_LISTED_IN_PERSISTENCE_UNIT = 7243; - public static final int INVALID_MAPPING = 7244; - /** * INTERNAL: * TopLink exceptions should only be thrown by TopLink. --- 299,304 ---- *************** *** 2117,2128 **** validationException.setErrorCode(CLASS_NOT_LISTED_IN_PERSISTENCE_UNIT); return validationException; } - - public static ValidationException invalidMapping(Class entityClass, Class targetClass) { - Object[] args = { entityClass, targetClass }; - ValidationException validationException = new ValidationException(ExceptionMessageGenerator.buildMessage(ValidationException.class, INVALID_MAPPING, args)); - validationException.setErrorCode(INVALID_MAPPING); - return validationException; - } - } --- 2115,2118 ---- ================================================================================ Merge Diffs: /ade/lhillis_main/tldev/source/essentials/oracle/toplink/essentials/exceptions/i18n/ValidationExceptionResource.java vs. /net/stottnfs2.ca.oracle.com/vol/vol1/ade_ottawa_txn/lhillis/lhillis_essentials_gf730_060725/ade_storage/000005/AB0952363AC40CBFE034080020E8C54E.55 Report generated at Wed Jul 26 16:12:49 2006 -------------------------------------------------------------------------------- *** /ade/lhillis_main/tldev/source/essentials/oracle/toplink/essentials/exceptions/i18n/ValidationExceptionResource.java Wed Jul 26 16:12:49 2006 --- /net/stottnfs2.ca.oracle.com/vol/vol1/ade_ottawa_txn/lhillis/lhillis_essentials_gf730_060725/ade_storage/000005/AB0952363AC40CBFE034080020E8C54E.55 Tue Jul 25 15:05:43 2006 *************** *** 243,250 **** { "7240", "The table generator specified in [{2}] with pk column value == [{0}] conflicts with the sequence generator specified in [{1}] with sequence name == [{0}]. They cannot use the same value."}, { "7241", "The table generator specified in [{2}] with name == [{0}] conflicts with another table generator with the same name in [{1}]."}, { "7242", "An attempt was made to traverse a relationship using indirection that had a null Session. This often occurs when an entity with an uninstantiated LAZY relationship is serialized and that lazy relationship is traversed after serialization. To avoid this issue, instantiate the LAZY relationship prior to serialization."}, ! { "7243", "Missing meta data for class [{0}]. Ensure the class is not being excluded from your persistence unit by a true setting. If this is the case, you will need to include the class directly by adding a [{0}] entry for your persistence-unit."}, ! { "7244", "An incompatible mapping has been encountered between [{0}] and [{1}]. This usually occurs when the cardinality of a mapping does not correspond with the cardinality of its backpointer."} }; /** --- 243,249 ---- { "7240", "The table generator specified in [{2}] with pk column value == [{0}] conflicts with the sequence generator specified in [{1}] with sequence name == [{0}]. They cannot use the same value."}, { "7241", "The table generator specified in [{2}] with name == [{0}] conflicts with another table generator with the same name in [{1}]."}, { "7242", "An attempt was made to traverse a relationship using indirection that had a null Session. This often occurs when an entity with an uninstantiated LAZY relationship is serialized and that lazy relationship is traversed after serialization. To avoid this issue, instantiate the LAZY relationship prior to serialization."}, ! { "7243", "Missing meta data for class [{0}]. Ensure the class is not being excluded from your persistence unit by a true setting. If this is the case, you will need to include the class directly by adding a [{0}] entry for your persistence-unit."} }; /** ================================================================================ Merge Diffs: /ade/lhillis_main/tldev/source/essentials/oracle/toplink/essentials/internal/ejb/cmp3/metadata/accessors/OneToOneAccessor.java vs. /net/stottnfs2.ca.oracle.com/vol/vol1/ade_ottawa_txn/lhillis/lhillis_essentials_gf730_060725/ade_storage/000006/AB0952363AC40CBFE034080020E8C54E.4 Report generated at Wed Jul 26 16:12:49 2006 -------------------------------------------------------------------------------- *** /ade/lhillis_main/tldev/source/essentials/oracle/toplink/essentials/internal/ejb/cmp3/metadata/accessors/OneToOneAccessor.java Wed Jul 26 16:12:49 2006 --- /net/stottnfs2.ca.oracle.com/vol/vol1/ade_ottawa_txn/lhillis/lhillis_essentials_gf730_060725/ade_storage/000006/AB0952363AC40CBFE034080020E8C54E.4 Wed Jul 26 10:26:49 2006 *************** *** 75,91 **** if (m_mappedBy.equals("")) { // Owning side, look for JoinColumns or PrimaryKeyJoinColumns. processOwningMappingKeys(mapping); ! } else { ! // Non-owning side, process the foreign keys from the owner. ! OneToOneMapping ownerMapping = null; ! if (getOwningMapping().isOneToOneMapping()){ ! ownerMapping = (OneToOneMapping)getOwningMapping(); ! }else { ! //gf730 - If improper mapping encountered, throw an exception ! getValidator().throwIvalidMappingEncountered(getJavaClass(), getReferenceClass()); ! } ! mapping.setSourceToTargetKeyFields(ownerMapping.getTargetToSourceKeyFields()); mapping.setTargetToSourceKeyFields(ownerMapping.getSourceToTargetKeyFields()); } --- 75,83 ---- if (m_mappedBy.equals("")) { // Owning side, look for JoinColumns or PrimaryKeyJoinColumns. processOwningMappingKeys(mapping); ! } else { // Non-owning side, process the foreign keys from the owner. ! OneToOneMapping ownerMapping = ((OneToOneMapping) getOwningMapping()); mapping.setSourceToTargetKeyFields(ownerMapping.getTargetToSourceKeyFields()); mapping.setTargetToSourceKeyFields(ownerMapping.getSourceToTargetKeyFields()); } ================================================================================ Merge Diffs: /ade/lhillis_main/tldev/source/essentials/oracle/toplink/essentials/internal/ejb/cmp3/metadata/accessors/ManyToManyAccessor.java vs. /net/stottnfs2.ca.oracle.com/vol/vol1/ade_ottawa_txn/lhillis/lhillis_essentials_gf730_060725/ade_storage/000007/AB0952363AC40CBFE034080020E8C54E.5 Report generated at Wed Jul 26 16:12:49 2006 -------------------------------------------------------------------------------- *** /ade/lhillis_main/tldev/source/essentials/oracle/toplink/essentials/internal/ejb/cmp3/metadata/accessors/ManyToManyAccessor.java Wed Jul 26 16:12:49 2006 --- /net/stottnfs2.ca.oracle.com/vol/vol1/ade_ottawa_txn/lhillis/lhillis_essentials_gf730_060725/ade_storage/000007/AB0952363AC40CBFE034080020E8C54E.5 Wed Jul 26 13:19:30 2006 *************** *** 79,91 **** mapping.setIsReadOnly(true); // Get the owning mapping from the reference descriptor metadata. ! ManyToManyMapping ownerMapping = null; ! if (getOwningMapping().isManyToManyMapping()){ ! ownerMapping = (ManyToManyMapping)getOwningMapping(); ! }else { ! //gf730 - If improper mapping encountered, throw an exception ! getValidator().throwIvalidMappingEncountered(getJavaClass(), getReferenceClass()); ! } // Set the relation table name from the owner. mapping.setRelationTableName(ownerMapping.getRelationTableName()); --- 79,85 ---- mapping.setIsReadOnly(true); // Get the owning mapping from the reference descriptor metadata. ! ManyToManyMapping ownerMapping = (ManyToManyMapping) getOwningMapping(); // Set the relation table name from the owner. mapping.setRelationTableName(ownerMapping.getRelationTableName());