[jboss-cvs] JBossAS SVN: r95357 - trunk/tomcat/src/main/java/org/jboss/web/tomcat/service/deployers.

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

Author: remy.maucherat at jboss.com
Date: 2009-10-21 22:30:09 -0400 (Wed, 21 Oct 2009)
New Revision: 95357

Modified:
   trunk/tomcat/src/main/java/org/jboss/web/tomcat/service/deployers/JBossContextConfig.java
Log:
- Pass the description.

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-22 01:57:30 UTC (rev 95356)
+++ trunk/tomcat/src/main/java/org/jboss/web/tomcat/service/deployers/JBossContextConfig.java	2009-10-22 02:30:09 UTC (rev 95357)
@@ -64,6 +64,7 @@
 import org.apache.catalina.startup.ContextConfig;
 import org.apache.naming.resources.ProxyDirContext;
 import org.apache.tomcat.util.IntrospectionUtils;
+import org.jboss.annotation.javaee.Icon;
 import org.jboss.deployers.structure.spi.DeploymentUnit;
 import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
 import org.jboss.deployment.ServletContainerInitializerDeployer;
@@ -914,6 +915,10 @@
             tagLibraryInfo.setJspversion(tldMetaData.getJspVersion());
          tagLibraryInfo.setShortname(tldMetaData.getShortName());
          tagLibraryInfo.setUri(tldMetaData.getUri());
+         if (tldMetaData.getDescriptionGroup() != null)
+         {
+            tagLibraryInfo.setInfo(tldMetaData.getDescriptionGroup().getDescription());
+         }
          // Listener
          if (tldMetaData.getListeners() != null)
          {
@@ -948,6 +953,20 @@
                if (tagMetaData.getBodyContent() != null)
                   tagInfo.setBodyContent(tagMetaData.getBodyContent().toString());
                tagInfo.setDynamicAttributes(tagMetaData.getDynamicAttributes());
+               // Description group
+               if (tagMetaData.getDescriptionGroup() != null)
+               {
+                  DescriptionGroupMetaData descriptionGroup = tagMetaData.getDescriptionGroup();
+                  if (descriptionGroup.getIcons() != null && descriptionGroup.getIcons().value() != null
+                        && (descriptionGroup.getIcons().value().length > 0))
+                  {
+                     Icon icon = descriptionGroup.getIcons().value()[0];
+                     tagInfo.setLargeIcon(icon.largeIcon());
+                     tagInfo.setSmallIcon(icon.smallIcon());
+                  }
+                  tagInfo.setInfoString(descriptionGroup.getDescription());
+                  tagInfo.setDisplayName(descriptionGroup.getDisplayName());
+               }
                // Variable
                if (tagMetaData.getVariables() != null)
                {