================================================================================
Merge Diffs: /ade/tware_toplink10i/tldev/source/essentials/oracle/toplink/essentials/internal/ejb/cmp3/base/EntityManagerFactoryImpl.java vs. /net/ottnfs1.ca.oracle.com/vol/vol1/ade_ottawa_txn/tware/tware_10essentials_gf610_ddl_generation_060426/ade_storage/000001/AB0952363AC40CBFE034080020E8C54E.12
Report generated at Thu Apr 27 11:11:01 2006
--------------------------------------------------------------------------------
*** /ade/tware_toplink10i/tldev/source/essentials/oracle/toplink/essentials/internal/ejb/cmp3/base/EntityManagerFactoryImpl.java	Thu Apr 27 11:11:01 2006
--- /net/ottnfs1.ca.oracle.com/vol/vol1/ade_ottawa_txn/tware/tware_10essentials_gf610_ddl_generation_060426/ade_storage/000001/AB0952363AC40CBFE034080020E8C54E.12	Wed Apr 26 16:22:25 2006
***************
*** 125,132 ****
  	            this.serverSession.logout();
  	        }
  	        SessionManager.getManager().getSessions().remove(serverSession.getName());
-         } else if (setupImpl != null && setupImpl.getDeployedSessionName() != null){
-             SessionManager.getManager().getSessions().remove(setupImpl.getDeployedSessionName());
          }
      }
  
