================================================================================
Merge Diffs: /ade/ailitche_toplink_main/tltest/resource/essentials/ejb30-testing/META-INF/persistence.xml vs. /net/stottnfs2.ca.oracle.com/vol/vol1/ade_ottawa_txn/ailitche/ailitche_ri_5389828_060726/ade_storage/000001/AB0952363AC40CBFE034080020E8C54E.46
Report generated at Wed Jul 26 11:04:53 2006
--------------------------------------------------------------------------------
*** /ade/ailitche_toplink_main/tltest/resource/essentials/ejb30-testing/META-INF/persistence.xml	Wed Jul 26 11:04:53 2006
--- /net/stottnfs2.ca.oracle.com/vol/vol1/ade_ottawa_txn/ailitche/ailitche_ri_5389828_060726/ade_storage/000001/AB0952363AC40CBFE034080020E8C54E.46	Wed Jul 26 10:13:05 2006
***************
*** 41,47 ****
  			<property name="toplink.descriptor.customizer.Employee" value="oracle.toplink.essentials.testing.models.cmp3.advanced.Customizer"/>
  			<property name="toplink.descriptor.customizer.oracle.toplink.essentials.testing.models.cmp3.advanced.Address" value="oracle.toplink.essentials.testing.models.cmp3.advanced.Customizer"/>
  			<!--property name="toplink.logging.level" value="FINEST"/-->
- 			<property name="toplink.logging.timestamp" value="false"/>
  			<property name="toplink.orm.throw.exceptions" value="true"/>
  		</properties>
  	</persistence-unit>
--- 41,46 ----
================================================================================
Merge Diffs: /ade/ailitche_toplink_main/tldev/source/essentials/oracle/toplink/essentials/ejb/cmp3/EntityManagerFactoryProvider.java vs. /net/stottnfs2.ca.oracle.com/vol/vol1/ade_ottawa_txn/ailitche/ailitche_ri_5389828_060726/ade_storage/000002/AB0952363AC40CBFE034080020E8C54E.47
Report generated at Wed Jul 26 11:04:53 2006
--------------------------------------------------------------------------------
*** /ade/ailitche_toplink_main/tldev/source/essentials/oracle/toplink/essentials/ejb/cmp3/EntityManagerFactoryProvider.java	Wed Jul 26 11:04:53 2006
--- /net/stottnfs2.ca.oracle.com/vol/vol1/ade_ottawa_txn/ailitche/ailitche_ri_5389828_060726/ade_storage/000002/AB0952363AC40CBFE034080020E8C54E.47	Wed Jul 26 10:28:58 2006
***************
*** 290,296 ****
          if (value == null){
              value = System.getProperty(propertyKey);
          }
!         if(value != null && session !=  null) {
              session.log(SessionLog.FINEST, SessionLog.PROPERTIES, "property_value_specified", new Object[]{propertyKey, value});
          }
          
--- 290,296 ----
          if (value == null){
              value = System.getProperty(propertyKey);
          }
!         if(value != null) {
              session.log(SessionLog.FINEST, SessionLog.PROPERTIES, "property_value_specified", new Object[]{propertyKey, value});
          }
          
================================================================================
Merge Diffs: /ade/ailitche_toplink_main/tltest/resource/essentials/ejb30-testing/META-INF/persistence.xml vs. /net/stottnfs2.ca.oracle.com/vol/vol1/ade_ottawa_txn/ailitche/ailitche_ri_5389828_060726/ade_storage/000001/AB0952363AC40CBFE034080020E8C54E.46
Report generated at Wed Jul 26 11:05:52 2006
--------------------------------------------------------------------------------
*** /ade/ailitche_toplink_main/tltest/resource/essentials/ejb30-testing/META-INF/persistence.xml	Wed Jul 26 11:04:53 2006
--- /net/stottnfs2.ca.oracle.com/vol/vol1/ade_ottawa_txn/ailitche/ailitche_ri_5389828_060726/ade_storage/000001/AB0952363AC40CBFE034080020E8C54E.46	Wed Jul 26 10:13:05 2006
***************
*** 41,47 ****
  			<property name="toplink.descriptor.customizer.Employee" value="oracle.toplink.essentials.testing.models.cmp3.advanced.Customizer"/>
  			<property name="toplink.descriptor.customizer.oracle.toplink.essentials.testing.models.cmp3.advanced.Address" value="oracle.toplink.essentials.testing.models.cmp3.advanced.Customizer"/>
  			<!--property name="toplink.logging.level" value="FINEST"/-->
- 			<property name="toplink.logging.timestamp" value="false"/>
  			<property name="toplink.orm.throw.exceptions" value="true"/>
  		</properties>
  	</persistence-unit>
--- 41,46 ----
================================================================================
Merge Diffs: /ade/ailitche_toplink_main/tldev/source/essentials/oracle/toplink/essentials/ejb/cmp3/EntityManagerFactoryProvider.java vs. /net/stottnfs2.ca.oracle.com/vol/vol1/ade_ottawa_txn/ailitche/ailitche_ri_5389828_060726/ade_storage/000002/AB0952363AC40CBFE034080020E8C54E.47
Report generated at Wed Jul 26 11:05:52 2006
--------------------------------------------------------------------------------
*** /ade/ailitche_toplink_main/tldev/source/essentials/oracle/toplink/essentials/ejb/cmp3/EntityManagerFactoryProvider.java	Wed Jul 26 11:04:53 2006
--- /net/stottnfs2.ca.oracle.com/vol/vol1/ade_ottawa_txn/ailitche/ailitche_ri_5389828_060726/ade_storage/000002/AB0952363AC40CBFE034080020E8C54E.47	Wed Jul 26 10:28:58 2006
***************
*** 290,296 ****
          if (value == null){
              value = System.getProperty(propertyKey);
          }
!         if(value != null && session !=  null) {
              session.log(SessionLog.FINEST, SessionLog.PROPERTIES, "property_value_specified", new Object[]{propertyKey, value});
          }
          
--- 290,296 ----
          if (value == null){
              value = System.getProperty(propertyKey);
          }
!         if(value != null) {
              session.log(SessionLog.FINEST, SessionLog.PROPERTIES, "property_value_specified", new Object[]{propertyKey, value});
          }