[jboss-cvs] JBossAS SVN: r95684 - in projects/metadata/web/trunk/src/main/java/org/jboss/metadata: web/jboss and 1 other directories.

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

Author: remy.maucherat at jboss.com
Date: 2009-10-28 11:07:31 -0400 (Wed, 28 Oct 2009)
New Revision: 95684

Modified:
   projects/metadata/web/trunk/src/main/java/org/jboss/metadata/annotation/creator/web/RunAsProcessor.java
   projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/jboss/JBossWebMetaData.java
   projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/Tag11MetaData.java
   projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/Tld11MetaData.java
   projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/Tld12MetaData.java
   projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/Tld20MetaData.java
   projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/Tld21MetaData.java
   projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/WebFragment30MetaData.java
Log:
- Fix warnings.

Modified: projects/metadata/web/trunk/src/main/java/org/jboss/metadata/annotation/creator/web/RunAsProcessor.java
===================================================================
--- projects/metadata/web/trunk/src/main/java/org/jboss/metadata/annotation/creator/web/RunAsProcessor.java	2009-10-28 14:57:49 UTC (rev 95683)
+++ projects/metadata/web/trunk/src/main/java/org/jboss/metadata/annotation/creator/web/RunAsProcessor.java	2009-10-28 15:07:31 UTC (rev 95684)
@@ -29,7 +29,6 @@
 import org.jboss.metadata.annotation.creator.Processor;
 import org.jboss.metadata.annotation.finder.AnnotationFinder;
 import org.jboss.metadata.javaee.spec.RunAsMetaData;
-import org.jboss.metadata.web.spec.AnnotationMergedView;
 import org.jboss.metadata.web.spec.AnnotationMetaData;
 import org.jboss.metadata.web.spec.AnnotationsMetaData;
 

Modified: projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/jboss/JBossWebMetaData.java
===================================================================
--- projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/jboss/JBossWebMetaData.java	2009-10-28 14:57:49 UTC (rev 95683)
+++ projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/jboss/JBossWebMetaData.java	2009-10-28 15:07:31 UTC (rev 95684)
@@ -156,7 +156,7 @@
     * this is really a hack for new injection code  so that we can reparse web.xml/jbossweb.xml for JavaEE 5 injections
     * todo remove this when we clean up
     */
-   private HashMap arbitraryMetadata = new HashMap();
+   private HashMap<?, ?> arbitraryMetadata = new HashMap<Object, Object>();
 
    /**
     * The maximum number of active sessions allowed, or -1 for no limit
@@ -658,11 +658,11 @@
       this.securityDomain = securityDomain.trim();
    }
 
-   public HashMap getArbitraryMetadata()
+   public HashMap<?, ?> getArbitraryMetadata()
    {
       return arbitraryMetadata;
    }
-   public void setArbitraryMetadata(HashMap arbitraryMetadata)
+   public void setArbitraryMetadata(HashMap<?, ?> arbitraryMetadata)
    {
       this.arbitraryMetadata = arbitraryMetadata;
    }

Modified: projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/Tag11MetaData.java
===================================================================
--- projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/Tag11MetaData.java	2009-10-28 14:57:49 UTC (rev 95683)
+++ projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/Tag11MetaData.java	2009-10-28 15:07:31 UTC (rev 95684)
@@ -21,8 +21,6 @@
  */
 package org.jboss.metadata.web.spec;
 
-import java.util.List;
-
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlType;
 

Modified: projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/Tld11MetaData.java
===================================================================
--- projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/Tld11MetaData.java	2009-10-28 14:57:49 UTC (rev 95683)
+++ projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/Tld11MetaData.java	2009-10-28 15:07:31 UTC (rev 95684)
@@ -1,6 +1,5 @@
 package org.jboss.metadata.web.spec;
 
-import java.util.ArrayList;
 import java.util.List;
 
 import javax.xml.bind.annotation.XmlElement;

Modified: projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/Tld12MetaData.java
===================================================================
--- projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/Tld12MetaData.java	2009-10-28 14:57:49 UTC (rev 95683)
+++ projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/Tld12MetaData.java	2009-10-28 15:07:31 UTC (rev 95684)
@@ -2,14 +2,12 @@
 
 import java.util.List;
 
-import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlNs;
 import javax.xml.bind.annotation.XmlNsForm;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
 
-import org.jboss.metadata.javaee.spec.JavaEEMetaDataConstants;
 import org.jboss.xb.annotations.JBossXmlSchema;
 
 /**

Modified: projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/Tld20MetaData.java
===================================================================
--- projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/Tld20MetaData.java	2009-10-28 14:57:49 UTC (rev 95683)
+++ projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/Tld20MetaData.java	2009-10-28 15:07:31 UTC (rev 95684)
@@ -1,9 +1,5 @@
 package org.jboss.metadata.web.spec;
 
-import java.util.List;
-
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlNs;
 import javax.xml.bind.annotation.XmlNsForm;
 import javax.xml.bind.annotation.XmlRootElement;

Modified: projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/Tld21MetaData.java
===================================================================
--- projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/Tld21MetaData.java	2009-10-28 14:57:49 UTC (rev 95683)
+++ projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/Tld21MetaData.java	2009-10-28 15:07:31 UTC (rev 95684)
@@ -1,9 +1,5 @@
 package org.jboss.metadata.web.spec;
 
-import java.util.List;
-
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlNs;
 import javax.xml.bind.annotation.XmlNsForm;
 import javax.xml.bind.annotation.XmlRootElement;

Modified: projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/WebFragment30MetaData.java
===================================================================
--- projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/WebFragment30MetaData.java	2009-10-28 14:57:49 UTC (rev 95683)
+++ projects/metadata/web/trunk/src/main/java/org/jboss/metadata/web/spec/WebFragment30MetaData.java	2009-10-28 15:07:31 UTC (rev 95684)
@@ -1,6 +1,5 @@
 package org.jboss.metadata.web.spec;
 
-import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.XmlNs;
 import javax.xml.bind.annotation.XmlNsForm;
 import javax.xml.bind.annotation.XmlRootElement;