From c7e1d0aff0c2b9077ea488a9875b7d213a2b925f Mon Sep 17 00:00:00 2001
From: Brett Meyer <brett@3riverdev.com>
Date: Mon, 8 Apr 2013 18:48:08 -0400
Subject: [PATCH 1/8] Updated for JPA 2.1

---
 HibernateOSGi_AppManaged/features.xml       |  8 ++++----
 HibernateOSGi_AppManaged/pom.xml            | 12 ++++++------
 HibernateOSGi_ContainerManaged/features.xml | 17 ++++++++---------
 HibernateOSGi_ContainerManaged/pom.xml      |  7 ++++---
 4 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/HibernateOSGi_AppManaged/features.xml b/HibernateOSGi_AppManaged/features.xml
index 4a83437..373c140 100644
--- a/HibernateOSGi_AppManaged/features.xml
+++ b/HibernateOSGi_AppManaged/features.xml
@@ -8,7 +8,7 @@
         <bundle start-level="30">mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/1.1.1</bundle>
         
         <!-- JPA -->
-        <bundle start-level="30">mvn:org.apache.geronimo.specs/geronimo-jpa_2.0_spec/1.1</bundle>
+        <bundle start-level="30">mvn:org.hibernate.javax.persistence/hibernate-jpa-2.1-api/1.0.0-SNAPSHOT</bundle>
         
         <!-- Taken from Karaf-Tutorial -->
         <bundle>mvn:commons-collections/commons-collections/3.2.1</bundle>
@@ -41,9 +41,9 @@
         <!--<bundle>wrap:mvn:javax.validation/validation-api/1.0.0.GA</bundle>
         <bundle>mvn:org.hibernate/hibernate-validator/4.2.0.Final</bundle>-->
 
-        <bundle>mvn:org.hibernate/hibernate-core/4.2.1-SNAPSHOT</bundle>
-        <bundle>mvn:org.hibernate/hibernate-entitymanager/4.2.1-SNAPSHOT</bundle>
-        <bundle>mvn:org.hibernate/hibernate-osgi/4.2.1-SNAPSHOT</bundle>
+        <bundle>mvn:org.hibernate/hibernate-core/4.3.0-SNAPSHOT</bundle>
+        <bundle>mvn:org.hibernate/hibernate-entitymanager/4.3.0-SNAPSHOT</bundle>
+        <bundle>mvn:org.hibernate/hibernate-osgi/4.3.0-SNAPSHOT</bundle>
         
         <bundle>mvn:org.hibernate/HibernateOSGi_AppManaged/1.0.0</bundle>
 	</feature>
diff --git a/HibernateOSGi_AppManaged/pom.xml b/HibernateOSGi_AppManaged/pom.xml
index 756919e..b7aff87 100644
--- a/HibernateOSGi_AppManaged/pom.xml
+++ b/HibernateOSGi_AppManaged/pom.xml
@@ -8,10 +8,10 @@
 
 	<dependencies>
 		<dependency>
-			<groupId>org.apache.geronimo.specs</groupId>
-			<artifactId>geronimo-jpa_2.0_spec</artifactId>
-			<version>1.1</version>
-		</dependency>
+            <groupId>org.hibernate.javax.persistence</groupId>
+            <artifactId>hibernate-jpa-2.1-api</artifactId>
+            <version>1.0.0-SNAPSHOT</version>
+        </dependency>
 		<dependency>
 			<groupId>org.osgi</groupId>
 			<artifactId>org.osgi.core</artifactId>
@@ -30,12 +30,12 @@
         <dependency>
             <groupId>org.hibernate</groupId>
             <artifactId>hibernate-core</artifactId>
-            <version>4.2.1-SNAPSHOT</version>
+            <version>4.3.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.hibernate</groupId>
             <artifactId>hibernate-entitymanager</artifactId>
-            <version>4.2.1-SNAPSHOT</version>
+            <version>4.3.0-SNAPSHOT</version>
         </dependency>
 		<dependency>
 			<groupId>com.h2database</groupId>
diff --git a/HibernateOSGi_ContainerManaged/features.xml b/HibernateOSGi_ContainerManaged/features.xml
index 9e1493b..9cf210e 100644
--- a/HibernateOSGi_ContainerManaged/features.xml
+++ b/HibernateOSGi_ContainerManaged/features.xml
@@ -18,13 +18,12 @@
         <bundle start-level="30">mvn:org.apache.aries.transaction/org.apache.aries.transaction.manager/1.0.1</bundle>
         
         <!-- JPA -->
-        <!-- <bundle start-level="30">mvn:org.hibernate.javax.persistence/hibernate-jpa-2.1-api/1.0.0-SNAPSHOT</bundle> -->
-        <bundle start-level="30">mvn:org.apache.geronimo.specs/geronimo-jpa_2.0_spec/1.1</bundle>
+        <bundle start-level="30">mvn:org.hibernate.javax.persistence/hibernate-jpa-2.1-api/1.0.0-SNAPSHOT</bundle>
         <bundle start-level="30">mvn:org.apache.aries/org.apache.aries.util/1.0.0</bundle>
-        <bundle start-level="30">mvn:org.apache.aries.jpa/org.apache.aries.jpa.api/1.0.0</bundle>
-        <bundle start-level="30">mvn:org.apache.aries.jpa/org.apache.aries.jpa.blueprint.aries/1.0.0</bundle>
-        <bundle start-level="30">mvn:org.apache.aries.jpa/org.apache.aries.jpa.container/1.0.0</bundle>
-        <bundle start-level="30">mvn:org.apache.aries.jpa/org.apache.aries.jpa.container.context/1.0.1</bundle>
+        <bundle start-level="30">mvn:org.apache.aries.jpa/org.apache.aries.jpa.api/1.0.1-SNAPSHOT</bundle>
+        <bundle start-level="30">mvn:org.apache.aries.jpa/org.apache.aries.jpa.blueprint.aries/1.0.2-SNAPSHOT</bundle>
+        <bundle start-level="30">mvn:org.apache.aries.jpa/org.apache.aries.jpa.container/1.0.1-SNAPSHOT</bundle>
+        <bundle start-level="30">mvn:org.apache.aries.jpa/org.apache.aries.jpa.container.context/1.0.2-SNAPSHOT</bundle>
         
 	    <!-- JNDI -->
         <bundle start-level="30">mvn:org.apache.aries.jndi/org.apache.aries.jndi.api/1.0.0</bundle>
@@ -65,8 +64,8 @@
         <!--<bundle>wrap:mvn:javax.validation/validation-api/1.0.0.GA</bundle>
         <bundle>mvn:org.hibernate/hibernate-validator/4.2.0.Final</bundle>-->
 
-        <bundle>mvn:org.hibernate/hibernate-core/4.2.1-SNAPSHOT</bundle>
-        <bundle>mvn:org.hibernate/hibernate-entitymanager/4.2.1-SNAPSHOT</bundle>
+        <bundle>mvn:org.hibernate/hibernate-core/4.3.0-SNAPSHOT</bundle>
+        <bundle>mvn:org.hibernate/hibernate-entitymanager/4.3.0-SNAPSHOT</bundle>
         
         <!-- TODO: It seems that the persistence unit bundle needs to be started
         before hibernate-osgi.  When the BundleActivator is started,
