[jboss-cvs] JBossAS SVN: r82646 - in projects/metadata/trunk/src/test: resources/org/jboss/test/metadata/annotation/client and 4 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Jan 6 18:11:40 EST 2009
Author: alex.loubyansky at jboss.com
Date: 2009-01-06 18:11:39 -0500 (Tue, 06 Jan 2009)
New Revision: 82646
Modified:
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/xml/XmlValidationUnitTestCase.java
projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/annotation/client/JBossAnnotationClient_testAnnotatedEnv.xml
projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/annotation/ejb3/AnnotationEjb3_testAnnotationMergedViewWithPartialXml-jboss.xml
projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/annotation/web/AnnotationWeb_testAnnotationXML.xml
projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/EjbJar21MergeActivationConfig.xml
projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/EjbJarJBossMerge_EntityGeneric_ejb-jar.xml
projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/whitespace/Whitespace_testJBoss50EjbRef.xml
Log:
JBMETA-159
Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/xml/XmlValidationUnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/xml/XmlValidationUnitTestCase.java 2009-01-06 22:59:51 UTC (rev 82645)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/xml/XmlValidationUnitTestCase.java 2009-01-06 23:11:39 UTC (rev 82646)
@@ -64,6 +64,22 @@
FACTORY.setValidating(true);
IGNORE.add("log4j.xml");
+ // these test only fragments of descriptors
+ IGNORE.add("Icon_testNonDefaultLanguage.xml");
+ IGNORE.add("Icon_testDefaultLanguage.xml");
+ IGNORE.add("DisplayName_testNonDefaultLanguage.xml");
+ IGNORE.add("DisplayName_testDefaultLanguage.xml");
+ IGNORE.add("Description_testNonDefaultLanguage.xml");
+ IGNORE.add("Description_testDefaultLanguage.xml");
+ IGNORE.add("DescriptionGroup_testIconDefaultLanguage.xml");
+ IGNORE.add("DescriptionGroup_testDisplayNameDefaultLanguage.xml");
+ IGNORE.add("DescriptionGroup_testDescriptionDefaultLanguage.xml");
+ IGNORE.add("handler-chains.xml");
+ IGNORE.add("handler-chains2.xml");
+ // these don't include DTD info on purpose
+ IGNORE.add("JBoss42_testNoDoctype.xml");
+ IGNORE.add("Ear4x_testNoDtd.xml");
+
}
private static final EntityResolver RESOLVER = new JBossEntityResolver();
Modified: projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/annotation/client/JBossAnnotationClient_testAnnotatedEnv.xml
===================================================================
--- projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/annotation/client/JBossAnnotationClient_testAnnotatedEnv.xml 2009-01-06 22:59:51 UTC (rev 82645)
+++ projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/annotation/client/JBossAnnotationClient_testAnnotatedEnv.xml 2009-01-06 23:11:39 UTC (rev 82646)
@@ -7,8 +7,8 @@
id="appclient-test">
<jndi-name>standaloneCclient</jndi-name>
<ejb-ref>
+ <jndi-name>test_resourceClasJndiName</jndi-name>
<ejb-ref-name>ejb/resourceClassBean</ejb-ref-name>
- <jndi-name>test_resourceClasJndiName</jndi-name>
<ignore-dependency/>
</ejb-ref>
</jboss-client>
Modified: projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/annotation/ejb3/AnnotationEjb3_testAnnotationMergedViewWithPartialXml-jboss.xml
===================================================================
--- projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/annotation/ejb3/AnnotationEjb3_testAnnotationMergedViewWithPartialXml-jboss.xml 2009-01-06 22:59:51 UTC (rev 82645)
+++ projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/annotation/ejb3/AnnotationEjb3_testAnnotationMergedViewWithPartialXml-jboss.xml 2009-01-06 23:11:39 UTC (rev 82646)
@@ -6,13 +6,13 @@
<enterprise-beans>
<ejb>
<ejb-name>EjbLink2Bean</ejb-name>
- <jndi-name>ejb3_stateless_ejblink_one_EjbLink2Bean</jndi-name>
<ejb-ref>
<ejb-ref-name>ejb/EjbLink1Bean</ejb-ref-name>
</ejb-ref>
<ejb-ref>
<ejb-ref-name>ejb/EjbLink3Bean</ejb-ref-name>
</ejb-ref>
+ <jndi-name>ejb3_stateless_ejblink_one_EjbLink2Bean</jndi-name>
</ejb>
</enterprise-beans>
Modified: projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/annotation/web/AnnotationWeb_testAnnotationXML.xml
===================================================================
--- projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/annotation/web/AnnotationWeb_testAnnotationXML.xml 2009-01-06 22:59:51 UTC (rev 82645)
+++ projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/annotation/web/AnnotationWeb_testAnnotationXML.xml 2009-01-06 23:11:39 UTC (rev 82646)
@@ -44,6 +44,6 @@
<role-name>Administrator</role-name>
</security-role>
<security-role>
- <role-name>InternalUser</role-name>
+ <role-name>Manager</role-name>
</security-role>
</web-app>
\ No newline at end of file
Modified: projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/EjbJar21MergeActivationConfig.xml
===================================================================
--- projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/EjbJar21MergeActivationConfig.xml 2009-01-06 22:59:51 UTC (rev 82645)
+++ projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/EjbJar21MergeActivationConfig.xml 2009-01-06 23:11:39 UTC (rev 82646)
@@ -9,6 +9,8 @@
<message-driven>
<ejb-name>testmdb</ejb-name>
+ <ejb-class>test.MDBClass</ejb-class>
+ <transaction-type>Container</transaction-type>
<activation-config>
<activation-config-property>
<activation-config-property-name>ejbjar1</activation-config-property-name>
Modified: projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/EjbJarJBossMerge_EntityGeneric_ejb-jar.xml
===================================================================
--- projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/EjbJarJBossMerge_EntityGeneric_ejb-jar.xml 2009-01-06 22:59:51 UTC (rev 82645)
+++ projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/EjbJarJBossMerge_EntityGeneric_ejb-jar.xml 2009-01-06 23:11:39 UTC (rev 82646)
@@ -10,6 +10,10 @@
<enterprise-beans>
<entity>
<ejb-name>myEjbName</ejb-name>
+ <ejb-class>MyEjbClass</ejb-class>
+ <persistence-type>Container</persistence-type>
+ <prim-key-class>java.lang.Long</prim-key-class>
+ <reentrant>false</reentrant>
</entity>
</enterprise-beans>
Modified: projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/whitespace/Whitespace_testJBoss50EjbRef.xml
===================================================================
--- projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/whitespace/Whitespace_testJBoss50EjbRef.xml 2009-01-06 22:59:51 UTC (rev 82645)
+++ projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/whitespace/Whitespace_testJBoss50EjbRef.xml 2009-01-06 23:11:39 UTC (rev 82646)
@@ -8,13 +8,13 @@
<enterprise-beans>
<session>
<ejb-name>SessionB</ejb-name>
- <jndi-name>naming/SessionB</jndi-name>
<ejb-ref>
<ejb-ref-name>ejb/NoLinkSessionA</ejb-ref-name>
<jndi-name>naming/SessionA </jndi-name>
</ejb-ref>
+ <jndi-name>naming/SessionB</jndi-name>
</session>
</enterprise-beans>
</jboss>
More information about the jboss-cvs-commits
mailing list