[seam-commits] Seam SVN: r12103 - in modules/xml/trunk: src/test/java/org/jboss/seam/xml/test/simple and 7 other directories.
seam-commits at lists.jboss.org
seam-commits at lists.jboss.org
Fri Mar 5 15:45:42 EST 2010
Author: swd847
Date: 2010-03-05 15:45:41 -0500 (Fri, 05 Mar 2010)
New Revision: 12103
Removed:
modules/xml/trunk/src/test/java/org/jboss/seam/xml/test/simple/VetoTest.java
modules/xml/trunk/src/test/java/org/jboss/seam/xml/test/simple/VetoedBean.java
modules/xml/trunk/src/test/resources/org/jboss/seam/xml/test/simple/veto-beans.xml
Modified:
modules/xml/trunk/pom.xml
modules/xml/trunk/src/test/resources/META-INF/seam-beans.xml
modules/xml/trunk/src/test/resources/org/jboss/seam/xml/test/fieldset/array-set-field-value-beans.xml
modules/xml/trunk/src/test/resources/org/jboss/seam/xml/test/fieldset/colection-set-field-value-beans.xml
modules/xml/trunk/src/test/resources/org/jboss/seam/xml/test/fieldset/map-set-field-value-beans.xml
modules/xml/trunk/src/test/resources/org/jboss/seam/xml/test/fieldset/set-field-value-beans.xml
modules/xml/trunk/src/test/resources/org/jboss/seam/xml/test/injection/producer-field-value-beans.xml
modules/xml/trunk/src/test/resources/org/jboss/seam/xml/test/injection/qualifier-attributes-test-beans.xml
modules/xml/trunk/src/test/resources/org/jboss/seam/xml/test/interceptor/interceptor-beans.xml
modules/xml/trunk/src/test/resources/org/jboss/seam/xml/test/method/method-beans.xml
modules/xml/trunk/src/test/resources/org/jboss/seam/xml/test/producer/multiple-producers.xml
modules/xml/trunk/src/test/resources/org/jboss/seam/xml/test/simple/simple-beans.xml
Log:
removed all reference to <veto> from the tests
Modified: modules/xml/trunk/pom.xml
===================================================================
--- modules/xml/trunk/pom.xml 2010-03-05 09:32:12 UTC (rev 12102)
+++ modules/xml/trunk/pom.xml 2010-03-05 20:45:41 UTC (rev 12103)
@@ -92,6 +92,14 @@
<downloadSources>true</downloadSources>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <forkMode>once</forkMode>
+ <argLine>-Xmx512Mb</argLine>
+ </configuration>
+ </plugin>
</plugins>
</build>
</project>
Deleted: modules/xml/trunk/src/test/java/org/jboss/seam/xml/test/simple/VetoTest.java
===================================================================
--- modules/xml/trunk/src/test/java/org/jboss/seam/xml/test/simple/VetoTest.java 2010-03-05 09:32:12 UTC (rev 12102)
+++ modules/xml/trunk/src/test/java/org/jboss/seam/xml/test/simple/VetoTest.java 2010-03-05 20:45:41 UTC (rev 12103)
@@ -1,34 +0,0 @@
-/*
- * Distributed under the LGPL License
- *
- */
-package org.jboss.seam.xml.test.simple;
-
-import org.jboss.seam.xml.test.AbstractXMLTest;
-import org.testng.annotations.Test;
-
-public class VetoTest extends AbstractXMLTest
-{
-
- @Override
- protected String getXmlFileName()
- {
- return "veto-beans.xml";
- }
-
- @Test
- public void testInterceptors()
- {
-
- try
- {
- VetoedBean y = getReference(VetoedBean.class);
- assert y != null : "Vetoed bean was installed";
- }
- catch (Exception e)
- {
- // we expect this to throw an exception instead of returning null
- }
-
- }
-}
Deleted: modules/xml/trunk/src/test/java/org/jboss/seam/xml/test/simple/VetoedBean.java
===================================================================
--- modules/xml/trunk/src/test/java/org/jboss/seam/xml/test/simple/VetoedBean.java 2010-03-05 09:32:12 UTC (rev 12102)
+++ modules/xml/trunk/src/test/java/org/jboss/seam/xml/test/simple/VetoedBean.java 2010-03-05 20:45:41 UTC (rev 12103)
@@ -1,10 +0,0 @@
-/*
- * Distributed under the LGPL License
- *
- */
-package org.jboss.seam.xml.test.simple;
-
-public class VetoedBean
-{
-
-}
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 09:32:12 UTC (rev 12102)
+++ modules/xml/trunk/src/test/resources/META-INF/seam-beans.xml 2010-03-05 20:45:41 UTC (rev 12103)
@@ -7,6 +7,7 @@
</test:InterceptorBinding>
<test:InterceptorBean>
+ <override/>
<Interceptor/>
<test:InterceptorBinding/>
<test:myMethod>
@@ -14,5 +15,9 @@
<AroundInvoke/>
</test:myMethod>
</test:InterceptorBean>
+
+ <veto>
+ <test:InterceptorBean/>
+ </veto>
</Beans>
\ No newline at end of file
Modified: modules/xml/trunk/src/test/resources/org/jboss/seam/xml/test/fieldset/array-set-field-value-beans.xml
===================================================================
--- modules/xml/trunk/src/test/resources/org/jboss/seam/xml/test/fieldset/array-set-field-value-beans.xml 2010-03-05 09:32:12 UTC (rev 12102)
+++ modules/xml/trunk/src/test/resources/org/jboss/seam/xml/test/fieldset/array-set-field-value-beans.xml 2010-03-05 20:45:41 UTC (rev 12103)
@@ -1,10 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<Beans xmlns="urn:seam:core"
xmlns:test="urn:java:org.jboss.seam.xml.test.fieldset">
- <veto>
- <test:ArrayFieldValue/>
- </veto>
<test:ArrayFieldValue>
+ <override/>
<test:iarray>
<value>1</value>
<value>2</value>
Modified: modules/xml/trunk/src/test/resources/org/jboss/seam/xml/test/fieldset/colection-set-field-value-beans.xml
===================================================================
--- modules/xml/trunk/src/test/resources/org/jboss/seam/xml/test/fieldset/colection-set-field-value-beans.xml 2010-03-05 09:32:12 UTC (rev 12102)
+++ modules/xml/trunk/src/test/resources/org/jboss/seam/xml/test/fieldset/colection-set-field-value-beans.xml 2010-03-05 20:45:41 UTC (rev 12103)
@@ -2,11 +2,8 @@
<Beans xmlns="urn:seam:core"
xmlns:test="urn:java:org.jboss.seam.xml.test.fieldset">
- <veto>
- <test:CollectionFieldValue/>
- </veto>
-
<test:CollectionFieldValue>
+ <override/>
<test:iset>
<value>1</value>
<value>2</value>
Modified: modules/xml/trunk/src/test/resources/org/jboss/seam/xml/test/fieldset/map-set-field-value-beans.xml
===================================================================
--- modules/xml/trunk/src/test/resources/org/jboss/seam/xml/test/fieldset/map-set-field-value-beans.xml 2010-03-05 09:32:12 UTC (rev 12102)
+++ modules/xml/trunk/src/test/resources/org/jboss/seam/xml/test/fieldset/map-set-field-value-beans.xml 2010-03-05 20:45:41 UTC (rev 12103)
@@ -1,10 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<Beans xmlns="urn:seam:core"
xmlns:test="urn:java:org.jboss.seam.xml.test.fieldset">
- <veto>
- <test:MapFieldValue />
- </veto>
<test:MapFieldValue>
+ <override/>
<test:map1>
<entry><key>1</key><value>hello</value></entry>
<entry><key>2</key><value>world</value></entry>
Modified: modules/xml/trunk/src/test/resources/org/jboss/seam/xml/test/fieldset/set-field-value-beans.xml
===================================================================
--- modules/xml/trunk/src/test/resources/org/jboss/seam/xml/test/fieldset/set-field-value-beans.xml 2010-03-05 09:32:12 UTC (rev 12102)
+++ modules/xml/trunk/src/test/resources/org/jboss/seam/xml/test/fieldset/set-field-value-beans.xml 2010-03-05 20:45:41 UTC (rev 12103)
@@ -1,13 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<Beans xmlns="urn:seam:core"
xmlns:test="urn:java:org.jboss.seam.xml.test.fieldset">
-
- <veto>
- <test:FieldValueBean />
- <test:FieldValueProducer/>
- </veto>
-
+
<test:FieldValueBean>
+ <override/>
<test:ivalue>10</test:ivalue>
<test:stringValue>hello world</test:stringValue>
<test:enumValue>A</test:enumValue>
Modified: modules/xml/trunk/src/test/resources/org/jboss/seam/xml/test/injection/producer-field-value-beans.xml
===================================================================
--- modules/xml/trunk/src/test/resources/org/jboss/seam/xml/test/injection/producer-field-value-beans.xml 2010-03-05 09:32:12 UTC (rev 12102)
+++ modules/xml/trunk/src/test/resources/org/jboss/seam/xml/test/injection/producer-field-value-beans.xml 2010-03-05 20:45:41 UTC (rev 12103)
@@ -2,16 +2,13 @@
<Beans xmlns="urn:seam:core"
xmlns:test="urn:java:org.jboss.seam.xml.test.injection">
- <veto>
- <test:ProducerBean/>
- <test:RecieverBean/>
- </veto>
-
+
<test:ProducerQualifier>
<Qualifier/>
</test:ProducerQualifier>
<test:ProducerBean>
+ <override/>
<test:value>
<Produces/>
<test:ProducerQualifier/>
@@ -20,6 +17,7 @@
</test:ProducerBean>
<test:RecieverBean>
+ <override/>
<test:value>
<test:ProducerQualifier/>
<Inject/>
Modified: modules/xml/trunk/src/test/resources/org/jboss/seam/xml/test/injection/qualifier-attributes-test-beans.xml
===================================================================
--- modules/xml/trunk/src/test/resources/org/jboss/seam/xml/test/injection/qualifier-attributes-test-beans.xml 2010-03-05 09:32:12 UTC (rev 12102)
+++ modules/xml/trunk/src/test/resources/org/jboss/seam/xml/test/injection/qualifier-attributes-test-beans.xml 2010-03-05 20:45:41 UTC (rev 12103)
@@ -2,10 +2,6 @@
<Beans xmlns="urn:seam:core"
xmlns:test="urn:java:org.jboss.seam.xml.test.injection">
- <veto>
- <test:QualifierTestBean/>
- </veto>
-
<test:OtherQualifier>
<Qualifier/>
</test:OtherQualifier>
@@ -19,6 +15,7 @@
</test:QualifiedBean2>
<test:QualifierTestBean>
+ <override/>
<test:bean1>
<test:OtherQualifier value1="AA" value2="1" value="A" />
<Inject/>
Modified: modules/xml/trunk/src/test/resources/org/jboss/seam/xml/test/interceptor/interceptor-beans.xml
===================================================================
--- modules/xml/trunk/src/test/resources/org/jboss/seam/xml/test/interceptor/interceptor-beans.xml 2010-03-05 09:32:12 UTC (rev 12102)
+++ modules/xml/trunk/src/test/resources/org/jboss/seam/xml/test/interceptor/interceptor-beans.xml 2010-03-05 20:45:41 UTC (rev 12103)
@@ -2,11 +2,8 @@
<Beans xmlns="urn:seam:core"
xmlns:test="urn:java:org.jboss.seam.xml.test.interceptor">
- <veto>
- <test:InterceptedBean/>
- </veto>
-
<test:InterceptedBean>
+ <override/>
<test:method>
<test:InterceptorBinding/>
</test:method>
Modified: modules/xml/trunk/src/test/resources/org/jboss/seam/xml/test/method/method-beans.xml
===================================================================
--- modules/xml/trunk/src/test/resources/org/jboss/seam/xml/test/method/method-beans.xml 2010-03-05 09:32:12 UTC (rev 12102)
+++ modules/xml/trunk/src/test/resources/org/jboss/seam/xml/test/method/method-beans.xml 2010-03-05 20:45:41 UTC (rev 12103)
@@ -1,10 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<Beans xmlns="urn:seam:core" xmlns:test="urn:java:org.jboss.seam.xml.test.method">
- <veto>
- <test:MethodTarget />
- </veto>
+
<test:Qualifier1>
<Qualifier />
</test:Qualifier1>
@@ -42,6 +40,7 @@
</test:MethodBean>
<test:MethodTarget>
+ <override/>
<test:value1>
<Inject />
</test:value1>
Modified: modules/xml/trunk/src/test/resources/org/jboss/seam/xml/test/producer/multiple-producers.xml
===================================================================
--- modules/xml/trunk/src/test/resources/org/jboss/seam/xml/test/producer/multiple-producers.xml 2010-03-05 09:32:12 UTC (rev 12102)
+++ modules/xml/trunk/src/test/resources/org/jboss/seam/xml/test/producer/multiple-producers.xml 2010-03-05 20:45:41 UTC (rev 12103)
@@ -1,12 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<Beans xmlns="urn:seam:core"
xmlns:test="urn:java:org.jboss.seam.xml.test.producer">
- <veto>
- <test:Producer/>
- <test:Reciever/>
- </veto>
+
<test:Producer>
+ <override/>
<test:value>
<Produces/>
<test:ProducerQualifier value="1" />
@@ -32,6 +30,7 @@
<test:Reciever>
+ <override/>
<test:val1>
<Inject/>
<test:ProducerQualifier value="1" />
Modified: modules/xml/trunk/src/test/resources/org/jboss/seam/xml/test/simple/simple-beans.xml
===================================================================
--- modules/xml/trunk/src/test/resources/org/jboss/seam/xml/test/simple/simple-beans.xml 2010-03-05 09:32:12 UTC (rev 12102)
+++ modules/xml/trunk/src/test/resources/org/jboss/seam/xml/test/simple/simple-beans.xml 2010-03-05 20:45:41 UTC (rev 12103)
@@ -1,9 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<Beans xmlns="urn:seam:core"
xmlns:test="urn:java:org.jboss.seam.xml.test.simple">
- <veto>
- <test:Bean2/>
- </veto>
+
<test:Bean1>
@@ -19,6 +17,7 @@
</test:Bean1>
<test:Bean2>
+ <override/>
<test:produceBean3>
<Produces/>
</test:produceBean3>
Deleted: modules/xml/trunk/src/test/resources/org/jboss/seam/xml/test/simple/veto-beans.xml
===================================================================
--- modules/xml/trunk/src/test/resources/org/jboss/seam/xml/test/simple/veto-beans.xml 2010-03-05 09:32:12 UTC (rev 12102)
+++ modules/xml/trunk/src/test/resources/org/jboss/seam/xml/test/simple/veto-beans.xml 2010-03-05 20:45:41 UTC (rev 12103)
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Beans xmlns="urn:seam:core"
- xmlns:test="urn:java:org.jboss.seam.xml.test.simple">
-
- <veto>
- <test:VetoedBean/>
- </veto>
-
-</Beans>
\ No newline at end of file
More information about the seam-commits
mailing list