[picocontainer-scm] [scm-git][1] update to last 3.X release of Hibernate.

commit 22f214717779cd92871e0d96f503dfe1bceaf5bb
Author:     Michael Rimov <[email protected]>
AuthorDate: Fri Mar 16 13:18:15 2012 -0700
Commit:     Michael Rimov <[email protected]>
CommitDate: Fri Mar 16 13:18:15 2012 -0700

    update to last 3.X release of Hibernate.

diff --git a/persistence/persistence-hibernate/pom.xml b/persistence/persistence-hibernate/pom.xml
index 467fbec..722a07c 100644
--- a/persistence/persistence-hibernate/pom.xml
+++ b/persistence/persistence-hibernate/pom.xml
@@ -3,34 +3,32 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>org.picocontainer.persistence</groupId><artifactId>picocontainer-persistence</artifactId><version>3.0-SNAPSHOT</version>
+        <groupId>org.picocontainer.persistence</groupId>
+        <artifactId>picocontainer-persistence</artifactId>
+        <version>3.0-SNAPSHOT</version>
     </parent>
     <artifactId>picocontainer-persistence-hibernate</artifactId>
     <name>PicoContainer Persistence Hibernate</name>
     <packaging>jar</packaging>
     <dependencies>
         <dependency>
-            <groupId>org.picocontainer</groupId><artifactId>picocontainer</artifactId>
+            <groupId>org.picocontainer</groupId>
+            <artifactId>picocontainer</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.hibernate</groupId><artifactId>hibernate-annotations</artifactId><version>3.3.1.GA</version>
+				<groupId>org.hibernate</groupId>
+				<artifactId>hibernate-core</artifactId>
+				<version>3.6.9.Final</version>
         </dependency>
         <dependency>
-            <groupId>org.apache.geronimo.specs</groupId><artifactId>geronimo-jta_1.0.1B_spec</artifactId><version>1.1.1</version>
-            <scope>provided</scope>
+				<groupId>javax.transaction</groupId>
+				<artifactId>jta</artifactId>
+				<version>1.1</version>
+			</dependency>
+		<dependency>
+			<groupId>javassist</groupId>
+			<artifactId>javassist</artifactId>
+			<version>3.9.0.GA</version>
         </dependency>
     </dependencies>
-    <repositories>
-        <repository>
-            <id>jboss</id>
-            <name>JBoss Repository</name>
-            <url>http://repository.jboss.com/maven2</url>
-            <releases>
-                <enabled>true</enabled>
-            </releases>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-        </repository>
-    </repositories>
 </project>
diff --git a/persistence/persistence-hibernate/src/java/org/picocontainer/persistence/hibernate/ConfigurableSessionFactory.java b/persistence/persistence-hibernate/src/java/org/picocontainer/persistence/hibernate/ConfigurableSessionFactory.java
index a400396..03a0ad8 100644
--- a/persistence/persistence-hibernate/src/java/org/picocontainer/persistence/hibernate/ConfigurableSessionFactory.java
+++ b/persistence/persistence-hibernate/src/java/org/picocontainer/persistence/hibernate/ConfigurableSessionFactory.java
@@ -16,10 +16,12 @@ import java.util.Set;
 import javax.naming.NamingException;
 import javax.naming.Reference;
 
+import org.hibernate.Cache;
 import org.hibernate.HibernateException;
 import org.hibernate.Interceptor;
 import org.hibernate.SessionFactory;
 import org.hibernate.StatelessSession;
+import org.hibernate.TypeHelper;
 import org.hibernate.cfg.Configuration;
 import org.hibernate.classic.Session;
 import org.hibernate.engine.FilterDefinition;
@@ -60,42 +62,50 @@ public final class ConfigurableSessionFactory implements SessionFactory, Disposa
 
 	/** {@inheritDoc} **/
     @SuppressWarnings("unchecked")
+    @Deprecated
 	public void evict(Class persistentClass) {
         delegate.evict(persistentClass);
     }
 
 	/** {@inheritDoc} **/
     @SuppressWarnings("unchecked")
+    @Deprecated
 	public void evict(Class persistentClass, Serializable id) {
         delegate.evict(persistentClass, id);
     }
 
 	/** {@inheritDoc} **/
+    @Deprecated
     public void evictCollection(String roleName) {
         delegate.evictCollection(roleName);
     }
 
 	/** {@inheritDoc} **/
+    @Deprecated
     public void evictCollection(String roleName, Serializable id) {
         delegate.evictCollection(roleName, id);
     }
 
 	/** {@inheritDoc} **/
+    @Deprecated
     public void evictEntity(String entityName) {
         delegate.evictEntity(entityName);
     }
 
 	/** {@inheritDoc} **/
+    @Deprecated
     public void evictEntity(String entityName, Serializable id) {
         delegate.evictEntity(entityName, id);
     }
 
 	/** {@inheritDoc} **/
