hibernate-commits — CVS commits

[Hibernate-commits] Hibernate2/doc/reference/html adv-or-mapping.html,1.3,NONE architecture.html,1.3,NONE best-practices.html,1.3,NONE examples.html,1.3,NONE index.html,1.4,NONE manipulating-data.html,1.3,NONE or-mapping.html,1.3,NONE persistent-classes.html,1.2,NONE query-language.html,1.4,NONE session-configuration.html,1.4,NONE transactions.html,1.3,NONE

[<tu...@us...>]

Update of /cvsroot/hibernate/Hibernate2/doc/reference/html
In directory sc8-pr-cvs1:/tmp/cvs-serv23426/doc/reference/html

Removed Files:
	adv-or-mapping.html architecture.html best-practices.html 
	examples.html index.html manipulating-data.html 
	or-mapping.html persistent-classes.html query-language.html 
	session-configuration.html transactions.html 
Log Message:
No longer needed, generated with build.xml

--- adv-or-mapping.html DELETED ---

--- architecture.html DELETED ---

--- best-practices.html DELETED ---

--- examples.html DELETED ---

--- index.html DELETED ---

--- manipulating-data.html DELETED ---

--- or-mapping.html DELETED ---

--- persistent-classes.html DELETED ---

--- query-language.html DELETED ---

--- session-configuration.html DELETED ---

--- transactions.html DELETED ---

[Hibernate-commits] Hibernate2/doc/reference/bin db2fopdf.sh,1.1,NONE db2html.sh,1.1,NONE

[<tu...@us...>]

Update of /cvsroot/hibernate/Hibernate2/doc/reference/bin
In directory sc8-pr-cvs1:/tmp/cvs-serv22750/doc/reference/bin

Removed Files:
	db2fopdf.sh db2html.sh 
Log Message:
No longer needed, build.xml now

--- db2fopdf.sh DELETED ---

--- db2html.sh DELETED ---

[Hibernate-commits] Hibernate2/doc/reference/src advanced_or_mapping.xml,1.10,1.11

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

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

Modified Files:
	advanced_or_mapping.xml 
Log Message:
fixed some minor doco bigs

Index: advanced_or_mapping.xml
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/doc/reference/src/advanced_or_mapping.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** advanced_or_mapping.xml	23 Feb 2003 13:53:24 -0000	1.10
--- advanced_or_mapping.xml	27 Mar 2003 11:29:38 -0000	1.11
***************
*** 173,178 ****
                          <para>
                              <literal>cascade</literal> (optional - defaults to <literal>none</literal>)
!                             enable operations to cascade to child entities (not used for toplevel
!                             collections)
                          </para>
                      </callout>                   
--- 173,177 ----
                          <para>
                              <literal>cascade</literal> (optional - defaults to <literal>none</literal>)
!                             enable operations to cascade to child entities
                          </para>
                      </callout>                   
***************
*** 305,310 ****
                  An association from <literal>Foo</literal> to <literal>Bar</literal> requires the 
                  addition of a key column and possibly an index column to the table of the contained 
!                 entity class, <literal>Bar</literal>. If the association is declared toplevel, a 
!                 foreign key column is required in the table of <literal>Foo</literal>.
              </para>
  
--- 304,308 ----
                  An association from <literal>Foo</literal> to <literal>Bar</literal> requires the 
                  addition of a key column and possibly an index column to the table of the contained 
!                 entity class, <literal>Bar</literal>.
              </para>
  
***************
*** 726,733 ****
  
              <para>
!                 The properties of a component may be of any Hibernate type (nested and toplevel
!                 collections, many-to-one associations, other components, etc). Nested components
!                 should <emphasis>not</emphasis> be considered an exotic usage. Hibernate is intended 
!                 to support a very fine-grained object model.
              </para>
              
--- 724,731 ----
  
              <para>
!                 The properties of a component may be of any Hibernate type (collections, many-to-one 
!                 associations, other components, etc). Nested components should <emphasis>not</emphasis> 
!                 be considered an exotic usage. Hibernate is intended to support a very fine-grained 
!                 object model.
              </para>
              

[Hibernate-commits] Hibernate2/src/net/sf/hibernate/cfg Environment.java,1.5,1.6

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

Update of /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/cfg
In directory sc8-pr-cvs1:/tmp/cvs-serv15024/cfg

Modified Files:
	Environment.java 
Log Message:
Alex Burgel's patch for DBCP connection validation

Index: Environment.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/cfg/Environment.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Environment.java	28 Feb 2003 07:01:27 -0000	1.5
--- Environment.java	26 Mar 2003 10:47:55 -0000	1.6
***************
*** 178,182 ****
  	public static final String DBCP_WHENEXHAUSTED = "hibernate.dbcp.whenExhaustedAction";
  	/**
! 	 * Query to execute for connection validation (optional)
  	 */
  	public static final String DBCP_VALIDATION_QUERY = "hibernate.dbcp.validationQuery";
--- 178,191 ----
  	public static final String DBCP_WHENEXHAUSTED = "hibernate.dbcp.whenExhaustedAction";
  	/**
! 	 * Validate connection when borrowing connection from pool (optional, true or false)
! 	 */
! 	public static final String DBCP_VALIDATION_ONBORROW = "hibernate.dbcp.testOnBorrow";
! 	/**
! 	 * Validate connection when returning connection to pool (optional, true or false)
! 	 */
! 	public static final String DBCP_VALIDATION_ONRETURN = "hibernate.dbcp.testOnReturn";
! 	/**
! 	 * Query to execute for connection validation (optional, requires either 
! 	 * <tt>DBCP_VALIDATION_ONBORROW</tt> or <tt>DBCP_VALIDATION_ONRETURN</tt>)
  	 */
  	public static final String DBCP_VALIDATION_QUERY = "hibernate.dbcp.validationQuery";

[Hibernate-commits] Hibernate2/src/net/sf/hibernate/connection DBCPConnectionProvider.java,1.6,1.7

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

Update of /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/connection
In directory sc8-pr-cvs1:/tmp/cvs-serv15024/connection

Modified Files:
	DBCPConnectionProvider.java 
Log Message:
Alex Burgel's patch for DBCP connection validation

Index: DBCPConnectionProvider.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/connection/DBCPConnectionProvider.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** DBCPConnectionProvider.java	22 Feb 2003 06:42:07 -0000	1.6
--- DBCPConnectionProvider.java	26 Mar 2003 10:47:56 -0000	1.7
***************
*** 8,11 ****
--- 8,16 ----
  import javax.sql.DataSource;
  
+ import net.sf.hibernate.HibernateException;
+ import net.sf.hibernate.cfg.Environment;
+ import net.sf.hibernate.util.JDBCExceptionReporter;
+ import net.sf.hibernate.util.PropertiesHelper;
+ 
  import org.apache.commons.dbcp.ConnectionFactory;
  import org.apache.commons.dbcp.DriverManagerConnectionFactory;
***************
*** 19,26 ****
  import org.apache.commons.pool.impl.GenericObjectPool;
  