--- 125,130 ----
================================================================================
Merge Diffs: /ade/tware_toplink10i/tldev/source/essentials/oracle/toplink/essentials/ejb/cmp3/EntityManagerFactoryProvider.java vs. /net/ottnfs1.ca.oracle.com/vol/vol1/ade_ottawa_txn/tware/tware_10essentials_gf610_ddl_generation_060426/ade_storage/000002/AB0952363AC40CBFE034080020E8C54E.40
Report generated at Thu Apr 27 11:11:01 2006
--------------------------------------------------------------------------------
*** /ade/tware_toplink10i/tldev/source/essentials/oracle/toplink/essentials/ejb/cmp3/EntityManagerFactoryProvider.java	Thu Apr 27 11:11:01 2006
--- /net/ottnfs1.ca.oracle.com/vol/vol1/ade_ottawa_txn/tware/tware_10essentials_gf610_ddl_generation_060426/ade_storage/000002/AB0952363AC40CBFE034080020E8C54E.40	Wed Apr 26 16:24:52 2006
***************
*** 112,124 ****
          ServerSession session = getServerSession(name, nonNullProperties);
          if (session != null){
              try {
- 
-                 boolean validationOnly = ((String)getConfigPropertyAsString(TOPLINK_VALIDATION_ONLY_PROPERTY, nonNullProperties, "false")).equalsIgnoreCase("true");
                  EntityManagerFactory emf = new EntityManagerFactoryImpl(session);
!                 if (!validationOnly){
!                     login(session, getPersistenceUnitProperties(name, nonNullProperties));
!                     generateDDLFiles(session, getPersistenceUnitProperties(name, nonNullProperties), true);
!                 }
                  return emf;
              } catch (oracle.toplink.essentials.exceptions.ValidationException e)  {
                  throw new javax.persistence.PersistenceException(e);
--- 112,120 ----
          ServerSession session = getServerSession(name, nonNullProperties);
          if (session != null){
              try {
                  EntityManagerFactory emf = new EntityManagerFactoryImpl(session);
!                 login(session, getPersistenceUnitProperties(name, nonNullProperties));
!                 generateDDLFiles(session, getPersistenceUnitProperties(name, nonNullProperties), true);
                  return emf;
              } catch (oracle.toplink.essentials.exceptions.ValidationException e)  {
                  throw new javax.persistence.PersistenceException(e);
***************
*** 150,159 ****
          // When the factory is actually accessed, the emSetupImpl will be used to complete the session construction
          EntityManagerFactoryImpl factory = new EntityManagerFactoryImpl(emSetupImpl, mergedProperties);
  
-         String ddlGeneration = (String)getConfigPropertyAsString(DDL_GENERATION, mergedProperties, NONE);
-         
          // This code has been added to allow validation to occur without actually calling createEntityManager
!         if (validationOnly || !ddlGeneration.equalsIgnoreCase(NONE)){
          	factory.getServerSession();
          }
          return factory;
--- 146,153 ----
          // When the factory is actually accessed, the emSetupImpl will be used to complete the session construction
          EntityManagerFactoryImpl factory = new EntityManagerFactoryImpl(emSetupImpl, mergedProperties);
  
          // This code has been added to allow validation to occur without actually calling createEntityManager
!         if (validationOnly){
          	factory.getServerSession();
          }
          return factory;
================================================================================
Merge Diffs: /ade/tware_toplink10i/tldev/source/essentials/oracle/toplink/essentials/internal/ejb/cmp3/base/EntityManagerFactoryImpl.java vs. /net/ottnfs1.ca.oracle.com/vol/vol1/ade_ottawa_txn/tware/tware_10essentials_gf610_ddl_generation_060426/ade_storage/000001/AB0952363AC40CBFE034080020E8C54E.12
Report generated at Thu Apr 27 11:30:54 2006
--------------------------------------------------------------------------------
*** /ade/tware_toplink10i/tldev/source/essentials/oracle/toplink/essentials/internal/ejb/cmp3/base/EntityManagerFactoryImpl.java	Thu Apr 27 11:11:01 2006
--- /net/ottnfs1.ca.oracle.com/vol/vol1/ade_ottawa_txn/tware/tware_10essentials_gf610_ddl_generation_060426/ade_storage/000001/AB0952363AC40CBFE034080020E8C54E.12	Wed Apr 26 16:22:25 2006
***************
*** 125,132 ****
  	            this.serverSession.logout();
  	        }
  	        SessionManager.getManager().getSessions().remove(serverSession.getName());
-         } else if (setupImpl != null && setupImpl.getDeployedSessionName() != null){
-             SessionManager.getManager().getSessions().remove(setupImpl.getDeployedSessionName());
          }
      }
  
--- 125,130 ----
================================================================================
Merge Diffs: /ade/tware_toplink10i/tldev/source/essentials/oracle/toplink/essentials/ejb/cmp3/EntityManagerFactoryProvider.java vs. /net/ottnfs1.ca.oracle.com/vol/vol1/ade_ottawa_txn/tware/tware_10essentials_gf610_ddl_generation_060426/ade_storage/000002/AB0952363AC40CBFE034080020E8C54E.40
Report generated at Thu Apr 27 11:30:54 2006
--------------------------------------------------------------------------------
*** /ade/tware_toplink10i/tldev/source/essentials/oracle/toplink/essentials/ejb/cmp3/EntityManagerFactoryProvider.java	Thu Apr 27 11:11:01 2006
--- /net/ottnfs1.ca.oracle.com/vol/vol1/ade_ottawa_txn/tware/tware_10essentials_gf610_ddl_generation_060426/ade_storage/000002/AB0952363AC40CBFE034080020E8C54E.40	Wed Apr 26 16:24:52 2006
***************
*** 112,124 ****
          ServerSession session = getServerSession(name, nonNullProperties);
          if (session != null){
              try {
- 
-                 boolean validationOnly = ((String)getConfigPropertyAsString(TOPLINK_VALIDATION_ONLY_PROPERTY, nonNullProperties, "false")).equalsIgnoreCase("true");
                  EntityManagerFactory emf = new EntityManagerFactoryImpl(session);
!                 if (!validationOnly){
!                     login(session, getPersistenceUnitProperties(name, nonNullProperties));
!                     generateDDLFiles(session, getPersistenceUnitProperties(name, nonNullProperties), true);
!                 }
                  return emf;
              } catch (oracle.toplink.essentials.exceptions.ValidationException e)  {
                  throw new javax.persistence.PersistenceException(e);
--- 112,120 ----
          ServerSession session = getServerSession(name, nonNullProperties);
          if (session != null){
              try {
                  EntityManagerFactory emf = new EntityManagerFactoryImpl(session);
!                 login(session, getPersistenceUnitProperties(name, nonNullProperties));
!                 generateDDLFiles(session, getPersistenceUnitProperties(name, nonNullProperties), true);
                  return emf;
              } catch (oracle.toplink.essentials.exceptions.ValidationException e)  {
                  throw new javax.persistence.PersistenceException(e);
***************
*** 150,159 ****
          // When the factory is actually accessed, the emSetupImpl will be used to complete the session construction
          EntityManagerFactoryImpl factory = new EntityManagerFactoryImpl(emSetupImpl, mergedProperties);
  
-         String ddlGeneration = (String)getConfigPropertyAsString(DDL_GENERATION, mergedProperties, NONE);
-         
          // This code has been added to allow validation to occur without actually calling createEntityManager
!         if (validationOnly || !ddlGeneration.equalsIgnoreCase(NONE)){
          	factory.getServerSession();
          }
          return factory;
--- 146,153 ----
          // When the factory is actually accessed, the emSetupImpl will be used to complete the session construction
          EntityManagerFactoryImpl factory = new EntityManagerFactoryImpl(emSetupImpl, mergedProperties);
  
          // This code has been added to allow validation to occur without actually calling createEntityManager
!         if (validationOnly){
          	factory.getServerSession();
          }
          return factory;