From 57001426bc256ac1a8c52e4b39eaba9b62ee1d37 Mon Sep 17 00:00:00 2001 From: Brett Meyer Date: Mon, 1 Apr 2013 10:32:08 -0400 Subject: [PATCH] Corrected compile error after master merge --- .../hibernate/jpa/event/spi/JpaIntegrator.java | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/hibernate-entitymanager/src/main/java/org/hibernate/jpa/event/spi/JpaIntegrator.java b/hibernate-entitymanager/src/main/java/org/hibernate/jpa/event/spi/JpaIntegrator.java index 5049f31dd9..1139ef9787 100644 --- a/hibernate-entitymanager/src/main/java/org/hibernate/jpa/event/spi/JpaIntegrator.java +++ b/hibernate-entitymanager/src/main/java/org/hibernate/jpa/event/spi/JpaIntegrator.java @@ -29,6 +29,7 @@ import java.util.Map; import org.hibernate.HibernateException; +import org.hibernate.boot.registry.classloading.spi.ClassLoaderService; import org.hibernate.cfg.Configuration; import org.hibernate.engine.spi.CascadeStyles; import org.hibernate.engine.spi.CascadingAction; @@ -59,22 +60,11 @@ import org.hibernate.jpa.event.internal.jpa.CallbackRegistryConsumer; import org.hibernate.jpa.event.internal.jpa.CallbackRegistryImpl; import org.hibernate.jpa.event.internal.jpa.LegacyCallbackProcessor; -import org.hibernate.jpa.event.spi.jpa.ListenerFactory; import org.hibernate.jpa.event.internal.jpa.StandardListenerFactory; +import org.hibernate.jpa.event.spi.jpa.ListenerFactory; import org.hibernate.mapping.PersistentClass; -<<<<<<< HEAD -import org.hibernate.metamodel.spi.binding.EntityBinding; import org.hibernate.metamodel.spi.MetadataImplementor; -import org.hibernate.secure.internal.JACCPreDeleteEventListener; -import org.hibernate.secure.internal.JACCPreInsertEventListener; -import org.hibernate.secure.internal.JACCPreLoadEventListener; -import org.hibernate.secure.internal.JACCPreUpdateEventListener; -import org.hibernate.secure.internal.JACCSecurityListener; -======= -import org.hibernate.metamodel.binding.EntityBinding; -import org.hibernate.metamodel.source.MetadataImplementor; ->>>>>>> master -import org.hibernate.boot.registry.classloading.spi.ClassLoaderService; +import org.hibernate.metamodel.spi.binding.EntityBinding; import org.hibernate.service.spi.ServiceRegistryImplementor; import org.hibernate.service.spi.SessionFactoryServiceRegistry;