[jboss-cvs] JBossAS SVN: r95311 - in trunk: tomcat/src/main/java/org/jboss/web/tomcat/service/deployers and 1 other directory.

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

Author: remy.maucherat at jboss.com
Date: 2009-10-21 11:56:25 -0400 (Wed, 21 Oct 2009)
New Revision: 95311

Modified:
   trunk/server/src/main/java/org/jboss/deployment/TldParsingDeployer.java
   trunk/tomcat/src/main/java/org/jboss/web/tomcat/service/deployers/JBossContextConfig.java
Log:
- Populate tag files (ooops).
- Skip over implicit taglibs (which are actually fake TLDs that only contain a version number, 
  and are supposed to be parsed - and raise an error - only at translation time; whatever ...).

Modified: trunk/server/src/main/java/org/jboss/deployment/TldParsingDeployer.java
===================================================================
--- trunk/server/src/main/java/org/jboss/deployment/TldParsingDeployer.java	2009-10-21 15:50:04 UTC (rev 95310)
+++ trunk/server/src/main/java/org/jboss/deployment/TldParsingDeployer.java	2009-10-21 15:56:25 UTC (rev 95311)
@@ -51,4 +51,14 @@
       unit.addAttachment(file.toURL().toString(), metaData, getOutput());
    }
 
+   protected TldMetaData parse(VirtualFile file) throws Exception {
+      if (file == null)
+         throw new IllegalArgumentException("Null file");
+
+      if (file.getName().equals("implicit.tld") && (file.getPathName().indexOf("/WEB-INF/tags/") != -1)) {
+         return new TldMetaData();
+      } else {
+         return super.parse(file);
+      }
+   }
 }

Modified: trunk/tomcat/src/main/java/org/jboss/web/tomcat/service/deployers/JBossContextConfig.java
===================================================================
--- trunk/tomcat/src/main/java/org/jboss/web/tomcat/service/deployers/JBossContextConfig.java	2009-10-21 15:50:04 UTC (rev 95310)
+++ trunk/tomcat/src/main/java/org/jboss/web/tomcat/service/deployers/JBossContextConfig.java	2009-10-21 15:56:25 UTC (rev 95311)
@@ -56,6 +56,7 @@
 import org.apache.catalina.deploy.SessionCookie;
 import org.apache.catalina.deploy.jsp.FunctionInfo;
 import org.apache.catalina.deploy.jsp.TagAttributeInfo;
+import org.apache.catalina.deploy.jsp.TagFileInfo;
 import org.apache.catalina.deploy.jsp.TagInfo;
 import org.apache.catalina.deploy.jsp.TagLibraryInfo;
 import org.apache.catalina.deploy.jsp.TagLibraryValidatorInfo;
@@ -103,6 +104,7 @@
 import org.jboss.metadata.web.spec.ServletSecurityMetaData;
 import org.jboss.metadata.web.spec.SessionConfigMetaData;
 import org.jboss.metadata.web.spec.SessionTrackingModeType;
+import org.jboss.metadata.web.spec.TagFileMetaData;
 import org.jboss.metadata.web.spec.TagMetaData;
 import org.jboss.metadata.web.spec.TaglibMetaData;
 import org.jboss.metadata.web.spec.TldMetaData;
@@ -981,6 +983,17 @@
                tagLibraryInfo.addTagInfo(tagInfo);
             }
          }
+         // Tag files
+         if (tldMetaData.getTagFiles() != null)
+         {
+            for (TagFileMetaData tagFileMetaData : tldMetaData.getTagFiles())
+            {
+               TagFileInfo tagFileInfo = new TagFileInfo();
+               tagFileInfo.setName(tagFileMetaData.getName());
+               tagFileInfo.setPath(tagFileMetaData.getPath());
+               tagLibraryInfo.addTagFileInfo(tagFileInfo);
+            }
+         }
          // Function
          if (tldMetaData.getFunctions() != null)
          {