Added: 
openejb/trunk/openejb3/assembly/openejb-tomcat/src/main/resources/viewejb.jsp
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb3/assembly/openejb-tomcat/src/main/resources/viewejb.jsp?rev=578481&view=auto
==============================================================================
--- 
openejb/trunk/openejb3/assembly/openejb-tomcat/src/main/resources/viewejb.jsp 
(added)
+++ 
openejb/trunk/openejb3/assembly/openejb-tomcat/src/main/resources/viewejb.jsp 
Sat Sep 22 12:37:19 2007
@@ -0,0 +1,237 @@
+<%@ page import="
+org.apache.openejb.BeanType,
+org.apache.openejb.DeploymentInfo,
+org.apache.openejb.loader.SystemInstance,
+org.apache.openejb.spi.ContainerSystem,
+javax.naming.Context,
+javax.naming.InitialContext
+"%>
+<%@ page import="javax.servlet.http.HttpSession" %>
+<%@ page import="java.io.IOException" %>
+<%@ page import="java.util.HashMap" %>
+<%@ page import="java.util.Map" %>
+<%@ page import="java.util.Properties" %>
+<%@ page import="java.lang.reflect.Field" %>
+<%@ page import="java.lang.reflect.Method" %>
+<html>
+<head>
+    <META http-equiv="Content-Type" content="text/html; charset=UTF-8">
+    <title>XXXOpenEJB Tomcat Integration/1.0</title>
+    <link href="default.css" rel="stylesheet">
+    <!-- $Id: viewejb.jsp,v 1.1.2.2 2003/05/06 11:59:21 dblevins Exp $ -->
+    <!-- Author: David Blevins ([EMAIL PROTECTED]) -->
+</head>
+<body marginwidth="0" marginheight="0" leftmargin="0" bottommargin="0" 
topmargin="0" vlink="#6763a9" link="#6763a9" bgcolor="#ffffff">
+<a name="top"></a>
+<table width="712" cellspacing="0" cellpadding="0" border="0">
+    <tr>
+        <td bgcolor="#5A5CB8" align="left" valign="top" width="7"><img 
height="9" width="1" border="0" src="images/dotTrans.gif"></td>
+        <td bgcolor="#5A5CB8" align="left" valign="top" width="40"><img 
border="0" height="6" width="40" src="images/dotTrans.gif"></td>
+        <td bgcolor="#5A5CB8" align="left" valign="top" height="2" 
width="430"><img border="0" height="6" width="430" src="images/top_2.gif"></td>
+        <td bgcolor="#E24717" align="left" valign="top" height="2" 
width="120"><img src="images/top_3.gif" width="120" height="6" border="0"></td>
+    </tr>
+    <tr>
+        <td bgcolor="#5A5CB8" align="left" valign="top" bgcolor="#ffffff" 
width="13"><img border="0" height="15" width="13" 
src="images/dotTrans.gif"></td>
+        <td align="left" valign="top" width="40"><img border="0" height="1" 
width="1" src="images/dotTrans.gif"></td>
+        <td align="left" valign="middle" width="430"><a 
href="http://openejb.apache.org";><span 
class="menuTopOff">OpenEJB</span></a><img border="0" height="2" width="20" 
src="images/dotTrans.gif"><a href="index.jsp"><span 
class="menuTopOff">Index</span></a><img border="0" height="2" width="20" 
src="images/dotTrans.gif"><a href="viewjndi.jsp"><span 
class="menuTopOff">JNDI</span></a><img border="0" height="2" width="20" 
src="images/dotTrans.gif"><a href="viewejb.jsp"><span 
class="menuTopOff">EJB</span></a><img border="0" height="2" width="20" 
src="images/dotTrans.gif"><a href="viewclass.jsp"><span 
class="menuTopOff">Class</span></a><img border="0" height="2" width="20" 
src="images/dotTrans.gif"><a href="invokeobj.jsp"><span 
class="menuTopOff">Invoke</span></a><img border="0" height="2" width="20" 
src="images/dotTrans.gif"></td>
+        <td align="left" valign="top" height="20" width="120"><img border="0" 
height="2" width="10" src="images/dotTrans.gif"></td>
+    </tr>
+    <tr>
+        <td align="left" valign="top" bgcolor="#a9a5de" width="7"><img 
border="0" height="3" width="7" src="images/line_sm.gif"></td>
+        <td align="left" valign="top" height="3" width="40"><img border="0" 
height="3" width="40" src="images/line_light.gif"></td>
+        <td align="left" valign="top" height="3" width="430"><img border="0" 
height="3" width="430" src="images/line_light.gif"></td>
+        <td align="left" valign="top" height="3" width="120"><img height="1" 
width="1" border="0" src="images/dotTrans.gif"></td>
+    </tr>
+    <tr>
+        <td align="left" valign="top" bgcolor="#a9a5de" width="7">&nbsp;</td>
+        <td align="left" valign="top" width="40">&nbsp;</td>
+        <td valign="top" width="430" rowspan="4">
+            <table width="430" cellspacing="0" cellpadding="0" border="0" 
rows="2" cols="1">
+                <tr>
+                    <td align="left" valign="top"><br>
+                        <img width="200" vspace="0" 
src="./images/logo_ejb2.gif" hspace="0" height="55" border="0">
+                        <br>
+                        <img src="images/dotTrans.gif" hspace="0" height="7" 
border="0"><br>
+                            <span class="pageTitle">
+                            OpenEJB Enterprise JavaBeans Viewer
+                            </span>
+                        <br>
+                        <img src="images/dotTrans.gif" hspace="0" height="1" 
border="0"></td>
+                </tr>
+            </table>
+            <p>
+            </p>
+            <FONT SIZE="2">
+                <%
+    try{
+        String ejb = request.getParameter("ejb");
+        if (ejb == null) {
+            out.print("No EJB specified");
+        } else {
+            printEjb(ejb,out, session);
+        }
+    } catch (Exception e){
+        
+        out.println("FAIL: ");
+        out.print(e.getMessage());
+        throw e;
+        //return;
+    }
+%>
+<BR><BR>
+<BR>
+</FONT>
+
+            </td>
+            <td align="left" valign="top" height="5" width="120">
+
+
+                &nbsp;</td>
+        </tr>
+    </table>
+    </body>
+</html>
+
+<%!
+    private DeploymentInfo getDeployment(String id, 
javax.servlet.jsp.JspWriter out) {
+        // due to crazy class loader stuff, we need to use reflection
+        try {
+            Class<?> clazz = 
getClass().getClassLoader().getParent().getParent().loadClass("org.apache.openejb.loader.SystemInstance");
+//            out.print("clazz=" + clazz + "<br><br>");
+//            out.print("resource=" + clazz.getClassLoader().getResource("") + 
"<br><br>");
+
+            Method getMethod = clazz.getMethod("get");
+//            out.print("getMethod=" + getMethod + "<br><br>");
+
+            Object systemInstance = getMethod.invoke(null);
+//            out.print("systemInstance=" + systemInstance + "<br><br>");
+
+            Method getComponentMethod = clazz.getMethod("getComponent", 
Class.class);
+//            out.print("getComponentMethod=" + getComponentMethod + 
"<br><br>");
+
+//            Field field = clazz.getDeclaredField("components");
+//            field.setAccessible(true);
+//            Object components = field.get(systemInstance);
+//            out.print("components=" + components + "<br><br>");
+
+            ContainerSystem containerSystem = (ContainerSystem) 
getComponentMethod.invoke(systemInstance, ContainerSystem.class);
+//            out.print("containerSystem=" + containerSystem + "<br><br>");
+            if (containerSystem == null) {
+                return null;
+            }
+
+            DeploymentInfo ejb = containerSystem.getDeploymentInfo(id);
+//            out.print("ejb=" + ejb + "<br><br>");
+            return ejb;
+        } catch (Exception e) {
+            return null;
+        }
+    }
+
+    String tab = "&nbsp;&nbsp;&nbsp;&nbsp;";
+
+    public void printEjb(String name, javax.servlet.jsp.JspWriter out, 
HttpSession session) throws Exception {
+        String id = (name.startsWith("/")) ? name.substring(1, name.length()) 
: name;
+        DeploymentInfo ejb = getDeployment(id, out);
+
+        if (ejb == null) {
+            out.print("No such EJB: " + id);
+            return;
+        }
+        String type = null;
+
+        switch (ejb.getComponentType()) {
+            case CMP_ENTITY:
+                type = "EntityBean with Container-Managed Persistence";
+                break;
+            case BMP_ENTITY:
+                type = "EntityBean with Bean-Managed Persistence";
+                break;
+            case STATEFUL:
+                type = "Stateful SessionBean";
+                break;
+            case STATELESS:
+                type = "Stateless SessionBean";
+                break;
+            default:
+                type = "Unkown Bean Type";
+                break;
+        }
+        out.print("<b>" + type + "</b><br>");
+        out.print("<table>");
+        printRow("JNDI Name", name, out);
+        printRow("Remote Interface", getClassRef(ejb.getRemoteInterface()), 
out);
+        printRow("Home Interface", getClassRef(ejb.getHomeInterface()), out);
+        printRow("Bean Class", getClassRef(ejb.getBeanClass()), out);
+        if (ejb.getComponentType() == BeanType.BMP_ENTITY || 
ejb.getComponentType() == BeanType.CMP_ENTITY) {
+            printRow("Primary Key", getClassRef(ejb.getPrimaryKeyClass()), 
out);
+        }
+        String pepperImg = "<img src='images/pepper.gif' border='0'>";
+        out.print("</table>");
+        out.print("<br><br><b>Actions:</b><br>");
+        out.print("<table>");
+
+        // Browse JNDI with this ejb
+        //javax.servlet.http.HttpSession session = this.session;
+        //noinspection unchecked
+        Map<String, Object> objects = (Map<String, Object>) 
session.getAttribute("objects");
+        if (objects == null) {
+            objects = new HashMap<String, Object>();
+            session.setAttribute("objects", objects);
+        }
+
+        InitialContext ctx;
+        Properties p = new Properties();
+
+        p.put(Context.INITIAL_CONTEXT_FACTORY, 
"org.apache.openejb.client.LocalInitialContextFactory");
+        p.put("openejb.loader", "embed");
+
+        ctx = new InitialContext(p);
+        Object obj = ctx.lookup(name);
+        String objID = ejb.getHomeInterface().getName() + "@" + obj.hashCode();
+        objects.put(objID, obj);
+        String invokerURL = "<a href='invokeobj.jsp?obj=" + objID + "'>Invoke 
this EJB</a>";
+        printRow(pepperImg, invokerURL, out);
+
+        Context enc = ejb.getJndiEnc();
+        String ctxID = "enc" + enc.hashCode();
+        session.setAttribute(ctxID, enc);
+        String jndiURL = "<a href='viewjndi.jsp?ctx=" + ctxID + "'>Browse this 
EJB's private JNDI namespace</a>";
+        printRow(pepperImg, jndiURL, out);
+        out.print("</table>");
+
+    }
+
+    protected void printRow(String col1, String col2, 
javax.servlet.jsp.JspWriter out) throws IOException {
+        out.print("<tr><td><font size='2'>");
+        out.print(col1);
+        out.print("</font></td><td><font size='2'>");
+        out.print(col2);
+        out.print("</font></td></tr>");
+    }
+
+    public String getClassRef(Class clazz) throws Exception {
+        String name = clazz.getName();
+        return "<a href='viewclass.jsp?class=" + name + "'>" + name + "</a>";
+    }
+
+    public String getShortClassRef(Class clazz) throws Exception {
+        if (clazz.isPrimitive()) {
+            return "<font color='gray'>" + clazz.getName() + "</font>";
+        } else if (clazz.isArray() && clazz.getComponentType().isPrimitive()) {
+            return "<font color='gray'>" + clazz.getComponentType() + 
"[]</font>";
+        } else if (clazz.isArray()) {
+            String name = clazz.getComponentType().getName();
+            int dot = name.lastIndexOf(".") + 1;
+            String shortName = name.substring(dot, name.length());
+            return "<a href='viewclass.jsp?class=" + name + "'>" + shortName + 
"[]</a>";
+        } else {
+            String name = clazz.getName();
+            int dot = name.lastIndexOf(".") + 1;
+            String shortName = name.substring(dot, name.length());
+            return "<a href='viewclass.jsp?class=" + name + "'>" + shortName + 
"</a>";
+        }
+    }
+
+%>
+

