================================================================================
Merge Diffs: /ade/gpelleti_main/tltest/source/entity-persistence-tests/src/java/oracle/toplink/essentials/testing/tests/cmp3/validation/ValidationTestSuite.java vs. /net/stottnfs2.ca.oracle.com/vol/vol1/ade_ottawa_txn/gpelleti/gpelleti_ri_gf1053_060906/ade_storage/000002/AB0952363AC40CBFE034080020E8C54E.5
Report generated at Mon Sep 11 09:11:41 2006
--------------------------------------------------------------------------------
*** /net/stottnfs2.ca.oracle.com/vol/vol1/ade_ottawa_txn/gpelleti/gpelleti_ri_gf1053_060906/ade_storage/000002/AB0952363AC40CBFE034080020E8C54E.5	Fri Sep  8 10:40:19 2006
--- /ade/gpelleti_main/tltest/source/entity-persistence-tests/src/java/oracle/toplink/essentials/testing/tests/cmp3/validation/ValidationTestSuite.java	Mon Sep 11 09:11:41 2006
***************
*** 19,33 ****
   * [name of copyright owner]
   */
  // Copyright (c) 1998, 2006, Oracle. All rights reserved.  
- 
- 
  package oracle.toplink.essentials.testing.tests.cmp3.validation;
  
- import java.util.List;
- 
  import junit.framework.Test;
  import junit.framework.TestSuite;
  
  import oracle.toplink.essentials.internal.ejb.cmp3.EntityManagerImpl;
  import oracle.toplink.essentials.testing.framework.junit.JUnitTestCase;
  import oracle.toplink.essentials.testing.models.cmp3.advanced.Employee;
--- 19,34 ----
   * [name of copyright owner]
   */
  // Copyright (c) 1998, 2006, Oracle. All rights reserved.  
  package oracle.toplink.essentials.testing.tests.cmp3.validation;
  
  import junit.framework.Test;
  import junit.framework.TestSuite;
  
+ import java.util.Map;
+ import java.util.HashMap;
+ import javax.persistence.*;
+ import oracle.toplink.essentials.config.TopLinkProperties;
+ 
  import oracle.toplink.essentials.internal.ejb.cmp3.EntityManagerImpl;
  import oracle.toplink.essentials.testing.framework.junit.JUnitTestCase;
  import oracle.toplink.essentials.testing.models.cmp3.advanced.Employee;
***************
*** 46,61 ****
          clearCache();
      }
      
-     public void testPKClassTypeValidation(){
-         try{
-             createEntityManager().find(Employee.class, new Employee());
-         }catch (IllegalArgumentException ex){
-             return;
-         }
-         fail("Failed to throw expected IllegalArgumentException, when incorrect PKClass is used in find call");
-     }
-     
-    
      public static Test suite() {
          return new TestSuite(ValidationTestSuite.class) {
          
--- 47,52 ----
***************
*** 68,72 ****
          };
      }
      
! 
  }
--- 59,90 ----
          };
      }
      
!     public void testCacheIsolation_PropertiesDefault_Config() throws Exception {
!         Map properties = this.getDatabaseProperties();
!         properties.put(TopLinkProperties.CACHE_SHARED_DEFAULT, Boolean.FALSE.toString());
!         
!         EntityManager em = createEntityManager("isolated", properties);
!         assertTrue("Item descriptor did not have an isolated cache setting from a TopLink properties setting.", ((EntityManagerImpl)em).getServerSession().getClassDescriptorForAlias("Item").isIsolated());
!         em.close();
!     }
!     
!     /**
!      * This test assumes the persistence unit has the following property set:
!      *       <property name="toplink.cache.shared.default" value="false"/>
!      * @throws Exception
!      */
!     public void testCacheIsolation_XMLDefault_Config() throws Exception {
!         EntityManager em = createEntityManager("isolated");
!         assertTrue("Item descriptor did not have an isolated cache setting from an XML setting.", ((EntityManagerImpl)em).getServerSession().getClassDescriptorForAlias("Item").isIsolated());
!         em.close();
!     }
!     
!     public void testPKClassTypeValidation(){
!         try{
!             createEntityManager().find(Employee.class, new Employee());
!         }catch (IllegalArgumentException ex){
!             return;
!         }
!         fail("Failed to throw expected IllegalArgumentException, when incorrect PKClass is used in find call");
!     }
  }