+    @Deprecated
     public void evictQueries() {
         delegate.evictQueries();
     }
 
 	/** {@inheritDoc} **/
+    @Deprecated
     public void evictQueries(String cacheRegion) {
         delegate.evictQueries(cacheRegion);
     }
@@ -196,4 +206,16 @@ public final class ConfigurableSessionFactory implements SessionFactory, Disposa
 		close();
 	}
 
+	public Cache getCache() {
+		return delegate.getCache();
+	}
+
+	public boolean containsFetchProfileDefinition(String name) {
+		return delegate.containsFetchProfileDefinition(name);
+	}
+
+	public TypeHelper getTypeHelper() {
+		return delegate.getTypeHelper();
+	}
+
 }
diff --git a/persistence/persistence-hibernate/src/java/org/picocontainer/persistence/hibernate/ScopedSession.java b/persistence/persistence-hibernate/src/java/org/picocontainer/persistence/hibernate/ScopedSession.java
index 70158dc..0f48738 100644
--- a/persistence/persistence-hibernate/src/java/org/picocontainer/persistence/hibernate/ScopedSession.java
+++ b/persistence/persistence-hibernate/src/java/org/picocontainer/persistence/hibernate/ScopedSession.java
@@ -8,12 +8,18 @@
 
 package org.picocontainer.persistence.hibernate;
 
+import java.io.Serializable;
 import java.sql.Connection;
 
 import org.hibernate.HibernateException;
 import org.hibernate.Interceptor;
+import org.hibernate.LobHelper;
+import org.hibernate.LockOptions;
 import org.hibernate.Session;
 import org.hibernate.SessionFactory;
+import org.hibernate.TypeHelper;
+import org.hibernate.UnknownProfileException;
+import org.hibernate.jdbc.Work;
 import org.picocontainer.Disposable;
 import org.picocontainer.Startable;
 
@@ -234,4 +240,70 @@ public final class ScopedSession extends AbstractSessionDecorator implements Sta
         disposed = true;
     }
 
+	public boolean isDefaultReadOnly() {
+		return session.isDefaultReadOnly();
+	}
+
+	public void setDefaultReadOnly(boolean readOnly) {
+		session.setDefaultReadOnly(readOnly);
+	}
+
+	public Object load(Class theClass, Serializable id, LockOptions lockOptions)
+			throws HibernateException {
+		return session.load(theClass, id, lockOptions);
+	}
+
+	public Object load(String entityName, Serializable id,
+			LockOptions lockOptions) throws HibernateException {
+		return session.load(entityName, id,lockOptions);
+	}
+
+	public LockRequest buildLockRequest(LockOptions lockOptions) {
+		return session.buildLockRequest(lockOptions);
+	}
+
+	public void refresh(Object object, LockOptions lockOptions)
+			throws HibernateException {
+		session.refresh(object,lockOptions);
+	}
+
+	public Object get(Class clazz, Serializable id, LockOptions lockOptions)
+			throws HibernateException {
+		return session.get(clazz, id, lockOptions);
+	}
+
+	public Object get(String entityName, Serializable id,
+			LockOptions lockOptions) throws HibernateException {
+		return session.get(entityName,id,lockOptions);
+	}
+
+	public boolean isReadOnly(Object entityOrProxy) {
+		return session.isReadOnly(entityOrProxy);
+	}
+
+	public void doWork(Work work) throws HibernateException {
+		session.doWork(work);
+	}
+
+	public boolean isFetchProfileEnabled(String name)
+			throws UnknownProfileException {
+		return session.isFetchProfileEnabled(name);
+	}
+
+	public void enableFetchProfile(String name) throws UnknownProfileException {
+		session.enableFetchProfile(name);
+	}
+
+	public void disableFetchProfile(String name) throws UnknownProfileException {
+		session.disableFetchProfile(name);
+	}
+
+	public TypeHelper getTypeHelper() {
+		return session.getTypeHelper();
+	}
+
+	public LobHelper getLobHelper() {
+		return session.getLobHelper();
+	}
+
 }
diff --git a/persistence/pom.xml b/persistence/pom.xml
index 50dd966..a253bcb 100644
--- a/persistence/pom.xml
+++ b/persistence/pom.xml
@@ -2,9 +2,14 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <groupId>org.picocontainer.persistence</groupId><artifactId>picocontainer-persistence</artifactId>
-    <name>PicoContainer Persistence</name>
+    <parent>
+	    <groupId>org.picocontainer</groupId>
+	    <artifactId>picocontainer-root</artifactId>
     <version>3.0-SNAPSHOT</version>
+    </parent>
+    <groupId>org.picocontainer.persistence</groupId>
+    <artifactId>picocontainer-persistence</artifactId>
+    <name>PicoContainer Persistence</name>
     <packaging>pom</packaging>
     <url>http://www.picocontainer.org/persistence</url>
     <modules>