From seam-commits at lists.jboss.org Fri Jan 22 16:22:05 2010
Content-Type: multipart/mixed; boundary="===============4940329666322308843=="
MIME-Version: 1.0
From: seam-commits at lists.jboss.org
To: seam-commits at lists.jboss.org
Subject: [seam-commits] Seam SVN: r11986 - in modules/xml/trunk:
 src/main/java/org/jboss/seam/xml/bootstrap and 6 other directories.
Date: Fri, 22 Jan 2010 16:22:05 -0500
Message-ID: <201001222122.o0MLM5sU029355@svn01.web.mwc.hst.phx2.redhat.com>

--===============4940329666322308843==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: swd847
Date: 2010-01-22 16:22:04 -0500 (Fri, 22 Jan 2010)
New Revision: 11986

Added:
   modules/xml/trunk/src/main/java/org/jboss/seam/xml/util/XmlConfiguration=
Exception.java
   modules/xml/trunk/src/main/java/org/jboss/seam/xml/util/XmlParseExceptio=
n.java
Modified:
   modules/xml/trunk/docs/src/main/en-US/xml-general.xml
   modules/xml/trunk/src/main/java/org/jboss/seam/xml/bootstrap/XmlExtensio=
n.java
   modules/xml/trunk/src/main/java/org/jboss/seam/xml/core/BeanResult.java
   modules/xml/trunk/src/main/java/org/jboss/seam/xml/core/XmlResult.java
   modules/xml/trunk/src/main/java/org/jboss/seam/xml/fieldset/CollectionFi=
eldSet.java
   modules/xml/trunk/src/main/java/org/jboss/seam/xml/fieldset/DirectFieldS=
etter.java
   modules/xml/trunk/src/main/java/org/jboss/seam/xml/fieldset/FieldValueSe=
tter.java
   modules/xml/trunk/src/main/java/org/jboss/seam/xml/fieldset/MapFieldSet.=
java
   modules/xml/trunk/src/main/java/org/jboss/seam/xml/fieldset/MethodFieldS=
etter.java
   modules/xml/trunk/src/main/java/org/jboss/seam/xml/fieldset/SimpleFieldV=
alue.java
   modules/xml/trunk/src/main/java/org/jboss/seam/xml/model/AbstractXmlItem=
.java
   modules/xml/trunk/src/main/java/org/jboss/seam/xml/model/AnnotationXmlIt=
em.java
   modules/xml/trunk/src/main/java/org/jboss/seam/xml/model/ArrayXmlItem.ja=
va
   modules/xml/trunk/src/main/java/org/jboss/seam/xml/model/ClassXmlItem.ja=
va
   modules/xml/trunk/src/main/java/org/jboss/seam/xml/model/DependsXmlItem.=
java
   modules/xml/trunk/src/main/java/org/jboss/seam/xml/model/KeyXmlItem.java
   modules/xml/trunk/src/main/java/org/jboss/seam/xml/model/MethodXmlItem.j=
ava
   modules/xml/trunk/src/main/java/org/jboss/seam/xml/model/ModelBuilder.ja=
va
   modules/xml/trunk/src/main/java/org/jboss/seam/xml/model/ValueXmlItem.ja=
va
   modules/xml/trunk/src/main/java/org/jboss/seam/xml/parser/ParserMain.java
   modules/xml/trunk/src/main/java/org/jboss/seam/xml/parser/namespace/Name=
spaceUtils.java
   modules/xml/trunk/src/main/java/org/jboss/seam/xml/parser/namespace/Pack=
ageNamespaceElementResolver.java
Log:
improved handling of parse errors



Modified: modules/xml/trunk/docs/src/main/en-US/xml-general.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/xml/trunk/docs/src/main/en-US/xml-general.xml	2010-01-22 19:28:=
28 UTC (rev 11985)
+++ modules/xml/trunk/docs/src/main/en-US/xml-general.xml	2010-01-22 21:22:=
04 UTC (rev 11986)
@@ -4,7 +4,7 @@
 <chapter id=3D"remoting">
   <title>Seam XML Configuration</title>
   =

-  <para>Seam provides a method for configuring JSR-299 beans using XML. </=
para>
+  <para>Seam provides a method for configuring JSR-299 beans using XML. By=
 default the XML configuration old defines new beans, it does not </para>
 =

 =

 </chapter>

Modified: modules/xml/trunk/src/main/java/org/jboss/seam/xml/bootstrap/XmlE=
xtension.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/xml/trunk/src/main/java/org/jboss/seam/xml/bootstrap/XmlExtensi=
on.java	2010-01-22 19:28:28 UTC (rev 11985)
+++ modules/xml/trunk/src/main/java/org/jboss/seam/xml/bootstrap/XmlExtensi=
on.java	2010-01-22 21:22:04 UTC (rev 11986)
@@ -16,6 +16,7 @@
 import java.util.Map.Entry;
 =

 import javax.enterprise.event.Observes;
+import javax.enterprise.inject.spi.AfterBeanDiscovery;
 import javax.enterprise.inject.spi.AnnotatedType;
 import javax.enterprise.inject.spi.BeforeBeanDiscovery;
 import javax.enterprise.inject.spi.Extension;
