User: starksm
Date: 01/07/17 20:25:23
Modified: src/resources/lock/META-INF Tag: Branch_2_2 ejb-jar.xml
Added: src/resources/lock/META-INF Tag: Branch_2_2 jboss.xml
Log:
Update the lock contention tests
Revision Changes Path
No revision
No revision
1.1.4.1 +69 -31 jbosstest/src/resources/lock/META-INF/ejb-jar.xml
Index: ejb-jar.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/src/resources/lock/META-INF/ejb-jar.xml,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -u -r1.1 -r1.1.4.1
--- ejb-jar.xml 2000/10/09 18:12:29 1.1
+++ ejb-jar.xml 2001/07/18 03:25:23 1.1.4.1
@@ -1,37 +1,75 @@
<?xml version="1.0" encoding="UTF-8"?>
-<ejb-jar>
+ <ejb-jar>
- <enterprise-beans>
- <entity>
- <ejb-name>EnterpriseEntity</ejb-name>
- <home>org.jboss.test.lock.interfaces.EnterpriseEntityHome</home>
- <remote>org.jboss.test.lock.interfaces.EnterpriseEntity</remote>
- <ejb-class>org.jboss.test.lock.bean.EnterpriseEntityBean</ejb-class>
- <persistence-type>Container</persistence-type>
- <prim-key-class>java.lang.String</prim-key-class>
- <reentrant>False</reentrant>
- <cmp-field>
- <field-name>name</field-name>
- </cmp-field>
- <cmp-field>
- <field-name>field</field-name>
- </cmp-field>
- <cmp-field>
- <field-name>nextEntity</field-name>
- </cmp-field>
- <primkey-field>name</primkey-field>
- </entity>
+ <enterprise-beans>
+ <entity>
+ <ejb-name>EnterpriseEntity_A</ejb-name>
+ <home>org.jboss.test.lock.interfaces.EnterpriseEntityHome</home>
+ <remote>org.jboss.test.lock.interfaces.EnterpriseEntity</remote>
+ <ejb-class>org.jboss.test.lock.bean.EnterpriseEntityBean</ejb-class>
+ <persistence-type>Container</persistence-type>
+ <prim-key-class>java.lang.String</prim-key-class>
+ <reentrant>False</reentrant>
+ <cmp-field><field-name>name</field-name></cmp-field>
+ <cmp-field><field-name>field</field-name></cmp-field>
+ <cmp-field><field-name>nextEntity</field-name></cmp-field>
+ <primkey-field>name</primkey-field>
+ </entity>
+
+ <entity>
+ <ejb-name>EnterpriseEntity_B</ejb-name>
+ <home>org.jboss.test.lock.interfaces.EnterpriseEntityHome</home>
+ <remote>org.jboss.test.lock.interfaces.EnterpriseEntity</remote>
+ <ejb-class>org.jboss.test.lock.bean.EnterpriseEntityBean</ejb-class>
+ <persistence-type>Container</persistence-type>
+ <prim-key-class>java.lang.String</prim-key-class>
+ <reentrant>False</reentrant>
+ <cmp-field><field-name>name</field-name></cmp-field>
+ <cmp-field><field-name>field</field-name></cmp-field>
+ <cmp-field><field-name>nextEntity</field-name></cmp-field>
+ <primkey-field>name</primkey-field>
+ </entity>
+
+ <entity>
+ <ejb-name>EnterpriseEntity_C</ejb-name>
+ <home>org.jboss.test.lock.interfaces.EnterpriseEntityHome</home>
+ <remote>org.jboss.test.lock.interfaces.EnterpriseEntity</remote>
+ <ejb-class>org.jboss.test.lock.bean.EnterpriseEntityBean</ejb-class>
+ <persistence-type>Container</persistence-type>
+ <prim-key-class>java.lang.String</prim-key-class>
+ <reentrant>False</reentrant>
+ <cmp-field><field-name>name</field-name></cmp-field>
+ <cmp-field><field-name>field</field-name></cmp-field>
+ <cmp-field><field-name>nextEntity</field-name></cmp-field>
+ <primkey-field>name</primkey-field>
+ </entity>
+
</enterprise-beans>
-
+
<assembly-descriptor>
- <container-transaction>
- <method>
- <ejb-name>EnterpriseEntity</ejb-name>
- <method-name>*</method-name>
- </method>
- <trans-attribute>RequiresNew</trans-attribute>
- </container-transaction>
- </assembly-descriptor>
+ <container-transaction>
+ <method>
+ <ejb-name>EnterpriseEntity_A</ejb-name>
+ <method-name>*</method-name>
+ </method>
+ <trans-attribute>RequiresNew</trans-attribute>
+ </container-transaction>
+
+ <container-transaction>
+ <method>
+ <ejb-name>EnterpriseEntity_B</ejb-name>
+ <method-name>*</method-name>
+ </method>
+ <trans-attribute>Required</trans-attribute>
+ </container-transaction>
-</ejb-jar>
+ <container-transaction>
+ <method>
+ <ejb-name>EnterpriseEntity_C</ejb-name>
+ <method-name>*</method-name>
+ </method>
+ <trans-attribute>RequiresNew</trans-attribute>
+ </container-transaction>
+ </assembly-descriptor>
+ </ejb-jar>
No revision
No revision
1.1.2.1 +0 -44 jbosstest/src/resources/lock/META-INF/jboss.xml
Index: jboss.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/src/resources/lock/META-INF/jboss.xml,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- jboss.xml 2001/07/11 05:52:09 1.1
+++ jboss.xml 2001/07/18 03:25:23 1.1.2.1
@@ -124,45 +124,6 @@
<commit-option>C</commit-option>
</container-configuration>
- <container-configuration>
- <container-name>EntityBean_D</container-name>
- <call-logging>false</call-logging>
-
<container-invoker>org.jboss.ejb.plugins.jrmp.server.JRMPContainerInvoker</container-invoker>
- <container-interceptors>
- <interceptor>org.jboss.ejb.plugins.LogInterceptor</interceptor>
- <interceptor>org.jboss.ejb.plugins.SecurityInterceptor</interceptor>
- <interceptor>org.jboss.ejb.plugins.TxInterceptorCMT</interceptor>
- <interceptor
metricsEnabled="true">org.jboss.ejb.plugins.MetricsInterceptor</interceptor>
- <interceptor>org.jboss.ejb.plugins.EntityInstanceInterceptor</interceptor>
-
<interceptor>org.jboss.ejb.plugins.EntitySynchronizationInterceptor</interceptor>
- </container-interceptors>
- <instance-pool>org.jboss.ejb.plugins.EntityInstancePool</instance-pool>
- <instance-cache>org.jboss.ejb.plugins.EntityInstanceCache</instance-cache>
-
<persistence-manager>org.jboss.ejb.plugins.jaws.JAWSPersistenceManager</persistence-manager>
- <transaction-manager>org.jboss.tm.TxManager</transaction-manager>
- <container-invoker-conf>
- <!-- <RMIObjectPort>4444</RMIObjectPort> -->
- <Optimized>True</Optimized>
- </container-invoker-conf>
- <container-cache-conf>
-
<cache-policy>org.jboss.ejb.plugins.LRUEnterpriseContextCachePolicy</cache-policy>
- <cache-policy-conf>
- <min-capacity>50</min-capacity>
- <max-capacity>1000</max-capacity>
- <overager-period>300</overager-period>
- <max-bean-age>600</max-bean-age>
- <resizer-period>400</resizer-period>
- <max-cache-miss-period>60</max-cache-miss-period>
- <min-cache-miss-period>1</min-cache-miss-period>
- <cache-load-factor>0.75</cache-load-factor>
- </cache-policy-conf>
- </container-cache-conf>
- <container-pool-conf>
- <MaximumSize>100</MaximumSize>
- <MinimumSize>10</MinimumSize>
- </container-pool-conf>
- <commit-option>D</commit-option>
- </container-configuration>
</container-configurations>
<enterprise-beans>
@@ -184,11 +145,6 @@
<configuration-name>EntityBean_C</configuration-name>
</entity>
- <entity>
- <ejb-name>EnterpriseEntity_D</ejb-name>
- <jndi-name>EnterpriseEntity_D</jndi-name>
- <configuration-name>EntityBean_D</configuration-name>
- </entity>
</enterprise-beans>
</jboss>
_______________________________________________
Jboss-development mailing list
[EMAIL PROTECTED]
http://lists.sourceforge.net/lists/listinfo/jboss-development
