[webbeans-commits] Webbeans SVN: r2653 - doc/trunk/reference/it-IT.
by webbeans-commits＠lists.jboss.org
Author: nico.ben
Date: 2009-05-05 16:40:49 -0400 (Tue, 05 May 2009)
New Revision: 2653
Modified:
doc/trunk/reference/it-IT/ri-spi.po
doc/trunk/reference/it-IT/viewlayers.po
Log:
Italian translation
Modified: doc/trunk/reference/it-IT/ri-spi.po
===================================================================
--- doc/trunk/reference/it-IT/ri-spi.po 2009-05-05 13:44:17 UTC (rev 2652)
+++ doc/trunk/reference/it-IT/ri-spi.po 2009-05-05 20:40:49 UTC (rev 2653)
@@ -6,7 +6,7 @@
"Project-Id-Version: master.xml\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
"POT-Creation-Date: 2009-04-19 20:36+0000\n"
-"PO-Revision-Date: 2009-04-21 20:54+0100\n"
+"PO-Revision-Date: 2009-05-05 22:38+0100\n"
"Last-Translator: Nicola Benaglia <nico.benaz(a)gmail.com>\n"
"Language-Team: none\n"
"MIME-Version: 1.0\n"
@@ -251,9 +251,9 @@
#. Tag: para
#: ri-spi.xml:73
-#, fuzzy, no-c-format
+#, no-c-format
msgid "The resolution of <literal>@EJB</literal> (for injection into simple beans), the resolution of local EJBs (for backing session beans) and remote EJBs (for injection as a Java EE resource) is delegated to the container. You must provide an implementation of <literal>org.jboss.webbeans.ejb.spi.EjbServices</literal> which provides these operations. For resolving the <literal>@EJB</literal> injection point, Web Beans will provide the <literal>InjectionPoint</literal>; for resolving local EJBs, the <literal>EjbDescriptor</literal> will be provided, and for remote EJBs the <literal>jndiName</literal>, <literal>mappedName</literal>, or <literal>ejbLink</literal> will be provided."
-msgstr "La risoluzione di <literal>@EJB</literal> e <literal>@Resource</literal> è delegata al container. Occorre fornire un'implementazione di <literal>org.jboss.webbeans.ejb.spi.EjbServices</literal> che rende disponibili queste operazioni. Web Beans passa nel <literal>javax.inject.manager.InjectionPoint</literal> la risoluzione, anche come <literal>NamingContext</literal>, che è in uso per ogni richiesta di risoluzione."
+msgstr "La risoluzione di <literal>@EJB</literal> (per l'injection in bean semplici), la risoluzione di EJB locali (per backing bean di sessione) ed EJB remoti (per l'injection come risorsa Java EE) è delegata al container. Occorre fornire un'implementazione di <literal>org.jboss.webbeans.ejb.spi.EjbServices</literal> che rende disponibili queste operazioni. Web Beans fornisce <literal>InjectionPoint</literal>; per risolvere gli EJB locali, viene fornito <literal>EjbDescriptor</literal>, e per gli EJB remoti vengono forniti <literal>jndiName</literal>, <literal>mappedName</literal>, o <literal>ejbLink</literal>."
#. Tag: para
#: ri-spi.xml:87
Modified: doc/trunk/reference/it-IT/viewlayers.po
===================================================================
--- doc/trunk/reference/it-IT/viewlayers.po 2009-05-05 13:44:17 UTC (rev 2652)
+++ doc/trunk/reference/it-IT/viewlayers.po 2009-05-05 20:40:49 UTC (rev 2653)
@@ -6,7 +6,7 @@
"Project-Id-Version: Web_Beans:_Java_Contexts_and_Dependency_Injection VERSION\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
"POT-Creation-Date: 2009-04-19 20:36+0000\n"
-"PO-Revision-Date: 2009-04-20 22:15+0100\n"
+"PO-Revision-Date: 2009-05-05 22:40+0100\n"
"Last-Translator: Nicola Benaglia <nico.benaz(a)gmail.com>\n"
"Language-Team: none\n"
"MIME-Version: 1.0\n"
@@ -107,7 +107,7 @@
#: viewlayers.xml:70
#, no-c-format
msgid "Starting and stopping conversations in Wicket"
-msgstr ""
+msgstr "Avviare ed interrompere le conversazioni in Wicket"
#. Tag: para
#: viewlayers.xml:71
@@ -119,7 +119,7 @@
#: viewlayers.xml:85
#, no-c-format
msgid "Long running conversation propagation in Wicket"
-msgstr ""
+msgstr "Propagazione di conversazioni long running in Wicket"
#. Tag: para
#: viewlayers.xml:86
15 years, 6 months
- 1
- 0
[webbeans-commits] Webbeans SVN: r2652 - in tck/trunk/impl/src/main: java/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/interceptorbindingtype and 16 other directories.
by webbeans-commits＠lists.jboss.org
Author: dallen6
Date: 2009-05-05 09:44:17 -0400 (Tue, 05 May 2009)
New Revision: 2652
Added:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/interceptorbindingtype/childnotannotation/
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/interceptorbindingtype/childnotannotation/NotAnnotationTypeTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/interceptorbindingtype/childnotjavatype/
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/interceptorbindingtype/childnotjavatype/ChildNotJavaTypeTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/stereotype/childnotannotation/
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/stereotype/childnotannotation/NotAnnotationTypeTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/stereotype/childnotjavatype/
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/stereotype/childnotjavatype/NotJavaTypeTest.java
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/interceptorbindingtype/childnotannotation/
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/interceptorbindingtype/childnotannotation/beans.xml
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/interceptorbindingtype/childnotjavatype/
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/interceptorbindingtype/childnotjavatype/beans.xml
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/stereotype/childnotannotation/
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/stereotype/childnotannotation/beans.xml
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/stereotype/childnotjavatype/
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/stereotype/childnotjavatype/beans.xml
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/interceptorbindingtype/notjavatype/NotJavaTypeTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/stereotype/notjavatype/NotJavaTypeTest.java
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/notjavatype/beans.xml
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/stereotype/notjavatype/beans.xml
Log:
Fixed some tests and added missing ones for XML, section 9
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-05 08:43:05 UTC (rev 2651)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/bindingtype/notjavatype/NotJavaTypeTest.java 2009-05-05 13:44:17 UTC (rev 2652)
@@ -15,7 +15,7 @@
@ExpectedDeploymentException(DefinitionException.class)
public class NotJavaTypeTest extends AbstractJSR299Test
{
- @Test(groups = "ri-broken")
+ @Test(groups = "xml")
@SpecAssertions( {
@SpecAssertion(section = "9.4", id = "d")
})
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/interceptorbindingtype/childnotannotation/NotAnnotationTypeTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/interceptorbindingtype/childnotannotation/NotAnnotationTypeTest.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/interceptorbindingtype/childnotannotation/NotAnnotationTypeTest.java 2009-05-05 13:44:17 UTC (rev 2652)
@@ -0,0 +1,26 @@
+package org.jboss.jsr299.tck.tests.xml.annotationtypes.notvalidxml.interceptorbindingtype.childnotannotation;
+
+import javax.inject.DefinitionException;
+
+import org.hibernate.tck.annotations.SpecAssertion;
+import org.hibernate.tck.annotations.SpecAssertions;
+import org.jboss.jsr299.tck.AbstractJSR299Test;
+import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.testharness.impl.packaging.ExpectedDeploymentException;
+import org.jboss.testharness.impl.packaging.jsr299.BeansXml;
+import org.testng.annotations.Test;
+
+@Artifact
+@BeansXml("beans.xml")
+(a)ExpectedDeploymentException(DefinitionException.class)
+public class NotAnnotationTypeTest extends AbstractJSR299Test
+{
+ @Test(groups = "xml")
+ @SpecAssertions( {
+ @SpecAssertion(section = "9.4.2", id = "c")
+ })
+ public void testChildNotAnnotationType()
+ {
+ assert false;
+ }
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/interceptorbindingtype/childnotannotation/NotAnnotationTypeTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/interceptorbindingtype/childnotjavatype/ChildNotJavaTypeTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/interceptorbindingtype/childnotjavatype/ChildNotJavaTypeTest.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/interceptorbindingtype/childnotjavatype/ChildNotJavaTypeTest.java 2009-05-05 13:44:17 UTC (rev 2652)
@@ -0,0 +1,26 @@
+package org.jboss.jsr299.tck.tests.xml.annotationtypes.notvalidxml.interceptorbindingtype.childnotjavatype;
+
+import javax.inject.DefinitionException;
+
+import org.hibernate.tck.annotations.SpecAssertion;
+import org.hibernate.tck.annotations.SpecAssertions;
+import org.jboss.jsr299.tck.AbstractJSR299Test;
+import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.testharness.impl.packaging.ExpectedDeploymentException;
+import org.jboss.testharness.impl.packaging.jsr299.BeansXml;
+import org.testng.annotations.Test;
+
+@Artifact
+@BeansXml("beans.xml")
+(a)ExpectedDeploymentException(DefinitionException.class)
+public class ChildNotJavaTypeTest extends AbstractJSR299Test
+{
+ @Test(groups = "xml")
+ @SpecAssertions( {
+ @SpecAssertion(section = "9.4.2", id = "b")
+ })
+ public void testChildNotJavaType()
+ {
+ assert false;
+ }
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/interceptorbindingtype/childnotjavatype/ChildNotJavaTypeTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
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-05 08:43:05 UTC (rev 2651)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/interceptorbindingtype/notjavatype/NotJavaTypeTest.java 2009-05-05 13:44:17 UTC (rev 2652)
@@ -15,7 +15,7 @@
@ExpectedDeploymentException(DefinitionException.class)
public class NotJavaTypeTest extends AbstractJSR299Test
{
- @Test(groups = "ri-broken")
+ @Test(groups = "xml")
@SpecAssertions( {
@SpecAssertion(section = "9.4", id = "d")
})
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/stereotype/childnotannotation/NotAnnotationTypeTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/stereotype/childnotannotation/NotAnnotationTypeTest.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/stereotype/childnotannotation/NotAnnotationTypeTest.java 2009-05-05 13:44:17 UTC (rev 2652)
@@ -0,0 +1,26 @@
+package org.jboss.jsr299.tck.tests.xml.annotationtypes.notvalidxml.stereotype.childnotannotation;
+
+import javax.inject.DefinitionException;
+
+import org.hibernate.tck.annotations.SpecAssertion;
+import org.hibernate.tck.annotations.SpecAssertions;
+import org.jboss.jsr299.tck.AbstractJSR299Test;
+import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.testharness.impl.packaging.ExpectedDeploymentException;
+import org.jboss.testharness.impl.packaging.jsr299.BeansXml;
+import org.testng.annotations.Test;
+
+@Artifact
+@BeansXml("beans.xml")
+(a)ExpectedDeploymentException(DefinitionException.class)
+public class NotAnnotationTypeTest extends AbstractJSR299Test
+{
+ @Test(groups = "xml")
+ @SpecAssertions( {
+ @SpecAssertion(section = "9.4.1", id = "c")
+ })
+ public void testChildNotAnnotationType()
+ {
+ assert false;
+ }
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/stereotype/childnotannotation/NotAnnotationTypeTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/stereotype/childnotjavatype/NotJavaTypeTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/stereotype/childnotjavatype/NotJavaTypeTest.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/stereotype/childnotjavatype/NotJavaTypeTest.java 2009-05-05 13:44:17 UTC (rev 2652)
@@ -0,0 +1,26 @@
+package org.jboss.jsr299.tck.tests.xml.annotationtypes.notvalidxml.stereotype.childnotjavatype;
+
+import javax.inject.DefinitionException;
+
+import org.hibernate.tck.annotations.SpecAssertion;
+import org.hibernate.tck.annotations.SpecAssertions;
+import org.jboss.jsr299.tck.AbstractJSR299Test;
+import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.testharness.impl.packaging.ExpectedDeploymentException;
+import org.jboss.testharness.impl.packaging.jsr299.BeansXml;
+import org.testng.annotations.Test;
+
+@Artifact
+@BeansXml("beans.xml")
+(a)ExpectedDeploymentException(DefinitionException.class)
+public class NotJavaTypeTest extends AbstractJSR299Test
+{
+ @Test(groups = "xml")
+ @SpecAssertions( {
+ @SpecAssertion(section = "9.4.1", id = "b")
+ })
+ public void testChildNotJavaType()
+ {
+ assert false;
+ }
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/stereotype/childnotjavatype/NotJavaTypeTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
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-05 08:43:05 UTC (rev 2651)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/stereotype/notjavatype/NotJavaTypeTest.java 2009-05-05 13:44:17 UTC (rev 2652)
@@ -15,7 +15,7 @@
@ExpectedDeploymentException(DefinitionException.class)
public class NotJavaTypeTest extends AbstractJSR299Test
{
- @Test(groups = "ri-broken")
+ @Test(groups = "xml")
@SpecAssertions( {
@SpecAssertion(section = "9.4", id = "d")
})
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-05 08:43:05 UTC (rev 2651)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/bindingtype/notjavatype/beans.xml 2009-05-05 13:44:17 UTC (rev 2652)
@@ -1,6 +1,6 @@
<Beans xmlns="urn:java:ee"
xmlns:dd="urn:java:org.jboss.jsr299.tck.tests.xml.annotationtypes.notvalidxml.foo">
- <dd:TestBindingType>
+ <dd:NotJavaType>
<BindingType />
- </dd:TestBindingType>
+ </dd:NotJavaType>
</Beans>
\ No newline at end of file
Added: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/interceptorbindingtype/childnotannotation/beans.xml
===================================================================
--- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/interceptorbindingtype/childnotannotation/beans.xml (rev 0)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/interceptorbindingtype/childnotannotation/beans.xml 2009-05-05 13:44:17 UTC (rev 2652)
@@ -0,0 +1,7 @@
+<Beans xmlns="urn:java:ee"
+ xmlns:dd="urn:java:org.jboss.jsr299.tck.tests.xml.annotationtypes.notvalidxml.foo">
+ <dd:TestInterceptorBindingType>
+ <InterceptorBindingType />
+ <dd:NotAnnotationType />
+ </dd:TestInterceptorBindingType>
+</Beans>
\ No newline at end of file
Property changes on: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/interceptorbindingtype/childnotannotation/beans.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/interceptorbindingtype/childnotjavatype/beans.xml
===================================================================
--- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/interceptorbindingtype/childnotjavatype/beans.xml (rev 0)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/interceptorbindingtype/childnotjavatype/beans.xml 2009-05-05 13:44:17 UTC (rev 2652)
@@ -0,0 +1,7 @@
+<Beans xmlns="urn:java:ee"
+ xmlns:dd="urn:java:org.jboss.jsr299.tck.tests.xml.annotationtypes.notvalidxml.foo">
+ <dd:TestInterceptorBindingType>
+ <InterceptorBindingType />
+ <dd:NotJavaType />
+ </dd:TestInterceptorBindingType>
+</Beans>
\ No newline at end of file
Property changes on: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/interceptorbindingtype/childnotjavatype/beans.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
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-05 08:43:05 UTC (rev 2651)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/interceptorbindingtype/notjavatype/beans.xml 2009-05-05 13:44:17 UTC (rev 2652)
@@ -1,6 +1,6 @@
<Beans xmlns="urn:java:ee"
xmlns:dd="urn:java:org.jboss.jsr299.tck.tests.xml.annotationtypes.notvalidxml.foo">
- <dd:TestInterceptorBindingType>
+ <dd:NotJavaType>
<InterceptorBindingType />
- </dd:TestInterceptorBindingType>
+ </dd:NotJavaType>
</Beans>
\ No newline at end of file
Added: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/stereotype/childnotannotation/beans.xml
===================================================================
--- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/stereotype/childnotannotation/beans.xml (rev 0)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/stereotype/childnotannotation/beans.xml 2009-05-05 13:44:17 UTC (rev 2652)
@@ -0,0 +1,7 @@
+<Beans xmlns="urn:java:ee"
+ xmlns:dd="urn:java:org.jboss.jsr299.tck.tests.xml.annotationtypes.notvalidxml.foo">
+ <dd:TestStereotype>
+ <Stereotype />
+ <dd:NotAnnotationType />
+ </dd:TestStereotype>
+</Beans>
\ No newline at end of file
Property changes on: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/stereotype/childnotannotation/beans.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/stereotype/childnotjavatype/beans.xml
===================================================================
--- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/stereotype/childnotjavatype/beans.xml (rev 0)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/stereotype/childnotjavatype/beans.xml 2009-05-05 13:44:17 UTC (rev 2652)
@@ -0,0 +1,7 @@
+<Beans xmlns="urn:java:ee"
+ xmlns:dd="urn:java:org.jboss.jsr299.tck.tests.xml.annotationtypes.notvalidxml.foo">
+ <dd:TestStereotype>
+ <Stereotype />
+ <dd:NotJavaType />
+ </dd:TestStereotype>
+</Beans>
\ No newline at end of file
Property changes on: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/stereotype/childnotjavatype/beans.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
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-05 08:43:05 UTC (rev 2651)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/stereotype/notjavatype/beans.xml 2009-05-05 13:44:17 UTC (rev 2652)
@@ -1,6 +1,6 @@
<Beans xmlns="urn:java:ee"
xmlns:dd="urn:java:org.jboss.jsr299.tck.tests.xml.annotationtypes.notvalidxml.foo">
- <dd:TestStereotype>
+ <dd:NotJavaType>
<Stereotype />
- </dd:TestStereotype>
+ </dd:NotJavaType>
</Beans>
\ No newline at end of file
15 years, 6 months
- 1
- 0
[webbeans-commits] Webbeans SVN: r2651 - in tck/trunk/impl/src/main: java/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/bindingtype/multipledeclaration and 5 other directories.
by webbeans-commits＠lists.jboss.org
Author: dallen6
Date: 2009-05-05 04:43:05 -0400 (Tue, 05 May 2009)
New Revision: 2651
Added:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer10/ObserverExceptionRethrownTest.java
Removed:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer10/ObserverExceptionRethrown.java
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/bindingtype/multipledeclaration/MultipleDeclarationTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/interceptorbindingtype/multipledeclaration/MultipleDeclarationTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/stereotype/multipledeclaration/MultipleDeclarationTest.java
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/bindingtype/multipledeclaration/beans.xml
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/interceptorbindingtype/multipledeclaration/beans.xml
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/stereotype/multipledeclaration/beans.xml
Log:
Cleanup/simplification of some tests.
Deleted: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer10/ObserverExceptionRethrown.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer10/ObserverExceptionRethrown.java 2009-05-05 05:33:08 UTC (rev 2650)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer10/ObserverExceptionRethrown.java 2009-05-05 08:43:05 UTC (rev 2651)
@@ -1,43 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.jboss.jsr299.tck.tests.event.broken.observer10;
-
-import org.hibernate.tck.annotations.SpecAssertion;
-import org.jboss.jsr299.tck.AbstractJSR299Test;
-import org.jboss.testharness.impl.packaging.Artifact;
-import org.testng.annotations.Test;
-
-/**
- * Tests that an unchecked exception thrown from a non-transactional
- * observer is rethrown.
- *
- * @author David Allen
- *
- */
-@Artifact
-public class ObserverExceptionRethrown extends AbstractJSR299Test
-{
- @Test(groups = { "events" }, expectedExceptions = { TeaCupPomeranian.OversizedException.class })
- @SpecAssertion(section = "7.5.8", id = "q")
- public void testNonTransactionalObserverThrowsNonCheckedExceptionIsRethrown()
- {
- getCurrentManager().fireEvent("Another event");
- }
-
-
-}
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer10/ObserverExceptionRethrownTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer10/ObserverExceptionRethrownTest.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer10/ObserverExceptionRethrownTest.java 2009-05-05 08:43:05 UTC (rev 2651)
@@ -0,0 +1,43 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jboss.jsr299.tck.tests.event.broken.observer10;
+
+import org.hibernate.tck.annotations.SpecAssertion;
+import org.jboss.jsr299.tck.AbstractJSR299Test;
+import org.jboss.testharness.impl.packaging.Artifact;
+import org.testng.annotations.Test;
+
+/**
+ * Tests that an unchecked exception thrown from a non-transactional
+ * observer is rethrown.
+ *
+ * @author David Allen
+ *
+ */
+@Artifact
+public class ObserverExceptionRethrownTest extends AbstractJSR299Test
+{
+ @Test(groups = { "events" }, expectedExceptions = { TeaCupPomeranian.OversizedException.class })
+ @SpecAssertion(section = "7.5.8", id = "q")
+ public void testNonTransactionalObserverThrowsNonCheckedExceptionIsRethrown()
+ {
+ getCurrentManager().fireEvent("Another event");
+ }
+
+
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/event/broken/observer10/ObserverExceptionRethrownTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/bindingtype/multipledeclaration/MultipleDeclarationTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/bindingtype/multipledeclaration/MultipleDeclarationTest.java 2009-05-05 05:33:08 UTC (rev 2650)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/bindingtype/multipledeclaration/MultipleDeclarationTest.java 2009-05-05 08:43:05 UTC (rev 2651)
@@ -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.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;
@@ -15,17 +13,15 @@
import org.testng.annotations.Test;
@Artifact
-(a)Classes({TestBindingType.class, TestInterceptorBindingType.class, TestStereotype.class})
+@Classes( { TestBindingType.class })
@BeansXml("beans.xml")
@ExpectedDeploymentException(DefinitionException.class)
-public class MultipleDeclarationTest extends AbstractJSR299Test
-{
- @Test
- @SpecAssertions({
- @SpecAssertion(section="9.4", id="h")
- })
- public void testMultipleDeclaration()
- {
- assert false;
- }
+public class MultipleDeclarationTest extends AbstractJSR299Test
+{
+ @Test
+ @SpecAssertions( { @SpecAssertion(section = "9.4", id = "h") })
+ public void testMultipleDeclaration()
+ {
+ assert false;
+ }
}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/interceptorbindingtype/multipledeclaration/MultipleDeclarationTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/interceptorbindingtype/multipledeclaration/MultipleDeclarationTest.java 2009-05-05 05:33:08 UTC (rev 2650)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/interceptorbindingtype/multipledeclaration/MultipleDeclarationTest.java 2009-05-05 08:43:05 UTC (rev 2651)
@@ -5,9 +5,7 @@
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;
@@ -15,17 +13,15 @@
import org.testng.annotations.Test;
@Artifact
-(a)Classes({TestBindingType.class, TestInterceptorBindingType.class, TestStereotype.class})
+@Classes( { TestInterceptorBindingType.class })
@BeansXml("beans.xml")
@ExpectedDeploymentException(DefinitionException.class)
-public class MultipleDeclarationTest extends AbstractJSR299Test
-{
- @Test
- @SpecAssertions({
- @SpecAssertion(section="9.4", id="h")
- })
- public void testMultipleDeclaration()
- {
- assert false;
- }
+public class MultipleDeclarationTest extends AbstractJSR299Test
+{
+ @Test
+ @SpecAssertions( { @SpecAssertion(section = "9.4", id = "h") })
+ public void testMultipleDeclaration()
+ {
+ assert false;
+ }
}
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/stereotype/multipledeclaration/MultipleDeclarationTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/stereotype/multipledeclaration/MultipleDeclarationTest.java 2009-05-05 05:33:08 UTC (rev 2650)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/stereotype/multipledeclaration/MultipleDeclarationTest.java 2009-05-05 08:43:05 UTC (rev 2651)
@@ -5,8 +5,6 @@
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;
@@ -15,17 +13,15 @@
import org.testng.annotations.Test;
@Artifact
-(a)Classes({TestBindingType.class, TestInterceptorBindingType.class, TestStereotype.class})
+@Classes( { TestStereotype.class })
@BeansXml("beans.xml")
@ExpectedDeploymentException(DefinitionException.class)
-public class MultipleDeclarationTest extends AbstractJSR299Test
-{
- @Test
- @SpecAssertions({
- @SpecAssertion(section="9.4", id="h")
- })
- public void testMultipleDeclaration()
- {
- assert false;
- }
+public class MultipleDeclarationTest extends AbstractJSR299Test
+{
+ @Test
+ @SpecAssertions( { @SpecAssertion(section = "9.4", id = "h") })
+ public void testMultipleDeclaration()
+ {
+ assert false;
+ }
}
Modified: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/bindingtype/multipledeclaration/beans.xml
===================================================================
--- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/bindingtype/multipledeclaration/beans.xml 2009-05-05 05:33:08 UTC (rev 2650)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/bindingtype/multipledeclaration/beans.xml 2009-05-05 08:43:05 UTC (rev 2651)
@@ -3,12 +3,6 @@
<dd:TestBindingType>
<BindingType />
</dd:TestBindingType>
- <dd:TestInterceptorBindingType>
- <InterceptorBindingType />
- </dd:TestInterceptorBindingType>
- <dd:TestStereotype>
- <Stereotype />
- </dd:TestStereotype>
<dd:TestBindingType>
<BindingType />
</dd:TestBindingType>
Modified: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/interceptorbindingtype/multipledeclaration/beans.xml
===================================================================
--- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/interceptorbindingtype/multipledeclaration/beans.xml 2009-05-05 05:33:08 UTC (rev 2650)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/interceptorbindingtype/multipledeclaration/beans.xml 2009-05-05 08:43:05 UTC (rev 2651)
@@ -1,14 +1,8 @@
<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:TestStereotype>
<dd:TestInterceptorBindingType>
<InterceptorBindingType />
</dd:TestInterceptorBindingType>
Modified: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/stereotype/multipledeclaration/beans.xml
===================================================================
--- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/stereotype/multipledeclaration/beans.xml 2009-05-05 05:33:08 UTC (rev 2650)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/stereotype/multipledeclaration/beans.xml 2009-05-05 08:43:05 UTC (rev 2651)
@@ -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:TestStereotype>
15 years, 6 months
- 1
- 0
[webbeans-commits] Webbeans SVN: r2650 - in extensions/trunk/servlet/tests: src/test/java/org/jboss/webbeans and 5 other directories.
by webbeans-commits＠lists.jboss.org
Author: dan.j.allen
Date: 2009-05-05 01:33:08 -0400 (Tue, 05 May 2009)
New Revision: 2650
Added:
extensions/trunk/servlet/tests/src/test/java/org/jboss/webbeans/environment/
extensions/trunk/servlet/tests/src/test/java/org/jboss/webbeans/environment/servlet/
extensions/trunk/servlet/tests/src/test/java/org/jboss/webbeans/environment/servlet/discovery/
extensions/trunk/servlet/tests/src/test/java/org/jboss/webbeans/environment/servlet/discovery/ServletWebBeanDiscoveryTest.java
extensions/trunk/servlet/tests/src/test/resources/META-INF/
extensions/trunk/servlet/tests/src/test/resources/META-INF/beans.xml
Modified:
extensions/trunk/servlet/tests/pom.xml
Log:
WBX-38 add test to verify that the scanner properly locates META-INF/beans.xml files
Modified: extensions/trunk/servlet/tests/pom.xml
===================================================================
--- extensions/trunk/servlet/tests/pom.xml 2009-05-05 05:32:13 UTC (rev 2649)
+++ extensions/trunk/servlet/tests/pom.xml 2009-05-05 05:33:08 UTC (rev 2650)
@@ -32,11 +32,32 @@
<artifactId>servlet-api</artifactId>
<scope>provided</scope>
</dependency>
+
+ <dependency>
+ <groupId>org.jboss.ejb3</groupId>
+ <artifactId>jboss-ejb3-api</artifactId>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <artifactId>jboss-jaxrpc</artifactId>
+ <groupId>jbossws</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>jboss-jaxrpc</artifactId>
+ <groupId>jboss.jbossws</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>jboss-transaction-api</artifactId>
+ <groupId>org.jboss.javaee</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
<dependency>
<groupId>org.jboss.webbeans</groupId>
<artifactId>webbeans-core-test</artifactId>
<scope>test</scope>
+ <version>1.0.0-SNAPSHOT</version> <!-- waiting on >= 1.0.0.PREVIEW2 -->
</dependency>
<dependency>
@@ -61,6 +82,13 @@
<artifactId>webbeans-spi</artifactId>
<scope>test</scope>
</dependency>
+
+ <dependency>
+ <groupId>org.jboss.webbeans.servlet</groupId>
+ <artifactId>webbeans-servlet-int</artifactId>
+ <scope>test</scope>
+ <version>1.0.0-SNAPSHOT</version> <!-- waiting on >= 1.0.0.CR2 -->
+ </dependency>
<dependency>
<groupId>javax.el</groupId>
Added: extensions/trunk/servlet/tests/src/test/java/org/jboss/webbeans/environment/servlet/discovery/ServletWebBeanDiscoveryTest.java
===================================================================
--- extensions/trunk/servlet/tests/src/test/java/org/jboss/webbeans/environment/servlet/discovery/ServletWebBeanDiscoveryTest.java (rev 0)
+++ extensions/trunk/servlet/tests/src/test/java/org/jboss/webbeans/environment/servlet/discovery/ServletWebBeanDiscoveryTest.java 2009-05-05 05:33:08 UTC (rev 2650)
@@ -0,0 +1,41 @@
+package org.jboss.webbeans.environment.servlet.discovery;
+
+import java.net.URL;
+import java.util.Set;
+import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.webbeans.mock.MockServletContext;
+import org.jboss.webbeans.test.AbstractWebBeansTest;
+import org.testng.annotations.Test;
+
+/**
+ * A set of tests to verify the discovery of JSR-299 resources in a servlet environment.
+ *
+ * @author Dan Allen
+ */
+@Artifact
+// for now we are just going to look for the one in test-classes/META-INF/beans.xml using standalone mode
+//@Resources(
+// @Resource(source = "beans.xml", destination = "WEB-INF/classes/META-INF/beans.xml")
+//)
+public class ServletWebBeanDiscoveryTest extends AbstractWebBeansTest
+{
+ /**
+ * Verify that the scanner properly locates any META-INF/beans.xml. To prevent a brittle test,
+ * assume that there is at least one found and that the path ends with META-INF/beans.xml. Technically,
+ * META-INF would need to be the root of the classpath.
+ */
+ @Test
+ public void testDiscoverMetaInfBeansXml()
+ {
+ ServletWebBeanDiscovery discovery = new ServletWebBeanDiscovery(new MockServletContext("."))
+ {
+ };
+
+ Set<URL> beansXmls = discovery.getWbUrls();
+ assert beansXmls.size() >= 1 : "Expecting to find at least one META-INF/beans.xml resource on the test classpath";
+ for (URL beansXml : beansXmls)
+ {
+ assert beansXml.getPath().endsWith("META-INF/beans.xml") : beansXml.getPath() + " does not end with META-INF/beans.xml as expected";
+ }
+ }
+}
Added: extensions/trunk/servlet/tests/src/test/resources/META-INF/beans.xml
===================================================================
15 years, 6 months
- 1
- 0
[webbeans-commits] Webbeans SVN: r2649 - in ri/trunk/tests: src/main/java/org/jboss/webbeans/mock and 1 other directory.
by webbeans-commits＠lists.jboss.org
Author: dan.j.allen
Date: 2009-05-05 01:32:13 -0400 (Tue, 05 May 2009)
New Revision: 2649
Added:
ri/trunk/tests/src/main/java/org/jboss/webbeans/mock/MockServletContext.java
Modified:
ri/trunk/tests/pom.xml
Log:
add a MockServletContext for testing purposes
Modified: ri/trunk/tests/pom.xml
===================================================================
--- ri/trunk/tests/pom.xml 2009-05-05 05:29:37 UTC (rev 2648)
+++ ri/trunk/tests/pom.xml 2009-05-05 05:32:13 UTC (rev 2649)
@@ -39,10 +39,15 @@
<artifactId>el-api</artifactId>
</dependency>
- <dependency>
+ <dependency>
<groupId>javax.el</groupId>
<artifactId>el-ri</artifactId>
</dependency>
+
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </dependency>
<dependency>
<groupId>org.jboss.webbeans</groupId>
Added: ri/trunk/tests/src/main/java/org/jboss/webbeans/mock/MockServletContext.java
===================================================================
--- ri/trunk/tests/src/main/java/org/jboss/webbeans/mock/MockServletContext.java (rev 0)
+++ ri/trunk/tests/src/main/java/org/jboss/webbeans/mock/MockServletContext.java 2009-05-05 05:32:13 UTC (rev 2649)
@@ -0,0 +1,558 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jboss.webbeans.mock;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.Collections;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
+import javax.servlet.RequestDispatcher;
+import javax.servlet.Servlet;
+import javax.servlet.ServletContext;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+
+/**
+ * Mock implementation of the servlet context for testing purposes. This implementation supports all
+ * of the standard context methods except that request dispatching just indicates what is being
+ * dispatched to, rather than doing the actual dispatch.
+ * <p>
+ * The context can be configured with a path parameter that should point to an absolute directory
+ * location that represents the place where the contents of the WAR bundle are located. Setting this
+ * value allows all of the resource location functionality to work as in a fully functioning web
+ * application. This value is not set then not resource location functionality will work and instead
+ * null will always be returned.
+ *
+ * Adapted from Apache Wicket
+ *
+ * @author Chris Turner (Wicket)
+ */
+public class MockServletContext implements ServletContext
+{
+ private final Map<String, Object> attributes = new HashMap<String, Object>();
+
+ private final Map<String, String> initParameters = new HashMap<String, String>();
+
+ /** Map of mime types */
+ private final Map<String, String> mimeTypes = new HashMap<String, String>();
+
+ private File webappRoot;
+
+ /**
+ * Create the mock object. As part of the creation, the context sets the root directory where
+ * web application content is stored. This must be an ABSOLUTE directory relative to where the
+ * tests are being executed. For example: <code>System.getProperty("user.dir") +
+ * "/src/webapp"</code>
+ *
+ * @param application
+ * The application that this context is for
+ * @param path
+ * The path to the root of the web application
+ */
+ public MockServletContext(final String path)
+ {
+ webappRoot = null;
+ if (path != null)
+ {
+ webappRoot = new File(path);
+ if (!webappRoot.exists() || !webappRoot.isDirectory())
+ {
+ //log.warn("WARNING: The webapp root directory is invalid: " + path);
+ webappRoot = null;
+ }
+ }
+
+ // assume we're running in maven or an eclipse project created by maven,
+ // so the sessions directory will be created inside the target directory,
+ // and will be cleaned up with a mvn clean
+
+ File file = new File("target/work/");
+ file.mkdirs();
+ attributes.put("javax.servlet.context.tempdir", file);
+
+ mimeTypes.put("html", "text/html");
+ mimeTypes.put("htm", "text/html");
+ mimeTypes.put("css", "text/css");
+ mimeTypes.put("xml", "text/xml");
+ mimeTypes.put("js", "text/plain");
+ mimeTypes.put("gif", "image/gif");
+ mimeTypes.put("jpg", "image/jpeg");
+ mimeTypes.put("png", "image/png");
+ }
+
+ /**
+ * Add an init parameter.
+ *
+ * @param name
+ * The parameter name
+ * @param value
+ * The parameter value
+ */
+ public void addInitParameter(final String name, final String value)
+ {
+ initParameters.put(name, value);
+ }
+
+ // Configuration methods
+
+ /**
+ * Add a new recognized mime type.
+ *
+ * @param fileExtension
+ * The file extension (e.g. "jpg")
+ * @param mimeType
+ * The mime type (e.g. "image/jpeg")
+ */
+ public void addMimeType(final String fileExtension, final String mimeType)
+ {
+ mimeTypes.put(fileExtension, mimeType);
+ }
+
+ /**
+ * Get an attribute with the given name.
+ *
+ * @param name
+ * The attribute name
+ * @return The value, or null
+ */
+ public Object getAttribute(final String name)
+ {
+ return attributes.get(name);
+ }
+
+ /**
+ * Get all of the attribute names.
+ *
+ * @return The attribute names
+ */
+ public Enumeration<String> getAttributeNames()
+ {
+ return Collections.enumeration(attributes.keySet());
+ }
+
+ // ServletContext interface methods
+
+ /**
+ * Get the context for the given URL path
+ *
+ * @param name
+ * The url path
+ * @return Always returns this
+ */
+ public ServletContext getContext(String name)
+ {
+ return this;
+ }
+
+ /**
+ * Get the init parameter with the given name.
+ *
+ * @param name
+ * The name
+ * @return The parameter, or null if no such parameter
+ */
+ public String getInitParameter(final String name)
+ {
+ return initParameters.get(name);
+ }
+
+ /**
+ * Get the name of all of the init parameters.
+ *
+ * @return The init parameter names
+ */
+ public Enumeration<String> getInitParameterNames()
+ {
+ return Collections.enumeration(initParameters.keySet());
+ }
+
+ /**
+ * @return Always 2
+ */
+ public int getMajorVersion()
+ {
+ return 2;
+ }
+
+ /**
+ * Get the mime type for the given file. Uses a hardcoded map of mime types set at
+ * Initialization time.
+ *
+ * @param name
+ * The name to get the mime type for
+ * @return The mime type
+ */
+ public String getMimeType(final String name)
+ {
+ int index = name.lastIndexOf('.');
+ if (index == -1 || index == (name.length() - 1))
+ {
+ return null;
+ }
+ else
+ {
+ return mimeTypes.get(name.substring(index + 1));
+ }
+ }
+
+ /**
+ * @return Always 3
+ */
+ public int getMinorVersion()
+ {
+ return 3;
+ }
+
+ /**
+ * Wicket does not use the RequestDispatcher, so this implementation just returns a dummy value.
+ *
+ * @param name
+ * The name of the servlet or JSP
+ * @return The dispatcher
+ */
+ public RequestDispatcher getNamedDispatcher(final String name)
+ {
+ return getRequestDispatcher(name);
+ }
+
+ /**
+ * Get the real file path of the given resource name.
+ *
+ * @param name
+ * The name
+ * @return The real path or null
+ */
+ public String getRealPath(String name)
+ {
+ if (webappRoot == null)
+ {
+ return null;
+ }
+
+ if (name.startsWith("/"))
+ {
+ name = name.substring(1);
+ }
+
+ File f = new File(webappRoot, name);
+ if (!f.exists())
+ {
+ return null;
+ }
+ else
+ {
+ return f.getPath();
+ }
+ }
+
+ /**
+ * Wicket does not use the RequestDispatcher, so this implementation just returns a dummy value.
+ *
+ * @param name
+ * The name of the resource to get the dispatcher for
+ * @return The dispatcher
+ */
+ public RequestDispatcher getRequestDispatcher(final String name)
+ {
+ return new RequestDispatcher()
+ {
+ public void forward(ServletRequest servletRequest, ServletResponse servletResponse)
+ throws IOException
+ {
+ servletResponse.getWriter().write("FORWARD TO RESOURCE: " + name);
+ }
+
+ public void include(ServletRequest servletRequest, ServletResponse servletResponse)
+ throws IOException
+ {
+ servletResponse.getWriter().write("INCLUDE OF RESOURCE: " + name);
+ }
+ };
+ }
+
+ /**
+ * Get the URL for a particular resource that is relative to the web app root directory.
+ *
+ * @param name
+ * The name of the resource to get
+ * @return The resource, or null if resource not found
+ * @throws MalformedURLException
+ * If the URL is invalid
+ */
+ public URL getResource(String name) throws MalformedURLException
+ {
+ if (webappRoot == null)
+ {
+ return null;
+ }
+
+ if (name.startsWith("/"))
+ {
+ name = name.substring(1);
+ }
+
+ File f = new File(webappRoot, name);
+ if (!f.exists())
+ {
+ return null;
+ }
+ else
+ {
+ return f.toURI().toURL();
+ }
+ }
+
+ /**
+ * Get an input stream for a particular resource that is relative to the web app root directory.
+ *
+ * @param name
+ * The name of the resource to get
+ * @return The input stream for the resource, or null of resource is not found
+ */
+ public InputStream getResourceAsStream(String name)
+ {
+ if (webappRoot == null)
+ {
+ return null;
+ }
+
+ if (name.startsWith("/"))
+ {
+ name = name.substring(1);
+ }
+
+ File f = new File(webappRoot, name);
+ if (!f.exists())
+ {
+ return null;
+ }
+ else
+ {
+ try
+ {
+ return new FileInputStream(f);
+ }
+ catch (FileNotFoundException e)
+ {
+ e.printStackTrace();
+ return null;
+ }
+ }
+ }
+
+ /**
+ * Get the resource paths starting from the web app root directory and then relative to the the
+ * given name.
+ *
+ * @param name
+ * The starting name
+ * @return The set of resource paths at this location
+ */
+ public Set<String> getResourcePaths(String name)
+ {
+ if (webappRoot == null)
+ {
+ return new HashSet<String>();
+ }
+
+ if (name.startsWith("/"))
+ {
+ name = name.substring(1);
+ }
+ if (name.endsWith("/"))
+ {
+ name = name.substring(0, name.length() - 1);
+ }
+ String[] elements = null;
+ if (name.trim().length() == 0)
+ {
+ elements = new String[0];
+ }
+ else
+ {
+ elements = name.split("/");
+ }
+
+ File current = webappRoot;
+ for (int i = 0; i < elements.length; i++)
+ {
+ File[] files = current.listFiles();
+ boolean match = false;
+ for (int f = 0; f < files.length; f++)
+ {
+ if (files[f].getName().equals(elements[i]) && files[f].isDirectory())
+ {
+ current = files[f];
+ match = true;
+ break;
+ }
+ }
+ if (!match)
+ {
+ return null;
+ }
+ }
+
+ File[] files = current.listFiles();
+ Set<String> result = new HashSet<String>();
+ int stripLength = webappRoot.getPath().length();
+ for (int f = 0; f < files.length; f++)
+ {
+ String s = files[f].getPath().substring(stripLength).replace('\\', '/');
+ if (files[f].isDirectory())
+ {
+ s = s + "/";
+ }
+ result.add(s);
+ }
+ return result;
+ }
+
+ /**
+ * Get the server info.
+ *
+ * @return The server info
+ */
+ public String getServerInfo()
+ {
+ return "Wicket Mock Test Environment v1.0";
+ }
+
+ /**
+ * NOT USED - Servlet Spec requires that this always returns null.
+ *
+ * @param name
+ * Not used
+ * @return null
+ * @throws ServletException
+ * Not used
+ */
+ public Servlet getServlet(String name) throws ServletException
+ {
+ return null;
+ }
+
+ /**
+ * Return the name of the servlet context.
+ *
+ * @return The name
+ */
+ public String getServletContextName()
+ {
+ return "Mock";
+ }
+
+ /**
+ * NOT USED - Servlet spec requires that this always returns null.
+ *
+ * @return null
+ */
+ public Enumeration<String> getServletNames()
+ {
+ return null;
+ }
+
+ /**
+ * NOT USED - Servlet spec requires that this always returns null.
+ *
+ * @return null
+ */
+ public Enumeration<Servlet> getServlets()
+ {
+ return null;
+ }
+
+ /**
+ * As part of testing we always log to the console.
+ *
+ * @param e
+ * The exception to log
+ * @param msg
+ * The message to log
+ */
+ public void log(Exception e, String msg)
+ {
+ //log.error(msg, e);
+ }
+
+ /**
+ * As part of testing we always log to the console.
+ *
+ * @param msg
+ * The message to log
+ */
+ public void log(String msg)
+ {
+ //log.info(msg);
+ }
+
+ /**
+ * As part of testing we always log to the console.
+ *
+ * @param msg
+ * The message to log
+ * @param cause
+ * The cause exception
+ */
+ public void log(String msg, Throwable cause)
+ {
+ //log.error(msg, cause);
+ }
+
+ /**
+ * Remove an attribute with the given name.
+ *
+ * @param name
+ * The name
+ */
+ public void removeAttribute(final String name)
+ {
+ attributes.remove(name);
+ }
+
+ /**
+ * Set an attribute.
+ *
+ * @param name
+ * The name of the attribute
+ * @param o
+ * The value
+ */
+ public void setAttribute(final String name, final Object o)
+ {
+ attributes.put(name, o);
+ }
+
+ /**
+ * @return context path
+ */
+ public String getContextPath()
+ {
+ return "";
+ }
+}
15 years, 6 months
- 1
- 0
[webbeans-commits] Webbeans SVN: r2648 - extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/discovery.
by webbeans-commits＠lists.jboss.org
Author: dan.j.allen
Date: 2009-05-05 01:29:37 -0400 (Tue, 05 May 2009)
New Revision: 2648
Modified:
extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/discovery/SEWebBeanDiscovery.java
Log:
WBX-38
there should be no leading / on the META-INF/beans.xml resource
Modified: extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/discovery/SEWebBeanDiscovery.java
===================================================================
--- extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/discovery/SEWebBeanDiscovery.java 2009-05-05 05:28:53 UTC (rev 2647)
+++ extensions/trunk/se/src/main/java/org/jboss/webbeans/environment/se/discovery/SEWebBeanDiscovery.java 2009-05-05 05:29:37 UTC (rev 2648)
@@ -68,7 +68,7 @@
private void scan()
{
Scanner scanner = new URLScanner(Reflections.getClassLoader(), this);
- scanner.scanResources(new String[] { "/META-INF/beans.xml" });
+ scanner.scanResources(new String[] { "META-INF/beans.xml" });
}
}
15 years, 6 months
- 1
- 0
[webbeans-commits] Webbeans SVN: r2647 - extensions/trunk/servlet/int/src/main/java/org/jboss/webbeans/environment/servlet/discovery.
by webbeans-commits＠lists.jboss.org
Author: dan.j.allen
Date: 2009-05-05 01:28:53 -0400 (Tue, 05 May 2009)
New Revision: 2647
Modified:
extensions/trunk/servlet/int/src/main/java/org/jboss/webbeans/environment/servlet/discovery/AbstractScanner.java
extensions/trunk/servlet/int/src/main/java/org/jboss/webbeans/environment/servlet/discovery/ServletWebBeanDiscovery.java
Log:
WBX-38
resource path should be META-INF/beans.xml rather than /META-INF/beans.xml
use string constants for paths (to avoid mixups in the future)
Modified: extensions/trunk/servlet/int/src/main/java/org/jboss/webbeans/environment/servlet/discovery/AbstractScanner.java
===================================================================
--- extensions/trunk/servlet/int/src/main/java/org/jboss/webbeans/environment/servlet/discovery/AbstractScanner.java 2009-05-05 05:28:00 UTC (rev 2646)
+++ extensions/trunk/servlet/int/src/main/java/org/jboss/webbeans/environment/servlet/discovery/AbstractScanner.java 2009-05-05 05:28:53 UTC (rev 2647)
@@ -31,7 +31,7 @@
*/
public abstract class AbstractScanner implements Scanner
{
-
+
private static final Log log = Logging.getLog(Scanner.class);
private final ClassLoader classLoader;
private final ServletWebBeanDiscovery webBeanDiscovery;
@@ -60,7 +60,7 @@
log.error("Error loading " + name, e);
}
}
- else if (name.endsWith("beans.xml"))
+ else if (name.equals(ServletWebBeanDiscovery.META_INF_BEANS_XML))
{
webBeanDiscovery.getWbUrls().add(url);
}
Modified: extensions/trunk/servlet/int/src/main/java/org/jboss/webbeans/environment/servlet/discovery/ServletWebBeanDiscovery.java
===================================================================
--- extensions/trunk/servlet/int/src/main/java/org/jboss/webbeans/environment/servlet/discovery/ServletWebBeanDiscovery.java 2009-05-05 05:28:00 UTC (rev 2646)
+++ extensions/trunk/servlet/int/src/main/java/org/jboss/webbeans/environment/servlet/discovery/ServletWebBeanDiscovery.java 2009-05-05 05:28:53 UTC (rev 2647)
@@ -39,6 +39,9 @@
*/
public abstract class ServletWebBeanDiscovery implements WebBeanDiscovery
{
+ public static final String META_INF_BEANS_XML = "META-INF/beans.xml";
+ public static final String WEB_INF_BEANS_XML = "/WEB-INF/beans.xml";
+ public static final String WEB_INF_CLASSES = "/WEB-INF/classes";
private final Set<Class<?>> wbClasses;
private final Set<URL> wbUrls;
@@ -75,13 +78,13 @@
private void scan()
{
Scanner scanner = new URLScanner(Reflections.getClassLoader(), this);
- scanner.scanResources(new String[] { "/META-INF/beans.xml" });
+ scanner.scanResources(new String[] { META_INF_BEANS_XML });
try
{
- URL beans = servletContext.getResource("/WEB-INF/beans.xml");
+ URL beans = servletContext.getResource(WEB_INF_BEANS_XML);
if (beans != null)
{
- File webInfClasses = Servlets.getRealFile(servletContext, "/WEB-INF/classes");
+ File webInfClasses = Servlets.getRealFile(servletContext, WEB_INF_CLASSES);
if (webInfClasses != null)
{
File[] files = { webInfClasses };
15 years, 6 months
- 1
- 0
[webbeans-commits] Webbeans SVN: r2646 - extensions/trunk/servlet/int/src/main/java/org/jboss/webbeans/environment/servlet/discovery.
by webbeans-commits＠lists.jboss.org
Author: dan.j.allen
Date: 2009-05-05 01:28:00 -0400 (Tue, 05 May 2009)
New Revision: 2646
Modified:
extensions/trunk/servlet/int/src/main/java/org/jboss/webbeans/environment/servlet/discovery/URLScanner.java
Log:
change META-INF/components.xml to META-INF/beans.xml in comment
Modified: extensions/trunk/servlet/int/src/main/java/org/jboss/webbeans/environment/servlet/discovery/URLScanner.java
===================================================================
--- extensions/trunk/servlet/int/src/main/java/org/jboss/webbeans/environment/servlet/discovery/URLScanner.java 2009-05-04 13:52:15 UTC (rev 2645)
+++ extensions/trunk/servlet/int/src/main/java/org/jboss/webbeans/environment/servlet/discovery/URLScanner.java 2009-05-05 05:28:00 UTC (rev 2646)
@@ -88,7 +88,7 @@
if ((resourceName != null) && (resourceName.lastIndexOf('/') > 0))
{
- // for META-INF/components.xml
+ // for META-INF/beans.xml
dirOrArchive = dirOrArchive.getParentFile();
}
15 years, 6 months
- 1
- 0
[webbeans-commits] Webbeans SVN: r2645 - in tck/trunk/impl/src/main: java/org/jboss/jsr299/tck/tests/xml/annotationtypes/notvalidxml/bindingtype/notjavatype and 14 other directories.
by webbeans-commits＠lists.jboss.org
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 />
15 years, 6 months
- 1
- 0
[webbeans-commits] Webbeans SVN: r2644 - in tck/trunk/impl/src/main: resources/org/jboss/jsr299/tck/tests/xml/schema and 1 other directory.
by webbeans-commits＠lists.jboss.org
Author: dallen6
Date: 2009-05-03 17:26:12 -0400 (Sun, 03 May 2009)
New Revision: 2644
Added:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/schema/NamespacesValidatedTest.java
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/schema/Order.java
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/schema/invalid-beans.xml
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/schema/standard-beans.xml
Removed:
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/schema/beans.xml
Modified:
tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/schema/StandardSchemaLocationTest.java
tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/schema/schema.xsd
Log:
Some improvements and splitting of tests for XML schema related assertions.
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/schema/NamespacesValidatedTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/schema/NamespacesValidatedTest.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/schema/NamespacesValidatedTest.java 2009-05-03 21:26:12 UTC (rev 2644)
@@ -0,0 +1,56 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jboss.jsr299.tck.tests.xml.schema;
+
+import javax.inject.DefinitionException;
+
+import org.hibernate.tck.annotations.SpecAssertion;
+import org.hibernate.tck.annotations.SpecAssertions;
+import org.jboss.jsr299.tck.AbstractJSR299Test;
+import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.testharness.impl.packaging.ExpectedDeploymentException;
+import org.jboss.testharness.impl.packaging.Resource;
+import org.jboss.testharness.impl.packaging.Resources;
+import org.jboss.testharness.impl.packaging.jsr299.BeansXml;
+import org.testng.annotations.Test;
+
+/**
+ * This test is designed to produce an XML validation failure so
+ * that we can detect that the namespace was validated with
+ * the XML parser and the corresponding schema per the spec.
+ *
+ * @author David Allen
+ *
+ */
+@Artifact
+@Resources({
+ @Resource(source="schema.xsd", destination="WEB-INF/classes/org/jboss/jsr299/tck/tests/xml/schema/schema.xsd")
+})
+@BeansXml("invalid-beans.xml")
+(a)ExpectedDeploymentException(DefinitionException.class)
+public class NamespacesValidatedTest extends AbstractJSR299Test
+{
+ @Test(groups = { "ri-broken", "xml" })
+ @SpecAssertions({
+ @SpecAssertion(section="9.3", id="a")
+ })
+ public void testValidationFailure()
+ {
+ assert false;
+ }
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/schema/NamespacesValidatedTest.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/schema/Order.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/schema/Order.java (rev 0)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/schema/Order.java 2009-05-03 21:26:12 UTC (rev 2644)
@@ -0,0 +1,17 @@
+package org.jboss.jsr299.tck.tests.xml.schema;
+
+class Order
+{
+ private String shipToAddress;
+ private String shippingMethod;
+
+ public String getShipToAddress()
+ {
+ return shipToAddress;
+ }
+
+ public String getShippingMethod()
+ {
+ return shippingMethod;
+ }
+}
Property changes on: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/schema/Order.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/schema/StandardSchemaLocationTest.java
===================================================================
--- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/schema/StandardSchemaLocationTest.java 2009-05-03 12:18:01 UTC (rev 2643)
+++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/xml/schema/StandardSchemaLocationTest.java 2009-05-03 21:26:12 UTC (rev 2644)
@@ -1,12 +1,9 @@
package org.jboss.jsr299.tck.tests.xml.schema;
-import javax.inject.DefinitionException;
-
import org.hibernate.tck.annotations.SpecAssertion;
import org.hibernate.tck.annotations.SpecAssertions;
import org.jboss.jsr299.tck.AbstractJSR299Test;
import org.jboss.testharness.impl.packaging.Artifact;
-import org.jboss.testharness.impl.packaging.ExpectedDeploymentException;
import org.jboss.testharness.impl.packaging.Resource;
import org.jboss.testharness.impl.packaging.Resources;
import org.jboss.testharness.impl.packaging.jsr299.BeansXml;
@@ -16,18 +13,18 @@
@Resources({
@Resource(source="schema.xsd", destination="WEB-INF/classes/org/jboss/jsr299/tck/tests/xml/schema/schema.xsd")
})
-@BeansXml("beans.xml")
-(a)ExpectedDeploymentException(DefinitionException.class)
+@BeansXml("standard-beans.xml")
public class StandardSchemaLocationTest extends AbstractJSR299Test
{
- @Test(groups="incontainer-ri-broken")
+ @Test(groups = { "ri-broken", "xml" })
@SpecAssertions({
- @SpecAssertion(section="9.3", id="a"),
@SpecAssertion(section="9.3", id="b"),
@SpecAssertion(section="9.3", id="c")
})
public void testStandardSchemaLocation()
{
- assert false;
+ Order order = getCurrentManager().getInstanceByType(Order.class);
+ assert order.getShipToAddress() != null;
+ assert order.getShipToAddress().equals("123 Main St., Anywhere, MA");
}
}
Deleted: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/schema/beans.xml
===================================================================
--- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/schema/beans.xml 2009-05-03 12:18:01 UTC (rev 2643)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/schema/beans.xml 2009-05-03 21:26:12 UTC (rev 2644)
@@ -1,8 +0,0 @@
-<Beans xmlns="urn:java:ee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="urn:java:org.jboss.jsr299.tck.tests.xml.schema http://mydomain.com/myapp/schema-1.2.xsd">
- <Deploy>
- <Standard />
- <Production />
- </Deploy>
-</Beans>
\ No newline at end of file
Added: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/schema/invalid-beans.xml
===================================================================
--- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/schema/invalid-beans.xml (rev 0)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/schema/invalid-beans.xml 2009-05-03 21:26:12 UTC (rev 2644)
@@ -0,0 +1,11 @@
+<Beans xmlns="urn:java:ee"
+ xmlns:test="urn:java:org.jboss.jsr299.tck.tests.xml.schema">
+ <Deploy>
+ <Standard />
+ <Production />
+ </Deploy>
+ <test:Order>
+ <test:shipToAddress>123 Main St., Anywhere, MA</test:shipToAddress>
+ <test:shippingMethod>DHL</test:shippingMethod>
+ </test:Order>
+</Beans>
\ No newline at end of file
Property changes on: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/schema/invalid-beans.xml
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/schema/schema.xsd
===================================================================
--- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/schema/schema.xsd 2009-05-03 12:18:01 UTC (rev 2643)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/schema/schema.xsd 2009-05-03 21:26:12 UTC (rev 2644)
@@ -1,10 +1,9 @@
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" targetNamespace="urn:java:ee">
- <xs:element name="Beanses">
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" targetNamespace="urn:java:org.jboss.jsr299.tck.tests.xml.schema">
+ <xs:element name="Order">
<xs:complexType>
<xs:sequence minOccurs="0" maxOccurs="unbounded">
- <xs:any namespace="##any" processContents="skip" />
+ <xs:element name="shipToAddress" />
</xs:sequence>
- <xs:anyAttribute namespace="##any" processContents="skip" />
</xs:complexType>
</xs:element>
</xs:schema>
\ No newline at end of file
Copied: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/schema/standard-beans.xml (from rev 2643, tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/schema/beans.xml)
===================================================================
--- tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/schema/standard-beans.xml (rev 0)
+++ tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/xml/schema/standard-beans.xml 2009-05-03 21:26:12 UTC (rev 2644)
@@ -0,0 +1,10 @@
+<Beans xmlns="urn:java:ee"
+ xmlns:test="urn:java:org.jboss.jsr299.tck.tests.xml.schema">
+ <Deploy>
+ <Standard />
+ <Production />
+ </Deploy>
+ <test:Order>
+ <test:shipToAddress>123 Main St., Anywhere, MA</test:shipToAddress>
+ </test:Order>
+</Beans>
\ No newline at end of file
15 years, 6 months
- 1
- 0