hibernate-commits — CVS commits

[Hibernate-commits] Hibernate changelog.txt,1.285,1.286

[<one...@us...>]

Update of /cvsroot/hibernate/Hibernate
In directory sc8-pr-cvs1:/tmp/cvs-serv31904

Modified Files:
	changelog.txt 
Log Message:
forgot a credit

Index: changelog.txt
===================================================================
RCS file: /cvsroot/hibernate/Hibernate/changelog.txt,v
retrieving revision 1.285
retrieving revision 1.286
diff -C2 -d -r1.285 -r1.286
*** changelog.txt	7 Dec 2002 09:47:21 -0000	1.285
--- changelog.txt	8 Dec 2002 06:02:44 -0000	1.286
***************
*** 5,9 ****
  * fixed a bug where uppercase IS NOT NULL, NOT IN, etc were not parsed correctly
  * addition to readonly="true" bags now no longer requires collection initialization
! * added ResinTransactionManagerLookup
  * improved exception message when setting null to primitive type (Max Andersen)
  * improved exception message for an unserializable identifier
--- 5,9 ----
  * fixed a bug where uppercase IS NOT NULL, NOT IN, etc were not parsed correctly
  * addition to readonly="true" bags now no longer requires collection initialization
! * added ResinTransactionManagerLookup (Aapo Laakkonen)
  * improved exception message when setting null to primitive type (Max Andersen)
  * improved exception message for an unserializable identifier
***************
*** 630,632 ****
  Initial alpha version
  
! $Id$
\ No newline at end of file
--- 630,632 ----
  Initial alpha version
  
! $Id$

[Hibernate-commits] Hibernate/cirrus/hibernate/transaction JBossTransactionManagerLookup.java,1.2,1.3 OrionTransactionManagerLookup.java,1.2,1.3 ResinTransactionManagerLookup.java,1.1,1.2 TransactionManagerLookup.java,1.2,1.3 WebSphereTransactionManagerLookup.java,1.3,1.4 WeblogicTransactionManagerLookup.java,1.2,1.3

[<one...@us...>]

Update of /cvsroot/hibernate/Hibernate/cirrus/hibernate/transaction
In directory sc8-pr-cvs1:/tmp/cvs-serv31206/cirrus/hibernate/transaction

Modified Files:
	JBossTransactionManagerLookup.java 
	OrionTransactionManagerLookup.java 
	ResinTransactionManagerLookup.java 
	TransactionManagerLookup.java 
	WebSphereTransactionManagerLookup.java 
	WeblogicTransactionManagerLookup.java 
Log Message:
added default UserTransaction JNDI name to Lookup classes

Index: JBossTransactionManagerLookup.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate/cirrus/hibernate/transaction/JBossTransactionManagerLookup.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** JBossTransactionManagerLookup.java	26 Nov 2002 03:35:45 -0000	1.2
--- JBossTransactionManagerLookup.java	8 Dec 2002 05:58:58 -0000	1.3
***************
*** 10,13 ****
--- 10,17 ----
  		return "java:/TransactionManager";
  	}
+ 	
+ 	public String getUserTransactionName() {
+ 		return "UserTransaction";
+ 	}
  
  }

Index: OrionTransactionManagerLookup.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate/cirrus/hibernate/transaction/OrionTransactionManagerLookup.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** OrionTransactionManagerLookup.java	26 Nov 2002 03:35:45 -0000	1.2
--- OrionTransactionManagerLookup.java	8 Dec 2002 05:58:58 -0000	1.3
***************
*** 12,14 ****
--- 12,18 ----
  	}
  
+ 	public String getUserTransactionName() {
+ 		return "java:comp/UserTransaction";
+ 	}
+ 
  }

Index: ResinTransactionManagerLookup.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate/cirrus/hibernate/transaction/ResinTransactionManagerLookup.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ResinTransactionManagerLookup.java	6 Dec 2002 12:24:32 -0000	1.1
--- ResinTransactionManagerLookup.java	8 Dec 2002 05:58:58 -0000	1.2
***************
*** 9,12 ****
--- 9,16 ----
  	 */
  	protected String getName() {
+ 		return "java:comp/TransactionManager";
+ 	}
+ 	
+ 	public String getUserTransactionName() {
  		return "java:comp/UserTransaction";
  	}

Index: TransactionManagerLookup.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate/cirrus/hibernate/transaction/TransactionManagerLookup.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** TransactionManagerLookup.java	26 Nov 2002 03:35:45 -0000	1.2
--- TransactionManagerLookup.java	8 Dec 2002 05:58:58 -0000	1.3
***************
*** 12,15 ****
--- 12,28 ----
   */
  public interface TransactionManagerLookup {
+ 
+ 	/**
+ 	 * Obtain the JTA <tt>TransactionManager</tt>
+ 	 */
  	public TransactionManager getTransactionManager(Properties props) throws HibernateException;
+ 	
+ 	/**
+ 	 * Return the JNDI name of the JTA <tt>UserTransaction</tt>
+ 	 * or <tt>null</tt> (optional operation).
+ 	 */
+ 	public String getUserTransactionName() {
+ 		return null;
+ 	}
+ 
  }

Index: WebSphereTransactionManagerLookup.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate/cirrus/hibernate/transaction/WebSphereTransactionManagerLookup.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** WebSphereTransactionManagerLookup.java	26 Nov 2002 03:35:45 -0000	1.3
--- WebSphereTransactionManagerLookup.java	8 Dec 2002 05:58:58 -0000	1.4
***************
*** 24,26 ****
--- 24,30 ----
  	}
  
+ 	public String getUserTransactionName() {
+ 		return "jta/usertransaction";
+ 	}
+ 
  }

Index: WeblogicTransactionManagerLookup.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate/cirrus/hibernate/transaction/WeblogicTransactionManagerLookup.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** WeblogicTransactionManagerLookup.java	26 Nov 2002 03:35:45 -0000	1.2
--- WeblogicTransactionManagerLookup.java	8 Dec 2002 05:58:58 -0000	1.3
***************
*** 11,13 ****
--- 11,17 ----
  	}
  
+ 	public String getUserTransactionName() {
+ 		return "javax.transaction.UserTransaction";
+ 	}
+ 
  }

[Hibernate-commits] Hibernate hibernate.properties,1.94,1.95

[<one...@us...>]

Update of /cvsroot/hibernate/Hibernate
In directory sc8-pr-cvs1:/tmp/cvs-serv31206

Modified Files:
	hibernate.properties 
Log Message:
added default UserTransaction JNDI name to Lookup classes

Index: hibernate.properties
===================================================================
RCS file: /cvsroot/hibernate/Hibernate/hibernate.properties,v
retrieving revision 1.94
retrieving revision 1.95
diff -C2 -d -r1.94 -r1.95
*** hibernate.properties	7 Dec 2002 08:16:09 -0000	1.94
--- hibernate.properties	8 Dec 2002 05:58:58 -0000	1.95
***************
*** 221,226 ****
--- 221,229 ----
  
  ## to use JTATransactionFactory, Hibernate must be able to locate the UserTransaction in JNDI
+ ## default is java:comp/UserTransaction
  
  #jta.UserTransaction jta/usertransaction
+ #jta.UserTransaction javax.transaction.UserTransaction
+ #jta.UserTransaction UserTransaction
  
  

[Hibernate-commits] Tools/src/META-INF xtags.xml,1.5,1.6

[<jo...@us...>]

Update of /cvsroot/hibernate/Tools/src/META-INF
In directory sc8-pr-cvs1:/tmp/cvs-serv28139/src/META-INF

Modified Files:
	xtags.xml 
Log Message:
The current CVS version of the Hibernate XDoclet module now reflects the changes in the hibernate-mapping-1.1.dtd.

Index: xtags.xml
===================================================================
RCS file: /cvsroot/hibernate/Tools/src/META-INF/xtags.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** xtags.xml	16 Sep 2002 04:24:45 -0000	1.5
--- xtags.xml	7 Dec 2002 15:16:14 -0000	1.6
***************
*** 29,40 ****
                      <usage-description>Caching option</usage-description>
                      <mandatory>false</mandatory>
! 					<option-sets>
! 						<option-set>
! 							<options>
! 								<option>read-write</option>
! 								<option>read-only</option>
! 							</options>
! 						</option-set>
! 					</option-sets>
                  </parameter>
                  <parameter type="text">
--- 29,40 ----
                      <usage-description>Caching option</usage-description>
                      <mandatory>false</mandatory>
!                     <option-sets>
!                         <option-set>
!                             <options>
!                                 <option>read-write</option>
!                                 <option>read-only</option>
!                             </options>
!                         </option-set>
!                     </option-sets>
                  </parameter>
                  <parameter type="text">
