You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by da...@apache.org on 2006/04/27 23:08:05 UTC
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
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 @@
<!--<version>${pom.currentVersion}</version>-->
<type>car</type>
</dependency>
+ <dependency>
+ <groupId>${pom.groupId}</groupId>
+ <artifactId>system-database</artifactId>
+ <type>car</type>
+ </dependency>
</dependencies>
</environment>
</xml-attribute>
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));
}