Author: tveronezi
Date: Tue Sep 6 00:24:48 2011
New Revision: 1165459
URL: http://svn.apache.org/viewvc?rev=1165459&view=rev
Log:
Fixing “Problem using Hibernate as my persistence” -
http://openejb.979440.n4.nabble.com/Problem-using-Hibernate-as-my-persistence-provider-td982358.html.
Behind the scenes, hibernate uses the “org.hibernate.ejb.Ejb3Configuration”
class to create the EntityManagerFactory instance. This Ejb3Configuration class
uses the ClassLoader of the current thread (in our case, the openejb main
thread) instead of the ClassLoader which loaded the class itself.
Added:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EntityManagerFactoryCallable.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EntityManagerFactoryThreadFactory.java
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/PersistenceBuilder.java
Added:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EntityManagerFactoryCallable.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EntityManagerFactoryCallable.java?rev=1165459&view=auto
==============================================================================
---
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EntityManagerFactoryCallable.java
(added)
+++
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EntityManagerFactoryCallable.java
Tue Sep 6 00:24:48 2011
@@ -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.apache.openejb.assembler.classic;
+
+import org.apache.openejb.persistence.PersistenceUnitInfoImpl;
+
+import javax.persistence.EntityManagerFactory;
+import javax.persistence.spi.PersistenceProvider;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.Callable;
+
+public class EntityManagerFactoryCallable implements
Callable<EntityManagerFactory> {
+ private final String persistenceProviderClassName;
+ private final PersistenceUnitInfoImpl unitInfo;
+
+ public EntityManagerFactoryCallable(String persistenceProviderClassName,
PersistenceUnitInfoImpl unitInfo) {
+ this.persistenceProviderClassName = persistenceProviderClassName;
+ this.unitInfo = unitInfo;
+ }
+
+ @Override
+ public EntityManagerFactory call() throws Exception {
+ Class clazz =
Thread.currentThread().getContextClassLoader().loadClass(persistenceProviderClassName);
+ PersistenceProvider persistenceProvider = (PersistenceProvider)
clazz.newInstance();
+
+ // Create entity manager factories with the validator factory
+ Map<String, Object> properties = new HashMap<String, Object>();
+ properties.put("javax.persistence.validator.ValidatorFactory", new
ValidatorFactoryWrapper());
+ EntityManagerFactory emf =
persistenceProvider.createContainerEntityManagerFactory(unitInfo, properties);
+ return emf;
+ }
+}
Added:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EntityManagerFactoryThreadFactory.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EntityManagerFactoryThreadFactory.java?rev=1165459&view=auto
==============================================================================
---
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EntityManagerFactoryThreadFactory.java
(added)
+++
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/EntityManagerFactoryThreadFactory.java
Tue Sep 6 00:24:48 2011
@@ -0,0 +1,34 @@
+/*
+ * 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.apache.openejb.assembler.classic;
+
+import java.util.concurrent.ThreadFactory;
+
+public class EntityManagerFactoryThreadFactory implements ThreadFactory {
+ private final ClassLoader appClassLoader;
+
+ public EntityManagerFactoryThreadFactory(ClassLoader appClassLoader) {
+ this.appClassLoader = appClassLoader;
+ }
+
+ @Override
+ public Thread newThread(Runnable r) {
+ final Thread newThread = new Thread(r);
+ newThread.setContextClassLoader(this.appClassLoader);
+ return newThread;
+ }
+}
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/PersistenceBuilder.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/PersistenceBuilder.java?rev=1165459&r1=1165458&r2=1165459&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/PersistenceBuilder.java
(original)
+++
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/PersistenceBuilder.java
Tue Sep 6 00:24:48 2011
@@ -16,26 +16,26 @@
*/
package org.apache.openejb.assembler.classic;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.concurrent.TimeUnit;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.spi.PersistenceProvider;
-import javax.persistence.spi.PersistenceUnitTransactionType;
-import javax.persistence.SharedCacheMode;
-import javax.persistence.ValidationMode;
-import javax.sql.DataSource;
-import javax.naming.Context;
-import javax.naming.NamingException;
-import javax.validation.ValidatorFactory;
-
+import org.apache.openejb.OpenEJBException;
+import org.apache.openejb.loader.SystemInstance;
import org.apache.openejb.persistence.PersistenceClassLoaderHandler;
import org.apache.openejb.persistence.PersistenceUnitInfoImpl;
import org.apache.openejb.spi.ContainerSystem;
-import org.apache.openejb.loader.SystemInstance;
-import org.apache.openejb.util.Logger;
import org.apache.openejb.util.LogCategory;
-import org.apache.openejb.OpenEJBException;
+import org.apache.openejb.util.Logger;
+
+import javax.naming.Context;
+import javax.naming.NamingException;
+import javax.persistence.EntityManagerFactory;
+import javax.persistence.SharedCacheMode;
+import javax.persistence.ValidationMode;
+import javax.persistence.spi.PersistenceUnitTransactionType;
+import javax.sql.DataSource;
+import java.util.Map;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
+import java.util.concurrent.TimeUnit;
public class PersistenceBuilder {
@@ -192,14 +192,11 @@ public class PersistenceBuilder {
final long start = System.nanoTime();
try {
- Class clazz = classLoader.loadClass(persistenceProviderClassName);
- PersistenceProvider persistenceProvider = (PersistenceProvider)
clazz.newInstance();
-
- // Create entity manager factories with the validator factory
- Map<String, Object> properties = new HashMap<String, Object>();
- properties.put("javax.persistence.validator.ValidatorFactory", new
ValidatorFactoryWrapper());
- EntityManagerFactory emf =
persistenceProvider.createContainerEntityManagerFactory(unitInfo, properties);
- return emf;
+ final ExecutorService executor =
Executors.newSingleThreadExecutor(new
EntityManagerFactoryThreadFactory(classLoader));
+ final Future<EntityManagerFactory> future = executor.submit(
+ new
EntityManagerFactoryCallable(persistenceProviderClassName, unitInfo)
+ );
+ return future.get(10, TimeUnit.MINUTES);
} finally {
final long time = TimeUnit.MILLISECONDS.convert(System.nanoTime()
- start, TimeUnit.NANOSECONDS);
logger.info("assembler.buildingPersistenceUnit",
unitInfo.getPersistenceUnitName(), unitInfo.getPersistenceProviderClassName(),
time+"");