***************
*** 52,63 ****
                      <usage-description>Specifies that queries should (not) use SELECT DISTINCT.</usage-description>
                      <mandatory>false</mandatory>
! 					<option-sets>
! 						<option-set>
! 							<options>
! 								<option>distinct</option>
! 								<option>all</option>
! 							</options>
! 						</option-set>
! 					</option-sets>
                  </parameter>-->
                  <parameter type="text">
--- 52,63 ----
                      <usage-description>Specifies that queries should (not) use SELECT DISTINCT.</usage-description>
                      <mandatory>false</mandatory>
!                     <option-sets>
!                         <option-set>
!                             <options>
!                                 <option>distinct</option>
!                                 <option>all</option>
!                             </options>
!                         </option-set>
!                     </option-sets>
                  </parameter>-->
                  <parameter type="text">
***************
*** 65,76 ****
                      <usage-description>Specifies that instances of the class are (not) mutable.</usage-description>
                      <mandatory>false</mandatory>
! 					<option-sets>
! 						<option-set>
! 							<options>
! 								<option>read-write</option>
! 								<option>read-only</option>
! 							</options>
! 						</option-set>
! 					</option-sets>
                  </parameter>
                  <parameter type="text">
--- 65,76 ----
                      <usage-description>Specifies that instances of the class are (not) mutable.</usage-description>
                      <mandatory>false</mandatory>
!                     <option-sets>
!                         <option-set>
!                             <options>
!                                 <option>read-write</option>
!                                 <option>read-only</option>
!                             </options>
!                         </option-set>
!                     </option-sets>
                  </parameter>
                  <parameter type="text">
***************
*** 208,227 ****
                      <usage-description>The key generator class</usage-description>
                      <mandatory>true</mandatory>
! 					<option-sets>
! 						<option-set>
! 							<options>
! 								<option>uuid.hex</option>
! 								<option>uuid.string</option>
! 								<option>vm.long</option>
! 								<option>vm.hex</option>
! 								<option>assigned</option>
! 								<option>native</option>
! 								<option>sequence</option>
! 								<option>hilo.long</option>
! 								<option>hilo.hex</option>
! 								<option>seqhilo.long</option>
! 							</options>
! 						</option-set>
! 					</option-sets>
                  </parameter>
                  <parameter type="text">
--- 208,227 ----
                      <usage-description>The key generator class</usage-description>
                      <mandatory>true</mandatory>
!                     <option-sets>
!                         <option-set>
!                             <options>
!                                 <option>uuid.hex</option>
!                                 <option>uuid.string</option>
!                                 <option>vm.long</option>
!                                 <option>vm.hex</option>
!                                 <option>assigned</option>
!                                 <option>native</option>
!                                 <option>sequence</option>
!                                 <option>hilo.long</option>
!                                 <option>hilo.hex</option>
!                                 <option>seqhilo.long</option>
!                             </options>
!                         </option-set>
!                     </option-sets>
                  </parameter>
                  <parameter type="text">
***************
*** 288,306 ****
                      <usage-description>Specifies, which operations should be cascaded from the parent object to the associated object.</usage-description>
                      <mandatory>false</mandatory>
! 					<option-sets>
! 						<option-set>
! 							<options>
! 								<option>all</option>
! 								<option>none</option>
! 								<option>save/update</option>
! 								<option>delete</option>
! 							</options>
! 						</option-set>
! 					</option-sets>
!                 </parameter>
!                 <parameter type="text">
!                     <name>length</name>
!                     <usage-description>The length of the mapped database table column.</usage-description>
!                     <mandatory>false</mandatory>
                  </parameter>
                  <parameter type="bool">
--- 288,301 ----
                      <usage-description>Specifies, which operations should be cascaded from the parent object to the associated object.</usage-description>
                      <mandatory>false</mandatory>
!                     <option-sets>
!                         <option-set>
!                             <options>
!                                 <option>all</option>
!                                 <option>none</option>
!                                 <option>save/update</option>
!                                 <option>delete</option>
!                             </options>
!                         </option-set>
!                     </option-sets>
                  </parameter>
                  <parameter type="bool">
***************
*** 336,349 ****
                      <usage-description>Specifies, which operations should be cascaded from the parent object to the associated object.</usage-description>
                      <mandatory>false</mandatory>
! 					<option-sets>
! 						<option-set>
! 							<options>
! 								<option>all</option>
! 								<option>none</option>
! 								<option>save/update</option>
! 								<option>delete</option>
! 							</options>
! 						</option-set>
! 					</option-sets>
                  </parameter>
                  <parameter type="bool">
--- 331,344 ----
                      <usage-description>Specifies, which operations should be cascaded from the parent object to the associated object.</usage-description>
                      <mandatory>false</mandatory>
!                     <option-sets>
!                         <option-set>
!                             <options>
!                                 <option>all</option>
!                                 <option>none</option>
!                                 <option>save/update</option>
!                                 <option>delete</option>
!                             </options>
!                         </option-set>
!                     </option-sets>
                  </parameter>
                  <parameter type="bool">
***************
*** 389,402 ****
                      <usage-description>Specifies which operations should be cascaded from the parent object to the associated object.</usage-description>
                      <mandatory>false</mandatory>
! 					<option-sets>
! 						<option-set>
! 							<options>
! 								<option>all</option>
! 								<option>none</option>
! 								<option>save/update</option>
! 								<option>delete</option>
! 							</options>
! 						</option-set>
! 					</option-sets>
                  </parameter>
              </tag>
--- 384,397 ----
                      <usage-description>Specifies which operations should be cascaded from the parent object to the associated object.</usage-description>
                      <mandatory>false</mandatory>
!                     <option-sets>
!                         <option-set>
!                             <options>
!                                 <option>all</option>
!                                 <option>none</option>
!                                 <option>save/update</option>
!                                 <option>delete</option>
!                             </options>
!                         </option-set>
!                     </option-sets>
                  </parameter>
              </tag>
***************
*** 442,455 ****
                      <usage-description>Specifies, which operations should be cascaded from the parent object to the associated object.</usage-description>
                      <mandatory>false</mandatory>
! 					<option-sets>
! 						<option-set>
! 							<options>
! 								<option>all</option>
! 								<option>none</option>
! 								<option>save/update</option>
! 								<option>delete</option>
! 							</options>
! 						</option-set>
! 					</option-sets>
                  </parameter>
                  <parameter type="text">
--- 437,450 ----
                      <usage-description>Specifies, which operations should be cascaded from the parent object to the associated object.</usage-description>
                      <mandatory>false</mandatory>
!                     <option-sets>
!                         <option-set>
!                             <options>
!                                 <option>all</option>
!                                 <option>none</option>
!                                 <option>save/update</option>
!                                 <option>delete</option>
!                             </options>
!                         </option-set>
!                     </option-sets>
                  </parameter>
                  <parameter type="text">
***************
*** 500,513 ****
                      <usage-description>Specifies, which operations should be cascaded from the parent object to the associated object.</usage-description>
                      <mandatory>false</mandatory>
! 					<option-sets>
! 						<option-set>
! 							<options>
! 								<option>all</option>
! 								<option>none</option>
! 								<option>save/update</option>
! 								<option>delete</option>
! 							</options>
! 						</option-set>
! 					</option-sets>
                  </parameter>
                  <parameter type="text">
--- 495,508 ----
                      <usage-description>Specifies, which operations should be cascaded from the parent object to the associated object.</usage-description>
                      <mandatory>false</mandatory>
!                     <option-sets>
!                         <option-set>
!                             <options>
!                                 <option>all</option>
!                                 <option>none</option>
!                                 <option>save/update</option>
!                                 <option>delete</option>
!                             </options>
!                         </option-set>
!                     </option-sets>
                  </parameter>
                  <parameter type="text">
***************
*** 548,561 ****
                      <usage-description>Specifies which operations should be cascaded from the parent object to the associated object.</usage-description>
                      <mandatory>false</mandatory>
! 					<option-sets>
! 						<option-set>
! 							<options>
! 								<option>all</option>
! 								<option>none</option>
! 								<option>save/update</option>
! 								<option>delete</option>
! 							</options>
! 						</option-set>
! 					</option-sets>
                  </parameter>
              </tag>
--- 543,556 ----
                      <usage-description>Specifies which operations should be cascaded from the parent object to the associated object.</usage-description>
                      <mandatory>false</mandatory>
!                     <option-sets>
!                         <option-set>
!                             <options>
!                                 <option>all</option>
!                                 <option>none</option>
!                                 <option>save/update</option>
!                                 <option>delete</option>
!                             </options>
!                         </option-set>
!                     </option-sets>
                  </parameter>
              </tag>
***************
*** 591,604 ****
                      <usage-description>Specifies which operations should be cascaded from the parent object to the associated object.</usage-description>
                      <mandatory>false</mandatory>