@@ -76,6 +75,6 @@
         watch for bundles with PUs before registering the persistence provider? -->
         <bundle>mvn:org.hibernate/HibernateOSGi_ContainerManaged/1.0.0</bundle>
         
-        <bundle>mvn:org.hibernate/hibernate-osgi/4.2.1-SNAPSHOT</bundle>
+        <bundle>mvn:org.hibernate/hibernate-osgi/4.3.0-SNAPSHOT</bundle>
 	</feature>
 </features>
diff --git a/HibernateOSGi_ContainerManaged/pom.xml b/HibernateOSGi_ContainerManaged/pom.xml
index 9c4108a..b550e6d 100644
--- a/HibernateOSGi_ContainerManaged/pom.xml
+++ b/HibernateOSGi_ContainerManaged/pom.xml
@@ -8,9 +8,9 @@
 
 	<dependencies>
 		<dependency>
-			<groupId>org.apache.geronimo.specs</groupId>
-			<artifactId>geronimo-jpa_2.0_spec</artifactId>
-			<version>1.1</version>
+			<groupId>org.hibernate.javax.persistence</groupId>
+            <artifactId>hibernate-jpa-2.1-api</artifactId>
+            <version>1.0.0-SNAPSHOT</version>
 		</dependency>
         <dependency>
             <groupId>org.osgi</groupId>
@@ -51,6 +51,7 @@
                             org.apache.karaf.shell.commands,
                             org.hibernate.proxy,
                             javassist.util.proxy,
+                            javax.persistence;version="[1.0.0,2.1.0]",
                             * 
 						</Import-Package>
 						<Meta-Persistence>META-INF/persistence.xml</Meta-Persistence>

From deb9566b9cdc6c20ed1fbb02dddc6ebba795cfb8 Mon Sep 17 00:00:00 2001
From: Brett Meyer <brett@3riverdev.com>
Date: Wed, 10 Apr 2013 14:27:30 -0400
Subject: [PATCH 2/8] Added envers test

---
 HibernateOSGi_AppManaged/features.xml         |  1 +
 HibernateOSGi_AppManaged/pom.xml              |  5 ++
 .../hibernate/osgitest/DataPointService.java  |  7 +++
 .../osgitest/DataPointServiceImpl.java        | 30 ++++++++++++
 .../osgitest/command/GetRevisionsCommand.java | 48 +++++++++++++++++++
 .../osgitest/command/UpdateCommand.java       | 47 ++++++++++++++++++
 .../hibernate/osgitest/entity/DataPoint.java  |  3 ++
 .../OSGI-INF/blueprint/blueprint.xml          | 10 ++++
 8 files changed, 151 insertions(+)
 create mode 100644 HibernateOSGi_AppManaged/src/main/java/org/hibernate/osgitest/command/GetRevisionsCommand.java
 create mode 100644 HibernateOSGi_AppManaged/src/main/java/org/hibernate/osgitest/command/UpdateCommand.java

diff --git a/HibernateOSGi_AppManaged/features.xml b/HibernateOSGi_AppManaged/features.xml
index 373c140..c340ac7 100644
--- a/HibernateOSGi_AppManaged/features.xml
+++ b/HibernateOSGi_AppManaged/features.xml
@@ -43,6 +43,7 @@
 
         <bundle>mvn:org.hibernate/hibernate-core/4.3.0-SNAPSHOT</bundle>
         <bundle>mvn:org.hibernate/hibernate-entitymanager/4.3.0-SNAPSHOT</bundle>
+        <bundle>mvn:org.hibernate/hibernate-envers/4.3.0-SNAPSHOT</bundle>
         <bundle>mvn:org.hibernate/hibernate-osgi/4.3.0-SNAPSHOT</bundle>
         
         <bundle>mvn:org.hibernate/HibernateOSGi_AppManaged/1.0.0</bundle>
diff --git a/HibernateOSGi_AppManaged/pom.xml b/HibernateOSGi_AppManaged/pom.xml
index b7aff87..cea2265 100644
--- a/HibernateOSGi_AppManaged/pom.xml
+++ b/HibernateOSGi_AppManaged/pom.xml
@@ -36,6 +36,11 @@
             <groupId>org.hibernate</groupId>
             <artifactId>hibernate-entitymanager</artifactId>
             <version>4.3.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.hibernate</groupId>
+            <artifactId>hibernate-envers</artifactId>
+            <version>4.3.0-SNAPSHOT</version>
         </dependency>
 		<dependency>
 			<groupId>com.h2database</groupId>
diff --git a/HibernateOSGi_AppManaged/src/main/java/org/hibernate/osgitest/DataPointService.java b/HibernateOSGi_AppManaged/src/main/java/org/hibernate/osgitest/DataPointService.java
index 46ccc92..e6e2609 100644
--- a/HibernateOSGi_AppManaged/src/main/java/org/hibernate/osgitest/DataPointService.java
+++ b/HibernateOSGi_AppManaged/src/main/java/org/hibernate/osgitest/DataPointService.java
@@ -21,6 +21,7 @@
 package org.hibernate.osgitest;
 
 import java.util.List;
+import java.util.Map;
 
 import org.hibernate.osgitest.entity.DataPoint;
 
