You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rm...@apache.org on 2011/09/01 13:58:36 UTC
svn commit: r1164028 - in
/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb:
assembler/classic/JndiEncBuilder.java assembler/classic/ResourceInfo.java
config/ConfigurationFactory.java
Author: rmannibucau
Date: Thu Sep 1 11:58:36 2011
New Revision: 1164028
URL: http://svn.apache.org/viewvc?rev=1164028&view=rev
Log:
replacing the added method in info tree by a field to respect OpenEJB info tree structure
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JndiEncBuilder.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ResourceInfo.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java
Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JndiEncBuilder.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JndiEncBuilder.java?rev=1164028&r1=1164027&r2=1164028&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JndiEncBuilder.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/JndiEncBuilder.java Thu Sep 1 11:58:36 2011
@@ -452,8 +452,8 @@ public class JndiEncBuilder {
OpenEjbConfiguration config = SystemInstance.get().getComponent(OpenEjbConfiguration.class);
for (ResourceInfo resource : config.facilities.resources) {
- String jndiName = resource.getJndiName();
- if (!jndiName.isEmpty()) {
+ String jndiName = resource.jndiName;
+ if (jndiName != null && !jndiName.isEmpty()) {
String refName = "openejb/Resource/" + resource.id;
Object reference = new IntraVmJndiReference(refName);
String boundName = normalize(jndiName);
Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ResourceInfo.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ResourceInfo.java?rev=1164028&r1=1164027&r2=1164028&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ResourceInfo.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/ResourceInfo.java Thu Sep 1 11:58:36 2011
@@ -17,13 +17,5 @@
package org.apache.openejb.assembler.classic;
public class ResourceInfo extends ServiceInfo {
-
- public static final String JNDI_NAME_KEY = "JndiName";
-
- public String getJndiName() {
- if (properties.containsKey(JNDI_NAME_KEY)) {
- return properties.getProperty("JndiName");
- }
- return "";
- }
+ public String jndiName = "";
}
Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java?rev=1164028&r1=1164027&r2=1164028&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/ConfigurationFactory.java Thu Sep 1 11:58:36 2011
@@ -850,6 +850,9 @@ public class ConfigurationFactory implem
info.id = service.getId();
info.properties = props;
info.constructorArgs.addAll(parseConstructorArgs(provider));
+ if (info instanceof ResourceInfo && service instanceof Resource) {
+ ((ResourceInfo) info).jndiName = ((Resource) service).getJndi();
+ }
specialProcessing(info);