! 					<option-sets>
! 						<option-set>
! 							<options>
! 								<option>all</option>
! 								<option>save/update</option>
! 								<option>delete</option>
! 								<option>none</option>
! 							</options>
! 						</option-set>
! 					</option-sets>
                  </parameter>
                  <parameter type="text">
--- 586,599 ----
                      <usage-description>Specifies which operations should be cascaded from the parent object to the associated object.</usage-description>
                      <mandatory>false</mandatory>
!                     <option-sets>
!                         <option-set>
!                             <options>
!                                 <option>all</option>
!                                 <option>save/update</option>
!                                 <option>delete</option>
!                                 <option>none</option>
!                             </options>
!                         </option-set>
!                     </option-sets>
                  </parameter>
                  <parameter type="text">
***************
*** 639,652 ****
                      <usage-description>Specifies which operations should be cascaded from the parent object to the associated object.</usage-description>
                      <mandatory>false</mandatory>
! 					<option-sets>
! 						<option-set>
! 							<options>
! 								<option>all</option>
! 								<option>none</option>
! 								<option>save/update</option>
! 								<option>delete</option>
! 							</options>
! 						</option-set>
! 					</option-sets>
                  </parameter>
              </tag>
--- 634,647 ----
                      <usage-description>Specifies which operations should be cascaded from the parent object to the associated object.</usage-description>
                      <mandatory>false</mandatory>
!                     <option-sets>
!                         <option-set>
!                             <options>
!                                 <option>all</option>
!                                 <option>none</option>
!                                 <option>save/update</option>
!                                 <option>delete</option>
!                             </options>
!                         </option-set>
!                     </option-sets>
                  </parameter>
              </tag>
***************
*** 677,690 ****
                      <usage-description>Specifies which operations should be cascaded from the parent object to the associated object.</usage-description>
                      <mandatory>false</mandatory>
! 					<option-sets>
! 						<option-set>
! 							<options>
! 								<option>all</option>
! 								<option>none</option>
! 								<option>save/update</option>
! 								<option>delete</option>
! 							</options>
! 						</option-set>
! 					</option-sets>
                  </parameter>
              </tag>
--- 672,685 ----
                      <usage-description>Specifies which operations should be cascaded from the parent object to the associated object.</usage-description>
                      <mandatory>false</mandatory>
!                     <option-sets>
!                         <option-set>
!                             <options>
!                                 <option>all</option>
!                                 <option>none</option>
!                                 <option>save/update</option>
!                                 <option>delete</option>
!                             </options>
!                         </option-set>
!                     </option-sets>
                  </parameter>
              </tag>
***************
*** 720,739 ****
                      <usage-description>The key generator class (toplevel collections only)</usage-description>
                      <mandatory>true</mandatory>
! 					<option-sets>
! 						<option-set>
! 							<options>
! 								<option>uuid.hex</option>
! 								<option>uuid.string</option>
! 								<option>vm.long</option>
! 								<option>vm.hex</option>
! 								<option>assigned</option>
! 								<option>native</option>
! 								<option>sequence</option>
! 								<option>hilo.long</option>
! 								<option>hilo.hex</option>
! 								<option>seqhilo.long</option>
! 							</options>
! 						</option-set>
! 					</option-sets>
                  </parameter>
                  <parameter type="text">
--- 715,734 ----
                      <usage-description>The key generator class (toplevel collections only)</usage-description>
                      <mandatory>true</mandatory>
!                     <option-sets>
!                         <option-set>
!                             <options>
!                                 <option>uuid.hex</option>
!                                 <option>uuid.string</option>
!                                 <option>vm.long</option>
!                                 <option>vm.hex</option>
!                                 <option>assigned</option>
!                                 <option>native</option>
!                                 <option>sequence</option>
!                                 <option>hilo.long</option>
!                                 <option>hilo.hex</option>
!                                 <option>seqhilo.long</option>
!                             </options>
!                         </option-set>
!                     </option-sets>
                  </parameter>
                  <parameter type="text">

[Hibernate-commits] Tools/src/cirrus/hibernate/tools/xdoclet/test Order.java,1.3,1.4

[<jo...@us...>]

Update of /cvsroot/hibernate/Tools/src/cirrus/hibernate/tools/xdoclet/test
In directory sc8-pr-cvs1:/tmp/cvs-serv28139/src/cirrus/hibernate/tools/xdoclet/test

Modified Files:
	Order.java 
Log Message:
The current CVS version of the Hibernate XDoclet module now reflects the changes in the hibernate-mapping-1.1.dtd.

Index: Order.java
===================================================================
RCS file: /cvsroot/hibernate/Tools/src/cirrus/hibernate/tools/xdoclet/test/Order.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Order.java	14 Sep 2002 17:19:41 -0000	1.3
--- Order.java	7 Dec 2002 15:16:14 -0000	1.4
***************
*** 13,17 ****
   * @hibernate.class table="TB_ORDER"
   * @hibernate.jcs-cache usage="read-write"
-  * @hibernate.cache timeout="10" type="readwrite"
   * @hibernate.query name="query1" query="select a from b for pleasure 1"
   * @hibernate.query name="query2" query="select a from b for pleasure 2"
--- 13,16 ----
***************
*** 112,116 ****
       * @return OrderTypeRefValue
       * 
