Hibernate SVN: r20760 - in core/trunk/core/src/main/java/org/hibernate: engine and 1 other directories.
by hibernate-commits＠lists.jboss.org
Author: steve.ebersole(a)jboss.com
Date: 2010-09-30 13:47:19 -0400 (Thu, 30 Sep 2010)
New Revision: 20760
Modified:
core/trunk/core/src/main/java/org/hibernate/action/EntityIdentityInsertAction.java
core/trunk/core/src/main/java/org/hibernate/action/EntityInsertAction.java
core/trunk/core/src/main/java/org/hibernate/engine/PersistenceContext.java
core/trunk/core/src/main/java/org/hibernate/engine/SessionImplementor.java
core/trunk/core/src/main/java/org/hibernate/engine/StatefulPersistenceContext.java
core/trunk/core/src/main/java/org/hibernate/engine/TwoPhaseLoad.java
core/trunk/core/src/main/java/org/hibernate/impl/SessionImpl.java
Log:
HHH-5609 - Move SessionImplementor#wasInsertedDuringTransaction to PersistenceContext
Modified: core/trunk/core/src/main/java/org/hibernate/action/EntityIdentityInsertAction.java
===================================================================
--- core/trunk/core/src/main/java/org/hibernate/action/EntityIdentityInsertAction.java 2010-09-30 15:18:21 UTC (rev 20759)
+++ core/trunk/core/src/main/java/org/hibernate/action/EntityIdentityInsertAction.java 2010-09-30 17:47:19 UTC (rev 20760)
@@ -75,7 +75,7 @@
//need to do that here rather than in the save event listener to let
//the post insert events to have a id-filled entity when IDENTITY is used (EJB3)
persister.setIdentifier( instance, generatedId, session );
- getSession().registerInsertedKey( getPersister(), generatedId );
+ getSession().getPersistenceContext().registerInsertedKey( getPersister(), generatedId );
}
Modified: core/trunk/core/src/main/java/org/hibernate/action/EntityInsertAction.java
===================================================================
--- core/trunk/core/src/main/java/org/hibernate/action/EntityInsertAction.java 2010-09-30 15:18:21 UTC (rev 20759)
+++ core/trunk/core/src/main/java/org/hibernate/action/EntityInsertAction.java 2010-09-30 17:47:19 UTC (rev 20760)
@@ -93,7 +93,7 @@
entry.postUpdate(instance, state, version);
}
- getSession().registerInsertedKey( getPersister(), getId() );
+ getSession().getPersistenceContext().registerInsertedKey( getPersister(), getId() );
}
final SessionFactoryImplementor factory = getSession().getFactory();
Modified: core/trunk/core/src/main/java/org/hibernate/engine/PersistenceContext.java
===================================================================
--- core/trunk/core/src/main/java/org/hibernate/engine/PersistenceContext.java 2010-09-30 15:18:21 UTC (rev 20759)
+++ core/trunk/core/src/main/java/org/hibernate/engine/PersistenceContext.java 2010-09-30 17:47:19 UTC (rev 20760)
@@ -583,4 +583,22 @@
* @param parent
*/
public void removeChildParent(Object child);
+
+ /**
+ * Register keys inserted during the current transaction
+ *
+ * @param persister The entity persister
+ * @param id The id
+ */
+ public void registerInsertedKey(EntityPersister persister, Serializable id);
+
+ /**
+ * Allows callers to check to see if the identified entity was inserted during the current transaction.
+ *
+ * @param persister The entity persister
+ * @param id The id
+ *
+ * @return True if inserted during this transaction, false otherwise.
+ */
+ public boolean wasInsertedDuringTransaction(EntityPersister persister, Serializable id);
}
Modified: core/trunk/core/src/main/java/org/hibernate/engine/SessionImplementor.java
===================================================================
--- core/trunk/core/src/main/java/org/hibernate/engine/SessionImplementor.java 2010-09-30 15:18:21 UTC (rev 20759)
+++ core/trunk/core/src/main/java/org/hibernate/engine/SessionImplementor.java 2010-09-30 17:47:19 UTC (rev 20760)
@@ -365,22 +365,4 @@
* should never be null.
*/
public LoadQueryInfluencers getLoadQueryInfluencers();
-
- /**
- * Register keys inserted during the current transaction
- *
- * @param persister The entity persister
- * @param id The id
- */
- public void registerInsertedKey(EntityPersister persister, Serializable id);
-
- /**
- * Allows callers to check to see if the identified entity was inserted during the current transaction.
- *
- * @param persister The entity persister
- * @param id The id
- *
- * @return True if inserted during this transaction, false otherwise.
- */
- public boolean wasInsertedDuringTransaction(EntityPersister persister, Serializable id);
}
Modified: core/trunk/core/src/main/java/org/hibernate/engine/StatefulPersistenceContext.java
===================================================================
--- core/trunk/core/src/main/java/org/hibernate/engine/StatefulPersistenceContext.java 2010-09-30 15:18:21 UTC (rev 20759)
+++ core/trunk/core/src/main/java/org/hibernate/engine/StatefulPersistenceContext.java 2010-09-30 17:47:19 UTC (rev 20760)
@@ -269,6 +269,7 @@
}
public void afterTransactionCompletion() {
+ cleanUpInsertedKeysAfterTransaction();
// Downgrade locks
Iterator iter = entityEntries.values().iterator();
while ( iter.hasNext() ) {
@@ -1622,4 +1623,49 @@
public void removeChildParent(Object child) {
parentsByChild.remove(child);
}
+
+
+ private HashMap<String,List<Serializable>> insertedKeysMap;
+
+ /**
+ * {@inheritDoc}
+ */
+ public void registerInsertedKey(EntityPersister persister, Serializable id) {
+ // we only are about regsitering these if the persister defines caching
+ if ( persister.hasCache() ) {
+ if ( insertedKeysMap == null ) {
+ insertedKeysMap = new HashMap<String, List<Serializable>>();
+ }
+ final String rootEntityName = persister.getRootEntityName();
+ List<Serializable> insertedEntityIds = insertedKeysMap.get( rootEntityName );
+ if ( insertedEntityIds == null ) {
+ insertedEntityIds = new ArrayList<Serializable>();
+ insertedKeysMap.put( rootEntityName, insertedEntityIds );
+ }
+ insertedEntityIds.add( id );
+ }
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public boolean wasInsertedDuringTransaction(EntityPersister persister, Serializable id) {
+ // again, we only really care if the entity is cached
+ if ( persister.hasCache() ) {
+ if ( insertedKeysMap != null ) {
+ List<Serializable> insertedEntityIds = insertedKeysMap.get( persister.getRootEntityName() );
+ if ( insertedEntityIds != null ) {
+ return insertedEntityIds.contains( id );
+ }
+ }
+ }
+ return false;
+ }
+
+ private void cleanUpInsertedKeysAfterTransaction() {
+ if ( insertedKeysMap != null ) {
+ insertedKeysMap.clear();
+ }
+ }
+
}
Modified: core/trunk/core/src/main/java/org/hibernate/engine/TwoPhaseLoad.java
===================================================================
--- core/trunk/core/src/main/java/org/hibernate/engine/TwoPhaseLoad.java 2010-09-30 15:18:21 UTC (rev 20759)
+++ core/trunk/core/src/main/java/org/hibernate/engine/TwoPhaseLoad.java 2010-09-30 17:47:19 UTC (rev 20760)
@@ -183,7 +183,7 @@
// 2) Session#clear + some form of load
//
// we need to be careful not to clobber the lock here in the cache so that it can be rolled back if need be
- if ( session.wasInsertedDuringTransaction( persister, id ) ) {
+ if ( session.getPersistenceContext().wasInsertedDuringTransaction( persister, id ) ) {
persister.getCacheAccessStrategy().update(
cacheKey,
persister.getCacheEntryStructure().structure( entry ),
Modified: core/trunk/core/src/main/java/org/hibernate/impl/SessionImpl.java
===================================================================
--- core/trunk/core/src/main/java/org/hibernate/impl/SessionImpl.java 2010-09-30 15:18:21 UTC (rev 20759)
+++ core/trunk/core/src/main/java/org/hibernate/impl/SessionImpl.java 2010-09-30 17:47:19 UTC (rev 20760)
@@ -598,7 +598,6 @@
public void afterTransactionCompletion(boolean success, Transaction tx) {
log.trace( "after transaction completion" );
- cleanUpInsertedKeysAfterTransaction();
persistenceContext.afterTransactionCompletion();
actionQueue.afterTransactionCompletion(success);
if ( rootSession == null && tx != null ) {
@@ -2017,49 +2016,6 @@
return loadQueryInfluencers;
}
- private HashMap<String,List<Serializable>> insertedKeysMap;
-
- /**
- * {@inheritDoc}
- */
- public void registerInsertedKey(EntityPersister persister, Serializable id) {
- // we only are about regsitering these if the persister defines caching
- if ( persister.hasCache() ) {
- if ( insertedKeysMap == null ) {
- insertedKeysMap = new HashMap<String, List<Serializable>>();
- }
- final String rootEntityName = persister.getRootEntityName();
- List<Serializable> insertedEntityIds = insertedKeysMap.get( rootEntityName );
- if ( insertedEntityIds == null ) {
- insertedEntityIds = new ArrayList<Serializable>();
- insertedKeysMap.put( rootEntityName, insertedEntityIds );
- }
- insertedEntityIds.add( id );
- }
- }
-
- /**
- * {@inheritDoc}
- */
- public boolean wasInsertedDuringTransaction(EntityPersister persister, Serializable id) {
- // again, we only really care if the entity is cached
- if ( persister.hasCache() ) {
- if ( insertedKeysMap != null ) {
- List<Serializable> insertedEntityIds = insertedKeysMap.get( persister.getRootEntityName() );
- if ( insertedEntityIds != null ) {
- return insertedEntityIds.contains( id );
- }
- }
- }
- return false;
- }
-
- private void cleanUpInsertedKeysAfterTransaction() {
- if ( insertedKeysMap != null ) {
- insertedKeysMap.clear();
- }
- }
-
// filter support ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
/**
14 years, 2 months
- 1
- 0
Hibernate SVN: r20759 - in core/trunk: core/src/main/java/org/hibernate/type/descriptor and 4 other directories.
by hibernate-commits＠lists.jboss.org
Author: steve.ebersole(a)jboss.com
Date: 2010-09-30 11:18:21 -0400 (Thu, 30 Sep 2010)
New Revision: 20759
Added:
core/trunk/core/src/main/java/org/hibernate/type/descriptor/JdbcTypeNameMapper.java
core/trunk/testsuite/src/test/java/org/hibernate/test/annotations/dataTypes/
core/trunk/testsuite/src/test/java/org/hibernate/test/annotations/dataTypes/BasicOperationsTest.java
core/trunk/testsuite/src/test/java/org/hibernate/test/annotations/dataTypes/Grade.java
core/trunk/testsuite/src/test/java/org/hibernate/test/annotations/dataTypes/SomeEntity.java
core/trunk/testsuite/src/test/java/org/hibernate/test/annotations/dataTypes/SomeOtherEntity.java
Modified:
core/trunk/core/src/main/java/org/hibernate/type/BasicTypeRegistry.java
core/trunk/core/src/main/java/org/hibernate/type/DateType.java
core/trunk/core/src/main/java/org/hibernate/type/TimeType.java
core/trunk/core/src/main/java/org/hibernate/type/descriptor/sql/BasicBinder.java
core/trunk/testsuite/src/test/resources/log4j.properties
Log:
HHH-5606 - Incorrect standard type regsitrations to date/time
Modified: core/trunk/core/src/main/java/org/hibernate/type/BasicTypeRegistry.java
===================================================================
--- core/trunk/core/src/main/java/org/hibernate/type/BasicTypeRegistry.java 2010-09-30 13:15:55 UTC (rev 20758)
+++ core/trunk/core/src/main/java/org/hibernate/type/BasicTypeRegistry.java 2010-09-30 15:18:21 UTC (rev 20759)
@@ -144,7 +144,7 @@
log.debug( "Adding type registration {} -> {}", key, type );
final Type old = registry.put( key, type );
if ( old != null && old != type ) {
- log.debug( " Overrides previous {}", old );
+ log.info( "Type registration [{}] overrides previous : {}", key, old );
}
}
}
Modified: core/trunk/core/src/main/java/org/hibernate/type/DateType.java
===================================================================
--- core/trunk/core/src/main/java/org/hibernate/type/DateType.java 2010-09-30 13:15:55 UTC (rev 20758)
+++ core/trunk/core/src/main/java/org/hibernate/type/DateType.java 2010-09-30 15:18:21 UTC (rev 20759)
@@ -49,10 +49,18 @@
}
@Override
- protected boolean registerUnderJavaType() {
- return true;
+ public String[] getRegistrationKeys() {
+ return new String[] {
+ getName(),
+ java.sql.Date.class.getName()
+ };
}
+// @Override
+// protected boolean registerUnderJavaType() {
+// return true;
+// }
+
public String objectToSQLString(Date value, Dialect dialect) throws Exception {
final java.sql.Date jdbcDate = java.sql.Date.class.isInstance( value )
? ( java.sql.Date ) value
Modified: core/trunk/core/src/main/java/org/hibernate/type/TimeType.java
===================================================================
--- core/trunk/core/src/main/java/org/hibernate/type/TimeType.java 2010-09-30 13:15:55 UTC (rev 20758)
+++ core/trunk/core/src/main/java/org/hibernate/type/TimeType.java 2010-09-30 15:18:21 UTC (rev 20759)
@@ -50,10 +50,18 @@
}
@Override
- protected boolean registerUnderJavaType() {
- return true;
+ public String[] getRegistrationKeys() {
+ return new String[] {
+ getName(),
+ java.sql.Time.class.getName()
+ };
}
+ // @Override
+// protected boolean registerUnderJavaType() {
+// return true;
+// }
+
public String objectToSQLString(Date value, Dialect dialect) throws Exception {
Time jdbcTime = Time.class.isInstance( value )
? ( Time ) value
Added: core/trunk/core/src/main/java/org/hibernate/type/descriptor/JdbcTypeNameMapper.java
===================================================================
--- core/trunk/core/src/main/java/org/hibernate/type/descriptor/JdbcTypeNameMapper.java (rev 0)
+++ core/trunk/core/src/main/java/org/hibernate/type/descriptor/JdbcTypeNameMapper.java 2010-09-30 15:18:21 UTC (rev 20759)
@@ -0,0 +1,81 @@
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * Copyright (c) 2010, Red Hat Inc. or third-party contributors as
+ * indicated by the @author tags or express copyright attribution
+ * statements applied by the authors. All third-party contributions are
+ * distributed under license by Red Hat Inc.
+ *
+ * This copyrighted material is made available to anyone wishing to use, modify,
+ * copy, or redistribute it subject to the terms and conditions of the GNU
+ * Lesser General Public License, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this distribution; if not, write to:
+ * Free Software Foundation, Inc.
+ * 51 Franklin Street, Fifth Floor
+ * Boston, MA 02110-1301 USA
+ */
+package org.hibernate.type.descriptor;
+
+import java.lang.reflect.Field;
+import java.sql.Types;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import org.hibernate.HibernateException;
+
+/**
+ * TODO : javadoc
+ *
+ * @author Steve Ebersole
+ */
+public class JdbcTypeNameMapper {
+ private static final Logger log = LoggerFactory.getLogger( JdbcTypeNameMapper.class );
+ private static Map<Integer,String> JDBC_TYPE_MAP = buildJdbcTypeMap();
+
+ private static Map<Integer, String> buildJdbcTypeMap() {
+ HashMap<Integer, String> map = new HashMap<Integer, String>();
+ Field[] fields = Types.class.getFields();
+ if ( fields == null ) {
+ throw new HibernateException( "Unexpected problem extracting JDBC type mapping codes from java.sql.Types" );
+ }
+ for ( Field field : fields ) {
+ try {
+ final int code = field.getInt( null );
+ String old = map.put(
+ Integer.valueOf( code ),
+ field.getName()
+ );
+ if ( old != null ) {
+ log.info( "java.sql.Types mapped the same code [" + code + "] multiple times; was [" + old + "]; now [" + field.getName() + "]" );
+ }
+ }
+ catch ( IllegalAccessException e ) {
+ throw new HibernateException( "Unable to access JDBC type mapping [" + field.getName() + "]", e );
+ }
+ }
+ return Collections.unmodifiableMap( map );
+ }
+
+ public static String getTypeName(int code) {
+ return getTypeName( Integer.valueOf( code ) );
+ }
+
+ public static String getTypeName(Integer code) {
+ String name = JDBC_TYPE_MAP.get( code );
+ if ( name == null ) {
+ return "UNKNOWN(" + code + ")";
+ }
+ return name;
+ }
+}
Modified: core/trunk/core/src/main/java/org/hibernate/type/descriptor/sql/BasicBinder.java
===================================================================
--- core/trunk/core/src/main/java/org/hibernate/type/descriptor/sql/BasicBinder.java 2010-09-30 13:15:55 UTC (rev 20758)
+++ core/trunk/core/src/main/java/org/hibernate/type/descriptor/sql/BasicBinder.java 2010-09-30 15:18:21 UTC (rev 20759)
@@ -29,6 +29,7 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.hibernate.type.descriptor.JdbcTypeNameMapper;
import org.hibernate.type.descriptor.ValueBinder;
import org.hibernate.type.descriptor.WrapperOptions;
import org.hibernate.type.descriptor.java.JavaTypeDescriptor;
@@ -41,6 +42,9 @@
public abstract class BasicBinder<J> implements ValueBinder<J> {
private static final Logger log = LoggerFactory.getLogger( BasicBinder.class );
+ private static final String BIND_MSG_TEMPLATE = "binding parameter [%d] as [%s] - %s";
+ private static final String NULL_BIND_MSG_TEMPLATE = "binding parameter [%d] as [%s] - <null>";
+
private final JavaTypeDescriptor<J> javaDescriptor;
private final SqlTypeDescriptor sqlDescriptor;
@@ -62,11 +66,26 @@
*/
public final void bind(PreparedStatement st, J value, int index, WrapperOptions options) throws SQLException {
if ( value == null ) {
- log.trace( "binding [null] to parameter [{}]", index );
+ if ( log.isTraceEnabled() ) {
+ log.trace(
+ String.format(
+ NULL_BIND_MSG_TEMPLATE,
+ index,
+ JdbcTypeNameMapper.getTypeName( sqlDescriptor.getSqlType() )
+ )
+ );
+ }
st.setNull( index, sqlDescriptor.getSqlType() );
}
else {
- log.trace( "binding [{}] to parameter [{}]", getJavaDescriptor().extractLoggableRepresentation( value ), index );
+ log.trace(
+ String.format(
+ BIND_MSG_TEMPLATE,
+ index,
+ JdbcTypeNameMapper.getTypeName( sqlDescriptor.getSqlType() ),
+ getJavaDescriptor().extractLoggableRepresentation( value )
+ )
+ );
doBind( st, value, index, options );
}
}
Added: core/trunk/testsuite/src/test/java/org/hibernate/test/annotations/dataTypes/BasicOperationsTest.java
===================================================================
--- core/trunk/testsuite/src/test/java/org/hibernate/test/annotations/dataTypes/BasicOperationsTest.java (rev 0)
+++ core/trunk/testsuite/src/test/java/org/hibernate/test/annotations/dataTypes/BasicOperationsTest.java 2010-09-30 15:18:21 UTC (rev 20759)
@@ -0,0 +1,108 @@
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * Copyright (c) 2010, Red Hat Inc. or third-party contributors as
+ * indicated by the @author tags or express copyright attribution
+ * statements applied by the authors. All third-party contributions are
+ * distributed under license by Red Hat Inc.
+ *
+ * This copyrighted material is made available to anyone wishing to use, modify,
+ * copy, or redistribute it subject to the terms and conditions of the GNU
+ * Lesser General Public License, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this distribution; if not, write to:
+ * Free Software Foundation, Inc.
+ * 51 Franklin Street, Fifth Floor
+ * Boston, MA 02110-1301 USA
+ */
+package org.hibernate.test.annotations.dataTypes;
+
+import java.sql.Connection;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.Date;
+
+import org.hibernate.Session;
+import org.hibernate.jdbc.Work;
+import org.hibernate.test.annotations.TestCase;
+import org.hibernate.type.descriptor.JdbcTypeNameMapper;
+
+/**
+ * TODO : javadoc
+ *
+ * @author Steve Ebersole
+ */
+public class BasicOperationsTest extends TestCase {
+ @Override
+ protected Class<?>[] getAnnotatedClasses() {
+ return new Class[] { SomeEntity.class, SomeOtherEntity.class };
+ }
+
+ public void testCreateAndDelete() {
+ Date now = new Date();
+
+ Session s = openSession();
+ s.doWork(
+ new Work() {
+ public void execute(Connection connection) throws SQLException {
+ // id -> java.util.Date (DATE - becase of explicit TemporalType)
+ validateColumn( connection, "ID", java.sql.Types.DATE );
+
+ // timeData -> java.sql.Time (TIME)
+ validateColumn( connection, "TIMEDATA", java.sql.Types.TIME );
+
+ // tsData -> java.sql.Timestamp (TIMESTAMP)
+ validateColumn( connection, "TSDATA", java.sql.Types.TIMESTAMP );
+ }
+
+ private void validateColumn(Connection connection, String columnName, int expectedJdbcTypeCode)
+ throws SQLException {
+ ResultSet columnInfo = connection.getMetaData().getColumns( null, null, "SOMEENTITY", columnName );
+ assertTrue( columnInfo.next() );
+ int dataType = columnInfo.getInt( "DATA_TYPE" );
+ columnInfo.close();
+ assertEquals( columnName, JdbcTypeNameMapper.getTypeName(expectedJdbcTypeCode), JdbcTypeNameMapper.getTypeName(dataType) );
+ }
+
+ }
+ );
+ s.beginTransaction();
+ SomeEntity someEntity = new SomeEntity( now );
+ SomeOtherEntity someOtherEntity = new SomeOtherEntity(1);
+ s.save( someEntity );
+ s.save( someOtherEntity );
+ s.getTransaction().commit();
+ s.close();
+
+ s = openSession();
+ s.beginTransaction();
+ s.delete( someEntity );
+ s.delete( someOtherEntity );
+ s.getTransaction().commit();
+ s.close();
+ }
+
+ private Byte[] generateByteArray() {
+ final byte[] bytes = "I'll be back".getBytes();
+ final Byte[] wrappedBytes = new Byte[ bytes.length ];
+ for ( int i = 0, max = bytes.length; i < max; i++ ) {
+ wrappedBytes[i] = Byte.valueOf( bytes[i] );
+ }
+ return wrappedBytes;
+ }
+
+ private Character[] generateCharacterArray() {
+ final char[] chars = "I'll be back".toCharArray();
+ final Character[] wrappedChars = new Character[ chars.length ];
+ for ( int i = 0, max = chars.length; i < max; i++ ) {
+ wrappedChars[i] = Character.valueOf( chars[i] );
+ }
+ return wrappedChars;
+ }
+}
Added: core/trunk/testsuite/src/test/java/org/hibernate/test/annotations/dataTypes/Grade.java
===================================================================
--- core/trunk/testsuite/src/test/java/org/hibernate/test/annotations/dataTypes/Grade.java (rev 0)
+++ core/trunk/testsuite/src/test/java/org/hibernate/test/annotations/dataTypes/Grade.java 2010-09-30 15:18:21 UTC (rev 20759)
@@ -0,0 +1,37 @@
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * Copyright (c) 2010, Red Hat Inc. or third-party contributors as
+ * indicated by the @author tags or express copyright attribution
+ * statements applied by the authors. All third-party contributions are
+ * distributed under license by Red Hat Inc.
+ *
+ * This copyrighted material is made available to anyone wishing to use, modify,
+ * copy, or redistribute it subject to the terms and conditions of the GNU
+ * Lesser General Public License, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this distribution; if not, write to:
+ * Free Software Foundation, Inc.
+ * 51 Franklin Street, Fifth Floor
+ * Boston, MA 02110-1301 USA
+ */
+package org.hibernate.test.annotations.dataTypes;
+
+/**
+ * TODO : javadoc
+ *
+ * @author Steve Ebersole
+ */
+public enum Grade {
+ A,
+ B,
+ C,
+ D,
+ F
+}
Added: core/trunk/testsuite/src/test/java/org/hibernate/test/annotations/dataTypes/SomeEntity.java
===================================================================
--- core/trunk/testsuite/src/test/java/org/hibernate/test/annotations/dataTypes/SomeEntity.java (rev 0)
+++ core/trunk/testsuite/src/test/java/org/hibernate/test/annotations/dataTypes/SomeEntity.java 2010-09-30 15:18:21 UTC (rev 20759)
@@ -0,0 +1,99 @@
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * Copyright (c) 2010, Red Hat Inc. or third-party contributors as
+ * indicated by the @author tags or express copyright attribution
+ * statements applied by the authors. All third-party contributions are
+ * distributed under license by Red Hat Inc.
+ *
+ * This copyrighted material is made available to anyone wishing to use, modify,
+ * copy, or redistribute it subject to the terms and conditions of the GNU
+ * Lesser General Public License, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this distribution; if not, write to:
+ * Free Software Foundation, Inc.
+ * 51 Franklin Street, Fifth Floor
+ * Boston, MA 02110-1301 USA
+ */
+package org.hibernate.test.annotations.dataTypes;
+
+import java.util.Date;
+import javax.persistence.Access;
+import javax.persistence.AccessType;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Lob;
+import javax.persistence.Temporal;
+import javax.persistence.TemporalType;
+
+/**
+ * TODO : javadoc
+ *
+ * @author Steve Ebersole
+ */
+@Entity
+(a)Access(AccessType.FIELD)
+public class SomeEntity {
+ @Id
+ @Temporal(TemporalType.DATE)
+ private java.util.Date id;
+ private java.sql.Time timeData;
+ private java.sql.Timestamp tsData;
+ @Lob
+ private Byte[] byteData;
+ private Character[] charData;
+
+ public SomeEntity() {
+ }
+
+ public SomeEntity(Date id) {
+ this.id = id;
+ }
+
+ public java.util.Date getId() {
+ return id;
+ }
+
+ public void setId(java.util.Date id) {
+ this.id = id;
+ }
+
+ public Character[] getCharData() {
+ return charData;
+ }
+
+ public void setCharData(Character[] charData) {
+ this.charData = charData;
+ }
+
+ public java.sql.Time getTimeData() {
+ return timeData;
+ }
+
+ public void setTimeData(java.sql.Time timeData) {
+ this.timeData = timeData;
+ }
+
+ public java.sql.Timestamp getTsData() {
+ return tsData;
+ }
+
+ public void setTsData(java.sql.Timestamp tsData) {
+ this.tsData = tsData;
+ }
+
+ public Byte[] getByteData() {
+ return byteData;
+ }
+
+ public void setByteData(Byte[] byteData) {
+ this.byteData = byteData;
+ }
+
+}
Added: core/trunk/testsuite/src/test/java/org/hibernate/test/annotations/dataTypes/SomeOtherEntity.java
===================================================================
--- core/trunk/testsuite/src/test/java/org/hibernate/test/annotations/dataTypes/SomeOtherEntity.java (rev 0)
+++ core/trunk/testsuite/src/test/java/org/hibernate/test/annotations/dataTypes/SomeOtherEntity.java 2010-09-30 15:18:21 UTC (rev 20759)
@@ -0,0 +1,150 @@
+/*
+ * Hibernate, Relational Persistence for Idiomatic Java
+ *
+ * Copyright (c) 2010, Red Hat Inc. or third-party contributors as
+ * indicated by the @author tags or express copyright attribution
+ * statements applied by the authors. All third-party contributions are
+ * distributed under license by Red Hat Inc.
+ *
+ * This copyrighted material is made available to anyone wishing to use, modify,
+ * copy, or redistribute it subject to the terms and conditions of the GNU
+ * Lesser General Public License, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this distribution; if not, write to:
+ * Free Software Foundation, Inc.
+ * 51 Franklin Street, Fifth Floor
+ * Boston, MA 02110-1301 USA
+ */
+package org.hibernate.test.annotations.dataTypes;
+
+import javax.persistence.Access;
+import javax.persistence.AccessType;
+import javax.persistence.Basic;
+import javax.persistence.Entity;
+import javax.persistence.EnumType;
+import javax.persistence.Enumerated;
+import javax.persistence.Id;
+
+/**
+ * TODO : javadoc
+ *
+ * @author Steve Ebersole
+ */
+@Entity
+(a)Access(AccessType.FIELD)
+public class SomeOtherEntity {
+ @Id
+ protected int id;
+ protected boolean booleanData;
+ protected byte byteData;
+ protected char characterData;
+ protected short shortData;
+ protected int integerData;
+ protected long longData;
+ protected double doubleData;
+ protected float floatData;
+ @Enumerated(EnumType.STRING)
+ protected Grade grade;
+
+
+ public SomeOtherEntity()
+ {
+ }
+
+ public SomeOtherEntity(int id)
+ {
+ this.id = id;
+ }
+
+ public SomeOtherEntity(
+ int id,
+ boolean booleanData,
+ byte byteData,
+ char characterData,
+ short shortData,
+ int integerData,
+ long longData,
+ double doubleData,
+ float floatData) {
+ this.id = id;
+ this.booleanData = booleanData;
+ this.byteData = byteData;
+ this.characterData = characterData;
+ this.shortData = shortData;
+ this.integerData = integerData;
+ this.longData = longData;
+ this.doubleData = doubleData;
+ this.floatData = floatData;
+ }
+
+ public Integer getId() {
+ return id;
+ }
+
+ public void setId(Integer id) {
+ this.id = id;
+ }
+
+ public Character getCharacterData() {
+ return characterData;
+ }
+
+ public void setCharacterData(Character characterData) {
+ this.characterData = characterData;
+ }
+
+ public Short getShortData() {
+ return shortData;
+ }
+
+ public void setShortData(Short shortData) {
+ this.shortData = shortData;
+ }
+
+ public Integer getIntegerData() {
+ return integerData;
+ }
+
+ public void setIntegerData(Integer integerData) {
+ this.integerData = integerData;
+ }
+
+ public Long getLongData() {
+ return longData;
+ }
+
+ public void setLongData(Long longData) {
+ this.longData = longData;
+ }
+
+ public Double getDoubleData() {
+ return doubleData;
+ }
+
+ public void setDoubleData(Double doubleData) {
+ this.doubleData = doubleData;
+ }
+
+ public Float getFloatData() {
+ return floatData;
+ }
+
+ public void setFloatData(Float floatData) {
+ this.floatData = floatData;
+ }
+
+ public Grade getGrade() {
+ return grade;
+ }
+
+ public void setGrade(Grade grade) {
+ this.grade = grade;
+ }
+
+}
Modified: core/trunk/testsuite/src/test/resources/log4j.properties
===================================================================
--- core/trunk/testsuite/src/test/resources/log4j.properties 2010-09-30 13:15:55 UTC (rev 20758)
+++ core/trunk/testsuite/src/test/resources/log4j.properties 2010-09-30 15:18:21 UTC (rev 20759)
@@ -11,4 +11,6 @@
log4j.logger.org.hibernate.hql.ast.QueryTranslatorImpl=trace
log4j.logger.org.hibernate.hql.ast.HqlSqlWalker=trace
log4j.logger.org.hibernate.hql.ast.SqlGenerator=trace
-log4j.logger.org.hibernate.hql.ast.AST=trace
\ No newline at end of file
+log4j.logger.org.hibernate.hql.ast.AST=trace
+log4j.logger.org.hibernate.type.descriptor.sql.BasicBinder=trace
+log4j.logger.org.hibernate.type.BasicTypeRegistry=trace
\ No newline at end of file
14 years, 2 months
- 1
- 0
Hibernate SVN: r20758 - core/trunk/parent.
by hibernate-commits＠lists.jboss.org
Author: steve.ebersole(a)jboss.com
Date: 2010-09-30 09:15:55 -0400 (Thu, 30 Sep 2010)
New Revision: 20758
Modified:
core/trunk/parent/pom.xml
Log:
HHH-5607 - Add derby profile
Modified: core/trunk/parent/pom.xml
===================================================================
--- core/trunk/parent/pom.xml 2010-09-30 10:15:56 UTC (rev 20757)
+++ core/trunk/parent/pom.xml 2010-09-30 13:15:55 UTC (rev 20758)
@@ -613,6 +613,28 @@
<jdbc.isolation/>
</properties>
</profile>
+
+ <profile>
+ <id>derby</id>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derby</artifactId>
+ <!-- 10.5.3.0 has a bad pom -->
+ <version>10.5.3.0_1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <properties>
+ <db.dialect>org.hibernate.dialect.DerbyDialect</db.dialect>
+ <jdbc.driver>org.apache.derby.jdbc.EmbeddedDriver</jdbc.driver>
+ <jdbc.url>jdbc:derby:${pom.build.outputDirectory}/test/derby;create=true</jdbc.url>
+ <jdbc.user>sa</jdbc.user>
+ <jdbc.pass/>
+ <jdbc.isolation/>
+ </properties>
+ </profile>
+
<!--
###################################################################
Profiles naming db instances in the Red Hat QA/QE lab
14 years, 2 months
- 1
- 0
Hibernate SVN: r20757 - validator/trunk/hibernate-validator-tck-runner.
by hibernate-commits＠lists.jboss.org
Author: hardy.ferentschik
Date: 2010-09-30 06:15:56 -0400 (Thu, 30 Sep 2010)
New Revision: 20757
Modified:
validator/trunk/hibernate-validator-tck-runner/pom.xml
Log:
fixed typo
Modified: validator/trunk/hibernate-validator-tck-runner/pom.xml
===================================================================
--- validator/trunk/hibernate-validator-tck-runner/pom.xml 2010-09-30 08:49:21 UTC (rev 20756)
+++ validator/trunk/hibernate-validator-tck-runner/pom.xml 2010-09-30 10:15:56 UTC (rev 20757)
@@ -10,7 +10,7 @@
</parent>
<artifactId>hibernate-validator-tck-runner</artifactId>
<name>Hibernate Validator TCK Runner</name>
- <description>Aggregates dependencies and run's the JSR-303 TCK</description>
+ <description>Aggregates dependencies and runs the JSR-303 TCK</description>
<dependencies>
<dependency>
14 years, 2 months
- 1
- 0
Hibernate SVN: r20756 - core/trunk.
by hibernate-commits＠lists.jboss.org
Author: hardy.ferentschik
Date: 2010-09-30 04:49:21 -0400 (Thu, 30 Sep 2010)
New Revision: 20756
Modified:
core/trunk/tagRelease.sh
Log:
Fixed typo in string null check of project name. -z instead of -Z
Modified: core/trunk/tagRelease.sh
===================================================================
--- core/trunk/tagRelease.sh 2010-09-29 21:33:09 UTC (rev 20755)
+++ core/trunk/tagRelease.sh 2010-09-30 08:49:21 UTC (rev 20756)
@@ -63,7 +63,7 @@
fi
projectName=`xmlstarlet sel -N x=http://maven.apache.org/POM/4.0.0 -t -v "/x:project/x:artifactId" pom.xml`
-if [ -Z "$projectName" ]; then
+if [ -z "$projectName" ]; then
echo "Could not determine propject name (misasing/incomplete pom?)."
exit;
fi
14 years, 2 months
- 1
- 0
Hibernate SVN: r20755 - core/tags/hibernate-3.6.0.CR2.
by hibernate-commits＠lists.jboss.org
Author: gbadner
Date: 2010-09-29 17:33:09 -0400 (Wed, 29 Sep 2010)
New Revision: 20755
Modified:
core/tags/hibernate-3.6.0.CR2/changelog.txt
Log:
updated changelog.txt for 3.6.0.CR2
Modified: core/tags/hibernate-3.6.0.CR2/changelog.txt
===================================================================
--- core/tags/hibernate-3.6.0.CR2/changelog.txt 2010-09-29 21:23:58 UTC (rev 20754)
+++ core/tags/hibernate-3.6.0.CR2/changelog.txt 2010-09-29 21:33:09 UTC (rev 20755)
@@ -5,6 +5,40 @@
refer to the particular case on JIRA using the issue tracking number to learn
more about each case.
+Changes in version 3.6.0.CR2 (2010.09.29)
+-------------------------------------------
+http://opensource.atlassian.com/projects/hibernate/browse/HHH/fixforversion/11131
+
+** Bug
+ * [HHH-892] - HQL parser does not resolve alias in ORDER BY clause
+ * [HHH-2917] - Using subselects as operands for arithmetic operations causes NullPointerException
+ * [HHH-4510] - Add column-level read/write support (HHH-4440) to annotations
+ * [HHH-5490] - dirty data be inserted into 2L cache
+ * [HHH-5552] - Infinispan listener implementations need to load entities and keys using application classloader.
+ * [HHH-5563] - JndiInfinispanRegionFactory creates region with a stopped cache, if region previously existed
+ * [HHH-5568] - correct wrong format in document
+ * [HHH-5573] - Change TestCase to rebuildSessionFactory() whenever sessions var is accessed
+ * [HHH-5590] - Don't log and rethrow exceptions in AbstractFlushingEventListener
+ * [HHH-5591] - ConcurrentStatisticsImpl#queryExecuted() does not update queryExecutionMaxTimeQueryString
+ * [HHH-5592] - org.hibernate.test.hql.ASTParserLoadingOrderByTest hangs on postgresql
+ * [HHH-5593] - org.hibernate.test.legacy.FooBarTest.testCollectionWhere fails on hsqldb
+ * [HHH-5594] - org.hibernate.test.jpa.lock.JPALockTest fails on hsqldb
+ * [HHH-5595] - postgresql jdbc driver does not implement the setQueryTimeout method
+ * [HHH-5596] - org.hibernate.test.annotations.onetoone.OneToOneTest.testPkOneToOneSelectStatementDoesNotGenerateExtraJoin() fails on postgresql
+ * [HHH-5597] - org.hibernate.test.criteria.LikeTest.testLike fails on postgresql because of the default escape charactor
+
+** Improvement
+ * [HHH-5560] - Envers ValidAuditTimeStrategy needs a better name
+ * [HHH-5589] - mysql does not support column check
+
+** New Feature
+ * [HHH-5190] - Provide annotation support for <discriminator>'s force and insert
+ * [HHH-5205] - Add support for source="db" for timestamp versions
+
+** Patch
+ * [HHH-5581] - Improve InformixDialect sequence support
+
+
Changes in version 3.6.0.CR1 (2010.09.15)
-------------------------------------------
http://opensource.atlassian.com/projects/hibernate/browse/HHH/fixforversi...
14 years, 2 months
- 1
- 0
Hibernate SVN: r20754 - core/trunk.
by hibernate-commits＠lists.jboss.org
Author: gbadner
Date: 2010-09-29 17:23:58 -0400 (Wed, 29 Sep 2010)
New Revision: 20754
Modified:
core/trunk/changelog.txt
Log:
update changelog.txt for 3.6.0.CR2
Modified: core/trunk/changelog.txt
===================================================================
--- core/trunk/changelog.txt 2010-09-29 20:56:44 UTC (rev 20753)
+++ core/trunk/changelog.txt 2010-09-29 21:23:58 UTC (rev 20754)
@@ -5,6 +5,40 @@
refer to the particular case on JIRA using the issue tracking number to learn
more about each case.
+Changes in version 3.6.0.CR2 (2010.09.29)
+-------------------------------------------
+http://opensource.atlassian.com/projects/hibernate/browse/HHH/fixforversion/11131
+
+** Bug
+ * [HHH-892] - HQL parser does not resolve alias in ORDER BY clause
+ * [HHH-2917] - Using subselects as operands for arithmetic operations causes NullPointerException
+ * [HHH-4510] - Add column-level read/write support (HHH-4440) to annotations
+ * [HHH-5490] - dirty data be inserted into 2L cache
+ * [HHH-5552] - Infinispan listener implementations need to load entities and keys using application classloader.
+ * [HHH-5563] - JndiInfinispanRegionFactory creates region with a stopped cache, if region previously existed
+ * [HHH-5568] - correct wrong format in document
+ * [HHH-5573] - Change TestCase to rebuildSessionFactory() whenever sessions var is accessed
+ * [HHH-5590] - Don't log and rethrow exceptions in AbstractFlushingEventListener
+ * [HHH-5591] - ConcurrentStatisticsImpl#queryExecuted() does not update queryExecutionMaxTimeQueryString
+ * [HHH-5592] - org.hibernate.test.hql.ASTParserLoadingOrderByTest hangs on postgresql
+ * [HHH-5593] - org.hibernate.test.legacy.FooBarTest.testCollectionWhere fails on hsqldb
+ * [HHH-5594] - org.hibernate.test.jpa.lock.JPALockTest fails on hsqldb
+ * [HHH-5595] - postgresql jdbc driver does not implement the setQueryTimeout method
+ * [HHH-5596] - org.hibernate.test.annotations.onetoone.OneToOneTest.testPkOneToOneSelectStatementDoesNotGenerateExtraJoin() fails on postgresql
+ * [HHH-5597] - org.hibernate.test.criteria.LikeTest.testLike fails on postgresql because of the default escape charactor
+
+** Improvement
+ * [HHH-5560] - Envers ValidAuditTimeStrategy needs a better name
+ * [HHH-5589] - mysql does not support column check
+
+** New Feature
+ * [HHH-5190] - Provide annotation support for <discriminator>'s force and insert
+ * [HHH-5205] - Add support for source="db" for timestamp versions
+
+** Patch
+ * [HHH-5581] - Improve InformixDialect sequence support
+
+
Changes in version 3.6.0.CR1 (2010.09.15)
-------------------------------------------
http://opensource.atlassian.com/projects/hibernate/browse/HHH/fixforversi...
14 years, 2 months
- 1
- 0
Hibernate SVN: r20753 - in core/trunk: cache-ehcache and 29 other directories.
by hibernate-commits＠lists.jboss.org
Author: steve.ebersole(a)jboss.com
Date: 2010-09-29 16:56:44 -0400 (Wed, 29 Sep 2010)
New Revision: 20753
Modified:
core/trunk/cache-ehcache/pom.xml
core/trunk/cache-infinispan/pom.xml
core/trunk/cache-jbosscache/pom.xml
core/trunk/cache-oscache/pom.xml
core/trunk/cache-swarmcache/pom.xml
core/trunk/connection-c3p0/pom.xml
core/trunk/connection-proxool/pom.xml
core/trunk/core/pom.xml
core/trunk/distribution/pom.xml
core/trunk/documentation/devguide/pom.xml
core/trunk/documentation/envers/pom.xml
core/trunk/documentation/jbosscache2/pom.xml
core/trunk/documentation/manual/pom.xml
core/trunk/documentation/pom.xml
core/trunk/documentation/quickstart/pom.xml
core/trunk/documentation/quickstart/tutorials/annotations/pom.xml
core/trunk/documentation/quickstart/tutorials/basic/pom.xml
core/trunk/documentation/quickstart/tutorials/entitymanager/pom.xml
core/trunk/documentation/quickstart/tutorials/envers/pom.xml
core/trunk/documentation/quickstart/tutorials/pom.xml
core/trunk/entitymanager/pom.xml
core/trunk/envers/pom.xml
core/trunk/jdbc3-testing/pom.xml
core/trunk/jdbc4-testing/pom.xml
core/trunk/parent/pom.xml
core/trunk/pom.xml
core/trunk/testing/pom.xml
core/trunk/testsuite/pom.xml
core/trunk/tutorials/eg/pom.xml
core/trunk/tutorials/pom.xml
core/trunk/tutorials/web/pom.xml
Log:
Updating pom versions to /home/steve/projects/hibernate/core/trunk for release tagging
Modified: core/trunk/cache-ehcache/pom.xml
===================================================================
--- core/trunk/cache-ehcache/pom.xml 2010-09-29 20:56:14 UTC (rev 20752)
+++ core/trunk/cache-ehcache/pom.xml 2010-09-29 20:56:44 UTC (rev 20753)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.6.0.CR2</version>
+ <version>3.6.0-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/cache-infinispan/pom.xml
===================================================================
--- core/trunk/cache-infinispan/pom.xml 2010-09-29 20:56:14 UTC (rev 20752)
+++ core/trunk/cache-infinispan/pom.xml 2010-09-29 20:56:44 UTC (rev 20753)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.6.0.CR2</version>
+ <version>3.6.0-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/cache-jbosscache/pom.xml
===================================================================
--- core/trunk/cache-jbosscache/pom.xml 2010-09-29 20:56:14 UTC (rev 20752)
+++ core/trunk/cache-jbosscache/pom.xml 2010-09-29 20:56:44 UTC (rev 20753)
@@ -27,7 +27,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.6.0.CR2</version>
+ <version>3.6.0-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/cache-oscache/pom.xml
===================================================================
--- core/trunk/cache-oscache/pom.xml 2010-09-29 20:56:14 UTC (rev 20752)
+++ core/trunk/cache-oscache/pom.xml 2010-09-29 20:56:44 UTC (rev 20753)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.6.0.CR2</version>
+ <version>3.6.0-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/cache-swarmcache/pom.xml
===================================================================
--- core/trunk/cache-swarmcache/pom.xml 2010-09-29 20:56:14 UTC (rev 20752)
+++ core/trunk/cache-swarmcache/pom.xml 2010-09-29 20:56:44 UTC (rev 20753)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.6.0.CR2</version>
+ <version>3.6.0-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/connection-c3p0/pom.xml
===================================================================
--- core/trunk/connection-c3p0/pom.xml 2010-09-29 20:56:14 UTC (rev 20752)
+++ core/trunk/connection-c3p0/pom.xml 2010-09-29 20:56:44 UTC (rev 20753)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.6.0.CR2</version>
+ <version>3.6.0-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/connection-proxool/pom.xml
===================================================================
--- core/trunk/connection-proxool/pom.xml 2010-09-29 20:56:14 UTC (rev 20752)
+++ core/trunk/connection-proxool/pom.xml 2010-09-29 20:56:44 UTC (rev 20753)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.6.0.CR2</version>
+ <version>3.6.0-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/core/pom.xml
===================================================================
--- core/trunk/core/pom.xml 2010-09-29 20:56:14 UTC (rev 20752)
+++ core/trunk/core/pom.xml 2010-09-29 20:56:44 UTC (rev 20753)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.6.0.CR2</version>
+ <version>3.6.0-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/distribution/pom.xml
===================================================================
--- core/trunk/distribution/pom.xml 2010-09-29 20:56:14 UTC (rev 20752)
+++ core/trunk/distribution/pom.xml 2010-09-29 20:56:44 UTC (rev 20753)
@@ -30,7 +30,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.6.0.CR2</version>
+ <version>3.6.0-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/documentation/devguide/pom.xml
===================================================================
--- core/trunk/documentation/devguide/pom.xml 2010-09-29 20:56:14 UTC (rev 20752)
+++ core/trunk/documentation/devguide/pom.xml 2010-09-29 20:56:44 UTC (rev 20753)
@@ -29,7 +29,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.6.0.CR2</version>
+ <version>3.6.0-SNAPSHOT</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/documentation/envers/pom.xml
===================================================================
--- core/trunk/documentation/envers/pom.xml 2010-09-29 20:56:14 UTC (rev 20752)
+++ core/trunk/documentation/envers/pom.xml 2010-09-29 20:56:44 UTC (rev 20753)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.6.0.CR2</version>
+ <version>3.6.0-SNAPSHOT</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/documentation/jbosscache2/pom.xml
===================================================================
--- core/trunk/documentation/jbosscache2/pom.xml 2010-09-29 20:56:14 UTC (rev 20752)
+++ core/trunk/documentation/jbosscache2/pom.xml 2010-09-29 20:56:44 UTC (rev 20753)
@@ -30,7 +30,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.6.0.CR2</version>
+ <version>3.6.0-SNAPSHOT</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/documentation/manual/pom.xml
===================================================================
--- core/trunk/documentation/manual/pom.xml 2010-09-29 20:56:14 UTC (rev 20752)
+++ core/trunk/documentation/manual/pom.xml 2010-09-29 20:56:44 UTC (rev 20753)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.6.0.CR2</version>
+ <version>3.6.0-SNAPSHOT</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/documentation/pom.xml
===================================================================
--- core/trunk/documentation/pom.xml 2010-09-29 20:56:14 UTC (rev 20752)
+++ core/trunk/documentation/pom.xml 2010-09-29 20:56:44 UTC (rev 20753)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.6.0.CR2</version>
+ <version>3.6.0-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/documentation/quickstart/pom.xml
===================================================================
--- core/trunk/documentation/quickstart/pom.xml 2010-09-29 20:56:14 UTC (rev 20752)
+++ core/trunk/documentation/quickstart/pom.xml 2010-09-29 20:56:44 UTC (rev 20753)
@@ -29,7 +29,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.6.0.CR2</version>
+ <version>3.6.0-SNAPSHOT</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/documentation/quickstart/tutorials/annotations/pom.xml
===================================================================
--- core/trunk/documentation/quickstart/tutorials/annotations/pom.xml 2010-09-29 20:56:14 UTC (rev 20752)
+++ core/trunk/documentation/quickstart/tutorials/annotations/pom.xml 2010-09-29 20:56:44 UTC (rev 20753)
@@ -29,7 +29,7 @@
<parent>
<groupId>org.hibernate.tutorials</groupId>
<artifactId>hibernate-tutorials</artifactId>
- <version>3.6.0.CR2</version>
+ <version>3.6.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: core/trunk/documentation/quickstart/tutorials/basic/pom.xml
===================================================================
--- core/trunk/documentation/quickstart/tutorials/basic/pom.xml 2010-09-29 20:56:14 UTC (rev 20752)
+++ core/trunk/documentation/quickstart/tutorials/basic/pom.xml 2010-09-29 20:56:44 UTC (rev 20753)
@@ -29,7 +29,7 @@
<parent>
<groupId>org.hibernate.tutorials</groupId>
<artifactId>hibernate-tutorials</artifactId>
- <version>3.6.0.CR2</version>
+ <version>3.6.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: core/trunk/documentation/quickstart/tutorials/entitymanager/pom.xml
===================================================================
--- core/trunk/documentation/quickstart/tutorials/entitymanager/pom.xml 2010-09-29 20:56:14 UTC (rev 20752)
+++ core/trunk/documentation/quickstart/tutorials/entitymanager/pom.xml 2010-09-29 20:56:44 UTC (rev 20753)
@@ -29,7 +29,7 @@
<parent>
<artifactId>hibernate-tutorials</artifactId>
<groupId>org.hibernate.tutorials</groupId>
- <version>3.6.0.CR2</version>
+ <version>3.6.0-SNAPSHOT</version>
</parent>
<artifactId>hibernate-tutorial-entitymanager</artifactId>
Modified: core/trunk/documentation/quickstart/tutorials/envers/pom.xml
===================================================================
--- core/trunk/documentation/quickstart/tutorials/envers/pom.xml 2010-09-29 20:56:14 UTC (rev 20752)
+++ core/trunk/documentation/quickstart/tutorials/envers/pom.xml 2010-09-29 20:56:44 UTC (rev 20753)
@@ -29,7 +29,7 @@
<parent>
<artifactId>hibernate-tutorials</artifactId>
<groupId>org.hibernate.tutorials</groupId>
- <version>3.6.0.CR2</version>
+ <version>3.6.0-SNAPSHOT</version>
</parent>
<artifactId>hibernate-tutorial-envers</artifactId>
Modified: core/trunk/documentation/quickstart/tutorials/pom.xml
===================================================================
--- core/trunk/documentation/quickstart/tutorials/pom.xml 2010-09-29 20:56:14 UTC (rev 20752)
+++ core/trunk/documentation/quickstart/tutorials/pom.xml 2010-09-29 20:56:44 UTC (rev 20753)
@@ -28,7 +28,7 @@
<groupId>org.hibernate.tutorials</groupId>
<artifactId>hibernate-tutorials</artifactId>
- <version>3.6.0.CR2</version>
+ <version>3.6.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Hibernate Getting Started Guide Tutorials</name>
Modified: core/trunk/entitymanager/pom.xml
===================================================================
--- core/trunk/entitymanager/pom.xml 2010-09-29 20:56:14 UTC (rev 20752)
+++ core/trunk/entitymanager/pom.xml 2010-09-29 20:56:44 UTC (rev 20753)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.6.0.CR2</version>
+ <version>3.6.0-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/envers/pom.xml
===================================================================
--- core/trunk/envers/pom.xml 2010-09-29 20:56:14 UTC (rev 20752)
+++ core/trunk/envers/pom.xml 2010-09-29 20:56:44 UTC (rev 20753)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.6.0.CR2</version>
+ <version>3.6.0-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/jdbc3-testing/pom.xml
===================================================================
--- core/trunk/jdbc3-testing/pom.xml 2010-09-29 20:56:14 UTC (rev 20752)
+++ core/trunk/jdbc3-testing/pom.xml 2010-09-29 20:56:44 UTC (rev 20753)
@@ -28,7 +28,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.6.0.CR2</version>
+ <version>3.6.0-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/jdbc4-testing/pom.xml
===================================================================
--- core/trunk/jdbc4-testing/pom.xml 2010-09-29 20:56:14 UTC (rev 20752)
+++ core/trunk/jdbc4-testing/pom.xml 2010-09-29 20:56:44 UTC (rev 20753)
@@ -28,7 +28,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.6.0.CR2</version>
+ <version>3.6.0-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/parent/pom.xml
===================================================================
--- core/trunk/parent/pom.xml 2010-09-29 20:56:14 UTC (rev 20752)
+++ core/trunk/parent/pom.xml 2010-09-29 20:56:44 UTC (rev 20753)
@@ -29,7 +29,7 @@
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
<packaging>pom</packaging>
- <version>3.6.0.CR2</version>
+ <version>3.6.0-SNAPSHOT</version>
<name>Hibernate Core Parent POM</name>
<description>The base POM for all Hibernate Core modules.</description>
@@ -54,9 +54,9 @@
</licenses>
<scm>
- <connection>scm:svn:https://svn.jboss.org/repos/hibernate/core/tags/hibernate-3.6.0.CR2</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/hibernate/core/tags/hibernate-3.6.0.CR2</developerConnection>
- <url>https://svn.jboss.org/repos/hibernate/core/tags/hibernate-3.6.0.CR2</url>
+ <connection>scm:svn:https://svn.jboss.org/repos/hibernate/core/trunk</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/hibernate/core/trunk</developerConnection>
+ <url>https://svn.jboss.org/repos/hibernate/core/trunk</url>
</scm>
<ciManagement>
Modified: core/trunk/pom.xml
===================================================================
--- core/trunk/pom.xml 2010-09-29 20:56:14 UTC (rev 20752)
+++ core/trunk/pom.xml 2010-09-29 20:56:44 UTC (rev 20753)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.6.0.CR2</version>
+ <version>3.6.0-SNAPSHOT</version>
<relativePath>parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/testing/pom.xml
===================================================================
--- core/trunk/testing/pom.xml 2010-09-29 20:56:14 UTC (rev 20752)
+++ core/trunk/testing/pom.xml 2010-09-29 20:56:44 UTC (rev 20753)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.6.0.CR2</version>
+ <version>3.6.0-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/testsuite/pom.xml
===================================================================
--- core/trunk/testsuite/pom.xml 2010-09-29 20:56:14 UTC (rev 20752)
+++ core/trunk/testsuite/pom.xml 2010-09-29 20:56:44 UTC (rev 20753)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.6.0.CR2</version>
+ <version>3.6.0-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/tutorials/eg/pom.xml
===================================================================
--- core/trunk/tutorials/eg/pom.xml 2010-09-29 20:56:14 UTC (rev 20752)
+++ core/trunk/tutorials/eg/pom.xml 2010-09-29 20:56:44 UTC (rev 20753)
@@ -30,7 +30,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-tutorials</artifactId>
- <version>3.6.0.CR2</version>
+ <version>3.6.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: core/trunk/tutorials/pom.xml
===================================================================
--- core/trunk/tutorials/pom.xml 2010-09-29 20:56:14 UTC (rev 20752)
+++ core/trunk/tutorials/pom.xml 2010-09-29 20:56:44 UTC (rev 20753)
@@ -29,7 +29,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.6.0.CR2</version>
+ <version>3.6.0-SNAPSHOT</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/tutorials/web/pom.xml
===================================================================
--- core/trunk/tutorials/web/pom.xml 2010-09-29 20:56:14 UTC (rev 20752)
+++ core/trunk/tutorials/web/pom.xml 2010-09-29 20:56:44 UTC (rev 20753)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-tutorials</artifactId>
- <version>3.6.0.CR2</version>
+ <version>3.6.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
14 years, 2 months
- 1
- 0
Hibernate SVN: r20752 - core/tags.
by hibernate-commits＠lists.jboss.org
Author: steve.ebersole(a)jboss.com
Date: 2010-09-29 16:56:14 -0400 (Wed, 29 Sep 2010)
New Revision: 20752
Added:
core/tags/hibernate-3.6.0.CR2/
Log:
Tagging 3.6.0.CR2 release
Copied: core/tags/hibernate-3.6.0.CR2 (from rev 20751, core/trunk)
14 years, 2 months
- 1
- 0
Hibernate SVN: r20751 - in core/trunk: cache-ehcache and 32 other directories.
by hibernate-commits＠lists.jboss.org
Author: steve.ebersole(a)jboss.com
Date: 2010-09-29 16:55:58 -0400 (Wed, 29 Sep 2010)
New Revision: 20751
Modified:
core/trunk/cache-ehcache/pom.xml
core/trunk/cache-infinispan/pom.xml
core/trunk/cache-jbosscache/pom.xml
core/trunk/cache-oscache/pom.xml
core/trunk/cache-swarmcache/pom.xml
core/trunk/connection-c3p0/pom.xml
core/trunk/connection-proxool/pom.xml
core/trunk/core/pom.xml
core/trunk/core/src/main/java/org/hibernate/annotations/DiscriminatorOptions.java
core/trunk/distribution/pom.xml
core/trunk/documentation/devguide/pom.xml
core/trunk/documentation/envers/pom.xml
core/trunk/documentation/jbosscache2/pom.xml
core/trunk/documentation/manual/pom.xml
core/trunk/documentation/pom.xml
core/trunk/documentation/quickstart/pom.xml
core/trunk/documentation/quickstart/tutorials/annotations/pom.xml
core/trunk/documentation/quickstart/tutorials/basic/pom.xml
core/trunk/documentation/quickstart/tutorials/entitymanager/pom.xml
core/trunk/documentation/quickstart/tutorials/envers/pom.xml
core/trunk/documentation/quickstart/tutorials/pom.xml
core/trunk/entitymanager/pom.xml
core/trunk/envers/pom.xml
core/trunk/jdbc3-testing/pom.xml
core/trunk/jdbc4-testing/pom.xml
core/trunk/parent/pom.xml
core/trunk/pom.xml
core/trunk/testing/pom.xml
core/trunk/testsuite/pom.xml
core/trunk/testsuite/src/test/java/org/hibernate/test/annotations/inheritance/discriminatoroptions/BaseClass.java
core/trunk/testsuite/src/test/java/org/hibernate/test/annotations/inheritance/discriminatoroptions/SubClass.java
core/trunk/testsuite/src/test/java/org/hibernate/test/annotations/various/DBTimestamped.java
core/trunk/testsuite/src/test/java/org/hibernate/test/annotations/various/VMTimestamped.java
core/trunk/tutorials/eg/pom.xml
core/trunk/tutorials/pom.xml
core/trunk/tutorials/web/pom.xml
Log:
Updating pom versions to /home/steve/projects/hibernate/core/trunk for release tagging
Modified: core/trunk/cache-ehcache/pom.xml
===================================================================
--- core/trunk/cache-ehcache/pom.xml 2010-09-29 12:50:23 UTC (rev 20750)
+++ core/trunk/cache-ehcache/pom.xml 2010-09-29 20:55:58 UTC (rev 20751)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.6.0-SNAPSHOT</version>
+ <version>3.6.0.CR2</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/cache-infinispan/pom.xml
===================================================================
--- core/trunk/cache-infinispan/pom.xml 2010-09-29 12:50:23 UTC (rev 20750)
+++ core/trunk/cache-infinispan/pom.xml 2010-09-29 20:55:58 UTC (rev 20751)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.6.0-SNAPSHOT</version>
+ <version>3.6.0.CR2</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/cache-jbosscache/pom.xml
===================================================================
--- core/trunk/cache-jbosscache/pom.xml 2010-09-29 12:50:23 UTC (rev 20750)
+++ core/trunk/cache-jbosscache/pom.xml 2010-09-29 20:55:58 UTC (rev 20751)
@@ -27,7 +27,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.6.0-SNAPSHOT</version>
+ <version>3.6.0.CR2</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/cache-oscache/pom.xml
===================================================================
--- core/trunk/cache-oscache/pom.xml 2010-09-29 12:50:23 UTC (rev 20750)
+++ core/trunk/cache-oscache/pom.xml 2010-09-29 20:55:58 UTC (rev 20751)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.6.0-SNAPSHOT</version>
+ <version>3.6.0.CR2</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/cache-swarmcache/pom.xml
===================================================================
--- core/trunk/cache-swarmcache/pom.xml 2010-09-29 12:50:23 UTC (rev 20750)
+++ core/trunk/cache-swarmcache/pom.xml 2010-09-29 20:55:58 UTC (rev 20751)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.6.0-SNAPSHOT</version>
+ <version>3.6.0.CR2</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/connection-c3p0/pom.xml
===================================================================
--- core/trunk/connection-c3p0/pom.xml 2010-09-29 12:50:23 UTC (rev 20750)
+++ core/trunk/connection-c3p0/pom.xml 2010-09-29 20:55:58 UTC (rev 20751)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.6.0-SNAPSHOT</version>
+ <version>3.6.0.CR2</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/connection-proxool/pom.xml
===================================================================
--- core/trunk/connection-proxool/pom.xml 2010-09-29 12:50:23 UTC (rev 20750)
+++ core/trunk/connection-proxool/pom.xml 2010-09-29 20:55:58 UTC (rev 20751)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.6.0-SNAPSHOT</version>
+ <version>3.6.0.CR2</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/core/pom.xml
===================================================================
--- core/trunk/core/pom.xml 2010-09-29 12:50:23 UTC (rev 20750)
+++ core/trunk/core/pom.xml 2010-09-29 20:55:58 UTC (rev 20751)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.6.0-SNAPSHOT</version>
+ <version>3.6.0.CR2</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/core/src/main/java/org/hibernate/annotations/DiscriminatorOptions.java
===================================================================
--- core/trunk/core/src/main/java/org/hibernate/annotations/DiscriminatorOptions.java 2010-09-29 12:50:23 UTC (rev 20750)
+++ core/trunk/core/src/main/java/org/hibernate/annotations/DiscriminatorOptions.java 2010-09-29 20:55:58 UTC (rev 20751)
@@ -21,7 +21,7 @@
* 51 Franklin Street, Fifth Floor
* Boston, MA 02110-1301 USA
*/
-// $Id:$
+// $Id$
package org.hibernate.annotations;
import java.lang.annotation.Retention;
Modified: core/trunk/distribution/pom.xml
===================================================================
--- core/trunk/distribution/pom.xml 2010-09-29 12:50:23 UTC (rev 20750)
+++ core/trunk/distribution/pom.xml 2010-09-29 20:55:58 UTC (rev 20751)
@@ -30,7 +30,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.6.0-SNAPSHOT</version>
+ <version>3.6.0.CR2</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/documentation/devguide/pom.xml
===================================================================
--- core/trunk/documentation/devguide/pom.xml 2010-09-29 12:50:23 UTC (rev 20750)
+++ core/trunk/documentation/devguide/pom.xml 2010-09-29 20:55:58 UTC (rev 20751)
@@ -29,7 +29,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.6.0-SNAPSHOT</version>
+ <version>3.6.0.CR2</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/documentation/envers/pom.xml
===================================================================
--- core/trunk/documentation/envers/pom.xml 2010-09-29 12:50:23 UTC (rev 20750)
+++ core/trunk/documentation/envers/pom.xml 2010-09-29 20:55:58 UTC (rev 20751)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.6.0-SNAPSHOT</version>
+ <version>3.6.0.CR2</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/documentation/jbosscache2/pom.xml
===================================================================
--- core/trunk/documentation/jbosscache2/pom.xml 2010-09-29 12:50:23 UTC (rev 20750)
+++ core/trunk/documentation/jbosscache2/pom.xml 2010-09-29 20:55:58 UTC (rev 20751)
@@ -30,7 +30,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.6.0-SNAPSHOT</version>
+ <version>3.6.0.CR2</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/documentation/manual/pom.xml
===================================================================
--- core/trunk/documentation/manual/pom.xml 2010-09-29 12:50:23 UTC (rev 20750)
+++ core/trunk/documentation/manual/pom.xml 2010-09-29 20:55:58 UTC (rev 20751)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.6.0-SNAPSHOT</version>
+ <version>3.6.0.CR2</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/documentation/pom.xml
===================================================================
--- core/trunk/documentation/pom.xml 2010-09-29 12:50:23 UTC (rev 20750)
+++ core/trunk/documentation/pom.xml 2010-09-29 20:55:58 UTC (rev 20751)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.6.0-SNAPSHOT</version>
+ <version>3.6.0.CR2</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/documentation/quickstart/pom.xml
===================================================================
--- core/trunk/documentation/quickstart/pom.xml 2010-09-29 12:50:23 UTC (rev 20750)
+++ core/trunk/documentation/quickstart/pom.xml 2010-09-29 20:55:58 UTC (rev 20751)
@@ -29,7 +29,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.6.0-SNAPSHOT</version>
+ <version>3.6.0.CR2</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/documentation/quickstart/tutorials/annotations/pom.xml
===================================================================
--- core/trunk/documentation/quickstart/tutorials/annotations/pom.xml 2010-09-29 12:50:23 UTC (rev 20750)
+++ core/trunk/documentation/quickstart/tutorials/annotations/pom.xml 2010-09-29 20:55:58 UTC (rev 20751)
@@ -29,7 +29,7 @@
<parent>
<groupId>org.hibernate.tutorials</groupId>
<artifactId>hibernate-tutorials</artifactId>
- <version>3.6.0-SNAPSHOT</version>
+ <version>3.6.0.CR2</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: core/trunk/documentation/quickstart/tutorials/basic/pom.xml
===================================================================
--- core/trunk/documentation/quickstart/tutorials/basic/pom.xml 2010-09-29 12:50:23 UTC (rev 20750)
+++ core/trunk/documentation/quickstart/tutorials/basic/pom.xml 2010-09-29 20:55:58 UTC (rev 20751)
@@ -29,7 +29,7 @@
<parent>
<groupId>org.hibernate.tutorials</groupId>
<artifactId>hibernate-tutorials</artifactId>
- <version>3.6.0-SNAPSHOT</version>
+ <version>3.6.0.CR2</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: core/trunk/documentation/quickstart/tutorials/entitymanager/pom.xml
===================================================================
--- core/trunk/documentation/quickstart/tutorials/entitymanager/pom.xml 2010-09-29 12:50:23 UTC (rev 20750)
+++ core/trunk/documentation/quickstart/tutorials/entitymanager/pom.xml 2010-09-29 20:55:58 UTC (rev 20751)
@@ -29,7 +29,7 @@
<parent>
<artifactId>hibernate-tutorials</artifactId>
<groupId>org.hibernate.tutorials</groupId>
- <version>3.6.0-SNAPSHOT</version>
+ <version>3.6.0.CR2</version>
</parent>
<artifactId>hibernate-tutorial-entitymanager</artifactId>
Modified: core/trunk/documentation/quickstart/tutorials/envers/pom.xml
===================================================================
--- core/trunk/documentation/quickstart/tutorials/envers/pom.xml 2010-09-29 12:50:23 UTC (rev 20750)
+++ core/trunk/documentation/quickstart/tutorials/envers/pom.xml 2010-09-29 20:55:58 UTC (rev 20751)
@@ -29,7 +29,7 @@
<parent>
<artifactId>hibernate-tutorials</artifactId>
<groupId>org.hibernate.tutorials</groupId>
- <version>3.6.0-SNAPSHOT</version>
+ <version>3.6.0.CR2</version>
</parent>
<artifactId>hibernate-tutorial-envers</artifactId>
Modified: core/trunk/documentation/quickstart/tutorials/pom.xml
===================================================================
--- core/trunk/documentation/quickstart/tutorials/pom.xml 2010-09-29 12:50:23 UTC (rev 20750)
+++ core/trunk/documentation/quickstart/tutorials/pom.xml 2010-09-29 20:55:58 UTC (rev 20751)
@@ -28,7 +28,7 @@
<groupId>org.hibernate.tutorials</groupId>
<artifactId>hibernate-tutorials</artifactId>
- <version>3.6.0-SNAPSHOT</version>
+ <version>3.6.0.CR2</version>
<packaging>pom</packaging>
<name>Hibernate Getting Started Guide Tutorials</name>
Modified: core/trunk/entitymanager/pom.xml
===================================================================
--- core/trunk/entitymanager/pom.xml 2010-09-29 12:50:23 UTC (rev 20750)
+++ core/trunk/entitymanager/pom.xml 2010-09-29 20:55:58 UTC (rev 20751)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.6.0-SNAPSHOT</version>
+ <version>3.6.0.CR2</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/envers/pom.xml
===================================================================
--- core/trunk/envers/pom.xml 2010-09-29 12:50:23 UTC (rev 20750)
+++ core/trunk/envers/pom.xml 2010-09-29 20:55:58 UTC (rev 20751)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.6.0-SNAPSHOT</version>
+ <version>3.6.0.CR2</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/jdbc3-testing/pom.xml
===================================================================
--- core/trunk/jdbc3-testing/pom.xml 2010-09-29 12:50:23 UTC (rev 20750)
+++ core/trunk/jdbc3-testing/pom.xml 2010-09-29 20:55:58 UTC (rev 20751)
@@ -28,7 +28,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.6.0-SNAPSHOT</version>
+ <version>3.6.0.CR2</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/jdbc4-testing/pom.xml
===================================================================
--- core/trunk/jdbc4-testing/pom.xml 2010-09-29 12:50:23 UTC (rev 20750)
+++ core/trunk/jdbc4-testing/pom.xml 2010-09-29 20:55:58 UTC (rev 20751)
@@ -28,7 +28,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.6.0-SNAPSHOT</version>
+ <version>3.6.0.CR2</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/parent/pom.xml
===================================================================
--- core/trunk/parent/pom.xml 2010-09-29 12:50:23 UTC (rev 20750)
+++ core/trunk/parent/pom.xml 2010-09-29 20:55:58 UTC (rev 20751)
@@ -29,7 +29,7 @@
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
<packaging>pom</packaging>
- <version>3.6.0-SNAPSHOT</version>
+ <version>3.6.0.CR2</version>
<name>Hibernate Core Parent POM</name>
<description>The base POM for all Hibernate Core modules.</description>
@@ -54,9 +54,9 @@
</licenses>
<scm>
- <connection>scm:svn:https://svn.jboss.org/repos/hibernate/core/trunk</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/hibernate/core/trunk</developerConnection>
- <url>https://svn.jboss.org/repos/hibernate/core/trunk</url>
+ <connection>scm:svn:https://svn.jboss.org/repos/hibernate/core/tags/hibernate-3.6.0.CR2</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/hibernate/core/tags/hibernate-3.6.0.CR2</developerConnection>
+ <url>https://svn.jboss.org/repos/hibernate/core/tags/hibernate-3.6.0.CR2</url>
</scm>
<ciManagement>
Modified: core/trunk/pom.xml
===================================================================
--- core/trunk/pom.xml 2010-09-29 12:50:23 UTC (rev 20750)
+++ core/trunk/pom.xml 2010-09-29 20:55:58 UTC (rev 20751)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.6.0-SNAPSHOT</version>
+ <version>3.6.0.CR2</version>
<relativePath>parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/testing/pom.xml
===================================================================
--- core/trunk/testing/pom.xml 2010-09-29 12:50:23 UTC (rev 20750)
+++ core/trunk/testing/pom.xml 2010-09-29 20:55:58 UTC (rev 20751)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.6.0-SNAPSHOT</version>
+ <version>3.6.0.CR2</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/testsuite/pom.xml
===================================================================
--- core/trunk/testsuite/pom.xml 2010-09-29 12:50:23 UTC (rev 20750)
+++ core/trunk/testsuite/pom.xml 2010-09-29 20:55:58 UTC (rev 20751)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.6.0-SNAPSHOT</version>
+ <version>3.6.0.CR2</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/annotations/inheritance/discriminatoroptions/BaseClass.java
===================================================================
--- core/trunk/testsuite/src/test/java/org/hibernate/test/annotations/inheritance/discriminatoroptions/BaseClass.java 2010-09-29 12:50:23 UTC (rev 20750)
+++ core/trunk/testsuite/src/test/java/org/hibernate/test/annotations/inheritance/discriminatoroptions/BaseClass.java 2010-09-29 20:55:58 UTC (rev 20751)
@@ -22,7 +22,7 @@
* Boston, MA 02110-1301 USA
*/
-// $Id:$
+// $Id$
package org.hibernate.test.annotations.inheritance.discriminatoroptions;
import javax.persistence.DiscriminatorValue;
Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/annotations/inheritance/discriminatoroptions/SubClass.java
===================================================================
--- core/trunk/testsuite/src/test/java/org/hibernate/test/annotations/inheritance/discriminatoroptions/SubClass.java 2010-09-29 12:50:23 UTC (rev 20750)
+++ core/trunk/testsuite/src/test/java/org/hibernate/test/annotations/inheritance/discriminatoroptions/SubClass.java 2010-09-29 20:55:58 UTC (rev 20751)
@@ -22,7 +22,7 @@
* Boston, MA 02110-1301 USA
*/
-// $Id:$
+// $Id$
package org.hibernate.test.annotations.inheritance.discriminatoroptions;
import javax.persistence.DiscriminatorValue;
Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/annotations/various/DBTimestamped.java
===================================================================
--- core/trunk/testsuite/src/test/java/org/hibernate/test/annotations/various/DBTimestamped.java 2010-09-29 12:50:23 UTC (rev 20750)
+++ core/trunk/testsuite/src/test/java/org/hibernate/test/annotations/various/DBTimestamped.java 2010-09-29 20:55:58 UTC (rev 20751)
@@ -22,7 +22,7 @@
* Boston, MA 02110-1301 USA
*/
-// $Id:$
+// $Id$
package org.hibernate.test.annotations.various;
import java.util.Date;
Modified: core/trunk/testsuite/src/test/java/org/hibernate/test/annotations/various/VMTimestamped.java
===================================================================
--- core/trunk/testsuite/src/test/java/org/hibernate/test/annotations/various/VMTimestamped.java 2010-09-29 12:50:23 UTC (rev 20750)
+++ core/trunk/testsuite/src/test/java/org/hibernate/test/annotations/various/VMTimestamped.java 2010-09-29 20:55:58 UTC (rev 20751)
@@ -22,7 +22,7 @@
* Boston, MA 02110-1301 USA
*/
-// $Id:$
+// $Id$
package org.hibernate.test.annotations.various;
import java.util.Date;
Modified: core/trunk/tutorials/eg/pom.xml
===================================================================
--- core/trunk/tutorials/eg/pom.xml 2010-09-29 12:50:23 UTC (rev 20750)
+++ core/trunk/tutorials/eg/pom.xml 2010-09-29 20:55:58 UTC (rev 20751)
@@ -30,7 +30,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-tutorials</artifactId>
- <version>3.6.0-SNAPSHOT</version>
+ <version>3.6.0.CR2</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: core/trunk/tutorials/pom.xml
===================================================================
--- core/trunk/tutorials/pom.xml 2010-09-29 12:50:23 UTC (rev 20750)
+++ core/trunk/tutorials/pom.xml 2010-09-29 20:55:58 UTC (rev 20751)
@@ -29,7 +29,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-parent</artifactId>
- <version>3.6.0-SNAPSHOT</version>
+ <version>3.6.0.CR2</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
Modified: core/trunk/tutorials/web/pom.xml
===================================================================
--- core/trunk/tutorials/web/pom.xml 2010-09-29 12:50:23 UTC (rev 20750)
+++ core/trunk/tutorials/web/pom.xml 2010-09-29 20:55:58 UTC (rev 20751)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-tutorials</artifactId>
- <version>3.6.0-SNAPSHOT</version>
+ <version>3.6.0.CR2</version>
<relativePath>../pom.xml</relativePath>
</parent>
14 years, 2 months
- 1
- 0