[Jboss-cvs] JBossAS SVN: r55831 - in trunk/tomcat/src: main/org/jboss/web/tomcat/tc6 resources

[jboss-cvs-commits at lists.jboss.org]

Author: bill.burke at jboss.com
Date: 2006-08-11 14:56:53 -0400 (Fri, 11 Aug 2006)
New Revision: 55831

Modified:
   trunk/tomcat/src/main/org/jboss/web/tomcat/tc6/TomcatInjectionContainer.java
   trunk/tomcat/src/resources/web.xml
Log:
turn on JDK 1.5 compiler by default
Small update to injeciton container

Modified: trunk/tomcat/src/main/org/jboss/web/tomcat/tc6/TomcatInjectionContainer.java
===================================================================
--- trunk/tomcat/src/main/org/jboss/web/tomcat/tc6/TomcatInjectionContainer.java	2006-08-11 18:53:49 UTC (rev 55830)
+++ trunk/tomcat/src/main/org/jboss/web/tomcat/tc6/TomcatInjectionContainer.java	2006-08-11 18:56:53 UTC (rev 55831)
@@ -181,9 +181,11 @@
     */
    public void processAnnotations(Object object) throws IllegalAccessException, InvocationTargetException, NamingException
    {
+      log.debug("**************** Processing annotations for: " + object.getClass().getName());
       Map<AccessibleObject, Injector> injectors = resolvedClassInjections.get(object.getClass().getName());
       if (injectors == null)
       {
+         log.debug("-- there was no prior annotation preprocessing done");
          encInjectors.recordAdded();
          // let's assume this is a JSP or some other artifact that cannot be found within XML
          injectors = InjectionUtil.processAnnotations(this, handlers, object.getClass());
@@ -199,8 +201,13 @@
             encInjectors.clearAdded();
          }
       }
-      if (injectors == null || injectors.size() == 0) return;
+      if (injectors == null || injectors.size() == 0)
+      {
+         log.debug("-- no injectors found: " + injectors);
+         return;
+      }
 
+      log.debug("-- doing injections");
       for (Injector injector : injectors.values())
       {
          injector.inject(object);

Modified: trunk/tomcat/src/resources/web.xml
===================================================================
--- trunk/tomcat/src/resources/web.xml	2006-08-11 18:53:49 UTC (rev 55830)
+++ trunk/tomcat/src/resources/web.xml	2006-08-11 18:56:53 UTC (rev 55831)
@@ -259,12 +259,11 @@
          <param-name>xpoweredBy</param-name>
          <param-value>false</param-value>
       </init-param>
-      <!-- Uncomment to use jdk1.5 features in jsp pages
+      <!-- Uncomment to use jdk1.5 features in jsp pages -->
       <init-param>
          <param-name>compilerSourceVM</param-name>
          <param-value>1.5</param-value>
       </init-param>
-      -->
       <!-- Use a custom options class to allow the shared tag lib descriptors
        to be loaded from jars in the tomcat sar conf/tlds directory. The
        standard options implementation can only find taglibs based on the