!      * @hibernate.many-to-one column="ORDER_TYPE_CD" length="5" cascade="none"
       */
      public OrderTypeRefValue getOrderType() {
--- 111,115 ----
       * @return OrderTypeRefValue
       * 
!      * @hibernate.many-to-one column="ORDER_TYPE_CD" cascade="none"
       */
      public OrderTypeRefValue getOrderType() {

[Hibernate-commits] Tools/src/cirrus/hibernate/tools/xdoclet/resources hibernate-properties.xdt,1.5,1.6 hibernate.xdt,1.7,1.8 hibernate-collections.xdt,1.3,1.4 hibernate-composite-element.xdt,1.2,1.3

[<jo...@us...>]

Update of /cvsroot/hibernate/Tools/src/cirrus/hibernate/tools/xdoclet/resources
In directory sc8-pr-cvs1:/tmp/cvs-serv28139/src/cirrus/hibernate/tools/xdoclet/resources

Modified Files:
	hibernate-properties.xdt hibernate.xdt 
	hibernate-collections.xdt hibernate-composite-element.xdt 
Log Message:
The current CVS version of the Hibernate XDoclet module now reflects the changes in the hibernate-mapping-1.1.dtd.

Index: hibernate-properties.xdt
===================================================================
RCS file: /cvsroot/hibernate/Tools/src/cirrus/hibernate/tools/xdoclet/resources/hibernate-properties.xdt,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** hibernate-properties.xdt	14 Sep 2002 18:15:24 -0000	1.5
--- hibernate-properties.xdt	7 Dec 2002 15:16:14 -0000	1.6
***************
*** 30,36 ****
  			column="<XDtMethod:methodTagValue tagName="hibernate.many-to-one" paramName="column" />"
  		  </XDtMethod:ifHasMethodTag>
- 		  <XDtMethod:ifHasMethodTag tagName="hibernate.many-to-one" paramName="length">
- 			length="<XDtMethod:methodTagValue tagName="hibernate.many-to-one" paramName="length" />"
- 		  </XDtMethod:ifHasMethodTag>
  		  <XDtMethod:ifHasMethodTag tagName="hibernate.many-to-one" paramName="not-null">
  			not-null="<XDtMethod:methodTagValue tagName="hibernate.many-to-one" paramName="not-null" />"
--- 30,33 ----

Index: hibernate.xdt
===================================================================
RCS file: /cvsroot/hibernate/Tools/src/cirrus/hibernate/tools/xdoclet/resources/hibernate.xdt,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** hibernate.xdt	16 Sep 2002 04:24:45 -0000	1.7
--- hibernate.xdt	7 Dec 2002 15:16:14 -0000	1.8
***************
*** 120,137 ****
  
  	<XDtClass:pushClass value="<XDtCollection:get name='backupClass' key='oldClassName' />">
! 	<XDtClass:ifHasClassTag tagName="hibernate.cache" superclasses="false">
! 		<cache
! 		  <XDtClass:ifHasClassTag tagName="hibernate.cache" paramName="timeout" superclasses="false">
! 			timeout="<XDtClass:classTagValue tagName="hibernate.cache" paramName="timeout" />"
! 		  </XDtClass:ifHasClassTag>
! 		  <XDtClass:ifHasClassTag tagName="hibernate.cache" paramName="impl-class" superclasses="false">
! 			impl-class="<XDtClass:classTagValue tagName="hibernate.cache" paramName="impl-class" />"
! 		  </XDtClass:ifHasClassTag>
! 		  <XDtClass:ifHasClassTag tagName="hibernate.cache" paramName="type" superclasses="false">
! 			type="<XDtClass:classTagValue tagName="hibernate.cache" paramName="type" values="readonly,readwrite" />"
! 		  </XDtClass:ifHasClassTag>
! 		/>
! 	</XDtClass:ifHasClassTag>
! 
  	</class>
  
--- 120,124 ----
  
  	<XDtClass:pushClass value="<XDtCollection:get name='backupClass' key='oldClassName' />">
! 	
  	</class>
  

Index: hibernate-collections.xdt
===================================================================
RCS file: /cvsroot/hibernate/Tools/src/cirrus/hibernate/tools/xdoclet/resources/hibernate-collections.xdt,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** hibernate-collections.xdt	14 Sep 2002 17:19:41 -0000	1.3
--- hibernate-collections.xdt	7 Dec 2002 15:16:14 -0000	1.4
***************
*** 8,14 ****
  			  	column="<XDtMethod:methodTagValue tagName="hibernate.collection-key" paramName="column" />"
  			  </XDtMethod:ifHasMethodTag>
- 			  <XDtMethod:ifHasMethodTag tagName="hibernate.collection-key" paramName="type">
- 			  	type="<XDtMethod:methodTagValue tagName="hibernate.collection-key" paramName="type" />"
- 			  </XDtMethod:ifHasMethodTag>
  			  <XDtMethod:ifHasMethodTag tagName="hibernate.collection-key" paramName="length">
  			  	length="<XDtMethod:methodTagValue tagName="hibernate.collection-key" paramName="length" />"
--- 8,11 ----
***************
*** 95,101 ****
  			  <XDtMethod:ifHasMethodTag tagName="hibernate.collection-many-to-many" paramName="column">
  			  	column="<XDtMethod:methodTagValue tagName="hibernate.collection-many-to-many" paramName="column" />"
- 			  </XDtMethod:ifHasMethodTag>
- 			  <XDtMethod:ifHasMethodTag tagName="hibernate.collection-many-to-many" paramName="length">
- 			  	length="<XDtMethod:methodTagValue tagName="hibernate.collection-many-to-many" paramName="length" />"
  			  </XDtMethod:ifHasMethodTag>
  			  <XDtMethod:ifHasMethodTag tagName="hibernate.collection-many-to-many" paramName="not-null">
--- 92,95 ----

Index: hibernate-composite-element.xdt
===================================================================
RCS file: /cvsroot/hibernate/Tools/src/cirrus/hibernate/tools/xdoclet/resources/hibernate-composite-element.xdt,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** hibernate-composite-element.xdt	14 Sep 2002 17:19:41 -0000	1.2
--- hibernate-composite-element.xdt	7 Dec 2002 15:16:14 -0000	1.3
***************
*** 30,36 ****
  					column="<XDtMethod:methodTagValue tagName="hibernate.many-to-one" paramName="column" />"
  				  </XDtMethod:ifHasMethodTag>
- 				  <XDtMethod:ifHasMethodTag tagName="hibernate.many-to-one" paramName="length">
- 					length="<XDtMethod:methodTagValue tagName="hibernate.many-to-one" paramName="length" />"
- 				  </XDtMethod:ifHasMethodTag>
  				  <XDtMethod:ifHasMethodTag tagName="hibernate.many-to-one" paramName="not-null">
  					not-null="<XDtMethod:methodTagValue tagName="hibernate.many-to-one" paramName="not-null" />"
--- 30,33 ----

[Hibernate-commits] Tools Readme,NONE,1.1

[<jo...@us...>]

Update of /cvsroot/hibernate/Tools
In directory sc8-pr-cvs1:/tmp/cvs-serv28139

Added Files:
	Readme 
Log Message:
The current CVS version of the Hibernate XDoclet module now reflects the changes in the hibernate-mapping-1.1.dtd.

--- NEW FILE: Readme ---
07 December 2002

The current CVS version of the Hibernate XDoclet module now reflects the changes in the
hibernate-mapping-1.1.dtd. This only means that mappings genernated by the module should
not break when run under hibernate 1.1 or 1.2. It does *not* mean that additional tags 
have been added to increase the functionality. I am, however, planning on adding some
additional functionality in the near future.

Please note that the current documenation is *neither* complete nor accurate. This will 
be addressed in the near future. Also note the build process leaves a bit to be desired, 
it is not clean and it is not reproducable. This is also being addressed.

Regards,
Joel Rosi-Schwartz 
<Joe...@Et...>

[Hibernate-commits] Tools/lib hibernate-xdoclet.jar,1.10,1.11

[<jo...@us...>]

Update of /cvsroot/hibernate/Tools/lib
In directory sc8-pr-cvs1:/tmp/cvs-serv28139/lib

Modified Files:
	hibernate-xdoclet.jar 
Log Message:
The current CVS version of the Hibernate XDoclet module now reflects the changes in the hibernate-mapping-1.1.dtd.

Index: hibernate-xdoclet.jar
===================================================================
RCS file: /cvsroot/hibernate/Tools/lib/hibernate-xdoclet.jar,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
Binary files /tmp/cvs09M9dc and /tmp/cvs481m2d differ

[Hibernate-commits] Hibernate changelog.txt,1.284,1.285 readme.txt,1.54,1.55

[<one...@us...>]

Update of /cvsroot/hibernate/Hibernate
In directory sc8-pr-cvs1:/tmp/cvs-serv17400

Modified Files:
	changelog.txt readme.txt 
Log Message:
1.2 final

Index: changelog.txt
===================================================================
RCS file: /cvsroot/hibernate/Hibernate/changelog.txt,v
retrieving revision 1.284
retrieving revision 1.285
diff -C2 -d -r1.284 -r1.285
*** changelog.txt	7 Dec 2002 09:41:22 -0000	1.284
--- changelog.txt	7 Dec 2002 09:47:21 -0000	1.285
***************
*** 1,6 ****
  Hibernate Changelog
  ===================
! Changes in version 1.2 final
! ----------------------------
  * fixed a bug where uppercase IS NOT NULL, NOT IN, etc were not parsed correctly
  * addition to readonly="true" bags now no longer requires collection initialization
--- 1,6 ----
  Hibernate Changelog
  ===================
! Changes in version 1.2 final (7.12.2002)
! ----------------------------------------
  * fixed a bug where uppercase IS NOT NULL, NOT IN, etc were not parsed correctly
  * addition to readonly="true" bags now no longer requires collection initialization

Index: readme.txt
===================================================================
RCS file: /cvsroot/hibernate/Hibernate/readme.txt,v
retrieving revision 1.54
retrieving revision 1.55
diff -C2 -d -r1.54 -r1.55
*** readme.txt	30 Nov 2002 03:57:30 -0000	1.54
--- readme.txt	7 Dec 2002 09:47:22 -0000	1.55
***************
*** 1,5 ****
  Hibernate - Relational Persistence for Idiomatic Java
  =====================================================
! version 1.2 beta 4 29 November 2002
  
  Instructions
--- 1,5 ----
  Hibernate - Relational Persistence for Idiomatic Java
  =====================================================
! version 1.2 final 7 December 2002
  
  Instructions

[Hibernate-commits] Hibernate/cirrus/hibernate/collections PersistentCollection.java,1.76,1.77

[<one...@us...>]

Update of /cvsroot/hibernate/Hibernate/cirrus/hibernate/collections
In directory sc8-pr-cvs1:/tmp/cvs-serv16209/cirrus/hibernate/collections

Modified Files:
	PersistentCollection.java 
Log Message:
added a test for initialize-after-add

Index: PersistentCollection.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate/cirrus/hibernate/collections/PersistentCollection.java,v
retrieving revision 1.76
retrieving revision 1.77
diff -C2 -d -r1.76 -r1.77
*** PersistentCollection.java	7 Dec 2002 09:05:41 -0000	1.76
--- PersistentCollection.java	7 Dec 2002 09:41:22 -0000	1.77
***************
*** 87,91 ****
  	}
  	
! 	public boolean addAll(Object obj) {
  		throw new AssertionFailure("Collection does not support delayed initialization");
  	}
--- 87,91 ----
  	}
  	
! 	public boolean addAll(Collection coll) {
  		throw new AssertionFailure("Collection does not support delayed initialization");
  	}

[Hibernate-commits] Hibernate/cirrus/hibernate/test Contained.java,1.3,1.4 Container.hbm.xml,1.10,1.11 Container.java,1.4,1.5 ParentChildTest.java,1.31,1.32

[<one...@us...>]

Update of /cvsroot/hibernate/Hibernate/cirrus/hibernate/test
In directory sc8-pr-cvs1:/tmp/cvs-serv16209/cirrus/hibernate/test

