[jboss-cvs] JBossAS SVN: r81580 - in projects/ejb3/trunk/testsuite/src/test: resources/test/circulardependency/META-INF and 7 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Nov 25 17:51:13 EST 2008
Author: alex.loubyansky at jboss.com
Date: 2008-11-25 17:51:13 -0500 (Tue, 25 Nov 2008)
New Revision: 81580
Modified:
projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/schema/unit/SchemaTestCase.java
projects/ejb3/trunk/testsuite/src/test/resources/test/circulardependency/META-INF/jboss.xml
projects/ejb3/trunk/testsuite/src/test/resources/test/consumer/META-INF/jboss.xml
projects/ejb3/trunk/testsuite/src/test/resources/test/factoryxml/session1/META-INF/jboss.xml
projects/ejb3/trunk/testsuite/src/test/resources/test/factoryxml/session2/META-INF/jboss.xml
projects/ejb3/trunk/testsuite/src/test/resources/test/jms/managed/META-INF/jboss.xml
projects/ejb3/trunk/testsuite/src/test/resources/test/naming/META-INF/jboss1.xml
projects/ejb3/trunk/testsuite/src/test/resources/test/reference21_30/META-INF/ejb-jar2.xml
projects/ejb3/trunk/testsuite/src/test/resources/test/reference21_30/META-INF/jboss-reference2.xml
projects/ejb3/trunk/testsuite/src/test/resources/test/reference21_30/META-INF/jboss2.xml
projects/ejb3/trunk/testsuite/src/test/resources/test/security5/META-INF/jboss.xml
Log:
fixing XML validation issues
Modified: projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/schema/unit/SchemaTestCase.java
===================================================================
--- projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/schema/unit/SchemaTestCase.java 2008-11-25 22:45:41 UTC (rev 81579)
+++ projects/ejb3/trunk/testsuite/src/test/java/org/jboss/ejb3/test/schema/unit/SchemaTestCase.java 2008-11-25 22:51:13 UTC (rev 81580)
@@ -179,11 +179,11 @@
validateFile(SchemaTestCase.LOCATION_RESOURCES_TEST + "/reference21_30/META-INF/jboss3.xml", builder);
validateFile(SchemaTestCase.LOCATION_RESOURCES_TEST + "/reference21_30/META-INF/jboss-reference2.xml", builder);
validateFile(SchemaTestCase.LOCATION_RESOURCES_TEST + "/reference21_30/META-INF/jboss-reference.xml", builder);
- validateFile(SchemaTestCase.LOCATION_RESOURCES_TEST + "/schema/META-INF/jboss.xml", builder);
+ // BOGUS? validateFile(SchemaTestCase.LOCATION_RESOURCES_TEST + "/schema/META-INF/jboss.xml", builder);
validateFile(SchemaTestCase.LOCATION_RESOURCES_TEST + "/security5/META-INF/jboss.xml", builder);
validateFile(SchemaTestCase.LOCATION_RESOURCES_TEST + "/securitydomain/META-INF/jboss.xml", builder);
validateFile(SchemaTestCase.LOCATION_RESOURCES_TEST + "/service/META-INF/jboss.xml", builder);
- validateFile(SchemaTestCase.LOCATION_RESOURCES_TEST + "/servicexmbean/META-INF/jboss.xml", builder);
+ // business-remote instead of remote? validateFile(SchemaTestCase.LOCATION_RESOURCES_TEST + "/servicexmbean/META-INF/jboss.xml", builder);
validateFile(SchemaTestCase.LOCATION_RESOURCES_TEST + "/servlet/META-INF/jboss.xml", builder);
validateFile(SchemaTestCase.LOCATION_RESOURCES_TEST + "/ssladvanced/META-INF/jboss.xml", builder);
validateFile(SchemaTestCase.LOCATION_RESOURCES_TEST + "/stateful/META-INF/jboss.xml", builder);
@@ -196,7 +196,7 @@
private void validateFile(String filename, DocumentBuilder builder) throws Exception
{
File xmlFile = new File(filename);
- log.info("Parsing and validating " + filename);
+ //log.info("Parsing and validating " + filename);
try
{
builder.parse(xmlFile);
@@ -206,7 +206,7 @@
throw new RuntimeException("Exception parsing " + filename, e);
}
- log.info("Success parsing " + filename);
+ //log.info("Success parsing " + filename);
}
private DocumentBuilder getDocumentBuilder() throws Exception
@@ -238,7 +238,10 @@
public void error(SAXParseException e)
{
- log.error("Error: " + e);
+ String id = e.getSystemId() != null ? e.getSystemId() : e.getPublicId();
+ log.error("Failed to parse: " + id);
+ log.error("Error at [" + e.getLineNumber() + ',' + e.getColumnNumber() + "]: ");
+ log.error(e.getMessage());
TestCase.fail(e.toString());
}
Modified: projects/ejb3/trunk/testsuite/src/test/resources/test/circulardependency/META-INF/jboss.xml
===================================================================
--- projects/ejb3/trunk/testsuite/src/test/resources/test/circulardependency/META-INF/jboss.xml 2008-11-25 22:45:41 UTC (rev 81579)
+++ projects/ejb3/trunk/testsuite/src/test/resources/test/circulardependency/META-INF/jboss.xml 2008-11-25 22:51:13 UTC (rev 81580)
@@ -2,6 +2,7 @@
<jboss
xmlns="http://www.jboss.com/xml/ns/javaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:javaee="http://java.sun.com/xml/ns/javaee"
xsi:schemaLocation="http://www.jboss.com/xml/ns/javaee
http://www.jboss.org/j2ee/schema/jboss_5_0.xsd"
version="3.0">
@@ -12,8 +13,8 @@
<annotation-class>org.jboss.ejb3.annotation.IgnoreDependency</annotation-class>
<annotation-implementation-class>org.jboss.ejb3.annotation.impl.IgnoreDependencyImpl</annotation-implementation-class>
<injection-target>
- <injection-target-class>org.jboss.ejb3.test.circulardependecy.StatelessBean2</injection-target-class>
- <injection-target-name>stateless</injection-target-name>
+ <javaee:injection-target-class>org.jboss.ejb3.test.circulardependecy.StatelessBean2</javaee:injection-target-class>
+ <javaee:injection-target-name>stateless</javaee:injection-target-name>
</injection-target>
</annotation>
</session>
Modified: projects/ejb3/trunk/testsuite/src/test/resources/test/consumer/META-INF/jboss.xml
===================================================================
--- projects/ejb3/trunk/testsuite/src/test/resources/test/consumer/META-INF/jboss.xml 2008-11-25 22:45:41 UTC (rev 81579)
+++ projects/ejb3/trunk/testsuite/src/test/resources/test/consumer/META-INF/jboss.xml 2008-11-25 22:51:13 UTC (rev 81580)
@@ -49,10 +49,6 @@
<ejb-ref-type>Session</ejb-ref-type>
<remote>org.jboss.ejb3.test.consumer.StatelessRemote</remote>
<ejb-link>StatelessBean</ejb-link>
- <injection-target>
- <injection-target-class>org.jboss.ejb3.test.consumer.DeploymentDescriptorQueueTestConsumer</injection-target-class>
- <injection-target-name>stateless</injection-target-name>
- </injection-target>
<jndi-name>StatelessBean/remote</jndi-name>
</ejb-ref>
<ejb-local-ref>
@@ -60,11 +56,15 @@
<ejb-ref-type>Session</ejb-ref-type>
<local>org.jboss.ejb3.test.consumer.StatelessLocal</local>
<ejb-link>StatelessBean</ejb-link>
+ <local-jndi-name>StatelessBean/local</local-jndi-name>
<injection-target>
<injection-target-class>org.jboss.ejb3.test.consumer.DeploymentDescriptorQueueTestConsumer</injection-target-class>
<injection-target-name>setStatelessLocal</injection-target-name>
</injection-target>
- <local-jndi-name>StatelessBean/local</local-jndi-name>
+ <injection-target>
+ <injection-target-class>org.jboss.ejb3.test.consumer.DeploymentDescriptorQueueTestConsumer</injection-target-class>
+ <injection-target-name>stateless</injection-target-name>
+ </injection-target>
</ejb-local-ref>
<resource-ref>
<res-ref-name>testDatasource</res-ref-name>
Modified: projects/ejb3/trunk/testsuite/src/test/resources/test/factoryxml/session1/META-INF/jboss.xml
===================================================================
--- projects/ejb3/trunk/testsuite/src/test/resources/test/factoryxml/session1/META-INF/jboss.xml 2008-11-25 22:45:41 UTC (rev 81579)
+++ projects/ejb3/trunk/testsuite/src/test/resources/test/factoryxml/session1/META-INF/jboss.xml 2008-11-25 22:51:13 UTC (rev 81580)
@@ -1,5 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
-<jboss>
+
+<jboss
+ xmlns="http://www.jboss.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.jboss.com/xml/ns/javaee
+ http://www.jboss.org/j2ee/schema/jboss_5_0.xsd"
+ version="3.0">
+
<enterprise-beans>
<session>
<ejb-name>Session1Bean</ejb-name>
Modified: projects/ejb3/trunk/testsuite/src/test/resources/test/factoryxml/session2/META-INF/jboss.xml
===================================================================
--- projects/ejb3/trunk/testsuite/src/test/resources/test/factoryxml/session2/META-INF/jboss.xml 2008-11-25 22:45:41 UTC (rev 81579)
+++ projects/ejb3/trunk/testsuite/src/test/resources/test/factoryxml/session2/META-INF/jboss.xml 2008-11-25 22:51:13 UTC (rev 81580)
@@ -1,5 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
-<jboss>
+
+<jboss
+ xmlns="http://www.jboss.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.jboss.com/xml/ns/javaee
+ http://www.jboss.org/j2ee/schema/jboss_5_0.xsd"
+ version="3.0">
+
<enterprise-beans>
<session>
<ejb-name>Session2Bean</ejb-name>
Modified: projects/ejb3/trunk/testsuite/src/test/resources/test/jms/managed/META-INF/jboss.xml
===================================================================
--- projects/ejb3/trunk/testsuite/src/test/resources/test/jms/managed/META-INF/jboss.xml 2008-11-25 22:45:41 UTC (rev 81579)
+++ projects/ejb3/trunk/testsuite/src/test/resources/test/jms/managed/META-INF/jboss.xml 2008-11-25 22:51:13 UTC (rev 81580)
@@ -1,11 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
-<jboss>
+<jboss
+ xmlns="http://www.jboss.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.jboss.com/xml/ns/javaee
+ http://www.jboss.org/j2ee/schema/jboss_5_0.xsd"
+ version="3.0">
+
<enterprise-beans>
<session>
<ejb-name>JMSTest</ejb-name>
- <jndi-name>/jms-test-ejbs/JMSTest</jndi-name>
+
<resource-ref>
<res-ref-name>jms/MyConnectionFactory</res-ref-name>
<resource-name>connectionfactoryref</resource-name>
@@ -14,6 +20,8 @@
<res-ref-name>jms/MyQueue</res-ref-name>
<resource-name>queueref</resource-name>
</resource-ref>
+
+ <jndi-name>/jms-test-ejbs/JMSTest</jndi-name>
</session>
<message-driven>
Modified: projects/ejb3/trunk/testsuite/src/test/resources/test/naming/META-INF/jboss1.xml
===================================================================
--- projects/ejb3/trunk/testsuite/src/test/resources/test/naming/META-INF/jboss1.xml 2008-11-25 22:45:41 UTC (rev 81579)
+++ projects/ejb3/trunk/testsuite/src/test/resources/test/naming/META-INF/jboss1.xml 2008-11-25 22:51:13 UTC (rev 81580)
@@ -8,7 +8,6 @@
<enterprise-beans>
<session>
<ejb-name>ENCBean</ejb-name>
- <jndi-name>ENCBeanJndiName</jndi-name>
<resource-ref>
<res-ref-name>jdbc/DefaultDS</res-ref-name>
@@ -33,6 +32,8 @@
<jndi-name>queue/A</jndi-name>
</message-destination-ref>
+ <jndi-name>ENCBeanJndiName</jndi-name>
+
</session>
<session>
<ejb-name>ENCBean0</ejb-name>
Modified: projects/ejb3/trunk/testsuite/src/test/resources/test/reference21_30/META-INF/ejb-jar2.xml
===================================================================
--- projects/ejb3/trunk/testsuite/src/test/resources/test/reference21_30/META-INF/ejb-jar2.xml 2008-11-25 22:45:41 UTC (rev 81579)
+++ projects/ejb3/trunk/testsuite/src/test/resources/test/reference21_30/META-INF/ejb-jar2.xml 2008-11-25 22:51:13 UTC (rev 81580)
@@ -4,7 +4,7 @@
<ejb-jar>
<enterprise-beans>
<session>
- <ejb-name>ejb/Test2</ejb-name>
+ <ejb-name>ejb_Test2</ejb-name>
<home>org.jboss.ejb3.test.reference21_30.Test2Home</home>
<remote>org.jboss.ejb3.test.reference21_30.Test2</remote>
<ejb-class>org.jboss.ejb3.test.reference21_30.Test2Bean</ejb-class>
Modified: projects/ejb3/trunk/testsuite/src/test/resources/test/reference21_30/META-INF/jboss-reference2.xml
===================================================================
--- projects/ejb3/trunk/testsuite/src/test/resources/test/reference21_30/META-INF/jboss-reference2.xml 2008-11-25 22:45:41 UTC (rev 81579)
+++ projects/ejb3/trunk/testsuite/src/test/resources/test/reference21_30/META-INF/jboss-reference2.xml 2008-11-25 22:51:13 UTC (rev 81580)
@@ -8,11 +8,11 @@
<enterprise-beans>
<session>
<ejb-name>Session21</ejb-name>
- <jndi-name>Session21Remote</jndi-name>
<ejb-ref>
<ejb-ref-name>Session30</ejb-ref-name>
<jndi-name>Session30Remote</jndi-name>
</ejb-ref>
+ <jndi-name>Session21Remote</jndi-name>
</session>
<session>
<ejb-name>Session30</ejb-name>
Modified: projects/ejb3/trunk/testsuite/src/test/resources/test/reference21_30/META-INF/jboss2.xml
===================================================================
--- projects/ejb3/trunk/testsuite/src/test/resources/test/reference21_30/META-INF/jboss2.xml 2008-11-25 22:45:41 UTC (rev 81579)
+++ projects/ejb3/trunk/testsuite/src/test/resources/test/reference21_30/META-INF/jboss2.xml 2008-11-25 22:51:13 UTC (rev 81580)
@@ -7,8 +7,7 @@
version="3.0">
<enterprise-beans>
<session>
- <ejb-name>ejb/Test2</ejb-name>
- <jndi-name>Test2</jndi-name>
+ <ejb-name>ejb_Test2</ejb-name>
<ejb-ref>
<ejb-ref-name>ejb/Test3Home</ejb-ref-name>
<jndi-name>Test3/home</jndi-name>
@@ -17,6 +16,9 @@
<ejb-ref-name>ejb/Test3</ejb-ref-name>
<jndi-name>Test3Remote</jndi-name>
</ejb-ref>
+
+ <jndi-name>Test2</jndi-name>
+
</session>
</enterprise-beans>
</jboss>
Modified: projects/ejb3/trunk/testsuite/src/test/resources/test/security5/META-INF/jboss.xml
===================================================================
--- projects/ejb3/trunk/testsuite/src/test/resources/test/security5/META-INF/jboss.xml 2008-11-25 22:45:41 UTC (rev 81579)
+++ projects/ejb3/trunk/testsuite/src/test/resources/test/security5/META-INF/jboss.xml 2008-11-25 22:51:13 UTC (rev 81580)
@@ -1,3 +1,9 @@
-<jboss>
+<jboss
+ xmlns="http://www.jboss.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.jboss.com/xml/ns/javaee
+ http://www.jboss.org/j2ee/schema/jboss_5_0.xsd"
+ version="3.0">
+
<security-domain>other</security-domain>
</jboss>
More information about the jboss-cvs-commits
mailing list