User: starksm
Date: 01/07/14 14:24:45
Modified: src/resources/perf/META-INF Tag: Branch_2_4 ejb-jar.xml
Added: src/resources/perf/META-INF Tag: Branch_2_4
secure-ejb-jar.xml secure-jboss.xml
Log:
Merge changes from main
Revision Changes Path
No revision
No revision
1.1.2.2 +115 -1 jbosstest/src/resources/perf/META-INF/ejb-jar.xml
Index: ejb-jar.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/src/resources/perf/META-INF/ejb-jar.xml,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- ejb-jar.xml 2001/07/09 01:06:07 1.1.2.1
+++ ejb-jar.xml 2001/07/14 21:24:45 1.1.2.2
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="Cp1252"?>
+<?xml version="1.0" encoding="UTF-8"?>
<ejb-jar>
<description>Performance test</description>
@@ -14,6 +14,21 @@
<transaction-type>Bean</transaction-type>
</session>
<session>
+ <ejb-name>ClientSession</ejb-name>
+ <home>org.jboss.test.perf.interfaces.SessionHome</home>
+ <remote>org.jboss.test.perf.interfaces.Session</remote>
+ <ejb-class>org.jboss.test.perf.ejb.ClientSessionBean</ejb-class>
+ <session-type>Stateful</session-type>
+ <transaction-type>Container</transaction-type>
+ <ejb-ref>
+ <ejb-ref-name>ejb/Session</ejb-ref-name>
+ <ejb-ref-type>Session</ejb-ref-type>
+ <home>org.jboss.test.perf.interfaces.SessionHome</home>
+ <remote>org.jboss.test.perf.interfaces.Session</remote>
+ <ejb-link>Session</ejb-link>
+ </ejb-ref>
+ </session>
+ <session>
<ejb-name>Probe</ejb-name>
<home>org.jboss.test.perf.interfaces.ProbeHome</home>
<remote>org.jboss.test.perf.interfaces.Probe</remote>
@@ -29,6 +44,15 @@
<session-type>Stateless</session-type>
<transaction-type>Container</transaction-type>
</session>
+ <session>
+ <description>Transacted stateless session bean</description>
+ <ejb-name>TxSession</ejb-name>
+ <home>org.jboss.test.perf.interfaces.TxSessionHome</home>
+ <remote>org.jboss.test.perf.interfaces.TxSession</remote>
+ <ejb-class>org.jboss.test.perf.ejb.TxSessionBean</ejb-class>
+ <session-type>Stateless</session-type>
+ <transaction-type>Container</transaction-type>
+ </session>
<entity>
<ejb-name>Entity</ejb-name>
@@ -45,5 +69,95 @@
<field-name>the_value</field-name>
</cmp-field>
</entity>
+
+ <entity>
+ <ejb-name>Entity2</ejb-name>
+ <home>org.jboss.test.perf.interfaces.Entity2Home</home>
+ <remote>org.jboss.test.perf.interfaces.Entity</remote>
+ <ejb-class>org.jboss.test.perf.ejb.Entity2Bean</ejb-class>
+ <persistence-type>Container</persistence-type>
+ <prim-key-class>org.jboss.test.perf.interfaces.Entity2PK</prim-key-class>
+ <reentrant>True</reentrant>
+ <cmp-field>
+ <field-name>key1</field-name>
+ </cmp-field>
+ <cmp-field>
+ <field-name>key2</field-name>
+ </cmp-field>
+ <cmp-field>
+ <field-name>key3</field-name>
+ </cmp-field>
+ <cmp-field>
+ <field-name>the_value</field-name>
+ </cmp-field>
+ </entity>
+
</enterprise-beans>
+
+ <assembly-descriptor>
+ <container-transaction>
+ <method>
+ <ejb-name>TxSession</ejb-name>
+ <method-name>requiredToSupports</method-name>
+ </method>
+ <method>
+ <ejb-name>TxSession</ejb-name>
+ <method-name>txRequired</method-name>
+ </method>
+ <method>
+ <ejb-name>TxSession</ejb-name>
+ <method-name>requiredToMandatory</method-name>
+ </method>
+ <method>
+ <ejb-name>TxSession</ejb-name>
+ <method-name>requiredToRequiresNew</method-name>
+ </method>
+ <trans-attribute>Required</trans-attribute>
+ </container-transaction>
+
+ <container-transaction>
+ <method>
+ <ejb-name>TxSession</ejb-name>
+ <method-name>txSupports</method-name>
+ </method>
+ <trans-attribute>Supports</trans-attribute>
+ </container-transaction>
+
+ <container-transaction>
+ <method>
+ <ejb-name>TxSession</ejb-name>
+ <method-name>txMandatory</method-name>
+ </method>
+ <trans-attribute>Mandatory</trans-attribute>
+ </container-transaction>
+
+ <container-transaction>
+ <method>
+ <ejb-name>TxSession</ejb-name>
+ <method-name>*</method-name>
+ </method>
+ <method>
+ <ejb-name>TxSession</ejb-name>
+ <method-name>txRequiresNew</method-name>
+ </method>
+ <trans-attribute>RequiresNew</trans-attribute>
+ </container-transaction>
+
+ <container-transaction>
+ <method>
+ <ejb-name>TxSession</ejb-name>
+ <method-name>txNever</method-name>
+ </method>
+ <trans-attribute>Never</trans-attribute>
+ </container-transaction>
+
+ <container-transaction>
+ <method>
+ <ejb-name>TxSession</ejb-name>
+ <method-name>txNotSupported</method-name>
+ </method>
+ <trans-attribute>NotSupported</trans-attribute>
+ </container-transaction>
+ </assembly-descriptor>
+
</ejb-jar>
No revision
No revision
1.1.2.1 +0 -0 jbosstest/src/resources/perf/META-INF/secure-ejb-jar.xml
Index: secure-ejb-jar.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/src/resources/perf/META-INF/secure-ejb-jar.xml,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
1.1.2.1 +0 -0 jbosstest/src/resources/perf/META-INF/secure-jboss.xml
Index: secure-jboss.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/src/resources/perf/META-INF/secure-jboss.xml,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
_______________________________________________
Jboss-development mailing list
[EMAIL PROTECTED]
http://lists.sourceforge.net/lists/listinfo/jboss-development
