[jboss-cvs] JBossAS SVN: r105730 - in trunk: tomcat/src/resources and 1 other directories.

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

Author: remy.maucherat at jboss.com
Date: 2010-06-04 13:57:27 -0400 (Fri, 04 Jun 2010)
New Revision: 105730

Modified:
   trunk/server/src/main/java/org/jboss/web/deployers/WarAnnotationMetaDataDeployer.java
   trunk/tomcat/src/resources/standalone/war-deployers-jboss-beans.xml
   trunk/tomcat/src/resources/war-deployers-jboss-beans.xml
Log:
- Cleanup: drop useless flag.

Modified: trunk/server/src/main/java/org/jboss/web/deployers/WarAnnotationMetaDataDeployer.java
===================================================================
--- trunk/server/src/main/java/org/jboss/web/deployers/WarAnnotationMetaDataDeployer.java	2010-06-04 17:37:54 UTC (rev 105729)
+++ trunk/server/src/main/java/org/jboss/web/deployers/WarAnnotationMetaDataDeployer.java	2010-06-04 17:57:27 UTC (rev 105730)
@@ -21,24 +21,22 @@
  */
 package org.jboss.web.deployers;
 
-import java.io.IOException;
 import java.lang.annotation.Annotation;
 import java.lang.reflect.AnnotatedElement;
-import java.util.*;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
 
 import org.jboss.deployers.spi.DeploymentException;
 import org.jboss.deployers.spi.deployer.DeploymentStages;
 import org.jboss.deployers.spi.deployer.helpers.AbstractDeployer;
 import org.jboss.deployers.structure.spi.DeploymentUnit;
 import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
-import org.jboss.deployment.AnnotatedClassFilter;
 import org.jboss.metadata.annotation.creator.AnnotationContext;
 import org.jboss.metadata.annotation.creator.web.Web30MetaDataCreator;
 import org.jboss.metadata.annotation.finder.AnnotationFinder;
 import org.jboss.metadata.annotation.finder.DefaultAnnotationFinder;
 import org.jboss.metadata.web.spec.WebMetaData;
-import org.jboss.scanning.spi.metadata.PathMetaData;
-import org.jboss.scanning.spi.metadata.ScanningMetaData;
 import org.jboss.scanning.web.spi.ResourcesIndex;
 import org.jboss.vfs.VirtualFile;
 
@@ -53,8 +51,6 @@
 {
    public static final String WEB_ANNOTATED_ATTACHMENT_NAME = "annotated."+WebMetaData.class.getName();
 
-   private boolean metaDataCompleteIsDefault = false;
-
    public WarAnnotationMetaDataDeployer()
    {
       setStage(DeploymentStages.POST_CLASSLOADER);
@@ -63,15 +59,6 @@
       addOutput(WEB_ANNOTATED_ATTACHMENT_NAME);
    }
 
-   public boolean isMetaDataCompleteIsDefault()
-   {
-      return metaDataCompleteIsDefault;
-   }
-   public void setMetaDataCompleteIsDefault(boolean metaDataCompleteIsDefault)
-   {
-      this.metaDataCompleteIsDefault = metaDataCompleteIsDefault;
-   }
-
    public void deploy(DeploymentUnit unit) throws DeploymentException
    {
       if (unit instanceof VFSDeploymentUnit == false)

Modified: trunk/tomcat/src/resources/standalone/war-deployers-jboss-beans.xml
===================================================================
--- trunk/tomcat/src/resources/standalone/war-deployers-jboss-beans.xml	2010-06-04 17:37:54 UTC (rev 105729)
+++ trunk/tomcat/src/resources/standalone/war-deployers-jboss-beans.xml	2010-06-04 17:57:27 UTC (rev 105730)
@@ -48,10 +48,8 @@
           class="org.jboss.web.deployers.SharedJBossWebMetaDataDeployer">
       <property name="webXml">${jboss.server.home.url}/deploy/jbossweb.sar/web.xml</property>
    </bean>
-   <!-- Servlet 3.0 annotation support (performance drop) -->
    <bean name="WebAnnotationMetaDataDeployer" class="org.jboss.web.deployers.WarAnnotationMetaDataDeployer">
       <property name="relativeOrder">2005</property>
-      <property name="metaDataCompleteIsDefault">false</property>
       <!-- Order this after AopMetaDataDeployer *if it is present* -->
       <install method="addInput">
         <parameter class="java.lang.String">org.jboss.aop.asintegration.jboss5.AopMetaDataDeployerOutput</parameter>

Modified: trunk/tomcat/src/resources/war-deployers-jboss-beans.xml
===================================================================
--- trunk/tomcat/src/resources/war-deployers-jboss-beans.xml	2010-06-04 17:37:54 UTC (rev 105729)
+++ trunk/tomcat/src/resources/war-deployers-jboss-beans.xml	2010-06-04 17:57:27 UTC (rev 105730)
@@ -53,10 +53,8 @@
           class="org.jboss.web.deployers.SharedJBossWebMetaDataDeployer">
       <property name="webXml">${jboss.server.home.url}/deploy/jbossweb.sar/web.xml</property>
    </bean>
-   <!-- Servlet 3.0 annotation support (performance drop) -->
    <bean name="WebAnnotationMetaDataDeployer" class="org.jboss.web.deployers.WarAnnotationMetaDataDeployer">
       <property name="relativeOrder">2005</property>
-      <property name="metaDataCompleteIsDefault">false</property>
       <!-- Order this after AopMetaDataDeployer *if it is present* -->
       <install method="addInput">
         <parameter class="java.lang.String">org.jboss.aop.asintegration.jboss5.AopMetaDataDeployerOutput</parameter>