================================================================================
Merge Diffs: /ade/gpelleti_main/tltest/resource/essentials/ejb30-testing/META-INF/persistence.xml vs. /net/stottnfs2.ca.oracle.com/vol/vol1/ade_ottawa_txn/gpelleti/gpelleti_ri_gf1053_060906/ade_storage/000003/AB0952363AC40CBFE034080020E8C54E.47
Report generated at Mon Sep 11 09:11:41 2006
--------------------------------------------------------------------------------
*** /net/stottnfs2.ca.oracle.com/vol/vol1/ade_ottawa_txn/gpelleti/gpelleti_ri_gf1053_060906/ade_storage/000003/AB0952363AC40CBFE034080020E8C54E.47	Fri Sep  8 10:58:52 2006
--- /ade/gpelleti_main/tltest/resource/essentials/ejb30-testing/META-INF/persistence.xml	Mon Sep 11 09:11:41 2006
***************
*** 68,71 ****
--- 68,84 ----
  		<provider>oracle.toplink.essentials.PersistenceProvider</provider>
  		<jta-data-source>jdbc/__default</jta-data-source>
  	</persistence-unit>
+     <persistence-unit name="isolated">
+ 		<provider>oracle.toplink.essentials.PersistenceProvider</provider>
+         <class>oracle.toplink.essentials.testing.models.cmp3.relationships.Item</class>
+ 		<exclude-unlisted-classes>true</exclude-unlisted-classes>
+ 		<properties>
+             <property name="toplink.session-name" value="isolated-session"/>
+ 			<property name="toplink.jdbc.driver" value="TEST_DRIVER_CLASS"/>
+ 			<property name="toplink.jdbc.url" value="TEST_DATABASE_URL"/>
+ 			<property name="toplink.jdbc.user" value="TEST_DATABASE_USER"/>
+ 			<property name="toplink.jdbc.password" value="TEST_DATABASE_PASSWORD"/>
+             <property name="toplink.cache.shared.default" value="false"/>
+ 		</properties>
+ 	</persistence-unit>
  </persistence>
================================================================================
Merge Diffs: /ade/gpelleti_main/tldev/source/essentials/oracle/toplink/essentials/internal/ejb/cmp3/EntityManagerSetupImpl.java vs. /net/stottnfs2.ca.oracle.com/vol/vol1/ade_ottawa_txn/gpelleti/gpelleti_ri_gf1053_060906/ade_storage/000004/AB0952363AC40CBFE034080020E8C54E.76
Report generated at Mon Sep 11 09:11:41 2006
--------------------------------------------------------------------------------
*** /net/stottnfs2.ca.oracle.com/vol/vol1/ade_ottawa_txn/gpelleti/gpelleti_ri_gf1053_060906/ade_storage/000004/AB0952363AC40CBFE034080020E8C54E.76	Fri Sep  8 13:52:40 2006
--- /ade/gpelleti_main/tldev/source/essentials/oracle/toplink/essentials/internal/ejb/cmp3/EntityManagerSetupImpl.java	Mon Sep 11 09:11:41 2006
***************
*** 394,400 ****
              hasDefault = true;
          }
          
!         String defaultSharedString = (String)sharedMap.remove(TopLinkProperties.CACHE_SHARED_DEFAULT);
          Boolean defaultShared = null;
          if(defaultSharedString != null) {
              defaultShared = Boolean.parseBoolean(defaultSharedString);
--- 394,400 ----
              hasDefault = true;
          }
          
