================================================================================
Merge Diffs: /ade/ailitche_toplink_main/tldev/source/essentials/oracle/toplink/essentials/exceptions/i18n/EntityManagerSetupExceptionResource.java vs. /net/stottnfs2.ca.oracle.com/vol/vol1/ade_ottawa_txn/ailitche/ailitche_ri_gf1017_060824/ade_storage/000001/AB0952363AC40CBFE034080020E8C54E.12
Report generated at Thu Aug 24 16:12:39 2006
--------------------------------------------------------------------------------
*** /net/stottnfs2.ca.oracle.com/vol/vol1/ade_ottawa_txn/ailitche/ailitche_ri_gf1017_060824/ade_storage/000001/AB0952363AC40CBFE034080020E8C54E.12	Thu Aug 24 16:03:15 2006
--- /ade/ailitche_toplink_main/tldev/source/essentials/oracle/toplink/essentials/exceptions/i18n/EntityManagerSetupExceptionResource.java	Thu Aug 24 16:12:38 2006
***************
*** 44,50 ****
                                             { "28011", "The session, [{0}], built for a persistence unit was not available at the time it was deployed.  This means that somehow the session was removed from the container in the middle of the deployment process." },
                                             { "28012", "Value [{0}] is of incorrect type for property [{2}], value type should be [{1}]." },
                                             { "28013", "Attempted to deploy PersistenceUnit [{0}] for which predeploy method either had not called or had failed" },
!                                            { "28014", "Exception was thrown while processing property [{0}] with value {[1}]." }
     };
  
      /**
--- 44,50 ----
                                             { "28011", "The session, [{0}], built for a persistence unit was not available at the time it was deployed.  This means that somehow the session was removed from the container in the middle of the deployment process." },
                                             { "28012", "Value [{0}] is of incorrect type for property [{2}], value type should be [{1}]." },
                                             { "28013", "Attempted to deploy PersistenceUnit [{0}] for which predeploy method either had not called or had failed" },
!                                            { "28014", "Exception was thrown while processing property [{0}] with value [{1}]." }
     };
  
      /**
================================================================================
Merge Diffs: /ade/ailitche_toplink_main/tldev/source/essentials/oracle/toplink/essentials/exceptions/i18n/ExceptionResource.java vs. /net/stottnfs2.ca.oracle.com/vol/vol1/ade_ottawa_txn/ailitche/ailitche_ri_gf1017_060824/ade_storage/000002/AB0952363AC40CBFE034080020E8C54E.4
Report generated at Thu Aug 24 16:12:39 2006
--------------------------------------------------------------------------------
*** /net/stottnfs2.ca.oracle.com/vol/vol1/ade_ottawa_txn/ailitche/ailitche_ri_gf1017_060824/ade_storage/000002/AB0952363AC40CBFE034080020E8C54E.4	Thu Aug 24 16:03:33 2006
--- /ade/ailitche_toplink_main/tldev/source/essentials/oracle/toplink/essentials/exceptions/i18n/ExceptionResource.java	Thu Aug 24 16:12:39 2006
***************
*** 18,24 ****
   * own identifying information: Portions Copyright [yyyy] 
   * [name of copyright owner]
   */
! // Copyright (c) 1998, 2005, Oracle. All rights reserved.  
  package oracle.toplink.essentials.exceptions.i18n;
  
  
--- 18,24 ----
   * own identifying information: Portions Copyright [yyyy] 
   * [name of copyright owner]
   */
! // Copyright (c) 1998, 2006, Oracle. All rights reserved.  
  package oracle.toplink.essentials.exceptions.i18n;
  
  
***************
*** 44,50 ****
                                             { "DescriptorHeader", "Descriptor: " },
                                             { "QueryHeader", "Query: " },
                                             { "DescriptorExceptionsHeader", "Descriptor Exceptions: " },