- import net.sf.hibernate.HibernateException;
- import net.sf.hibernate.cfg.Environment;
- import net.sf.hibernate.util.JDBCExceptionReporter;
- 
  /**
   * A connection provider that uses an Apache commons DBCP connection pool. Hibernate will
--- 24,27 ----
***************
*** 41,45 ****
  			final Connection c = ds.getConnection();
  			if (isolation!=null) c.setTransactionIsolation( isolation.intValue() );
- 			c.setAutoCommit(false);
  			return c;
  		}
--- 42,45 ----
***************
*** 95,99 ****
  				Byte.parseByte( props.getProperty(Environment.DBCP_WHENEXHAUSTED) ),
  				Long.parseLong( props.getProperty(Environment.DBCP_MAXWAIT) ),
! 				Integer.parseInt( props.getProperty(Environment.DBCP_MAXIDLE) )
  			);
  			
--- 95,101 ----
  				Byte.parseByte( props.getProperty(Environment.DBCP_WHENEXHAUSTED) ),
  				Long.parseLong( props.getProperty(Environment.DBCP_MAXWAIT) ),
! 				Integer.parseInt( props.getProperty(Environment.DBCP_MAXIDLE) ),
! 				PropertiesHelper.getBoolean( Environment.DBCP_VALIDATION_ONBORROW, props ),
! 				PropertiesHelper.getBoolean( Environment.DBCP_VALIDATION_ONRETURN, props )
  			);
  			

[Hibernate-commits] Hibernate2/lib jta.jar,NONE,1.1 jdbc2_0-stdext.licence.txt,NONE,1.1 connector.licence.txt,NONE,1.1 jta.licence.txt,NONE,1.1 jdbc2_0-stdext.jar,NONE,1.1 jaas.jar,NONE,1.1 jaas.licence.txt,NONE,1.1 j2ee.jar,1.1.1.1,NONE

[<db...@us...>]

Update of /cvsroot/hibernate/Hibernate2/lib
In directory sc8-pr-cvs1:/tmp/cvs-serv11625/lib

Added Files:
	jta.jar jdbc2_0-stdext.licence.txt connector.licence.txt 
	jta.licence.txt jdbc2_0-stdext.jar jaas.jar jaas.licence.txt 
Removed Files:
	j2ee.jar 
Log Message:
Split j2ee.jar into required packages as per sun licence agreement. Currently only need jca, jta, jaas, jdbc2 ext. Other javax things come with JDK1.3 and above

--- NEW FILE: jta.jar ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: jdbc2_0-stdext.licence.txt ---
                Sun Microsystems, Inc.
Binary Code License Agreement

READ THE TERMS OF THIS AGREEMENT AND ANY PROVIDED
SUPPLEMENTAL LICENSE TERMS (COLLECTIVELY
"AGREEMENT") CAREFULLY BEFORE OPENING THE SOFTWARE
MEDIA PACKAGE.  BY OPENING THE SOFTWARE MEDIA
PACKAGE, YOU AGREE TO THE TERMS OF THIS AGREEMENT.
IF YOU ARE ACCESSING THE SOFTWARE ELECTRONICALLY,
INDICATE YOUR ACCEPTANCE OF THESE TERMS BY
SELECTING THE "ACCEPT" BUTTON AT THE END OF THIS
AGREEMENT.  IF YOU DO NOT AGREE TO ALL THESE
TERMS, PROMPTLY RETURN THE UNUSED SOFTWARE TO YOUR
PLACE OF PURCHASE FOR A REFUND OR, IF THE SOFTWARE
IS ACCESSED ELECTRONICALLY, SELECT THE "DECLINE"
BUTTON AT THE END OF THIS AGREEMENT.

1.  LICENSE TO USE.  Sun grants you a
non-exclusive and non-transferable license for the
internal use only of the accompanying software and
documentation and any error corrections provided
by Sun (collectively "Software"), by the number of
users and the class of computer hardware for which
the corresponding fee has been paid.

2.  RESTRICTIONS Software is confidential and
copyrighted. Title to Software and all associated
intellectual property rights is retained by Sun
and/or its licensors.  Except as specifically
authorized in any Supplemental License Terms, you
may not make copies of Software, other than a
single copy of Software for archival purposes.
Unless enforcement is prohibited by applicable
law, you may not modify, decompile, or reverse
engineer Software.  Software is not designed or
licensed for use in on-line control of aircraft,
air traffic, aircraft navigation or aircraft
communications; or in the design, construction,
operation or maintenance of any nuclear facility.
No right, title or interest in or to any
trademark, service mark, logo or trade name of Sun
or its licensors is granted under this Agreement.

3. LIMITED WARRANTY.  Sun warrants to you that for
a period of ninety (90) days from the date of
purchase, as evidenced by a copy of the receipt,
the media on which Software is furnished (if any)
will be free of defects in materials and
workmanship under normal use.  Except for the
foregoing, Software is provided "AS IS".  Your
exclusive remedy and Sun's entire liability under
this limited warranty will be at Sun's option to
replace Software media or refund the fee paid for
Software.

4.  DISCLAIMER OF WARRANTY.  UNLESS SPECIFIED IN
THIS AGREEMENT, ALL EXPRESS OR IMPLIED CONDITIONS,
REPRESENTATIONS AND WARRANTIES, INCLUDING ANY
IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
PARTICULAR PURPOSE OR NON-INFRINGEMENT ARE
DISCLAIMED, EXCEPT TO THE EXTENT THAT THESE
DISCLAIMERS ARE HELD TO BE LEGALLY INVALID.

5.  LIMITATION OF LIABILITY.  TO THE EXTENT NOT
PROHIBITED BY LAW, IN NO EVENT WILL SUN OR ITS
LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT
OR DATA, OR FOR SPECIAL, INDIRECT, CONSEQUENTIAL,
INCIDENTAL OR PUNITIVE DAMAGES, HOWEVER CAUSED
REGARDLESS OF THE THEORY OF LIABILITY, ARISING OUT
OF OR RELATED TO THE USE OF OR INABILITY TO USE
SOFTWARE, EVEN IF SUN HAS BEEN ADVISED OF THE
POSSIBILITY OF SUCH DAMAGES.  In no event will
Sun's liability to you, whether in contract, tort
(including negligence), or otherwise, exceed the
amount paid by you for Software under this
Agreement.  The foregoing limitations will apply
even if the above stated warranty fails of its
essential purpose.

6.  Termination.  This Agreement is effective
until terminated.  You may terminate this
Agreement at any time by destroying all copies of
Software.  This Agreement will terminate
immediately without notice from Sun if you fail to
comply with any provision of this Agreement.  Upon
Termination, you must destroy all copies of
Software.

7.  Export Regulations.  All Software and
technical data delivered under this Agreement are
subject to US export control laws and may be
subject to export or import regulations in other
countries.  You agree to comply strictly with all
such laws and regulations and acknowledge that you
have the responsibility to obtain such licenses to
export, re-export, or import as may be required
after delivery to you.

8.  U.S. Government Restricted Rights.  If
Software is being acquired by or on behalf of the
U.S. Government or by a U.S. Government prime
contractor or subcontractor (at any tier), then
the Government's rights in Software and
accompanying documentation will be only as set
forth in this Agreement; this is in accordance
with 48 CFR 227.7201 through 227.7202-4 (for
Department of Defense (DOD) acquisitions) and with
48 CFR 2.101 and 12.212 (for non-DOD
acquisitions).

9.  Governing Law.  Any action related to this
Agreement will be governed by California law and
controlling U.S. federal law.  No choice of law
rules of any jurisdiction will apply.

10.  Severability. If any provision of this
Agreement is held to be unenforceable, this
Agreement will remain in effect with the provision
omitted, unless omission would frustrate the
intent of the parties, in which case this
Agreement will immediately terminate.

11.  Integration.  This Agreement is the entire
agreement between you and Sun relating to its
subject matter.  It supersedes all prior or
contemporaneous oral or written communications,
proposals, representations and warranties and
prevails over any conflicting or additional terms
of any quote, order, acknowledgment, or other
communication between the parties relating to its
subject matter during the term of this Agreement.
No modification of this Agreement will be binding,
unless in writing and signed by an authorized
representative of each party.

For inquiries please contact: Sun Microsystems,
Inc.  901 San Antonio Road, Palo Alto, California
94303


SUPPLEMENTAL LICENSE TERMS
JDBCTM 2.0 INTERFACE CLASSES

These supplemental license terms ("Supplement")
add to or modify the terms of the Binary Code
License Agreement (collectively, the
"Agreement"). Capitalized terms not defined in
this Supplement shall have the same meanings
ascribed to them in the Agreement. These
Supplement terms shall supersede any inconsistent
or conflicting terms in the Agreement, or in any
license contained within the Software.

1. License to Distribute. Sun grants you a
non-exclusive, non-transferable, limited license
to reproduce and distribute the binary and/or
source code form of the Software to third party
end users through multiple tiers of distribution,
provided that you: (i) distribute the Software
complete and unmodified in its original Java
Archive file, and only bundled as a part of your
program that incorporates the Software
("Program"); (ii) do not distribute additional
software intended to replace any component(s) of
the Software; (iii) agree to incorporate the most
current version of the Software that was available
from Sun no later than 180 days prior to each
production release of the Program; (iv) do not
remove or alter any proprietary legends or notices
contained in or on the Software; (v) only
distribute the Program pursuant to a license
agreement that protects Sun's interest consistent
with the terms contained in the Agreement; (vi)
may not create, or authorize your licensees to cr!
eate additional classes, interfaces, or
subpackages that are contained in the "java"
"javax" or "sun" packages or similar as specified
by Sun in any class file naming convention; and
(vii) agree to defend and indemnify Sun and its
licensors from and against any damages, costs,
liabilities, settlement amounts and/or expenses
(including attorneys' fees) incurred in connection
with any claim, lawsuit or action by any third
party that arises or results from the use or
distribution of any and all Programs.

2. Trademarks and Logos. You acknowledge as
between you and Sun that Sun owns the Java
trademark and all Java-related trademarks, logos
and icons including the Coffee Cup and Duke ("Java
Marks") and agree to comply with the Java
Trademark Guidelines at
http://java.sun.com/trademarks.html.





                
--- NEW FILE: connector.licence.txt ---
Sun Microsystems, Inc. 
Binary Code License Agreement

READ THE TERMS OF THIS AGREEMENT AND ANY PROVIDED SUPPLEMENTAL LICENSE TERMS (COLLECTIVELY "AGREEMENT") CAREFULLY BEFORE OPENING THE SOFTWARE MEDIA PACKAGE.  BY OPENING THE SOFTWARE MEDIA PACKAGE, YOU AGREE TO THE TERMS OF THIS AGREEMENT.  IF YOU ARE ACCESSING THE SOFTWARE ELECTRONICALLY, INDICATE YOUR ACCEPTANCE OF THESE TERMS BY SELECTING THE "ACCEPT" BUTTON AT THE END OF THIS AGREEMENT.  IF YOU DO NOT AGREE TO ALL THESE TERMS, PROMPTLY RETURN THE UNUSED SOFTWARE TO YOUR PLACE OF PURCHASE FOR A REFUND OR, IF THE SOFTWARE IS ACCESSED ELECTRONICALLY, SELECT THE "DECLINE" BUTTON AT THE END OF THIS AGREEMENT. 

1.  LICENSE TO USE.  Sun grants you a non-exclusive and non-transferable license for the internal use only of the accompanying software and documentation and any error corrections provided by Sun (collectively "Software"), by the number of users and the class of computer hardware for which the corresponding fee has been paid. 

2.  RESTRICTIONS.  Software is confidential and copyrighted. Title to Software and all associated intellectual property rights is retained by Sun and/or its licensors.  Except as specifically authorized in any Supplemental License Terms, you may not make copies of Software, other than a single copy of Software for archival purposes.  Unless enforcement is prohibited by applicable law, you may not modify, decompile, or reverse engineer Software.  You acknowledge that Software is not designed, licensed or intended for use in the design, construction, operation or maintenance of any nuclear facility.  Sun disclaims any express or implied warranty of fitness for such uses.  No right, title or interest in or to any trademark, service mark, logo or trade name of Sun or its licensors is granted under this Agreement. 

3. LIMITED WARRANTY.  Sun warrants to you that for a period of ninety (90) days from the date of purchase, as evidenced by a copy of the receipt, the media on which Software is furnished (if any) will be free of defects in materials and workmanship under normal use.  Except for the foregoing, Software is provided "AS IS".  Your exclusive remedy and Sun's entire liability under this limited warranty will be at Sun's option to replace Software media or refund the fee paid for Software. 

4.  DISCLAIMER OF WARRANTY.  UNLESS SPECIFIED IN THIS AGREEMENT, ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES, INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT ARE DISCLAIMED, EXCEPT TO THE EXTENT THAT THESE DISCLAIMERS ARE HELD TO BE LEGALLY INVALID. 

5.  LIMITATION OF LIABILITY.  TO THE EXTENT NOT PROHIBITED BY LAW, IN NO EVENT WILL SUN OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR SPECIAL, INDIRECT, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE DAMAGES, HOWEVER CAUSED REGARDLESS OF THE THEORY OF LIABILITY, ARISING OUT OF OR RELATED TO THE USE OF OR INABILITY TO USE SOFTWARE, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.  In no event will Sun's liability to you, whether in contract, tort (including negligence), or otherwise, exceed the amount paid by you for Software under this Agreement.  The foregoing limitations will apply even if the above stated warranty fails of its essential purpose. 

6.  Termination.  This Agreement is effective until terminated.  You may terminate this Agreement at any time by destroying all copies of Software.  This Agreement will terminate immediately without notice from Sun if you fail to comply with any provision of this Agreement.  Upon Termination, you must destroy all copies of Software. 

7. Export Regulations. All Software and technical data delivered under this Agreement are subject to US export control laws and may be subject to export or import regulations in other countries.  You agree to comply strictly with all such laws and regulations and acknowledge that you have the responsibility to obtain such licenses to export, re-export, or import as may be required after delivery to you. 

8.   U.S. Government Restricted Rights.  If Software is being acquired by or on behalf of the U.S. Government or by a U.S. Government prime contractor or subcontractor (at any tier), then the Government's rights in Software and accompanying documentation will be only as set forth in this Agreement; this is in accordance with 48 CFR 227.7201 through 227.7202-4 (for Department of Defense (DOD) acquisitions) and with 48 CFR 2.101 and 12.212 (for non-DOD acquisitions). 

9.  Governing Law.  Any action related to this Agreement will be governed by California law and controlling U.S. federal law.  No choice of law rules of any jurisdiction will apply. 

10.  Severability. If any provision of this Agreement is held to be unenforceable, this Agreement will remain in effect with the provision omitted, unless omission would frustrate the intent of the parties, in which case this Agreement will immediately terminate. 

11.  Integration.  This Agreement is the entire agreement between you and Sun relating to its subject matter.  It supersedes all prior or contemporaneous oral or written communications, proposals, representations and warranties and prevails over any conflicting or additional terms of any quote, order, acknowledgment, or other communication between the parties relating to its subject matter during the term of this Agreement.  No modification of this Agreement will be binding, unless in writing and signed by an authorized representative of each party. 

JAVA(TM) INTERFACE CLASSES 

J2EE(TM) CONNECTOR ARCHITECTURE, VERSION 1.0 
SUPPLEMENTAL LICENSE TERMS

These supplemental license terms ("Supplemental Terms") add to or modify the terms of the Binary Code License Agreement (collectively, the "Agreement"). Capitalized terms not defined in these Supplemental Terms shall have the same meanings ascribed to them in the Agreement. These Supplemental Terms shall supersede any inconsistent or conflicting terms in the Agreement, or in any license contained within the Software. 

1. Software Internal Use and Development License Grant. Subject to the terms and conditions of this Agreement, including, but not limited to Section 3 (Java(TM) Technology Restrictions) of these Supplemental Terms, Sun grants you a non-exclusive, non-transferable, limited license to reproduce internally and use internally the binary form of the Software, complete and unmodified, for the sole purpose of designing, developing and testing your Java applets and applications ("Programs"). 

2. License to Distribute Software.  In addition to the license granted in Section 1 (Software Internal Use and Development License Grant) of these Supplemental Terms, subject to the terms and conditions of this Agreement, including but not limited to Section 3 (Java Technology Restrictions), Sun grants you a non-exclusive, non-transferable, limited license to reproduce and distribute the Software in binary form only, provided that you (i) distribute the Software complete and unmodified and only bundled as part of your Programs, (ii) do not distribute additional software intended to replace any component(s) of the Software, (iii) do not remove or alter any proprietary legends or notices contained in the Software, (iv) only distribute the Software subject to a license agreement that protects Sun's interests consistent with the terms contained in this Agreement, and (v) agree to defend and indemnify Sun and its licensors from and against any damages, costs, liabilities, settlement amounts and/or expenses (including attorneys' fees) incurred in connection with any claim, lawsuit or action by any third party that arises or results from the use or distribution of any and all Programs and/or Software. 

3. Java Technology Restrictions. You may not modify the Java Platform Interface ("JPI", identified as classes contained within the "java" package or any subpackages of the "java" package), by creating additional classes within the JPI or otherwise causing the addition to or modification of the classes in the JPI.  In the event that you create an additional class and associated API(s) which (i) extends the functionality of the Java Platform, and (ii) is exposed to third party software developers for the purpose of developing additional software which invokes such additional API, you must promptly publish broadly an accurate specification for such API for free use by all developers. You may not create, or authorize your licensees to create additional classes, interfaces, or subpackages that are in any way identified as "java", "javax", "sun" or similar convention as specified by Sun in any naming convention designation. 

4. Trademarks and Logos. You acknowledge and agree as between you and Sun that Sun owns the SUN, SOLARIS, JAVA, JINI, FORTE, and iPLANET trademarks and all SUN, SOLARIS, JAVA, JINI, FORTE, and iPLANET-related trademarks, service marks, logos and other brand designations ("Sun Marks"), and you agree to comply with the Sun Trademark and Logo Usage Requirements currently located at http://www.sun.com/policies/trademarks. Any use you make of the Sun Marks inures to Sun's benefit. 

5. Source Code. Software may contain source code that is provided solely for reference purposes pursuant to the terms of this Agreement.  Source code may not be redistributed unless expressly provided for in this Agreement. 

6.  Termination for Infringement.  Either party may terminate this Agreement immediately should any Software become, or in either party's opinion be likely to become, the subject of a claim of infringement of any intellectual property right. 

For inquiries please contact: Sun Microsystems, Inc.  901 San Antonio Road, Palo Alto, California 94303 


--- NEW FILE: jta.licence.txt ---
  
Sun Microsystems, Inc. 
Binary Code License Agreement

READ THE TERMS OF THIS AGREEMENT AND ANY PROVIDED SUPPLEMENTAL LICENSE TERMS (COLLECTIVELY "AGREEMENT") CAREFULLY BEFORE OPENING THE SOFTWARE MEDIA PACKAGE.  BY OPENING THE SOFTWARE MEDIA PACKAGE, YOU AGREE TO THE TERMS OF THIS AGREEMENT.  IF YOU ARE ACCESSING THE SOFTWARE ELECTRONICALLY, INDICATE YOUR ACCEPTANCE OF THESE TERMS BY SELECTING THE "ACCEPT" BUTTON AT THE END OF THIS AGREEMENT.  IF YOU DO NOT AGREE TO ALL THESE TERMS, PROMPTLY RETURN THE UNUSED SOFTWARE TO YOUR PLACE OF PURCHASE FOR A REFUND OR, IF THE SOFTWARE IS ACCESSED ELECTRONICALLY, SELECT THE "DECLINE" BUTTON AT THE END OF THIS AGREEMENT. 

1.  LICENSE TO USE.  Sun grants you a non-exclusive and non-transferable license for the internal use only of the accompanying software and documentation and any error corrections provided by Sun (collectively "Software"), by the number of users and the class of computer hardware for which the corresponding fee has been paid. 

2.  RESTRICTIONS.  Software is confidential and copyrighted. Title to Software and all associated intellectual property rights is retained by Sun and/or its licensors.  Except as specifically authorized in any Supplemental License Terms, you may not make copies of Software, other than a single copy of Software for archival purposes.  Unless enforcement is prohibited by applicable law, you may not modify, decompile, or reverse engineer Software.  Licensee acknowledges that Licensed Software is not designed or intended for use in the design, construction, operation or maintenance of any nuclear facility. Sun Microsystems, Inc. disclaims any express or implied warranty of fitness for such uses.   No right, title or interest in or to any trademark, service mark, logo or trade name of Sun or its licensors is granted under this Agreement. 

3. LIMITED WARRANTY.  Sun warrants to you that for a period of ninety (90) days from the date of purchase, as evidenced by a copy of the receipt, the media on which Software is furnished (if any) will be free of defects in materials and workmanship under normal use.  Except for the foregoing, Software is provided "AS IS".  Your exclusive remedy and Sun's entire liability under this limited warranty will be at Sun's option to replace Software media or refund the fee paid for Software. 

4.  DISCLAIMER OF WARRANTY.  UNLESS SPECIFIED IN THIS AGREEMENT, ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES, INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT ARE DISCLAIMED, EXCEPT TO THE EXTENT THAT THESE DISCLAIMERS ARE HELD TO BE LEGALLY INVALID. 

5.  LIMITATION OF LIABILITY.  TO THE EXTENT NOT PROHIBITED BY LAW, IN NO EVENT WILL SUN OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR SPECIAL, INDIRECT, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE DAMAGES, HOWEVER CAUSED REGARDLESS OF THE THEORY OF LIABILITY, ARISING OUT OF OR RELATED TO THE USE OF OR INABILITY TO USE SOFTWARE, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.  In no event will Sun's liability to you, whether in contract, tort (including negligence), or otherwise, exceed the amount paid by you for Software under this Agreement.  The foregoing limitations will apply even if the above stated warranty fails of its essential purpose. 

6.  Termination.  This Agreement is effective until terminated.  You may terminate this Agreement at any time by destroying all copies of Software.  This Agreement will terminate immediately without notice from Sun if you fail to comply with any provision of this Agreement.  Upon Termination, you must destroy all copies of Software. 

7. Export Regulations. All Software and technical data delivered under this Agreement are subject to US export control laws and may be subject to export or import regulations in other countries.  You agree to comply strictly with all such laws and regulations and acknowledge that you have the responsibility to obtain such licenses to export, re-export, or import as may be required after delivery to you. 

8.   U.S. Government Restricted Rights.  If Software is being acquired by or on behalf of the U.S. Government or by a U.S. Government prime contractor or subcontractor (at any tier), then the Government's rights in Software and accompanying documentation will be only as set forth in this Agreement; this is in accordance with 48 CFR 227.7201 through 227.7202-4 (for Department of Defense (DOD) acquisitions) and with 48 CFR 2.101 and 12.212 (for non-DOD acquisitions). 

9.  Governing Law.  Any action related to this Agreement will be governed by California law and controlling U.S. federal law.  No choice of law rules of any jurisdiction will apply. 

10.  Severability. If any provision of this Agreement is held to be unenforceable, this Agreement will remain in effect with the provision omitted, unless omission would frustrate the intent of the parties, in which case this Agreement will immediately terminate. 

11.  Integration.  This Agreement is the entire agreement between you and Sun relating to its subject matter.  It supersedes all prior or contemporaneous oral or written communications, proposals, representations and warranties and prevails over any conflicting or additional terms of any quote, order, acknowledgment, or other communication between the parties relating to its subject matter during the term of this Agreement.  No modification of this Agreement will be binding, unless in writing and signed by an authorized representative of each party. 

JAVATM INTERFACE CLASSES 
JAVA TRANSACTION API (JTA), VERSION 1.0.1B, MAINTENANCE RELEASE
SUPPLEMENTAL LICENSE TERMS

These supplemental license terms ("Supplemental Terms") add to or modify the terms of the Binary Code License Agreement (collectively, the "Agreement"). Capitalized terms not defined in these Supplemental Terms shall have the same meanings ascribed to them in the Agreement. These Supplemental Terms shall supersede any inconsistent or conflicting terms in the Agreement, or in any license contained within the Software. 

1. Software Internal Use and Development License Grant. Subject to the terms and conditions of this Agreement, including, but not limited to Section 3 (Java Technology Restrictions) of these Supplemental Terms, Sun grants you a non-exclusive, non-transferable, limited license to reproduce internally and use internally the binary form of the Software, complete and unmodified, for the sole purpose of designing, developing and testing your Java applets and applications ("Programs"). 

2. License to Distribute Software.  In addition to the license granted in Section 1 (Software Internal Use and Development License Grant) of these Supplemental Terms, subject to the terms and conditions of this Agreement, including but not limited to Section 3 (Java Technology Restrictions), Sun grants you a non-exclusive, non-transferable, limited license to reproduce and distribute the Software in binary form only, provided that you (i) distribute the Software complete and unmodified and only bundled as part of your Programs, (ii) do not distribute additional software intended to replace any component(s) of the Software, (iii) do not remove or alter any proprietary legends or notices contained in the Software, (iv) only distribute the Software subject to a license agreement that protects Sun's interests consistent with the terms contained in this Agreement, and (v) agree to defend and indemnify Sun and its licensors from and against any damages, costs, liabilities, settlement amounts and/or expenses (including attorneys' fees) incurred in connection with any claim, lawsuit or action by any third party that arises or results from the use or distribution of any and all Programs and/or Software. 

3. Java Technology Restrictions. You may not modify the Java Platform Interface ("JPI", identified as classes contained within the "java" package or any subpackages of the "java" package), by creating additional classes within the JPI or otherwise causing the addition to or modification of the classes in the JPI.  In the event that you create an additional class and associated API(s) which (i) extends the functionality of the Java Platform, and (ii) is exposed to third party software developers for the purpose of developing additional software which invokes such additional API, you must promptly publish broadly an accurate specification for such API for free use by all developers. You may not create, or authorize your licensees to create additional classes, interfaces, or subpackages that are in any way identified as "java", "javax", "sun" or similar convention as specified by Sun in any naming convention designation. 

4. Trademarks and Logos. You acknowledge and agree as between you and Sun that Sun owns the SUN, SOLARIS, JAVA, JINI, FORTE, and iPLANET trademarks and all SUN, SOLARIS, JAVA, JINI, FORTE, and iPLANET-related trademarks, service marks, logos and other brand designations ("Sun Marks"), and you agree to comply with the Sun Trademark and Logo Usage Requirements currently located at http://www.sun.com/policies/trademarks. Any use you make of the Sun Marks inures to Sun's benefit. 

5. Source Code. Software may contain source code that is provided solely for reference purposes pursuant to the terms of this Agreement.  Source code may not be redistributed unless expressly provided for in this Agreement. 

6. Termination for Infringement.  Either party may terminate this Agreement immediately should any Software become, or in either party's opinion be likely to become, the subject of a claim of infringement of any intellectual property right. 

For inquiries please contact: Sun Microsystems, Inc. 4150 Network Circle, Santa Clara, California 95054. 

 

--- NEW FILE: jdbc2_0-stdext.jar ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: jaas.jar ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: jaas.licence.txt ---
Sun Microsystems, Inc. 
Binary Code License Agreement

READ THE TERMS OF THIS AGREEMENT AND ANY PROVIDED SUPPLEMENTAL LICENSE TERMS (COLLECTIVELY "AGREEMENT") CAREFULLY BEFORE OPENING THE SOFTWARE MEDIA PACKAGE.  BY OPENING THE SOFTWARE MEDIA PACKAGE, YOU AGREE TO THE TERMS OF THIS AGREEMENT.  IF YOU ARE ACCESSING THE SOFTWARE ELECTRONICALLY, INDICATE YOUR ACCEPTANCE OF THESE TERMS BY SELECTING THE "ACCEPT" BUTTON AT THE END OF THIS AGREEMENT.  IF YOU DO NOT AGREE TO ALL THESE TERMS, PROMPTLY RETURN THE UNUSED SOFTWARE TO YOUR PLACE OF PURCHASE FOR A REFUND OR, IF THE SOFTWARE IS ACCESSED ELECTRONICALLY, SELECT THE "DECLINE" BUTTON AT THE END OF THIS AGREEMENT. 

1.  LICENSE TO USE.  Sun grants you a non-exclusive and non-transferable license for the internal use only of the accompanying software and documentation and any error corrections provided by Sun (collectively "Software"), by the number of users and the class of computer hardware for which the corresponding fee has been paid. 

2.  RESTRICTIONS.  Software is confidential and copyrighted. Title to Software and all associated intellectual property rights is retained by Sun and/or its licensors.  Except as specifically authorized in any Supplemental License Terms, you may not make copies of Software, other than a single copy of Software for archival purposes.  Unless enforcement is prohibited by applicable law, you may not modify, decompile, or reverse engineer Software.  Licensee acknowledges that Licensed Software is not designed or intended for use in the design, construction, operation or maintenance of any nuclear facility. Sun Microsystems, Inc. disclaims any express or implied warranty of fitness for such uses.   No right, title or interest in or to any trademark, service mark, logo or trade name of Sun or its licensors is granted under this Agreement. 

3. LIMITED WARRANTY.  Sun warrants to you that for a period of ninety (90) days from the date of purchase, as evidenced by a copy of the receipt, the media on which Software is furnished (if any) will be free of defects in materials and workmanship under normal use.  Except for the foregoing, Software is provided "AS IS".  Your exclusive remedy and Sun's entire liability under this limited warranty will be at Sun's option to replace Software media or refund the fee paid for Software. 

4.  DISCLAIMER OF WARRANTY.  UNLESS SPECIFIED IN THIS AGREEMENT, ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES, INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE OR NON-INFRINGEMENT ARE DISCLAIMED, EXCEPT TO THE EXTENT THAT THESE DISCLAIMERS ARE HELD TO BE LEGALLY INVALID. 

5.  LIMITATION OF LIABILITY.  TO THE EXTENT NOT PROHIBITED BY LAW, IN NO EVENT WILL SUN OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA, OR FOR SPECIAL, INDIRECT, CONSEQUENTIAL, INCIDENTAL OR PUNITIVE DAMAGES, HOWEVER CAUSED REGARDLESS OF THE THEORY OF LIABILITY, ARISING OUT OF OR RELATED TO THE USE OF OR INABILITY TO USE SOFTWARE, EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.  In no event will Sun's liability to you, whether in contract, tort (including negligence), or otherwise, exceed the amount paid by you for Software under this Agreement.  The foregoing limitations will apply even if the above stated warranty fails of its essential purpose. 

6.  Termination.  This Agreement is effective until terminated.  You may terminate this Agreement at any time by destroying all copies of Software.  This Agreement will terminate immediately without notice from Sun if you fail to comply with any provision of this Agreement.  Upon Termination, you must destroy all copies of Software. 

7. Export Regulations. All Software and technical data delivered under this Agreement are subject to US export control laws and may be subject to export or import regulations in other countries.  You agree to comply strictly with all such laws and regulations and acknowledge that you have the responsibility to obtain such licenses to export, re-export, or import as may be required after delivery to you. 

8.   U.S. Government Restricted Rights.  If Software is being acquired by or on behalf of the U.S. Government or by a U.S. Government prime contractor or subcontractor (at any tier), then the Government's rights in Software and accompanying documentation will be only as set forth in this Agreement; this is in accordance with 48 CFR 227.7201 through 227.7202-4 (for Department of Defense (DOD) acquisitions) and with 48 CFR 2.101 and 12.212 (for non-DOD acquisitions). 

9.  Governing Law.  Any action related to this Agreement will be governed by California law and controlling U.S. federal law.  No choice of law rules of any jurisdiction will apply. 

10.  Severability. If any provision of this Agreement is held to be unenforceable, this Agreement will remain in effect with the provision omitted, unless omission would frustrate the intent of the parties, in which case this Agreement will immediately terminate. 

11.  Integration.  This Agreement is the entire agreement between you and Sun relating to its subject matter.  It supersedes all prior or contemporaneous oral or written communications, proposals, representations and warranties and prevails over any conflicting or additional terms of any quote, order, acknowledgment, or other communication between the parties relating to its subject matter during the term of this Agreement.  No modification of this Agreement will be binding, unless in writing and signed by an authorized representative of each party. 

JAVATM OPTIONAL PACKAGE 
JAVA AUTHENTICATION AND AUTHORIZATION SERVICE (JAAS), VERSION 1.0_01
SUPPLEMENTAL LICENSE TERMS

These supplemental license terms ("Supplemental Terms") add to or modify the terms of the Binary Code License Agreement (collectively, the "Agreement"). Capitalized terms not defined in these Supplemental Terms shall have the same meanings ascribed to them in the Agreement. These Supplemental Terms shall supersede any inconsistent or conflicting terms in the Agreement, or in any license contained within the Software. 

1. Software Internal Use and Development License Grant.  Subject to the terms and conditions of this Agreement, including, but not limited to Section 3 (Java Technology Restrictions) of these Supplemental Terms, Sun grants you a non-exclusive, non-transferable, limited license to reproduce internally and use internally the binary form of the Software, complete and unmodified, for the sole purpose of designing, developing and testing your Java applets and applications ("Programs"). 

2. License to Distribute Software.  In addition to the license granted in Section 1 (Software Internal Use and Development License Grant) of these Supplemental Terms, subject to the terms and conditions of this Agreement, including but not limited to, Section 3 (Java Technology Restrictions) of these Supplemental Terms, Sun grants you a non-exclusive, non-transferable, limited license to reproduce and distribute the Software in binary code form only, provided that you (i) distribute the Software complete and unmodified and only bundled as part of your Programs, (ii) do not distribute additional software intended to replace any component(s) of the Software, (iii) do not remove or alter any proprietary legends or notices contained in the Software, (iv) only distribute the Software subject to a license agreement that protects Sun's interests consistent with the terms contained in this Agreement, and (v) agree to defend and indemnify Sun and its licensors from and against any damages, costs, liabilities, settlement amounts and/or expenses (including attorneys' fees) incurred in connection with any claim, lawsuit or action by any third party that arises or results from the use or distribution of any and all Programs and/or Software. 

3. Java Technology Restrictions. You may not modify the Java Platform Interface ("JPI", identified as classes contained within the "java" package or any subpackages of the "java" package), by creating additional classes within the JPI or otherwise causing the addition to or modification of the classes in the JPI.  In the event that you create an additional class and associated API(s) which (i) extends the functionality of the Java platform, and (ii) is exposed to third party software developers for the purpose of developing additional software which invokes such additional API, you must promptly publish broadly an accurate specification for such API for free use by all developers.  You may not create, or authorize your licensees to create additional classes, interfaces, or subpackages that are in any way identified as "java", "javax", "sun" or similar convention as specified by Sun in any naming convention designation. 

4. Trademarks and Logos. You acknowledge and agree as between you and Sun that Sun owns the SUN, SOLARIS, JAVA, JINI, FORTE, and iPLANET trademarks and all SUN, SOLARIS, JAVA, JINI, FORTE, and iPLANET-related trademarks, service marks, logos and other brand designations ("Sun Marks"), and you agree to comply with the Sun Trademark and Logo Usage Requirements currently located at http://www.sun.com/policies/trademarks. Any use you make of the Sun Marks inures to Sun's benefit. 

5. Source Code. Software may contain source code that is provided solely for reference purposes pursuant to the terms of this Agreement.  Source code may not be redistributed unless expressly provided for in this Agreement. 

6. Termination for Infringement.  Either party may terminate this Agreement immediately should any Software become, or in either party's opinion be likely to become, the subject of a claim of infringement of any intellectual property right.
For inquiries please contact: Sun Microsystems, Inc. 4150 Network Circle, Santa Clara, California 95054. 


--- j2ee.jar DELETED ---

[Hibernate-commits] Hibernate2/src/net/sf/hibernate/id SequenceHiLoGenerator.java,1.6,1.7 TableHiLoGenerator.java,1.3,1.4

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

Update of /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/id
In directory sc8-pr-cvs1:/tmp/cvs-serv21232/hibernate/id

Modified Files:
	SequenceHiLoGenerator.java TableHiLoGenerator.java 
Log Message:
made hilo generators interact better with unsaved-value=0

Index: SequenceHiLoGenerator.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/id/SequenceHiLoGenerator.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** SequenceHiLoGenerator.java	19 Jan 2003 11:47:07 -0000	1.6
--- SequenceHiLoGenerator.java	25 Mar 2003 13:49:35 -0000	1.7
***************
*** 49,55 ****
  	public synchronized Serializable generate(SessionImplementor session, Object obj) throws SQLException, HibernateException {
  		
! 		if ( lo==maxLoValue ) {
  			long hival = ( (Number) super.generate(session, obj) ).longValue();
! 			lo = 0;
  			hi = hival * ( maxLoValue+1 );
  			log.debug("new hi value: " + hival);
--- 49,55 ----
  	public synchronized Serializable generate(SessionImplementor session, Object obj) throws SQLException, HibernateException {
  		
! 		if ( lo>maxLoValue ) {
  			long hival = ( (Number) super.generate(session, obj) ).longValue();
! 			lo = 1;
  			hi = hival * ( maxLoValue+1 );
  			log.debug("new hi value: " + hival);

Index: TableHiLoGenerator.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/id/TableHiLoGenerator.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** TableHiLoGenerator.java	21 Mar 2003 12:03:37 -0000	1.3
--- TableHiLoGenerator.java	25 Mar 2003 13:49:43 -0000	1.4
***************
*** 54,60 ****
  	public synchronized Serializable generate(SessionImplementor session, Object obj) throws SQLException, HibernateException {
  		
! 		if (lo==maxLo) {
  			int hival = ( (Integer) super.generate(session, obj) ).intValue();
! 			lo = 0;
  			hi = hival * (maxLo+1);
  			log.debug("new hi value: " + hival);
--- 54,60 ----
  	public synchronized Serializable generate(SessionImplementor session, Object obj) throws SQLException, HibernateException {
  		
! 		if (lo>maxLo) {
  			int hival = ( (Integer) super.generate(session, obj) ).intValue();
! 			lo = 1;
  			hi = hival * (maxLo+1);
  			log.debug("new hi value: " + hival);

[Hibernate-commits] Hibernate2/src/net/sf/hibernate/test FooBarTest.java,1.43,1.44

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

Update of /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/test
In directory sc8-pr-cvs1:/tmp/cvs-serv21232/hibernate/test

Modified Files:
	FooBarTest.java 
Log Message:
made hilo generators interact better with unsaved-value=0

Index: FooBarTest.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/test/FooBarTest.java,v
retrieving revision 1.43
retrieving revision 1.44
diff -C2 -d -r1.43 -r1.44
*** FooBarTest.java	20 Mar 2003 13:59:09 -0000	1.43
--- FooBarTest.java	25 Mar 2003 13:49:44 -0000	1.44
***************
*** 242,246 ****
  		assertTrue( s.find("from Foo foo").size()==2 );
  		assertTrue( s.filter( baz.getFooArray(), "" ).size()==1 );
! 		assertTrue( s.delete("from java.lang.Object o")==9 );
  		s.flush();
  		s.connection().commit();
--- 242,248 ----
  		assertTrue( s.find("from Foo foo").size()==2 );
  		assertTrue( s.filter( baz.getFooArray(), "" ).size()==1 );
! 		//assertTrue( s.delete("from java.lang.Object o")==9 );
! 		s.delete("from Foo foo");
! 		s.delete(baz);
  		s.flush();
  		s.connection().commit();

[Hibernate-commits] Hibernate2/src/net/sf/hibernate/tool/hbm2java Generator.java,1.7,1.8 Renderer.java,1.3,1.4

[<max...@us...>]

Update of /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/tool/hbm2java
In directory sc8-pr-cvs1:/tmp/cvs-serv4416/src/net/sf/hibernate/tool/hbm2java

Modified Files:
	Generator.java Renderer.java 
Log Message:
fix of stupid commit error :)

Index: Generator.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/tool/hbm2java/Generator.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** Generator.java	25 Mar 2003 06:18:35 -0000	1.7
--- Generator.java	25 Mar 2003 08:08:02 -0000	1.8
***************
*** 119,123 ****
          PrintWriter writer = new PrintWriter(new FileOutputStream(file));
  
!         renderer.render(this.packageName, classMapping, class2classmap, writer);
          writer.close();
      }
--- 119,123 ----
          PrintWriter writer = new PrintWriter(new FileOutputStream(file));
  
!         renderer.render(classMapping, class2classmap, writer);
          writer.close();
      }

Index: Renderer.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/tool/hbm2java/Renderer.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Renderer.java	5 Jan 2003 02:11:24 -0000	1.3
--- Renderer.java	25 Mar 2003 08:08:04 -0000	1.4
***************
*** 8,12 ****
  
  public interface Renderer {
! 	public void render(String className, ClassMapping classMapping, Map class2classmap, PrintWriter writer) throws Exception;
  }
  
--- 8,12 ----
  
  public interface Renderer {
! 	public void render(ClassMapping classMapping, Map class2classmap, PrintWriter writer) throws Exception;
  }
  

[Hibernate-commits] Hibernate2/src/net/sf/hibernate/tool/hbm2java AbstractRenderer.java,NONE,1.1 BasicRenderer.java,1.11,1.12

[<max...@us...>]

Update of /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/tool/hbm2java
In directory sc8-pr-cvs1:/tmp/cvs-serv18147/src/net/sf/hibernate/tool/hbm2java

Modified Files:
	BasicRenderer.java 
Added Files:
	AbstractRenderer.java 
Log Message:
Small refactoring of Renderers.
Now there is an AbstractRenderer with "basics" supportmethods.
Done to support the multiple files per entity strategy, for e.g. Finders and Constants files.

--- NEW FILE: AbstractRenderer.java ---
/*
 * Created on 25-03-2003
 *
 * To change this generated comment go to 
 * Window>Preferences>Java>Code Generation>Code Template
 */
