================================================================================
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_5376828_060707/ade_storage/000001/AB0952363AC40CBFE034080020E8C54E.73
Report generated at Fri Jul  7 14:34:50 2006
--------------------------------------------------------------------------------
*** /ade/gpelleti_main/tldev/source/essentials/oracle/toplink/essentials/internal/ejb/cmp3/EntityManagerSetupImpl.java	Fri Jul  7 14:34:50 2006
--- /net/stottnfs2.ca.oracle.com/vol/vol1/ade_ottawa_txn/gpelleti/gpelleti_ri_5376828_060707/ade_storage/000001/AB0952363AC40CBFE034080020E8C54E.73	Fri Jul  7 13:49:31 2006
***************
*** 61,67 ****
  import oracle.toplink.essentials.internal.ejb.cmp3.jdbc.base.DataSourceImpl;
  import oracle.toplink.essentials.tools.sessionconfiguration.DescriptorCustomizer;
  import oracle.toplink.essentials.tools.sessionconfiguration.SessionCustomizer;
- import oracle.toplink.essentials.internal.security.SecurableObjectHolder;
  
  /**
   * INTERNAL:
--- 61,66 ----
***************
*** 77,83 ****
      protected boolean isInContainerMode = false;
      // indicates whether weaving was used on the first run through predeploy (in STATE_INITIAL)
      protected boolean enableLazyForOneToOne = false;
-     protected SecurableObjectHolder securableObjectHolder = new SecurableObjectHolder();
      
  	public static final String STATE_INITIAL        = "Initial";
  	public static final String STATE_PREDEPLOYED    = "Predeployed";
--- 76,81 ----
***************
*** 669,675 ****
              login.setUserName(user);
          }
          if(password != null) {
!             login.setPassword(securableObjectHolder.getSecurableObject().decryptPassword(password));
          }
  
          String toplinkPlatform = (String)PropertiesHandler.getPropertyValueLogDebug(TopLinkProperties.TARGET_DATABASE, m, session);
--- 667,673 ----
              login.setUserName(user);
          }
          if(password != null) {
!             login.setPassword(password);
          }
  
          String toplinkPlatform = (String)PropertiesHandler.getPropertyValueLogDebug(TopLinkProperties.TARGET_DATABASE, m, session);
================================================================================
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_5376828_060707/ade_storage/000001/AB0952363AC40CBFE034080020E8C54E.73
Report generated at Fri Jul  7 14:42:59 2006
--------------------------------------------------------------------------------
*** /ade/gpelleti_main/tldev/source/essentials/oracle/toplink/essentials/internal/ejb/cmp3/EntityManagerSetupImpl.java	Fri Jul  7 14:34:50 2006
--- /net/stottnfs2.ca.oracle.com/vol/vol1/ade_ottawa_txn/gpelleti/gpelleti_ri_5376828_060707/ade_storage/000001/AB0952363AC40CBFE034080020E8C54E.73	Fri Jul  7 13:49:31 2006
***************
*** 61,67 ****
  import oracle.toplink.essentials.internal.ejb.cmp3.jdbc.base.DataSourceImpl;
  import oracle.toplink.essentials.tools.sessionconfiguration.DescriptorCustomizer;
  import oracle.toplink.essentials.tools.sessionconfiguration.SessionCustomizer;
- import oracle.toplink.essentials.internal.security.SecurableObjectHolder;
  
  /**
   * INTERNAL:
--- 61,66 ----
***************
*** 77,83 ****
      protected boolean isInContainerMode = false;
      // indicates whether weaving was used on the first run through predeploy (in STATE_INITIAL)
      protected boolean enableLazyForOneToOne = false;
-     protected SecurableObjectHolder securableObjectHolder = new SecurableObjectHolder();
      
  	public static final String STATE_INITIAL        = "Initial";
  	public static final String STATE_PREDEPLOYED    = "Predeployed";
--- 76,81 ----
***************
*** 669,675 ****
              login.setUserName(user);
          }
          if(password != null) {
!             login.setPassword(securableObjectHolder.getSecurableObject().decryptPassword(password));
          }
  
          String toplinkPlatform = (String)PropertiesHandler.getPropertyValueLogDebug(TopLinkProperties.TARGET_DATABASE, m, session);
--- 667,673 ----
              login.setUserName(user);
          }
          if(password != null) {
!             login.setPassword(password);
          }
  
          String toplinkPlatform = (String)PropertiesHandler.getPropertyValueLogDebug(TopLinkProperties.TARGET_DATABASE, m, session);