================================================================================
Merge Diffs: /ade/cdelahun_toplinkmain/tltest/resource/essentials/ejb30-testing/META-INF/persistence.xml vs. /net/ottnfs1.ca.oracle.com/vol/vol1/ade_ottawa_txn/cdelahun/cdelahun_ri_gfbug_589_060428/ade_storage/000001/AB0952363AC40CBFE034080020E8C54E.36
Report generated at Tue May 2 00:40:10 2006
--------------------------------------------------------------------------------
*** /ade/cdelahun_toplinkmain/tltest/resource/essentials/ejb30-testing/META-INF/persistence.xml Tue May 2 00:40:10 2006
--- /net/ottnfs1.ca.oracle.com/vol/vol1/ade_ottawa_txn/cdelahun/cdelahun_ri_gfbug_589_060428/ade_storage/000001/AB0952363AC40CBFE034080020E8C54E.36 Mon May 1 11:50:39 2006
***************
*** 6,13 ****
META-INF/advanced-entity-mappings.xml
!
META-INF/inherited-entity-mappings.xml
META-INF/incomplete-nonowning-entity-mappings.xml
META-INF/incomplete-owning-entity-mappings.xml
--- 6,12 ----
META-INF/advanced-entity-mappings.xml
! META-INF/inheritance-entity-mappings.xml
META-INF/inherited-entity-mappings.xml
META-INF/incomplete-nonowning-entity-mappings.xml
META-INF/incomplete-owning-entity-mappings.xml
================================================================================
Merge Diffs: /ade/cdelahun_toplinkmain/tltest/resource/essentials/ejb30-testing/META-INF/orm.xml vs. /net/ottnfs1.ca.oracle.com/vol/vol1/ade_ottawa_txn/cdelahun/cdelahun_ri_gfbug_589_060428/ade_storage/000003/AB0952363AC40CBFE034080020E8C54E.0
Report generated at Tue May 2 00:40:10 2006
--------------------------------------------------------------------------------
*** /ade/cdelahun_toplinkmain/tltest/resource/essentials/ejb30-testing/META-INF/orm.xml Tue May 2 00:37:18 2006
--- /net/ottnfs1.ca.oracle.com/vol/vol1/ade_ottawa_txn/cdelahun/cdelahun_ri_gfbug_589_060428/ade_storage/000003/AB0952363AC40CBFE034080020E8C54E.0 Mon May 1 17:27:22 2006
***************
*** 1,281 ****
-
-
- Inheritance Test Model Instance Document
-
-
-
-
- PROPERTY
-
-
-
-
-
-
-
-
-
- oracle.toplink.essentials.testing.models.cmp3.xml.inheritance
-
-
-
-
-
-
-
-
- SELECT t0.MAX_SPEED AS FERRARI_SPEED FROM CMP3_XML_SPORTS_CAR t0, CMP3_XML_FUEL_VEH t1 WHERE t1.DESCRIP='Ferrari'
-
-
-
-
-
-
-
- V
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- F
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- NF
-
-
-
-
-
-
- BO
-
-
-
-
-
-
-
-
-
-
- C
-
-
-
-
-
- SC
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- BI
-
-
-
-
-
-
-
-
-
-
-
- BU
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- E
-
-
-
-
-
-
-
-
-
-
- IC
-
-
-
-
-
- L
-
-
-
-
-
- Performance
-
-
-
-
-
-
-
-
-
-
-
- P
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Normal
-
-
-
-
-
-
-
-
-
-
-
-
-
-
--- 0 ----
================================================================================
Merge Diffs: /ade/cdelahun_toplinkmain/tltest/source/entity-persistence-tests/src/java/oracle/toplink/essentials/testing/tests/cmp3/inheritance/LifecycleCallbackJunitTest.java vs. /net/ottnfs1.ca.oracle.com/vol/vol1/ade_ottawa_txn/cdelahun/cdelahun_ri_gfbug_589_060428/ade_storage/000004/AB0952363AC40CBFE034080020E8C54E.12
Report generated at Tue May 2 00:40:10 2006
--------------------------------------------------------------------------------
*** /ade/cdelahun_toplinkmain/tltest/source/entity-persistence-tests/src/java/oracle/toplink/essentials/testing/tests/cmp3/inheritance/LifecycleCallbackJunitTest.java Tue May 2 00:40:10 2006
--- /net/ottnfs1.ca.oracle.com/vol/vol1/ade_ottawa_txn/cdelahun/cdelahun_ri_gfbug_589_060428/ade_storage/000004/AB0952363AC40CBFE034080020E8C54E.12 Mon May 1 16:02:12 2006
***************
*** 131,137 ****
assertFalse("The PostPersist callback method on BusListener was not called.", busListenerPostPersistCountBefore == busListenerPostPersistCountAfter);
assertFalse("The PostPersist callback method on FueledVehicleListener was not called.", fueledVehiclePostPersistCountBefore == fueledVehiclePostPersistCountAfter);
assertFalse("The PostPersist callback method on DefaultListener was not called.", defaultListenerPostPersistCountBefore == defaultListenerPostPersistCountAfter);
! assertTrue("The PostLoad callback method on DefaultListener was called more than once, possibly on the refresh.", (defaultListenerPostLoadCountIntermidiate - defaultListenerPostLoadCountBefore) == 1);
assertTrue("The PostLoad callback method on DefaultListener was called on the getQueryResult().", defaultListenerPostLoadCountIntermidiate == defaultListenerPostLoadCountAfter);
}
--- 131,137 ----
assertFalse("The PostPersist callback method on BusListener was not called.", busListenerPostPersistCountBefore == busListenerPostPersistCountAfter);
assertFalse("The PostPersist callback method on FueledVehicleListener was not called.", fueledVehiclePostPersistCountBefore == fueledVehiclePostPersistCountAfter);
assertFalse("The PostPersist callback method on DefaultListener was not called.", defaultListenerPostPersistCountBefore == defaultListenerPostPersistCountAfter);
! assertTrue("The PostLoad callback method on DefaultListener was called on the refresh.", (defaultListenerPostLoadCountIntermidiate - defaultListenerPostLoadCountBefore) == 1);
assertTrue("The PostLoad callback method on DefaultListener was called on the getQueryResult().", defaultListenerPostLoadCountIntermidiate == defaultListenerPostLoadCountAfter);
}
***************
*** 204,210 ****
assertTrue("The PrePersist callback method on ListenerSuperclass was called.", listenerSuperclassPrePersistCountBefore == listenerSuperclassPrePersistCountAfter);
assertFalse("The PrePersist callback method on AbstractBus was not called.", abstractBusPrePeristCountBefore == abstractBusPrePeristCountAfter);
assertFalse("The PrePersist callback method on DefaultListener was not called.", defaultListenerPrePersistCountBefore == defaultListenerPrePersistCountAfter);
- assertFalse("The PrePersist callback method on DefaultListener was called more than once.", defaultListenerPrePersistCountAfter - defaultListenerPrePersistCountBefore >1 );
}
public void testPrePersistSportsCarInheritAndExcludeDefault() {
--- 204,209 ----
================================================================================
Merge Diffs: /ade/cdelahun_toplinkmain/tldev/source/essentials/oracle/toplink/essentials/internal/ejb/cmp3/EntityManagerSetupImpl.java vs. /net/ottnfs1.ca.oracle.com/vol/vol1/ade_ottawa_txn/cdelahun/cdelahun_ri_gfbug_589_060428/ade_storage/000005/AB0952363AC40CBFE034080020E8C54E.59
Report generated at Tue May 2 00:40:10 2006
--------------------------------------------------------------------------------
*** /ade/cdelahun_toplinkmain/tldev/source/essentials/oracle/toplink/essentials/internal/ejb/cmp3/EntityManagerSetupImpl.java Tue May 2 00:40:10 2006
--- /net/ottnfs1.ca.oracle.com/vol/vol1/ade_ottawa_txn/cdelahun/cdelahun_ri_gfbug_589_060428/ade_storage/000005/AB0952363AC40CBFE034080020E8C54E.59 Mon May 1 16:56:14 2006
***************
*** 162,176 ****
*/
public Set buildPersistentClassSetFromXMLDocuments(ClassLoader loader, PersistenceUnitInfo persistenceUnitInfo) {
HashSet classSet = new HashSet();
- String ormStr = "META-INF/orm.xml";
- try{
- Enumeration resources = loader.getResources(ormStr);
- while (resources.hasMoreElements()){
- URL mappingFileResource = resources.nextElement();
- classSet.addAll(EntityMappingsXMLProcessor.buildClassSet(mappingFileResource, loader));
- }
- } catch (IOException e){/* ignore */}
-
if (persistenceUnitInfo != null) {
if (!persistenceUnitInfo.getMappingFileNames().isEmpty()) {
Iterator mappingFiles = persistenceUnitInfo.getMappingFileNames().iterator();
--- 162,167 ----
================================================================================
Merge Diffs: /ade/cdelahun_toplinkmain/tldev/source/essentials/oracle/toplink/essentials/internal/ejb/cmp3/JavaSECMPInitializer.java vs. /net/ottnfs1.ca.oracle.com/vol/vol1/ade_ottawa_txn/cdelahun/cdelahun_ri_gfbug_589_060428/ade_storage/000006/AB0952363AC40CBFE034080020E8C54E.20
Report generated at Tue May 2 00:40:10 2006
--------------------------------------------------------------------------------
*** /ade/cdelahun_toplinkmain/tldev/source/essentials/oracle/toplink/essentials/internal/ejb/cmp3/JavaSECMPInitializer.java Tue May 2 00:40:10 2006
--- /net/ottnfs1.ca.oracle.com/vol/vol1/ade_ottawa_txn/cdelahun/cdelahun_ri_gfbug_589_060428/ade_storage/000006/AB0952363AC40CBFE034080020E8C54E.20 Mon May 1 16:59:50 2006
***************
*** 376,386 ****
public class TempEntityLoader extends URLClassLoader {
Collection classNames;
boolean shouldOverrideLoadClassForCollectionMembers;
-
- //added to resolved gf #589 - without this, the orm.xml url would be returned twice
- public Enumeration getResources(String name) throws java.io.IOException {
- return this.getParent().getResources(name);
- }
public TempEntityLoader(URL[] urls, ClassLoader parent, Collection classNames, boolean shouldOverrideLoadClassForCollectionMembers) {
super(urls, parent);
--- 376,381 ----
================================================================================
Merge Diffs: /ade/cdelahun_toplinkmain/tltest/resource/essentials/ejb30-testing/META-INF/persistence.xml vs. /net/ottnfs1.ca.oracle.com/vol/vol1/ade_ottawa_txn/cdelahun/cdelahun_ri_gfbug_589_060428/ade_storage/000001/AB0952363AC40CBFE034080020E8C54E.36
Report generated at Tue May 2 00:51:47 2006
--------------------------------------------------------------------------------
*** /ade/cdelahun_toplinkmain/tltest/resource/essentials/ejb30-testing/META-INF/persistence.xml Tue May 2 00:40:10 2006
--- /net/ottnfs1.ca.oracle.com/vol/vol1/ade_ottawa_txn/cdelahun/cdelahun_ri_gfbug_589_060428/ade_storage/000001/AB0952363AC40CBFE034080020E8C54E.36 Mon May 1 11:50:39 2006
***************
*** 6,13 ****
META-INF/advanced-entity-mappings.xml
!
META-INF/inherited-entity-mappings.xml
META-INF/incomplete-nonowning-entity-mappings.xml
META-INF/incomplete-owning-entity-mappings.xml
--- 6,12 ----
META-INF/advanced-entity-mappings.xml
! META-INF/inheritance-entity-mappings.xml
META-INF/inherited-entity-mappings.xml
META-INF/incomplete-nonowning-entity-mappings.xml
META-INF/incomplete-owning-entity-mappings.xml
================================================================================
Merge Diffs: /ade/cdelahun_toplinkmain/tltest/resource/essentials/ejb30-testing/META-INF/orm.xml vs. /net/ottnfs1.ca.oracle.com/vol/vol1/ade_ottawa_txn/cdelahun/cdelahun_ri_gfbug_589_060428/ade_storage/000003/AB0952363AC40CBFE034080020E8C54E.0
Report generated at Tue May 2 00:51:47 2006
--------------------------------------------------------------------------------
*** /ade/cdelahun_toplinkmain/tltest/resource/essentials/ejb30-testing/META-INF/orm.xml Tue May 2 00:37:18 2006
--- /net/ottnfs1.ca.oracle.com/vol/vol1/ade_ottawa_txn/cdelahun/cdelahun_ri_gfbug_589_060428/ade_storage/000003/AB0952363AC40CBFE034080020E8C54E.0 Mon May 1 17:27:22 2006
***************
*** 1,281 ****
-
-
- Inheritance Test Model Instance Document
-
-
-
-
- PROPERTY
-
-
-
-
-
-
-
-
-
- oracle.toplink.essentials.testing.models.cmp3.xml.inheritance
-
-
-
-
-
-
-
-
- SELECT t0.MAX_SPEED AS FERRARI_SPEED FROM CMP3_XML_SPORTS_CAR t0, CMP3_XML_FUEL_VEH t1 WHERE t1.DESCRIP='Ferrari'
-
-
-
-
-
-
-
- V
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- F
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- NF
-
-
-
-
-
-
- BO
-
-
-
-
-
-
-
-
-
-
- C
-
-
-
-
-
- SC
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- BI
-
-
-
-
-
-
-
-
-
-
-
- BU
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- E
-
-
-
-
-
-
-
-
-
-
- IC
-
-
-
-
-
- L
-
-
-
-
-
- Performance
-
-
-
-
-
-
-
-
-
-
-
- P
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Normal
-
-
-
-
-
-
-
-
-
-
-
-
-
-
--- 0 ----
================================================================================
Merge Diffs: /ade/cdelahun_toplinkmain/tltest/source/entity-persistence-tests/src/java/oracle/toplink/essentials/testing/tests/cmp3/inheritance/LifecycleCallbackJunitTest.java vs. /net/ottnfs1.ca.oracle.com/vol/vol1/ade_ottawa_txn/cdelahun/cdelahun_ri_gfbug_589_060428/ade_storage/000004/AB0952363AC40CBFE034080020E8C54E.12
Report generated at Tue May 2 00:51:47 2006
--------------------------------------------------------------------------------
*** /ade/cdelahun_toplinkmain/tltest/source/entity-persistence-tests/src/java/oracle/toplink/essentials/testing/tests/cmp3/inheritance/LifecycleCallbackJunitTest.java Tue May 2 00:40:10 2006
--- /net/ottnfs1.ca.oracle.com/vol/vol1/ade_ottawa_txn/cdelahun/cdelahun_ri_gfbug_589_060428/ade_storage/000004/AB0952363AC40CBFE034080020E8C54E.12 Mon May 1 16:02:12 2006
***************
*** 131,137 ****
assertFalse("The PostPersist callback method on BusListener was not called.", busListenerPostPersistCountBefore == busListenerPostPersistCountAfter);
assertFalse("The PostPersist callback method on FueledVehicleListener was not called.", fueledVehiclePostPersistCountBefore == fueledVehiclePostPersistCountAfter);
assertFalse("The PostPersist callback method on DefaultListener was not called.", defaultListenerPostPersistCountBefore == defaultListenerPostPersistCountAfter);
! assertTrue("The PostLoad callback method on DefaultListener was called more than once, possibly on the refresh.", (defaultListenerPostLoadCountIntermidiate - defaultListenerPostLoadCountBefore) == 1);
assertTrue("The PostLoad callback method on DefaultListener was called on the getQueryResult().", defaultListenerPostLoadCountIntermidiate == defaultListenerPostLoadCountAfter);
}
--- 131,137 ----
assertFalse("The PostPersist callback method on BusListener was not called.", busListenerPostPersistCountBefore == busListenerPostPersistCountAfter);
assertFalse("The PostPersist callback method on FueledVehicleListener was not called.", fueledVehiclePostPersistCountBefore == fueledVehiclePostPersistCountAfter);
assertFalse("The PostPersist callback method on DefaultListener was not called.", defaultListenerPostPersistCountBefore == defaultListenerPostPersistCountAfter);
! assertTrue("The PostLoad callback method on DefaultListener was called on the refresh.", (defaultListenerPostLoadCountIntermidiate - defaultListenerPostLoadCountBefore) == 1);
assertTrue("The PostLoad callback method on DefaultListener was called on the getQueryResult().", defaultListenerPostLoadCountIntermidiate == defaultListenerPostLoadCountAfter);
}
***************
*** 204,210 ****
assertTrue("The PrePersist callback method on ListenerSuperclass was called.", listenerSuperclassPrePersistCountBefore == listenerSuperclassPrePersistCountAfter);
assertFalse("The PrePersist callback method on AbstractBus was not called.", abstractBusPrePeristCountBefore == abstractBusPrePeristCountAfter);
assertFalse("The PrePersist callback method on DefaultListener was not called.", defaultListenerPrePersistCountBefore == defaultListenerPrePersistCountAfter);
- assertFalse("The PrePersist callback method on DefaultListener was called more than once.", defaultListenerPrePersistCountAfter - defaultListenerPrePersistCountBefore >1 );
}
public void testPrePersistSportsCarInheritAndExcludeDefault() {
--- 204,209 ----
================================================================================
Merge Diffs: /ade/cdelahun_toplinkmain/tldev/source/essentials/oracle/toplink/essentials/internal/ejb/cmp3/EntityManagerSetupImpl.java vs. /net/ottnfs1.ca.oracle.com/vol/vol1/ade_ottawa_txn/cdelahun/cdelahun_ri_gfbug_589_060428/ade_storage/000005/AB0952363AC40CBFE034080020E8C54E.59
Report generated at Tue May 2 00:51:47 2006
--------------------------------------------------------------------------------
*** /ade/cdelahun_toplinkmain/tldev/source/essentials/oracle/toplink/essentials/internal/ejb/cmp3/EntityManagerSetupImpl.java Tue May 2 00:40:10 2006
--- /net/ottnfs1.ca.oracle.com/vol/vol1/ade_ottawa_txn/cdelahun/cdelahun_ri_gfbug_589_060428/ade_storage/000005/AB0952363AC40CBFE034080020E8C54E.59 Mon May 1 16:56:14 2006
***************
*** 162,176 ****
*/
public Set buildPersistentClassSetFromXMLDocuments(ClassLoader loader, PersistenceUnitInfo persistenceUnitInfo) {
HashSet classSet = new HashSet();
- String ormStr = "META-INF/orm.xml";
- try{
- Enumeration resources = loader.getResources(ormStr);
- while (resources.hasMoreElements()){
- URL mappingFileResource = resources.nextElement();
- classSet.addAll(EntityMappingsXMLProcessor.buildClassSet(mappingFileResource, loader));
- }
- } catch (IOException e){/* ignore */}
-
if (persistenceUnitInfo != null) {
if (!persistenceUnitInfo.getMappingFileNames().isEmpty()) {
Iterator mappingFiles = persistenceUnitInfo.getMappingFileNames().iterator();
--- 162,167 ----
================================================================================
Merge Diffs: /ade/cdelahun_toplinkmain/tldev/source/essentials/oracle/toplink/essentials/internal/ejb/cmp3/JavaSECMPInitializer.java vs. /net/ottnfs1.ca.oracle.com/vol/vol1/ade_ottawa_txn/cdelahun/cdelahun_ri_gfbug_589_060428/ade_storage/000006/AB0952363AC40CBFE034080020E8C54E.20
Report generated at Tue May 2 00:51:47 2006
--------------------------------------------------------------------------------
*** /ade/cdelahun_toplinkmain/tldev/source/essentials/oracle/toplink/essentials/internal/ejb/cmp3/JavaSECMPInitializer.java Tue May 2 00:40:10 2006
--- /net/ottnfs1.ca.oracle.com/vol/vol1/ade_ottawa_txn/cdelahun/cdelahun_ri_gfbug_589_060428/ade_storage/000006/AB0952363AC40CBFE034080020E8C54E.20 Mon May 1 16:59:50 2006
***************
*** 376,386 ****
public class TempEntityLoader extends URLClassLoader {
Collection classNames;
boolean shouldOverrideLoadClassForCollectionMembers;
-
- //added to resolved gf #589 - without this, the orm.xml url would be returned twice
- public Enumeration getResources(String name) throws java.io.IOException {
- return this.getParent().getResources(name);
- }
public TempEntityLoader(URL[] urls, ClassLoader parent, Collection classNames, boolean shouldOverrideLoadClassForCollectionMembers) {
super(urls, parent);
--- 376,381 ----