Modified Files:
	Contained.java Container.hbm.xml Container.java 
	ParentChildTest.java 
Log Message:
added a test for initialize-after-add

Index: Contained.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate/cirrus/hibernate/test/Contained.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Contained.java	26 Nov 2002 03:35:44 -0000	1.3
--- Contained.java	7 Dec 2002 09:41:22 -0000	1.4
***************
*** 9,12 ****
--- 9,14 ----
  	private long id;
  	private Collection bag = new ArrayList();
+ 	private Collection lazyBag = new ArrayList();
+ 	
  	public boolean equals(Object other) {
  		return id==( (Contained) other ).id;
***************
*** 62,65 ****
--- 64,83 ----
  	public void setBag(Collection bag) {
  		this.bag = bag;
+ 	}
+ 
+ 	/**
+ 	 * Returns the lazyBag.
+ 	 * @return Collection
+ 	 */
+ 	public Collection getLazyBag() {
+ 		return lazyBag;
+ 	}
+ 
+ 	/**
+ 	 * Sets the lazyBag.
+ 	 * @param lazyBag The lazyBag to set
+ 	 */
+ 	public void setLazyBag(Collection lazyBag) {
+ 		this.lazyBag = lazyBag;
  	}
  

Index: Container.hbm.xml
===================================================================
RCS file: /cvsroot/hibernate/Hibernate/cirrus/hibernate/test/Container.hbm.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** Container.hbm.xml	20 Nov 2002 14:20:09 -0000	1.10
--- Container.hbm.xml	7 Dec 2002 09:41:22 -0000	1.11
***************
*** 41,44 ****
--- 41,48 ----
  			<many-to-many column="contained_id" class="cirrus.hibernate.test.Contained" outer-join="true"/>
  		</bag>
+ 		<bag role="lazyBag" readonly="true" lazy="true" table="LCCBAG">
+ 			<key column="container_id"/>
+ 			<many-to-many column="contained_id" class="cirrus.hibernate.test.Contained"/>
+ 		</bag>
  		<map role="ternaryMap">
  			<key column="container_id"/>
***************
*** 67,70 ****
--- 71,78 ----
  			<key column="contained_id"/>
  			<many-to-many column="container_id" class="cirrus.hibernate.test.Container" outer-join="false"/>
+ 		</bag>
+ 		<bag role="lazyBag" lazy="true" table="LCCBAG">
+ 			<key column="contained_id"/>
+ 			<many-to-many column="container_id" class="cirrus.hibernate.test.Container"/>
  		</bag>
  	</class>

Index: Container.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate/cirrus/hibernate/test/Container.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Container.java	4 Oct 2002 17:50:21 -0000	1.4
--- Container.java	7 Dec 2002 09:41:22 -0000	1.5
***************
*** 2,5 ****
--- 2,6 ----
  package cirrus.hibernate.test;
  
+ import java.util.ArrayList;
  import java.util.Collection;
  import java.util.List;
***************
*** 85,88 ****
--- 86,90 ----
  	private long id;
  	private Collection bag;
+ 	private Collection lazyBag = new ArrayList();
  	private Map ternaryMap;
  	private Set ternarySet;
***************
*** 275,278 ****
--- 277,296 ----
  	public void setTernarySet(Set ternarySet) {
  		this.ternarySet = ternarySet;
+ 	}
+ 
+ 	/**
+ 	 * Returns the lazyBag.
+ 	 * @return Collection
+ 	 */
+ 	public Collection getLazyBag() {
+ 		return lazyBag;
+ 	}
+ 
+ 	/**
+ 	 * Sets the lazyBag.
+ 	 * @param lazyBag The lazyBag to set
+ 	 */
+ 	public void setLazyBag(Collection lazyBag) {
+ 		this.lazyBag = lazyBag;
  	}
  

Index: ParentChildTest.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate/cirrus/hibernate/test/ParentChildTest.java,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** ParentChildTest.java	26 Nov 2002 03:35:44 -0000	1.31
--- ParentChildTest.java	7 Dec 2002 09:41:22 -0000	1.32
***************
*** 343,346 ****
--- 343,369 ----
  		c.getBag().add(c2);
  		c2.getBag().add(c);
+ 		c.getLazyBag().add(c1);
+ 		c1.getLazyBag().add(c);
+ 		t.commit();
+ 		s.close();
+ 		
+ 		s = sessions.openSession();
+ 		t = s.beginTransaction();
+ 		c = (Container) s.find("from c in class Container").get(0);
+ 		Contained c3 = new Contained();
+ 		c.getBag().add(c3);
+ 		c3.getBag().add(c);
+ 		c.getLazyBag().add(c3);
+ 		c3.getLazyBag().add(c);
+ 		t.commit();
+ 		s.close();
+ 		
+ 		s = sessions.openSession();
+ 		t = s.beginTransaction();
+ 		c = (Container) s.find("from c in class Container").get(0);
+ 		Contained c4 = new Contained();
+ 		c.getLazyBag().add(c4);
+ 		c4.getLazyBag().add(c);
+ 		assertTrue( c.getLazyBag().size()==3 );
  		t.commit();
  		s.close();
***************
*** 355,359 ****
  			j++;
  		}
! 		assertTrue(j==3);
  		s.delete(c);
  		c.getBag().remove(c2);
--- 378,382 ----
  			j++;
  		}
! 		assertTrue(j==4);
  		s.delete(c);
  		c.getBag().remove(c2);
***************
*** 364,368 ****
  			s.delete( iter.next() );
  		}
! 		assertTrue(j==2);
  		t.commit();
  		s.close();
--- 387,392 ----
  			s.delete( iter.next() );
  		}
! 		assertTrue(j==3);
! 		s.delete( s.load(Contained.class, new Long( c4.getId() ) ) );
  		t.commit();
  		s.close();

[Hibernate-commits] Hibernate changelog.txt,1.283,1.284

[<one...@us...>]

Update of /cvsroot/hibernate/Hibernate
In directory sc8-pr-cvs1:/tmp/cvs-serv16209

Modified Files:
	changelog.txt 
Log Message:
added a test for initialize-after-add

Index: changelog.txt
===================================================================
RCS file: /cvsroot/hibernate/Hibernate/changelog.txt,v
retrieving revision 1.283
retrieving revision 1.284
diff -C2 -d -r1.283 -r1.284
*** changelog.txt	7 Dec 2002 08:16:09 -0000	1.283
--- changelog.txt	7 Dec 2002 09:41:22 -0000	1.284
***************
*** 4,7 ****
--- 4,8 ----
  ----------------------------
  * fixed a bug where uppercase IS NOT NULL, NOT IN, etc were not parsed correctly
+ * addition to readonly="true" bags now no longer requires collection initialization
  * added ResinTransactionManagerLookup
  * improved exception message when setting null to primitive type (Max Andersen)

[Hibernate-commits] Hibernate/cirrus/hibernate/impl SessionImpl.java,1.156,1.157

[<one...@us...>]

Update of /cvsroot/hibernate/Hibernate/cirrus/hibernate/impl
In directory sc8-pr-cvs1:/tmp/cvs-serv9434/hibernate/impl

Modified Files:
	SessionImpl.java 
Log Message:
readonly bags and lists now no longer require initialization for add(), addAll()

Index: SessionImpl.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate/cirrus/hibernate/impl/SessionImpl.java,v
retrieving revision 1.156
retrieving revision 1.157
diff -C2 -d -r1.156 -r1.157
*** SessionImpl.java	7 Dec 2002 08:10:23 -0000	1.156
--- SessionImpl.java	7 Dec 2002 09:05:41 -0000	1.157
***************
*** 2328,2331 ****
--- 2328,2336 ----
  		return getCollectionEntry(coll).loadedID;
  	}
