[jboss-cvs] JBossAS SVN: r66130 - 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
Mon Oct 15 13:01:32 EDT 2007
Author: scott.stark at jboss.org
Date: 2007-10-15 13:01:32 -0400 (Mon, 15 Oct 2007)
New Revision: 66130
Modified:
projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/EjbJar21Everything_testEverything.xml
Log:
Make this a valid document
Modified: projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/EjbJar21Everything_testEverything.xml
===================================================================
--- projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/EjbJar21Everything_testEverything.xml 2007-10-15 15:13:18 UTC (rev 66129)
+++ projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/EjbJar21Everything_testEverything.xml 2007-10-15 17:01:32 UTC (rev 66130)
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
-
+<!-- $Id $ -->
<ejb-jar xmlns="http://java.sun.com/xml/ns/j2ee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/javaee/ejb-jar_2_1.xsd"
- version="2.1"
- id="ejb-jar-id">
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/ejb-jar_2_1.xsd"
+ version="2.1"
+ id="ejb-jar-id">
<description>en-ejb-jar-desc</description>
<description xml:lang="fr">fr-ejb-jar-desc</description>
@@ -29,6 +29,9 @@
<session>
<ejb-name>session0EjbName</ejb-name>
+ <ejb-class>session0EjbClass</ejb-class>
+ <session-type>Stateless</session-type>
+ <transaction-type>Container</transaction-type>
</session>
<session id="session1-id">
@@ -186,20 +189,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>
@@ -365,20 +367,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>
@@ -393,6 +394,7 @@
<ejb-name>session3EjbName</ejb-name>
<ejb-class>session3EjbClass</ejb-class>
<session-type>Stateful</session-type>
+ <transaction-type>Container</transaction-type>
</session>
<session>
@@ -407,11 +409,17 @@
<ejb-class>session5EjbClass</ejb-class>
<session-type>Stateless</session-type>
<transaction-type>Container</transaction-type>
- <security-identity/>
+ <security-identity>
+ <use-caller-identity id="session5Ejb-caller-identity"/>
+ </security-identity>
</session>
<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">
@@ -579,20 +587,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>
@@ -792,20 +799,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>
@@ -844,6 +850,8 @@
<ejb-name>entity3EjbName</ejb-name>
<ejb-class>entity3Class</ejb-class>
<persistence-type>Bean</persistence-type>
+ <prim-key-class>entity3EjbKeyClass</prim-key-class>
+ <reentrant>false</reentrant>
</entity>
<entity>
@@ -865,6 +873,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">
@@ -1029,7 +1039,6 @@
<description>en-mdb1SecurityIdentity-desc</description>
<description xml:lang="fr">fr-mdb1SecurityIdentity-desc</description>
<description xml:lang="de">de-mdb1SecurityIdentity-desc</description>
- <use-caller-identity id="mdb1SecurityIdentityUseCallerIdentity-id"/>
<run-as id="mdb1SecurityIdentityRunAs-id">
<description>en-mdb1SecurityIdentityRunAs-desc</description>
<description xml:lang="fr">fr-mdb1SecurityIdentityRunAs-desc</description>
@@ -1202,7 +1211,6 @@
<description>en-mdb2SecurityIdentity-desc</description>
<description xml:lang="fr">fr-mdb2SecurityIdentity-desc</description>
<description xml:lang="de">de-mdb2SecurityIdentity-desc</description>
- <use-caller-identity id="mdb2SecurityIdentityUseCallerIdentity-id"/>
<run-as id="mdb2SecurityIdentityRunAs-id">
<description>en-mdb2SecurityIdentityRunAs-desc</description>
<description xml:lang="fr">fr-mdb2SecurityIdentityRunAs-desc</description>
@@ -1212,7 +1220,6 @@
</security-identity>
</message-driven>
-
</enterprise-beans>
<relationships id="relationships-id">
@@ -1235,14 +1242,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">
@@ -1256,14 +1263,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>
@@ -1283,14 +1290,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">
@@ -1304,14 +1311,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>
@@ -1323,15 +1330,15 @@
<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">
<description>en-methodPermission1-desc</description>
<description xml:lang="fr">fr-methodPermission1-desc</description>
@@ -3310,4 +3317,4 @@
<ejb-client-jar>some/path/client.jar</ejb-client-jar>
-</ejb-jar>
\ No newline at end of file
+</ejb-jar>
Property changes on: projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/EjbJar21Everything_testEverything.xml
___________________________________________________________________
Name: svn:keywords
+ Id Revision
More information about the jboss-cvs-commits
mailing list