Return-Path: Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: (qmail 17210 invoked from network); 27 Apr 2006 21:08:28 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 27 Apr 2006 21:08:28 -0000 Received: (qmail 86599 invoked by uid 500); 27 Apr 2006 21:08:28 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 86572 invoked by uid 500); 27 Apr 2006 21:08:27 -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 86553 invoked by uid 99); 27 Apr 2006 21:08:27 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 27 Apr 2006 14:08:27 -0700 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.29) with SMTP; Thu, 27 Apr 2006 14:08:26 -0700 Received: (qmail 17154 invoked by uid 65534); 27 Apr 2006 21:08:06 -0000 Message-ID: <20060427210806.17153.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r397635 - in /geronimo/branches/1.1: configs/openejb-deployer/src/plan/plan.xml modules/kernel/src/java/org/apache/geronimo/gbean/ReferencePatterns.java modules/kernel/src/java/org/apache/geronimo/kernel/config/ConfigurationUtil.java Date: Thu, 27 Apr 2006 21:08:05 -0000 To: scm@geronimo.apache.org From: dain@apache.org X-Mailer: svnmailer-1.0.8 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: dain Date: Thu Apr 27 14:08:04 2006 New Revision: 397635 URL: http://svn.apache.org/viewcvs?rev=397635&view=rev Log: Added system-database to openejb default environment so ejbs can see the timers. Added better error message to ConfigruationUtil when references can't be resolved. Modified: geronimo/branches/1.1/configs/openejb-deployer/src/plan/plan.xml geronimo/branches/1.1/modules/kernel/src/java/org/apache/geronimo/gbean/ReferencePatterns.java geronimo/branches/1.1/modules/kernel/src/java/org/apache/geronimo/kernel/config/ConfigurationUtil.java Modified: geronimo/branches/1.1/configs/openejb-deployer/src/plan/plan.xml URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/configs/openejb-deployer/src/plan/plan.xml?rev=397635&r1=397634&r2=397635&view=diff ============================================================================== --- geronimo/branches/1.1/configs/openejb-deployer/src/plan/plan.xml (original) +++ geronimo/branches/1.1/configs/openejb-deployer/src/plan/plan.xml Thu Apr 27 14:08:04 2006 @@ -43,6 +43,11 @@ car + + ${pom.groupId} + system-database + car + Modified: geronimo/branches/1.1/modules/kernel/src/java/org/apache/geronimo/gbean/ReferencePatterns.java URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/kernel/src/java/org/apache/geronimo/gbean/ReferencePatterns.java?rev=397635&r1=397634&r2=397635&view=diff ============================================================================== --- geronimo/branches/1.1/modules/kernel/src/java/org/apache/geronimo/gbean/ReferencePatterns.java (original) +++ geronimo/branches/1.1/modules/kernel/src/java/org/apache/geronimo/gbean/ReferencePatterns.java Thu Apr 27 14:08:04 2006 @@ -80,4 +80,11 @@ return abstractName != null; } + public String toString() { + if (abstractName != null) { + return abstractName.toString(); + } else { + return patterns.toString(); + } + } } Modified: geronimo/branches/1.1/modules/kernel/src/java/org/apache/geronimo/kernel/config/ConfigurationUtil.java URL: http://svn.apache.org/viewcvs/geronimo/branches/1.1/modules/kernel/src/java/org/apache/geronimo/kernel/config/ConfigurationUtil.java?rev=397635&r1=397634&r2=397635&view=diff ============================================================================== --- geronimo/branches/1.1/modules/kernel/src/java/org/apache/geronimo/kernel/config/ConfigurationUtil.java (original) +++ geronimo/branches/1.1/modules/kernel/src/java/org/apache/geronimo/kernel/config/ConfigurationUtil.java Thu Apr 27 14:08:04 2006 @@ -279,7 +279,7 @@ try { abstractName = configuration.findGBean(referencePatterns); } catch (GBeanNotFoundException e) { - throw new InvalidConfigException("Unable to resolve reference named " + referenceName + " in gbean " + gbeanData.getAbstractName(), e); + throw new InvalidConfigException("Unable to resolve reference \"" + referenceName + "\" in gbean " + gbeanData.getAbstractName() + " to a gbean matching the pattern " + referencePatterns, e); } gbeanData.setReferencePatterns(referenceName, new ReferencePatterns(abstractName)); }