Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 46305 invoked from network); 28 Feb 2011 07:31:00 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 28 Feb 2011 07:31:00 -0000 Received: (qmail 83031 invoked by uid 500); 28 Feb 2011 07:31:00 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 82898 invoked by uid 500); 28 Feb 2011 07:30:58 -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 82891 invoked by uid 99); 28 Feb 2011 07:30:57 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 28 Feb 2011 07:30:57 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.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, 28 Feb 2011 07:30:55 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 7DD33238890B; Mon, 28 Feb 2011 07:30:34 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1075227 - in /geronimo/server/branches/3.0-M2/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment: EjbModuleBuilder.java GeronimoDeploymentLoader.java Date: Mon, 28 Feb 2011 07:30:34 -0000 To: scm@geronimo.apache.org From: genspring@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110228073034.7DD33238890B@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: genspring Date: Mon Feb 28 07:30:34 2011 New Revision: 1075227 URL: http://svn.apache.org/viewvc?rev=1075227&view=rev Log: svn merge --non-interactive -c 1075055 https://svn.apache.org/repos/asf/geronimo/server/trunk . Create a GeronimoDeploymentLoader as a workaround, as the DeploymentLoader from OpenEJB breaks most application deployment, need to remove it once the changes in OpenEJB is done Added: geronimo/server/branches/3.0-M2/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/GeronimoDeploymentLoader.java - copied unchanged from r1075055, geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/GeronimoDeploymentLoader.java Modified: geronimo/server/branches/3.0-M2/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbModuleBuilder.java Modified: geronimo/server/branches/3.0-M2/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbModuleBuilder.java URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-M2/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbModuleBuilder.java?rev=1075227&r1=1075226&r2=1075227&view=diff ============================================================================== --- geronimo/server/branches/3.0-M2/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbModuleBuilder.java (original) +++ geronimo/server/branches/3.0-M2/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbModuleBuilder.java Mon Feb 28 07:30:34 2011 @@ -303,7 +303,7 @@ public class EjbModuleBuilder implements Set> loadingRequiredModuleTypes = new HashSet>(); loadingRequiredModuleTypes.add(org.apache.openejb.config.EjbModule.class); loadingRequiredModuleTypes.add(org.apache.openejb.config.WsModule.class); - DeploymentLoader loader = new DeploymentLoader(ddDir, loadingRequiredModuleTypes); + DeploymentLoader loader = new GeronimoDeploymentLoader(ddDir, loadingRequiredModuleTypes); AppModule appModule; try { appModule = loader.load(new File(moduleFile.getName()));