+ 	
+ 	public boolean isCollectionReadOnly(PersistentCollection collection) {
+ 		CollectionEntry ce = getCollectionEntry(collection);
+ 		return ce!=null && ce.loadedPersister.isReadOnly();
+ 	}
  
  	public void initialize(PersistentCollection collection, boolean writing) throws HibernateException, SQLException {

[Hibernate-commits] Hibernate/cirrus/hibernate/engine SessionImplementor.java,1.7,1.8

[<one...@us...>]

Update of /cvsroot/hibernate/Hibernate/cirrus/hibernate/engine
In directory sc8-pr-cvs1:/tmp/cvs-serv9434/hibernate/engine

Modified Files:
	SessionImplementor.java 
Log Message:
readonly bags and lists now no longer require initialization for add(), addAll()

Index: SessionImplementor.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate/cirrus/hibernate/engine/SessionImplementor.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** SessionImplementor.java	5 Nov 2002 16:58:13 -0000	1.7
--- SessionImplementor.java	7 Dec 2002 09:05:41 -0000	1.8
***************
*** 66,69 ****
--- 66,73 ----
  	 */
  	public void initialize(PersistentCollection collection, boolean writing) throws HibernateException, SQLException;
+ 	/**
+ 	 * Is this the readonly end of a bidirectional association?
+ 	 */
+ 	public boolean isCollectionReadOnly(PersistentCollection collection);
  	
  	/**

[Hibernate-commits] Hibernate/cirrus/hibernate/collections Bag.java,1.16,1.17 List.java,1.44,1.45 PersistentCollection.java,1.75,1.76

[<one...@us...>]

Update of /cvsroot/hibernate/Hibernate/cirrus/hibernate/collections
In directory sc8-pr-cvs1:/tmp/cvs-serv9434/hibernate/collections

Modified Files:
	Bag.java List.java PersistentCollection.java 
Log Message:
readonly bags and lists now no longer require initialization for add(), addAll()

Index: Bag.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate/cirrus/hibernate/collections/Bag.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** Bag.java	1 Oct 2002 01:25:29 -0000	1.16
--- Bag.java	7 Dec 2002 09:05:40 -0000	1.17
***************
*** 239,244 ****
  	 */
  	public boolean add(Object o) {
! 		write();
! 		return bag.add(o);
  	}
  
--- 239,249 ----
  	 */
  	public boolean add(Object o) {
! 		if ( !scheduleAdd(o) ) {
! 			write();
! 			return bag.add(o);
! 		}
! 		else {
! 			return true;
! 		}
  	}
  
***************
*** 263,268 ****
  	 */
  	public boolean addAll(Collection c) {
! 		write();
! 		return bag.addAll(c);
  	}
  
--- 268,278 ----
  	 */
  	public boolean addAll(Collection c) {
! 		if ( !scheduleAddAll(c) ) {
! 			write();
! 			return bag.addAll(c);
! 		}
! 		else {
! 			return c.size()>0;
! 		}
  	}
  

Index: List.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate/cirrus/hibernate/collections/List.java,v
retrieving revision 1.44
retrieving revision 1.45
diff -C2 -d -r1.44 -r1.45
*** List.java	26 Nov 2002 03:35:41 -0000	1.44
--- List.java	7 Dec 2002 09:05:41 -0000	1.45
***************
*** 113,118 ****
  	 */
  	public boolean add(Object object) {
! 		write();
! 		return list.add(object);
  	}
  
--- 113,123 ----
  	 */
  	public boolean add(Object object) {
! 		if ( !scheduleAdd(object) ) {
! 			write();
! 			return list.add(object);
! 		}
! 		else {
! 			return true;
! 		}
  	}
  
***************
*** 136,142 ****
  	 * @see List#addAll(Collection)
  	 */
! 	public boolean addAll(Collection arg0) {
! 		write();
! 		return list.addAll( arg0);
  	}
  
--- 141,152 ----
  	 * @see List#addAll(Collection)
  	 */
! 	public boolean addAll(Collection c) {
! 		if ( !scheduleAddAll(c) ) {
! 			write();
! 			return list.addAll(c);
! 		}
! 		else {
! 			return c.size()>0;
! 		}
  	}
  

Index: PersistentCollection.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate/cirrus/hibernate/collections/PersistentCollection.java,v
retrieving revision 1.75
retrieving revision 1.76
diff -C2 -d -r1.75 -r1.76
*** PersistentCollection.java	26 Nov 2002 03:35:41 -0000	1.75
--- PersistentCollection.java	7 Dec 2002 09:05:41 -0000	1.76
***************
*** 5,8 ****
--- 5,9 ----
  import cirrus.hibernate.impl.CollectionPersister;
  
+ import java.util.ArrayList;
  import java.util.Collection;
  import java.util.Iterator;
***************
*** 43,46 ****
--- 44,48 ----
  	protected transient SessionImplementor session;
  	protected boolean initialized;
+ 	private transient List additions;
  
  	//Careful: these methods do not initialize the collection.
***************
*** 58,61 ****
--- 60,93 ----
  		if ( session!=null && session.isOpen() ) session.dirty(this);
  	}
