diff -rc original/JBossCMP-Docs/example/META-INF/MANIFEST.MF copy/JBossCMP-Docs/example/META-INF/MANIFEST.MF
*** original/JBossCMP-Docs/example/META-INF/MANIFEST.MF	Fri Jul  6 01:34:02 2001
--- copy/JBossCMP-Docs/example/META-INF/MANIFEST.MF	Wed May 29 14:41:10 2002
***************
*** 1,3 ****
--- 1,4 ----
  Manifest-Version: 1.0
+ Created-By: Ant 1.4.1
  Class-Path: ./lib/junit.jar
  
diff -rc original/JBossCMP-Docs/example/META-INF/ejb-jar.xml copy/JBossCMP-Docs/example/META-INF/ejb-jar.xml
*** original/JBossCMP-Docs/example/META-INF/ejb-jar.xml	Wed Nov 14 14:13:26 2001
--- copy/JBossCMP-Docs/example/META-INF/ejb-jar.xml	Thu May 30 16:37:29 2002
***************
*** 168,174 ****
              <ejb-ql>
                 SELECT OBJECT(o) 
                 FROM Order o
!                WHERE o.status = ?1
              </ejb-ql>               
           </query>
           <query>
--- 168,174 ----
              <ejb-ql>
                 SELECT OBJECT(o) 
                 FROM Order o
!                WHERE o.orderStatus = ?1
              </ejb-ql>               
           </query>
           <query>
***************
*** 434,440 ****
                 <ejb-name>LineItemEJB</ejb-name>
              </relationship-role-source>
              <cmr-field>
!                <cmr-field-name>order</cmr-field-name>
              </cmr-field>
           </ejb-relationship-role>
        </ejb-relation>
--- 434,440 ----
                 <ejb-name>LineItemEJB</ejb-name>
              </relationship-role-source>
              <cmr-field>
!                <cmr-field-name>orderField</cmr-field-name>
              </cmr-field>
           </ejb-relationship-role>
        </ejb-relation>
diff -rc original/JBossCMP-Docs/example/META-INF/jbosscmp-jdbc.xml copy/JBossCMP-Docs/example/META-INF/jbosscmp-jdbc.xml
*** original/JBossCMP-Docs/example/META-INF/jbosscmp-jdbc.xml	Thu Nov 15 16:53:30 2001
--- copy/JBossCMP-Docs/example/META-INF/jbosscmp-jdbc.xml	Wed Jun  5 10:21:23 2002
***************
*** 12,18 ****
        <select-for-update>false</select-for-update>
        <pk-constraint>true</pk-constraint>
        <relation-mapping-style>foreign-key</relation-mapping-style>
!       <read-ahead>true</read-ahead>
     </defaults>
  
     <enterprise-beans>
--- 12,22 ----
        <select-for-update>false</select-for-update>
        <pk-constraint>true</pk-constraint>
        <relation-mapping-style>foreign-key</relation-mapping-style>
! 	<read-ahead>
! 	        <strategy>on-load</strategy>
! 	        <page-size>500</page-size>
!         	<!--<eager-load-group>myGroup</eager-load-group>-->
! 	</read-ahead>
     </defaults>
  
     <enterprise-beans>
***************
*** 28,34 ****
           <time-out>300</time-out>
           <select-for-update>false</select-for-update>
           <pk-constraint>true</pk-constraint>
!          <read-ahead>true</read-ahead>
           <cmp-field>
              <field-name>userId</field-name>
              <column-name>USER_ID</column-name>
--- 32,42 ----
           <time-out>300</time-out>
           <select-for-update>false</select-for-update>
           <pk-constraint>true</pk-constraint>
! 	<read-ahead>
!         	<strategy>on-load</strategy>
! 	        <page-size>500</page-size>
!         	<!--<eager-load-group>myGroup</eager-load-group>-->
! 	</read-ahead>
           <cmp-field>
              <field-name>userId</field-name>
              <column-name>USER_ID</column-name>
***************
*** 122,128 ****
                    <ejb-name>OrderEJB</ejb-name>
                 </select>
                 <from>, AddressEJB as a</from>
!                <where>ORDER_DATA.shippingAddress_id=a.id AND a.state='CA'</where>
              </declared-sql>
           </query>
           <query>
--- 130,136 ----
                    <ejb-name>OrderEJB</ejb-name>
                 </select>
                 <from>, AddressEJB as a</from>
!                <where>ORDER_DATA.shippingAddress=a.id AND a.state='CA'</where>
              </declared-sql>
           </query>
           <query>
