[seam-commits] Seam SVN: r12104 - in modules/xml/trunk/src: main/java/org/jboss/seam/xml/parser/namespace and 1 other directories.

[seam-commits at lists.jboss.org]

Author: swd847
Date: 2010-03-05 15:48:08 -0500 (Fri, 05 Mar 2010)
New Revision: 12104

Removed:
   modules/xml/trunk/src/main/java/org/jboss/seam/xml/model/VetoXmlItem.java
Modified:
   modules/xml/trunk/src/main/java/org/jboss/seam/xml/model/ModelBuilder.java
   modules/xml/trunk/src/main/java/org/jboss/seam/xml/parser/namespace/RootNamespaceElementResolver.java
   modules/xml/trunk/src/test/resources/META-INF/seam-beans.xml
Log:
removed <veto> tag



Modified: modules/xml/trunk/src/main/java/org/jboss/seam/xml/model/ModelBuilder.java
===================================================================
--- modules/xml/trunk/src/main/java/org/jboss/seam/xml/model/ModelBuilder.java	2010-03-05 20:45:41 UTC (rev 12103)
+++ modules/xml/trunk/src/main/java/org/jboss/seam/xml/model/ModelBuilder.java	2010-03-05 20:48:08 UTC (rev 12104)
@@ -222,17 +222,7 @@
             }
          }
       }
-      for (VetoXmlItem it : item.getChildrenOfType(VetoXmlItem.class))
-      {
-         if (ret != null)
-         {
-            throw new XmlConfigurationException("Element cannot be both an VETO and a " + ret.toString(), item.getDocument(), item.getLineno());
-         }
-         else
-         {
-            ret = ResultType.VETO;
-         }
-      }
+
       if (ret == null)
       {
          ret = ResultType.BEAN;

Deleted: modules/xml/trunk/src/main/java/org/jboss/seam/xml/model/VetoXmlItem.java
===================================================================
--- modules/xml/trunk/src/main/java/org/jboss/seam/xml/model/VetoXmlItem.java	2010-03-05 20:45:41 UTC (rev 12103)
+++ modules/xml/trunk/src/main/java/org/jboss/seam/xml/model/VetoXmlItem.java	2010-03-05 20:48:08 UTC (rev 12104)
@@ -1,24 +0,0 @@
-/*
- * Distributed under the LGPL License
- * 
- */
-package org.jboss.seam.xml.model;
-
-import java.util.Collections;
-import java.util.Set;
-
-public class VetoXmlItem extends AbstractXmlItem
-{
-
-   public VetoXmlItem(XmlItem parent, String document, int lineno)
-   {
-      super(XmlItemType.VETO, parent, null, null, null, document, lineno);
-
-   }
-
-   public Set<XmlItemType> getAllowedItem()
-   {
-      return Collections.singleton(XmlItemType.CLASS);
-   }
-
-}

Modified: modules/xml/trunk/src/main/java/org/jboss/seam/xml/parser/namespace/RootNamespaceElementResolver.java
===================================================================
--- modules/xml/trunk/src/main/java/org/jboss/seam/xml/parser/namespace/RootNamespaceElementResolver.java	2010-03-05 20:45:41 UTC (rev 12103)
+++ modules/xml/trunk/src/main/java/org/jboss/seam/xml/parser/namespace/RootNamespaceElementResolver.java	2010-03-05 20:48:08 UTC (rev 12104)
@@ -13,7 +13,6 @@
 import org.jboss.seam.xml.model.ParameterXmlItem;
 import org.jboss.seam.xml.model.ParametersXmlItem;
 import org.jboss.seam.xml.model.ValueXmlItem;
-import org.jboss.seam.xml.model.VetoXmlItem;
 import org.jboss.seam.xml.model.XmlItem;
 import org.jboss.seam.xml.model.XmlItemType;
 import org.jboss.seam.xml.parser.SaxNode;
@@ -57,10 +56,6 @@
       {
          return new ArrayXmlItem(parent, node.getAttributes(), node.getDocument(), node.getLineNo());
       }
-      else if (item.equals("veto"))
-      {
-         return new VetoXmlItem(parent, node.getDocument(), node.getLineNo());
-      }
       else if (item.equals("override"))
       {
          return new OverrideXmlItem(parent, node.getDocument(), node.getLineNo());

Modified: modules/xml/trunk/src/test/resources/META-INF/seam-beans.xml
===================================================================
--- modules/xml/trunk/src/test/resources/META-INF/seam-beans.xml	2010-03-05 20:45:41 UTC (rev 12103)
+++ modules/xml/trunk/src/test/resources/META-INF/seam-beans.xml	2010-03-05 20:48:08 UTC (rev 12104)
@@ -15,9 +15,5 @@
             <AroundInvoke/>
         </test:myMethod>
     </test:InterceptorBean>
-    
-    <veto>
-    <test:InterceptorBean/>
-    </veto>
 
 </Beans>
\ No newline at end of file