Author: dallen6 Date: 2009-05-04 09:52:15 -0400 (Mon, 04 May 2009) New Revision: 2645 Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/bindingtype/notannotationtype/NotAnnotationTypeTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/bindingtype/notjavatype/NotJavaTypeTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/interceptorbindingtype/notannotationtype/NotAnnotationTypeTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/interceptorbindingtype/notjavatype/NotJavaTypeTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/interceptorbindingtype/notvalidtype/NotValidTypeTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/stereotype/notannotationtype/NotAnnotationTypeTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/stereotype/notjavatype/NotJavaTypeTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/stereotype/notvalidtype/NotValidTypeTest.java tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/bindingtype/notannotationtype/beans.xml tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/bindingtype/notjavatype/beans.xml tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/interceptorbindingtype/notannotationtype/beans.xml tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/interceptorbindingtype/notjavatype/beans.xml tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/interceptorbindingtype/notvalidtype/beans.xml tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/stereotype/notannotationtype/beans.xml tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/stereotype/notjavatype/beans.xml tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/stereotype/notvalidtype/beans.xml Log: Eliminated all unrelated classes and XML from tests expecting exceptions. Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/bindingtype/notannotationtype/NotAnnotationTypeTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/bindingtype/notannotationtype/NotAnnotationTypeTest.java 2009-05-03 21:26:12 UTC (rev 2644) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/bindingtype/notannotationtype/NotAnnotationTypeTest.java 2009-05-04 13:52:15 UTC (rev 2645) @@ -6,9 +6,6 @@ import org.hibernate.tck.annotations.SpecAssertions; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.jsr299.tck.tests.xml.annotationtypes.notvalidxml.foo.NotAnnotationType; -import org.jboss.jsr299.tck.tests.xml.annotationtypes.notvalidxml.foo.TestBindingType; -import org.jboss.jsr299.tck.tests.xml.annotationtypes.notvalidxml.foo.TestInterceptorBindingType; -import org.jboss.jsr299.tck.tests.xml.annotationtypes.notvalidxml.foo.TestStereotype; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.Classes; import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; @@ -16,17 +13,17 @@ import org.testng.annotations.Test; @Artifact -(a)Classes({TestBindingType.class, TestInterceptorBindingType.class, TestStereotype.class, NotAnnotationType.class}) +@Classes( { NotAnnotationType.class }) @BeansXml("beans.xml") @ExpectedDeploymentException(DefinitionException.class) -public class NotAnnotationTypeTest extends AbstractJSR299Test -{ - @Test(groups="ri-broken") - @SpecAssertions({ - @SpecAssertion(section="9.4", id="d") - }) - public void testNotAnnotationType() - { - assert false; - } +public class NotAnnotationTypeTest extends AbstractJSR299Test +{ + @Test(groups = "xml") + @SpecAssertions( { + @SpecAssertion(section = "9.4", id = "d") + }) + public void testNotAnnotationType() + { + assert false; + } } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/bindingtype/notjavatype/NotJavaTypeTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/bindingtype/notjavatype/NotJavaTypeTest.java 2009-05-03 21:26:12 UTC (rev 2644) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/bindingtype/notjavatype/NotJavaTypeTest.java 2009-05-04 13:52:15 UTC (rev 2645) @@ -5,27 +5,22 @@ import org.hibernate.tck.annotations.SpecAssertion; import org.hibernate.tck.annotations.SpecAssertions; import org.jboss.jsr299.tck.AbstractJSR299Test; -import org.jboss.jsr299.tck.tests.xml.annotationtypes.notvalidxml.foo.TestBindingType; -import org.jboss.jsr299.tck.tests.xml.annotationtypes.notvalidxml.foo.TestInterceptorBindingType; -import org.jboss.jsr299.tck.tests.xml.annotationtypes.notvalidxml.foo.TestStereotype; import org.jboss.testharness.impl.packaging.Artifact; -import org.jboss.testharness.impl.packaging.Classes; import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; import org.jboss.testharness.impl.packaging.jsr299.BeansXml; import org.testng.annotations.Test; @Artifact -(a)Classes({TestBindingType.class, TestInterceptorBindingType.class, TestStereotype.class}) @BeansXml("beans.xml") @ExpectedDeploymentException(DefinitionException.class) public class NotJavaTypeTest extends AbstractJSR299Test { - @Test(groups="ri-broken") - @SpecAssertions({ - @SpecAssertion(section="9.4", id="d") - }) - public void testNotJavaType() - { - assert false; - } + @Test(groups = "ri-broken") + @SpecAssertions( { + @SpecAssertion(section = "9.4", id = "d") + }) + public void testNotJavaType() + { + assert false; + } } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/interceptorbindingtype/notannotationtype/NotAnnotationTypeTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/interceptorbindingtype/notannotationtype/NotAnnotationTypeTest.java 2009-05-03 21:26:12 UTC (rev 2644) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/interceptorbindingtype/notannotationtype/NotAnnotationTypeTest.java 2009-05-04 13:52:15 UTC (rev 2645) @@ -6,9 +6,6 @@ import org.hibernate.tck.annotations.SpecAssertions; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.jsr299.tck.tests.xml.annotationtypes.notvalidxml.foo.NotAnnotationType; -import org.jboss.jsr299.tck.tests.xml.annotationtypes.notvalidxml.foo.TestBindingType; -import org.jboss.jsr299.tck.tests.xml.annotationtypes.notvalidxml.foo.TestInterceptorBindingType; -import org.jboss.jsr299.tck.tests.xml.annotationtypes.notvalidxml.foo.TestStereotype; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.Classes; import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; @@ -16,18 +13,15 @@ import org.testng.annotations.Test; @Artifact -(a)Classes({TestBindingType.class, TestInterceptorBindingType.class, TestStereotype.class, NotAnnotationType.class}) +@Classes( { NotAnnotationType.class }) @BeansXml("beans.xml") @ExpectedDeploymentException(DefinitionException.class) -public class NotAnnotationTypeTest extends AbstractJSR299Test -{ - @Test - @SpecAssertions({ - @SpecAssertion(section="9.4", id="d"), - @SpecAssertion(section="9.4.2", id="c") - }) - public void testNotAnnotationType() - { - assert false; - } +public class NotAnnotationTypeTest extends AbstractJSR299Test +{ + @Test(groups = "xml") + @SpecAssertions( { @SpecAssertion(section = "9.4", id = "d") }) + public void testNotAnnotationType() + { + assert false; + } } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/interceptorbindingtype/notjavatype/NotJavaTypeTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/interceptorbindingtype/notjavatype/NotJavaTypeTest.java 2009-05-03 21:26:12 UTC (rev 2644) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/interceptorbindingtype/notjavatype/NotJavaTypeTest.java 2009-05-04 13:52:15 UTC (rev 2645) @@ -5,28 +5,22 @@ import org.hibernate.tck.annotations.SpecAssertion; import org.hibernate.tck.annotations.SpecAssertions; import org.jboss.jsr299.tck.AbstractJSR299Test; -import org.jboss.jsr299.tck.tests.xml.annotationtypes.notvalidxml.foo.TestBindingType; -import org.jboss.jsr299.tck.tests.xml.annotationtypes.notvalidxml.foo.TestInterceptorBindingType; -import org.jboss.jsr299.tck.tests.xml.annotationtypes.notvalidxml.foo.TestStereotype; import org.jboss.testharness.impl.packaging.Artifact; -import org.jboss.testharness.impl.packaging.Classes; import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; import org.jboss.testharness.impl.packaging.jsr299.BeansXml; import org.testng.annotations.Test; @Artifact -(a)Classes({TestBindingType.class, TestInterceptorBindingType.class, TestStereotype.class}) @BeansXml("beans.xml") @ExpectedDeploymentException(DefinitionException.class) -public class NotJavaTypeTest extends AbstractJSR299Test -{ - @Test - @SpecAssertions({ - @SpecAssertion(section="9.4", id="d"), - @SpecAssertion(section="9.4.2", id="b") - }) - public void testNotJavaType() - { - assert false; - } +public class NotJavaTypeTest extends AbstractJSR299Test +{ + @Test(groups = "ri-broken") + @SpecAssertions( { + @SpecAssertion(section = "9.4", id = "d") + }) + public void testNotJavaType() + { + assert false; + } } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/interceptorbindingtype/notvalidtype/NotValidTypeTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/interceptorbindingtype/notvalidtype/NotValidTypeTest.java 2009-05-03 21:26:12 UTC (rev 2644) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/interceptorbindingtype/notvalidtype/NotValidTypeTest.java 2009-05-04 13:52:15 UTC (rev 2645) @@ -6,9 +6,7 @@ import org.hibernate.tck.annotations.SpecAssertions; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.jsr299.tck.tests.xml.annotationtypes.notvalidxml.foo.AnnotationType; -import org.jboss.jsr299.tck.tests.xml.annotationtypes.notvalidxml.foo.TestBindingType; import org.jboss.jsr299.tck.tests.xml.annotationtypes.notvalidxml.foo.TestInterceptorBindingType; -import org.jboss.jsr299.tck.tests.xml.annotationtypes.notvalidxml.foo.TestStereotype; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.Classes; import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; @@ -16,17 +14,15 @@ import org.testng.annotations.Test; @Artifact -(a)Classes({TestBindingType.class, TestInterceptorBindingType.class, TestStereotype.class, AnnotationType.class}) +@Classes( { TestInterceptorBindingType.class, AnnotationType.class }) @BeansXml("beans.xml") @ExpectedDeploymentException(DefinitionException.class) -public class NotValidTypeTest extends AbstractJSR299Test -{ - @Test - @SpecAssertions({ - @SpecAssertion(section="9.4.2", id="e") - }) - public void testNotValidType() - { - assert false; - } +public class NotValidTypeTest extends AbstractJSR299Test +{ + @Test(groups = "xml") + @SpecAssertions( { @SpecAssertion(section = "9.4.2", id = "e") }) + public void testNotValidType() + { + assert false; + } } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/stereotype/notannotationtype/NotAnnotationTypeTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/stereotype/notannotationtype/NotAnnotationTypeTest.java 2009-05-03 21:26:12 UTC (rev 2644) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/stereotype/notannotationtype/NotAnnotationTypeTest.java 2009-05-04 13:52:15 UTC (rev 2645) @@ -6,9 +6,6 @@ import org.hibernate.tck.annotations.SpecAssertions; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.jsr299.tck.tests.xml.annotationtypes.notvalidxml.foo.NotAnnotationType; -import org.jboss.jsr299.tck.tests.xml.annotationtypes.notvalidxml.foo.TestBindingType; -import org.jboss.jsr299.tck.tests.xml.annotationtypes.notvalidxml.foo.TestInterceptorBindingType; -import org.jboss.jsr299.tck.tests.xml.annotationtypes.notvalidxml.foo.TestStereotype; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.Classes; import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; @@ -16,18 +13,17 @@ import org.testng.annotations.Test; @Artifact -(a)Classes({TestBindingType.class, TestInterceptorBindingType.class, TestStereotype.class, NotAnnotationType.class}) +@Classes( { NotAnnotationType.class }) @BeansXml("beans.xml") @ExpectedDeploymentException(DefinitionException.class) -public class NotAnnotationTypeTest extends AbstractJSR299Test -{ - @Test - @SpecAssertions({ - @SpecAssertion(section="9.4", id="d"), - @SpecAssertion(section="9.4.1", id="c") - }) - public void testNotAnnotationType() - { - assert false; - } +public class NotAnnotationTypeTest extends AbstractJSR299Test +{ + @Test(groups = "xml") + @SpecAssertions( { + @SpecAssertion(section = "9.4", id = "d") + }) + public void testNotAnnotationType() + { + assert false; + } } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/stereotype/notjavatype/NotJavaTypeTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/stereotype/notjavatype/NotJavaTypeTest.java 2009-05-03 21:26:12 UTC (rev 2644) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/stereotype/notjavatype/NotJavaTypeTest.java 2009-05-04 13:52:15 UTC (rev 2645) @@ -5,28 +5,22 @@ import org.hibernate.tck.annotations.SpecAssertion; import org.hibernate.tck.annotations.SpecAssertions; import org.jboss.jsr299.tck.AbstractJSR299Test; -import org.jboss.jsr299.tck.tests.xml.annotationtypes.notvalidxml.foo.TestBindingType; -import org.jboss.jsr299.tck.tests.xml.annotationtypes.notvalidxml.foo.TestInterceptorBindingType; -import org.jboss.jsr299.tck.tests.xml.annotationtypes.notvalidxml.foo.TestStereotype; import org.jboss.testharness.impl.packaging.Artifact; -import org.jboss.testharness.impl.packaging.Classes; import org.jboss.testharness.impl.packaging.ExpectedDeploymentException; import org.jboss.testharness.impl.packaging.jsr299.BeansXml; import org.testng.annotations.Test; @Artifact -(a)Classes({TestBindingType.class, TestInterceptorBindingType.class, TestStereotype.class}) @BeansXml("beans.xml") @ExpectedDeploymentException(DefinitionException.class) -public class NotJavaTypeTest extends AbstractJSR299Test -{ - @Test - @SpecAssertions({ - @SpecAssertion(section="9.4", id="d"), - @SpecAssertion(section="9.4.1", id="b") - }) - public void testNotJavaType() - { - assert false; - } +public class NotJavaTypeTest extends AbstractJSR299Test +{ + @Test(groups = "ri-broken") + @SpecAssertions( { + @SpecAssertion(section = "9.4", id = "d") + }) + public void testNotJavaType() + { + assert false; + } } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/stereotype/notvalidtype/NotValidTypeTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/stereotype/notvalidtype/NotValidTypeTest.java 2009-05-03 21:26:12 UTC (rev 2644) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/stereotype/notvalidtype/NotValidTypeTest.java 2009-05-04 13:52:15 UTC (rev 2645) @@ -6,8 +6,6 @@ import org.hibernate.tck.annotations.SpecAssertions; import org.jboss.jsr299.tck.AbstractJSR299Test; import org.jboss.jsr299.tck.tests.xml.annotationtypes.notvalidxml.foo.AnnotationType; -import org.jboss.jsr299.tck.tests.xml.annotationtypes.notvalidxml.foo.TestBindingType; -import org.jboss.jsr299.tck.tests.xml.annotationtypes.notvalidxml.foo.TestInterceptorBindingType; import org.jboss.jsr299.tck.tests.xml.annotationtypes.notvalidxml.foo.TestStereotype; import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.Classes; @@ -16,17 +14,15 @@ import org.testng.annotations.Test; @Artifact -(a)Classes({TestBindingType.class, TestInterceptorBindingType.class, TestStereotype.class, AnnotationType.class}) +@Classes( { TestStereotype.class, AnnotationType.class }) @BeansXml("beans.xml") @ExpectedDeploymentException(DefinitionException.class) -public class NotValidTypeTest extends AbstractJSR299Test -{ - @Test - @SpecAssertions({ - @SpecAssertion(section="9.4.1", id="h") - }) - public void testNotValidType() - { - assert false; - } +public class NotValidTypeTest extends AbstractJSR299Test +{ + @Test(groups = "xml") + @SpecAssertions( { @SpecAssertion(section = "9.4.1", id = "h") }) + public void testNotValidType() + { + assert false; + } } Modified: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/bindingtype/notannotationtype/beans.xml =================================================================== --- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/bindingtype/notannotationtype/beans.xml 2009-05-03 21:26:12 UTC (rev 2644) +++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/bindingtype/notannotationtype/beans.xml 2009-05-04 13:52:15 UTC (rev 2645) @@ -1,13 +1,6 @@ <Beans xmlns="urn:java:ee" xmlns:dd="urn:java:org.jboss.jsr299.tck.tests.xml.annotationtypes.notvalidxml.foo"> - <dd:TestBindingType> + <dd:NotAnnotationType> <BindingType /> - <dd:NotAnnotationType /> - </dd:TestBindingType> - <dd:TestInterceptorBindingType> - <InterceptorBindingType /> - </dd:TestInterceptorBindingType> - <dd:TestStereotype> - <Stereotype /> - </dd:TestStereotype> + </dd:NotAnnotationType> </Beans> \ No newline at end of file Modified: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/bindingtype/notjavatype/beans.xml =================================================================== --- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/bindingtype/notjavatype/beans.xml 2009-05-03 21:26:12 UTC (rev 2644) +++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/bindingtype/notjavatype/beans.xml 2009-05-04 13:52:15 UTC (rev 2645) @@ -2,12 +2,5 @@ xmlns:dd="urn:java:org.jboss.jsr299.tck.tests.xml.annotationtypes.notvalidxml.foo"> <dd:TestBindingType> <BindingType /> - <dd:NotJavaType /> </dd:TestBindingType> - <dd:TestInterceptorBindingType> - <InterceptorBindingType /> - </dd:TestInterceptorBindingType> - <dd:TestStereotype> - <Stereotype /> - </dd:TestStereotype> </Beans> \ No newline at end of file Modified: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/interceptorbindingtype/notannotationtype/beans.xml =================================================================== --- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/interceptorbindingtype/notannotationtype/beans.xml 2009-05-03 21:26:12 UTC (rev 2644) +++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/interceptorbindingtype/notannotationtype/beans.xml 2009-05-04 13:52:15 UTC (rev 2645) @@ -1,13 +1,6 @@ <Beans xmlns="urn:java:ee" xmlns:dd="urn:java:org.jboss.jsr299.tck.tests.xml.annotationtypes.notvalidxml.foo"> - <dd:TestBindingType> - <BindingType /> - </dd:TestBindingType> - <dd:TestInterceptorBindingType> + <dd:NotAnnotationType> <InterceptorBindingType /> - <dd:NotAnnotationType /> - </dd:TestInterceptorBindingType> - <dd:TestStereotype> - <Stereotype /> - </dd:TestStereotype> + </dd:NotAnnotationType> </Beans> \ No newline at end of file Modified: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/interceptorbindingtype/notjavatype/beans.xml =================================================================== --- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/interceptorbindingtype/notjavatype/beans.xml 2009-05-03 21:26:12 UTC (rev 2644) +++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/interceptorbindingtype/notjavatype/beans.xml 2009-05-04 13:52:15 UTC (rev 2645) @@ -1,13 +1,6 @@ <Beans xmlns="urn:java:ee" xmlns:dd="urn:java:org.jboss.jsr299.tck.tests.xml.annotationtypes.notvalidxml.foo"> - <dd:TestBindingType> - <BindingType /> - </dd:TestBindingType> <dd:TestInterceptorBindingType> <InterceptorBindingType /> - <dd:NotJavaType /> </dd:TestInterceptorBindingType> - <dd:TestStereotype> - <Stereotype /> - </dd:TestStereotype> </Beans> \ No newline at end of file Modified: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/interceptorbindingtype/notvalidtype/beans.xml =================================================================== --- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/interceptorbindingtype/notvalidtype/beans.xml 2009-05-03 21:26:12 UTC (rev 2644) +++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/interceptorbindingtype/notvalidtype/beans.xml 2009-05-04 13:52:15 UTC (rev 2645) @@ -1,13 +1,7 @@ <Beans xmlns="urn:java:ee" xmlns:dd="urn:java:org.jboss.jsr299.tck.tests.xml.annotationtypes.notvalidxml.foo"> - <dd:TestBindingType> - <BindingType /> - </dd:TestBindingType> <dd:TestInterceptorBindingType> <InterceptorBindingType /> <dd:AnnotationType /> </dd:TestInterceptorBindingType> - <dd:TestStereotype> - <Stereotype /> - </dd:TestStereotype> </Beans> \ No newline at end of file Modified: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/stereotype/notannotationtype/beans.xml =================================================================== --- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/stereotype/notannotationtype/beans.xml 2009-05-03 21:26:12 UTC (rev 2644) +++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/stereotype/notannotationtype/beans.xml 2009-05-04 13:52:15 UTC (rev 2645) @@ -1,13 +1,6 @@ <Beans xmlns="urn:java:ee" xmlns:dd="urn:java:org.jboss.jsr299.tck.tests.xml.annotationtypes.notvalidxml.foo"> - <dd:TestBindingType> - <BindingType /> - </dd:TestBindingType> - <dd:TestInterceptorBindingType> - <InterceptorBindingType /> - </dd:TestInterceptorBindingType> - <dd:TestStereotype> + <dd:NotAnnotationType> <Stereotype /> - <dd:NotAnnotationType /> - </dd:TestStereotype> + </dd:NotAnnotationType> </Beans> \ No newline at end of file Modified: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/stereotype/notjavatype/beans.xml =================================================================== --- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/stereotype/notjavatype/beans.xml 2009-05-03 21:26:12 UTC (rev 2644) +++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/stereotype/notjavatype/beans.xml 2009-05-04 13:52:15 UTC (rev 2645) @@ -1,13 +1,6 @@ <Beans xmlns="urn:java:ee" xmlns:dd="urn:java:org.jboss.jsr299.tck.tests.xml.annotationtypes.notvalidxml.foo"> - <dd:TestBindingType> - <BindingType /> - </dd:TestBindingType> - <dd:TestInterceptorBindingType> - <InterceptorBindingType /> - </dd:TestInterceptorBindingType> <dd:TestStereotype> <Stereotype /> - <dd:NotJavaType /> </dd:TestStereotype> </Beans> \ No newline at end of file Modified: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/stereotype/notvalidtype/beans.xml =================================================================== --- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/stereotype/notvalidtype/beans.xml 2009-05-03 21:26:12 UTC (rev 2644) +++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/stereotype/notvalidtype/beans.xml 2009-05-04 13:52:15 UTC (rev 2645) @@ -1,11 +1,5 @@ <Beans xmlns="urn:java:ee" xmlns:dd="urn:java:org.jboss.jsr299.tck.tests.xml.annotationtypes.notvalidxml.foo"> - <dd:TestBindingType> - <BindingType /> - </dd:TestBindingType> - <dd:TestInterceptorBindingType> - <InterceptorBindingType /> - </dd:TestInterceptorBindingType> <dd:TestStereotype> <Stereotype /> <dd:AnnotationType />