***************
*** 138,144 ****
                    <field-name>state</field-name>
                 </select>
                 <from>, ORDER_DATA as o</from>
!                <where>o.shippingAddress_id=AddressEJB.id</where>
              </declared-sql>
           </query>
           <query>
--- 146,152 ----
                    <field-name>state</field-name>
                 </select>
                 <from>, ORDER_DATA as o</from>
!                <where>o.shippingAddress=AddressEJB.id</where>
              </declared-sql>
           </query>
           <query>
diff -rc original/JBossCMP-Docs/example/build.xml copy/JBossCMP-Docs/example/build.xml
*** original/JBossCMP-Docs/example/build.xml	Wed Nov 14 17:39:06 2001
--- copy/JBossCMP-Docs/example/build.xml	Wed Jun  5 10:36:53 2002
***************
*** 11,19 ****
  	<!-- **************** Change these paths ******************* -->
  
     <property name="jboss.home"	
!       value="/home/dain/work/jboss/jboss-all/build/output/jboss-3.0.0alpha"/>	
  
! 	<property name="junit.home"	value="/usr/java/junit3.7"/>
  
  	<!-- ******************************************************* -->
  	
--- 11,19 ----
  	<!-- **************** Change these paths ******************* -->
  
     <property name="jboss.home"	
!       value="/jboss-dev/jboss-all/build/output/jboss-3.1.0alpha"/>	
  
! 	<property name="junit.home"	value="/TogetherSoft/Together6.0/lib/junit"/>
  
  	<!-- ******************************************************* -->
  	
diff -rc original/JBossCMP-Docs/example/src/org/jboss/docs/cmp2/commerce/LineItem.java copy/JBossCMP-Docs/example/src/org/jboss/docs/cmp2/commerce/LineItem.java
*** original/JBossCMP-Docs/example/src/org/jboss/docs/cmp2/commerce/LineItem.java	Mon Nov 12 20:17:30 2001
--- copy/JBossCMP-Docs/example/src/org/jboss/docs/cmp2/commerce/LineItem.java	Thu May 30 16:36:45 2002
***************
*** 6,13 ****
  	public Long getId();
  	public void setId(Long id);
  	
! 	public abstract Order getOrder();
! 	public abstract void setOrder(Order o);
  
  	public abstract Product getProduct();
  	public abstract void setProduct(Product p);
--- 6,13 ----
  	public Long getId();
  	public void setId(Long id);
  	
! 	public abstract Order getOrderField();
! 	public abstract void setOrderField(Order o);
  
  	public abstract Product getProduct();
  	public abstract void setProduct(Product p);
diff -rc original/JBossCMP-Docs/example/src/org/jboss/docs/cmp2/commerce/LineItemBean.java copy/JBossCMP-Docs/example/src/org/jboss/docs/cmp2/commerce/LineItemBean.java
*** original/JBossCMP-Docs/example/src/org/jboss/docs/cmp2/commerce/LineItemBean.java	Mon Nov 12 20:24:32 2001
--- copy/JBossCMP-Docs/example/src/org/jboss/docs/cmp2/commerce/LineItemBean.java	Thu May 30 16:36:27 2002
***************
*** 16,23 ****
  	public abstract Long getId();
  	public abstract void setId(Long id);
  	
! 	public abstract Order getOrder();
! 	public abstract void setOrder(Order o);
  
  	public abstract Product getProduct();
  	public abstract void setProduct(Product p);
--- 16,23 ----
  	public abstract Long getId();
  	public abstract void setId(Long id);
  	
! 	public abstract Order getOrderField();
! 	public abstract void setOrderField(Order o);
  
  	public abstract Product getProduct();
  	public abstract void setProduct(Product p);
diff -rc original/JBossCMP-Docs/example/src/org/jboss/docs/cmp2/commerce/OneToManyBiTest.java copy/JBossCMP-Docs/example/src/org/jboss/docs/cmp2/commerce/OneToManyBiTest.java
*** original/JBossCMP-Docs/example/src/org/jboss/docs/cmp2/commerce/OneToManyBiTest.java	Wed Nov 14 13:04:52 2001
--- copy/JBossCMP-Docs/example/src/org/jboss/docs/cmp2/commerce/OneToManyBiTest.java	Wed Jun  5 10:41:37 2002
***************
*** 127,133 ****
        // ....getA() == null
        // b1n.getA() == null
        for(int i=0; i<b1x.length; i++) {
!          assertTrue(b1x[i].getOrder() == null);
        }
        
        
--- 127,133 ----
        // ....getA() == null
        // b1n.getA() == null
        for(int i=0; i<b1x.length; i++) {
!          assertTrue(b1x[i].getOrderField() == null);
        }
        
        
