Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 406 invoked from network); 14 Dec 2007 22:35:42 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 14 Dec 2007 22:35:42 -0000 Received: (qmail 49666 invoked by uid 500); 14 Dec 2007 22:35:30 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 49658 invoked by uid 500); 14 Dec 2007 22:35:30 -0000 Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: dev@geronimo.apache.org List-Id: Delivered-To: mailing list scm@geronimo.apache.org Received: (qmail 49647 invoked by uid 99); 14 Dec 2007 22:35:30 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 14 Dec 2007 14:35:30 -0800 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 14 Dec 2007 22:35:17 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id AFF3C1A9850; Fri, 14 Dec 2007 14:35:20 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r604319 - /geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/OpenEjbSystemGBean.java Date: Fri, 14 Dec 2007 22:35:19 -0000 To: scm@geronimo.apache.org From: dblevins@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20071214223520.AFF3C1A9850@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: dblevins Date: Fri Dec 14 14:35:19 2007 New Revision: 604319 URL: http://svn.apache.org/viewvc?rev=604319&view=rev Log: Hook up the new persistence unit processing code. Modified: geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/OpenEjbSystemGBean.java Modified: geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/OpenEjbSystemGBean.java URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/OpenEjbSystemGBean.java?rev=604319&r1=604318&r2=604319&view=diff ============================================================================== --- geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/OpenEjbSystemGBean.java (original) +++ geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/OpenEjbSystemGBean.java Fri Dec 14 14:35:19 2007 @@ -85,7 +85,6 @@ private final Assembler assembler; private final Set registeredResouceAdapters = new TreeSet(); private final ConcurrentMap processedResourceAdapterWrappers = new ConcurrentHashMap() ; - private final Collection persistenceUnitGBeans; private final Kernel kernel; private final ClassLoader classLoader; // These are provided by the corba subsystem when it first initializes. @@ -98,11 +97,7 @@ public OpenEjbSystemGBean(TransactionManager transactionManager, Collection resourceAdapters, Collection persistenceUnitGBeans, Kernel kernel, ClassLoader classLoader) throws Exception { this.kernel = kernel; this.classLoader = classLoader; - if (persistenceUnitGBeans == null) { - this.persistenceUnitGBeans = Collections.emptySet(); - } else { - this.persistenceUnitGBeans = persistenceUnitGBeans; - } + System.setProperty("duct tape",""); System.setProperty("admin.disabled", "true"); System.setProperty("openejb.logger.external", "true"); @@ -154,6 +149,7 @@ // process all resource adapters processResourceAdapterWrappers(resourceAdapters); + processPersistenceUnitGBeans(persistenceUnitGBeans); } private void setDefaultProperty(String key, String value) { @@ -394,15 +390,6 @@ ClassLoader oldClassLoader = Thread.currentThread().getContextClassLoader(); Thread.currentThread().setContextClassLoader(classLoader); - LinkResolver emfLinkResolver = new UniqueDefaultLinkResolver(); - for (PersistenceUnitGBean persistenceUnitGBean: persistenceUnitGBeans) { - EntityManagerFactory factory = persistenceUnitGBean.getEntityManagerFactory(); - String persistenceUnitRoot = persistenceUnitGBean.getPersistenceUnitRoot(); - String persistenceUnitName = persistenceUnitGBean.getPersistenceUnitName(); - if (!"cmp".equals(persistenceUnitName)) { - emfLinkResolver.add(persistenceUnitRoot, persistenceUnitName, factory); - } - } try { assembler.createEjbJar(ejbJarInfo, classLoader); } finally {