Author: djencks
Date: Wed Jul 11 14:43:36 2007
New Revision: 555412
URL: http://svn.apache.org/viewvc?view=rev&rev=555412
Log:
GERONIMO-3310. Make a mapped-name override a generated (not actually supplied)
resource link for message destination refs. This makes
messages-destination-refs work in geronimo-openejb, esp. in daytrader
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java?view=diff&rev=555412&r1=555411&r2=555412
==============================================================================
---
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java
(original)
+++
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java
Wed Jul 11 14:43:36 2007
@@ -292,7 +292,7 @@
for (MessageDestinationRef ref :
bean.getMessageDestinationRef()) {
// skip destination refs with a resource link already
assigned
- if (ejbDeployment.getResourceLink(ref.getName()) == null) {
+ if (ref.getMappedName() == null &&
ejbDeployment.getResourceLink(ref.getName()) == null) {
String destinationId = resolveDestinationId(ref,
moduleUri, destinationResolver, destinationTypes);
if (destinationId != null) {
// build the link and add it
