Author: rmannibucau
Date: Sun Oct 9 17:29:17 2011
New Revision: 1180659
URL: http://svn.apache.org/viewvc?rev=1180659&view=rev
Log:
TOMEE-10 localbean shown as EJB in viewjndi.jsp
Modified:
openejb/trunk/openejb/assembly/tomee/tomee-webapp/src/main/webapp/viewjndi.jsp
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/proxy/LocalBeanProxyGeneratorImpl.java
Modified:
openejb/trunk/openejb/assembly/tomee/tomee-webapp/src/main/webapp/viewjndi.jsp
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/assembly/tomee/tomee-webapp/src/main/webapp/viewjndi.jsp?rev=1180659&r1=1180658&r2=1180659&view=diff
==============================================================================
---
openejb/trunk/openejb/assembly/tomee/tomee-webapp/src/main/webapp/viewjndi.jsp
(original)
+++
openejb/trunk/openejb/assembly/tomee/tomee-webapp/src/main/webapp/viewjndi.jsp
Sun Oct 9 17:29:17 2011
@@ -29,6 +29,7 @@ java.util.Properties
<%@ page import="javax.naming.NamingException" %>
<%@ page import="java.lang.reflect.Method" %>
<%@ page import="java.lang.reflect.Field" %>
+<%@ page import="org.apache.openejb.util.proxy.LocalBeanProxyGeneratorImpl" %>
<html>
<head>
<META http-equiv="Content-Type" content="text/html; charset=UTF-8">
@@ -197,7 +198,9 @@ This is the private namespace of an Ente
if (obj instanceof Context) {
node.type = Node.CONTEXT;
buildNode(node, (Context) obj);
- } else if (obj instanceof java.rmi.Remote || obj instanceof
org.apache.openejb.core.ivm.IntraVmProxy) {
+ } else if (obj instanceof java.rmi.Remote
+ || obj instanceof org.apache.openejb.core.ivm.IntraVmProxy
+ || (obj != null &&
LocalBeanProxyGeneratorImpl.isLocalBean(obj.getClass()))) {
node.type = Node.BEAN;
} else {
node.type = Node.OTHER;
Modified:
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/proxy/LocalBeanProxyGeneratorImpl.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/proxy/LocalBeanProxyGeneratorImpl.java?rev=1180659&r1=1180658&r2=1180659&view=diff
==============================================================================
---
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/proxy/LocalBeanProxyGeneratorImpl.java
(original)
+++
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/util/proxy/LocalBeanProxyGeneratorImpl.java
Sun Oct 9 17:29:17 2011
@@ -93,10 +93,17 @@ public class LocalBeanProxyGeneratorImpl
return createProxy(clsToProxy, proxyName, cl);
}
- private String generateProxyName(String clsName) {
+ private static String generateProxyName(String clsName) {
return clsName + "$LocalBeanProxy";
}
+ public static boolean isLocalBean(Class<?> clazz) {
+ if (clazz.getSuperclass() == null) {
+ return false;
+ }
+ return
clazz.getName().equals(LocalBeanProxyGeneratorImpl.generateProxyName(clazz.getSuperclass().getName()));
+ }
+
private Class createProxy(Class<?> clsToProxy, String proxyName,
ClassLoader cl) {
String clsName = proxyName.replaceAll("\\.", "/");
