================================================================================ Merge Diffs: /ade/gpelleti_main/tltest/source/entity-persistence-tests/src/java/oracle/toplink/essentials/testing/models/cmp3/relationships/Customer.java vs. /net/ottnfs1.ca.oracle.com/vol/vol1/ade_ottawa_txn/gpelleti/gpelleti_ri_gf643_060510/ade_storage/000002/AB0952363AC40CBFE034080020E8C54E.8 Report generated at Thu May 11 15:16:12 2006 -------------------------------------------------------------------------------- *** /ade/gpelleti_main/tltest/source/entity-persistence-tests/src/java/oracle/toplink/essentials/testing/models/cmp3/relationships/Customer.java Thu May 11 15:16:12 2006 --- /net/ottnfs1.ca.oracle.com/vol/vol1/ade_ottawa_txn/gpelleti/gpelleti_ri_gf643_060510/ade_storage/000002/AB0952363AC40CBFE034080020E8C54E.8 Wed May 10 12:39:06 2006 *************** *** 21,27 **** // Copyright (c) 1998, 2006, Oracle. All rights reserved. package oracle.toplink.essentials.testing.models.cmp3.relationships; - import java.util.HashSet; import java.util.Collection; import javax.persistence.*; import static javax.persistence.GenerationType.*; --- 21,26 ---- *************** *** 45,51 **** private int version; private String city; private String name; ! private Collection orders = new HashSet(); public Customer() {} --- 44,50 ---- private int version; private String city; private String name; ! private Collection orders; public Customer() {} ================================================================================ 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_gf643_060510/ade_storage/000016/AB0952363AC40CBFE034080020E8C54E.45 Report generated at Thu May 11 15:16:12 2006 -------------------------------------------------------------------------------- *** /ade/gpelleti_main/tldev/source/essentials/oracle/toplink/essentials/internal/ejb/cmp3/metadata/MetadataHelper.java Thu May 11 15:16:12 2006 --- /net/ottnfs1.ca.oracle.com/vol/vol1/ade_ottawa_txn/gpelleti/gpelleti_ri_gf643_060510/ade_storage/000016/AB0952363AC40CBFE034080020E8C54E.45 Thu May 11 16:00:01 2006 *************** *** 42,48 **** import oracle.toplink.essentials.sessions.Project; import oracle.toplink.essentials.internal.helper.Helper; - import oracle.toplink.essentials.internal.helper.ClassConstants; import oracle.toplink.essentials.mappings.CollectionMapping; import oracle.toplink.essentials.descriptors.ClassDescriptor; import oracle.toplink.essentials.exceptions.ValidationException; --- 42,47 ---- *************** *** 53,59 **** import oracle.toplink.essentials.internal.security.PrivilegedGetField; import oracle.toplink.essentials.internal.security.PrivilegedGetMethod; import oracle.toplink.essentials.internal.security.PrivilegedGetMethods; - import oracle.toplink.essentials.internal.queryframework.CollectionContainerPolicy; /** * Common helper methods for the annotation and xml processors. --- 52,57 ---- *************** *** 701,707 **** mapping.useTransparentList(); } else if (rawClass == Collection.class) { mapping.useTransparentCollection(); - mapping.setContainerPolicy(new CollectionContainerPolicy(ClassConstants.IndirectList_Class)); } else if (rawClass == Set.class) { mapping.useTransparentSet(); } else { --- 699,704 ---- ================================================================================ Merge Diffs: /ade/gpelleti_main/tltest/source/entity-persistence-tests/src/java/oracle/toplink/essentials/testing/models/cmp3/relationships/Customer.java vs. /net/ottnfs1.ca.oracle.com/vol/vol1/ade_ottawa_txn/gpelleti/gpelleti_ri_gf643_060510/ade_storage/000002/AB0952363AC40CBFE034080020E8C54E.8 Report generated at Thu May 11 15:25:34 2006 -------------------------------------------------------------------------------- *** /ade/gpelleti_main/tltest/source/entity-persistence-tests/src/java/oracle/toplink/essentials/testing/models/cmp3/relationships/Customer.java Thu May 11 15:16:12 2006 --- /net/ottnfs1.ca.oracle.com/vol/vol1/ade_ottawa_txn/gpelleti/gpelleti_ri_gf643_060510/ade_storage/000002/AB0952363AC40CBFE034080020E8C54E.8 Wed May 10 12:39:06 2006 *************** *** 21,27 **** // Copyright (c) 1998, 2006, Oracle. All rights reserved. package oracle.toplink.essentials.testing.models.cmp3.relationships; - import java.util.HashSet; import java.util.Collection; import javax.persistence.*; import static javax.persistence.GenerationType.*; --- 21,26 ---- *************** *** 45,51 **** private int version; private String city; private String name; ! private Collection orders = new HashSet(); public Customer() {} --- 44,50 ---- private int version; private String city; private String name; ! private Collection orders; public Customer() {} ================================================================================ 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_gf643_060510/ade_storage/000016/AB0952363AC40CBFE034080020E8C54E.45 Report generated at Thu May 11 15:25:34 2006 -------------------------------------------------------------------------------- *** /ade/gpelleti_main/tldev/source/essentials/oracle/toplink/essentials/internal/ejb/cmp3/metadata/MetadataHelper.java Thu May 11 15:16:12 2006 --- /net/ottnfs1.ca.oracle.com/vol/vol1/ade_ottawa_txn/gpelleti/gpelleti_ri_gf643_060510/ade_storage/000016/AB0952363AC40CBFE034080020E8C54E.45 Thu May 11 16:00:01 2006 *************** *** 42,48 **** import oracle.toplink.essentials.sessions.Project; import oracle.toplink.essentials.internal.helper.Helper; - import oracle.toplink.essentials.internal.helper.ClassConstants; import oracle.toplink.essentials.mappings.CollectionMapping; import oracle.toplink.essentials.descriptors.ClassDescriptor; import oracle.toplink.essentials.exceptions.ValidationException; --- 42,47 ---- *************** *** 53,59 **** import oracle.toplink.essentials.internal.security.PrivilegedGetField; import oracle.toplink.essentials.internal.security.PrivilegedGetMethod; import oracle.toplink.essentials.internal.security.PrivilegedGetMethods; - import oracle.toplink.essentials.internal.queryframework.CollectionContainerPolicy; /** * Common helper methods for the annotation and xml processors. --- 52,57 ---- *************** *** 701,707 **** mapping.useTransparentList(); } else if (rawClass == Collection.class) { mapping.useTransparentCollection(); - mapping.setContainerPolicy(new CollectionContainerPolicy(ClassConstants.IndirectList_Class)); } else if (rawClass == Set.class) { mapping.useTransparentSet(); } else { --- 699,704 ----