================================================================================
Merge Diffs: /ade/gpelleti_main/tldev/source/essentials/oracle/toplink/essentials/ejb/cmp3/persistence/PersistenceUnitProcessor.java vs. /net/ottnfs1.ca.oracle.com/vol/vol1/ade_ottawa_txn/gpelleti/gpelleti_ri_5186551_060426/ade_storage/000003/AB0952363AC40CBFE034080020E8C54E.19
Report generated at Thu Apr 27 14:11:06 2006
--------------------------------------------------------------------------------
*** /ade/gpelleti_main/tldev/source/essentials/oracle/toplink/essentials/ejb/cmp3/persistence/PersistenceUnitProcessor.java	Thu Apr 27 14:11:06 2006
--- /net/ottnfs1.ca.oracle.com/vol/vol1/ade_ottawa_txn/gpelleti/gpelleti_ri_5186551_060426/ade_storage/000003/AB0952363AC40CBFE034080020E8C54E.19	Thu Apr 27 12:18:38 2006
***************
*** 304,323 ****
      }
  
    /**
!    * Return a set of class names that are annotated as either @Entity or @Embeddable.
     * from the base URL of this PersistenceUnitProcessor
     * @param loader the class loader to load the classes with
     * @return 
     */
      public static Set<String> buildPersistentClassSet(javax.persistence.spi.PersistenceUnitInfo persistenceUnitInfo, ClassLoader loader){
          Set<String> set = new HashSet();
!         
!         for (String className : persistenceUnitInfo.getManagedClassNames()) {
!             if (isClassPersistent(className, loader)) {
!                 set.add(className);
!             }
!         }
!         
          Iterator i = persistenceUnitInfo.getJarFileUrls().iterator();
          while (i.hasNext()) {
              set.addAll(PersistenceUnitProcessor.getPersistentClassNamesFromURL((URL)i.next(), loader));
--- 304,317 ----
      }
  
    /**
!    * Return a set of class names that are annotated as either @Entity, @Embeddable, or @MappedSuperclass
     * from the base URL of this PersistenceUnitProcessor
     * @param loader the class loader to load the classes with
     * @return 
     */
      public static Set<String> buildPersistentClassSet(javax.persistence.spi.PersistenceUnitInfo persistenceUnitInfo, ClassLoader loader){
          Set<String> set = new HashSet();
!         set.addAll(persistenceUnitInfo.getManagedClassNames());
          Iterator i = persistenceUnitInfo.getJarFileUrls().iterator();
          while (i.hasNext()) {
              set.addAll(PersistenceUnitProcessor.getPersistentClassNamesFromURL((URL)i.next(), loader));
***************
*** 506,512 ****
  
    /**
     *  Return whether the class with the given name is persistent.
!    *  A class is persistent if it is annotated with @Entity or @Embeddable.
     * @param className 
     * @return 
     */
--- 500,506 ----
  
    /**
     *  Return whether the class with the given name is persistent.
!    *  A class is persistent if it is annotated with @Entity, @Embeddable or @MappedSuperclass
     * @param className 
     * @return 
     */
***************
*** 521,527 ****
      }
      /**
      *  Return whether a given class is persistent
!     *  A class is persistent if it is annotated with @Entity or @Embeddable.
      * @param candidateClass 
      * @return 
      */
--- 515,521 ----
      }
      /**
      *  Return whether a given class is persistent
!     *  A class is persistent if it is annotated with @Entity, @Embeddable or @MappedSuperclass
      * @param candidateClass 
      * @return 
      */
================================================================================
Merge Diffs: /ade/gpelleti_main/tltest/resource/essentials/ejb30-testing/META-INF/persistence.xml vs. /net/ottnfs1.ca.oracle.com/vol/vol1/ade_ottawa_txn/gpelleti/gpelleti_ri_5186551_060426/ade_storage/000004/AB0952363AC40CBFE034080020E8C54E.35
Report generated at Thu Apr 27 14:11:06 2006
--------------------------------------------------------------------------------
*** /ade/gpelleti_main/tltest/resource/essentials/ejb30-testing/META-INF/persistence.xml	Thu Apr 27 14:11:06 2006
--- /net/ottnfs1.ca.oracle.com/vol/vol1/ade_ottawa_txn/gpelleti/gpelleti_ri_5186551_060426/ade_storage/000004/AB0952363AC40CBFE034080020E8C54E.35	Thu Apr 27 12:26:28 2006
***************
*** 13,20 ****
  		<mapping-file>META-INF/relationships-entity-mappings.xml</mapping-file>
  		<mapping-file>META-INF/orm-annotation-merge-advanced-entity-mappings.xml</mapping-file>
  		<mapping-file>META-INF/orm-annotation-merge-relationships-entity-mappings.xml</mapping-file>
-         <!-- this is here for testing purposes GF #588, do not remove. -->
-         <class>oracle.toplink.essentials.testing.models.cmp3.xml.inherited.Beer</class>
  		<exclude-unlisted-classes>false</exclude-unlisted-classes>
  		<properties>
  			<!--property name="toplink.logging.level" value="FINEST"/-->
--- 13,18 ----
================================================================================
Merge Diffs: /ade/gpelleti_main/tldev/source/essentials/oracle/toplink/essentials/ejb/cmp3/persistence/PersistenceUnitProcessor.java vs. /net/ottnfs1.ca.oracle.com/vol/vol1/ade_ottawa_txn/gpelleti/gpelleti_ri_5186551_060426/ade_storage/000003/AB0952363AC40CBFE034080020E8C54E.19
Report generated at Thu Apr 27 14:18:40 2006
--------------------------------------------------------------------------------
*** /ade/gpelleti_main/tldev/source/essentials/oracle/toplink/essentials/ejb/cmp3/persistence/PersistenceUnitProcessor.java	Thu Apr 27 14:11:06 2006
--- /net/ottnfs1.ca.oracle.com/vol/vol1/ade_ottawa_txn/gpelleti/gpelleti_ri_5186551_060426/ade_storage/000003/AB0952363AC40CBFE034080020E8C54E.19	Thu Apr 27 12:18:38 2006
***************
*** 304,323 ****
      }
  
    /**
!    * Return a set of class names that are annotated as either @Entity or @Embeddable.
     * from the base URL of this PersistenceUnitProcessor
     * @param loader the class loader to load the classes with
     * @return 
     */
      public static Set<String> buildPersistentClassSet(javax.persistence.spi.PersistenceUnitInfo persistenceUnitInfo, ClassLoader loader){
          Set<String> set = new HashSet();
!         
!         for (String className : persistenceUnitInfo.getManagedClassNames()) {
!             if (isClassPersistent(className, loader)) {
!                 set.add(className);
!             }
!         }
!         
          Iterator i = persistenceUnitInfo.getJarFileUrls().iterator();
          while (i.hasNext()) {
              set.addAll(PersistenceUnitProcessor.getPersistentClassNamesFromURL((URL)i.next(), loader));
--- 304,317 ----
      }
  
    /**
!    * Return a set of class names that are annotated as either @Entity, @Embeddable, or @MappedSuperclass
     * from the base URL of this PersistenceUnitProcessor
     * @param loader the class loader to load the classes with
     * @return 
     */
      public static Set<String> buildPersistentClassSet(javax.persistence.spi.PersistenceUnitInfo persistenceUnitInfo, ClassLoader loader){
          Set<String> set = new HashSet();
!         set.addAll(persistenceUnitInfo.getManagedClassNames());
          Iterator i = persistenceUnitInfo.getJarFileUrls().iterator();
          while (i.hasNext()) {
              set.addAll(PersistenceUnitProcessor.getPersistentClassNamesFromURL((URL)i.next(), loader));
***************
*** 506,512 ****
  
    /**
     *  Return whether the class with the given name is persistent.
!    *  A class is persistent if it is annotated with @Entity or @Embeddable.
     * @param className 
     * @return 
     */
--- 500,506 ----
  
    /**
     *  Return whether the class with the given name is persistent.
!    *  A class is persistent if it is annotated with @Entity, @Embeddable or @MappedSuperclass
     * @param className 
     * @return 
     */
***************
*** 521,527 ****
      }
      /**
      *  Return whether a given class is persistent
!     *  A class is persistent if it is annotated with @Entity or @Embeddable.
      * @param candidateClass 
      * @return 
      */
--- 515,521 ----
      }
      /**
      *  Return whether a given class is persistent
!     *  A class is persistent if it is annotated with @Entity, @Embeddable or @MappedSuperclass
      * @param candidateClass 
      * @return 
      */
================================================================================
Merge Diffs: /ade/gpelleti_main/tltest/resource/essentials/ejb30-testing/META-INF/persistence.xml vs. /net/ottnfs1.ca.oracle.com/vol/vol1/ade_ottawa_txn/gpelleti/gpelleti_ri_5186551_060426/ade_storage/000004/AB0952363AC40CBFE034080020E8C54E.35
Report generated at Thu Apr 27 14:18:40 2006
--------------------------------------------------------------------------------
*** /ade/gpelleti_main/tltest/resource/essentials/ejb30-testing/META-INF/persistence.xml	Thu Apr 27 14:11:06 2006
--- /net/ottnfs1.ca.oracle.com/vol/vol1/ade_ottawa_txn/gpelleti/gpelleti_ri_5186551_060426/ade_storage/000004/AB0952363AC40CBFE034080020E8C54E.35	Thu Apr 27 12:26:28 2006
***************
*** 13,20 ****
  		<mapping-file>META-INF/relationships-entity-mappings.xml</mapping-file>
  		<mapping-file>META-INF/orm-annotation-merge-advanced-entity-mappings.xml</mapping-file>
  		<mapping-file>META-INF/orm-annotation-merge-relationships-entity-mappings.xml</mapping-file>
-         <!-- this is here for testing purposes GF #588, do not remove. -->
-         <class>oracle.toplink.essentials.testing.models.cmp3.xml.inherited.Beer</class>
  		<exclude-unlisted-classes>false</exclude-unlisted-classes>
  		<properties>
  			<!--property name="toplink.logging.level" value="FINEST"/-->
--- 13,18 ----