+ 	
+ 	private boolean mayScheduleAdd() {
+ 		return !initialized && session!=null && session.isOpen() && session.isCollectionReadOnly(this);
+ 	}
+ 	
+ 	protected final boolean scheduleAdd(Object element) {
+ 		if ( mayScheduleAdd() ) {
+ 			if (additions==null) additions = new ArrayList(10);
+ 			additions.add(element);
+ 			return true;
+ 		}
+ 		else {
+ 			return false;
+ 		}
+ 	}
+ 	
+ 	protected final boolean scheduleAddAll(Collection coll) {
+ 		if ( mayScheduleAdd() ) {
+ 			if (additions==null) additions = new ArrayList(20);
+ 			additions.addAll(coll);
+ 			return true;
+ 		}
+ 		else {
+ 			return false;
+ 		}
+ 	}
+ 	
+ 	public boolean addAll(Object obj) {
+ 		throw new AssertionFailure("Collection does not support delayed initialization");
+ 	}
  
  	protected PersistentCollection(SessionImplementor session) {
***************
*** 79,86 ****
  	public final void initialize(boolean writing) {
  		if (!initialized) {
! 			if ( session!=null  && session.isOpen() )  {
  				try {
  					session.initialize(this, writing);
  					initialized = true;
  				}
  				catch (Exception e) {
--- 111,123 ----
  	public final void initialize(boolean writing) {
  		if (!initialized) {
! 			if ( session!=null && session.isOpen() )  {
  				try {
  					session.initialize(this, writing);
  					initialized = true;
+ 					//do this bit after setting initialized to true or it will recurse
+ 					if (additions!=null) {
+ 						addAll(additions);
+ 						additions=null;
+ 					}
  				}
  				catch (Exception e) {

[Hibernate-commits] Hibernate/cirrus/hibernate/test MasterDetailTest.java,1.41,1.42

[<one...@us...>]

Update of /cvsroot/hibernate/Hibernate/cirrus/hibernate/test
In directory sc8-pr-cvs1:/tmp/cvs-serv25742/cirrus/hibernate/test

Modified Files:
	MasterDetailTest.java 
Log Message:
added new test queries

Index: MasterDetailTest.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate/cirrus/hibernate/test/MasterDetailTest.java,v
retrieving revision 1.41
retrieving revision 1.42
diff -C2 -d -r1.41 -r1.42
*** MasterDetailTest.java	20 Nov 2002 14:20:10 -0000	1.41
--- MasterDetailTest.java	7 Dec 2002 08:20:53 -0000	1.42
***************
*** 65,68 ****
--- 65,72 ----
  		Session s = sessions.openSession();
  		Transaction t = s.beginTransaction();
+ 		if ( !(dialect instanceof MySQLDialect) && !(dialect instanceof SAPDBDialect) ) {
+ 			s.iterate("FROM m IN CLASS Master WHERE NOT EXISTS ( FROM d IN m.details.elements WHERE NOT d.i=5 )");
+ 			s.iterate("FROM m IN CLASS Master WHERE NOT 5 IN ( SELECT d.i FROM d IN m.details.elements )");
+ 		}
  		s.iterate("SELECT m FROM m IN CLASS cirrus.hibernate.test.Master, d IN m.details.elements WHERE d.i=5");
  		s.find("SELECT m FROM m IN CLASS cirrus.hibernate.test.Master, d IN m.details.elements WHERE d.i=5");

[Hibernate-commits] Hibernate changelog.txt,1.282,1.283 hibernate.properties,1.93,1.94

[<one...@us...>]

Update of /cvsroot/hibernate/Hibernate
In directory sc8-pr-cvs1:/tmp/cvs-serv23295

Modified Files:
	changelog.txt hibernate.properties 
Log Message:
1.2final

Index: changelog.txt
===================================================================
RCS file: /cvsroot/hibernate/Hibernate/changelog.txt,v
retrieving revision 1.282
retrieving revision 1.283
diff -C2 -d -r1.282 -r1.283
*** changelog.txt	30 Nov 2002 08:28:12 -0000	1.282
--- changelog.txt	7 Dec 2002 08:16:09 -0000	1.283
***************
*** 3,7 ****
--- 3,12 ----
  Changes in version 1.2 final
  ----------------------------
+ * fixed a bug where uppercase IS NOT NULL, NOT IN, etc were not parsed correctly
+ * added ResinTransactionManagerLookup
  * improved exception message when setting null to primitive type (Max Andersen)
+ * improved exception message for an unserializable identifier
+ * support for overloaded setter methods (patch by Alex Staubo)
+ * CodeGenerator support for <composite-element> (patch by Wolfgang Jung)
  
  Changes in version 1.2 beta 4 (29.11.2002)

Index: hibernate.properties
===================================================================
RCS file: /cvsroot/hibernate/Hibernate/hibernate.properties,v
retrieving revision 1.93
retrieving revision 1.94
diff -C2 -d -r1.93 -r1.94
*** hibernate.properties	30 Nov 2002 14:24:07 -0000	1.93
--- hibernate.properties	7 Dec 2002 08:16:09 -0000	1.94
***************
*** 231,234 ****
--- 231,235 ----
  #hibernate.transaction.manager_lookup_class cirrus.hibernate.transaction.WebSphereTransactionManagerLookup
  #hibernate.transaction.manager_lookup_class cirrus.hibernate.transaction.OrionTransactionManagerLookup
+ #hibernate.transaction.manager_lookup_class cirrus.hibernate.transaction.ResinTransactionManagerLookup
  
  

[Hibernate-commits] Hibernate/doc/reference/src session_configuration.xml,1.26,1.27

[<one...@us...>]

Update of /cvsroot/hibernate/Hibernate/doc/reference/src
In directory sc8-pr-cvs1:/tmp/cvs-serv23295/doc/reference/src

Modified Files:
	session_configuration.xml 
Log Message:
1.2final

Index: session_configuration.xml
===================================================================
RCS file: /cvsroot/hibernate/Hibernate/doc/reference/src/session_configuration.xml,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** session_configuration.xml	30 Nov 2002 03:57:30 -0000	1.26
--- session_configuration.xml	7 Dec 2002 08:16:09 -0000	1.27
***************
*** 491,494 ****
--- 491,496 ----
              <member><literal>cirrus.hibernate.transaction.OrionTransactionManagerLookup</literal></member>
              <member>for Orion</member>
+             <member><literal>cirrus.hibernate.transaction.ResinTransactionManagerLookup</literal></member>
+             <member>for Resin</member>
          </simplelist>
  

[Hibernate-commits] Hibernate/cirrus/hibernate/tools/codegen ClassMapping.java,1.17,1.18

[<one...@us...>]

Update of /cvsroot/hibernate/Hibernate/cirrus/hibernate/tools/codegen
In directory sc8-pr-cvs1:/tmp/cvs-serv19832/hibernate/tools/codegen

Modified Files:
	ClassMapping.java 
Log Message:
more work on infoString() stuff
integrated setter location patch by Alex Staubo
integrated composite-element codegen patch by Wolfgang Jung

Index: ClassMapping.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate/cirrus/hibernate/tools/codegen/ClassMapping.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** ClassMapping.java	28 Nov 2002 12:33:34 -0000	1.17
--- ClassMapping.java	7 Dec 2002 08:10:24 -0000	1.18
***************
*** 302,305 ****
--- 302,322 ----
           
           fields.add(new Field(name, interfaceClassName.getName(), "new " + implementingClassName.getName() + "()", false) );
+          if (collection.getChildren("composite-element") != null) {
+            for (Iterator compositeElements = collection.getChildren("composite-element").iterator(); compositeElements.hasNext(); ) {
+              Element compositeElement = (Element) compositeElements.next();
+              String compClass = compositeElement.getAttributeValue("class");
+              
+              try {
+                ClassMapping mapping = new ClassMapping(compositeElement, true);
+                ClassName classType = new ClassName();
+                classType.setFullyQualifiedName(compClass);
+                // add an import and field for this property
+                addImport(classType);
+                components.put( mapping.getCanonicalName(), mapping );
+              } catch (Exception e) {
+                System.err.println("Error building composite-element " + compClass);
+              }
+            }
+          }           
        }
     }

[Hibernate-commits] Hibernate/cirrus/hibernate/test Glarch.java,1.18,1.19

[<one...@us...>]

Update of /cvsroot/hibernate/Hibernate/cirrus/hibernate/test
In directory sc8-pr-cvs1:/tmp/cvs-serv19832/hibernate/test

Modified Files:
	Glarch.java 
Log Message:
more work on infoString() stuff
integrated setter location patch by Alex Staubo
integrated composite-element codegen patch by Wolfgang Jung

Index: Glarch.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate/cirrus/hibernate/test/Glarch.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** Glarch.java	26 Nov 2002 03:35:44 -0000	1.18
--- Glarch.java	7 Dec 2002 08:10:24 -0000	1.19
***************
*** 38,41 ****
--- 38,45 ----
  	}
  
+ 	public void setName(int name) {
+ 		this.name = Integer.toString(name);
+ 	}
+ 
  	public GlarchProxy getNext() {
  		return next;

[Hibernate-commits] Hibernate/cirrus/hibernate/impl SessionImpl.java,1.155,1.156

[<one...@us...>]

Update of /cvsroot/hibernate/Hibernate/cirrus/hibernate/impl
In directory sc8-pr-cvs1:/tmp/cvs-serv19832/hibernate/impl

Modified Files:
	SessionImpl.java 
Log Message:
more work on infoString() stuff
integrated setter location patch by Alex Staubo
integrated composite-element codegen patch by Wolfgang Jung

Index: SessionImpl.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate/cirrus/hibernate/impl/SessionImpl.java,v
retrieving revision 1.155
retrieving revision 1.156
diff -C2 -d -r1.155 -r1.156
*** SessionImpl.java	6 Dec 2002 12:22:20 -0000	1.155
--- SessionImpl.java	7 Dec 2002 08:10:23 -0000	1.156
***************
*** 241,245 ****
  
   			if ( log.isDebugEnabled() && dirty && loadedPersister!=null ) log.debug(
!  				"Collection dirty: " + loadedPersister.getRole() + '#' + loadedID
   			);
  
--- 241,245 ----
  
   			if ( log.isDebugEnabled() && dirty && loadedPersister!=null ) log.debug(
!  				"Collection dirty: " + infoString(loadedPersister, loadedID)
   			);
  
***************
*** 2035,2043 ****
  		if ( log.isDebugEnabled() ) {
  			log.debug(
! 				"Collection found: " + persister.getRole() + '#' + ce.currentID + ", was: " + (
! 					(ce.loadedPersister==null) ?
! 					"unreferenced" :
! 					ce.loadedPersister.getRole() + "#" + ce.loadedID
! 				)
  			);
  		}
--- 2035,2040 ----
  		if ( log.isDebugEnabled() ) {
  			log.debug(
! 				"Collection found: " + infoString(persister, ce.currentID) + 
! 				", was: " + infoString(ce.loadedPersister, ce.loadedID)
  			);
  		}
***************
*** 2151,2155 ****
  		CollectionEntry entry = getCollectionEntry(coll);
  		if ( log.isDebugEnabled() && entry.loadedPersister!=null ) log.debug(
! 			"Collection dereferenced: " + entry.loadedPersister.getRole() + '#' + entry.loadedID
  		);
  		entry.currentPersister=null;
--- 2148,2152 ----
  		CollectionEntry entry = getCollectionEntry(coll);
  		if ( log.isDebugEnabled() && entry.loadedPersister!=null ) log.debug(
! 			"Collection dereferenced: " + infoString(entry.loadedPersister, entry.loadedID)
  		);
  		entry.currentPersister=null;
***************
*** 2340,2344 ****
  			//if (closed) throw new LazyInitializationException( "Hibernate failed trying to load a collection - the session is closed" );
  
! 			if ( log.isTraceEnabled() ) log.trace( "initializing collection " + ce.loadedPersister.getRole() + '#' + ce.loadedID );
  
  			CollectionPersister p = ce.loadedPersister;
--- 2337,2341 ----
  			//if (closed) throw new LazyInitializationException( "Hibernate failed trying to load a collection - the session is closed" );
  
! 			if ( log.isTraceEnabled() ) log.trace( "initializing collection " + infoString(ce.loadedPersister, ce.loadedID) );
  
  			CollectionPersister p = ce.loadedPersister;
***************
*** 2574,2595 ****
       * @return String on the form [FooBar#id]
       */
!     private String infoString(ClassPersister persister, Serializable id) {
          StringBuffer s = new StringBuffer();
!         s.append("[");
          if(persister==null) {
!            s.append("<ClassPersister is null>");
          } 
          else {
            s.append(persister.getClassName());
          }
!         s.append("#");
  
          if (id==null) {
!                s.append("native");
          } 
          else {
              s.append(id);
          }
!         s.append("]");
  
          return s.toString();
--- 2571,2592 ----
       * @return String on the form [FooBar#id]
       */
!     private static String infoString(ClassPersister persister, Serializable id) {
          StringBuffer s = new StringBuffer();
!         s.append('[');
          if(persister==null) {
!            s.append("<null ClassPersister>");
          } 
          else {
            s.append(persister.getClassName());
          }
!         s.append('#');
  
          if (id==null) {
!                s.append("<null>");
          } 
          else {
              s.append(id);
          }
!         s.append(']');
  
          return s.toString();
***************
*** 2597,2634 ****
      }
      
!     private String infoString(Class clazz, Serializable id) {
          StringBuffer s = new StringBuffer();
!         s.append("[");
          if(clazz==null) {
!            s.append("<Class is null>");
          } 
          else {
!           s.append(clazz.getName());
          }
!         s.append("#");
  
          if (id==null) {
!                s.append("native");
          } 
          else {
              s.append(id);
          }
!         s.append("]");
  
          return s.toString();
      }
  
! 	private String infoString(ClassPersister persister) {
  		StringBuffer s = new StringBuffer();
! 		s.append("[");
  		if (persister == null) {
! 			s.append("<ClassPersister is null>");
  		} 
  		else {
! 			s.append(persister.getClassName());
  		}
! 		s.append("]");
  		return s.toString();
  	}
  
  }
--- 2594,2654 ----
      }
      
!     private static String infoString(Class clazz, Serializable id) {
          StringBuffer s = new StringBuffer();
!         s.append('[');
          if(clazz==null) {
!             s.append("<null Class>");
          } 
          else {
!             s.append( clazz.getName() );
          }
!         s.append('#');
  
          if (id==null) {
!             s.append("<null>");
          } 
          else {
              s.append(id);
          }
!         s.append(']');
  
          return s.toString();
      }
  
! 	private static String infoString(ClassPersister persister) {
  		StringBuffer s = new StringBuffer();
! 		s.append('[');
  		if (persister == null) {
! 			s.append("<null ClassPersister>");
  		} 
  		else {
! 			s.append( persister.getClassName() );
  		}
! 		s.append(']');
  		return s.toString();
  	}
+ 
+     private static String infoString(CollectionPersister persister, Serializable id) {
+         StringBuffer s = new StringBuffer();
+         s.append('[');
+         if(persister==null) {
+            s.append("<unreferenced>");
+         } 
+         else {
+ 	        s.append( persister.getRole() );
+ 	        s.append('#');
+ 	
+ 	        if (id==null) {
+ 	            s.append("<null>");
+ 	        } 
+ 	        else {
+ 	            s.append(id);
+ 	        }
+         }
+         s.append(']');
+ 
+         return s.toString();
+ 
+     }
  
  }

[Hibernate-commits] Hibernate/cirrus/hibernate/helpers ReflectHelper.java,1.35,1.36

[<one...@us...>]

Update of /cvsroot/hibernate/Hibernate/cirrus/hibernate/helpers
In directory sc8-pr-cvs1:/tmp/cvs-serv19832/hibernate/helpers

Modified Files:
	ReflectHelper.java 
Log Message:
more work on infoString() stuff
integrated setter location patch by Alex Staubo
integrated composite-element codegen patch by Wolfgang Jung

Index: ReflectHelper.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate/cirrus/hibernate/helpers/ReflectHelper.java,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -d -r1.35 -r1.36
*** ReflectHelper.java	30 Nov 2002 08:18:59 -0000	1.35
--- ReflectHelper.java	7 Dec 2002 08:10:23 -0000	1.36
***************
*** 161,167 ****
  	}
  	
! 	private static Method setter(Class theClass, String propertyName) {
  		
  		Method[] methods = theClass.getDeclaredMethods();
  		for (int i=0; i<methods.length; i++) {
  			if(
--- 161,170 ----
  	}
  	
! 	private static Method setter(Class theClass, String propertyName) throws MappingException {
! 		
! 		Class returnType = getGetter(theClass, propertyName).getReturnType();
  		
  		Method[] methods = theClass.getDeclaredMethods();
+ 		Method potentialSetter = null;
  		for (int i=0; i<methods.length; i++) {
  			if(
***************
*** 171,181 ****
  				String testStdMethod = Introspector.decapitalize( methods[i].getName().substring(3) );
  				String testOldMethod = methods[i].getName().substring(3);				
! 				if ( 
! 					( testStdMethod.equals(propertyName) || testOldMethod.equals(propertyName) ) && 
! 					( methods[i].getParameterTypes().length==1 ) 
! 				) return methods[i];
  			}
  		}	
! 		return null;	
  	}
  	
--- 174,187 ----
  				String testStdMethod = Introspector.decapitalize( methods[i].getName().substring(3) );
  				String testOldMethod = methods[i].getName().substring(3);				
! 				if (
! 					( testStdMethod.equals(propertyName) || testOldMethod.equals(propertyName) ) &&
! 					( methods[i].getParameterTypes().length==1 )
! 				) {
! 					potentialSetter = methods[i];
! 					if ( methods[i].getParameterTypes()[0].equals(returnType) ) return potentialSetter;
! 				}
  			}
  		}	
! 		return potentialSetter;	
  	}
  	

[Hibernate-commits] Hibernate/cirrus/hibernate/persister AbstractEntityPersister.java,1.18,1.19

[<one...@us...>]

Update of /cvsroot/hibernate/Hibernate/cirrus/hibernate/persister
In directory sc8-pr-cvs1:/tmp/cvs-serv2157/hibernate/persister

Modified Files:
	AbstractEntityPersister.java 
Log Message:
fixed a bug parsing upper case IS NOT NULL, NOT IN, etc
improved some exception messages (incl patch by Max Andersen)
added Resin support

Index: AbstractEntityPersister.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate/cirrus/hibernate/persister/AbstractEntityPersister.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** AbstractEntityPersister.java	30 Nov 2002 08:19:00 -0000	1.18
--- AbstractEntityPersister.java	6 Dec 2002 12:24:31 -0000	1.19
***************
*** 263,272 ****
  	
  	public Serializable getIdentifier(Object object) throws HibernateException {
  		if (hasEmbeddedIdentifier) {
! 			return (Serializable) object;
  		}
  		else {
  			if (identifierGetter==null) throw new HibernateException( "The class has no identifier property: " + className );
! 			return (Serializable) identifierGetter.get(object);
  		}
  	}
--- 263,279 ----
  	
  	public Serializable getIdentifier(Object object) throws HibernateException {
+ 		final Object id;
  		if (hasEmbeddedIdentifier) {
! 			id = object;
  		}
  		else {
  			if (identifierGetter==null) throw new HibernateException( "The class has no identifier property: " + className );
! 			id = identifierGetter.get(object);
! 		}
! 		try {
! 			return (Serializable) id;
! 		}
! 		catch (ClassCastException cce) {
! 			throw new ClassCastException( "Identifier classes must be serializable: " + cce.getMessage() );
  		}
  	}

[Hibernate-commits] Hibernate/cirrus/hibernate/transaction ResinTransactionManagerLookup.java,NONE,1.1

[<one...@us...>]

Update of /cvsroot/hibernate/Hibernate/cirrus/hibernate/transaction
In directory sc8-pr-cvs1:/tmp/cvs-serv2157/hibernate/transaction

Added Files:
	ResinTransactionManagerLookup.java 
Log Message:
fixed a bug parsing upper case IS NOT NULL, NOT IN, etc
improved some exception messages (incl patch by Max Andersen)
added Resin support

--- NEW FILE: ResinTransactionManagerLookup.java ---
//$Id: ResinTransactionManagerLookup.java,v 1.1 2002/12/06 12:24:32 oneovthafew Exp $
package cirrus.hibernate.transaction;

public class ResinTransactionManagerLookup
	extends JNDITransactionManagerLookup {

	/**
	 * @see cirrus.hibernate.transaction.JNDITransactionManagerLookup#getName()
	 */
	protected String getName() {
		return "java:comp/UserTransaction";
	}

}

[Hibernate-commits] Hibernate/cirrus/hibernate/query PreprocessingParser.java,1.3,1.4

[<one...@us...>]

Update of /cvsroot/hibernate/Hibernate/cirrus/hibernate/query
In directory sc8-pr-cvs1:/tmp/cvs-serv2157/hibernate/query

Modified Files:
	PreprocessingParser.java 
Log Message:
fixed a bug parsing upper case IS NOT NULL, NOT IN, etc
improved some exception messages (incl patch by Max Andersen)
added Resin support

Index: PreprocessingParser.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate/cirrus/hibernate/query/PreprocessingParser.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** PreprocessingParser.java	26 Nov 2002 03:35:44 -0000	1.3
--- PreprocessingParser.java	6 Dec 2002 12:24:32 -0000	1.4
***************
*** 78,82 ****
  				lastToken + ' ' + token :
  				lastToken + token;
! 			if ( operators.contains(doubleToken) ) {
  				parser.token(doubleToken, q);
  				lastToken=null;
--- 78,82 ----
  				lastToken + ' ' + token :
  				lastToken + token;
! 			if ( operators.contains( doubleToken.toLowerCase() ) ) {
  				parser.token(doubleToken, q);
  				lastToken=null;