Index: src/net/sf/hibernate/Hibernate.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/Hibernate.java,v
retrieving revision 1.19
diff -c -w -r1.19 Hibernate.java
*** src/net/sf/hibernate/Hibernate.java 4 Jun 2004 01:27:36 -0000 1.19
--- src/net/sf/hibernate/Hibernate.java 26 Jun 2004 23:25:48 -0000
***************
*** 182,194 ****
private Hibernate() {
throw new UnsupportedOperationException();
}
! /**
! * A Hibernate persistent enum type.
! * @deprecated Support for PersistentEnums will be removed in 2.2
! */
! public static Type enum(Class enumClass) throws MappingException {
! return new PersistentEnumType(enumClass);
! }
/**
* A Hibernate serializable type.
*/
--- 182,188 ----
private Hibernate() {
throw new UnsupportedOperationException();
}
!
/**
* A Hibernate serializable type.
*/
Index: src/net/sf/hibernate/Query.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/Query.java,v
retrieving revision 1.17
diff -c -w -r1.17 Query.java
*** src/net/sf/hibernate/Query.java 10 Jun 2004 14:31:54 -0000 1.17
--- src/net/sf/hibernate/Query.java 26 Jun 2004 23:25:49 -0000
***************
*** 298,311 ****
* @param val a non-null instance of a persistent class
*/
public Query setEntity(int position, Object val); // use setParameter for null values
- /**
- * Bind an instance of a persistent enumeration class to a JDBC-style query parameter.
- * @param position the position of the parameter in the query
- * string, numbered from 0.
- * @param val a non-null instance of a persistent enumeration
- * @deprecated Support for PersistentEnums will be removed in 2.2
- */
- public Query setEnum(int position, Object val) throws MappingException; // use setParameter for null values
/**
* Bind an instance of a mapped persistent class to a named query parameter.
--- 298,303 ----
***************
*** 313,325 ****
* @param val a non-null instance of a persistent class
*/
public Query setEntity(String name, Object val); // use setParameter for null values
- /**
- * Bind an instance of a mapped persistent enumeration class to a named query parameter.
- * @param name the name of the parameter
- * @param val a non-null instance of a persistent enumeration
- * @deprecated Support for PersistentEnums will be removed in 2.2
- */
- public Query setEnum(String name, Object val) throws MappingException; // use setParameter for null values
}
--- 305,310 ----
Index: src/net/sf/hibernate/cfg/Configuration.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/cfg/Configuration.java,v
retrieving revision 1.33
diff -c -w -r1.33 Configuration.java
*** src/net/sf/hibernate/cfg/Configuration.java 24 Jun 2004 19:45:29 -0000 1.33
--- src/net/sf/hibernate/cfg/Configuration.java 26 Jun 2004 23:25:49 -0000
***************
*** 383,392 ****
throw new MappingException("Could not configure datastore from jar: " + jar.getName(), ioe);
}
! Enumeration enum = jarFile.entries();
! while( enum.hasMoreElements() ) {
! ZipEntry ze = (ZipEntry) enum.nextElement();
if( ze.getName().endsWith(".hbm.xml") ) {
log.info( "Found mapping documents in jar: " + ze.getName() );
--- 383,392 ----
throw new MappingException("Could not configure datastore from jar: " + jar.getName(), ioe);
}
! Enumeration enumeration = jarFile.entries();
! while( enumeration.hasMoreElements() ) {
! ZipEntry ze = (ZipEntry) enumeration.nextElement();
if( ze.getName().endsWith(".hbm.xml") ) {
log.info( "Found mapping documents in jar: " + ze.getName() );
Index: src/net/sf/hibernate/impl/AbstractQueryImpl.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/impl/AbstractQueryImpl.java,v
retrieving revision 1.6
diff -c -w -r1.6 AbstractQueryImpl.java
*** src/net/sf/hibernate/impl/AbstractQueryImpl.java 10 Jun 2004 14:31:55 -0000 1.6
--- src/net/sf/hibernate/impl/AbstractQueryImpl.java 26 Jun 2004 23:25:49 -0000
***************
*** 242,252 ****
return this;
}
- public Query setEnum(int position, Object val) throws MappingException {
- setParameter( position, val, Hibernate.enum( val.getClass() ) );
- return this;
- }
-
public Query setLocale(int position, Locale locale) {
setParameter(position, locale, Hibernate.LOCALE);
return this;
--- 242,247 ----
***************
*** 302,312 ****
return this;
}
- public Query setEnum(String name, Object val) throws MappingException {
- setParameter( name, val, Hibernate.enum( val.getClass() ) );
- return this;
- }
-
public Query setFloat(String name, float val) {
setParameter(name, new Float(val), Hibernate.FLOAT);
return this;
--- 297,302 ----
Index: src/net/sf/hibernate/type/TypeFactory.java
===================================================================
RCS file: /cvsroot/hibernate/Hibernate2/src/net/sf/hibernate/type/TypeFactory.java,v
retrieving revision 1.16
diff -c -w -r1.16 TypeFactory.java
*** src/net/sf/hibernate/type/TypeFactory.java 4 Jun 2004 01:28:52 -0000 1.16
--- src/net/sf/hibernate/type/TypeFactory.java 26 Jun 2004 23:25:49 -0000
***************
*** 165,173 ****
else if ( Lifecycle.class.isAssignableFrom(typeClass) ) {
type = Hibernate.entity(typeClass);
}
- else if ( PersistentEnum.class.isAssignableFrom(typeClass) ) {
- type = Hibernate.enum(typeClass);
- }
else if ( Serializable.class.isAssignableFrom(typeClass) ) {
type = Hibernate.serializable(typeClass);
}
--- 165,170 ----