@@ -31,6 +32,7 @@
 import org.jboss.seam.xml.parser.ParserMain;
 import org.jboss.seam.xml.parser.SaxNode;
 import org.jboss.seam.xml.util.FileDataReader;
+import org.jboss.seam.xml.util.XmlParseException;
 import org.jboss.weld.extensions.util.AnnotationInstanceProvider;
 =

 public class XmlExtension implements Extension
@@ -42,9 +44,9 @@
 =

    List<XmlResult> results =3D new ArrayList<XmlResult>();
 =

-   Set<Class> veto =3D new HashSet<Class>();
+   Set<Class<?>> veto =3D new HashSet<Class<?>>();
 =

-   Map<Class, AnnotatedType> types =3D new HashMap<Class, AnnotatedType>();
+   Map<Class<?>, AnnotatedType<?>> types =3D new HashMap<Class<?>, Annotat=
edType<?>>();
 =

    int count =3D 0;
 =

@@ -53,6 +55,8 @@
     */
    Map<Integer, List<FieldValueObject>> fieldValues =3D new HashMap<Intege=
r, List<FieldValueObject>>();
 =

+   List<XmlParseException> parseErrors =3D new ArrayList<XmlParseException=
>();
+
    /**
     * This is the entry point for the extension
     */
@@ -73,7 +77,7 @@
             {
                ParserMain parser =3D new ParserMain();
                ModelBuilder builder =3D new ModelBuilder();
-               SaxNode parentNode =3D parser.parse(d.getInputSource(), d.g=
etFileUrl());
+               SaxNode parentNode =3D parser.parse(d.getInputSource(), d.g=
etFileUrl(), parseErrors);
                ;
                results.add(builder.build(parentNode));
             }
@@ -95,7 +99,7 @@
                problemString.append("\n");
             }
          }
-         for (BeanResult b : r.getFieldValues().keySet())
+         for (BeanResult<?> b : r.getFieldValues().keySet())
          {
             int val =3D count++;
             fieldValues.put(val, r.getFieldValues().get(b));
@@ -105,11 +109,11 @@
             b.getBuilder().addToClass(a);
          }
 =

-         for (Class b : r.getQualifiers())
+         for (Class<? extends Annotation> b : r.getQualifiers())
          {
             event.addQualifier(b);
          }
-         for (Class b : r.getInterceptorBindings())
+         for (Class<? extends Annotation> b : r.getInterceptorBindings())
          {
             event.addInterceptorBinding(b);
          }
@@ -117,7 +121,7 @@
          {
             event.addStereotype(b.getKey(), b.getValue());
          }
-         for (BeanResult bb : r.getBeans())
+         for (BeanResult<?> bb : r.getBeans())
          {
             boolean install =3D true;
             for (Object className : bb.getDependencies())
@@ -134,7 +138,7 @@
             }
             if (install)
             {
-               AnnotatedType tp =3D bb.getBuilder().create();
+               AnnotatedType<?> tp =3D bb.getBuilder().create();
                event.addAnnotatedType(tp);
                types.put(tp.getJavaClass(), tp);
             }
@@ -148,7 +152,7 @@
       }
    }
 =

-   public void processAnotated(@Observes ProcessAnnotatedType event)
+   public <T> void processAnotated(@Observes ProcessAnnotatedType<T> event)
    {
       // veto implementation
       if (veto.contains(event.getAnnotatedType().getJavaClass()))
@@ -157,19 +161,27 @@
       }
    }
 =

-   public void processInjectionTarget(@Observes ProcessInjectionTarget eve=
nt)
+   public <T> void processInjectionTarget(@Observes ProcessInjectionTarget=
<T> event)
    {
 =

-      AnnotatedType at =3D event.getAnnotatedType();
+      AnnotatedType<T> at =3D event.getAnnotatedType();
       XmlId xid =3D at.getAnnotation(XmlId.class);
       if (xid !=3D null)
       {
          List<FieldValueObject> fvs =3D fieldValues.get(xid.value());
-         event.setInjectionTarget(new InjectionTargetWrapper(event.getInje=
ctionTarget(), fvs));
+         event.setInjectionTarget(new InjectionTargetWrapper<T>(event.getI=
njectionTarget(), fvs));
       }
 =

    }
 =

+   public void processAfterBeanDeployment(@Observes AfterBeanDiscovery eve=
nt)
+   {
+      for (XmlParseException t : parseErrors)
+      {
+         event.addDefinitionError(t);
+      }
+   }
+
    public List<Class<? extends XmlDocumentProvider>> getDocumentProviders()
    {
       List<Class<? extends XmlDocumentProvider>> ret =3D new ArrayList<Cla=
ss<? extends XmlDocumentProvider>>();
@@ -207,5 +219,4 @@
       }
       return ret;
    }
-
 }

Modified: modules/xml/trunk/src/main/java/org/jboss/seam/xml/core/BeanResul=
t.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/xml/trunk/src/main/java/org/jboss/seam/xml/core/BeanResult.java=
	2010-01-22 19:28:28 UTC (rev 11985)
+++ modules/xml/trunk/src/main/java/org/jboss/seam/xml/core/BeanResult.java=
	2010-01-22 21:22:04 UTC (rev 11986)
