[jboss-cvs] JBossAS SVN: r77235 - trunk/tomcat/src/main/org/jboss/web/tomcat/service/injection.

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

Author: emuckenhuber
Date: 2008-08-20 08:12:54 -0400 (Wed, 20 Aug 2008)
New Revision: 77235

Modified:
   trunk/tomcat/src/main/org/jboss/web/tomcat/service/injection/WebResourceHandler.java
Log:
[JBAS-5626] fix url injection

Modified: trunk/tomcat/src/main/org/jboss/web/tomcat/service/injection/WebResourceHandler.java
===================================================================
--- trunk/tomcat/src/main/org/jboss/web/tomcat/service/injection/WebResourceHandler.java	2008-08-20 10:40:48 UTC (rev 77234)
+++ trunk/tomcat/src/main/org/jboss/web/tomcat/service/injection/WebResourceHandler.java	2008-08-20 12:12:54 UTC (rev 77235)
@@ -83,7 +83,7 @@
          this.checkEncInjectors = checkEncInjectors;
       }
       
-      private void createURLInjector(String encName, String mappedName, InjectionContainer container)
+      private static void createURLInjector(String encName, String mappedName, InjectionContainer container)
       {
          assert encName.length() > 0 : "encName is empty";
          assert mappedName.length() > 0 : "mappedName is empty";
@@ -172,6 +172,12 @@
                   throw new RuntimeException("mapped-name is required for " + envRef.getResourceRefName() + " of deployment " + container.getIdentifier());
                }
             }
+            else if(URL.class.getName().equals(envRef.getType()))
+            {
+               createURLInjector(encName, envRef.getMappedName(), container);
+               InjectionUtil.injectionTarget(encName, envRef, container, container.getEncInjections());
+               continue;
+            }
             else if(envRef.getResUrl() != null)
             {
                try