You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by da...@apache.org on 2007/04/10 19:19:36 UTC
svn commit: r527207 -
/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/OpenEjb2Conversion.java
Author: dain
Date: Tue Apr 10 10:19:35 2007
New Revision: 527207
URL: http://svn.apache.org/viewvc?view=rev&rev=527207
Log:
Copy ejb-link declaration in openejb 2 plan into ejb declaration
Modified:
incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/OpenEjb2Conversion.java
Modified: incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/OpenEjb2Conversion.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/OpenEjb2Conversion.java?view=diff&rev=527207&r1=527206&r2=527207
==============================================================================
--- incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/OpenEjb2Conversion.java (original)
+++ incubator/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/OpenEjb2Conversion.java Tue Apr 10 10:19:35 2007
@@ -141,6 +141,11 @@
if (ref != null) {
ref.setMappedName("jndi:" + nsCorbaloc);
}
+ } else if (refType.getEjbLink() != null) {
+ EjbRef ref = ejbRefs.get(refName);
+ if (ref != null) {
+ ref.setEjbLink(refType.getEjbLink());
+ }
} else {
PatternType pattern = refType.getPattern();
addEjbLink(deployment, refName, pattern);
@@ -154,8 +159,15 @@
continue;
}
- PatternType pattern = refType.getPattern();
- addEjbLink(deployment, refName, pattern);
+ if (refType.getEjbLink() != null) {
+ EjbRef ref = ejbRefs.get(refName);
+ if (ref != null) {
+ ref.setEjbLink(refType.getEjbLink());
+ }
+ } else {
+ PatternType pattern = refType.getPattern();
+ addEjbLink(deployment, refName, pattern);
+ }
}
}
}