@@ -12,17 +12,17 @@
 =

 public class BeanResult<X>
 {
-   NewAnnotatedTypeBuilder builder;
+   NewAnnotatedTypeBuilder<X> builder;
    List<String> dependencies =3D new ArrayList<String>();
-   Class type;
+   Class<X> type;
 =

-   public BeanResult(Class type)
+   public BeanResult(Class<X> type)
    {
       this.type =3D type;
       builder =3D new NewAnnotatedTypeBuilder<X>(type);
    }
 =

-   public NewAnnotatedTypeBuilder getBuilder()
+   public NewAnnotatedTypeBuilder<X> getBuilder()
    {
       return builder;
    }
@@ -37,7 +37,7 @@
       return Collections.unmodifiableList(dependencies);
    }
 =

-   public Class getType()
+   public Class<X> getType()
    {
       return type;
    }

Modified: modules/xml/trunk/src/main/java/org/jboss/seam/xml/core/XmlResult=
.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/xml/trunk/src/main/java/org/jboss/seam/xml/core/XmlResult.java	=
2010-01-22 19:28:28 UTC (rev 11985)
+++ modules/xml/trunk/src/main/java/org/jboss/seam/xml/core/XmlResult.java	=
2010-01-22 21:22:04 UTC (rev 11986)
@@ -27,13 +27,13 @@
 =

    List<Class<? extends Annotation>> interceptorBindings =3D new ArrayList=
<Class<? extends Annotation>>();
 =

-   List<Class> veto =3D new ArrayList<Class>();
+   List<Class<?>> veto =3D new ArrayList<Class<?>>();
 =

    List<String> problems =3D new ArrayList<String>();
 =

-   List<BeanResult> beans =3D new ArrayList<BeanResult>();
+   List<BeanResult<?>> beans =3D new ArrayList<BeanResult<?>>();
 =

-   Map<BeanResult, List<FieldValueObject>> fieldValues =3D new HashMap<Bea=
nResult, List<FieldValueObject>>();
+   Map<BeanResult<?>, List<FieldValueObject>> fieldValues =3D new HashMap<=
BeanResult<?>, List<FieldValueObject>>();
 =

    public Map<Class<? extends Annotation>, Annotation[]> getStereotypes()
    {
@@ -50,7 +50,7 @@
       return interceptorBindings;
    }
 =

-   public List<BeanResult> getBeans()
+   public List<BeanResult<?>> getBeans()
    {
       return beans;
    }
@@ -65,17 +65,17 @@
       problems.add(p);
    }
 =

-   public Map<BeanResult, List<FieldValueObject>> getFieldValues()
+   public Map<BeanResult<?>, List<FieldValueObject>> getFieldValues()
    {
       return fieldValues;
    }
 =

-   public void addVeto(Class clazz)
+   public void addVeto(Class<?> clazz)
    {
       veto.add(clazz);
    }
 =

-   public List<Class> getVeto()
+   public List<Class<?>> getVeto()
    {
       return veto;
    }

