svn commit: r578265 - in /openejb/branches/3.0-beta-1/examples/servlet-samples/src/main/java/org/apache/openejb/examples/servlet: AnnotatedEJB.java AnnotatedEJBLocal.java AnnotatedEJBRemote.java AnnotatedServlet.java

[dain]

Author: dain
Date: Fri Sep 21 13:45:22 2007
New Revision: 578265

URL: http://svn.apache.org/viewvc?rev=578265&view=rev
Log:
Merging 577901 from trunk
Add remote interface to example annotated servlet

Added:
    
openejb/branches/3.0-beta-1/examples/servlet-samples/src/main/java/org/apache/openejb/examples/servlet/AnnotatedEJBRemote.java
      - copied unchanged from r577901, 
openejb/trunk/openejb3/examples/servlet-samples/src/main/java/org/apache/openejb/examples/servlet/AnnotatedEJBRemote.java
Modified:
    
openejb/branches/3.0-beta-1/examples/servlet-samples/src/main/java/org/apache/openejb/examples/servlet/AnnotatedEJB.java
    
openejb/branches/3.0-beta-1/examples/servlet-samples/src/main/java/org/apache/openejb/examples/servlet/AnnotatedEJBLocal.java
    
openejb/branches/3.0-beta-1/examples/servlet-samples/src/main/java/org/apache/openejb/examples/servlet/AnnotatedServlet.java

Modified: 
openejb/branches/3.0-beta-1/examples/servlet-samples/src/main/java/org/apache/openejb/examples/servlet/AnnotatedEJB.java
URL: 
http://svn.apache.org/viewvc/openejb/branches/3.0-beta-1/examples/servlet-samples/src/main/java/org/apache/openejb/examples/servlet/AnnotatedEJB.java?rev=578265&r1=578264&r2=578265&view=diff
==============================================================================
--- 
openejb/branches/3.0-beta-1/examples/servlet-samples/src/main/java/org/apache/openejb/examples/servlet/AnnotatedEJB.java
 (original)
+++ 
openejb/branches/3.0-beta-1/examples/servlet-samples/src/main/java/org/apache/openejb/examples/servlet/AnnotatedEJB.java
 Fri Sep 21 13:45:22 2007
@@ -22,7 +22,7 @@
 import javax.annotation.Resource;
 
 @Stateless
-public class AnnotatedEJB implements AnnotatedEJBLocal {
+public class AnnotatedEJB implements AnnotatedEJBLocal, AnnotatedEJBRemote {
     @Resource
     private DataSource ds;
 

Modified: 
openejb/branches/3.0-beta-1/examples/servlet-samples/src/main/java/org/apache/openejb/examples/servlet/AnnotatedEJBLocal.java
URL: 
http://svn.apache.org/viewvc/openejb/branches/3.0-beta-1/examples/servlet-samples/src/main/java/org/apache/openejb/examples/servlet/AnnotatedEJBLocal.java?rev=578265&r1=578264&r2=578265&view=diff
==============================================================================
--- 
openejb/branches/3.0-beta-1/examples/servlet-samples/src/main/java/org/apache/openejb/examples/servlet/AnnotatedEJBLocal.java
 (original)
+++ 
openejb/branches/3.0-beta-1/examples/servlet-samples/src/main/java/org/apache/openejb/examples/servlet/AnnotatedEJBLocal.java
 Fri Sep 21 13:45:22 2007
@@ -18,7 +18,9 @@
 package org.apache.openejb.examples.servlet;
 
 import javax.sql.DataSource;
+import javax.ejb.Local;
 
[EMAIL PROTECTED]
 public interface AnnotatedEJBLocal {
     String getName();
 

Modified: 
openejb/branches/3.0-beta-1/examples/servlet-samples/src/main/java/org/apache/openejb/examples/servlet/AnnotatedServlet.java
URL: 
http://svn.apache.org/viewvc/openejb/branches/3.0-beta-1/examples/servlet-samples/src/main/java/org/apache/openejb/examples/servlet/AnnotatedServlet.java?rev=578265&r1=578264&r2=578265&view=diff
==============================================================================
--- 
openejb/branches/3.0-beta-1/examples/servlet-samples/src/main/java/org/apache/openejb/examples/servlet/AnnotatedServlet.java
 (original)
+++ 
openejb/branches/3.0-beta-1/examples/servlet-samples/src/main/java/org/apache/openejb/examples/servlet/AnnotatedServlet.java
 Fri Sep 21 13:45:22 2007
@@ -25,25 +25,53 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.sql.DataSource;
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
 import java.io.IOException;
 
 public class AnnotatedServlet extends HttpServlet {
     @EJB
-    private AnnotatedEJBLocal ejb;
+    private AnnotatedEJBLocal localEJB;
+
+    @EJB
+    private AnnotatedEJBRemote remoteEJB;
 
     @Resource
     private DataSource ds;
 
+
     protected void doGet(HttpServletRequest request, HttpServletResponse 
response) throws ServletException, IOException {
         response.setContentType("text/plain");
         ServletOutputStream out = response.getOutputStream();
 
-        out.println("@EJB=" + ejb);
-        if (ejb != null) {
-            out.println("@EJB.getName()=" + ejb.getName());
-            out.println("@EJB.getDs()=" + ejb.getDs());
+        out.println("Local EJB");
+        out.println("@EJB=" + localEJB);
+        if (localEJB != null) {
+            out.println("@EJB.getName()=" + localEJB.getName());
+            out.println("@EJB.getDs()=" + localEJB.getDs());
+        }
+        out.println("JNDI=" + lookupField("localEJB"));
+        out.println();
+
+        out.println("Remote EJB");
+        out.println("@EJB=" + remoteEJB);
+        if (localEJB != null) {
+            out.println("@EJB.getName()=" + remoteEJB.getName());
         }
+        out.println("JNDI=" + lookupField("remoteEJB"));
+        out.println();
+
 
+        out.println("DataSource");
         out.println("@Resource=" + ds);
+        out.println("JNDI=" + lookupField("ds"));
+    }
+
+    private Object lookupField(String name) {
+        try {
+            return new InitialContext().lookup("java:comp/env/" + 
getClass().getName() + "/" + name);
+        } catch (NamingException e) {
+            return null;
+        }
     }
 }