package net.sf.hibernate.tool.hbm2java;

import java.io.PrintWriter;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.TreeSet;

import org.apache.commons.lang.StringUtils;

import net.sf.hibernate.util.StringHelper;

/**
 * @author max
 */
public abstract class AbstractRenderer implements Renderer {

	/**
		 * Returns the true name for the given class name. By true name is
		 * that it will return the Proxy for the class name if the class was
		 * defined with a proxy attribute.
		 * @param field class name that we use to serach in class2classmap
		 * @param class2classmap a map from classname to classmappings
		 * @return String return either name or the proxy name of the classmap
		 */
	static protected String getTrueTypeName(Field field, Map class2classmap) {
		String name =
			(field.getClassType() != null)
				? field.getClassType().getFullyQualifiedName()
				: field.getType();
		ClassMapping cmap = (ClassMapping) class2classmap.get(name);

		if (cmap != null) {
			if (cmap.getProxy() != null) {
				return cmap.getProxy();
			}
		}
		return name;
	}

	static protected String getTrueTypeName(ClassName cn, Map class2classmap) {
		String name = cn.getFullyQualifiedName();
		ClassMapping cmap = (ClassMapping) class2classmap.get(name);

		if (cmap != null) {
			if (cmap.getProxy() != null) {
				return cmap.getProxy();
			}
		}
		return name;
	}