@@ -31,8 +32,14 @@ public interface DataPointService {
 
 	public void add(DataPoint dp);
 
+	public void update(DataPoint dp);
+
+	public DataPoint get(long id);
+
 	public List<DataPoint> getAll();
 
+	public Map<Number, DataPoint> getRevisions(long id);
+
 	public void deleteAll();
 
 	public void addJPA(DataPoint dp);
diff --git a/HibernateOSGi_AppManaged/src/main/java/org/hibernate/osgitest/DataPointServiceImpl.java b/HibernateOSGi_AppManaged/src/main/java/org/hibernate/osgitest/DataPointServiceImpl.java
index f8a55cd..c423823 100644
--- a/HibernateOSGi_AppManaged/src/main/java/org/hibernate/osgitest/DataPointServiceImpl.java
+++ b/HibernateOSGi_AppManaged/src/main/java/org/hibernate/osgitest/DataPointServiceImpl.java
@@ -20,11 +20,16 @@
  */
 package org.hibernate.osgitest;
 
+import java.util.HashSet;
 import java.util.List;
+import java.util.Map;
 
 import javax.persistence.EntityManager;
 
 import org.hibernate.Session;
+import org.hibernate.criterion.Restrictions;
+import org.hibernate.envers.AuditReader;
+import org.hibernate.envers.AuditReaderFactory;
 import org.hibernate.osgitest.entity.DataPoint;
 
 /**
@@ -40,6 +45,24 @@ public void add(DataPoint dp) {
 		s.close();
 	}
 
+	public void update(DataPoint dp) {
+		Session s = HibernateUtil.getSession();
+		s.getTransaction().begin();
+		s.update( dp );
+		s.getTransaction().commit();
+		s.close();
+	}
+
+	public DataPoint get(long id) {
+		Session s = HibernateUtil.getSession();
+		s.getTransaction().begin();
+		DataPoint dp = (DataPoint) s.createCriteria( DataPoint.class ).add(
+				Restrictions.eq( "id", id ) ).uniqueResult();
+		s.getTransaction().commit();
+		s.close();
+		return dp;
+	}
+
 	public List<DataPoint> getAll() {
 		Session s = HibernateUtil.getSession();
 		s.getTransaction().begin();
@@ -48,6 +71,13 @@ public List<DataPoint> getAll() {
 		s.close();
 		return list;
 	}
+	
+	public Map<Number, DataPoint> getRevisions(long id) {
+		EntityManager em = HibernateUtil.getEntityManager();
+		AuditReader reader = AuditReaderFactory.get(em);
+		List<Number> revisionNums = reader.getRevisions( DataPoint.class, id );
+		return reader.findRevisions( DataPoint.class, new HashSet<Number>(revisionNums) );
+	}
 
 	public void deleteAll() {
 		Session s = HibernateUtil.getSession();
diff --git a/HibernateOSGi_AppManaged/src/main/java/org/hibernate/osgitest/command/GetRevisionsCommand.java b/HibernateOSGi_AppManaged/src/main/java/org/hibernate/osgitest/command/GetRevisionsCommand.java
new file mode 100644
index 0000000..ba7d731
--- /dev/null
+++ b/HibernateOSGi_AppManaged/src/main/java/org/hibernate/osgitest/command/GetRevisionsCommand.java
@@ -0,0 +1,48 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.hibernate.osgitest.command;
+
+import java.util.Map;
+
+import org.apache.felix.gogo.commands.Action;
+import org.apache.felix.gogo.commands.Argument;
+import org.apache.felix.gogo.commands.Command;
+import org.apache.felix.service.command.CommandSession;
+import org.hibernate.osgitest.DataPointService;
+import org.hibernate.osgitest.entity.DataPoint;
+
+@Command(scope = "dp", name = "getRevisions")
+public class GetRevisionsCommand implements Action {
+	@Argument(index=0, name="Id", required=true, description="Id", multiValued=false)
+    String id;
+	
+    private DataPointService dpService;
+    
+    public void setDpService(DataPointService dpService) {
+        this.dpService = dpService;
+    }
+
+    public Object execute(CommandSession session) throws Exception {
+    	Map<Number, DataPoint> revisions = dpService.getRevisions(Long.valueOf( id ));
+        for (Number revisionNum : revisions.keySet()) {
+        	DataPoint dp = revisions.get( revisionNum );
+            System.out.println(revisionNum + ": " + dp.getId() + ", " + dp.getName());
+        }
+        return null;
+    }
+
+}
diff --git a/HibernateOSGi_AppManaged/src/main/java/org/hibernate/osgitest/command/UpdateCommand.java b/HibernateOSGi_AppManaged/src/main/java/org/hibernate/osgitest/command/UpdateCommand.java
new file mode 100644
index 0000000..f694967
--- /dev/null
+++ b/HibernateOSGi_AppManaged/src/main/java/org/hibernate/osgitest/command/UpdateCommand.java
@@ -0,0 +1,47 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.hibernate.osgitest.command;
+
+import org.apache.felix.gogo.commands.Action;
+import org.apache.felix.gogo.commands.Argument;
+import org.apache.felix.gogo.commands.Command;
+import org.apache.felix.service.command.CommandSession;
+import org.hibernate.osgitest.DataPointService;
+import org.hibernate.osgitest.entity.DataPoint;
+
+@Command(scope = "dp", name = "update")
+public class UpdateCommand implements Action {
+    @Argument(index=0, name="Id", required=true, description="Id", multiValued=false)
+    String id;
+    
+    @Argument(index=1, name="Name", required=true, description="Name", multiValued=false)
+    String name;
+    
+    private DataPointService dpService;
+    
+    public void setDpService(DataPointService dpService) {
+        this.dpService = dpService;
+    }
+
+    public Object execute(CommandSession session) throws Exception {
+        DataPoint dp = dpService.get( Long.valueOf( id ) );
+        dp.setName( name );
+        dpService.update( dp );
+        return null;
+    }
+
+}
diff --git a/HibernateOSGi_AppManaged/src/main/java/org/hibernate/osgitest/entity/DataPoint.java b/HibernateOSGi_AppManaged/src/main/java/org/hibernate/osgitest/entity/DataPoint.java
index 2a566d8..6f7126f 100644
--- a/HibernateOSGi_AppManaged/src/main/java/org/hibernate/osgitest/entity/DataPoint.java
+++ b/HibernateOSGi_AppManaged/src/main/java/org/hibernate/osgitest/entity/DataPoint.java
@@ -24,10 +24,13 @@
 import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
 
+import org.hibernate.envers.Audited;
+
 /**
  * @author Brett Meyer
  */
 @Entity
+@Audited
 public class DataPoint {
 	@Id
 	@GeneratedValue
diff --git a/HibernateOSGi_AppManaged/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/HibernateOSGi_AppManaged/src/main/resources/OSGI-INF/blueprint/blueprint.xml
index 8ded25c..b144069 100644
--- a/HibernateOSGi_AppManaged/src/main/resources/OSGI-INF/blueprint/blueprint.xml
+++ b/HibernateOSGi_AppManaged/src/main/resources/OSGI-INF/blueprint/blueprint.xml
@@ -31,11 +31,21 @@
                 <property name="dpService" ref="dpService"/>
             </action>
         </command>
+        <command name="dp:update">
+            <action class="org.hibernate.osgitest.command.UpdateCommand">
+                <property name="dpService" ref="dpService"/>
+            </action>
+        </command>
         <command name="dp:getAll">
             <action class="org.hibernate.osgitest.command.GetAllCommand">
                 <property name="dpService" ref="dpService"/>
             </action>
         </command>
+        <command name="dp:getRevisions">
+            <action class="org.hibernate.osgitest.command.GetRevisionsCommand">
+                <property name="dpService" ref="dpService"/>
+            </action>
+        </command>
         <command name="dp:deleteAll">
             <action class="org.hibernate.osgitest.command.DeleteAllCommand">
                 <property name="dpService" ref="dpService"/>

From e4a47e09de9bc81b0eb4bfe1ed7d4398a7b228bd Mon Sep 17 00:00:00 2001
From: Brett Meyer <brett@3riverdev.com>
Date: Mon, 22 Apr 2013 13:50:52 -0400
Subject: [PATCH 3/8] 4.3.1 osgi core

---
 HibernateOSGi_AppManaged/pom.xml       | 2 +-
 HibernateOSGi_ContainerManaged/pom.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/HibernateOSGi_AppManaged/pom.xml b/HibernateOSGi_AppManaged/pom.xml
index cea2265..b788d45 100644
--- a/HibernateOSGi_AppManaged/pom.xml
+++ b/HibernateOSGi_AppManaged/pom.xml
@@ -15,7 +15,7 @@
 		<dependency>
 			<groupId>org.osgi</groupId>
 			<artifactId>org.osgi.core</artifactId>
-			<version>4.3.0</version>
+			<version>4.3.1</version>
 		</dependency>
         <dependency>
             <groupId>org.osgi</groupId>
diff --git a/HibernateOSGi_ContainerManaged/pom.xml b/HibernateOSGi_ContainerManaged/pom.xml
index b550e6d..bc7d877 100644
--- a/HibernateOSGi_ContainerManaged/pom.xml
+++ b/HibernateOSGi_ContainerManaged/pom.xml
@@ -15,7 +15,7 @@
         <dependency>
             <groupId>org.osgi</groupId>
             <artifactId>org.osgi.core</artifactId>
-            <version>4.3.0</version>
+            <version>4.3.1</version>
         </dependency>
         <dependency>
             <groupId>org.osgi</groupId>

From a25fd0a05cc11e38a737384ac22c6a60db6b35e0 Mon Sep 17 00:00:00 2001
From: Brett Meyer <brmeyer@redhat.com>
Date: Mon, 29 Apr 2013 11:16:44 -0400
Subject: [PATCH 4/8] Added C3P0 test

---
 HibernateOSGi_AppManaged/features.xml                    | 3 +++
 .../src/main/resources/META-INF/persistence.xml          | 9 +++++++++
 .../src/main/resources/hibernate.cfg.xml                 | 9 +++++++++
 3 files changed, 21 insertions(+)

diff --git a/HibernateOSGi_AppManaged/features.xml b/HibernateOSGi_AppManaged/features.xml
index c340ac7..2904dae 100644
--- a/HibernateOSGi_AppManaged/features.xml
+++ b/HibernateOSGi_AppManaged/features.xml
@@ -28,6 +28,8 @@
 		
 		<!-- These do not natively support OSGi, so wrap with BND. -->
 		<bundle>wrap:mvn:org.jboss/jandex/1.1.0.Alpha1</bundle>
+		<!-- Optional.  Needed to test C3P0 connection pools. -->
+		<!-- <bundle>wrap:mvn:c3p0/c3p0/0.9.1</bundle> -->
 		
         <bundle>wrap:mvn:org.hibernate.common/hibernate-commons-annotations/4.0.1.Final</bundle>
         <bundle>mvn:com.fasterxml/classmate/0.5.4</bundle>
@@ -43,6 +45,7 @@
 
         <bundle>mvn:org.hibernate/hibernate-core/4.3.0-SNAPSHOT</bundle>
         <bundle>mvn:org.hibernate/hibernate-entitymanager/4.3.0-SNAPSHOT</bundle>
+        <bundle>mvn:org.hibernate/hibernate-c3p0/4.3.0-SNAPSHOT</bundle>
         <bundle>mvn:org.hibernate/hibernate-envers/4.3.0-SNAPSHOT</bundle>
         <bundle>mvn:org.hibernate/hibernate-osgi/4.3.0-SNAPSHOT</bundle>
         
diff --git a/HibernateOSGi_AppManaged/src/main/resources/META-INF/persistence.xml b/HibernateOSGi_AppManaged/src/main/resources/META-INF/persistence.xml
index 74ede90..d72fa87 100644
--- a/HibernateOSGi_AppManaged/src/main/resources/META-INF/persistence.xml
+++ b/HibernateOSGi_AppManaged/src/main/resources/META-INF/persistence.xml
@@ -13,6 +13,15 @@
             <property name="hibernate.connection.username" value="sa"/>
             <property name="hibernate.connection.password" value=""/>
             <property name="hibernate.hbm2ddl.auto" value="create-drop"/>
+            
+            <!-- <property name="hibernate.connection.pool_size" value="5"/>
+			<property name="hibernate.c3p0.min_size" value="50"/>
+			<property name="hibernate.c3p0.max_size" value="800"/>
+			<property name="hibernate.c3p0.max_statements" value="50"/>
+			<property name="hibernate.jdbc.batch_size" value="10"/>
+			<property name="hibernate.c3p0.timeout" value="300"/>
+			<property name="hibernate.c3p0.idle_test_period" value="3000"/>
+			<property name="hibernate.c3p0.testConnectionOnCheckout" value="true"/> -->
         </properties>
     </persistence-unit>
 </persistence>
\ No newline at end of file
diff --git a/HibernateOSGi_AppManaged/src/main/resources/hibernate.cfg.xml b/HibernateOSGi_AppManaged/src/main/resources/hibernate.cfg.xml
index a0bdf1e..732016b 100644
--- a/HibernateOSGi_AppManaged/src/main/resources/hibernate.cfg.xml
+++ b/HibernateOSGi_AppManaged/src/main/resources/hibernate.cfg.xml
@@ -11,6 +11,15 @@
         <property name="hibernate.connection.password"></property>
         <property name="hibernate.dialect">org.hibernate.dialect.H2Dialect</property>
         <property name="hibernate.hbm2ddl.auto">create-drop</property>
+        
+        <!-- <property name="hibernate.connection.pool_size">5</property>
+		<property name="hibernate.c3p0.min_size">50</property>
+		<property name="hibernate.c3p0.max_size">800</property>
+		<property name="hibernate.c3p0.max_statements">50</property>
+		<property name="hibernate.jdbc.batch_size">10</property>
+		<property name="hibernate.c3p0.timeout">300</property>
+		<property name="hibernate.c3p0.idle_test_period">3000</property>
+		<property name="hibernate.c3p0.testConnectionOnCheckout">true</property> -->
     
         <mapping class="org.hibernate.osgitest.entity.DataPoint"/>
     </session-factory>

From 2978503501a8f247967b5253778e24cd80bd6156 Mon Sep 17 00:00:00 2001
From: Brett Meyer <brmeyer@redhat.com>
Date: Mon, 29 Apr 2013 11:47:37 -0400
Subject: [PATCH 5/8] proxool test

---
 HibernateOSGi_AppManaged/features.xml                      | 5 ++++-
 .../src/main/resources/hibernate.cfg.xml                   | 6 ++++++
 .../src/main/resources/pool-one.properties                 | 7 +++++++
 3 files changed, 17 insertions(+), 1 deletion(-)
 create mode 100644 HibernateOSGi_AppManaged/src/main/resources/pool-one.properties

diff --git a/HibernateOSGi_AppManaged/features.xml b/HibernateOSGi_AppManaged/features.xml
index 2904dae..5ab1f0f 100644
--- a/HibernateOSGi_AppManaged/features.xml
+++ b/HibernateOSGi_AppManaged/features.xml
@@ -30,6 +30,8 @@
 		<bundle>wrap:mvn:org.jboss/jandex/1.1.0.Alpha1</bundle>
 		<!-- Optional.  Needed to test C3P0 connection pools. -->
 		<!-- <bundle>wrap:mvn:c3p0/c3p0/0.9.1</bundle> -->
+		<!-- Optional.  Needed to test Proxool connection pools. -->
+		<!-- <bundle>wrap:mvn:proxool/proxool/0.8.3</bundle> -->
 		
         <bundle>wrap:mvn:org.hibernate.common/hibernate-commons-annotations/4.0.1.Final</bundle>
         <bundle>mvn:com.fasterxml/classmate/0.5.4</bundle>
@@ -45,7 +47,8 @@
 
         <bundle>mvn:org.hibernate/hibernate-core/4.3.0-SNAPSHOT</bundle>
         <bundle>mvn:org.hibernate/hibernate-entitymanager/4.3.0-SNAPSHOT</bundle>
-        <bundle>mvn:org.hibernate/hibernate-c3p0/4.3.0-SNAPSHOT</bundle>
+        <!-- <bundle>mvn:org.hibernate/hibernate-c3p0/4.3.0-SNAPSHOT</bundle> -->
+        <!-- <bundle>mvn:org.hibernate/hibernate-proxool/4.3.0-SNAPSHOT</bundle> -->
         <bundle>mvn:org.hibernate/hibernate-envers/4.3.0-SNAPSHOT</bundle>
         <bundle>mvn:org.hibernate/hibernate-osgi/4.3.0-SNAPSHOT</bundle>
         
diff --git a/HibernateOSGi_AppManaged/src/main/resources/hibernate.cfg.xml b/HibernateOSGi_AppManaged/src/main/resources/hibernate.cfg.xml
index 732016b..4509069 100644
--- a/HibernateOSGi_AppManaged/src/main/resources/hibernate.cfg.xml
+++ b/HibernateOSGi_AppManaged/src/main/resources/hibernate.cfg.xml
@@ -20,6 +20,12 @@
 		<property name="hibernate.c3p0.timeout">300</property>
 		<property name="hibernate.c3p0.idle_test_period">3000</property>
 		<property name="hibernate.c3p0.testConnectionOnCheckout">true</property> -->
+		
+		<!-- <property name="hibernate.connection.pool_size">5</property>
+		<property name="hibernate.jdbc.batch_size">10</property>
+		<property name="hibernate.connection.provider_class">proxool</property>
+		<property name="hibernate.proxool.properties">pool-one.properties</property>
+		<property name="hibernate.proxool.pool_alias">pool-one</property> -->
     
         <mapping class="org.hibernate.osgitest.entity.DataPoint"/>
     </session-factory>
diff --git a/HibernateOSGi_AppManaged/src/main/resources/pool-one.properties b/HibernateOSGi_AppManaged/src/main/resources/pool-one.properties
new file mode 100644
index 0000000..abaee38
--- /dev/null
+++ b/HibernateOSGi_AppManaged/src/main/resources/pool-one.properties
@@ -0,0 +1,7 @@
+jdbc-0.proxool.alias=pool-one
+jdbc-0.proxool.driver-url=jdbc:h2:mem:db1;DB_CLOSE_DELAY=-1;MVCC=TRUE
+jdbc-0.proxool.driver-class=org.h2.Driver
+jdbc-0.user=sa
+jdbc-0.password=
+jdbc-0.proxool.maximum-connection-count=2
+jdbc-0.proxool.house-keeping-test-sql=select CURRENT_DATE
\ No newline at end of file

From de42a89bd3eb07a5a32796cccee447e6c09c012a Mon Sep 17 00:00:00 2001
From: Brett Meyer <brett@3riverdev.com>
Date: Tue, 30 Apr 2013 23:34:29 -0400
Subject: [PATCH 6/8] Updated for Hibernate ORM 4.2.2-SNAPSHOT.  Added envers
 test and numerous commands to AppManaged. Conflicts: 
 HibernateOSGi_AppManaged/features.xml 	HibernateOSGi_AppManaged/pom.xml 
 HibernateOSGi_ContainerManaged/features.xml

---
 .../hibernate/osgitest/DataPointService.java  |  9 +++-
 .../osgitest/DataPointServiceImpl.java        | 33 +++++++++++--
 .../osgitest/command/GetRevisionsCommand.java |  8 ++--
 .../command/GetRevisionsCommandJPA.java       | 48 +++++++++++++++++++
 .../osgitest/command/UpdateCommandJPA.java    | 47 ++++++++++++++++++
 .../OSGI-INF/blueprint/blueprint.xml          | 10 ++++
 6 files changed, 146 insertions(+), 9 deletions(-)
 create mode 100644 HibernateOSGi_AppManaged/src/main/java/org/hibernate/osgitest/command/GetRevisionsCommandJPA.java
 create mode 100644 HibernateOSGi_AppManaged/src/main/java/org/hibernate/osgitest/command/UpdateCommandJPA.java

diff --git a/HibernateOSGi_AppManaged/src/main/java/org/hibernate/osgitest/DataPointService.java b/HibernateOSGi_AppManaged/src/main/java/org/hibernate/osgitest/DataPointService.java
index e6e2609..7017fdb 100644
--- a/HibernateOSGi_AppManaged/src/main/java/org/hibernate/osgitest/DataPointService.java
+++ b/HibernateOSGi_AppManaged/src/main/java/org/hibernate/osgitest/DataPointService.java
@@ -23,6 +23,7 @@
 import java.util.List;
 import java.util.Map;
 
+import org.hibernate.envers.DefaultRevisionEntity;
 import org.hibernate.osgitest.entity.DataPoint;
 
 /**
@@ -38,13 +39,19 @@ public interface DataPointService {
 
 	public List<DataPoint> getAll();
 
-	public Map<Number, DataPoint> getRevisions(long id);
+	public Map<Number, DefaultRevisionEntity> getRevisions(long id);
 
 	public void deleteAll();
 
 	public void addJPA(DataPoint dp);
 
+	public void updateJPA(DataPoint dp);
+
+	public DataPoint getJPA(long id);
+
 	public List<DataPoint> getAllJPA();
 
+	public Map<Number, DefaultRevisionEntity> getRevisionsJPA(long id);
+
 	public void deleteAllJPA();
 }
diff --git a/HibernateOSGi_AppManaged/src/main/java/org/hibernate/osgitest/DataPointServiceImpl.java b/HibernateOSGi_AppManaged/src/main/java/org/hibernate/osgitest/DataPointServiceImpl.java
index c423823..0b463ca 100644
--- a/HibernateOSGi_AppManaged/src/main/java/org/hibernate/osgitest/DataPointServiceImpl.java
+++ b/HibernateOSGi_AppManaged/src/main/java/org/hibernate/osgitest/DataPointServiceImpl.java
@@ -30,6 +30,7 @@
 import org.hibernate.criterion.Restrictions;
 import org.hibernate.envers.AuditReader;
 import org.hibernate.envers.AuditReaderFactory;
+import org.hibernate.envers.DefaultRevisionEntity;
 import org.hibernate.osgitest.entity.DataPoint;
 
 /**
@@ -72,11 +73,11 @@ public List<DataPoint> getAll() {
 		return list;
 	}
 	
-	public Map<Number, DataPoint> getRevisions(long id) {
-		EntityManager em = HibernateUtil.getEntityManager();
-		AuditReader reader = AuditReaderFactory.get(em);
+	public Map<Number, DefaultRevisionEntity> getRevisions(long id) {
+		Session s = HibernateUtil.getSession();
+		AuditReader reader = AuditReaderFactory.get(s);
 		List<Number> revisionNums = reader.getRevisions( DataPoint.class, id );
-		return reader.findRevisions( DataPoint.class, new HashSet<Number>(revisionNums) );
+		return reader.findRevisions( DefaultRevisionEntity.class, new HashSet<Number>(revisionNums) );
 	}
 
 	public void deleteAll() {
@@ -95,6 +96,23 @@ public void addJPA(DataPoint dp) {
 		em.close();
 	}
 
+	public void updateJPA(DataPoint dp) {
+		EntityManager em = HibernateUtil.getEntityManager();
+		em.getTransaction().begin();
+		em.merge( dp );
+		em.getTransaction().commit();
+		em.close();
+	}
+
+	public DataPoint getJPA(long id) {
+		EntityManager em = HibernateUtil.getEntityManager();
+		em.getTransaction().begin();
+		DataPoint dp = (DataPoint) em.createQuery( "from DataPoint dp where dp.id=" + id ).getSingleResult();
+		em.getTransaction().commit();
+		em.close();
+		return dp;
+	}
+
 	public List<DataPoint> getAllJPA() {
 		EntityManager em = HibernateUtil.getEntityManager();
 		em.getTransaction().begin();
@@ -103,6 +121,13 @@ public List<DataPoint> getAllJPA() {
 		em.close();
 		return list;
 	}
+	
+	public Map<Number, DefaultRevisionEntity> getRevisionsJPA(long id) {
+		EntityManager em = HibernateUtil.getEntityManager();
+		AuditReader reader = AuditReaderFactory.get(em);
+		List<Number> revisionNums = reader.getRevisions( DataPoint.class, id );
+		return reader.findRevisions( DefaultRevisionEntity.class, new HashSet<Number>(revisionNums) );
+	}
 
 	public void deleteAllJPA() {
 		EntityManager em = HibernateUtil.getEntityManager();
diff --git a/HibernateOSGi_AppManaged/src/main/java/org/hibernate/osgitest/command/GetRevisionsCommand.java b/HibernateOSGi_AppManaged/src/main/java/org/hibernate/osgitest/command/GetRevisionsCommand.java
index ba7d731..b4573f6 100644
--- a/HibernateOSGi_AppManaged/src/main/java/org/hibernate/osgitest/command/GetRevisionsCommand.java
+++ b/HibernateOSGi_AppManaged/src/main/java/org/hibernate/osgitest/command/GetRevisionsCommand.java
@@ -22,8 +22,8 @@
 import org.apache.felix.gogo.commands.Argument;
 import org.apache.felix.gogo.commands.Command;
 import org.apache.felix.service.command.CommandSession;
+import org.hibernate.envers.DefaultRevisionEntity;
 import org.hibernate.osgitest.DataPointService;
-import org.hibernate.osgitest.entity.DataPoint;
 
 @Command(scope = "dp", name = "getRevisions")
 public class GetRevisionsCommand implements Action {
@@ -37,10 +37,10 @@ public void setDpService(DataPointService dpService) {
     }
 
     public Object execute(CommandSession session) throws Exception {
-    	Map<Number, DataPoint> revisions = dpService.getRevisions(Long.valueOf( id ));
+    	Map<Number, DefaultRevisionEntity> revisions = dpService.getRevisions(Long.valueOf( id ));
         for (Number revisionNum : revisions.keySet()) {
-        	DataPoint dp = revisions.get( revisionNum );
-            System.out.println(revisionNum + ": " + dp.getId() + ", " + dp.getName());
+        	DefaultRevisionEntity dre = revisions.get( revisionNum );
+            System.out.println(revisionNum + ": " + dre.getId() + ", " + dre.getTimestamp());
         }
         return null;
     }
diff --git a/HibernateOSGi_AppManaged/src/main/java/org/hibernate/osgitest/command/GetRevisionsCommandJPA.java b/HibernateOSGi_AppManaged/src/main/java/org/hibernate/osgitest/command/GetRevisionsCommandJPA.java
new file mode 100644
index 0000000..ec0e8ec
--- /dev/null
+++ b/HibernateOSGi_AppManaged/src/main/java/org/hibernate/osgitest/command/GetRevisionsCommandJPA.java
@@ -0,0 +1,48 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.hibernate.osgitest.command;
+
+import java.util.Map;
+
+import org.apache.felix.gogo.commands.Action;
+import org.apache.felix.gogo.commands.Argument;
+import org.apache.felix.gogo.commands.Command;
+import org.apache.felix.service.command.CommandSession;
+import org.hibernate.envers.DefaultRevisionEntity;
+import org.hibernate.osgitest.DataPointService;
+
+@Command(scope = "dp", name = "getRevisionsJPA")
+public class GetRevisionsCommandJPA implements Action {
+	@Argument(index=0, name="Id", required=true, description="Id", multiValued=false)
+    String id;
+	
+    private DataPointService dpService;
+    
+    public void setDpService(DataPointService dpService) {
+        this.dpService = dpService;
+    }
+
+    public Object execute(CommandSession session) throws Exception {
+    	Map<Number, DefaultRevisionEntity> revisions = dpService.getRevisionsJPA(Long.valueOf( id ));
+        for (Number revisionNum : revisions.keySet()) {
+        	DefaultRevisionEntity dre = revisions.get( revisionNum );
+            System.out.println(revisionNum + ": " + dre.getId() + ", " + dre.getTimestamp());
+        }
+        return null;
+    }
+
+}
diff --git a/HibernateOSGi_AppManaged/src/main/java/org/hibernate/osgitest/command/UpdateCommandJPA.java b/HibernateOSGi_AppManaged/src/main/java/org/hibernate/osgitest/command/UpdateCommandJPA.java
new file mode 100644
index 0000000..a454a9e
--- /dev/null
+++ b/HibernateOSGi_AppManaged/src/main/java/org/hibernate/osgitest/command/UpdateCommandJPA.java
@@ -0,0 +1,47 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.hibernate.osgitest.command;
+
+import org.apache.felix.gogo.commands.Action;
+import org.apache.felix.gogo.commands.Argument;
+import org.apache.felix.gogo.commands.Command;
+import org.apache.felix.service.command.CommandSession;
+import org.hibernate.osgitest.DataPointService;
+import org.hibernate.osgitest.entity.DataPoint;
+
+@Command(scope = "dp", name = "updateJPA")
+public class UpdateCommandJPA implements Action {
+    @Argument(index=0, name="Id", required=true, description="Id", multiValued=false)
+    String id;
+    
+    @Argument(index=1, name="Name", required=true, description="Name", multiValued=false)
+    String name;
+    
+    private DataPointService dpService;
+    
+    public void setDpService(DataPointService dpService) {
+        this.dpService = dpService;
+    }
+
+    public Object execute(CommandSession session) throws Exception {
+        DataPoint dp = dpService.getJPA( Long.valueOf( id ) );
+        dp.setName( name );
+        dpService.updateJPA( dp );
+        return null;
+    }
+
+}
diff --git a/HibernateOSGi_AppManaged/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/HibernateOSGi_AppManaged/src/main/resources/OSGI-INF/blueprint/blueprint.xml
index b144069..b0595bd 100644
--- a/HibernateOSGi_AppManaged/src/main/resources/OSGI-INF/blueprint/blueprint.xml
+++ b/HibernateOSGi_AppManaged/src/main/resources/OSGI-INF/blueprint/blueprint.xml
@@ -57,11 +57,21 @@
                 <property name="dpService" ref="dpService"/>
             </action>
         </command>
+        <command name="dp:updateJPA">
+            <action class="org.hibernate.osgitest.command.UpdateCommandJPA">
+                <property name="dpService" ref="dpService"/>
+            </action>
+        </command>
         <command name="dp:getAllJPA">
             <action class="org.hibernate.osgitest.command.GetAllCommandJPA">
                 <property name="dpService" ref="dpService"/>
             </action>
         </command>
+        <command name="dp:getRevisionsJPA">
+            <action class="org.hibernate.osgitest.command.GetRevisionsCommandJPA">
+                <property name="dpService" ref="dpService"/>
+            </action>
+        </command>
         <command name="dp:deleteAllJPA">
             <action class="org.hibernate.osgitest.command.DeleteAllCommandJPA">
                 <property name="dpService" ref="dpService"/>

From 9db4b7f6a70cd6b699f1568767240c68f3fda457 Mon Sep 17 00:00:00 2001
From: Brett Meyer <brett@3riverdev.com>
Date: Wed, 1 May 2013 00:30:10 -0400
Subject: [PATCH 7/8] Updated AppManaged for JPA 2.1

---
 HibernateOSGi_AppManaged/pom.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/HibernateOSGi_AppManaged/pom.xml b/HibernateOSGi_AppManaged/pom.xml
index b788d45..19ed91c 100644
--- a/HibernateOSGi_AppManaged/pom.xml
+++ b/HibernateOSGi_AppManaged/pom.xml
@@ -76,6 +76,7 @@
                             org.hibernate.service,
                             org.hibernate.proxy,
                             javassist.util.proxy,
+                            javax.persistence;version="[1.0.0,2.1.0]",
                             * 
 						</Import-Package>
 					</instructions>

From 3d83dbbf0b4b662546ac7474577ff0b75e8a4f0b Mon Sep 17 00:00:00 2001
From: Brett Meyer <brett@3riverdev.com>
Date: Wed, 1 May 2013 14:28:16 -0400
Subject: [PATCH 8/8] Added ehcache and infinispan 2lc tests

---
 HibernateOSGi_AppManaged/features.xml         |  18 ++-
 .../main/resources/META-INF/persistence.xml   |   9 --
 .../src/main/resources/ehcache.xml            | 111 ++++++++++++++++++
 .../src/main/resources/hibernate.cfg.xml      |  13 ++
 4 files changed, 140 insertions(+), 11 deletions(-)
 create mode 100644 HibernateOSGi_AppManaged/src/main/resources/ehcache.xml

diff --git a/HibernateOSGi_AppManaged/features.xml b/HibernateOSGi_AppManaged/features.xml
index 5ab1f0f..f900842 100644
--- a/HibernateOSGi_AppManaged/features.xml
+++ b/HibernateOSGi_AppManaged/features.xml
@@ -27,13 +27,15 @@
 		<bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.dom4j/1.6.1_5</bundle>
 		
 		<!-- These do not natively support OSGi, so wrap with BND. -->
+        <bundle>wrap:mvn:org.hibernate.common/hibernate-commons-annotations/4.0.1.Final</bundle>
 		<bundle>wrap:mvn:org.jboss/jandex/1.1.0.Alpha1</bundle>
 		<!-- Optional.  Needed to test C3P0 connection pools. -->
 		<!-- <bundle>wrap:mvn:c3p0/c3p0/0.9.1</bundle> -->
 		<!-- Optional.  Needed to test Proxool connection pools. -->
 		<!-- <bundle>wrap:mvn:proxool/proxool/0.8.3</bundle> -->
+		<!-- Optional.  Needed to test ehcache 2lc. -->
+		<!-- <bundle>wrap:mvn:net.sf.ehcache/ehcache-core/2.4.3</bundle> -->
 		
-        <bundle>wrap:mvn:org.hibernate.common/hibernate-commons-annotations/4.0.1.Final</bundle>
         <bundle>mvn:com.fasterxml/classmate/0.5.4</bundle>
         <bundle>mvn:org.jboss.logging/jboss-logging/3.1.0.GA</bundle>
         
@@ -44,12 +46,24 @@
         <!-- hibernate-validator is optional. -->
         <!--<bundle>wrap:mvn:javax.validation/validation-api/1.0.0.GA</bundle>
         <bundle>mvn:org.hibernate/hibernate-validator/4.2.0.Final</bundle>-->
+        
+		<!-- Optional.  Needed to test infinispan 2lc. -->
+		<!-- IMPORTANT: Infinispan requires the JRE sun.misc package.  You
+		MUST enable this in your OSGi container.  For Karaf, add
+		"org.osgi.framework.system.packages.extra=sun.misc" to etc/config.properties -->
+		<!-- <bundle>wrap:mvn:org.jboss.marshalling/jboss-marshalling/1.3.17.GA</bundle>
+		<bundle>wrap:mvn:org.jboss.marshalling/jboss-marshalling-river/1.3.17.GA</bundle>
+		<bundle>wrap:mvn:org.jboss/staxmapper/1.1.0.Final</bundle>
+		<bundle>mvn:org.jgroups/jgroups/3.2.8.Final</bundle>
+		<bundle>mvn:org.infinispan/infinispan-core/5.2.0.Beta3</bundle> -->
 
         <bundle>mvn:org.hibernate/hibernate-core/4.3.0-SNAPSHOT</bundle>
         <bundle>mvn:org.hibernate/hibernate-entitymanager/4.3.0-SNAPSHOT</bundle>
+        <bundle>mvn:org.hibernate/hibernate-envers/4.3.0-SNAPSHOT</bundle>
         <!-- <bundle>mvn:org.hibernate/hibernate-c3p0/4.3.0-SNAPSHOT</bundle> -->
         <!-- <bundle>mvn:org.hibernate/hibernate-proxool/4.3.0-SNAPSHOT</bundle> -->
-        <bundle>mvn:org.hibernate/hibernate-envers/4.3.0-SNAPSHOT</bundle>
+        <!-- <bundle>mvn:org.hibernate/hibernate-ehcache/4.3.0-SNAPSHOT</bundle> -->
+        <!-- <bundle>mvn:org.hibernate/hibernate-infinispan/4.3.0-SNAPSHOT</bundle> -->
         <bundle>mvn:org.hibernate/hibernate-osgi/4.3.0-SNAPSHOT</bundle>
         
         <bundle>mvn:org.hibernate/HibernateOSGi_AppManaged/1.0.0</bundle>
diff --git a/HibernateOSGi_AppManaged/src/main/resources/META-INF/persistence.xml b/HibernateOSGi_AppManaged/src/main/resources/META-INF/persistence.xml
index d72fa87..74ede90 100644
--- a/HibernateOSGi_AppManaged/src/main/resources/META-INF/persistence.xml
+++ b/HibernateOSGi_AppManaged/src/main/resources/META-INF/persistence.xml
@@ -13,15 +13,6 @@
             <property name="hibernate.connection.username" value="sa"/>
             <property name="hibernate.connection.password" value=""/>
             <property name="hibernate.hbm2ddl.auto" value="create-drop"/>
-            
-            <!-- <property name="hibernate.connection.pool_size" value="5"/>
-			<property name="hibernate.c3p0.min_size" value="50"/>
-			<property name="hibernate.c3p0.max_size" value="800"/>
-			<property name="hibernate.c3p0.max_statements" value="50"/>
-			<property name="hibernate.jdbc.batch_size" value="10"/>
-			<property name="hibernate.c3p0.timeout" value="300"/>
-			<property name="hibernate.c3p0.idle_test_period" value="3000"/>
-			<property name="hibernate.c3p0.testConnectionOnCheckout" value="true"/> -->
         </properties>
     </persistence-unit>
 </persistence>
\ No newline at end of file
diff --git a/HibernateOSGi_AppManaged/src/main/resources/ehcache.xml b/HibernateOSGi_AppManaged/src/main/resources/ehcache.xml
new file mode 100644
index 0000000..11fddc7
--- /dev/null
+++ b/HibernateOSGi_AppManaged/src/main/resources/ehcache.xml
@@ -0,0 +1,111 @@
+<!--
+  ~ Hibernate, Relational Persistence for Idiomatic Java
+  ~
+  ~ Copyright (c) 2007, Red Hat Middleware LLC 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 Middleware LLC.
+  ~
+  ~ 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
+  -->
+<ehcache>
+
+    <!-- Sets the path to the directory where cache .data files are created.
+
+         If the path is a Java System Property it is replaced by
+         its value in the running VM.
+
+         The following properties are translated:
+         user.home - User's home directory
+         user.dir - User's current working directory
+         java.io.tmpdir - Default temp file path -->
+    <diskStore path="./target/tmp"/>
+
+
+    <!--Default Cache configuration. These will applied to caches programmatically created through
+        the CacheManager.
+
+        The following attributes are required for defaultCache:
+
+        maxInMemory       - Sets the maximum number of objects that will be created in memory
+        eternal           - Sets whether elements are eternal. If eternal,  timeouts are ignored and the element
+                            is never expired.
+        timeToIdleSeconds - Sets the time to idle for an element before it expires. Is only used
+                            if the element is not eternal. Idle time is now - last accessed time
+        timeToLiveSeconds - Sets the time to live for an element before it expires. Is only used
+                            if the element is not eternal. TTL is now - creation time
+        overflowToDisk    - Sets whether elements can overflow to disk when the in-memory cache
+                            has reached the maxInMemory limit.
+
+        -->
+    <defaultCache
+        maxElementsInMemory="10000"
+        eternal="false"
+        timeToIdleSeconds="120"
+        timeToLiveSeconds="120"
+        overflowToDisk="true"
+        />
+
+    <!--Predefined caches.  Add your cache configuration settings here.
+        If you do not have a configuration for your cache a WARNING will be issued when the
+        CacheManager starts
+
+        The following attributes are required for defaultCache:
+
+        name              - Sets the name of the cache. This is used to identify the cache. It must be unique.
+        maxInMemory       - Sets the maximum number of objects that will be created in memory
+        eternal           - Sets whether elements are eternal. If eternal,  timeouts are ignored and the element
+                            is never expired.
+        timeToIdleSeconds - Sets the time to idle for an element before it expires. Is only used
+                            if the element is not eternal. Idle time is now - last accessed time
+        timeToLiveSeconds - Sets the time to live for an element before it expires. Is only used
+                            if the element is not eternal. TTL is now - creation time
+        overflowToDisk    - Sets whether elements can overflow to disk when the in-memory cache
+                            has reached the maxInMemory limit.
+
+        -->
+
+    <!-- Sample cache named sampleCache1
+        This cache contains a maximum in memory of 10000 elements, and will expire
+        an element if it is idle for more than 5 minutes and lives for more than
+        10 minutes.
+
+        If there are more than 10000 elements it will overflow to the
+        disk cache, which in this configuration will go to wherever java.io.tmp is
+        defined on your system. On a standard Linux system this will be /tmp"
+        -->
+    <cache name="sampleCache1"
+        maxElementsInMemory="10000"
+        eternal="false"
+        timeToIdleSeconds="300"
+        timeToLiveSeconds="600"
+        overflowToDisk="true"
+        />
+
+    <!-- Sample cache named sampleCache2
+        This cache contains 1000 elements. Elements will always be held in memory.
+        They are not expired. -->
+    <cache name="sampleCache2"
+        maxElementsInMemory="1000"
+        eternal="true"
+        timeToIdleSeconds="0"
+        timeToLiveSeconds="0"
+        overflowToDisk="false"
+        /> -->
+
+    <!-- Place configuration for your caches following -->
+
+</ehcache>
diff --git a/HibernateOSGi_AppManaged/src/main/resources/hibernate.cfg.xml b/HibernateOSGi_AppManaged/src/main/resources/hibernate.cfg.xml
index 4509069..17244a1 100644
--- a/HibernateOSGi_AppManaged/src/main/resources/hibernate.cfg.xml
+++ b/HibernateOSGi_AppManaged/src/main/resources/hibernate.cfg.xml
@@ -26,7 +26,20 @@
 		<property name="hibernate.connection.provider_class">proxool</property>
 		<property name="hibernate.proxool.properties">pool-one.properties</property>
 		<property name="hibernate.proxool.pool_alias">pool-one</property> -->
+		
+		<!-- <property name="hibernate.cache.region_prefix">hibernate.test</property>
+		<property name="cache.use_query_cache">true</property>
+        <property name="cache.use_second_level_cache">true</property>
+        <property name="cache.use_structured_entries">true</property>
+        <property name="cache.region.factory_class">org.hibernate.cache.EhCacheRegionFactory</property>
+        <property name="net.sf.ehcache.configurationResourceName">file:///home/bmeyer2/workspace_hibernate_master/HibernateOSGi/HibernateOSGi_AppManaged/src/main/resources/ehcache.xml</property> -->
     
+        <!-- <property name="hibernate.cache.region_prefix">hibernate.test</property>
+		<property name="cache.use_query_cache">true</property>
+        <property name="cache.use_second_level_cache">true</property>
+        <property name="cache.use_structured_entries">true</property>
+        <property name="cache.region.factory_class">org.hibernate.cache.infinispan.InfinispanRegionFactory</property> -->
+        
         <mapping class="org.hibernate.osgitest.entity.DataPoint"/>
     </session-factory>
  

<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Transitional//EN' 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd'>
<html xmlns='http://www.w3.org/1999/xhtml'>
<head>
<title>pFad - Phonifier reborn</title>
<meta http-equiv='Content-Type' content='text/html; charset=utf-8' />
</head>
<body>
<h1>Pfad - The Proxy pFad of &#169; 2024 Garber Painting. All rights reserved.</h1>


<!-- Disclaimer -->
<p>Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.</p>
<br>
<p>Alternative Proxies:</p><p><a href="http://clevelandohioweatherforecast.com/php-proxy/index.php?q=https://github.com/brmeyer/HibernateOSGi/compare/master...jpa21.patch" target="_blank">Alternative Proxy</a></p><p><a href="http://clevelandohioweatherforecast.com/pFad/index.php?u=https://github.com/brmeyer/HibernateOSGi/compare/master...jpa21.patch" target="_blank">pFad Proxy</a></p><p><a href="http://clevelandohioweatherforecast.com/pFad/v3index.php?u=https://github.com/brmeyer/HibernateOSGi/compare/master...jpa21.patch" target="_blank">pFad v3 Proxy</a></p><p><a href="http://clevelandohioweatherforecast.com/pFad/v4index.php?u=https://github.com/brmeyer/HibernateOSGi/compare/master...jpa21.patch" target="_blank">pFad v4 Proxy</a></p></body>
</html>