Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 50165 invoked from network); 1 Mar 2011 03:39:23 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 1 Mar 2011 03:39:23 -0000 Received: (qmail 3505 invoked by uid 500); 1 Mar 2011 03:39:23 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 3380 invoked by uid 500); 1 Mar 2011 03:39: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 3368 invoked by uid 99); 1 Mar 2011 03:39:20 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 01 Mar 2011 03:39:20 +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; Tue, 01 Mar 2011 03:39:19 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 9759523888EC; Tue, 1 Mar 2011 03:38:59 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1075637 - in /geronimo/server/branches/3.0-M2/plugins/openejb: ./ geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/ Date: Tue, 01 Mar 2011 03:38:59 -0000 To: scm@geronimo.apache.org From: genspring@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110301033859.9759523888EC@eris.apache.org> Author: genspring Date: Tue Mar 1 03:38:59 2011 New Revision: 1075637 URL: http://svn.apache.org/viewvc?rev=1075637&view=rev Log: revert "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" Removed: geronimo/server/branches/3.0-M2/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/GeronimoDeploymentLoader.java Modified: geronimo/server/branches/3.0-M2/plugins/openejb/ (props changed) geronimo/server/branches/3.0-M2/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbModuleBuilder.java Propchange: geronimo/server/branches/3.0-M2/plugins/openejb/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Mar 1 03:38:59 2011 @@ -1,4 +1,4 @@ /geronimo/server/branches/2.2/plugins/openejb:830343,830385,830420,830443,830766,831498,831811,832538,885058,941914 /geronimo/server/branches/3.0-M1/plugins/openejb:948864,951792 /geronimo/server/trunk/plugins/j2ee/openejb:887507 -/geronimo/server/trunk/plugins/openejb:1056676,1057959-1057962,1064377,1064432-1064433,1071183 +/geronimo/server/trunk/plugins/openejb:1056676,1057959-1057962,1064377,1064432-1064433,1071183,1074421,1075055 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=1075637&r1=1075636&r2=1075637&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 Tue Mar 1 03:38:59 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 GeronimoDeploymentLoader(ddDir, loadingRequiredModuleTypes); + DeploymentLoader loader = new DeploymentLoader(ddDir, loadingRequiredModuleTypes); AppModule appModule; try { appModule = loader.load(new File(moduleFile.getName()));