	/**
	     * Returns the last part of type if it is in the set of imports.
	     * e.g. java.util.Date would become Date, if imports contains 
	     * java.util.Date.
	     * 
	     * @param type
	     * @param imports
	     * @return String
	     */
	protected String shortenType(String type, TreeSet imports) {
	    if( imports.contains(type) ) {
	      return type.substring( type.lastIndexOf(StringHelper.DOT)+1 );
	    } 
	    else {
	      if( type.endsWith("[]") ) {
	        return shortenType( type.substring(0, type.length()-2), imports ) + "[]";    
	      } 
	      else {
	        return type;   
	      }
	    }
	}

	/**
	     * Convert string into something that can be rendered nicely into a javadoc
	     * comment.
	     * Prefix each line with a star ('*').
	     * @param string
	     */
	protected String toJavaDoc(String string, int indent) {
	    StringBuffer result = new StringBuffer();
	    
	    if(string!=null) {
	        String[] lines = StringUtils.split(string, "\n\r\f");
	        for (int i = 0; i < lines.length; i++) {
	            String docline = " * " + lines[i] + "\n";
	            result.append(StringUtils.leftPad(docline, docline.length() + indent));
	        }
	    }
	    
	    return result.toString();
	}

	public String getFieldScope(Field field, String localScopeName, String defaultScope) {
	    if (defaultScope==null) defaultScope = "private";
	    return ( field.getMeta(localScopeName)==null )? defaultScope : field.getMetaAsString(localScopeName);
	}

}