***************
*** 136,142 ****
        // a1.isIdentical(....getA())
        // a1.isIdentical(b2m.getA()))
        for(int i=0; i<b2x.length; i++) {
!          assertTrue(a1.isIdentical(b2x[i].getOrder()));
        }
     }
  
--- 136,142 ----
        // a1.isIdentical(....getA())
        // a1.isIdentical(b2m.getA()))
        for(int i=0; i<b2x.length; i++) {
!          assertTrue(a1.isIdentical(b2x[i].getOrderField()));
        }
     }
  
***************
*** 145,151 ****
        // Change:
           
        // b2m.setA(b1n.getA());
!       b2x[b2x.length-1].setOrder(b1x[b1x.length-1].getOrder());
        
        // Expected result:
        
--- 145,151 ----
        // Change:
           
        // b2m.setA(b1n.getA());
!       b2x[b2x.length-1].setOrderField(b1x[b1x.length-1].getOrderField());
        
        // Expected result:
        
***************
*** 173,179 ****
        // a1.isIdentical(....getA())
        // a1.isIdentical(b1n.getA())
        for(int i=0; i<b1x.length; i++) {
!          assertTrue(a1.isIdentical(b1x[i].getOrder()));
        }
        
        // a2.isIdentical(b21.getA())
--- 173,179 ----
        // a1.isIdentical(....getA())
        // a1.isIdentical(b1n.getA())
        for(int i=0; i<b1x.length; i++) {
!          assertTrue(a1.isIdentical(b1x[i].getOrderField()));
        }
        
        // a2.isIdentical(b21.getA())
***************
*** 181,191 ****
        // a2.isIdentical(....getA())
        // a2.isIdentical(b2m_1.getA())
        for(int i=0; i<b2x.length-1; i++) {
!          assertTrue(a2.isIdentical(b2x[i].getOrder()));
        }
        
        // a1.isIdentical(b2m.getA())
!       assertTrue(a1.isIdentical(b2x[b2x.length-1].getOrder()));
     }
     
     // a1.getB().add(b2m);
--- 181,191 ----
        // a2.isIdentical(....getA())
        // a2.isIdentical(b2m_1.getA())
        for(int i=0; i<b2x.length-1; i++) {
!          assertTrue(a2.isIdentical(b2x[i].getOrderField()));
        }
        
        // a1.isIdentical(b2m.getA())
!       assertTrue(a1.isIdentical(b2x[b2x.length-1].getOrderField()));
     }
     
     // a1.getB().add(b2m);
***************
*** 221,227 ****
        // a1.isIdentical(....getA())
        // a1.isIdentical(b1n.getA())
        for(int i=0; i<b1x.length; i++) {
!          assertTrue(a1.isIdentical(b1x[i].getOrder()));
        }
        
        // a2.isIdentical(b21.getA())
--- 221,227 ----
        // a1.isIdentical(....getA())
        // a1.isIdentical(b1n.getA())
        for(int i=0; i<b1x.length; i++) {
!          assertTrue(a1.isIdentical(b1x[i].getOrderField()));
        }
        
        // a2.isIdentical(b21.getA())
***************
*** 229,239 ****
        // a2.isIdentical(....getA())
        // a2.isIdentical(b2m_1.getA())
        for(int i=0; i<b2x.length-1; i++) {
!          assertTrue(a2.isIdentical(b2x[i].getOrder()));
        }
        
        // a1.isIdentical(b2m.getA())
!       assertTrue(a1.isIdentical(b2x[b2x.length-1].getOrder()));
     }
     
     // a1.getB().remove(b1n);
--- 229,239 ----
        // a2.isIdentical(....getA())
        // a2.isIdentical(b2m_1.getA())
        for(int i=0; i<b2x.length-1; i++) {
!          assertTrue(a2.isIdentical(b2x[i].getOrderField()));
        }
        
        // a1.isIdentical(b2m.getA())
!       assertTrue(a1.isIdentical(b2x[b2x.length-1].getOrderField()));
     }
     
     // a1.getB().remove(b1n);
***************
*** 246,252 ****
        // Expected result:
        
        // b1n.getA() == null
!       assertTrue(b1x[b1x.length-1].getOrder() == null);
        
        // b1 == a1.getB()
        assertTrue(b1 == a1.getLineItems());
--- 246,252 ----
        // Expected result:
        
        // b1n.getA() == null
!       assertTrue(b1x[b1x.length-1].getOrderField() == null);
        
        // b1 == a1.getB()
        assertTrue(b1 == a1.getLineItems());