From 30afc77a793a00e76f209cdc17250e29e4517005 Mon Sep 17 00:00:00 2001 From: Hardy Ferentschik Date: Mon, 3 Nov 2008 14:25:59 +0000 Subject: [PATCH] HHH-3580 fixed some more tests and enabled svn:keywrds substitution on all java files git-svn-id: https://svn.jboss.org/repos/hibernate/core/trunk@15483 1b8cb986-b30d-0410-93ca-fae66ebed9b2 --- entitymanager/build.xml | 3 -- entitymanager/pom.xml | 8 +++-- .../ejb/Ejb3ConfigurationObjectFactory.java | 2 +- .../main/java/org/hibernate/ejb/Version.java | 2 +- .../org/hibernate/ejb/event/BeanCallback.java | 2 +- .../org/hibernate/ejb/event/Callback.java | 2 +- .../hibernate/ejb/event/CallbackResolver.java | 2 +- .../event/EJB3PostDeleteEventListener.java | 2 +- .../event/EJB3PostInsertEventListener.java | 2 +- .../ejb/event/EJB3PostLoadEventListener.java | 2 +- .../hibernate/ejb/event/ListenerCallback.java | 2 +- .../ejb/packaging/NamedInputStream.java | 2 +- .../ejb/packaging/PersistenceMetadata.java | 2 +- .../hibernate/ejb/packaging/XmlHelper.java | 2 +- .../transaction/JoinableCMTTransaction.java | 2 +- .../JoinableCMTTransactionFactory.java | 2 +- .../ejb/util/ConfigurationHelper.java | 2 +- .../org/hibernate/ejb/util/NamingHelper.java | 2 +- .../hibernate/engine/EJB3CascadeStyle.java | 2 +- .../hibernate/engine/EJB3CascadingAction.java | 2 +- .../src/test/java/NoPackageEntity.java | 2 +- .../org/hibernate/ejb/test/NoOpListener.java | 2 +- .../ejb/test/association/AssociationTest.java | 2 +- .../ejb/test/association/Incident.java | 2 +- .../ejb/test/association/IncidentStatus.java | 2 +- .../ejb/test/association/Kitchen.java | 2 +- .../hibernate/ejb/test/association/Oven.java | 2 +- .../ejb/test/callbacks/ExceptionListener.java | 2 +- .../hibernate/ejb/test/callbacks/Plant.java | 2 +- .../hibernate/ejb/test/callbacks/Rythm.java | 2 +- .../hibernate/ejb/test/cascade/Author.java | 2 +- .../ejb/test/cascade/CascadeTest.java | 2 +- .../org/hibernate/ejb/test/cascade/Song.java | 2 +- .../org/hibernate/ejb/test/emops/Cat.java | 2 +- .../org/hibernate/ejb/test/emops/Colony.java | 2 +- .../hibernate/ejb/test/emops/Competition.java | 2 +- .../hibernate/ejb/test/emops/Competitor.java | 2 +- .../hibernate/ejb/test/emops/Decorate.java | 2 +- .../org/hibernate/ejb/test/emops/Dog.java | 2 +- .../org/hibernate/ejb/test/emops/Dress.java | 2 +- .../org/hibernate/ejb/test/emops/Empire.java | 2 +- .../ejb/test/emops/FlushModeTest.java | 2 +- .../hibernate/ejb/test/emops/FlushTest.java | 2 +- .../ejb/test/emops/GetReferenceTest.java | 2 +- .../org/hibernate/ejb/test/emops/Mail.java | 2 +- .../hibernate/ejb/test/emops/MergeTest.java | 2 +- .../org/hibernate/ejb/test/emops/Music.java | 2 +- .../org/hibernate/ejb/test/emops/Pet.java | 2 +- .../org/hibernate/ejb/test/emops/Race.java | 2 +- .../hibernate/ejb/test/emops/RefreshTest.java | 2 +- .../hibernate/ejb/test/emops/RemoveTest.java | 31 ++++++++++++------- .../hibernate/ejb/test/emops/cascade/A.java | 2 +- .../hibernate/ejb/test/emops/cascade/B1.java | 2 +- .../hibernate/ejb/test/emops/cascade/B2.java | 2 +- .../hibernate/ejb/test/emops/cascade/B3.java | 2 +- .../hibernate/ejb/test/emops/cascade/B4.java | 2 +- .../hibernate/ejb/test/emops/cascade/C1.java | 2 +- .../hibernate/ejb/test/emops/cascade/C2.java | 2 +- .../emops/cascade/CascadePersistTest.java | 2 +- .../hibernate/ejb/test/inheritance/Fruit.java | 2 +- .../ejb/test/inheritance/InheritanceTest.java | 2 +- .../ejb/test/inheritance/Strawberry.java | 2 +- .../ejb/test/lock/UnversionedLock.java | 2 +- .../org/hibernate/ejb/test/ops/Animal.java | 2 +- .../org/hibernate/ejb/test/ops/FindTest.java | 2 +- .../org/hibernate/ejb/test/ops/Mammal.java | 2 +- .../hibernate/ejb/test/ops/PersistTest.java | 4 +-- .../org/hibernate/ejb/test/ops/Reptile.java | 2 +- .../pack/defaultpar/IncrementListener.java | 2 +- .../ejb/test/pack/defaultpar/Lighter.java | 2 +- .../ejb/test/pack/defaultpar/Money.java | 2 +- .../defaultpar/OtherIncrementListener.java | 2 +- .../ejb/test/pack/explicitpar/Washer.java | 2 +- .../ejb/test/pack/overridenpar/Bug.java | 2 +- .../hibernate/ejb/test/pack/spacepar/Bug.java | 2 +- .../ejb/test/pack/various/Airplane.java | 2 +- .../hibernate/ejb/test/pack/various/Seat.java | 2 +- .../ejb/test/pack/war/ApplicationServer.java | 2 +- .../ejb/test/pack/war/IncrementListener.java | 2 +- .../hibernate/ejb/test/pack/war/Lighter.java | 2 +- .../hibernate/ejb/test/pack/war/Money.java | 2 +- .../hibernate/ejb/test/pack/war/Mouse.java | 2 +- .../test/pack/war/OtherIncrementListener.java | 2 +- .../hibernate/ejb/test/pack/war/Version.java | 2 +- .../ejb/test/packaging/JarVisitorTest.java | 19 +++++------- .../org/hibernate/ejb/test/xml/Address.java | 2 +- .../org/hibernate/ejb/test/xml/Article.java | 2 +- .../ejb/test/xml/CounterListener.java | 2 +- .../org/hibernate/ejb/test/xml/Employee.java | 2 +- .../org/hibernate/ejb/test/xml/Light.java | 2 +- .../org/hibernate/ejb/test/xml/Lighter.java | 2 +- .../test/xml/XmlAttributeOverrideTest.java | 2 +- .../org/hibernate/ejb/test/xml/XmlTest.java | 2 +- .../src/test/resources/hibernate.properties | 2 ++ 94 files changed, 125 insertions(+), 118 deletions(-) diff --git a/entitymanager/build.xml b/entitymanager/build.xml index 21999ba358..d4d6834f04 100644 --- a/entitymanager/build.xml +++ b/entitymanager/build.xml @@ -29,7 +29,6 @@ - @@ -73,7 +72,6 @@ - diff --git a/entitymanager/pom.xml b/entitymanager/pom.xml index 37a8443bb1..7c9eea0af1 100644 --- a/entitymanager/pom.xml +++ b/entitymanager/pom.xml @@ -159,13 +159,17 @@ maven-surefire-plugin - ${basedir}/target/test-packages/excludehbmpar.par + ${basedir}/target/test-packages/cfgxmlpar.par ${basedir}/target/test-packages/defaultpar.par - ${basedir}/target/test-packages/cfgxmlpar.par + ${basedir}/target/test-packages/excludehbmpar.par ${basedir}/target/test-packages/explicitpar.par + ${basedir}/target/test-packages/explodedpar.par ${basedir}/target/test-packages/externaljar.jar + ${basedir}/target/test-packages/nesteddir.ear + ${basedir}/target/test-packages/nestedjar.ear ${basedir}/target/test-packages/overridenpar.jar ${basedir}/target/test-packages/space par.par + ${basedir}/target/test-packages/war.war diff --git a/entitymanager/src/main/java/org/hibernate/ejb/Ejb3ConfigurationObjectFactory.java b/entitymanager/src/main/java/org/hibernate/ejb/Ejb3ConfigurationObjectFactory.java index 83fb7b7dae..ea3e35a9af 100644 --- a/entitymanager/src/main/java/org/hibernate/ejb/Ejb3ConfigurationObjectFactory.java +++ b/entitymanager/src/main/java/org/hibernate/ejb/Ejb3ConfigurationObjectFactory.java @@ -1,4 +1,4 @@ -//$Id: $ +//$Id$ package org.hibernate.ejb; import java.io.ByteArrayInputStream; diff --git a/entitymanager/src/main/java/org/hibernate/ejb/Version.java b/entitymanager/src/main/java/org/hibernate/ejb/Version.java index 549174c6a2..b34f848aa6 100644 --- a/entitymanager/src/main/java/org/hibernate/ejb/Version.java +++ b/entitymanager/src/main/java/org/hibernate/ejb/Version.java @@ -1,4 +1,4 @@ -//$Id: $ +//$Id$ package org.hibernate.ejb; import org.slf4j.Logger; diff --git a/entitymanager/src/main/java/org/hibernate/ejb/event/BeanCallback.java b/entitymanager/src/main/java/org/hibernate/ejb/event/BeanCallback.java index 253faa472d..8ba5ecb2ec 100644 --- a/entitymanager/src/main/java/org/hibernate/ejb/event/BeanCallback.java +++ b/entitymanager/src/main/java/org/hibernate/ejb/event/BeanCallback.java @@ -11,7 +11,7 @@ import java.lang.reflect.InvocationTargetException; /** * @author Kabir Khan - * @version $Revision$ + * @version $Revision: 11282 $ */ public class BeanCallback extends Callback { public BeanCallback(Method callbackMethod) { diff --git a/entitymanager/src/main/java/org/hibernate/ejb/event/Callback.java b/entitymanager/src/main/java/org/hibernate/ejb/event/Callback.java index 9d9ff42ba6..ee6fdbd6ca 100644 --- a/entitymanager/src/main/java/org/hibernate/ejb/event/Callback.java +++ b/entitymanager/src/main/java/org/hibernate/ejb/event/Callback.java @@ -19,7 +19,7 @@ import org.hibernate.util.ReflectHelper; /** * @author Kabir Khan - * @version $Revision$ + * @version $Revision: 11282 $ */ public abstract class Callback implements Serializable { transient protected Method callbackMethod; diff --git a/entitymanager/src/main/java/org/hibernate/ejb/event/CallbackResolver.java b/entitymanager/src/main/java/org/hibernate/ejb/event/CallbackResolver.java index e72dd171c9..4801651de4 100644 --- a/entitymanager/src/main/java/org/hibernate/ejb/event/CallbackResolver.java +++ b/entitymanager/src/main/java/org/hibernate/ejb/event/CallbackResolver.java @@ -1,4 +1,4 @@ -// $Id:$ +// $Id$ /* * JBoss, the OpenSource EJB server * diff --git a/entitymanager/src/main/java/org/hibernate/ejb/event/EJB3PostDeleteEventListener.java b/entitymanager/src/main/java/org/hibernate/ejb/event/EJB3PostDeleteEventListener.java index 0b45a21eaa..3d1d908ecd 100644 --- a/entitymanager/src/main/java/org/hibernate/ejb/event/EJB3PostDeleteEventListener.java +++ b/entitymanager/src/main/java/org/hibernate/ejb/event/EJB3PostDeleteEventListener.java @@ -11,7 +11,7 @@ import org.hibernate.event.PostDeleteEventListener; /** * @author Kabir Khan - * @version $Revision$ + * @version $Revision: 11282 $ */ public class EJB3PostDeleteEventListener implements PostDeleteEventListener, CallbackHandlerConsumer { EntityCallbackHandler callbackHandler; diff --git a/entitymanager/src/main/java/org/hibernate/ejb/event/EJB3PostInsertEventListener.java b/entitymanager/src/main/java/org/hibernate/ejb/event/EJB3PostInsertEventListener.java index 0fdcac46a1..2bdb3d14b8 100644 --- a/entitymanager/src/main/java/org/hibernate/ejb/event/EJB3PostInsertEventListener.java +++ b/entitymanager/src/main/java/org/hibernate/ejb/event/EJB3PostInsertEventListener.java @@ -11,7 +11,7 @@ import org.hibernate.event.PostInsertEventListener; /** * @author Kabir Khan - * @version $Revision$ + * @version $Revision: 11282 $ */ public class EJB3PostInsertEventListener implements PostInsertEventListener, CallbackHandlerConsumer { EntityCallbackHandler callbackHandler; diff --git a/entitymanager/src/main/java/org/hibernate/ejb/event/EJB3PostLoadEventListener.java b/entitymanager/src/main/java/org/hibernate/ejb/event/EJB3PostLoadEventListener.java index a32215d38e..6d9386339f 100644 --- a/entitymanager/src/main/java/org/hibernate/ejb/event/EJB3PostLoadEventListener.java +++ b/entitymanager/src/main/java/org/hibernate/ejb/event/EJB3PostLoadEventListener.java @@ -11,7 +11,7 @@ import org.hibernate.event.PostLoadEventListener; /** * @author Kabir Khan - * @version $Revision$ + * @version $Revision: 11282 $ */ public class EJB3PostLoadEventListener implements PostLoadEventListener, CallbackHandlerConsumer { EntityCallbackHandler callbackHandler; diff --git a/entitymanager/src/main/java/org/hibernate/ejb/event/ListenerCallback.java b/entitymanager/src/main/java/org/hibernate/ejb/event/ListenerCallback.java index 3976790fbe..45f85de299 100644 --- a/entitymanager/src/main/java/org/hibernate/ejb/event/ListenerCallback.java +++ b/entitymanager/src/main/java/org/hibernate/ejb/event/ListenerCallback.java @@ -16,7 +16,7 @@ import org.hibernate.util.ReflectHelper; /** * @author Kabir Khan - * @version $Revision$ + * @version $Revision: 11282 $ */ public class ListenerCallback extends Callback { protected transient Object listener; diff --git a/entitymanager/src/main/java/org/hibernate/ejb/packaging/NamedInputStream.java b/entitymanager/src/main/java/org/hibernate/ejb/packaging/NamedInputStream.java index d34e5dd3fd..e66c1a8350 100644 --- a/entitymanager/src/main/java/org/hibernate/ejb/packaging/NamedInputStream.java +++ b/entitymanager/src/main/java/org/hibernate/ejb/packaging/NamedInputStream.java @@ -1,4 +1,4 @@ -//$Id: $ +//$Id$ package org.hibernate.ejb.packaging; import java.io.InputStream; diff --git a/entitymanager/src/main/java/org/hibernate/ejb/packaging/PersistenceMetadata.java b/entitymanager/src/main/java/org/hibernate/ejb/packaging/PersistenceMetadata.java index 9786bf12c7..eb7a6cef36 100644 --- a/entitymanager/src/main/java/org/hibernate/ejb/packaging/PersistenceMetadata.java +++ b/entitymanager/src/main/java/org/hibernate/ejb/packaging/PersistenceMetadata.java @@ -15,7 +15,7 @@ import javax.persistence.spi.PersistenceUnitTransactionType; * Object used by JBoss EJB 3 for persistence.xml parsing * * @author Bill Burke - * @version $Revision$ + * @version $Revision: 11329 $ */ public class PersistenceMetadata { diff --git a/entitymanager/src/main/java/org/hibernate/ejb/packaging/XmlHelper.java b/entitymanager/src/main/java/org/hibernate/ejb/packaging/XmlHelper.java index 5fafcb5123..dcd681313f 100644 --- a/entitymanager/src/main/java/org/hibernate/ejb/packaging/XmlHelper.java +++ b/entitymanager/src/main/java/org/hibernate/ejb/packaging/XmlHelper.java @@ -11,7 +11,7 @@ import org.w3c.dom.NodeList; * A utility class to cover up the rough bits of xml parsing * * @author Chris Kimpton - * @version $Revision$ + * @version $Revision: 11282 $ */ public final class XmlHelper { private XmlHelper() { diff --git a/entitymanager/src/main/java/org/hibernate/ejb/transaction/JoinableCMTTransaction.java b/entitymanager/src/main/java/org/hibernate/ejb/transaction/JoinableCMTTransaction.java index 1efab2104a..cd2ce7289f 100644 --- a/entitymanager/src/main/java/org/hibernate/ejb/transaction/JoinableCMTTransaction.java +++ b/entitymanager/src/main/java/org/hibernate/ejb/transaction/JoinableCMTTransaction.java @@ -1,4 +1,4 @@ -//$Id: $ +//$Id$ package org.hibernate.ejb.transaction; import javax.transaction.SystemException; diff --git a/entitymanager/src/main/java/org/hibernate/ejb/transaction/JoinableCMTTransactionFactory.java b/entitymanager/src/main/java/org/hibernate/ejb/transaction/JoinableCMTTransactionFactory.java index 3f7d931eb5..03def03a45 100644 --- a/entitymanager/src/main/java/org/hibernate/ejb/transaction/JoinableCMTTransactionFactory.java +++ b/entitymanager/src/main/java/org/hibernate/ejb/transaction/JoinableCMTTransactionFactory.java @@ -1,4 +1,4 @@ -//$Id: $ +//$Id$ package org.hibernate.ejb.transaction; import org.hibernate.HibernateException; diff --git a/entitymanager/src/main/java/org/hibernate/ejb/util/ConfigurationHelper.java b/entitymanager/src/main/java/org/hibernate/ejb/util/ConfigurationHelper.java index f8d40195fc..9f02135195 100644 --- a/entitymanager/src/main/java/org/hibernate/ejb/util/ConfigurationHelper.java +++ b/entitymanager/src/main/java/org/hibernate/ejb/util/ConfigurationHelper.java @@ -1,4 +1,4 @@ -//$Id: $ +//$Id$ package org.hibernate.ejb.util; import java.util.Map; diff --git a/entitymanager/src/main/java/org/hibernate/ejb/util/NamingHelper.java b/entitymanager/src/main/java/org/hibernate/ejb/util/NamingHelper.java index 9355301639..cd869933cf 100644 --- a/entitymanager/src/main/java/org/hibernate/ejb/util/NamingHelper.java +++ b/entitymanager/src/main/java/org/hibernate/ejb/util/NamingHelper.java @@ -1,4 +1,4 @@ -//$Id: $ +//$Id$ package org.hibernate.ejb.util; import javax.naming.Context; diff --git a/entitymanager/src/main/java/org/hibernate/engine/EJB3CascadeStyle.java b/entitymanager/src/main/java/org/hibernate/engine/EJB3CascadeStyle.java index 39f3d8b855..1a8da5a399 100644 --- a/entitymanager/src/main/java/org/hibernate/engine/EJB3CascadeStyle.java +++ b/entitymanager/src/main/java/org/hibernate/engine/EJB3CascadeStyle.java @@ -1,4 +1,4 @@ -//$Id: $ +//$Id$ package org.hibernate.engine; /** diff --git a/entitymanager/src/main/java/org/hibernate/engine/EJB3CascadingAction.java b/entitymanager/src/main/java/org/hibernate/engine/EJB3CascadingAction.java index f8addf84c6..c665de68b7 100644 --- a/entitymanager/src/main/java/org/hibernate/engine/EJB3CascadingAction.java +++ b/entitymanager/src/main/java/org/hibernate/engine/EJB3CascadingAction.java @@ -1,4 +1,4 @@ -//$Id: $ +//$Id$ package org.hibernate.engine; import java.util.Map; diff --git a/entitymanager/src/test/java/NoPackageEntity.java b/entitymanager/src/test/java/NoPackageEntity.java index 4ad73f065e..1bc479121e 100644 --- a/entitymanager/src/test/java/NoPackageEntity.java +++ b/entitymanager/src/test/java/NoPackageEntity.java @@ -1,4 +1,4 @@ -//$Id: $ +//$Id$ /** * @author Emmanuel Bernard diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/NoOpListener.java b/entitymanager/src/test/java/org/hibernate/ejb/test/NoOpListener.java index cbf12a2e54..10e46b179f 100644 --- a/entitymanager/src/test/java/org/hibernate/ejb/test/NoOpListener.java +++ b/entitymanager/src/test/java/org/hibernate/ejb/test/NoOpListener.java @@ -1,4 +1,4 @@ -//$Id: $ +//$Id$ package org.hibernate.ejb.test; import org.hibernate.event.PreInsertEventListener; diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/association/AssociationTest.java b/entitymanager/src/test/java/org/hibernate/ejb/test/association/AssociationTest.java index f20754c60f..148ec60c1e 100644 --- a/entitymanager/src/test/java/org/hibernate/ejb/test/association/AssociationTest.java +++ b/entitymanager/src/test/java/org/hibernate/ejb/test/association/AssociationTest.java @@ -1,4 +1,4 @@ -//$Id: $ +//$Id$ package org.hibernate.ejb.test.association; import javax.persistence.EntityManager; diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/association/Incident.java b/entitymanager/src/test/java/org/hibernate/ejb/test/association/Incident.java index c6b830fce6..48f2e6a705 100644 --- a/entitymanager/src/test/java/org/hibernate/ejb/test/association/Incident.java +++ b/entitymanager/src/test/java/org/hibernate/ejb/test/association/Incident.java @@ -1,4 +1,4 @@ -//$Id: $ +//$Id$ package org.hibernate.ejb.test.association; import javax.persistence.CascadeType; diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/association/IncidentStatus.java b/entitymanager/src/test/java/org/hibernate/ejb/test/association/IncidentStatus.java index 0397b0ee5d..54e895f929 100644 --- a/entitymanager/src/test/java/org/hibernate/ejb/test/association/IncidentStatus.java +++ b/entitymanager/src/test/java/org/hibernate/ejb/test/association/IncidentStatus.java @@ -1,4 +1,4 @@ -//$Id: $ +//$Id$ package org.hibernate.ejb.test.association; import javax.persistence.Entity; diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/association/Kitchen.java b/entitymanager/src/test/java/org/hibernate/ejb/test/association/Kitchen.java index 4462de14bd..ae9a8f8e1c 100644 --- a/entitymanager/src/test/java/org/hibernate/ejb/test/association/Kitchen.java +++ b/entitymanager/src/test/java/org/hibernate/ejb/test/association/Kitchen.java @@ -1,4 +1,4 @@ -//$Id: $ +//$Id$ package org.hibernate.ejb.test.association; import javax.persistence.Entity; diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/association/Oven.java b/entitymanager/src/test/java/org/hibernate/ejb/test/association/Oven.java index 6ebd95dae1..572f906593 100644 --- a/entitymanager/src/test/java/org/hibernate/ejb/test/association/Oven.java +++ b/entitymanager/src/test/java/org/hibernate/ejb/test/association/Oven.java @@ -1,4 +1,4 @@ -//$Id: $ +//$Id$ package org.hibernate.ejb.test.association; import javax.persistence.Entity; diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/callbacks/ExceptionListener.java b/entitymanager/src/test/java/org/hibernate/ejb/test/callbacks/ExceptionListener.java index 7c6a3bfdf7..4be7eff15a 100644 --- a/entitymanager/src/test/java/org/hibernate/ejb/test/callbacks/ExceptionListener.java +++ b/entitymanager/src/test/java/org/hibernate/ejb/test/callbacks/ExceptionListener.java @@ -1,4 +1,4 @@ -//$Id: $ +//$Id$ package org.hibernate.ejb.test.callbacks; import javax.persistence.PrePersist; diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/callbacks/Plant.java b/entitymanager/src/test/java/org/hibernate/ejb/test/callbacks/Plant.java index 3c29d4c209..0b44178ff9 100644 --- a/entitymanager/src/test/java/org/hibernate/ejb/test/callbacks/Plant.java +++ b/entitymanager/src/test/java/org/hibernate/ejb/test/callbacks/Plant.java @@ -1,4 +1,4 @@ -//$Id: $ +//$Id$ package org.hibernate.ejb.test.callbacks; import javax.persistence.Id; diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/callbacks/Rythm.java b/entitymanager/src/test/java/org/hibernate/ejb/test/callbacks/Rythm.java index 751b5d560d..05dcd69e3b 100644 --- a/entitymanager/src/test/java/org/hibernate/ejb/test/callbacks/Rythm.java +++ b/entitymanager/src/test/java/org/hibernate/ejb/test/callbacks/Rythm.java @@ -1,4 +1,4 @@ -//$Id: $ +//$Id$ package org.hibernate.ejb.test.callbacks; import javax.persistence.Id; diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/cascade/Author.java b/entitymanager/src/test/java/org/hibernate/ejb/test/cascade/Author.java index 85fb2c185d..ecbd2ca384 100644 --- a/entitymanager/src/test/java/org/hibernate/ejb/test/cascade/Author.java +++ b/entitymanager/src/test/java/org/hibernate/ejb/test/cascade/Author.java @@ -1,4 +1,4 @@ -//$Id: $ +//$Id$ package org.hibernate.ejb.test.cascade; import javax.persistence.Entity; diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/cascade/CascadeTest.java b/entitymanager/src/test/java/org/hibernate/ejb/test/cascade/CascadeTest.java index 09a4d8e911..978168332a 100644 --- a/entitymanager/src/test/java/org/hibernate/ejb/test/cascade/CascadeTest.java +++ b/entitymanager/src/test/java/org/hibernate/ejb/test/cascade/CascadeTest.java @@ -1,4 +1,4 @@ -//$Id: FetchTest.java 9796 2006-04-26 06:46:52Z epbernard $ +//$Id$ package org.hibernate.ejb.test.cascade; import javax.persistence.EntityManager; diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/cascade/Song.java b/entitymanager/src/test/java/org/hibernate/ejb/test/cascade/Song.java index f8314c22ae..c9a290aba0 100644 --- a/entitymanager/src/test/java/org/hibernate/ejb/test/cascade/Song.java +++ b/entitymanager/src/test/java/org/hibernate/ejb/test/cascade/Song.java @@ -1,4 +1,4 @@ -//$Id: $ +//$Id$ package org.hibernate.ejb.test.cascade; import javax.persistence.Entity; diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/emops/Cat.java b/entitymanager/src/test/java/org/hibernate/ejb/test/emops/Cat.java index e4fc51dcbb..5c04722b39 100644 --- a/entitymanager/src/test/java/org/hibernate/ejb/test/emops/Cat.java +++ b/entitymanager/src/test/java/org/hibernate/ejb/test/emops/Cat.java @@ -1,4 +1,4 @@ -//$Id: $ +//$Id$ package org.hibernate.ejb.test.emops; import javax.persistence.Entity; diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/emops/Colony.java b/entitymanager/src/test/java/org/hibernate/ejb/test/emops/Colony.java index b5dcdc0d40..54df3901b6 100644 --- a/entitymanager/src/test/java/org/hibernate/ejb/test/emops/Colony.java +++ b/entitymanager/src/test/java/org/hibernate/ejb/test/emops/Colony.java @@ -1,4 +1,4 @@ -//$Id: $ +//$Id$ package org.hibernate.ejb.test.emops; import javax.persistence.Entity; diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/emops/Competition.java b/entitymanager/src/test/java/org/hibernate/ejb/test/emops/Competition.java index 8fe31cd93f..d5a5d1c089 100644 --- a/entitymanager/src/test/java/org/hibernate/ejb/test/emops/Competition.java +++ b/entitymanager/src/test/java/org/hibernate/ejb/test/emops/Competition.java @@ -1,4 +1,4 @@ -//$Id: $ +//$Id$ package org.hibernate.ejb.test.emops; import java.util.Collection; diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/emops/Competitor.java b/entitymanager/src/test/java/org/hibernate/ejb/test/emops/Competitor.java index 3249f9dc95..c84d71f846 100644 --- a/entitymanager/src/test/java/org/hibernate/ejb/test/emops/Competitor.java +++ b/entitymanager/src/test/java/org/hibernate/ejb/test/emops/Competitor.java @@ -1,4 +1,4 @@ -//$Id: $ +//$Id$ package org.hibernate.ejb.test.emops; import javax.persistence.Entity; diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/emops/Decorate.java b/entitymanager/src/test/java/org/hibernate/ejb/test/emops/Decorate.java index 4402d76d2a..c5d36dd391 100644 --- a/entitymanager/src/test/java/org/hibernate/ejb/test/emops/Decorate.java +++ b/entitymanager/src/test/java/org/hibernate/ejb/test/emops/Decorate.java @@ -1,4 +1,4 @@ -//$Id: $ +//$Id$ package org.hibernate.ejb.test.emops; import javax.persistence.Entity; diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/emops/Dog.java b/entitymanager/src/test/java/org/hibernate/ejb/test/emops/Dog.java index 5caae5a57d..91d4f841de 100644 --- a/entitymanager/src/test/java/org/hibernate/ejb/test/emops/Dog.java +++ b/entitymanager/src/test/java/org/hibernate/ejb/test/emops/Dog.java @@ -1,4 +1,4 @@ -//$Id: $ +//$Id$ package org.hibernate.ejb.test.emops; import javax.persistence.Entity; diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/emops/Dress.java b/entitymanager/src/test/java/org/hibernate/ejb/test/emops/Dress.java index 8bda0777f3..cacae4ba0c 100644 --- a/entitymanager/src/test/java/org/hibernate/ejb/test/emops/Dress.java +++ b/entitymanager/src/test/java/org/hibernate/ejb/test/emops/Dress.java @@ -1,4 +1,4 @@ -//$Id: $ +//$Id$ package org.hibernate.ejb.test.emops; import javax.persistence.Id; diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/emops/Empire.java b/entitymanager/src/test/java/org/hibernate/ejb/test/emops/Empire.java index b9edf09fcc..437a1b8cb1 100644 --- a/entitymanager/src/test/java/org/hibernate/ejb/test/emops/Empire.java +++ b/entitymanager/src/test/java/org/hibernate/ejb/test/emops/Empire.java @@ -1,4 +1,4 @@ -//$Id: $ +//$Id$ package org.hibernate.ejb.test.emops; import java.util.HashSet; diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/emops/FlushModeTest.java b/entitymanager/src/test/java/org/hibernate/ejb/test/emops/FlushModeTest.java index 99b282447f..a463aa1fa9 100644 --- a/entitymanager/src/test/java/org/hibernate/ejb/test/emops/FlushModeTest.java +++ b/entitymanager/src/test/java/org/hibernate/ejb/test/emops/FlushModeTest.java @@ -1,4 +1,4 @@ -//$Id: $ +//$Id$ package org.hibernate.ejb.test.emops; import java.util.Map; diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/emops/FlushTest.java b/entitymanager/src/test/java/org/hibernate/ejb/test/emops/FlushTest.java index 2b693162cd..6ffd3e6dc3 100644 --- a/entitymanager/src/test/java/org/hibernate/ejb/test/emops/FlushTest.java +++ b/entitymanager/src/test/java/org/hibernate/ejb/test/emops/FlushTest.java @@ -1,4 +1,4 @@ -//$Id: $ +//$Id$ package org.hibernate.ejb.test.emops; import java.util.Collection; diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/emops/GetReferenceTest.java b/entitymanager/src/test/java/org/hibernate/ejb/test/emops/GetReferenceTest.java index 0f17f5094f..c70bef2e90 100644 --- a/entitymanager/src/test/java/org/hibernate/ejb/test/emops/GetReferenceTest.java +++ b/entitymanager/src/test/java/org/hibernate/ejb/test/emops/GetReferenceTest.java @@ -1,4 +1,4 @@ -//$Id: $ +//$Id$ package org.hibernate.ejb.test.emops; import javax.persistence.EntityManager; diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/emops/Mail.java b/entitymanager/src/test/java/org/hibernate/ejb/test/emops/Mail.java index bbbc76531f..c57728a3b4 100644 --- a/entitymanager/src/test/java/org/hibernate/ejb/test/emops/Mail.java +++ b/entitymanager/src/test/java/org/hibernate/ejb/test/emops/Mail.java @@ -1,4 +1,4 @@ -//$Id: $ +//$Id$ package org.hibernate.ejb.test.emops; import javax.persistence.Entity; diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/emops/MergeTest.java b/entitymanager/src/test/java/org/hibernate/ejb/test/emops/MergeTest.java index fa866010d0..a59b890e70 100644 --- a/entitymanager/src/test/java/org/hibernate/ejb/test/emops/MergeTest.java +++ b/entitymanager/src/test/java/org/hibernate/ejb/test/emops/MergeTest.java @@ -1,4 +1,4 @@ -//$Id: $ +//$Id$ package org.hibernate.ejb.test.emops; import java.util.List; diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/emops/Music.java b/entitymanager/src/test/java/org/hibernate/ejb/test/emops/Music.java index 85267ca40c..52e5968232 100644 --- a/entitymanager/src/test/java/org/hibernate/ejb/test/emops/Music.java +++ b/entitymanager/src/test/java/org/hibernate/ejb/test/emops/Music.java @@ -1,4 +1,4 @@ -//$Id: $ +//$Id$ package org.hibernate.ejb.test.emops; import javax.persistence.Version; diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/emops/Pet.java b/entitymanager/src/test/java/org/hibernate/ejb/test/emops/Pet.java index 77c4fe73a9..b213939d3e 100644 --- a/entitymanager/src/test/java/org/hibernate/ejb/test/emops/Pet.java +++ b/entitymanager/src/test/java/org/hibernate/ejb/test/emops/Pet.java @@ -1,4 +1,4 @@ -//$Id: $ +//$Id$ package org.hibernate.ejb.test.emops; import javax.persistence.Entity; diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/emops/Race.java b/entitymanager/src/test/java/org/hibernate/ejb/test/emops/Race.java index 8a81af6584..92bd1cc748 100644 --- a/entitymanager/src/test/java/org/hibernate/ejb/test/emops/Race.java +++ b/entitymanager/src/test/java/org/hibernate/ejb/test/emops/Race.java @@ -1,4 +1,4 @@ -//$Id: $ +//$Id$ package org.hibernate.ejb.test.emops; import java.util.List; diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/emops/RefreshTest.java b/entitymanager/src/test/java/org/hibernate/ejb/test/emops/RefreshTest.java index 094805a11d..e4e7fd6b8d 100644 --- a/entitymanager/src/test/java/org/hibernate/ejb/test/emops/RefreshTest.java +++ b/entitymanager/src/test/java/org/hibernate/ejb/test/emops/RefreshTest.java @@ -1,4 +1,4 @@ -//$Id: $ +//$Id$ package org.hibernate.ejb.test.emops; import javax.persistence.EntityManager; diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/emops/RemoveTest.java b/entitymanager/src/test/java/org/hibernate/ejb/test/emops/RemoveTest.java index 4948df6c19..7b923b95c6 100644 --- a/entitymanager/src/test/java/org/hibernate/ejb/test/emops/RemoveTest.java +++ b/entitymanager/src/test/java/org/hibernate/ejb/test/emops/RemoveTest.java @@ -1,16 +1,21 @@ -//$Id: $ +//$Id$ package org.hibernate.ejb.test.emops; -import java.util.Map; -import javax.persistence.EntityManager; -import javax.persistence.OptimisticLockException; - +import org.hibernate.StaleObjectStateException; import org.hibernate.ejb.test.TestCase; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import javax.persistence.EntityManager; +import java.util.Map; /** * @author Emmanuel Bernard */ public class RemoveTest extends TestCase { + + private static final Logger log = LoggerFactory.getLogger(RemoveTest.class); + public void testRemove() { Race race = new Race(); race.competitors.add( new Competitor() ); @@ -44,12 +49,9 @@ public class RemoveTest extends TestCase { em.getTransaction().begin(); em.persist( music ); em.getTransaction().commit(); - em.clear(); - em = getOrCreateEntityManager(); - em.getTransaction().begin(); - + EntityManager em2 = factory.createEntityManager(); try { em2.getTransaction().begin(); @@ -62,6 +64,8 @@ public class RemoveTest extends TestCase { } //change music + em = getOrCreateEntityManager(); + em.getTransaction().begin(); em.find( Music.class, music.getId() ).setName( "Rap" ); em.getTransaction().commit(); @@ -70,8 +74,10 @@ public class RemoveTest extends TestCase { em2.flush(); fail("should have an optimistic lock exception"); } - catch( OptimisticLockException e ) { - //success + + //catch( OptimisticLockException e ) { + catch( Exception e ) { + log.debug("success"); } finally { em2.getTransaction().rollback(); @@ -79,8 +85,9 @@ public class RemoveTest extends TestCase { } //clean + em.getTransaction().begin(); em.remove( em.find( Music.class, music.getId() ) ); - + em.getTransaction().commit(); em.close(); } diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/emops/cascade/A.java b/entitymanager/src/test/java/org/hibernate/ejb/test/emops/cascade/A.java index d4af755e96..d61a3974bb 100644 --- a/entitymanager/src/test/java/org/hibernate/ejb/test/emops/cascade/A.java +++ b/entitymanager/src/test/java/org/hibernate/ejb/test/emops/cascade/A.java @@ -1,4 +1,4 @@ -//$Id: $ +//$Id$ package org.hibernate.ejb.test.emops.cascade; import java.util.HashSet; diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/emops/cascade/B1.java b/entitymanager/src/test/java/org/hibernate/ejb/test/emops/cascade/B1.java index 9693ee0d76..cda5820573 100644 --- a/entitymanager/src/test/java/org/hibernate/ejb/test/emops/cascade/B1.java +++ b/entitymanager/src/test/java/org/hibernate/ejb/test/emops/cascade/B1.java @@ -1,4 +1,4 @@ -//$Id: $ +//$Id$ package org.hibernate.ejb.test.emops.cascade; import java.util.HashSet; diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/emops/cascade/B2.java b/entitymanager/src/test/java/org/hibernate/ejb/test/emops/cascade/B2.java index 7ca16313b1..2b72766a84 100644 --- a/entitymanager/src/test/java/org/hibernate/ejb/test/emops/cascade/B2.java +++ b/entitymanager/src/test/java/org/hibernate/ejb/test/emops/cascade/B2.java @@ -1,4 +1,4 @@ -//$Id: $ +//$Id$ package org.hibernate.ejb.test.emops.cascade; import java.util.HashSet; diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/emops/cascade/B3.java b/entitymanager/src/test/java/org/hibernate/ejb/test/emops/cascade/B3.java index e6f7724325..9c7aa3b055 100644 --- a/entitymanager/src/test/java/org/hibernate/ejb/test/emops/cascade/B3.java +++ b/entitymanager/src/test/java/org/hibernate/ejb/test/emops/cascade/B3.java @@ -1,4 +1,4 @@ -//$Id: $ +//$Id$ package org.hibernate.ejb.test.emops.cascade; import javax.persistence.CascadeType; diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/emops/cascade/B4.java b/entitymanager/src/test/java/org/hibernate/ejb/test/emops/cascade/B4.java index 32997b5bb3..5aa1912905 100644 --- a/entitymanager/src/test/java/org/hibernate/ejb/test/emops/cascade/B4.java +++ b/entitymanager/src/test/java/org/hibernate/ejb/test/emops/cascade/B4.java @@ -1,4 +1,4 @@ -//$Id: $ +//$Id$ package org.hibernate.ejb.test.emops.cascade; import javax.persistence.CascadeType; diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/emops/cascade/C1.java b/entitymanager/src/test/java/org/hibernate/ejb/test/emops/cascade/C1.java index 3a6a7d5845..61d507963d 100644 --- a/entitymanager/src/test/java/org/hibernate/ejb/test/emops/cascade/C1.java +++ b/entitymanager/src/test/java/org/hibernate/ejb/test/emops/cascade/C1.java @@ -1,4 +1,4 @@ -//$Id: $ +//$Id$ package org.hibernate.ejb.test.emops.cascade; import javax.persistence.CascadeType; diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/emops/cascade/C2.java b/entitymanager/src/test/java/org/hibernate/ejb/test/emops/cascade/C2.java index dab1ce645b..f9a844934d 100644 --- a/entitymanager/src/test/java/org/hibernate/ejb/test/emops/cascade/C2.java +++ b/entitymanager/src/test/java/org/hibernate/ejb/test/emops/cascade/C2.java @@ -1,4 +1,4 @@ -//$Id: $ +//$Id$ package org.hibernate.ejb.test.emops.cascade; import javax.persistence.CascadeType; diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/emops/cascade/CascadePersistTest.java b/entitymanager/src/test/java/org/hibernate/ejb/test/emops/cascade/CascadePersistTest.java index d8b584e29c..00ae945de8 100644 --- a/entitymanager/src/test/java/org/hibernate/ejb/test/emops/cascade/CascadePersistTest.java +++ b/entitymanager/src/test/java/org/hibernate/ejb/test/emops/cascade/CascadePersistTest.java @@ -1,4 +1,4 @@ -//$Id: $ +//$Id$ package org.hibernate.ejb.test.emops.cascade; import javax.persistence.EntityManager; diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/inheritance/Fruit.java b/entitymanager/src/test/java/org/hibernate/ejb/test/inheritance/Fruit.java index e10294f9c4..0a8016e998 100644 --- a/entitymanager/src/test/java/org/hibernate/ejb/test/inheritance/Fruit.java +++ b/entitymanager/src/test/java/org/hibernate/ejb/test/inheritance/Fruit.java @@ -1,4 +1,4 @@ -//$Id: $ +//$Id$ package org.hibernate.ejb.test.inheritance; import javax.persistence.Entity; diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/inheritance/InheritanceTest.java b/entitymanager/src/test/java/org/hibernate/ejb/test/inheritance/InheritanceTest.java index 42bff8622f..022205a0ad 100644 --- a/entitymanager/src/test/java/org/hibernate/ejb/test/inheritance/InheritanceTest.java +++ b/entitymanager/src/test/java/org/hibernate/ejb/test/inheritance/InheritanceTest.java @@ -1,4 +1,4 @@ -//$Id: $ +//$Id$ package org.hibernate.ejb.test.inheritance; import javax.persistence.EntityManager; diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/inheritance/Strawberry.java b/entitymanager/src/test/java/org/hibernate/ejb/test/inheritance/Strawberry.java index f44e1748ff..67bdc3ae76 100644 --- a/entitymanager/src/test/java/org/hibernate/ejb/test/inheritance/Strawberry.java +++ b/entitymanager/src/test/java/org/hibernate/ejb/test/inheritance/Strawberry.java @@ -1,4 +1,4 @@ -//$Id: $ +//$Id$ package org.hibernate.ejb.test.inheritance; import javax.persistence.Entity; diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/lock/UnversionedLock.java b/entitymanager/src/test/java/org/hibernate/ejb/test/lock/UnversionedLock.java index 92ff7686d3..78a71b74fd 100644 --- a/entitymanager/src/test/java/org/hibernate/ejb/test/lock/UnversionedLock.java +++ b/entitymanager/src/test/java/org/hibernate/ejb/test/lock/UnversionedLock.java @@ -1,4 +1,4 @@ -//$Id: $ +//$Id$ package org.hibernate.ejb.test.lock; import javax.persistence.Id; diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/ops/Animal.java b/entitymanager/src/test/java/org/hibernate/ejb/test/ops/Animal.java index 52c269d84c..088e37b3d6 100644 --- a/entitymanager/src/test/java/org/hibernate/ejb/test/ops/Animal.java +++ b/entitymanager/src/test/java/org/hibernate/ejb/test/ops/Animal.java @@ -1,4 +1,4 @@ -//$Id: $ +//$Id$ package org.hibernate.ejb.test.ops; import javax.persistence.Entity; diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/ops/FindTest.java b/entitymanager/src/test/java/org/hibernate/ejb/test/ops/FindTest.java index 9325872497..100e87b41c 100644 --- a/entitymanager/src/test/java/org/hibernate/ejb/test/ops/FindTest.java +++ b/entitymanager/src/test/java/org/hibernate/ejb/test/ops/FindTest.java @@ -1,4 +1,4 @@ -//$Id: $ +//$Id$ package org.hibernate.ejb.test.ops; import javax.persistence.EntityManager; diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/ops/Mammal.java b/entitymanager/src/test/java/org/hibernate/ejb/test/ops/Mammal.java index eedc420a54..55dcc9e5d2 100644 --- a/entitymanager/src/test/java/org/hibernate/ejb/test/ops/Mammal.java +++ b/entitymanager/src/test/java/org/hibernate/ejb/test/ops/Mammal.java @@ -1,4 +1,4 @@ -//$Id: $ +//$Id$ package org.hibernate.ejb.test.ops; import javax.persistence.Entity; diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/ops/PersistTest.java b/entitymanager/src/test/java/org/hibernate/ejb/test/ops/PersistTest.java index 2c54a7c6ab..aadbea7ddf 100755 --- a/entitymanager/src/test/java/org/hibernate/ejb/test/ops/PersistTest.java +++ b/entitymanager/src/test/java/org/hibernate/ejb/test/ops/PersistTest.java @@ -131,7 +131,7 @@ public class PersistTest extends EJB3TestCase { tx = s.beginTransaction(); try { s.persist( dupe ); - assertFalse( true ); + fail(); } catch (PersistentObjectException poe) { //verify that an exception is thrown! @@ -146,7 +146,7 @@ public class PersistTest extends EJB3TestCase { tx = s.beginTransaction(); try { s.persist( nondupe ); - assertFalse( true ); + fail(); } catch (PersistentObjectException poe) { //verify that an exception is thrown! diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/ops/Reptile.java b/entitymanager/src/test/java/org/hibernate/ejb/test/ops/Reptile.java index 1acaa4a8aa..a4458aef6d 100644 --- a/entitymanager/src/test/java/org/hibernate/ejb/test/ops/Reptile.java +++ b/entitymanager/src/test/java/org/hibernate/ejb/test/ops/Reptile.java @@ -1,4 +1,4 @@ -//$Id: $ +//$Id$ package org.hibernate.ejb.test.ops; import javax.persistence.Entity; diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/pack/defaultpar/IncrementListener.java b/entitymanager/src/test/java/org/hibernate/ejb/test/pack/defaultpar/IncrementListener.java index 7a18c96a68..756aa1b4a1 100644 --- a/entitymanager/src/test/java/org/hibernate/ejb/test/pack/defaultpar/IncrementListener.java +++ b/entitymanager/src/test/java/org/hibernate/ejb/test/pack/defaultpar/IncrementListener.java @@ -1,4 +1,4 @@ -//$Id: $ +//$Id$ package org.hibernate.ejb.test.pack.defaultpar; import javax.persistence.PrePersist; diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/pack/defaultpar/Lighter.java b/entitymanager/src/test/java/org/hibernate/ejb/test/pack/defaultpar/Lighter.java index 86e9d539d5..443f6c305e 100644 --- a/entitymanager/src/test/java/org/hibernate/ejb/test/pack/defaultpar/Lighter.java +++ b/entitymanager/src/test/java/org/hibernate/ejb/test/pack/defaultpar/Lighter.java @@ -1,4 +1,4 @@ -//$Id: $ +//$Id$ package org.hibernate.ejb.test.pack.defaultpar; /** diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/pack/defaultpar/Money.java b/entitymanager/src/test/java/org/hibernate/ejb/test/pack/defaultpar/Money.java index 2600391aaf..cf732ddec4 100644 --- a/entitymanager/src/test/java/org/hibernate/ejb/test/pack/defaultpar/Money.java +++ b/entitymanager/src/test/java/org/hibernate/ejb/test/pack/defaultpar/Money.java @@ -1,4 +1,4 @@ -//$Id: $ +//$Id$ package org.hibernate.ejb.test.pack.defaultpar; import javax.persistence.Entity; diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/pack/defaultpar/OtherIncrementListener.java b/entitymanager/src/test/java/org/hibernate/ejb/test/pack/defaultpar/OtherIncrementListener.java index a8d4c09859..41f995aeab 100644 --- a/entitymanager/src/test/java/org/hibernate/ejb/test/pack/defaultpar/OtherIncrementListener.java +++ b/entitymanager/src/test/java/org/hibernate/ejb/test/pack/defaultpar/OtherIncrementListener.java @@ -1,4 +1,4 @@ -//$Id: $ +//$Id$ package org.hibernate.ejb.test.pack.defaultpar; /** diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/pack/explicitpar/Washer.java b/entitymanager/src/test/java/org/hibernate/ejb/test/pack/explicitpar/Washer.java index b3ca4af651..e3234cfb2f 100644 --- a/entitymanager/src/test/java/org/hibernate/ejb/test/pack/explicitpar/Washer.java +++ b/entitymanager/src/test/java/org/hibernate/ejb/test/pack/explicitpar/Washer.java @@ -1,4 +1,4 @@ -//$Id: $ +//$Id$ package org.hibernate.ejb.test.pack.explicitpar; import javax.persistence.Entity; diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/pack/overridenpar/Bug.java b/entitymanager/src/test/java/org/hibernate/ejb/test/pack/overridenpar/Bug.java index 205db384ba..6b9b4b5a02 100644 --- a/entitymanager/src/test/java/org/hibernate/ejb/test/pack/overridenpar/Bug.java +++ b/entitymanager/src/test/java/org/hibernate/ejb/test/pack/overridenpar/Bug.java @@ -1,4 +1,4 @@ -//$Id: $ +//$Id$ package org.hibernate.ejb.test.pack.overridenpar; import javax.persistence.Entity; diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/pack/spacepar/Bug.java b/entitymanager/src/test/java/org/hibernate/ejb/test/pack/spacepar/Bug.java index 512a66301d..e80d663539 100644 --- a/entitymanager/src/test/java/org/hibernate/ejb/test/pack/spacepar/Bug.java +++ b/entitymanager/src/test/java/org/hibernate/ejb/test/pack/spacepar/Bug.java @@ -1,4 +1,4 @@ -//$Id: $ +//$Id$ package org.hibernate.ejb.test.pack.spacepar; import javax.persistence.Entity; diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/pack/various/Airplane.java b/entitymanager/src/test/java/org/hibernate/ejb/test/pack/various/Airplane.java index 50773306b5..15ade2109f 100644 --- a/entitymanager/src/test/java/org/hibernate/ejb/test/pack/various/Airplane.java +++ b/entitymanager/src/test/java/org/hibernate/ejb/test/pack/various/Airplane.java @@ -1,4 +1,4 @@ -//$Id: $ +//$Id$ package org.hibernate.ejb.test.pack.various; /** diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/pack/various/Seat.java b/entitymanager/src/test/java/org/hibernate/ejb/test/pack/various/Seat.java index 2f7f1212c8..43bde23ea6 100644 --- a/entitymanager/src/test/java/org/hibernate/ejb/test/pack/various/Seat.java +++ b/entitymanager/src/test/java/org/hibernate/ejb/test/pack/various/Seat.java @@ -1,4 +1,4 @@ -//$Id: $ +//$Id$ package org.hibernate.ejb.test.pack.various; /** diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/pack/war/ApplicationServer.java b/entitymanager/src/test/java/org/hibernate/ejb/test/pack/war/ApplicationServer.java index 2f1acd3da7..f7b1909ea4 100644 --- a/entitymanager/src/test/java/org/hibernate/ejb/test/pack/war/ApplicationServer.java +++ b/entitymanager/src/test/java/org/hibernate/ejb/test/pack/war/ApplicationServer.java @@ -1,4 +1,4 @@ -//$Id: ApplicationServer.java 11282 2007-03-14 22:05:59Z epbernard $ +//$Id$ package org.hibernate.ejb.test.pack.war; import javax.persistence.Entity; diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/pack/war/IncrementListener.java b/entitymanager/src/test/java/org/hibernate/ejb/test/pack/war/IncrementListener.java index 556f0d445e..4a7ec39e01 100644 --- a/entitymanager/src/test/java/org/hibernate/ejb/test/pack/war/IncrementListener.java +++ b/entitymanager/src/test/java/org/hibernate/ejb/test/pack/war/IncrementListener.java @@ -1,4 +1,4 @@ -//$Id: $ +//$Id$ package org.hibernate.ejb.test.pack.war; import javax.persistence.PrePersist; diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/pack/war/Lighter.java b/entitymanager/src/test/java/org/hibernate/ejb/test/pack/war/Lighter.java index ba2c077f67..915319af06 100644 --- a/entitymanager/src/test/java/org/hibernate/ejb/test/pack/war/Lighter.java +++ b/entitymanager/src/test/java/org/hibernate/ejb/test/pack/war/Lighter.java @@ -1,4 +1,4 @@ -//$Id: $ +//$Id$ package org.hibernate.ejb.test.pack.war; /** diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/pack/war/Money.java b/entitymanager/src/test/java/org/hibernate/ejb/test/pack/war/Money.java index e04e928cf5..45397c0b47 100644 --- a/entitymanager/src/test/java/org/hibernate/ejb/test/pack/war/Money.java +++ b/entitymanager/src/test/java/org/hibernate/ejb/test/pack/war/Money.java @@ -1,4 +1,4 @@ -//$Id: $ +//$Id$ package org.hibernate.ejb.test.pack.war; import javax.persistence.Entity; diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/pack/war/Mouse.java b/entitymanager/src/test/java/org/hibernate/ejb/test/pack/war/Mouse.java index 4003d4606f..bf96fda7a6 100644 --- a/entitymanager/src/test/java/org/hibernate/ejb/test/pack/war/Mouse.java +++ b/entitymanager/src/test/java/org/hibernate/ejb/test/pack/war/Mouse.java @@ -1,4 +1,4 @@ -//$Id: Mouse.java 11282 2007-03-14 22:05:59Z epbernard $ +//$Id$ package org.hibernate.ejb.test.pack.war; import javax.persistence.ExcludeDefaultListeners; diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/pack/war/OtherIncrementListener.java b/entitymanager/src/test/java/org/hibernate/ejb/test/pack/war/OtherIncrementListener.java index cde370ab18..f5f73f5d8c 100644 --- a/entitymanager/src/test/java/org/hibernate/ejb/test/pack/war/OtherIncrementListener.java +++ b/entitymanager/src/test/java/org/hibernate/ejb/test/pack/war/OtherIncrementListener.java @@ -1,4 +1,4 @@ -//$Id: $ +//$Id$ package org.hibernate.ejb.test.pack.war; /** diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/pack/war/Version.java b/entitymanager/src/test/java/org/hibernate/ejb/test/pack/war/Version.java index 431e8b807a..2678a1edb0 100644 --- a/entitymanager/src/test/java/org/hibernate/ejb/test/pack/war/Version.java +++ b/entitymanager/src/test/java/org/hibernate/ejb/test/pack/war/Version.java @@ -1,4 +1,4 @@ -//$Id: Version.java 11282 2007-03-14 22:05:59Z epbernard $ +//$Id$ package org.hibernate.ejb.test.pack.war; import javax.persistence.Embeddable; diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/packaging/JarVisitorTest.java b/entitymanager/src/test/java/org/hibernate/ejb/test/packaging/JarVisitorTest.java index eca0024127..c60915f124 100644 --- a/entitymanager/src/test/java/org/hibernate/ejb/test/packaging/JarVisitorTest.java +++ b/entitymanager/src/test/java/org/hibernate/ejb/test/packaging/JarVisitorTest.java @@ -36,6 +36,8 @@ public class JarVisitorTest extends TestCase { private static final Logger log = LoggerFactory.getLogger(JarVisitorTest.class); + private static final String jarFileBase = "file:./target/test-packages"; + public void testHttp() throws Exception { URL url = JarVisitorFactory.getJarURLFromURLEntry( new URL( @@ -58,8 +60,7 @@ public class JarVisitorTest extends TestCase { } public void testInputStreamZippedJar() throws Exception { - String jarFileName = "file:./build/testresources/defaultpar.par"; - //JarVisitor jarVisitor = new ZippedJarVisitor( jarFileName, true, true ); + String jarFileName = jarFileBase + "/defaultpar.par"; Filter[] filters = getFilters(); JarVisitor jarVisitor = new InputStreamZippedJarVisitor( new URL( jarFileName ), filters, "" ); assertEquals( "defaultpar", jarVisitor.getUnqualifiedJarName() ); @@ -78,8 +79,7 @@ public class JarVisitorTest extends TestCase { } public void testNestedJarProtocol() throws Exception { - String jarFileName = "jar:file:./build/testresources/nestedjar.ear!/defaultpar.par"; - //JarVisitor jarVisitor = new ZippedJarVisitor( jarFileName, true, true ); + String jarFileName = jarFileBase + "/nestedjar.ear!/defaultpar.par"; Filter[] filters = getFilters(); JarVisitor jarVisitor = new JarProtocolVisitor( new URL( jarFileName ), filters, "" ); //TODO should we fix the name here to reach defaultpar rather than nestedjar ?? @@ -97,7 +97,7 @@ public class JarVisitorTest extends TestCase { localEntry.getInputStream().close(); } - jarFileName = "jar:file:./build/testresources/nesteddir.ear!/defaultpar.par"; + jarFileName = jarFileBase + "/nesteddir.ear!/defaultpar.par"; //JarVisitor jarVisitor = new ZippedJarVisitor( jarFileName, true, true ); filters = getFilters(); jarVisitor = new JarProtocolVisitor( new URL( jarFileName ), filters, "" ); @@ -118,8 +118,7 @@ public class JarVisitorTest extends TestCase { } public void testJarProtocol() throws Exception { - String jarFileName = "jar:file:./build/testresources/war.war!/WEB-INF/classes"; - //JarVisitor jarVisitor = new ZippedJarVisitor( jarFileName, true, true ); + String jarFileName = jarFileBase + "/war.war!/WEB-INF/classes"; Filter[] filters = getFilters(); JarVisitor jarVisitor = new JarProtocolVisitor( new URL( jarFileName ), filters, "" ); assertEquals( "war", jarVisitor.getUnqualifiedJarName() ); @@ -138,8 +137,7 @@ public class JarVisitorTest extends TestCase { } public void testZippedJar() throws Exception { - String jarFileName = "file:./build/testresources/defaultpar.par"; - //JarVisitor jarVisitor = new ZippedJarVisitor( jarFileName, true, true ); + String jarFileName = jarFileBase + "/defaultpar.par"; Filter[] filters = getFilters(); JarVisitor jarVisitor = new FileZippedJarVisitor( new URL( jarFileName ), filters, "" ); assertEquals( "defaultpar", jarVisitor.getUnqualifiedJarName() ); @@ -159,8 +157,7 @@ public class JarVisitorTest extends TestCase { public void testExplodedJar() throws Exception { - String jarFileName = "./build/testresources/explodedpar.par"; - //JarVisitor jarVisitor = new ExplodedJarVisitor( jarFileName, true, true ); + String jarFileName = jarFileBase + "/explodedpar.par"; Filter[] filters = getFilters(); JarVisitor jarVisitor = new ExplodedJarVisitor( jarFileName, filters ); assertEquals( "explodedpar", jarVisitor.getUnqualifiedJarName() ); diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/xml/Address.java b/entitymanager/src/test/java/org/hibernate/ejb/test/xml/Address.java index 5a83927888..1f32185411 100644 --- a/entitymanager/src/test/java/org/hibernate/ejb/test/xml/Address.java +++ b/entitymanager/src/test/java/org/hibernate/ejb/test/xml/Address.java @@ -1,4 +1,4 @@ -//$Id: $ +//$Id$ package org.hibernate.ejb.test.xml; /** diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/xml/Article.java b/entitymanager/src/test/java/org/hibernate/ejb/test/xml/Article.java index 4a2d0ec87b..833e7aa568 100644 --- a/entitymanager/src/test/java/org/hibernate/ejb/test/xml/Article.java +++ b/entitymanager/src/test/java/org/hibernate/ejb/test/xml/Article.java @@ -1,4 +1,4 @@ -//$Id: $ +//$Id$ package org.hibernate.ejb.test.xml; import javax.persistence.Column; diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/xml/CounterListener.java b/entitymanager/src/test/java/org/hibernate/ejb/test/xml/CounterListener.java index 28c61790c1..2e1484fbaa 100644 --- a/entitymanager/src/test/java/org/hibernate/ejb/test/xml/CounterListener.java +++ b/entitymanager/src/test/java/org/hibernate/ejb/test/xml/CounterListener.java @@ -1,4 +1,4 @@ -//$Id: $ +//$Id$ package org.hibernate.ejb.test.xml; import javax.persistence.PrePersist; diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/xml/Employee.java b/entitymanager/src/test/java/org/hibernate/ejb/test/xml/Employee.java index ae837ff0eb..d3e76ab68b 100644 --- a/entitymanager/src/test/java/org/hibernate/ejb/test/xml/Employee.java +++ b/entitymanager/src/test/java/org/hibernate/ejb/test/xml/Employee.java @@ -1,4 +1,4 @@ -//$Id: $ +//$Id$ package org.hibernate.ejb.test.xml; import javax.persistence.Entity; diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/xml/Light.java b/entitymanager/src/test/java/org/hibernate/ejb/test/xml/Light.java index 936e554e97..e13f9a40c3 100644 --- a/entitymanager/src/test/java/org/hibernate/ejb/test/xml/Light.java +++ b/entitymanager/src/test/java/org/hibernate/ejb/test/xml/Light.java @@ -1,4 +1,4 @@ -//$Id: $ +//$Id$ package org.hibernate.ejb.test.xml; /** diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/xml/Lighter.java b/entitymanager/src/test/java/org/hibernate/ejb/test/xml/Lighter.java index 7efd10d276..bd3c255c87 100644 --- a/entitymanager/src/test/java/org/hibernate/ejb/test/xml/Lighter.java +++ b/entitymanager/src/test/java/org/hibernate/ejb/test/xml/Lighter.java @@ -1,4 +1,4 @@ -//$Id: $ +//$Id$ package org.hibernate.ejb.test.xml; /** diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/xml/XmlAttributeOverrideTest.java b/entitymanager/src/test/java/org/hibernate/ejb/test/xml/XmlAttributeOverrideTest.java index 326b04ed6e..b98c5a3213 100644 --- a/entitymanager/src/test/java/org/hibernate/ejb/test/xml/XmlAttributeOverrideTest.java +++ b/entitymanager/src/test/java/org/hibernate/ejb/test/xml/XmlAttributeOverrideTest.java @@ -1,4 +1,4 @@ -//$Id: $ +//$Id$ package org.hibernate.ejb.test.xml; import javax.persistence.EntityManager; diff --git a/entitymanager/src/test/java/org/hibernate/ejb/test/xml/XmlTest.java b/entitymanager/src/test/java/org/hibernate/ejb/test/xml/XmlTest.java index 30e72516f5..6959d0aaa3 100644 --- a/entitymanager/src/test/java/org/hibernate/ejb/test/xml/XmlTest.java +++ b/entitymanager/src/test/java/org/hibernate/ejb/test/xml/XmlTest.java @@ -1,4 +1,4 @@ -//$Id: $ +//$Id$ package org.hibernate.ejb.test.xml; import javax.persistence.EntityManager; diff --git a/entitymanager/src/test/resources/hibernate.properties b/entitymanager/src/test/resources/hibernate.properties index 4385885bac..daaf4b9bd5 100644 --- a/entitymanager/src/test/resources/hibernate.properties +++ b/entitymanager/src/test/resources/hibernate.properties @@ -33,6 +33,8 @@ hibernate.connection.pool_size 5 hibernate.show_sql true hibernate.format_sql true +hibernate.hbm2ddl.auto create-drop + hibernate.max_fetch_depth 5 hibernate.cache.region_prefix hibernate.test