Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 24913 invoked from network); 2 Nov 2009 07:26:18 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 2 Nov 2009 07:26:18 -0000 Received: (qmail 59362 invoked by uid 500); 2 Nov 2009 07:26:18 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 59271 invoked by uid 500); 2 Nov 2009 07:26:17 -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 59260 invoked by uid 99); 2 Nov 2009 07:26:17 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 02 Nov 2009 07:26:17 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 02 Nov 2009 07:26:15 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 207D923888E7; Mon, 2 Nov 2009 07:25:54 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r831811 - in /geronimo/server/branches/2.2/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb: EjbModuleImpl.java GeronimoThreadContextListener.java Date: Mon, 02 Nov 2009 07:25:53 -0000 To: scm@geronimo.apache.org From: djencks@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20091102072554.207D923888E7@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: djencks Date: Mon Nov 2 07:25:53 2009 New Revision: 831811 URL: http://svn.apache.org/viewvc?rev=831811&view=rev Log: GERONIMO-4918 make EjbModuleImpl initialize all the ejbDeployment gbeans during its startup. This helps corba and ws tests but is not quite sufficient Modified: geronimo/server/branches/2.2/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/EjbModuleImpl.java geronimo/server/branches/2.2/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/GeronimoThreadContextListener.java Modified: geronimo/server/branches/2.2/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/EjbModuleImpl.java URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/EjbModuleImpl.java?rev=831811&r1=831810&r2=831811&view=diff ============================================================================== --- geronimo/server/branches/2.2/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/EjbModuleImpl.java (original) +++ geronimo/server/branches/2.2/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/EjbModuleImpl.java Mon Nov 2 07:25:53 2009 @@ -34,6 +34,8 @@ import org.apache.geronimo.management.J2EEServer; import org.apache.openejb.NoSuchApplicationException; import org.apache.openejb.UndeployException; +import org.apache.openejb.DeploymentInfo; +import org.apache.openejb.core.CoreDeploymentInfo; import org.apache.openejb.assembler.classic.EjbJarInfo; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -165,6 +167,10 @@ public void doStart() throws Exception { openEjbSystem.createEjbJar(ejbJarInfo, classLoader); + for (String deploymentId: ejbs.keySet()) { + DeploymentInfo deploymentInfo = openEjbSystem.getDeploymentInfo(deploymentId); + GeronimoThreadContextListener.get().getEjbDeployment((CoreDeploymentInfo) deploymentInfo); + } } public void doStop() { Modified: geronimo/server/branches/2.2/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/GeronimoThreadContextListener.java URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/GeronimoThreadContextListener.java?rev=831811&r1=831810&r2=831811&view=diff ============================================================================== --- geronimo/server/branches/2.2/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/GeronimoThreadContextListener.java (original) +++ geronimo/server/branches/2.2/plugins/openejb/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/GeronimoThreadContextListener.java Mon Nov 2 07:25:53 2009 @@ -76,7 +76,7 @@ this.ejbs.remove(id); } - private EjbDeployment getEjbDeployment(CoreDeploymentInfo deploymentInfo) { + EjbDeployment getEjbDeployment(CoreDeploymentInfo deploymentInfo) { Deployment deployment = ejbs.get(deploymentInfo.getDeploymentID()); if (deployment == null) return null;