Modified: modules/xml/trunk/src/main/java/org/jboss/seam/xml/fieldset/Colle=
ctionFieldSet.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/xml/trunk/src/main/java/org/jboss/seam/xml/fieldset/CollectionF=
ieldSet.java	2010-01-22 19:28:28 UTC (rev 11985)
+++ modules/xml/trunk/src/main/java/org/jboss/seam/xml/fieldset/CollectionF=
ieldSet.java	2010-01-22 21:22:04 UTC (rev 11986)
@@ -32,7 +32,7 @@
 {
    FieldValueSetter field;
    List<CFS> values;
-   Class elementType;
+   Class<?> elementType;
    Class<? extends Collection> collectionType;
 =

    public CollectionFieldSet(FieldValueSetter field, List<XmlItem> items)
@@ -48,7 +48,7 @@
 =

          setter =3D new CFS()
          {
-            public void add(Collection o) throws IllegalAccessException
+            public void add(Collection<Object> o) throws IllegalAccessExce=
ption
             {
                o.add(fv);
             }
@@ -68,47 +68,47 @@
 =

          if (parameterizedType.getRawType() =3D=3D Collection.class)
          {
-            elementType =3D (Class) parameterizedType.getActualTypeArgumen=
ts()[0];
+            elementType =3D (Class<?>) parameterizedType.getActualTypeArgu=
ments()[0];
             collectionType =3D LinkedHashSet.class;
          }
          else if (parameterizedType.getRawType() =3D=3D List.class)
          {
-            elementType =3D (Class) parameterizedType.getActualTypeArgumen=
ts()[0];
+            elementType =3D (Class<?>) parameterizedType.getActualTypeArgu=
ments()[0];
             collectionType =3D ArrayList.class;
          }
          else if (parameterizedType.getRawType() =3D=3D Set.class)
          {
-            elementType =3D (Class) parameterizedType.getActualTypeArgumen=
ts()[0];
+            elementType =3D (Class<?>) parameterizedType.getActualTypeArgu=
ments()[0];
             collectionType =3D LinkedHashSet.class;
          }
          else if (parameterizedType.getRawType() =3D=3D SortedSet.class)
          {
-            elementType =3D (Class) parameterizedType.getActualTypeArgumen=
ts()[0];
+            elementType =3D (Class<?>) parameterizedType.getActualTypeArgu=
ments()[0];
             collectionType =3D TreeSet.class;
          }
          else if (parameterizedType.getRawType() =3D=3D HashSet.class)
          {
-            elementType =3D (Class) parameterizedType.getActualTypeArgumen=
ts()[0];
+            elementType =3D (Class<?>) parameterizedType.getActualTypeArgu=
ments()[0];
             collectionType =3D HashSet.class;
          }
          else if (parameterizedType.getRawType() =3D=3D ArrayList.class)
          {
-            elementType =3D (Class) parameterizedType.getActualTypeArgumen=
ts()[0];
+            elementType =3D (Class<?>) parameterizedType.getActualTypeArgu=
ments()[0];
             collectionType =3D ArrayList.class;
          }
          else if (parameterizedType.getRawType() =3D=3D LinkedList.class)
          {
-            elementType =3D (Class) parameterizedType.getActualTypeArgumen=
ts()[0];
+            elementType =3D (Class<?>) parameterizedType.getActualTypeArgu=
ments()[0];
             collectionType =3D LinkedList.class;
          }
          else if (parameterizedType.getRawType() =3D=3D LinkedHashSet.clas=
s)
          {
-            elementType =3D (Class) parameterizedType.getActualTypeArgumen=
ts()[0];
+            elementType =3D (Class<?>) parameterizedType.getActualTypeArgu=
ments()[0];
             collectionType =3D LinkedHashSet.class;
          }
          else if (parameterizedType.getRawType() =3D=3D TreeSet.class)
          {
-            elementType =3D (Class) parameterizedType.getActualTypeArgumen=
ts()[0];
+            elementType =3D (Class<?>) parameterizedType.getActualTypeArgu=
ments()[0];
             collectionType =3D TreeSet.class;
          }
          else
@@ -128,7 +128,7 @@
    {
       try
       {
-         Collection res =3D collectionType.newInstance();
+         Collection<Object> res =3D collectionType.newInstance();
          field.set(instance, res);
          for (int i =3D 0; i < values.size(); ++i)
          {
@@ -143,7 +143,7 @@
 =

    interface CFS
    {
-      void add(Collection o) throws IllegalAccessException;
+      void add(Collection<Object> o) throws IllegalAccessException;
    }
 =

 }

Modified: modules/xml/trunk/src/main/java/org/jboss/seam/xml/fieldset/Direc=
tFieldSetter.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/xml/trunk/src/main/java/org/jboss/seam/xml/fieldset/DirectField=
Setter.java	2010-01-22 19:28:28 UTC (rev 11985)
+++ modules/xml/trunk/src/main/java/org/jboss/seam/xml/fieldset/DirectField=
Setter.java	2010-01-22 21:22:04 UTC (rev 11986)
@@ -25,7 +25,7 @@
       return field.getGenericType();
    }
 =

-   public Class getType()
+   public Class<?> getType()
    {
       return field.getType();
    }
@@ -35,7 +35,7 @@
       return field.getName();
    }
 =

-   public Class getDeclaringClass()
+   public Class<?> getDeclaringClass()
    {
       return field.getDeclaringClass();
    }

Modified: modules/xml/trunk/src/main/java/org/jboss/seam/xml/fieldset/Field=
ValueSetter.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/xml/trunk/src/main/java/org/jboss/seam/xml/fieldset/FieldValueS=
etter.java	2010-01-22 19:28:28 UTC (rev 11985)
+++ modules/xml/trunk/src/main/java/org/jboss/seam/xml/fieldset/FieldValueS=
etter.java	2010-01-22 21:22:04 UTC (rev 11986)
@@ -8,11 +8,11 @@
 =

    public void set(Object instance, Object value) throws IllegalAccessExce=
ption, InvocationTargetException;
 =

-   public Class getType();
+   public Class<?> getType();
 =

    public Type getGenericType();
 =

-   public Class getDeclaringClass();
+   public Class<?> getDeclaringClass();
 =

    public String getName();
 =


Modified: modules/xml/trunk/src/main/java/org/jboss/seam/xml/fieldset/MapFi=
eldSet.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/xml/trunk/src/main/java/org/jboss/seam/xml/fieldset/MapFieldSet=
.java	2010-01-22 19:28:28 UTC (rev 11985)
+++ modules/xml/trunk/src/main/java/org/jboss/seam/xml/fieldset/MapFieldSet=
.java	2010-01-22 21:22:04 UTC (rev 11986)
@@ -28,8 +28,8 @@
 {
    FieldValueSetter field;
    List<MFS> values;
-   Class keyType;
-   Class valueType;
+   Class<?> keyType;
+   Class<?> valueType;
    Class<? extends Map> collectionType;
 =

    public MapFieldSet(FieldValueSetter field, List<EntryXmlItem> items)
@@ -45,6 +45,7 @@
          final Object value =3D XmlObjectConverter.convert(valueType, i.ge=
tValue().getInnerText());
          setter =3D new MFS()
          {
+            @SuppressWarnings("unchecked")
             public void add(Map m) throws IllegalAccessException
             {
                m.put(key, value);
@@ -65,32 +66,32 @@
 =

          if (parameterizedType.getRawType() =3D=3D Map.class)
          {
-            keyType =3D (Class) parameterizedType.getActualTypeArguments()=
[0];
-            valueType =3D (Class) parameterizedType.getActualTypeArguments=
()[1];
+            keyType =3D (Class<?>) parameterizedType.getActualTypeArgument=
s()[0];
+            valueType =3D (Class<?>) parameterizedType.getActualTypeArgume=
nts()[1];
             collectionType =3D LinkedHashMap.class;
          }
          else if (parameterizedType.getRawType() =3D=3D LinkedHashMap.clas=
s)
          {
-            keyType =3D (Class) parameterizedType.getActualTypeArguments()=
[0];
-            valueType =3D (Class) parameterizedType.getActualTypeArguments=
()[1];
+            keyType =3D (Class<?>) parameterizedType.getActualTypeArgument=
s()[0];
+            valueType =3D (Class<?>) parameterizedType.getActualTypeArgume=
nts()[1];
             collectionType =3D LinkedHashMap.class;
          }
          else if (parameterizedType.getRawType() =3D=3D HashMap.class)
          {
-            keyType =3D (Class) parameterizedType.getActualTypeArguments()=
[0];
-            valueType =3D (Class) parameterizedType.getActualTypeArguments=
()[1];
+            keyType =3D (Class<?>) parameterizedType.getActualTypeArgument=
s()[0];
+            valueType =3D (Class<?>) parameterizedType.getActualTypeArgume=
nts()[1];
             collectionType =3D HashMap.class;
          }
          else if (parameterizedType.getRawType() =3D=3D SortedMap.class)
          {
-            keyType =3D (Class) parameterizedType.getActualTypeArguments()=
[0];
-            valueType =3D (Class) parameterizedType.getActualTypeArguments=
()[1];
+            keyType =3D (Class<?>) parameterizedType.getActualTypeArgument=
s()[0];
+            valueType =3D (Class<?>) parameterizedType.getActualTypeArgume=
nts()[1];
             collectionType =3D TreeMap.class;
          }
          else if (parameterizedType.getRawType() =3D=3D TreeMap.class)
          {
-            keyType =3D (Class) parameterizedType.getActualTypeArguments()=
[0];
-            valueType =3D (Class) parameterizedType.getActualTypeArguments=
()[1];
+            keyType =3D (Class<?>) parameterizedType.getActualTypeArgument=
s()[0];
+            valueType =3D (Class<?>) parameterizedType.getActualTypeArgume=
nts()[1];
             collectionType =3D TreeMap.class;
          }
          else
@@ -125,7 +126,7 @@
 =

    interface MFS
    {
-      void add(Map o) throws IllegalAccessException;
+      void add(Map<?, ?> o) throws IllegalAccessException;
    }
 =

 }

Modified: modules/xml/trunk/src/main/java/org/jboss/seam/xml/fieldset/Metho=
dFieldSetter.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/xml/trunk/src/main/java/org/jboss/seam/xml/fieldset/MethodField=
Setter.java	2010-01-22 19:28:28 UTC (rev 11985)
+++ modules/xml/trunk/src/main/java/org/jboss/seam/xml/fieldset/MethodField=
Setter.java	2010-01-22 21:22:04 UTC (rev 11986)
@@ -28,12 +28,12 @@
       return method.getName();
    }
 =

-   public Class getDeclaringClass()
+   public Class<?> getDeclaringClass()
    {
       return method.getDeclaringClass();
    }
 =

-   public Class getType()
+   public Class<?> getType()
    {
       return method.getParameterTypes()[0];
    }

Modified: modules/xml/trunk/src/main/java/org/jboss/seam/xml/fieldset/Simpl=
eFieldValue.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/xml/trunk/src/main/java/org/jboss/seam/xml/fieldset/SimpleField=
Value.java	2010-01-22 19:28:28 UTC (rev 11985)
+++ modules/xml/trunk/src/main/java/org/jboss/seam/xml/fieldset/SimpleField=
Value.java	2010-01-22 21:22:04 UTC (rev 11986)
@@ -15,7 +15,7 @@
 =

    FS setter;
 =

-   public SimpleFieldValue(Class javaObject, final FieldValueSetter f, fin=
al String value)
+   public SimpleFieldValue(Class<?> javaObject, final FieldValueSetter f, =
final String value)
    {
       this.field =3D f;
 =


Modified: modules/xml/trunk/src/main/java/org/jboss/seam/xml/model/Abstract=
XmlItem.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/xml/trunk/src/main/java/org/jboss/seam/xml/model/AbstractXmlIte=
m.java	2010-01-22 19:28:28 UTC (rev 11985)
+++ modules/xml/trunk/src/main/java/org/jboss/seam/xml/model/AbstractXmlIte=
m.java	2010-01-22 21:22:04 UTC (rev 11986)
@@ -18,7 +18,7 @@
 {
    final XmlItemType type;
    final XmlItem parent;
-   final Class javaClass;
+   final Class<?> javaClass;
 =

    final String innerText;
    final Map<String, String> attributes;
@@ -28,7 +28,7 @@
       return innerText;
    }
 =

-   public AbstractXmlItem(XmlItemType type, XmlItem parent, Class javaClas=
s, String innerText, Map<String, String> attributes)
+   public AbstractXmlItem(XmlItemType type, XmlItem parent, Class<?> javaC=
lass, String innerText, Map<String, String> attributes)
    {
       this.type =3D type;
       this.parent =3D parent;
@@ -76,7 +76,7 @@
       return null;
    }
 =

-   public Class getJavaClass()
+   public Class<?> getJavaClass()
    {
       return javaClass;
    }

Modified: modules/xml/trunk/src/main/java/org/jboss/seam/xml/model/Annotati=
onXmlItem.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/xml/trunk/src/main/java/org/jboss/seam/xml/model/AnnotationXmlI=
tem.java	2010-01-22 19:28:28 UTC (rev 11985)
+++ modules/xml/trunk/src/main/java/org/jboss/seam/xml/model/AnnotationXmlI=
tem.java	2010-01-22 21:22:04 UTC (rev 11986)
@@ -21,7 +21,7 @@
     * @param innerText
     * @param attributes
     */
-   public AnnotationXmlItem(XmlItem parent, Class c, String innerText, Map=
<String, String> attributes)
+   public AnnotationXmlItem(XmlItem parent, Class<?> c, String innerText, =
Map<String, String> attributes)
    {
       super(XmlItemType.ANNOTATION, parent, c, innerText, attributes);
       if (innerText !=3D null)
@@ -35,7 +35,7 @@
 =

    public Set<XmlItemType> getAllowedItem()
    {
-      return Collections.EMPTY_SET;
+      return Collections.emptySet();
    }
 =

 }

Modified: modules/xml/trunk/src/main/java/org/jboss/seam/xml/model/ArrayXml=
Item.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/xml/trunk/src/main/java/org/jboss/seam/xml/model/ArrayXmlItem.j=
ava	2010-01-22 19:28:28 UTC (rev 11985)
+++ modules/xml/trunk/src/main/java/org/jboss/seam/xml/model/ArrayXmlItem.j=
ava	2010-01-22 21:22:04 UTC (rev 11986)
@@ -19,7 +19,7 @@
 =

    XmlItem child =3D null, parent;
 =

-   Class javaClass;
+   Class<?> javaClass;
 =

    public ArrayXmlItem(XmlItem parent)
    {
@@ -43,6 +43,7 @@
       child =3D xmlItem;
    }
 =

+   @SuppressWarnings("unchecked")
    public Map<String, String> getAttributes()
    {
       return Collections.EMPTY_MAP;
@@ -94,7 +95,7 @@
       {
          throw new RuntimeException("<array>  element must have a child sp=
ecifying the array type");
       }
-      Class l =3D child.getJavaClass();
+      Class<?> l =3D child.getJavaClass();
       try
       {
          javaClass =3D getClass().getClassLoader().loadClass("[L" + l.getN=
ame() + ";");

Modified: modules/xml/trunk/src/main/java/org/jboss/seam/xml/model/ClassXml=
Item.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/xml/trunk/src/main/java/org/jboss/seam/xml/model/ClassXmlItem.j=
ava	2010-01-22 19:28:28 UTC (rev 11985)
+++ modules/xml/trunk/src/main/java/org/jboss/seam/xml/model/ClassXmlItem.j=
ava	2010-01-22 21:22:04 UTC (rev 11986)
@@ -22,7 +22,7 @@
     * @param innerText
     * @param attributes
     */
-   public ClassXmlItem(XmlItem parent, Class c)
+   public ClassXmlItem(XmlItem parent, Class<?> c)
    {
       super(XmlItemType.CLASS, parent, c, null, null);
       if (innerText !=3D null)

Modified: modules/xml/trunk/src/main/java/org/jboss/seam/xml/model/DependsX=
mlItem.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/xml/trunk/src/main/java/org/jboss/seam/xml/model/DependsXmlItem=
.java	2010-01-22 19:28:28 UTC (rev 11985)
+++ modules/xml/trunk/src/main/java/org/jboss/seam/xml/model/DependsXmlItem=
.java	2010-01-22 21:22:04 UTC (rev 11986)
@@ -17,7 +17,7 @@
 =

    public Set<XmlItemType> getAllowedItem()
    {
-      return Collections.EMPTY_SET;
+      return Collections.emptySet();
    }
 =

 }

Modified: modules/xml/trunk/src/main/java/org/jboss/seam/xml/model/KeyXmlIt=
em.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/xml/trunk/src/main/java/org/jboss/seam/xml/model/KeyXmlItem.jav=
a	2010-01-22 19:28:28 UTC (rev 11985)
+++ modules/xml/trunk/src/main/java/org/jboss/seam/xml/model/KeyXmlItem.jav=
a	2010-01-22 21:22:04 UTC (rev 11986)
@@ -17,6 +17,6 @@
 =

    public Set<XmlItemType> getAllowedItem()
    {
-      return Collections.EMPTY_SET;
+      return Collections.emptySet();
    }
 }

Modified: modules/xml/trunk/src/main/java/org/jboss/seam/xml/model/MethodXm=
lItem.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/xml/trunk/src/main/java/org/jboss/seam/xml/model/MethodXmlItem.=
java	2010-01-22 19:28:28 UTC (rev 11985)
+++ modules/xml/trunk/src/main/java/org/jboss/seam/xml/model/MethodXmlItem.=
java	2010-01-22 21:22:04 UTC (rev 11986)
@@ -61,16 +61,16 @@
          return true;
       }
 =

-      List<Class> rtList =3D new ArrayList<Class>();
+      List<Class<?>> rtList =3D new ArrayList<Class<?>>();
       for (XmlItem c : children)
       {
          if (c.getType() =3D=3D XmlItemType.CLASS)
          {
-            Class cl =3D c.getJavaClass();
+            Class<?> cl =3D c.getJavaClass();
             rtList.add(cl);
          }
       }
-      Class[] alAr =3D new Class[rtList.size()];
+      Class<?>[] alAr =3D new Class[rtList.size()];
       for (int i =3D 0; i < rtList.size(); ++i)
       {
          alAr[i] =3D rtList.get(i);

Modified: modules/xml/trunk/src/main/java/org/jboss/seam/xml/model/ModelBui=
lder.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/xml/trunk/src/main/java/org/jboss/seam/xml/model/ModelBuilder.j=
ava	2010-01-22 19:28:28 UTC (rev 11985)
+++ modules/xml/trunk/src/main/java/org/jboss/seam/xml/model/ModelBuilder.j=
ava	2010-01-22 21:22:04 UTC (rev 11986)
@@ -85,6 +85,7 @@
       return ret;
    }
 =

+   @SuppressWarnings("unchecked")
    private void addNodeToResult(XmlResult ret, XmlItem rb) throws InvalidE=
lementException
    {
 =

@@ -93,7 +94,7 @@
          ResultType type =3D getItemType(rb);
          if (type =3D=3D ResultType.BEAN)
          {
-            BeanResult tp =3D buildAnnotatedType(rb);
+            BeanResult<?> tp =3D buildAnnotatedType(rb);
             ret.getBeans().add(tp);
             List<FieldValueObject> fields =3D new ArrayList<FieldValueObje=
ct>();
             for (XmlItem xi : rb.getChildren())
@@ -242,10 +243,11 @@
       return ret;
    }
 =

-   BeanResult buildAnnotatedType(XmlItem rb) throws InvalidElementException
+   @SuppressWarnings("unchecked")
+   <T> BeanResult<T> buildAnnotatedType(XmlItem rb) throws InvalidElementE=
xception
    {
-      BeanResult result =3D new BeanResult(rb.getJavaClass());
-      NewAnnotatedTypeBuilder type =3D result.getBuilder();
+      BeanResult<T> result =3D new BeanResult<T>(rb.getJavaClass());
+      NewAnnotatedTypeBuilder<T> type =3D result.getBuilder();
       // list of constructor arguments
       List<XmlItem> constList =3D new ArrayList<XmlItem>();
       for (XmlItem item : rb.getChildren())
@@ -314,6 +316,7 @@
       return result;
    }
 =

+   @SuppressWarnings("unchecked")
    void addSteriotypeToResult(XmlResult ret, XmlItem rb) throws InvalidEle=
mentException
    {
 =

@@ -336,10 +339,11 @@
 =

    }
 =

+   @SuppressWarnings("unchecked")
    Annotation createAnnotation(XmlItem item) throws InvalidElementException
    {
       Map<String, Object> typedVars =3D new HashMap<String, Object>();
-      Class anClass =3D item.getJavaClass();
+      Class<?> anClass =3D item.getJavaClass();
       for (Entry<String, String> e : item.getAttributes().entrySet())
       {
          String mname =3D e.getKey();
@@ -352,7 +356,7 @@
          {
             throw new InvalidElementException("Annotation " + item.getJava=
Class().getName() + " does not have a member named " + mname + " ,error in =
XML");
          }
-         Class returnType =3D m.getReturnType();
+         Class<?> returnType =3D m.getReturnType();
          typedVars.put(mname, XmlObjectConverter.convert(returnType, e.get=
Value()));
       }
 =


Modified: modules/xml/trunk/src/main/java/org/jboss/seam/xml/model/ValueXml=
Item.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/xml/trunk/src/main/java/org/jboss/seam/xml/model/ValueXmlItem.j=
ava	2010-01-22 19:28:28 UTC (rev 11985)
+++ modules/xml/trunk/src/main/java/org/jboss/seam/xml/model/ValueXmlItem.j=
ava	2010-01-22 21:22:04 UTC (rev 11986)
@@ -17,6 +17,6 @@
 =

    public Set<XmlItemType> getAllowedItem()
    {
-      return Collections.EMPTY_SET;
+      return Collections.emptySet();
    }
 }

Modified: modules/xml/trunk/src/main/java/org/jboss/seam/xml/parser/ParserM=
ain.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/xml/trunk/src/main/java/org/jboss/seam/xml/parser/ParserMain.ja=
va	2010-01-22 19:28:28 UTC (rev 11985)
+++ modules/xml/trunk/src/main/java/org/jboss/seam/xml/parser/ParserMain.ja=
va	2010-01-22 21:22:04 UTC (rev 11986)
@@ -6,18 +6,21 @@
 =

 import java.io.IOException;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 =

+import org.jboss.seam.xml.util.XmlParseException;
 import org.xml.sax.Attributes;
 import org.xml.sax.InputSource;
 import org.xml.sax.Locator;
 import org.xml.sax.SAXException;
+import org.xml.sax.SAXParseException;
 import org.xml.sax.XMLReader;
 import org.xml.sax.helpers.DefaultHandler;
 import org.xml.sax.helpers.XMLReaderFactory;
 =

 /**
- * Parser for xml configration
+ * Parser for xml configration, this class should only be used once
  * =

  * @author Stuart Douglas <stuart(a)baileyroberts.com.au>
  * =

@@ -35,8 +38,11 @@
 =

    String document;
 =

-   public SaxNode parse(InputSource inputSource, String fileUrl)
+   List<XmlParseException> errors;
+
+   public SaxNode parse(InputSource inputSource, String fileUrl, List<XmlP=
arseException> errors)
    {
+      this.errors =3D errors;
       document =3D fileUrl;
       try
       {
@@ -108,4 +114,15 @@
       this.locator =3D locator;
    }
 =

+   @Override
+   public void error(SAXParseException e) throws SAXException
+   {
+      errors.add(new XmlParseException(e, document, e.getLineNumber()));
+   }
+
+   @Override
+   public void fatalError(SAXParseException e) throws SAXException
+   {
+      errors.add(new XmlParseException(e, document, e.getLineNumber()));
+   }
 }

Modified: modules/xml/trunk/src/main/java/org/jboss/seam/xml/parser/namespa=
ce/NamespaceUtils.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/xml/trunk/src/main/java/org/jboss/seam/xml/parser/namespace/Nam=
espaceUtils.java	2010-01-22 19:28:28 UTC (rev 11985)
+++ modules/xml/trunk/src/main/java/org/jboss/seam/xml/parser/namespace/Nam=
espaceUtils.java	2010-01-22 21:22:04 UTC (rev 11986)
@@ -15,7 +15,7 @@
 {
    static XmlItem resolveMethodOrField(String name, XmlItem parent, String=
 innerText) throws InvalidElementException
    {
-      Class p =3D parent.getJavaClass();
+      Class<?> p =3D parent.getJavaClass();
       Field f =3D null;
       boolean methodFound =3D false;
       f =3D getField(p, name);
@@ -45,9 +45,9 @@
    /**
     * we need access to private fields so we cannot just use getField
     */
-   public static Field getField(Class parent, String name)
+   public static Field getField(Class<?> parent, String name)
    {
-      Class p =3D parent;
+      Class<?> p =3D parent;
       while (p !=3D Object.class)
       {
          try

Modified: modules/xml/trunk/src/main/java/org/jboss/seam/xml/parser/namespa=
ce/PackageNamespaceElementResolver.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/xml/trunk/src/main/java/org/jboss/seam/xml/parser/namespace/Pac=
kageNamespaceElementResolver.java	2010-01-22 19:28:28 UTC (rev 11985)
+++ modules/xml/trunk/src/main/java/org/jboss/seam/xml/parser/namespace/Pac=
kageNamespaceElementResolver.java	2010-01-22 21:22:04 UTC (rev 11986)
@@ -17,7 +17,7 @@
 public class PackageNamespaceElementResolver implements NamespaceElementRe=
solver
 {
    String pack;
-   Map<String, Class> cache =3D new HashMap<String, Class>();
+   Map<String, Class<?>> cache =3D new HashMap<String, Class<?>>();
    Set<String> notFound =3D new HashSet<String>();
 =

    public PackageNamespaceElementResolver(String pack)
@@ -34,7 +34,7 @@
 =

       try
       {
-         Class c;
+         Class<?> c;
          if (cache.containsKey(name))
          {
             c =3D cache.get(name);

Added: modules/xml/trunk/src/main/java/org/jboss/seam/xml/util/XmlConfigura=
tionException.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/xml/trunk/src/main/java/org/jboss/seam/xml/util/XmlConfiguratio=
nException.java	                        (rev 0)
+++ modules/xml/trunk/src/main/java/org/jboss/seam/xml/util/XmlConfiguratio=
nException.java	2010-01-22 21:22:04 UTC (rev 11986)
@@ -0,0 +1,20 @@
+package org.jboss.seam.xml.util;
+
+public class XmlConfigurationException extends Exception
+{
+   int lineno;
+   String document;
+
+   public XmlConfigurationException(String message, String document, int l=
ineno)
+   {
+      super(message);
+      this.document =3D document;
+      this.lineno =3D lineno;
+   }
+
+   @Override
+   public String getMessage()
+   {
+      return super.getMessage() + " at " + document + ":" + lineno;
+   }
+}

Added: modules/xml/trunk/src/main/java/org/jboss/seam/xml/util/XmlParseExce=
ption.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- modules/xml/trunk/src/main/java/org/jboss/seam/xml/util/XmlParseExcepti=
on.java	                        (rev 0)
+++ modules/xml/trunk/src/main/java/org/jboss/seam/xml/util/XmlParseExcepti=
on.java	2010-01-22 21:22:04 UTC (rev 11986)
@@ -0,0 +1,21 @@
+package org.jboss.seam.xml.util;
+
+
+public class XmlParseException extends RuntimeException
+{
+   int lineno;
+   String document;
+
+   public XmlParseException(Exception e, String document, int lineno)
+   {
+      super(e);
+      this.lineno =3D lineno;
+      this.document =3D document;
+   }
+
+   @Override
+   public String getMessage()
+   {
+      return "Error parsing XML document " + document + ":" + lineno + " "=
 + super.getMessage();
+   }
+}


--===============4940329666322308843==--