!         String defaultSharedString = (String)sharedMap.remove(TopLinkProperties.DEFAULT);
          Boolean defaultShared = null;
          if(defaultSharedString != null) {
              defaultShared = Boolean.parseBoolean(defaultSharedString);
================================================================================
Merge Diffs: /ade/gpelleti_main/tltest/source/entity-persistence-tests/src/java/oracle/toplink/essentials/testing/framework/junit/JUnitTestCase.java vs. /net/stottnfs2.ca.oracle.com/vol/vol1/ade_ottawa_txn/gpelleti/gpelleti_ri_gf1053_060906/ade_storage/000005/AB0952363AC40CBFE034080020E8C54E.20
Report generated at Mon Sep 11 09:11:41 2006
--------------------------------------------------------------------------------
*** /net/stottnfs2.ca.oracle.com/vol/vol1/ade_ottawa_txn/gpelleti/gpelleti_ri_gf1053_060906/ade_storage/000005/AB0952363AC40CBFE034080020E8C54E.20	Fri Sep  8 14:29:34 2006
--- /ade/gpelleti_main/tltest/source/entity-persistence-tests/src/java/oracle/toplink/essentials/testing/framework/junit/JUnitTestCase.java	Mon Sep 11 09:11:41 2006
***************
*** 101,106 ****
--- 101,110 ----
          return getEntityManagerFactory(persistenceUnitName).createEntityManager();       
      }
      
