[jboss-cvs] JBossAS SVN: r95956 - in projects/metadata/web/trunk: src/main/java/org/jboss/metadata/annotation/creator/web and 1 other directory.

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

Author: remy.maucherat at jboss.com
Date: 2009-11-03 10:09:13 -0500 (Tue, 03 Nov 2009)
New Revision: 95956

Modified:
   projects/metadata/web/trunk/pom.xml
   projects/metadata/web/trunk/src/main/java/org/jboss/metadata/annotation/creator/web/WebFilterProcessor.java
   projects/metadata/web/trunk/src/main/java/org/jboss/metadata/annotation/creator/web/WebListenerProcessor.java
   projects/metadata/web/trunk/src/main/java/org/jboss/metadata/annotation/creator/web/WebServletProcessor.java
Log:
- Add description groups to the meta data created from the Web annotations.

Modified: projects/metadata/web/trunk/pom.xml
===================================================================
--- projects/metadata/web/trunk/pom.xml	2009-11-03 14:41:01 UTC (rev 95955)
+++ projects/metadata/web/trunk/pom.xml	2009-11-03 15:09:13 UTC (rev 95956)
@@ -94,13 +94,13 @@
     <dependency>
       <groupId>org.jboss.metadata</groupId>
       <artifactId>jboss-metadata-common</artifactId>
-      <version>2.0.0.Alpha7</version>
+      <version>2.0.0.Alpha8</version>
     </dependency>
 
     <dependency>
       <groupId>org.jboss.metadata</groupId>
       <artifactId>jboss-metadata-common</artifactId>
-      <version>2.0.0.Alpha7</version>
+      <version>2.0.0.Alpha8</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>

Modified: projects/metadata/web/trunk/src/main/java/org/jboss/metadata/annotation/creator/web/WebFilterProcessor.java
===================================================================
--- projects/metadata/web/trunk/src/main/java/org/jboss/metadata/annotation/creator/web/WebFilterProcessor.java	2009-11-03 14:41:01 UTC (rev 95955)
+++ projects/metadata/web/trunk/src/main/java/org/jboss/metadata/annotation/creator/web/WebFilterProcessor.java	2009-11-03 15:09:13 UTC (rev 95956)
@@ -88,9 +88,9 @@
          }
          filter.setInitParam(initParams);
       }
-      DescriptionGroupMetaData descriptionGroup = null;
-         //ProcessorUtils.getDescriptionGroup(webFilter.description(), webFilter.displayName(),
-            //webFilter.smallIcon(), webFilter.largeIcon());
+      DescriptionGroupMetaData descriptionGroup = 
+         ProcessorUtils.getDescriptionGroup(webFilter.description(), webFilter.displayName(),
+            webFilter.smallIcon(), webFilter.largeIcon());
       if (descriptionGroup != null)
          filter.setDescriptionGroup(descriptionGroup);
       filters.add(filter);

Modified: projects/metadata/web/trunk/src/main/java/org/jboss/metadata/annotation/creator/web/WebListenerProcessor.java
===================================================================
--- projects/metadata/web/trunk/src/main/java/org/jboss/metadata/annotation/creator/web/WebListenerProcessor.java	2009-11-03 14:41:01 UTC (rev 95955)
+++ projects/metadata/web/trunk/src/main/java/org/jboss/metadata/annotation/creator/web/WebListenerProcessor.java	2009-11-03 15:09:13 UTC (rev 95956)
@@ -34,6 +34,7 @@
 import org.jboss.metadata.annotation.creator.Processor;
 import org.jboss.metadata.annotation.creator.ProcessorUtils;
 import org.jboss.metadata.annotation.finder.AnnotationFinder;
+import org.jboss.metadata.javaee.spec.DescriptionGroupMetaData;
 import org.jboss.metadata.web.spec.ListenerMetaData;
 import org.jboss.metadata.web.spec.WebMetaData;
 
@@ -61,6 +62,10 @@
 
       ListenerMetaData metaData = new ListenerMetaData();
       metaData.setListenerClass(element.getName());
+      DescriptionGroupMetaData descriptionGroup = 
+         ProcessorUtils.getDescriptionGroup(webListener.value());
+      if (descriptionGroup != null)
+         metaData.setDescriptionGroup(descriptionGroup);
       return metaData;
    }
 

Modified: projects/metadata/web/trunk/src/main/java/org/jboss/metadata/annotation/creator/web/WebServletProcessor.java
===================================================================
--- projects/metadata/web/trunk/src/main/java/org/jboss/metadata/annotation/creator/web/WebServletProcessor.java	2009-11-03 14:41:01 UTC (rev 95955)
+++ projects/metadata/web/trunk/src/main/java/org/jboss/metadata/annotation/creator/web/WebServletProcessor.java	2009-11-03 15:09:13 UTC (rev 95956)
@@ -89,9 +89,9 @@
          }
          servlet.setInitParam(initParams);
       }
-      DescriptionGroupMetaData descriptionGroup = null;
-         //ProcessorUtils.getDescriptionGroup(webServlet.description(), ""/*webServlet.displayName()*/,
-               //webServlet.smallIcon(), webServlet.largeIcon());
+      DescriptionGroupMetaData descriptionGroup = 
+         ProcessorUtils.getDescriptionGroup(webServlet.description(), ""/*webServlet.displayName()*/,
+               webServlet.smallIcon(), webServlet.largeIcon());
       if (descriptionGroup != null)
          servlet.setDescriptionGroup(descriptionGroup);
       servlets.add(servlet);