!                                            { "RuntimeExceptionsHeader", "Runtime Exceptions: " }
      };
  
      /**
--- 44,51 ----
                                             { "DescriptorHeader", "Descriptor: " },
                                             { "QueryHeader", "Query: " },
                                             { "DescriptorExceptionsHeader", "Descriptor Exceptions: " },
!                                            { "RuntimeExceptionsHeader", "Runtime Exceptions: " },
!                                            { "ErrorFormattingMessage", "Error in message format: {0} Arguments: {1}" }
      };
  
      /**
================================================================================
Merge Diffs: /ade/ailitche_toplink_main/tldev/source/essentials/oracle/toplink/essentials/exceptions/i18n/EntityManagerSetupExceptionResource.java vs. /net/stottnfs2.ca.oracle.com/vol/vol1/ade_ottawa_txn/ailitche/ailitche_ri_gf1017_060824/ade_storage/000001/AB0952363AC40CBFE034080020E8C54E.12
Report generated at Thu Aug 24 16:13:04 2006
--------------------------------------------------------------------------------
*** /net/stottnfs2.ca.oracle.com/vol/vol1/ade_ottawa_txn/ailitche/ailitche_ri_gf1017_060824/ade_storage/000001/AB0952363AC40CBFE034080020E8C54E.12	Thu Aug 24 16:03:15 2006
--- /ade/ailitche_toplink_main/tldev/source/essentials/oracle/toplink/essentials/exceptions/i18n/EntityManagerSetupExceptionResource.java	Thu Aug 24 16:12:38 2006
***************
*** 44,50 ****
                                             { "28011", "The session, [{0}], built for a persistence unit was not available at the time it was deployed.  This means that somehow the session was removed from the container in the middle of the deployment process." },
                                             { "28012", "Value [{0}] is of incorrect type for property [{2}], value type should be [{1}]." },
                                             { "28013", "Attempted to deploy PersistenceUnit [{0}] for which predeploy method either had not called or had failed" },
!                                            { "28014", "Exception was thrown while processing property [{0}] with value {[1}]." }
     };
  
      /**
--- 44,50 ----
                                             { "28011", "The session, [{0}], built for a persistence unit was not available at the time it was deployed.  This means that somehow the session was removed from the container in the middle of the deployment process." },
                                             { "28012", "Value [{0}] is of incorrect type for property [{2}], value type should be [{1}]." },
                                             { "28013", "Attempted to deploy PersistenceUnit [{0}] for which predeploy method either had not called or had failed" },
!                                            { "28014", "Exception was thrown while processing property [{0}] with value [{1}]." }
     };
  
      /**
================================================================================
Merge Diffs: /ade/ailitche_toplink_main/tldev/source/essentials/oracle/toplink/essentials/exceptions/i18n/ExceptionResource.java vs. /net/stottnfs2.ca.oracle.com/vol/vol1/ade_ottawa_txn/ailitche/ailitche_ri_gf1017_060824/ade_storage/000002/AB0952363AC40CBFE034080020E8C54E.4
Report generated at Thu Aug 24 16:13:04 2006
--------------------------------------------------------------------------------
*** /net/stottnfs2.ca.oracle.com/vol/vol1/ade_ottawa_txn/ailitche/ailitche_ri_gf1017_060824/ade_storage/000002/AB0952363AC40CBFE034080020E8C54E.4	Thu Aug 24 16:03:33 2006
--- /ade/ailitche_toplink_main/tldev/source/essentials/oracle/toplink/essentials/exceptions/i18n/ExceptionResource.java	Thu Aug 24 16:12:39 2006
***************
*** 18,24 ****
   * own identifying information: Portions Copyright [yyyy] 
   * [name of copyright owner]
   */
! // Copyright (c) 1998, 2005, Oracle. All rights reserved.  
  package oracle.toplink.essentials.exceptions.i18n;
  
  
--- 18,24 ----
   * own identifying information: Portions Copyright [yyyy] 
   * [name of copyright owner]
   */
! // Copyright (c) 1998, 2006, Oracle. All rights reserved.  
  package oracle.toplink.essentials.exceptions.i18n;
  
  
***************
*** 44,50 ****
                                             { "DescriptorHeader", "Descriptor: " },
                                             { "QueryHeader", "Query: " },
                                             { "DescriptorExceptionsHeader", "Descriptor Exceptions: " },
!                                            { "RuntimeExceptionsHeader", "Runtime Exceptions: " }
      };
  
      /**
--- 44,51 ----
                                             { "DescriptorHeader", "Descriptor: " },
                                             { "QueryHeader", "Query: " },
                                             { "DescriptorExceptionsHeader", "Descriptor Exceptions: " },
!                                            { "RuntimeExceptionsHeader", "Runtime Exceptions: " },
!                                            { "ErrorFormattingMessage", "Error in message format: {0} Arguments: {1}" }
      };
  
      /**