+     public static EntityManager createEntityManager(String persistenceUnitName, Map properties) {
+         return getEntityManagerFactory(persistenceUnitName, properties).createEntityManager();       
+     }
+     
      public static Map getDatabaseProperties(){
          if (propertiesMap == null){
              Properties properties = new Properties();
***************
*** 140,145 ****
--- 144,156 ----
          return emfNamedPersistenceUnit;
      }
      
+     public static EntityManagerFactory getEntityManagerFactory(String persistenceUnitName, Map properties){
+         if (emfNamedPersistenceUnit == null){
+             emfNamedPersistenceUnit = Persistence.createEntityManagerFactory(persistenceUnitName, properties);
+         }
+         return emfNamedPersistenceUnit;
+     }
+     
      public static EntityManagerFactory getEntityManagerFactory(){
          if (emf == null){
              emf = Persistence.createEntityManagerFactory("default", getDatabaseProperties());
================================================================================
Merge Diffs: /ade/gpelleti_main/tltest/source/entity-persistence-tests/src/java/oracle/toplink/essentials/testing/tests/cmp3/validation/ValidationTestSuite.java vs. /net/stottnfs2.ca.oracle.com/vol/vol1/ade_ottawa_txn/gpelleti/gpelleti_ri_gf1053_060906/ade_storage/000002/AB0952363AC40CBFE034080020E8C54E.5
Report generated at Wed Sep 13 11:26:28 2006
--------------------------------------------------------------------------------
*** /net/stottnfs2.ca.oracle.com/vol/vol1/ade_ottawa_txn/gpelleti/gpelleti_ri_gf1053_060906/ade_storage/000002/AB0952363AC40CBFE034080020E8C54E.5	Fri Sep  8 10:40:19 2006
--- /ade/gpelleti_main/tltest/source/entity-persistence-tests/src/java/oracle/toplink/essentials/testing/tests/cmp3/validation/ValidationTestSuite.java	Wed Sep 13 11:26:28 2006
***************
*** 19,39 ****
   * [name of copyright owner]
   */
  // Copyright (c) 1998, 2006, Oracle. All rights reserved.  
- 
- 
  package oracle.toplink.essentials.testing.tests.cmp3.validation;
  
! import java.util.List;
! 
  import junit.framework.Test;
  import junit.framework.TestSuite;
  
  import oracle.toplink.essentials.internal.ejb.cmp3.EntityManagerImpl;
  import oracle.toplink.essentials.testing.framework.junit.JUnitTestCase;
  import oracle.toplink.essentials.testing.models.cmp3.advanced.Employee;
  
  public class ValidationTestSuite extends JUnitTestCase {
-         
      public ValidationTestSuite() {
      }
      
--- 19,39 ----
   * [name of copyright owner]
   */
  // Copyright (c) 1998, 2006, Oracle. All rights reserved.  
  package oracle.toplink.essentials.testing.tests.cmp3.validation;
  
! import java.util.HashMap;
  import junit.framework.Test;
  import junit.framework.TestSuite;
  
+ import java.util.Map;
+ import javax.persistence.*;
+ import oracle.toplink.essentials.config.TopLinkProperties;
+ 
  import oracle.toplink.essentials.internal.ejb.cmp3.EntityManagerImpl;
  import oracle.toplink.essentials.testing.framework.junit.JUnitTestCase;
  import oracle.toplink.essentials.testing.models.cmp3.advanced.Employee;
  
  public class ValidationTestSuite extends JUnitTestCase {
      public ValidationTestSuite() {
      }
      
***************
*** 43,72 ****
      
      public void setUp () {
          super.setUp();
!         clearCache();
      }
      
-     public void testPKClassTypeValidation(){
-         try{
-             createEntityManager().find(Employee.class, new Employee());
-         }catch (IllegalArgumentException ex){
-             return;
-         }
-         fail("Failed to throw expected IllegalArgumentException, when incorrect PKClass is used in find call");
-     }
-     
-    
      public static Test suite() {
          return new TestSuite(ValidationTestSuite.class) {
          
!             protected void setUp(){               
              }
  
              protected void tearDown() {
-                 clearCache();
              }
          };
      }
      
! 
  }
--- 43,98 ----
      
      public void setUp () {
          super.setUp();
!         // Don't clear the cache here since it bring the default pu into play.
      }
      
      public static Test suite() {
          return new TestSuite(ValidationTestSuite.class) {
          
!             protected void setUp(){
              }
  
              protected void tearDown() {
              }
          };
      }
      
!     public void testCacheIsolation_PropertiesDefault_Config() throws Exception {
!         // Be sure not to modify the global properties.
!         Map properties = new HashMap((HashMap) getDatabaseProperties());
!         properties.put(TopLinkProperties.CACHE_SHARED_DEFAULT, Boolean.FALSE.toString());
!         
!         EntityManager em = createEntityManager("isolated1053", properties);
!         assertTrue("Item descriptor did not have an isolated cache setting from a TopLink properties setting.", ((EntityManagerImpl)em).getServerSession().getClassDescriptorForAlias("Item").isIsolated());
!         em.close();
!         
!         // Ensure this is done to avoid consecutive tests picking up our
!         // very specific isolated persistence unit.
!         this.closeEntityManagerFactoryNamedPersistenceUnit();
!     }
!     
!     /**
!      * This test assumes the persistence unit has the following property set:
!      *       <property name="toplink.cache.shared.default" value="false"/>
!      * @throws Exception
!      */
!      
!     public void testCacheIsolation_XMLDefault_Config() throws Exception {
!         EntityManager em = createEntityManager("isolated1053");
!         assertTrue("Item descriptor did not have an isolated cache setting from an XML setting.", ((EntityManagerImpl)em).getServerSession().getClassDescriptorForAlias("Item").isIsolated());
!         em.close();
!         
!         // Ensure this is done to avoid consecutive tests picking up our
!         // very specific isolated persistence unit.
!         this.closeEntityManagerFactoryNamedPersistenceUnit();
!     }
!     
!     public void testPKClassTypeValidation(){
!         try{
!             createEntityManager().find(Employee.class, new Employee());
!         }catch (IllegalArgumentException ex){
!             return;
!         }
!         fail("Failed to throw expected IllegalArgumentException, when incorrect PKClass is used in find call");
!     }
  }
================================================================================
Merge Diffs: /ade/gpelleti_main/tltest/resource/essentials/ejb30-testing/META-INF/persistence.xml vs. /net/stottnfs2.ca.oracle.com/vol/vol1/ade_ottawa_txn/gpelleti/gpelleti_ri_gf1053_060906/ade_storage/000003/AB0952363AC40CBFE034080020E8C54E.47
Report generated at Wed Sep 13 11:26:29 2006
--------------------------------------------------------------------------------
*** /net/stottnfs2.ca.oracle.com/vol/vol1/ade_ottawa_txn/gpelleti/gpelleti_ri_gf1053_060906/ade_storage/000003/AB0952363AC40CBFE034080020E8C54E.47	Fri Sep  8 10:58:52 2006
--- /ade/gpelleti_main/tltest/resource/essentials/ejb30-testing/META-INF/persistence.xml	Wed Sep 13 11:26:28 2006
***************
*** 68,71 ****
--- 68,84 ----
  		<provider>oracle.toplink.essentials.PersistenceProvider</provider>
  		<jta-data-source>jdbc/__default</jta-data-source>
  	</persistence-unit>
+     <persistence-unit name="isolated1053">
+ 		<provider>oracle.toplink.essentials.PersistenceProvider</provider>
+         <class>oracle.toplink.essentials.testing.models.cmp3.relationships.Item</class>
+ 		<exclude-unlisted-classes>true</exclude-unlisted-classes>
+ 		<properties>
+             <property name="toplink.session-name" value="isolated-session1053"/>
+ 			<property name="toplink.jdbc.driver" value="TEST_DRIVER_CLASS"/>
+ 			<property name="toplink.jdbc.url" value="TEST_DATABASE_URL"/>
+ 			<property name="toplink.jdbc.user" value="TEST_DATABASE_USER"/>
+ 			<property name="toplink.jdbc.password" value="TEST_DATABASE_PASSWORD"/>
+             <property name="toplink.cache.shared.default" value="false"/>
+ 		</properties>
+ 	</persistence-unit>
  </persistence>
================================================================================
Merge Diffs: /ade/gpelleti_main/tltest/source/entity-persistence-tests/src/java/oracle/toplink/essentials/testing/framework/junit/JUnitTestCase.java vs. /net/stottnfs2.ca.oracle.com/vol/vol1/ade_ottawa_txn/gpelleti/gpelleti_ri_gf1053_060906/ade_storage/000005/AB0952363AC40CBFE034080020E8C54E.20
Report generated at Wed Sep 13 11:26:29 2006
--------------------------------------------------------------------------------
*** /net/stottnfs2.ca.oracle.com/vol/vol1/ade_ottawa_txn/gpelleti/gpelleti_ri_gf1053_060906/ade_storage/000005/AB0952363AC40CBFE034080020E8C54E.20	Fri Sep  8 14:29:34 2006
--- /ade/gpelleti_main/tltest/source/entity-persistence-tests/src/java/oracle/toplink/essentials/testing/framework/junit/JUnitTestCase.java	Wed Sep 13 11:26:28 2006
***************
*** 101,106 ****
--- 101,110 ----
          return getEntityManagerFactory(persistenceUnitName).createEntityManager();       
      }
      
+     public static EntityManager createEntityManager(String persistenceUnitName, Map properties) {
+         return getEntityManagerFactory(persistenceUnitName, properties).createEntityManager();       
+     }
+     
      public static Map getDatabaseProperties(){
          if (propertiesMap == null){
              Properties properties = new Properties();
***************
*** 140,145 ****
--- 144,156 ----
          return emfNamedPersistenceUnit;
      }
      
+     public static EntityManagerFactory getEntityManagerFactory(String persistenceUnitName, Map properties){
+         if (emfNamedPersistenceUnit == null){
+             emfNamedPersistenceUnit = Persistence.createEntityManagerFactory(persistenceUnitName, properties);
+         }
+         return emfNamedPersistenceUnit;
+     }
+     
      public static EntityManagerFactory getEntityManagerFactory(){
          if (emf == null){
              emf = Persistence.createEntityManagerFactory("default", getDatabaseProperties());
================================================================================
Merge Diffs: /ade/gpelleti_main/tldev/source/essentials/oracle/toplink/essentials/internal/ejb/cmp3/EntityManagerSetupImpl.java vs. /net/stottnfs2.ca.oracle.com/vol/vol1/ade_ottawa_txn/gpelleti/gpelleti_ri_gf1053_060906/ade_storage/000006/AB0952363AC40CBFE034080020E8C54E.77
Report generated at Wed Sep 13 11:26:29 2006
--------------------------------------------------------------------------------
*** /net/stottnfs2.ca.oracle.com/vol/vol1/ade_ottawa_txn/gpelleti/gpelleti_ri_gf1053_060906/ade_storage/000006/AB0952363AC40CBFE034080020E8C54E.77	Wed Sep 13 11:24:14 2006
--- /ade/gpelleti_main/tldev/source/essentials/oracle/toplink/essentials/internal/ejb/cmp3/EntityManagerSetupImpl.java	Wed Sep 13 11:26:28 2006
***************
*** 374,380 ****
              hasDefault = true;
          }
          
!         String defaultSharedString = (String)sharedMap.remove(TopLinkProperties.CACHE_SHARED_DEFAULT);
          Boolean defaultShared = null;
          if(defaultSharedString != null) {
              defaultShared = Boolean.parseBoolean(defaultSharedString);
--- 374,380 ----
              hasDefault = true;
          }
          
!         String defaultSharedString = (String)sharedMap.remove(TopLinkProperties.DEFAULT);
          Boolean defaultShared = null;
          if(defaultSharedString != null) {
              defaultShared = Boolean.parseBoolean(defaultSharedString);
================================================================================
Merge Diffs: /ade/gpelleti_main/tltest/source/entity-persistence-tests/src/java/oracle/toplink/essentials/testing/tests/cmp3/validation/ValidationTestSuite.java vs. /net/stottnfs2.ca.oracle.com/vol/vol1/ade_ottawa_txn/gpelleti/gpelleti_ri_gf1053_060906/ade_storage/000002/AB0952363AC40CBFE034080020E8C54E.5
Report generated at Wed Sep 13 11:41:20 2006
--------------------------------------------------------------------------------
*** /net/stottnfs2.ca.oracle.com/vol/vol1/ade_ottawa_txn/gpelleti/gpelleti_ri_gf1053_060906/ade_storage/000002/AB0952363AC40CBFE034080020E8C54E.5	Fri Sep  8 10:40:19 2006
--- /ade/gpelleti_main/tltest/source/entity-persistence-tests/src/java/oracle/toplink/essentials/testing/tests/cmp3/validation/ValidationTestSuite.java	Wed Sep 13 11:26:28 2006
***************
*** 19,39 ****
   * [name of copyright owner]
   */
  // Copyright (c) 1998, 2006, Oracle. All rights reserved.  
- 
- 
  package oracle.toplink.essentials.testing.tests.cmp3.validation;
  
! import java.util.List;
! 
  import junit.framework.Test;
  import junit.framework.TestSuite;
  
  import oracle.toplink.essentials.internal.ejb.cmp3.EntityManagerImpl;
  import oracle.toplink.essentials.testing.framework.junit.JUnitTestCase;
  import oracle.toplink.essentials.testing.models.cmp3.advanced.Employee;
  
  public class ValidationTestSuite extends JUnitTestCase {
-         
      public ValidationTestSuite() {
      }
      
--- 19,39 ----
   * [name of copyright owner]
   */
  // Copyright (c) 1998, 2006, Oracle. All rights reserved.  
  package oracle.toplink.essentials.testing.tests.cmp3.validation;
  
! import java.util.HashMap;
  import junit.framework.Test;
  import junit.framework.TestSuite;
  
+ import java.util.Map;
+ import javax.persistence.*;
+ import oracle.toplink.essentials.config.TopLinkProperties;
+ 
  import oracle.toplink.essentials.internal.ejb.cmp3.EntityManagerImpl;
  import oracle.toplink.essentials.testing.framework.junit.JUnitTestCase;
  import oracle.toplink.essentials.testing.models.cmp3.advanced.Employee;
  
  public class ValidationTestSuite extends JUnitTestCase {
      public ValidationTestSuite() {
      }
      
***************
*** 43,72 ****
      
      public void setUp () {
          super.setUp();
!         clearCache();
      }
      
-     public void testPKClassTypeValidation(){
-         try{
-             createEntityManager().find(Employee.class, new Employee());
-         }catch (IllegalArgumentException ex){
-             return;
-         }
-         fail("Failed to throw expected IllegalArgumentException, when incorrect PKClass is used in find call");
-     }
-     
-    
      public static Test suite() {
          return new TestSuite(ValidationTestSuite.class) {
          
!             protected void setUp(){               
              }
  
              protected void tearDown() {
-                 clearCache();
              }
          };
      }
      
! 
  }
--- 43,98 ----
      
      public void setUp () {
          super.setUp();
!         // Don't clear the cache here since it bring the default pu into play.
      }
      
      public static Test suite() {
          return new TestSuite(ValidationTestSuite.class) {
          
!             protected void setUp(){
              }
  
              protected void tearDown() {
              }
          };
      }
      
!     public void testCacheIsolation_PropertiesDefault_Config() throws Exception {
!         // Be sure not to modify the global properties.
!         Map properties = new HashMap((HashMap) getDatabaseProperties());
!         properties.put(TopLinkProperties.CACHE_SHARED_DEFAULT, Boolean.FALSE.toString());
!         
!         EntityManager em = createEntityManager("isolated1053", properties);
!         assertTrue("Item descriptor did not have an isolated cache setting from a TopLink properties setting.", ((EntityManagerImpl)em).getServerSession().getClassDescriptorForAlias("Item").isIsolated());
!         em.close();
!         
!         // Ensure this is done to avoid consecutive tests picking up our
!         // very specific isolated persistence unit.
!         this.closeEntityManagerFactoryNamedPersistenceUnit();
!     }
!     
!     /**
!      * This test assumes the persistence unit has the following property set:
!      *       <property name="toplink.cache.shared.default" value="false"/>
!      * @throws Exception
!      */
!      
!     public void testCacheIsolation_XMLDefault_Config() throws Exception {
!         EntityManager em = createEntityManager("isolated1053");
!         assertTrue("Item descriptor did not have an isolated cache setting from an XML setting.", ((EntityManagerImpl)em).getServerSession().getClassDescriptorForAlias("Item").isIsolated());
!         em.close();
!         
!         // Ensure this is done to avoid consecutive tests picking up our
!         // very specific isolated persistence unit.
!         this.closeEntityManagerFactoryNamedPersistenceUnit();
!     }
!     
!     public void testPKClassTypeValidation(){
!         try{
!             createEntityManager().find(Employee.class, new Employee());
!         }catch (IllegalArgumentException ex){
!             return;
!         }
!         fail("Failed to throw expected IllegalArgumentException, when incorrect PKClass is used in find call");
!     }
  }
================================================================================
Merge Diffs: /ade/gpelleti_main/tltest/resource/essentials/ejb30-testing/META-INF/persistence.xml vs. /net/stottnfs2.ca.oracle.com/vol/vol1/ade_ottawa_txn/gpelleti/gpelleti_ri_gf1053_060906/ade_storage/000003/AB0952363AC40CBFE034080020E8C54E.47
Report generated at Wed Sep 13 11:41:20 2006
--------------------------------------------------------------------------------
*** /net/stottnfs2.ca.oracle.com/vol/vol1/ade_ottawa_txn/gpelleti/gpelleti_ri_gf1053_060906/ade_storage/000003/AB0952363AC40CBFE034080020E8C54E.47	Fri Sep  8 10:58:52 2006
--- /ade/gpelleti_main/tltest/resource/essentials/ejb30-testing/META-INF/persistence.xml	Wed Sep 13 11:26:28 2006
***************
*** 68,71 ****
--- 68,84 ----
  		<provider>oracle.toplink.essentials.PersistenceProvider</provider>
  		<jta-data-source>jdbc/__default</jta-data-source>
  	</persistence-unit>
+     <persistence-unit name="isolated1053">
+ 		<provider>oracle.toplink.essentials.PersistenceProvider</provider>
+         <class>oracle.toplink.essentials.testing.models.cmp3.relationships.Item</class>
+ 		<exclude-unlisted-classes>true</exclude-unlisted-classes>
+ 		<properties>
+             <property name="toplink.session-name" value="isolated-session1053"/>
+ 			<property name="toplink.jdbc.driver" value="TEST_DRIVER_CLASS"/>
+ 			<property name="toplink.jdbc.url" value="TEST_DATABASE_URL"/>
+ 			<property name="toplink.jdbc.user" value="TEST_DATABASE_USER"/>
+ 			<property name="toplink.jdbc.password" value="TEST_DATABASE_PASSWORD"/>
+             <property name="toplink.cache.shared.default" value="false"/>
+ 		</properties>
+ 	</persistence-unit>
  </persistence>
================================================================================
Merge Diffs: /ade/gpelleti_main/tltest/source/entity-persistence-tests/src/java/oracle/toplink/essentials/testing/framework/junit/JUnitTestCase.java vs. /net/stottnfs2.ca.oracle.com/vol/vol1/ade_ottawa_txn/gpelleti/gpelleti_ri_gf1053_060906/ade_storage/000005/AB0952363AC40CBFE034080020E8C54E.20
Report generated at Wed Sep 13 11:41:20 2006
--------------------------------------------------------------------------------
*** /net/stottnfs2.ca.oracle.com/vol/vol1/ade_ottawa_txn/gpelleti/gpelleti_ri_gf1053_060906/ade_storage/000005/AB0952363AC40CBFE034080020E8C54E.20	Fri Sep  8 14:29:34 2006
--- /ade/gpelleti_main/tltest/source/entity-persistence-tests/src/java/oracle/toplink/essentials/testing/framework/junit/JUnitTestCase.java	Wed Sep 13 11:26:28 2006
***************
*** 101,106 ****
--- 101,110 ----
          return getEntityManagerFactory(persistenceUnitName).createEntityManager();       
      }
      
+     public static EntityManager createEntityManager(String persistenceUnitName, Map properties) {
+         return getEntityManagerFactory(persistenceUnitName, properties).createEntityManager();       
+     }
+     
      public static Map getDatabaseProperties(){
          if (propertiesMap == null){
              Properties properties = new Properties();
***************
*** 140,145 ****
--- 144,156 ----
          return emfNamedPersistenceUnit;
      }
      
+     public static EntityManagerFactory getEntityManagerFactory(String persistenceUnitName, Map properties){
+         if (emfNamedPersistenceUnit == null){
+             emfNamedPersistenceUnit = Persistence.createEntityManagerFactory(persistenceUnitName, properties);
+         }
+         return emfNamedPersistenceUnit;
+     }
+     
      public static EntityManagerFactory getEntityManagerFactory(){
          if (emf == null){
              emf = Persistence.createEntityManagerFactory("default", getDatabaseProperties());
================================================================================
Merge Diffs: /ade/gpelleti_main/tldev/source/essentials/oracle/toplink/essentials/internal/ejb/cmp3/EntityManagerSetupImpl.java vs. /net/stottnfs2.ca.oracle.com/vol/vol1/ade_ottawa_txn/gpelleti/gpelleti_ri_gf1053_060906/ade_storage/000006/AB0952363AC40CBFE034080020E8C54E.77
Report generated at Wed Sep 13 11:41:20 2006
--------------------------------------------------------------------------------
*** /net/stottnfs2.ca.oracle.com/vol/vol1/ade_ottawa_txn/gpelleti/gpelleti_ri_gf1053_060906/ade_storage/000006/AB0952363AC40CBFE034080020E8C54E.77	Wed Sep 13 11:24:14 2006
--- /ade/gpelleti_main/tldev/source/essentials/oracle/toplink/essentials/internal/ejb/cmp3/EntityManagerSetupImpl.java	Wed Sep 13 11:26:28 2006
***************
*** 374,380 ****
              hasDefault = true;
          }
          
!         String defaultSharedString = (String)sharedMap.remove(TopLinkProperties.CACHE_SHARED_DEFAULT);
          Boolean defaultShared = null;
          if(defaultSharedString != null) {
              defaultShared = Boolean.parseBoolean(defaultSharedString);
--- 374,380 ----
              hasDefault = true;
          }
          
!         String defaultSharedString = (String)sharedMap.remove(TopLinkProperties.DEFAULT);
          Boolean defaultShared = null;
          if(defaultSharedString != null) {
              defaultShared = Boolean.parseBoolean(defaultSharedString);