[jboss-cvs] JBossAS SVN: r81782 - in projects/ejb3/trunk/testsuite/src/test: resources/test/dd/web/form-auth and 9 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Nov 28 11:54:40 EST 2008
Author: alex.loubyansky at jboss.com
Date: 2008-11-28 11:54:40 -0500 (Fri, 28 Nov 2008)
New Revision: 81782
Modified:
projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/schema/unit/DDValidationUnitTestCase.java
projects/ejb3/trunk/testsuite/src/test/resources/test/dd/web/form-auth/application.xml
projects/ejb3/trunk/testsuite/src/test/resources/test/dependency/META-INF/jboss-app.xml
projects/ejb3/trunk/testsuite/src/test/resources/test/externalrefscoped/first-ear/META-INF/jboss-app.xml
projects/ejb3/trunk/testsuite/src/test/resources/test/externalrefscoped/second-ear/META-INF/jboss-app.xml
projects/ejb3/trunk/testsuite/src/test/resources/test/factory/META-INF/jboss-app.xml
projects/ejb3/trunk/testsuite/src/test/resources/test/factoryxml/META-INF/jboss-app.xml
projects/ejb3/trunk/testsuite/src/test/resources/test/jsp/META-INF/application.xml
projects/ejb3/trunk/testsuite/src/test/resources/test/scopedclassloader/ejbear/META-INF/jboss-app.xml
projects/ejb3/trunk/testsuite/src/test/resources/test/scopedclassloader/webear/META-INF/jboss-app.xml
projects/ejb3/trunk/testsuite/src/test/resources/test/servlet/META-INF/application.xml
projects/ejb3/trunk/testsuite/src/test/resources/test/servlet/META-INF/jboss-app.xml
Log:
fixing DD validation
Modified: projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/schema/unit/DDValidationUnitTestCase.java
===================================================================
--- projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/schema/unit/DDValidationUnitTestCase.java 2008-11-28 16:44:57 UTC (rev 81781)
+++ projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/schema/unit/DDValidationUnitTestCase.java 2008-11-28 16:54:40 UTC (rev 81782)
@@ -83,6 +83,7 @@
VALIDATE_PATTERNS.add(Pattern.compile("application.*\\.xml")); // application, application-client pattern
ignore("schema/META-INF/jboss.xml");
+ ignore("schema/META-INF/ejb-jar.xml");
}
/**
@@ -119,8 +120,6 @@
public void testValidation() throws Exception
{
- getLog().info(RESOURCES.getAbsolutePath() + ", " + RESOURCES.isDirectory());
-
List<String> invalidList = new ArrayList<String>();
scan(RESOURCES, invalidList, false);
assertTrue("No descriptors were found", total > 0);
Modified: projects/ejb3/trunk/testsuite/src/test/resources/test/dd/web/form-auth/application.xml
===================================================================
--- projects/ejb3/trunk/testsuite/src/test/resources/test/dd/web/form-auth/application.xml 2008-11-28 16:44:57 UTC (rev 81781)
+++ projects/ejb3/trunk/testsuite/src/test/resources/test/dd/web/form-auth/application.xml 2008-11-28 16:54:40 UTC (rev 81782)
@@ -9,6 +9,7 @@
<module>
<web>
<web-uri>form-auth.war</web-uri>
+ <context-root>/form-auth</context-root>
</web>
</module>
Modified: projects/ejb3/trunk/testsuite/src/test/resources/test/dependency/META-INF/jboss-app.xml
===================================================================
--- projects/ejb3/trunk/testsuite/src/test/resources/test/dependency/META-INF/jboss-app.xml 2008-11-28 16:44:57 UTC (rev 81781)
+++ projects/ejb3/trunk/testsuite/src/test/resources/test/dependency/META-INF/jboss-app.xml 2008-11-28 16:54:40 UTC (rev 81782)
@@ -1,4 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
+
+<!DOCTYPE jboss-app
+ PUBLIC "-//JBoss//DTD Java EE Application 5.0//EN"
+ "http://www.jboss.org/j2ee/dtd/jboss-app_5_0.dtd">
+
<jboss-app>
<module>
<service>mydatasource-ds.xml</service>
Modified: projects/ejb3/trunk/testsuite/src/test/resources/test/externalrefscoped/first-ear/META-INF/jboss-app.xml
===================================================================
--- projects/ejb3/trunk/testsuite/src/test/resources/test/externalrefscoped/first-ear/META-INF/jboss-app.xml 2008-11-28 16:44:57 UTC (rev 81781)
+++ projects/ejb3/trunk/testsuite/src/test/resources/test/externalrefscoped/first-ear/META-INF/jboss-app.xml 2008-11-28 16:54:40 UTC (rev 81782)
@@ -1,3 +1,7 @@
+<!DOCTYPE jboss-app
+ PUBLIC "-//JBoss//DTD Java EE Application 5.0//EN"
+ "http://www.jboss.org/j2ee/dtd/jboss-app_5_0.dtd">
+
<jboss-app>
<loader-repository>org.jboss.test:name=externalrefscoped,ear=first</loader-repository>
</jboss-app>
\ No newline at end of file
Modified: projects/ejb3/trunk/testsuite/src/test/resources/test/externalrefscoped/second-ear/META-INF/jboss-app.xml
===================================================================
--- projects/ejb3/trunk/testsuite/src/test/resources/test/externalrefscoped/second-ear/META-INF/jboss-app.xml 2008-11-28 16:44:57 UTC (rev 81781)
+++ projects/ejb3/trunk/testsuite/src/test/resources/test/externalrefscoped/second-ear/META-INF/jboss-app.xml 2008-11-28 16:54:40 UTC (rev 81782)
@@ -1,3 +1,7 @@
+<!DOCTYPE jboss-app
+ PUBLIC "-//JBoss//DTD Java EE Application 5.0//EN"
+ "http://www.jboss.org/j2ee/dtd/jboss-app_5_0.dtd">
+
<jboss-app>
<loader-repository>org.jboss.test:name=externalrefscoped,ear=second</loader-repository>
</jboss-app>
\ No newline at end of file
Modified: projects/ejb3/trunk/testsuite/src/test/resources/test/factory/META-INF/jboss-app.xml
===================================================================
--- projects/ejb3/trunk/testsuite/src/test/resources/test/factory/META-INF/jboss-app.xml 2008-11-28 16:44:57 UTC (rev 81781)
+++ projects/ejb3/trunk/testsuite/src/test/resources/test/factory/META-INF/jboss-app.xml 2008-11-28 16:54:40 UTC (rev 81782)
@@ -1,4 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
+
+<!DOCTYPE jboss-app
+ PUBLIC "-//JBoss//DTD Java EE Application 5.0//EN"
+ "http://www.jboss.org/j2ee/dtd/jboss-app_5_0.dtd">
+
<jboss-app>
<loader-repository>
jboss.test:test=ejb3factory
Modified: projects/ejb3/trunk/testsuite/src/test/resources/test/factoryxml/META-INF/jboss-app.xml
===================================================================
--- projects/ejb3/trunk/testsuite/src/test/resources/test/factoryxml/META-INF/jboss-app.xml 2008-11-28 16:44:57 UTC (rev 81781)
+++ projects/ejb3/trunk/testsuite/src/test/resources/test/factoryxml/META-INF/jboss-app.xml 2008-11-28 16:54:40 UTC (rev 81782)
@@ -1,4 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
+
+<!DOCTYPE jboss-app
+ PUBLIC "-//JBoss//DTD Java EE Application 5.0//EN"
+ "http://www.jboss.org/j2ee/dtd/jboss-app_5_0.dtd">
+
<jboss-app>
<loader-repository>
jboss.test:test=ejb3factory
Modified: projects/ejb3/trunk/testsuite/src/test/resources/test/jsp/META-INF/application.xml
===================================================================
--- projects/ejb3/trunk/testsuite/src/test/resources/test/jsp/META-INF/application.xml 2008-11-28 16:44:57 UTC (rev 81781)
+++ projects/ejb3/trunk/testsuite/src/test/resources/test/jsp/META-INF/application.xml 2008-11-28 16:54:40 UTC (rev 81782)
@@ -1,6 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
-<application>
+<application xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
+ http://java.sun.com/xml/ns/javaee/application_5.xsd"
+ version="5" id="application-test-everything">
+
<display-name>EJB3 Web Container Testsuite</display-name>
<module>
Modified: projects/ejb3/trunk/testsuite/src/test/resources/test/scopedclassloader/ejbear/META-INF/jboss-app.xml
===================================================================
--- projects/ejb3/trunk/testsuite/src/test/resources/test/scopedclassloader/ejbear/META-INF/jboss-app.xml 2008-11-28 16:44:57 UTC (rev 81781)
+++ projects/ejb3/trunk/testsuite/src/test/resources/test/scopedclassloader/ejbear/META-INF/jboss-app.xml 2008-11-28 16:54:40 UTC (rev 81782)
@@ -1,4 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
+
+<!DOCTYPE jboss-app
+ PUBLIC "-//JBoss//DTD Java EE Application 5.0//EN"
+ "http://www.jboss.org/j2ee/dtd/jboss-app_5_0.dtd">
+
<jboss-app>
<loader-repository>
insight.com:loader=ejbs.ear
Modified: projects/ejb3/trunk/testsuite/src/test/resources/test/scopedclassloader/webear/META-INF/jboss-app.xml
===================================================================
--- projects/ejb3/trunk/testsuite/src/test/resources/test/scopedclassloader/webear/META-INF/jboss-app.xml 2008-11-28 16:44:57 UTC (rev 81781)
+++ projects/ejb3/trunk/testsuite/src/test/resources/test/scopedclassloader/webear/META-INF/jboss-app.xml 2008-11-28 16:54:40 UTC (rev 81782)
@@ -1,4 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
+
+<!DOCTYPE jboss-app
+ PUBLIC "-//JBoss//DTD Java EE Application 5.0//EN"
+ "http://www.jboss.org/j2ee/dtd/jboss-app_5_0.dtd">
+
<jboss-app>
<loader-repository>
insight.com:loader=web.ear
Modified: projects/ejb3/trunk/testsuite/src/test/resources/test/servlet/META-INF/application.xml
===================================================================
--- projects/ejb3/trunk/testsuite/src/test/resources/test/servlet/META-INF/application.xml 2008-11-28 16:44:57 UTC (rev 81781)
+++ projects/ejb3/trunk/testsuite/src/test/resources/test/servlet/META-INF/application.xml 2008-11-28 16:54:40 UTC (rev 81782)
@@ -1,6 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
-<application>
+<application xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
+ http://java.sun.com/xml/ns/javaee/application_5.xsd"
+ version="5" id="application-test-everything">
+
<display-name>EJB3 Web Container Testsuite</display-name>
<module>
Modified: projects/ejb3/trunk/testsuite/src/test/resources/test/servlet/META-INF/jboss-app.xml
===================================================================
--- projects/ejb3/trunk/testsuite/src/test/resources/test/servlet/META-INF/jboss-app.xml 2008-11-28 16:44:57 UTC (rev 81781)
+++ projects/ejb3/trunk/testsuite/src/test/resources/test/servlet/META-INF/jboss-app.xml 2008-11-28 16:54:40 UTC (rev 81782)
@@ -1,3 +1,8 @@
+<!DOCTYPE jboss-app
+ PUBLIC "-//JBoss//DTD Java EE Application 5.0//EN"
+ "http://www.jboss.org/j2ee/dtd/jboss-app_5_0.dtd">
+
+
<jboss-app>
<loader-repository>jboss.test:war=servlet.war</loader-repository>
More information about the jboss-cvs-commits
mailing list