Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 29115 invoked from network); 3 Oct 2007 18:38:08 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 3 Oct 2007 18:38:08 -0000 Received: (qmail 25757 invoked by uid 500); 3 Oct 2007 18:37:57 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 25737 invoked by uid 500); 3 Oct 2007 18:37:57 -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 25726 invoked by uid 99); 3 Oct 2007 18:37:57 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 03 Oct 2007 11:37:57 -0700 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; Wed, 03 Oct 2007 18:38:07 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 84DC51A9832; Wed, 3 Oct 2007 11:37:17 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r581680 - /geronimo/server/branches/2.0/modules/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/OpenEjbSystemGBean.java Date: Wed, 03 Oct 2007 18:37:17 -0000 To: scm@geronimo.apache.org From: dblevins@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20071003183717.84DC51A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: dblevins Date: Wed Oct 3 11:37:16 2007 New Revision: 581680 URL: http://svn.apache.org/viewvc?rev=581680&view=rev Log: Reverted the deploymentId change, seems the value of {appId} causes issues. Modified: geronimo/server/branches/2.0/modules/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/OpenEjbSystemGBean.java Modified: geronimo/server/branches/2.0/modules/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/OpenEjbSystemGBean.java URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.0/modules/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/OpenEjbSystemGBean.java?rev=581680&r1=581679&r2=581680&view=diff ============================================================================== --- geronimo/server/branches/2.0/modules/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/OpenEjbSystemGBean.java (original) +++ geronimo/server/branches/2.0/modules/geronimo-openejb/src/main/java/org/apache/geronimo/openejb/OpenEjbSystemGBean.java Wed Oct 3 11:37:16 2007 @@ -108,11 +108,11 @@ System.setProperty("admin.disabled", "true"); System.setProperty("openejb.logger.external", "true"); - setDefaultProperty("openejb.deploymentId.format", "{appId}/{moduleId}/{ejbName}"); + setDefaultProperty("openejb.deploymentId.format", "{moduleId}/{ejbName}"); setDefaultProperty("openejb.jndiname.strategy.class", "org.apache.openejb.assembler.classic.JndiBuilder$TemplatedStrategy"); setDefaultProperty("openejb.jndiname.format", "{ejbName}{interfaceType.annotationName}"); setDefaultProperty("openejb.jndiname.failoncollision", "false"); - + System.setProperty("openejb.naming", "xbean"); if (transactionManager == null) { throw new NullPointerException("transactionManager is null");