Index: BasicRenderer.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/tool/hbm2java/BasicRenderer.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** BasicRenderer.java	17 Feb 2003 18:22:42 -0000	1.11
--- BasicRenderer.java	25 Mar 2003 07:08:37 -0000	1.12
***************
*** 17,21 ****
  import org.apache.commons.logging.LogFactory;
  
! public class BasicRenderer implements Renderer {
  	
  	static final protected int ORDINARY = 0;
--- 17,21 ----
  import org.apache.commons.logging.LogFactory;
  
! public class BasicRenderer extends AbstractRenderer {
  	
  	static final protected int ORDINARY = 0;
***************
*** 25,76 ****
      static private Log log = LogFactory.getLog(BasicRenderer.class); 	
  
! 	/**
! 	 * Returns the true name for the given class name. By true name is
! 	 * that it will return the Proxy for the class name if the class was
! 	 * defined with a proxy attribute.
! 	 * @param field class name that we use to serach in class2classmap
! 	 * @param class2classmap a map from classname to classmappings
! 	 * @return String return either name or the proxy name of the classmap
! 	 */
! 	String getTrueTypeName(Field  field, Map class2classmap) {
!         String name = ( field.getClassType()!=null ) ?
!         	field.getClassType().getFullyQualifiedName():
!         	field.getType();
!         ClassMapping cmap = (ClassMapping) class2classmap.get(name);
!         
!         if(cmap!=null) {
!             if (cmap.getProxy()!=null) {
!                 return cmap.getProxy();
!             }   
!         } 
!         return name;
!     }
!     
!     private String makeSupportField(String fieldName, List fieldList) {
!     	String suffix="";
!     	boolean needSuffix=false;
!     	for( Iterator fields = fieldList.iterator(); fields.hasNext();) {
!     		String name = ((Field)fields.next()).getName();
!     		if(name.equals(fieldName)) needSuffix=true;
!     		suffix+=name;
!     	}
!     	return needSuffix ? fieldName+"_"+suffix : fieldName;
!     }
!     
!     String getTrueTypeName(ClassName cn, Map class2classmap) {
!         String name = cn.getFullyQualifiedName();
!         ClassMapping cmap = (ClassMapping) class2classmap.get(name);
!         
!         
!         if(cmap!=null) {
!                     if (cmap.getProxy()!=null) {
!                         return cmap.getProxy();
!                     }   
!                 } 
!         return name;
!     }
!     
!     
!     public void render(String packageName, ClassMapping classMapping, Map class2classmap, PrintWriter mainwriter) throws Exception {
          if ( classMapping.getGeneratedPackageName()!=null ) {
          	mainwriter.println("package " + classMapping.getGeneratedPackageName() + ";");
--- 25,29 ----
      static private Log log = LogFactory.getLog(BasicRenderer.class); 	
  
! 	public void render(ClassMapping classMapping, Map class2classmap, PrintWriter mainwriter) throws Exception {
          if ( classMapping.getGeneratedPackageName()!=null ) {
          	mainwriter.println("package " + classMapping.getGeneratedPackageName() + ";");
***************
*** 404,418 ****
  	    	
  	}
! 	private String getFieldAsObject(boolean prependThis, Field field) {
! 			ClassName type = field.getClassType();			
!        		if(type != null && type.isPrimitive() && !type.isArray()) {
!         			String typeName = (String) primitiveToObject.get(type.getName());
!         			typeName = "new "+typeName+"( ";
!         			typeName += prependThis ? "this." : "";
!         			return typeName+field.getName()+" )";        			
!        		}
!        		return field.getName();
! 	}
! 
      public int doFieldAccessors(ClassMapping classMapping, 
      											Map class2classmap, 
--- 357,361 ----
  	    	
  	}
! 	
      public int doFieldAccessors(ClassMapping classMapping, 
      											Map class2classmap, 
***************
*** 523,573 ****
      }
      
!     public String getFieldScope(Field field, String localScopeName, String defaultScope) {
!         if (defaultScope==null) defaultScope = "private";
!         return ( field.getMeta(localScopeName)==null )? defaultScope : field.getMetaAsString(localScopeName);
!     }
!         
!     /**
!      * Convert string into something that can be rendered nicely into a javadoc
!      * comment.
!      * Prefix each line with a star ('*').
!      * @param string
!      */
!     private String toJavaDoc(String string, int indent) {
!         StringBuffer result = new StringBuffer();
!         
!         if(string!=null) {
!             String[] lines = StringUtils.split(string, "\n\r\f");
!             for (int i = 0; i < lines.length; i++) {
!                 String docline = " * " + lines[i] + "\n";
!                 result.append(StringUtils.leftPad(docline, docline.length() + indent));
!             }
!         }
!         
!         return result.toString();
!     }
!     
!     
!     /**
!      * Returns the last part of type if it is in the set of imports.
!      * e.g. java.util.Date would become Date, if imports contains 
!      * java.util.Date.
!      * 
!      * @param type
!      * @param imports
!      * @return String
!      */
!     private String shortenType(String type, TreeSet imports) {
!         if( imports.contains(type) ) {
!           return type.substring( type.lastIndexOf(StringHelper.DOT)+1 );
!         } 
!         else {
!           if( type.endsWith("[]") ) {
!             return shortenType( type.substring(0, type.length()-2), imports ) + "[]";    
!           } 
!           else {
!             return type;   
!           }
!         }
!     }
  }
--- 466,491 ----
      }
      
!     protected String makeSupportField(String fieldName, List fieldList) {
! 		String suffix = "";
! 		boolean needSuffix = false;
! 		for (Iterator fields = fieldList.iterator(); fields.hasNext();) {
! 			String name = ((Field) fields.next()).getName();
! 			if (name.equals(fieldName))
! 				needSuffix = true;
! 			suffix += name;
! 		}
! 		return needSuffix ? fieldName + "_" + suffix : fieldName;
! 	}
! 	
! 	private String getFieldAsObject(boolean prependThis, Field field) {
! 				ClassName type = field.getClassType();			
! 				if(type != null && type.isPrimitive() && !type.isArray()) {
! 						String typeName = (String) primitiveToObject.get(type.getName());
! 						typeName = "new "+typeName+"( ";
! 						typeName += prependThis ? "this." : "";
! 						return typeName+field.getName()+" )";        			
! 				}
! 				return field.getName();
! 		}
! 
  }

[Hibernate-commits] Hibernate2/src/net/sf/hibernate/tool/hbm2java Generator.java,1.6,1.7

[<max...@us...>]

Update of /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/tool/hbm2java
In directory sc8-pr-cvs1:/tmp/cvs-serv3951/src/net/sf/hibernate/tool/hbm2java

Modified Files:
	Generator.java 
Log Message:
just small comments

Index: Generator.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/tool/hbm2java/Generator.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Generator.java	20 Jan 2003 12:48:16 -0000	1.6
--- Generator.java	25 Mar 2003 06:18:35 -0000	1.7
***************
*** 84,91 ****
--- 84,93 ----
           Renderer renderer = (Renderer) Class.forName(this.rendererClass).newInstance();
  
+ 		 /** Running through actual classes */
           for (Iterator classMappings = classMappingsCol.values().iterator(); classMappings.hasNext();) {
               ClassMapping classMapping = (ClassMapping) classMappings.next();
    			writeRecur(classMapping, classMappingsCol, renderer);
           }
+          /** Running through components */
           for (Iterator cmpMappings = ClassMapping.getComponents(); cmpMappings.hasNext();) {
               ClassMapping mapping = (ClassMapping) cmpMappings.next();

[Hibernate-commits] Hibernate2/src/net/sf/hibernate/engine Cascades.java,1.7,1.8

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

Update of /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/engine
In directory sc8-pr-cvs1:/tmp/cvs-serv25416/src/net/sf/hibernate/engine

Modified Files:
	Cascades.java 
Log Message:
fixed a typo

Index: Cascades.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/engine/Cascades.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** Cascades.java	16 Mar 2003 01:45:52 -0000	1.7
--- Cascades.java	24 Mar 2003 10:29:54 -0000	1.8
***************
*** 50,54 ****
  	public static final CascadingAction ACTION_DELETE = new CascadingAction() {
  		void cascade(Session session, Object child) throws HibernateException {
! 			log.trace("cacading to delete()");
  			session.delete(child);
  		}
--- 50,54 ----
  	public static final CascadingAction ACTION_DELETE = new CascadingAction() {
  		void cascade(Session session, Object child) throws HibernateException {
! 			log.trace("cascading to delete()");
  			session.delete(child);
  		}
***************
*** 68,72 ****
  				// saves / updates don't cascade to uninitialized proxies
  			) {
! 				log.trace("cacading to saveOrUpdate()");
  				session.saveOrUpdate(child);
  			}
--- 68,72 ----
  				// saves / updates don't cascade to uninitialized proxies
  			) {
! 				log.trace("cascading to saveOrUpdate()");
  				session.saveOrUpdate(child);
  			}

[Hibernate-commits] Hibernate/cirrus/hibernate/engine Cascades.java,1.8,1.9

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

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

Modified Files:
	Cascades.java 
Log Message:
fixed a typo

Index: Cascades.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate/cirrus/hibernate/engine/Cascades.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** Cascades.java	24 Dec 2002 13:45:37 -0000	1.8
--- Cascades.java	24 Mar 2003 10:29:01 -0000	1.9
***************
*** 51,55 ****
  	public static final CascadingAction ACTION_DELETE = new CascadingAction() {
  		void cascade(Session session, Object child) throws SQLException, HibernateException {
! 			log.trace("cacading to delete()");
  			session.delete(child);
  		}
--- 51,55 ----
  	public static final CascadingAction ACTION_DELETE = new CascadingAction() {
  		void cascade(Session session, Object child) throws SQLException, HibernateException {
! 			log.trace("cascading to delete()");
  			session.delete(child);
  		}
***************
*** 69,73 ****
  				// saves / updates don't cascade to uninitialized proxies
  			) {
! 				log.trace("cacading to saveOrUpdate()");
  				session.saveOrUpdate(child);
  			}
--- 69,73 ----
  				// saves / updates don't cascade to uninitialized proxies
  			) {
! 				log.trace("cascading to saveOrUpdate()");
  				session.saveOrUpdate(child);
  			}

[Hibernate-commits] Hibernate/cirrus/hibernate Session.java,1.80,1.81

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

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

Modified Files:
	Session.java 
Log Message:
1.2.4

Index: Session.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate/cirrus/hibernate/Session.java,v
retrieving revision 1.80
retrieving revision 1.81
diff -C2 -d -r1.80 -r1.81
*** Session.java	15 Dec 2002 10:46:39 -0000	1.80
--- Session.java	22 Mar 2003 13:42:35 -0000	1.81
***************
*** 24,29 ****
   * Transient instances may be made persistent by calling <tt>save()</tt>, 
   * <tt>insert()</tt> or <tt>update()</tt>. Persistent instances may be made transient 
!  * by calling<tt> delete()</tt>. Any instance returned by a <tt>find(), iterate()</tt>, 
!  * <tt>load()</tt> or <tt>create()</tt> method is persistent.<br>
   * <br>
   * <tt>create()</tt>,
--- 24,29 ----
   * Transient instances may be made persistent by calling <tt>save()</tt>, 
   * <tt>insert()</tt> or <tt>update()</tt>. Persistent instances may be made transient 
!  * by calling<tt> delete()</tt>. Any instance returned by a <tt>find(), iterate()</tt> or
!  * <tt>load()</tt> method is persistent.<br>
   * <br>
   * <tt>create()</tt>,

[Hibernate-commits] Hibernate changelog.txt,1.299,1.300 readme.txt,1.59,1.60

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

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

Modified Files:
	changelog.txt readme.txt 
Log Message:
1.2.4

Index: changelog.txt
===================================================================
RCS file: /cvsroot/hibernate/Hibernate/changelog.txt,v
retrieving revision 1.299
retrieving revision 1.300
diff -C2 -d -r1.299 -r1.300
*** changelog.txt	12 Mar 2003 12:40:52 -0000	1.299
--- changelog.txt	22 Mar 2003 13:42:35 -0000	1.300
***************
*** 10,13 ****
--- 10,14 ----
  * added Ant Tasks for SchemaExport and SchemaUpdater (Cameron Braid)
  * Query.setEntity(), etc, now aware of proxies (also improved hueristics for guessing Type)
+ * fixed problems with Sybase
  
  Changes in version 1.2.3 (28.1.2003)

Index: readme.txt
===================================================================
RCS file: /cvsroot/hibernate/Hibernate/readme.txt,v
retrieving revision 1.59
retrieving revision 1.60
diff -C2 -d -r1.59 -r1.60
*** readme.txt	28 Jan 2003 13:07:43 -0000	1.59
--- readme.txt	22 Mar 2003 13:42:35 -0000	1.60
***************
*** 1,5 ****
  Hibernate - Relational Persistence for Idiomatic Java
  =====================================================
! version 1.2.3 28 January 2003
  
  Instructions
--- 1,5 ----
  Hibernate - Relational Persistence for Idiomatic Java
  =====================================================
! version 1.2.4 22 March 2003
  
  Instructions

[Hibernate-commits] Hibernate2/src/net/sf/hibernate Session.java,1.12,1.13

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

Update of /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate
In directory sc8-pr-cvs1:/tmp/cvs-serv13010/src/net/sf/hibernate

Modified Files:
	Session.java 
Log Message:
2.0 beta 4

Index: Session.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/Session.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** Session.java	13 Mar 2003 03:16:00 -0000	1.12
--- Session.java	22 Mar 2003 13:41:51 -0000	1.13
***************
*** 24,29 ****
   * Transient instances may be made persistent by calling <tt>save()</tt>,
   * <tt>insert()</tt> or <tt>update()</tt>. Persistent instances may be made transient
!  * by calling<tt> delete()</tt>. Any instance returned by a <tt>find(), iterate()</tt>,
!  * <tt>load()</tt> or <tt>create()</tt> method is persistent.<br>
   * <br>
   * <tt>create()</tt>,
--- 24,29 ----
   * Transient instances may be made persistent by calling <tt>save()</tt>,
   * <tt>insert()</tt> or <tt>update()</tt>. Persistent instances may be made transient
!  * by calling<tt> delete()</tt>. Any instance returned by a <tt>find(), iterate()</tt> or
!  * <tt>load()</tt> method is persistent.<br>
   * <br>
   * <tt>create()</tt>,

[Hibernate-commits] Hibernate2 readme.txt,1.3,1.4

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

Update of /cvsroot/hibernate/Hibernate2
In directory sc8-pr-cvs1:/tmp/cvs-serv13010

Modified Files:
	readme.txt 
Log Message:
2.0 beta 4

Index: readme.txt
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/readme.txt,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** readme.txt	2 Feb 2003 06:47:05 -0000	1.3
--- readme.txt	22 Mar 2003 13:41:50 -0000	1.4
***************
*** 1,5 ****
  Hibernate - Relational Persistence for Idiomatic Java
  =====================================================
! version 2.0 beta 2 2 February 2003
  
  Instructions
--- 1,5 ----
  Hibernate - Relational Persistence for Idiomatic Java
  =====================================================
! version 2.0 beta 4 22 March 2003
  
  Instructions

[Hibernate-commits] Hibernate2 changelog.txt,1.13,1.14

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

Update of /cvsroot/hibernate/Hibernate2
In directory sc8-pr-cvs1:/tmp/cvs-serv19699

Modified Files:
	changelog.txt 
Log Message:
2.0 beta 4

Index: changelog.txt
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/changelog.txt,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** changelog.txt	17 Mar 2003 07:25:12 -0000	1.13
--- changelog.txt	22 Mar 2003 05:39:56 -0000	1.14
***************
*** 2,7 ****
  ===================
  
! Changes in version 2.0 beta 4 (x.x.2003)
! ----------------------------------------
  * Major HQL improvements
  - from "Foo as foo join foo.bars as bar" instead of "from foo in class Foo, bar in elements(foo.bars)"
--- 2,7 ----
  ===================
  
! Changes in version 2.0 beta 4 (22.3.2003)
! -----------------------------------------
  * Major HQL improvements
  - from "Foo as foo join foo.bars as bar" instead of "from foo in class Foo, bar in elements(foo.bars)"
***************
*** 23,26 ****
--- 23,27 ----
  * Query.setEntity(), etc, now aware of proxies (also improved hueristics for guessing Type)
  * added Hibernate.isInitialized()
+ * detect changes made directly to newly-wrapped collection (ie. not via the wrapper)
  * added Hibernate.refresh(Object, LockMode)
  * update(), saveOrUpdate() no longer initialize a proxy
***************
*** 28,31 ****
--- 29,33 ----
  * added force attribute to <discriminator>
  * improved handling of null discriminator-value
+ * support SQL-style '' escape for HQL strings
  
  Changes in version 2.0 beta 3 (24.2.2003)

[Hibernate-commits] Hibernate2/src/net/sf/hibernate/test Container.hbm.xml,1.4,1.5 Container.java,1.4,1.5 Fee.hbm.xml,1.3,1.4 Fee.java,1.3,1.4 Glarch.hbm.xml,1.7,1.8

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

Update of /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/test
In directory sc8-pr-cvs1:/tmp/cvs-serv3614/hibernate/test

Modified Files:
	Container.hbm.xml Container.java Fee.hbm.xml Fee.java 
	Glarch.hbm.xml 
Log Message:
added a test

Index: Container.hbm.xml
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/test/Container.hbm.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Container.hbm.xml	9 Feb 2003 06:28:16 -0000	1.4
--- Container.hbm.xml	22 Mar 2003 04:39:49 -0000	1.5
***************
*** 23,26 ****
--- 23,27 ----
  			<composite-element class="net.sf.hibernate.test.Container$ContainerInnerClass">
  				<property name="name"/>
+ 				<property name="count" column="count_"/>
  				<many-to-one name="simple"/>
  				<many-to-one name="one"/>

Index: Container.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/test/Container.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Container.java	9 Feb 2003 06:28:16 -0000	1.4
--- Container.java	22 Mar 2003 04:39:49 -0000	1.5
***************
*** 15,18 ****
--- 15,19 ----
  		private One one;
  		private Many many;
+ 		private int count;
  		
  		public void setSimple(Simple simple) {
***************
*** 78,81 ****
--- 79,98 ----
  		}
  		
+ 		/**
+ 		 * Returns the count.
+ 		 * @return int
+ 		 */
+ 		public int getCount() {
+ 			return count;
+ 		}
+ 
+ 		/**
+ 		 * Sets the count.
+ 		 * @param count The count to set
+ 		 */
+ 		public void setCount(int count) {
+ 			this.count = count;
+ 		}
+ 
  	}
  	

Index: Fee.hbm.xml
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/test/Fee.hbm.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Fee.hbm.xml	28 Jan 2003 10:22:21 -0000	1.3
--- Fee.hbm.xml	22 Mar 2003 04:39:49 -0000	1.4
***************
*** 11,14 ****
--- 11,15 ----
          <many-to-one name="anotherFee"/>
          <many-to-one name="qux" cascade="all"/>
+         <property name="count" column="count_"/>
          <set name="fees">
          	<key column="fee_id"/>

Index: Fee.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/test/Fee.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Fee.java	5 Jan 2003 02:11:23 -0000	1.3
--- Fee.java	22 Mar 2003 04:39:49 -0000	1.4
***************
*** 13,16 ****
--- 13,17 ----
  	private Qux qux;
  	private FooComponent compon;
+ 	private int count;
  	
  	public Fee() {
***************
*** 73,76 ****
--- 74,93 ----
  	}
  	
+ 	/**
+ 	 * Returns the count.
+ 	 * @return int
+ 	 */
+ 	public int getCount() {
+ 		return count;
+ 	}
+ 
+ 	/**
+ 	 * Sets the count.
+ 	 * @param count The count to set
+ 	 */
+ 	public void setCount(int count) {
+ 		this.count = count;
+ 	}
+ 
  }
  

Index: Glarch.hbm.xml
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/test/Glarch.hbm.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** Glarch.hbm.xml	20 Mar 2003 13:59:10 -0000	1.7
--- Glarch.hbm.xml	22 Mar 2003 04:39:49 -0000	1.8
***************
*** 33,37 ****
                      <property name="count" column="y_"/>
                  </nested-composite-element>
!                 <many-to-one name="fee" cascade="all"/>
              </composite-element>
          </list>
--- 33,37 ----
                      <property name="count" column="y_"/>
                  </nested-composite-element>
!                 <many-to-one name="fee" cascade="all" outer-join="true"/>
              </composite-element>
          </list>

[Hibernate-commits] Hibernate/cirrus/hibernate/test Container.hbm.xml,1.12,1.13 Container.java,1.5,1.6 Fee.hbm.xml,1.4,1.5 Fee.java,1.6,1.7 Glarch.hbm.xml,1.6,1.7

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

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

Modified Files:
	Container.hbm.xml Container.java Fee.hbm.xml Fee.java 
	Glarch.hbm.xml 
Log Message:
added a test

Index: Container.hbm.xml
===================================================================
RCS file: /cvsroot/hibernate/Hibernate/cirrus/hibernate/test/Container.hbm.xml,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** Container.hbm.xml	24 Dec 2002 13:45:38 -0000	1.12
--- Container.hbm.xml	22 Mar 2003 04:39:21 -0000	1.13
***************
*** 23,26 ****
--- 23,27 ----
  			<composite-element class="cirrus.hibernate.test.Container$ContainerInnerClass">
  				<property name="name"/>
+ 				<property name="count" column="count_" />
  				<many-to-one name="simple"/>
  				<many-to-one name="one"/>

Index: Container.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate/cirrus/hibernate/test/Container.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Container.java	7 Dec 2002 09:41:22 -0000	1.5
--- Container.java	22 Mar 2003 04:39:21 -0000	1.6
***************
*** 15,18 ****
--- 15,19 ----
  		private One one;
  		private Many many;
+ 		private int count;
  
  		public void setSimple(Simple simple) {
***************
*** 76,79 ****
--- 77,96 ----
  		public void setMany(Many many) {
  			this.many = many;
+ 		}
+ 
+ 		/**
+ 		 * Returns the count.
+ 		 * @return int
+ 		 */
+ 		public int getCount() {
+ 			return count;
+ 		}
+ 
+ 		/**
+ 		 * Sets the count.
+ 		 * @param count The count to set
+ 		 */
+ 		public void setCount(int count) {
+ 			this.count = count;
  		}
  

Index: Fee.hbm.xml
===================================================================
RCS file: /cvsroot/hibernate/Hibernate/cirrus/hibernate/test/Fee.hbm.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Fee.hbm.xml	25 Sep 2002 11:30:14 -0000	1.4
--- Fee.hbm.xml	22 Mar 2003 04:39:21 -0000	1.5
***************
*** 8,11 ****
--- 8,12 ----
          </id>
          <property name="fi"/>
+         <property name="count" column="count_"/>
          <many-to-one name="fee"/>
          <many-to-one name="anotherFee"/>

Index: Fee.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate/cirrus/hibernate/test/Fee.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Fee.java	28 Oct 2002 19:27:49 -0000	1.6
--- Fee.java	22 Mar 2003 04:39:21 -0000	1.7
***************
*** 13,16 ****
--- 13,17 ----
  	private Qux qux;
  	private FooComponent compon;
+ 	private int count;
  	
  	public Fee() {
***************
*** 71,74 ****
--- 72,91 ----
  	public void setCompon(FooComponent compon) {
  		this.compon = compon;
+ 	}
+ 
+ 	/**
+ 	 * Returns the count.
+ 	 * @return int
+ 	 */
+ 	public int getCount() {
+ 		return count;
+ 	}
+ 
+ 	/**
+ 	 * Sets the count.
+ 	 * @param count The count to set
+ 	 */
+ 	public void setCount(int count) {
+ 		this.count = count;
  	}
  

Index: Glarch.hbm.xml
===================================================================
RCS file: /cvsroot/hibernate/Hibernate/cirrus/hibernate/test/Glarch.hbm.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Glarch.hbm.xml	20 Mar 2003 13:58:49 -0000	1.6
--- Glarch.hbm.xml	22 Mar 2003 04:39:21 -0000	1.7
***************
*** 50,54 ****
                  </nested-composite-element>
                  <collection name="importantDates" role="glarch_dates" length="64"/>
!                 <many-to-one name="fee" cascade="all"/>
              </composite-element>
          </list>
--- 50,54 ----
                  </nested-composite-element>
                  <collection name="importantDates" role="glarch_dates" length="64"/>
!                 <many-to-one name="fee" cascade="all" outer-join="true"/>
              </composite-element>
          </list>

[Hibernate-commits] Hibernate2/src/net/sf/hibernate/tool/class2hbm ReflectedClass.java,1.3,1.4

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

Update of /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/tool/class2hbm
In directory sc8-pr-cvs1:/tmp/cvs-serv22034/hibernate/tool/class2hbm

Modified Files:
	ReflectedClass.java 
Log Message:
cleaned up imports

Index: ReflectedClass.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/tool/class2hbm/ReflectedClass.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** ReflectedClass.java	5 Jan 2003 02:11:23 -0000	1.3
--- ReflectedClass.java	21 Mar 2003 12:03:41 -0000	1.4
***************
*** 1,6 ****
  package net.sf.hibernate.tool.class2hbm;
  
- import java.lang.reflect.*;
  import java.beans.Introspector;
  import java.util.Enumeration;
  import java.util.Hashtable;
--- 1,7 ----
  package net.sf.hibernate.tool.class2hbm;
  
  import java.beans.Introspector;
+ import java.lang.reflect.Method;
+ import java.lang.reflect.Modifier;
  import java.util.Enumeration;
  import java.util.Hashtable;

[Hibernate-commits] Hibernate2/src/net/sf/hibernate/test ABCProxyTest.java,1.5,1.6 ABCTest.java,1.4,1.5 Baz.java,1.7,1.8 Holder.java,1.3,1.4 NewPerformanceTest.java,1.3,1.4 PerformanceTest.java,1.4,1.5 Qux.java,1.3,1.4

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

Update of /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/test
In directory sc8-pr-cvs1:/tmp/cvs-serv22034/hibernate/test

Modified Files:
	ABCProxyTest.java ABCTest.java Baz.java Holder.java 
	NewPerformanceTest.java PerformanceTest.java Qux.java 
Log Message:
cleaned up imports

Index: ABCProxyTest.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/test/ABCProxyTest.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** ABCProxyTest.java	16 Mar 2003 01:45:53 -0000	1.5
--- ABCProxyTest.java	21 Mar 2003 12:03:38 -0000	1.6
***************
*** 3,11 ****
  
  
- import net.sf.hibernate.*;
- 
- 
  import junit.framework.Test;
  import junit.framework.TestSuite;
  
  public class ABCProxyTest extends TestCase {
--- 3,11 ----
  
  
  import junit.framework.Test;
  import junit.framework.TestSuite;
+ import net.sf.hibernate.LockMode;
+ import net.sf.hibernate.Session;
+ import net.sf.hibernate.Transaction;
  
  public class ABCProxyTest extends TestCase {

Index: ABCTest.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/test/ABCTest.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ABCTest.java	9 Feb 2003 06:28:16 -0000	1.4
--- ABCTest.java	21 Mar 2003 12:03:38 -0000	1.5
***************
*** 3,11 ****
  
  
- import net.sf.hibernate.*;
- 
- 
  import junit.framework.Test;
  import junit.framework.TestSuite;
  
  public class ABCTest extends TestCase {
--- 3,10 ----
  
  
  import junit.framework.Test;
  import junit.framework.TestSuite;
+ import net.sf.hibernate.Session;
+ import net.sf.hibernate.Transaction;
  
  public class ABCTest extends TestCase {

Index: Baz.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/test/Baz.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** Baz.java	15 Feb 2003 01:00:56 -0000	1.7
--- Baz.java	21 Mar 2003 12:03:38 -0000	1.8
***************
*** 3,7 ****
  
  import java.io.Serializable;
! import java.util.*;
  
  public class Baz implements Named, Serializable, Comparable {
--- 3,16 ----
  
  import java.io.Serializable;
! import java.util.ArrayList;
! import java.util.Collection;
! import java.util.Date;
! import java.util.HashSet;
! import java.util.List;
! import java.util.Map;
! import java.util.Set;
! import java.util.SortedSet;
! import java.util.TreeMap;
! import java.util.TreeSet;
  
  public class Baz implements Named, Serializable, Comparable {

Index: Holder.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/test/Holder.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Holder.java	5 Jan 2003 02:11:23 -0000	1.3
--- Holder.java	21 Mar 2003 12:03:39 -0000	1.4
***************
*** 2,6 ****
  package net.sf.hibernate.test;
  
! import java.util.*;
  
  public class Holder implements Named {
--- 2,7 ----
  package net.sf.hibernate.test;
  
! import java.util.List;
! import java.util.Set;
  
  public class Holder implements Named {

Index: NewPerformanceTest.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/test/NewPerformanceTest.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** NewPerformanceTest.java	5 Jan 2003 02:11:23 -0000	1.3
--- NewPerformanceTest.java	21 Mar 2003 12:03:39 -0000	1.4
***************
*** 2,7 ****
  package net.sf.hibernate.test;
  
- import net.sf.hibernate.*;
- 
  import java.io.Serializable;
  import java.util.List;
--- 2,5 ----
***************
*** 9,12 ****
--- 7,11 ----
  import junit.framework.Test;
  import junit.framework.TestSuite;
+ import net.sf.hibernate.Session;
  
  public class NewPerformanceTest extends TestCase {

Index: PerformanceTest.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/test/PerformanceTest.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** PerformanceTest.java	26 Jan 2003 01:33:36 -0000	1.4
--- PerformanceTest.java	21 Mar 2003 12:03:39 -0000	1.5
***************
*** 2,10 ****
  package net.sf.hibernate.test;
  
- import net.sf.hibernate.*;
- import net.sf.hibernate.cfg.*;
- import net.sf.hibernate.connection.ConnectionProvider;
- import net.sf.hibernate.connection.ConnectionProviderFactory;
- 
  import java.io.Serializable;
  import java.sql.Connection;
--- 2,5 ----
***************
*** 15,18 ****
--- 10,17 ----
  import junit.framework.Test;
  import junit.framework.TestSuite;
+ import net.sf.hibernate.Session;
+ import net.sf.hibernate.cfg.Environment;
+ import net.sf.hibernate.connection.ConnectionProvider;
+ import net.sf.hibernate.connection.ConnectionProviderFactory;
  
  public class PerformanceTest extends TestCase {

Index: Qux.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/test/Qux.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Qux.java	5 Jan 2003 02:11:23 -0000	1.3
--- Qux.java	21 Mar 2003 12:03:39 -0000	1.4
***************
*** 2,13 ****
  package net.sf.hibernate.test;
  
  import net.sf.hibernate.CallbackException;
  import net.sf.hibernate.HibernateException;
  import net.sf.hibernate.Lifecycle;
  import net.sf.hibernate.Session;
- 
- import java.io.Serializable;
- import java.sql.SQLException;
- import java.util.*;
  
  public class Qux implements Lifecycle {
--- 2,14 ----
  package net.sf.hibernate.test;
  
+ import java.io.Serializable;
+ import java.sql.SQLException;
+ import java.util.List;
+ import java.util.Set;
+ 
  import net.sf.hibernate.CallbackException;
  import net.sf.hibernate.HibernateException;
  import net.sf.hibernate.Lifecycle;
  import net.sf.hibernate.Session;
  
  public class Qux implements Lifecycle {

[Hibernate-commits] Hibernate2/src/net/sf/hibernate/impl CacheEntry.java,1.3,1.4 SessionImpl.java,1.27,1.28

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

Update of /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/impl
In directory sc8-pr-cvs1:/tmp/cvs-serv22034/hibernate/impl

Modified Files:
	CacheEntry.java SessionImpl.java 
Log Message:
cleaned up imports

Index: CacheEntry.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/impl/CacheEntry.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** CacheEntry.java	5 Jan 2003 02:11:21 -0000	1.3
--- CacheEntry.java	21 Mar 2003 12:03:37 -0000	1.4
***************
*** 8,12 ****
  import net.sf.hibernate.HibernateException;
  import net.sf.hibernate.Lifecycle;
! import net.sf.hibernate.engine.*;
  import net.sf.hibernate.persister.ClassPersister;
  import net.sf.hibernate.type.Type;
--- 8,12 ----
  import net.sf.hibernate.HibernateException;
  import net.sf.hibernate.Lifecycle;
! import net.sf.hibernate.engine.SessionImplementor;
  import net.sf.hibernate.persister.ClassPersister;
  import net.sf.hibernate.type.Type;

Index: SessionImpl.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/impl/SessionImpl.java,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** SessionImpl.java	20 Mar 2003 13:59:06 -0000	1.27
--- SessionImpl.java	21 Mar 2003 12:03:37 -0000	1.28
***************
*** 43,47 ****
  import net.sf.hibernate.TransientObjectException;
  import net.sf.hibernate.Validatable;
- import net.sf.hibernate.util.*;
  import net.sf.hibernate.type.AbstractComponentType;
  import net.sf.hibernate.type.EntityType;
--- 43,46 ----
***************
*** 49,61 ****
  import net.sf.hibernate.type.Type;
  import net.sf.hibernate.type.TypeFactory;
  import net.sf.hibernate.cache.CacheException;
! import net.sf.hibernate.collection.*;
  import net.sf.hibernate.collection.PersistentCollection;
  import net.sf.hibernate.collection.ArrayHolder;
! import net.sf.hibernate.engine.*;
  import net.sf.hibernate.loader.CriteriaLoader;
  import net.sf.hibernate.persister.ClassPersister;
  import net.sf.hibernate.persister.Loadable;
! import net.sf.hibernate.proxy.*;
  import net.sf.hibernate.hql.QueryTranslator;
  import net.sf.hibernate.hql.FilterTranslator;
--- 48,73 ----
  import net.sf.hibernate.type.Type;
  import net.sf.hibernate.type.TypeFactory;
+ import net.sf.hibernate.util.IdentityMap;
+ import net.sf.hibernate.util.JoinedIterator;
+ import net.sf.hibernate.util.StringHelper;
  import net.sf.hibernate.cache.CacheException;
! import net.sf.hibernate.collection.CollectionPersister;
  import net.sf.hibernate.collection.PersistentCollection;
  import net.sf.hibernate.collection.ArrayHolder;
! import net.sf.hibernate.engine.Batcher;
! import net.sf.hibernate.engine.Cascades;
! import net.sf.hibernate.engine.CollectionSnapshot;
! import net.sf.hibernate.engine.Key;
! import net.sf.hibernate.engine.RowSelection;
! import net.sf.hibernate.engine.SessionFactoryImplementor;
! import net.sf.hibernate.engine.SessionImplementor;
! import net.sf.hibernate.engine.Versioning;
  import net.sf.hibernate.loader.CriteriaLoader;
  import net.sf.hibernate.persister.ClassPersister;
  import net.sf.hibernate.persister.Loadable;
! import net.sf.hibernate.proxy.CGLIBLazyInitializer;
! import net.sf.hibernate.proxy.HibernateProxy;
! import net.sf.hibernate.proxy.HibernateProxyHelper;
! import net.sf.hibernate.proxy.LazyInitializer;
  import net.sf.hibernate.hql.QueryTranslator;
  import net.sf.hibernate.hql.FilterTranslator;

[Hibernate-commits] Hibernate2/src/net/sf/hibernate/id IdentifierGenerationException.java,1.3,1.4 TableHiLoGenerator.java,1.2,1.3

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

Update of /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/id
In directory sc8-pr-cvs1:/tmp/cvs-serv22034/hibernate/id

Modified Files:
	IdentifierGenerationException.java TableHiLoGenerator.java 
Log Message:
cleaned up imports

Index: IdentifierGenerationException.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/id/IdentifierGenerationException.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** IdentifierGenerationException.java	5 Jan 2003 02:11:21 -0000	1.3
--- IdentifierGenerationException.java	21 Mar 2003 12:03:36 -0000	1.4
***************
*** 2,6 ****
  package net.sf.hibernate.id;
  
! import net.sf.hibernate.*;
  
  /**
--- 2,6 ----
  package net.sf.hibernate.id;
  
! import net.sf.hibernate.HibernateException;
  
  /**

Index: TableHiLoGenerator.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/id/TableHiLoGenerator.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** TableHiLoGenerator.java	19 Jan 2003 11:47:07 -0000	1.2
--- TableHiLoGenerator.java	21 Mar 2003 12:03:37 -0000	1.3
***************
*** 3,12 ****
  
  import java.io.Serializable;
! import java.sql.*;
  import java.util.Properties;
  
- import org.apache.commons.logging.Log;
- import org.apache.commons.logging.LogFactory;
- 
  import net.sf.hibernate.HibernateException;
  import net.sf.hibernate.dialect.Dialect;
--- 3,9 ----
  
  import java.io.Serializable;
! import java.sql.SQLException;
  import java.util.Properties;
  
  import net.sf.hibernate.HibernateException;
  import net.sf.hibernate.dialect.Dialect;
***************
*** 14,17 ****
--- 11,17 ----
  import net.sf.hibernate.type.Type;
  import net.sf.hibernate.util.PropertiesHelper;
+ 
+ import org.apache.commons.logging.Log;
+ import org.apache.commons.logging.LogFactory;
  
  /**

[Hibernate-commits] Hibernate2/src/net/sf/hibernate/eg Vertex.java,1.3,1.4

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

Update of /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/eg
In directory sc8-pr-cvs1:/tmp/cvs-serv22034/hibernate/eg

Modified Files:
	Vertex.java 
Log Message:
cleaned up imports

Index: Vertex.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/eg/Vertex.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Vertex.java	5 Jan 2003 02:11:20 -0000	1.3
--- Vertex.java	21 Mar 2003 12:03:36 -0000	1.4
***************
*** 1,5 ****
  //$Id$
  package net.sf.hibernate.eg;
! import java.util.*;
  
  public class Vertex {
--- 1,8 ----
  //$Id$
  package net.sf.hibernate.eg;
! import java.util.Date;
! import java.util.HashSet;
! import java.util.Iterator;
! import java.util.Set;
  
  public class Vertex {