[jboss-cvs] JBossAS SVN: r66160 - projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Oct 16 03:35:49 EDT 2007
Author: scott.stark at jboss.org
Date: 2007-10-16 03:35:49 -0400 (Tue, 16 Oct 2007)
New Revision: 66160
Modified:
projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/EjbJar3xEverything_testEverything.xml
Log:
Fix the validation errors
Modified: projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/EjbJar3xEverything_testEverything.xml
===================================================================
--- projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/EjbJar3xEverything_testEverything.xml 2007-10-16 07:19:39 UTC (rev 66159)
+++ projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/EjbJar3xEverything_testEverything.xml 2007-10-16 07:35:49 UTC (rev 66160)
@@ -30,6 +30,12 @@
<session>
<ejb-name>session0EjbName</ejb-name>
+ <ejb-class>session0EjbClass</ejb-class>
+ <session-type>Stateless</session-type>
+ <transaction-type>Container</transaction-type>
+ <security-identity>
+ <use-caller-identity/>
+ </security-identity>
</session>
<session id="session1-id">
@@ -472,20 +478,19 @@
<description xml:lang="fr">fr-session1SecurityRoleRef1-desc</description>
<description xml:lang="de">de-session1SecurityRoleRef1-desc</description>
<role-name>session1SecurityRoleRef1RoleName</role-name>
- <role-link>session1SecurityRoleRef1RoleLink</role-link>
+ <role-link>securityRoleRef1RoleLink</role-link>
</security-role-ref>
<security-role-ref id="session1SecurityRoleRef2-id">
<description>en-session1SecurityRoleRef2-desc</description>
<description xml:lang="fr">fr-session1SecurityRoleRef2-desc</description>
<description xml:lang="de">de-session1SecurityRoleRef2-desc</description>
<role-name>session1SecurityRoleRef2RoleName</role-name>
- <role-link>session1SecurityRoleRef2RoleLink</role-link>
+ <role-link>securityRoleRef2RoleLink</role-link>
</security-role-ref>
<security-identity id="session1SecurityIdentity-id">
<description>en-session1SecurityIdentity-desc</description>
<description xml:lang="fr">fr-session1SecurityIdentity-desc</description>
<description xml:lang="de">de-session1SecurityIdentity-desc</description>
- <use-caller-identity id="session1SecurityIdentityUseCallerIdentity-id"/>
<run-as id="session1SecurityIdentityRunAs-id">
<description>en-session1SecurityIdentityRunAs-desc</description>
<description xml:lang="fr">fr-session1SecurityIdentityRunAs-desc</description>
@@ -936,20 +941,19 @@
<description xml:lang="fr">fr-session2SecurityRoleRef1-desc</description>
<description xml:lang="de">de-session2SecurityRoleRef1-desc</description>
<role-name>session2SecurityRoleRef1RoleName</role-name>
- <role-link>session2SecurityRoleRef1RoleLink</role-link>
+ <role-link>securityRoleRef1RoleLink</role-link>
</security-role-ref>
<security-role-ref id="session2SecurityRoleRef2-id">
<description>en-session2SecurityRoleRef2-desc</description>
<description xml:lang="fr">fr-session2SecurityRoleRef2-desc</description>
<description xml:lang="de">de-session2SecurityRoleRef2-desc</description>
<role-name>session2SecurityRoleRef2RoleName</role-name>
- <role-link>session2SecurityRoleRef2RoleLink</role-link>
+ <role-link>securityRoleRef2RoleLink</role-link>
</security-role-ref>
<security-identity id="session2SecurityIdentity-id">
<description>en-session2SecurityIdentity-desc</description>
<description xml:lang="fr">fr-session2SecurityIdentity-desc</description>
<description xml:lang="de">de-session2SecurityIdentity-desc</description>
- <use-caller-identity id="session2SecurityIdentityUseCallerIdentity-id"/>
<run-as id="session2SecurityIdentityRunAs-id">
<description>en-session2SecurityIdentityRunAs-desc</description>
<description xml:lang="fr">fr-session2SecurityIdentityRunAs-desc</description>
@@ -977,6 +981,10 @@
<entity>
<ejb-name>entity0EjbName</ejb-name>
+ <ejb-class>entity0EjbClass</ejb-class>
+ <persistence-type>Container</persistence-type>
+ <prim-key-class>entity0EjbKeyClass</prim-key-class>
+ <reentrant>false</reentrant>
</entity>
<entity id="entity1-id">
@@ -1360,20 +1368,19 @@
<description xml:lang="fr">fr-entity1SecurityRoleRef1-desc</description>
<description xml:lang="de">de-entity1SecurityRoleRef1-desc</description>
<role-name>entity1SecurityRoleRef1RoleName</role-name>
- <role-link>entity1SecurityRoleRef1RoleLink</role-link>
+ <role-link>securityRoleRef1RoleLink</role-link>
</security-role-ref>
<security-role-ref id="entity1SecurityRoleRef2-id">
<description>en-entity1SecurityRoleRef2-desc</description>
<description xml:lang="fr">fr-entity1SecurityRoleRef2-desc</description>
<description xml:lang="de">de-entity1SecurityRoleRef2-desc</description>
<role-name>entity1SecurityRoleRef2RoleName</role-name>
- <role-link>entity1SecurityRoleRef2RoleLink</role-link>
+ <role-link>securityRoleRef2RoleLink</role-link>
</security-role-ref>
<security-identity id="entity1SecurityIdentity-id">
<description>en-entity1SecurityIdentity-desc</description>
<description xml:lang="fr">fr-entity1SecurityIdentity-desc</description>
<description xml:lang="de">de-entity1SecurityIdentity-desc</description>
- <use-caller-identity id="entity1SecurityIdentityUseCallerIdentity-id"/>
<run-as id="entity1SecurityIdentityRunAs-id">
<description>en-entity1SecurityIdentityRunAs-desc</description>
<description xml:lang="fr">fr-entity1SecurityIdentityRunAs-desc</description>
@@ -1789,20 +1796,19 @@
<description xml:lang="fr">fr-entity2SecurityRoleRef1-desc</description>
<description xml:lang="de">de-entity2SecurityRoleRef1-desc</description>
<role-name>entity2SecurityRoleRef1RoleName</role-name>
- <role-link>entity2SecurityRoleRef1RoleLink</role-link>
+ <role-link>securityRoleRef1RoleLink</role-link>
</security-role-ref>
<security-role-ref id="entity2SecurityRoleRef2-id">
<description>en-entity2SecurityRoleRef2-desc</description>
<description xml:lang="fr">fr-entity2SecurityRoleRef2-desc</description>
<description xml:lang="de">de-entity2SecurityRoleRef2-desc</description>
<role-name>entity2SecurityRoleRef2RoleName</role-name>
- <role-link>entity2SecurityRoleRef2RoleLink</role-link>
+ <role-link>securityRoleRef2RoleLink</role-link>
</security-role-ref>
<security-identity id="entity2SecurityIdentity-id">
<description>en-entity2SecurityIdentity-desc</description>
<description xml:lang="fr">fr-entity2SecurityIdentity-desc</description>
<description xml:lang="de">de-entity2SecurityIdentity-desc</description>
- <use-caller-identity id="entity2SecurityIdentityUseCallerIdentity-id"/>
<run-as id="entity2SecurityIdentityRunAs-id">
<description>en-entity2SecurityIdentityRunAs-desc</description>
<description xml:lang="fr">fr-entity2SecurityIdentityRunAs-desc</description>
@@ -1862,6 +1868,8 @@
<message-driven>
<ejb-name>mdb0EjbName</ejb-name>
+ <ejb-class>mdb0EjbClass</ejb-class>
+ <transaction-type>Container</transaction-type>
</message-driven>
<message-driven id="mdb1-id">
@@ -3432,14 +3440,14 @@
<description>en-relation1Role1RoleSource-desc</description>
<description xml:lang="fr">fr-relation1Role1RoleSource-desc</description>
<description xml:lang="de">de-relation1Role1RoleSource-desc</description>
- <ejb-name>relation1Role1RoleSourceNameEjbName</ejb-name>
+ <ejb-name>entity5EjbName</ejb-name>
</relationship-role-source>
<cmr-field id="relation1Role1CmrField-id">
<description>en-relation1Role1CmrField-desc</description>
<description xml:lang="fr">fr-relation1Role1CmrField-desc</description>
<description xml:lang="de">de-relation1Role1CmrField-desc</description>
<cmr-field-name>relation1Role1CmrFieldName</cmr-field-name>
- <cmr-field-type>relation1Role1CmrFieldType</cmr-field-type>
+ <cmr-field-type>java.util.Set</cmr-field-type>
</cmr-field>
</ejb-relationship-role>
<ejb-relationship-role id="relation1Role2-id">
@@ -3453,14 +3461,14 @@
<description>en-relation1Role2RoleSource-desc</description>
<description xml:lang="fr">fr-relation1Role2RoleSource-desc</description>
<description xml:lang="de">de-relation1Role2RoleSource-desc</description>
- <ejb-name>relation1Role2RoleSourceNameEjbName</ejb-name>
+ <ejb-name>entity5EjbName</ejb-name>
</relationship-role-source>
<cmr-field id="relation1Role2CmrField-id">
<description>en-relation1Role2CmrField-desc</description>
<description xml:lang="fr">fr-relation1Role2CmrField-desc</description>
<description xml:lang="de">de-relation1Role2CmrField-desc</description>
<cmr-field-name>relation1Role2CmrFieldName</cmr-field-name>
- <cmr-field-type>relation1Role2CmrFieldType</cmr-field-type>
+ <cmr-field-type>java.util.Set</cmr-field-type>
</cmr-field>
</ejb-relationship-role>
</ejb-relation>
@@ -3480,14 +3488,14 @@
<description>en-relation2Role1RoleSource-desc</description>
<description xml:lang="fr">fr-relation2Role1RoleSource-desc</description>
<description xml:lang="de">de-relation2Role1RoleSource-desc</description>
- <ejb-name>relation2Role1RoleSourceNameEjbName</ejb-name>
+ <ejb-name>entity5EjbName</ejb-name>
</relationship-role-source>
<cmr-field id="relation2Role1CmrField-id">
<description>en-relation2Role1CmrField-desc</description>
<description xml:lang="fr">fr-relation2Role1CmrField-desc</description>
<description xml:lang="de">de-relation2Role1CmrField-desc</description>
<cmr-field-name>relation2Role1CmrFieldName</cmr-field-name>
- <cmr-field-type>relation2Role1CmrFieldType</cmr-field-type>
+ <cmr-field-type>java.util.Set</cmr-field-type>
</cmr-field>
</ejb-relationship-role>
<ejb-relationship-role id="relation2Role2-id">
@@ -3501,14 +3509,14 @@
<description>en-relation2Role2RoleSource-desc</description>
<description xml:lang="fr">fr-relation2Role2RoleSource-desc</description>
<description xml:lang="de">de-relation2Role2RoleSource-desc</description>
- <ejb-name>relation2Role2RoleSourceNameEjbName</ejb-name>
+ <ejb-name>entity5EjbName</ejb-name>
</relationship-role-source>
<cmr-field id="relation2Role2CmrField-id">
<description>en-relation2Role2CmrField-desc</description>
<description xml:lang="fr">fr-relation2Role2CmrField-desc</description>
<description xml:lang="de">de-relation2Role2CmrField-desc</description>
<cmr-field-name>relation2Role2CmrFieldName</cmr-field-name>
- <cmr-field-type>relation2Role2CmrFieldType</cmr-field-type>
+ <cmr-field-type>java.util.Set</cmr-field-type>
</cmr-field>
</ejb-relationship-role>
</ejb-relation>
@@ -3520,13 +3528,13 @@
<description>en-securityRole1-desc</description>
<description xml:lang="fr">fr-securityRole1-desc</description>
<description xml:lang="de">de-securityRole1-desc</description>
- <role-name>securityRole1RoleName</role-name>
+ <role-name>securityRoleRef1RoleLink</role-name>
</security-role>
<security-role id="securityRole2-id">
<description>en-securityRole2-desc</description>
<description xml:lang="fr">fr-securityRole2-desc</description>
<description xml:lang="de">de-securityRole2-desc</description>
- <role-name>securityRole2RoleName</role-name>
+ <role-name>securityRoleRef2RoleLink</role-name>
</security-role>
<method-permission id="methodPermission1-id">
More information about the jboss-cvs-commits
mailing list