Added: 
openejb/trunk/openejb3/assembly/openejb-tomcat/src/main/resources/viewjndi.jsp
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb3/assembly/openejb-tomcat/src/main/resources/viewjndi.jsp?rev=578481&view=auto
==============================================================================
--- 
openejb/trunk/openejb3/assembly/openejb-tomcat/src/main/resources/viewjndi.jsp 
(added)
+++ 
openejb/trunk/openejb3/assembly/openejb-tomcat/src/main/resources/viewjndi.jsp 
Sat Sep 22 12:37:19 2007
@@ -0,0 +1,275 @@
+<%@ page import="
+javax.naming.Context,
+javax.naming.InitialContext,
+javax.naming.NameClassPair,
+javax.naming.NamingEnumeration,
+java.util.Properties
+"%>
+<%@ page import="javax.naming.NamingException" %>
+<%@ page import="java.lang.reflect.Method" %>
+<%@ page import="java.lang.reflect.Field" %>
+<html>
+<head>
+    <META http-equiv="Content-Type" content="text/html; charset=UTF-8">
+    <title>OpenEJB Tomcat Integration/1.0</title>
+    <link href="default.css" rel="stylesheet">
+</head>
+<body marginwidth="0" marginheight="0" leftmargin="0" bottommargin="0" 
topmargin="0" vlink="#6763a9" link="#6763a9" bgcolor="#ffffff">
+<a name="top"></a>
+<table width="712" cellspacing="0" cellpadding="0" border="0">
+    <tr>
+        <td bgcolor="#5A5CB8" align="left" valign="top" width="7"><img 
height="9" width="1" border="0" src="images/dotTrans.gif"></td>
+        <td bgcolor="#5A5CB8" align="left" valign="top" width="40"><img 
border="0" height="6" width="40" src="images/dotTrans.gif"></td>
+        <td bgcolor="#5A5CB8" align="left" valign="top" height="2" 
width="430"><img border="0" height="6" width="430" src="images/top_2.gif"></td>
+        <td bgcolor="#E24717" align="left" valign="top" height="2" 
width="120"><img src="images/top_3.gif" width="120" height="6" border="0"></td>
+    </tr>
+    <tr>
+        <td bgcolor="#5A5CB8" align="left" valign="top" bgcolor="#ffffff" 
width="13"><img border="0" height="15" width="13" 
src="images/dotTrans.gif"></td>
+        <td align="left" valign="top" width="40"><img border="0" height="1" 
width="1" src="images/dotTrans.gif"></td>
+        <td align="left" valign="middle" width="430"><a 
href="http://openejb.apache.org";><span 
class="menuTopOff">OpenEJB</span></a><img border="0" height="2" width="20" 
src="images/dotTrans.gif"><a href="index.jsp"><span 
class="menuTopOff">Index</span></a><img border="0" height="2" width="20" 
src="images/dotTrans.gif"><a href="viewjndi.jsp"><span 
class="menuTopOff">JNDI</span></a><img border="0" height="2" width="20" 
src="images/dotTrans.gif"><a href="viewejb.jsp"><span 
class="menuTopOff">EJB</span></a><img border="0" height="2" width="20" 
src="images/dotTrans.gif"><a href="viewclass.jsp"><span 
class="menuTopOff">Class</span></a><img border="0" height="2" width="20" 
src="images/dotTrans.gif"><a href="invokeobj.jsp"><span 
class="menuTopOff">Invoke</span></a><img border="0" height="2" width="20" 
src="images/dotTrans.gif"></td>
+        <td align="left" valign="top" height="20" width="120"><img border="0" 
height="2" width="10" src="images/dotTrans.gif"></td>
+    </tr>
+    <tr>
+        <td align="left" valign="top" bgcolor="#a9a5de" width="7"><img 
border="0" height="3" width="7" src="images/line_sm.gif"></td>
+        <td align="left" valign="top" height="3" width="40"><img border="0" 
height="3" width="40" src="images/line_light.gif"></td>
+        <td align="left" valign="top" height="3" width="430"><img border="0" 
height="3" width="430" src="images/line_light.gif"></td>
+        <td align="left" valign="top" height="3" width="120"><img height="1" 
width="1" border="0" src="images/dotTrans.gif"></td>
+    </tr>
+    <tr>
+        <td align="left" valign="top" bgcolor="#a9a5de" width="7">&nbsp;</td>
+        <td align="left" valign="top" width="40">&nbsp;</td>
+        <td valign="top" width="430" rowspan="4">
+            <table width="430" cellspacing="0" cellpadding="0" border="0" 
rows="2" cols="1">
+                <tr>
+                    <td align="left" valign="top"><br>
+                        <img width="200" vspace="0" 
src="./images/logo_ejb2.gif" hspace="0" height="55" border="0">
+                        <br>
+                        <img src="images/dotTrans.gif" hspace="0" height="7" 
border="0"><br>
+                            <span class="pageTitle">
+                            OpenEJB JNDI Namespace Browser
+                            </span>
+                        <br>
+                        <img src="images/dotTrans.gif" hspace="0" height="1" 
border="0"></td>
+                </tr>
+            </table>
+            <p>
+            </p>
+            <FONT SIZE="2">
+                <%
+    try{
+        String selected = request.getParameter("selected");
+        if (selected == null) {
+            selected = "";
+        } 
+
+        ctxID = request.getParameter("ctx");
+        ctx = null;
+
+        if (ctxID == null) {
+            Properties p = new Properties();
+            p.put(Context.INITIAL_CONTEXT_FACTORY, 
"org.apache.openejb.client.LocalInitialContextFactory");
+            p.put("openejb.loader", "embed");
+            try {
+                ctx = new InitialContext( p );
+                ctxID = null;
+                out.print("<b>OpenEJB Global JNDI Namespace</b><br><br>");
+            } catch(Exception e) {
+                out.print("<b>OpenEJB Not Installed</b><br><br>");             
   
+            }
+        } else {
+            ctx = (Context)session.getAttribute(ctxID);
+            if (ctxID.startsWith("enc")) {
+%>
+<b>JNDI Environment Naming Context (ENC)</b>
+<a href="enc-help.html">[Info]</A>
+<br><BR>
+This is the private namespace of an Enterprise JavaBean. 
+<BR><BR>
+<%
+            }
+        }
+
+        if (ctx != null) {
+            Node root = new RootNode();
+            buildNode(root,ctx);
+
+            printNodes(root, out, "",selected);
+        }
+    } catch (Exception e) {
+        out.println("FAIL");
+        throw e;
+        //return;
+    }
+%>
+</FONT>
+
+            </td>
+            <td align="left" valign="top" height="5" width="120">
+
+
+                &nbsp;</td>
+        </tr>
+    </table>
+    </body>
+</html>
+
+<%!
+    String ctxID;
+    Context ctx;
+
+    class Node {
+        static final int CONTEXT = 1;
+        static final int BEAN = 2;
+        static final int OTHER = 3;
+        Node parent;
+        Node[] children = new Node[0];
+        String name;
+        int type = 0;
+
+        public String getID() {
+            if (parent instanceof RootNode) {
+                return name;
+            } else {
+                return parent.getID() + "/" + name;
+            }
+        }
+
+        public String getName() {
+            return name;
+        }
+
+        public int getType() {
+            return type;
+        }
+
+        public void addChild(Node child) {
+            int len = children.length;
+            Node[] newChildren = new Node[len + 1];
+            System.arraycopy(children, 0, newChildren, 0, len);
+            newChildren[len] = child;
+            children = newChildren;
+            child.parent = this;
+        }
+    }
+
+    class RootNode extends Node {
+        public String getID() {
+            return "";
+        }
+
+        public String getName() {
+            return "";
+        }
+
+        public int getType() {
+            return Node.CONTEXT;
+        }
+    }
+
+    public void buildNode(Node parent, Context ctx) throws Exception {
+        NamingEnumeration namingEnumeration = ctx.list("");
+        while (namingEnumeration.hasMoreElements()) {
+            NameClassPair pair = (NameClassPair) namingEnumeration.next();
+            Node node = new Node();
+            parent.addChild(node);
+            node.name = pair.getName();
+
+            Object obj = lookup(ctx, node.getName());
+            if (obj instanceof Context) {
+                node.type = Node.CONTEXT;
+                buildNode(node, (Context) obj);
+            } else if (obj instanceof java.rmi.Remote) {
+                node.type = Node.BEAN;
+            } else {
+                node.type = Node.OTHER;
+            }
+        }
+    }
+
+    String openImg = "<img src='images/TreeOpen.gif' border='0'>";
+    String closedImg = "<img src='images/TreeClosed.gif' border='0'>";
+    String ejbImg = "<img src='images/ejb.gif' border='0'>";
+    String javaImg = "<img src='images/JavaCup.gif' border='0'>";
+
+
+    public void printNodes(Node node, javax.servlet.jsp.JspWriter out, String 
tabs, String selected) throws Exception {
+        switch (node.getType()) {
+            case Node.CONTEXT:
+                printContextNode(node, out, tabs, selected);
+                break;
+            case Node.BEAN:
+                printBeanNode(node, out, tabs, selected);
+                break;
+            default:
+                printOtherNode(node, out, tabs, selected);
+                break;
+        }
+
+    }
+
+    public void printContextNode(Node node, javax.servlet.jsp.JspWriter out, 
String tabs, String selected) throws Exception {
+        String id = node.getID();
+        if (selected.startsWith(id)) {
+            if (ctxID != null) {
+                out.print(tabs + "<a href='viewjndi.jsp?ctx=" + ctxID + 
"&selected=" + id + "'>" + openImg + "&nbsp;&nbsp;" + node.getName() + 
"</a><br>");
+            } else {
+                out.print(tabs + "<a href='viewjndi.jsp?selected=" + id + "'>" 
+ openImg + "&nbsp;&nbsp;" + node.getName() + "</a><br>");
+            }
+            for (int i = 0; i < node.children.length; i++) {
+                Node child = node.children[i];
+                printNodes(child, out, tabs + 
"&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;", selected);
+            }
+        } else {
+            if (ctxID != null) {
+                out.print(tabs + "<a href='viewjndi.jsp?ctx=" + ctxID + 
"&selected=" + id + "'>" + closedImg + "&nbsp;&nbsp;" + node.getName() + 
"</a><br>");
+            } else {
+                out.print(tabs + "<a href='viewjndi.jsp?selected=" + id + "'>" 
+ closedImg + "&nbsp;&nbsp;" + node.getName() + "</a><br>");
+            }
+        }
+    }
+
+    public void printBeanNode(Node node, javax.servlet.jsp.JspWriter out, 
String tabs, String selected) throws Exception {
+        String id = node.getID();
+        if (ctxID != null && ctxID.startsWith("enc")) {
+            // HACK!
+            try {
+                Object ejb = lookup(ctx, id);
+                Object deploymentID = getDeploymentId(ejb);
+                out.print(tabs + "<a href='viewejb.jsp?ejb=" + deploymentID + 
"'>" + ejbImg + "&nbsp;&nbsp;" + node.getName() + "</a><br>");
+            } catch (Exception e) {
+                out.print(tabs + ejbImg + "&nbsp;&nbsp;" + node.getName() + 
"<br>");
+            }
+        } else {
+            out.print(tabs + "<a href='viewejb.jsp?ejb=" + id + "'>" + ejbImg 
+ "&nbsp;&nbsp;" + node.getName() + "</a><br>");
+        }
+    }
+
+    public void printOtherNode(Node node, javax.servlet.jsp.JspWriter out, 
String tabs, String selected) throws Exception {
+        String id = node.getID();
+        Object obj = lookup(ctx, id);
+        String clazz = obj.getClass().getName();
+        out.print(tabs + "<a href='viewclass.jsp?class=" + clazz + "'>" + 
javaImg + "&nbsp;&nbsp;" + node.getName() + "</a><br>");
+    }
+
+    private Object getDeploymentId(Object ejb) throws Exception {
+        Class<?> proxyManagerClass = 
Class.forName("org.apache.openejb.util.proxy.ProxyManager");
+        Method getInvocationHandlerMethod = 
proxyManagerClass.getMethod("getInvocationHandler", Object.class);
+        Object handler = getInvocationHandlerMethod.invoke(null, ejb);
+
+        Class<?> baseEjbProxyHandler = 
Class.forName("org.apache.openejb.core.ivm.BaseEjbProxyHandler");
+        Field field = baseEjbProxyHandler.getField("deploymentID");
+        Object deploymentID = field.get(handler);
+        return deploymentID;
+    }
+
+    private Object lookup(Context ctx, String name) throws NamingException {
+        try {
+            Object obj = ctx.lookup(name);
+            return obj;
+        } catch (Exception e) {
+            return "ERROR: " + e.getMessage();
+        }
+    }
+
+%>
+

Modified: 
openejb/trunk/openejb3/container/openejb-loader/src/main/java/org/apache/openejb/loader/OpenEJBListener.java
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-loader/src/main/java/org/apache/openejb/loader/OpenEJBListener.java?rev=578481&r1=578480&r2=578481&view=diff
==============================================================================
--- 
openejb/trunk/openejb3/container/openejb-loader/src/main/java/org/apache/openejb/loader/OpenEJBListener.java
 (original)
+++ 
openejb/trunk/openejb3/container/openejb-loader/src/main/java/org/apache/openejb/loader/OpenEJBListener.java
 Sat Sep 22 12:37:19 2007
@@ -57,8 +57,10 @@
             File libDir = new File(webappDir, "lib");
             String catalinaHome = System.getProperty("catalina.home");
             properties.setProperty("openejb.home", catalinaHome);
+            System.setProperty("openejb.home", catalinaHome);
             String catalinaBase = System.getProperty("catalina.base");
             properties.setProperty("openejb.base", catalinaBase);
+            System.setProperty("openejb.base", catalinaBase);
             String libPath = libDir.getAbsolutePath();
             properties.setProperty("openejb.libs", libPath);
 


Reply via email to