From e523f3f3d6b5c49f9e5c138d08f5d1f6e77c3152 Mon Sep 17 00:00:00 2001
From: remm <remm@13f79535-47bb-0310-9956-ffa450edef68>
Date: Wed, 12 Apr 2006 13:32:02 +0000
Subject: [PATCH] - Add resource injection for all annotations that are
 supposed to be supported by the web tier.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc6.0.x/trunk@393457 13f79535-47bb-0310-9956-ffa450edef68
---
 .../apache/catalina/startup/WebAnnotationSet.java  |  3 --
 .../apache/catalina/util/AnnotationProcessor.java  | 41 ++++++++++++++++------
 2 files changed, 30 insertions(+), 14 deletions(-)

diff --git a/java/org/apache/catalina/startup/WebAnnotationSet.java b/java/org/apache/catalina/startup/WebAnnotationSet.java
index 8ed63de74..882b60613 100644
--- a/java/org/apache/catalina/startup/WebAnnotationSet.java
+++ b/java/org/apache/catalina/startup/WebAnnotationSet.java
@@ -33,9 +33,6 @@ import org.apache.catalina.deploy.ContextService;
 import org.apache.catalina.deploy.FilterDef;
 import org.apache.catalina.deploy.MessageDestinationRef;
 
-//import javax.ejb.EJB;
-//import javax.xml.ws.WebServiceRef;
-
 /**
  * <p><strong>AnnotationSet</strong> for processing the annotations of the web application
  * classes (<code>/WEB-INF/classes</code> and <code>/WEB-INF/lib</code>).</p>
diff --git a/java/org/apache/catalina/util/AnnotationProcessor.java b/java/org/apache/catalina/util/AnnotationProcessor.java
index 05e4f6a69..a7426c97b 100644
--- a/java/org/apache/catalina/util/AnnotationProcessor.java
+++ b/java/org/apache/catalina/util/AnnotationProcessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 1999,2004 The Apache Software Foundation.
+ * Copyright 2006 The Apache Software Foundation.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,9 +21,13 @@ import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
 
+import javax.annotation.EJB;
 import javax.annotation.PostConstruct;
 import javax.annotation.Resource;
 import javax.naming.NamingException;
+import javax.persistence.PersistenceContext;
+import javax.persistence.PersistenceUnit;
+import javax.xml.ws.WebServiceRef;
 
 import org.apache.tomcat.util.IntrospectionUtils;
 
@@ -116,18 +120,25 @@ public class AnnotationProcessor {
                 Resource annotation = (Resource) fields[i].getAnnotation(Resource.class);
                 lookupFieldResource(context, instance, fields[i], annotation.name());
             }
-            /*
             if (fields[i].isAnnotationPresent(EJB.class)) {
                 EJB annotation = (EJB) fields[i].getAnnotation(EJB.class);
-                lookupOnFieldResource(context, instance, fields[i], annotation.name());
+                lookupFieldResource(context, instance, fields[i], annotation.name());
             }
-            
             if (fields[i].isAnnotationPresent(WebServiceRef.class)) {
                 WebServiceRef annotation = 
                     (WebServiceRef) fields[i].getAnnotation(WebServiceRef.class);
-                lookupOnFieldResource(context, instance, fields[i], annotation.name());
+                lookupFieldResource(context, instance, fields[i], annotation.name());
+            }
+            if (fields[i].isAnnotationPresent(PersistenceContext.class)) {
+                PersistenceContext annotation = 
+                    (PersistenceContext) fields[i].getAnnotation(PersistenceContext.class);
+                lookupFieldResource(context, instance, fields[i], annotation.name());
+            }
+            if (fields[i].isAnnotationPresent(PersistenceUnit.class)) {
+                PersistenceUnit annotation = 
+                    (PersistenceUnit) fields[i].getAnnotation(PersistenceUnit.class);
+                lookupFieldResource(context, instance, fields[i], annotation.name());
             }
-            */
         }
         
         // Initialize methods annotations
@@ -137,18 +148,26 @@ public class AnnotationProcessor {
                 Resource annotation = (Resource) methods[i].getAnnotation(Resource.class);
                 lookupMethodResource(context, instance, methods[i], annotation.name());
             }
-            /*
             if (methods[i].isAnnotationPresent(EJB.class)) {
                 EJB annotation = (EJB) methods[i].getAnnotation(EJB.class);
-                lookupOnMethodResource(context, instance, methods[i], annotation.name());
+                lookupMethodResource(context, instance, methods[i], annotation.name());
             }
             if (methods[i].isAnnotationPresent(WebServiceRef.class)) {
                 WebServiceRef annotation = 
                     (WebServiceRef) methods[i].getAnnotation(WebServiceRef.class);
-                lookupOnMethodResource(context, instance, methods[i], annotation.name());
+                lookupMethodResource(context, instance, methods[i], annotation.name());
+            }
+            if (methods[i].isAnnotationPresent(PersistenceContext.class)) {
+                PersistenceContext annotation = 
+                    (PersistenceContext) methods[i].getAnnotation(PersistenceContext.class);
+                lookupMethodResource(context, instance, methods[i], annotation.name());
             }
-            */
-        }            
+            if (methods[i].isAnnotationPresent(PersistenceUnit.class)) {
+                PersistenceUnit annotation = 
+                    (PersistenceUnit) methods[i].getAnnotation(PersistenceUnit.class);
+                lookupMethodResource(context, instance, methods[i], annotation.name());
+            }
+        }
 
     }
     
-- 
2.11.0