Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 7385 invoked from network); 14 Dec 2007 23:02:33 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 14 Dec 2007 23:02:33 -0000 Received: (qmail 68448 invoked by uid 500); 14 Dec 2007 23:02:21 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 68438 invoked by uid 500); 14 Dec 2007 23:02:21 -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 68427 invoked by uid 99); 14 Dec 2007 23:02:21 -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 15:02:21 -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 23:02:08 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 040D81A9844; Fri, 14 Dec 2007 15:02:12 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r604328 - in /geronimo/server/trunk/plugins/openejb: geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbModuleBuilder.java geronimo-openejb/src/main/java/org/apache/geronimo/openejb/OpenEjbSystemGBean.java Date: Fri, 14 Dec 2007 23:02:10 -0000 To: scm@geronimo.apache.org From: dblevins@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20071214230212.040D81A9844@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: dblevins Date: Fri Dec 14 15:02:09 2007 New Revision: 604328 URL: http://svn.apache.org/viewvc?rev=604328&view=rev Log: Updated for repackaged LinkResolver Modified: geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbModuleBuilder.java geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/OpenEjbSystemGBean.java Modified: geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbModuleBuilder.java URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbModuleBuilder.java?rev=604328&r1=604327&r2=604328&view=diff ============================================================================== --- geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbModuleBuilder.java (original) +++ geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbModuleBuilder.java Fri Dec 14 15:02:09 2007 @@ -84,6 +84,7 @@ import org.apache.geronimo.xbeans.javaee.EjbJarType; import org.apache.geronimo.persistence.PersistenceUnitGBean; import org.apache.openejb.OpenEJBException; +import org.apache.openejb.util.LinkResolver; import org.apache.openejb.assembler.classic.AppInfo; import org.apache.openejb.assembler.classic.CmpJarBuilder; import org.apache.openejb.assembler.classic.ContainerInfo; @@ -94,10 +95,9 @@ import org.apache.openejb.assembler.classic.MdbContainerInfo; import org.apache.openejb.assembler.classic.MessageDrivenBeanInfo; import org.apache.openejb.assembler.classic.OpenEjbConfiguration; -import org.apache.openejb.assembler.classic.LinkResolver; import org.apache.openejb.assembler.classic.StatefulBeanInfo; import org.apache.openejb.assembler.classic.PersistenceContextReferenceInfo; -import org.apache.openejb.assembler.classic.UniqueDefaultLinkResolver; +import org.apache.openejb.util.UniqueDefaultLinkResolver; import org.apache.openejb.config.AppModule; import org.apache.openejb.config.ConfigurationFactory; import org.apache.openejb.config.DeploymentLoader; 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=604328&r1=604327&r2=604328&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 15:02:09 2007 @@ -18,7 +18,6 @@ import java.io.IOException; import java.util.Collection; -import java.util.Collections; import java.util.Map; import java.util.Properties; import java.util.Set; @@ -30,7 +29,6 @@ import javax.management.ObjectName; import javax.naming.NamingException; import javax.naming.Context; -import javax.persistence.EntityManagerFactory; import javax.resource.spi.ResourceAdapter; import javax.transaction.TransactionManager; @@ -57,12 +55,10 @@ import org.apache.openejb.assembler.classic.ClientInfo; import org.apache.openejb.assembler.classic.ContainerInfo; import org.apache.openejb.assembler.classic.EjbJarInfo; -import org.apache.openejb.assembler.classic.LinkResolver; import org.apache.openejb.assembler.classic.MdbContainerInfo; import org.apache.openejb.assembler.classic.ProxyFactoryInfo; import org.apache.openejb.assembler.classic.SecurityServiceInfo; import org.apache.openejb.assembler.classic.TransactionServiceInfo; -import org.apache.openejb.assembler.classic.UniqueDefaultLinkResolver; import org.apache.openejb.assembler.dynamic.PassthroughFactory; import org.apache.openejb.config.AppModule; import org.apache.openejb.config.ClientModule;