User: patriot1burke
Date: 02/04/12 14:57:23
Modified: src/resources/lock/META-INF ejb-jar.xml jboss.xml
Log:
cleaned up some tests
Revision Changes Path
1.5 +0 -89 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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ejb-jar.xml 9 Aug 2001 21:11:48 -0000 1.4
+++ ejb-jar.xml 12 Apr 2002 21:57:23 -0000 1.5
@@ -59,63 +59,6 @@
</entity>
<entity>
- <ejb-name>EnterpriseEntity_A_Queued</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_Queued</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_Queued</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_D_Queued</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_Multi</ejb-name>
<home>org.jboss.test.lock.interfaces.EnterpriseEntityHome</home>
<remote>org.jboss.test.lock.interfaces.EnterpriseEntity</remote>
@@ -177,38 +120,6 @@
</method>
<trans-attribute>RequiresNew</trans-attribute>
</container-transaction>
- <container-transaction>
- <method>
- <ejb-name>EnterpriseEntity_A_Queued</ejb-name>
- <method-name>*</method-name>
- </method>
- <trans-attribute>RequiresNew</trans-attribute>
- </container-transaction>
-
- <container-transaction>
- <method>
- <ejb-name>EnterpriseEntity_B_Queued</ejb-name>
- <method-name>*</method-name>
- </method>
- <trans-attribute>Required</trans-attribute>
- </container-transaction>
-
- <container-transaction>
- <method>
- <ejb-name>EnterpriseEntity_C_Queued</ejb-name>
- <method-name>*</method-name>
- </method>
- <trans-attribute>RequiresNew</trans-attribute>
- </container-transaction>
-
- <container-transaction>
- <method>
- <ejb-name>EnterpriseEntity_D_Queued</ejb-name>
- <method-name>*</method-name>
- </method>
- <trans-attribute>RequiresNew</trans-attribute>
- </container-transaction>
-
<container-transaction>
<method>
<ejb-name>EnterpriseEntity_B_Multi</ejb-name>
1.6 +3 -276 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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- jboss.xml 10 Mar 2002 03:08:20 -0000 1.5
+++ jboss.xml 12 Apr 2002 21:57:23 -0000 1.6
@@ -41,254 +41,6 @@
<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>
-
<locking-policy>org.jboss.ejb.plugins.lock.SimplePessimisticEJBLock</locking-policy>
- <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>A</commit-option>
- </container-configuration>
-
- <container-configuration>
- <container-name>EntityBean_B</container-name>
- <call-logging>false</call-logging>
- <container-invoker>org.jboss.proxy.ejb.ProxyFactory</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.EntityLockInterceptor</interceptor>
- <interceptor>org.jboss.ejb.plugins.EntityInstanceInterceptor</interceptor>
-
<interceptor>org.jboss.ejb.plugins.EntitySynchronizationInterceptor</interceptor>
- </container-interceptors>
- <client-interceptors>
- <home>
- <interceptor>org.jboss.proxy.ejb.HomeInterceptor</interceptor>
- <interceptor>org.jboss.proxy.SecurityInterceptor</interceptor>
- <interceptor>org.jboss.proxy.TransactionInterceptor</interceptor>
- <interceptor>org.jboss.invocation.InvokerInterceptor</interceptor>
- </home>
- <bean>
- <interceptor>org.jboss.proxy.ejb.EntityInterceptor</interceptor>
- <interceptor>org.jboss.proxy.SecurityInterceptor</interceptor>
- <interceptor>org.jboss.proxy.TransactionInterceptor</interceptor>
- <interceptor>org.jboss.invocation.InvokerInterceptor</interceptor>
- </bean>
- <list-entity>
- <interceptor>org.jboss.proxy.ejb.ListEntityInterceptor</interceptor>
- <interceptor>org.jboss.proxy.SecurityInterceptor</interceptor>
- <interceptor>org.jboss.proxy.TransactionInterceptor</interceptor>
- <interceptor>org.jboss.invocation.InvokerInterceptor</interceptor>
- </list-entity>
- </client-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>
-
<locking-policy>org.jboss.ejb.plugins.lock.SimplePessimisticEJBLock</locking-policy>
- <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>B</commit-option>
- </container-configuration>
-
- <container-configuration>
- <container-name>EntityBean_C</container-name>
- <call-logging>false</call-logging>
- <container-invoker>org.jboss.proxy.ejb.ProxyFactory</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.EntityLockInterceptor</interceptor>
- <interceptor>org.jboss.ejb.plugins.EntityInstanceInterceptor</interceptor>
-
<interceptor>org.jboss.ejb.plugins.EntitySynchronizationInterceptor</interceptor>
- </container-interceptors>
- <client-interceptors>
- <home>
- <interceptor>org.jboss.proxy.ejb.HomeInterceptor</interceptor>
- <interceptor>org.jboss.proxy.SecurityInterceptor</interceptor>
- <interceptor>org.jboss.proxy.TransactionInterceptor</interceptor>
- <interceptor>org.jboss.invocation.InvokerInterceptor</interceptor>
- </home>
- <bean>
- <interceptor>org.jboss.proxy.ejb.EntityInterceptor</interceptor>
- <interceptor>org.jboss.proxy.SecurityInterceptor</interceptor>
- <interceptor>org.jboss.proxy.TransactionInterceptor</interceptor>
- <interceptor>org.jboss.invocation.InvokerInterceptor</interceptor>
- </bean>
- <list-entity>
- <interceptor>org.jboss.proxy.ejb.ListEntityInterceptor</interceptor>
- <interceptor>org.jboss.proxy.SecurityInterceptor</interceptor>
- <interceptor>org.jboss.proxy.TransactionInterceptor</interceptor>
- <interceptor>org.jboss.invocation.InvokerInterceptor</interceptor>
- </list-entity>
- </client-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>
-
<locking-policy>org.jboss.ejb.plugins.lock.SimplePessimisticEJBLock</locking-policy>
- <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>C</commit-option>
- </container-configuration>
-
- <container-configuration>
- <container-name>EntityBean_D</container-name>
- <call-logging>false</call-logging>
- <container-invoker>org.jboss.proxy.ejb.ProxyFactory</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.EntityLockInterceptor</interceptor>
- <interceptor>org.jboss.ejb.plugins.EntityInstanceInterceptor</interceptor>
-
<interceptor>org.jboss.ejb.plugins.EntitySynchronizationInterceptor</interceptor>
- </container-interceptors>
- <client-interceptors>
- <home>
- <interceptor>org.jboss.proxy.ejb.HomeInterceptor</interceptor>
- <interceptor>org.jboss.proxy.SecurityInterceptor</interceptor>
- <interceptor>org.jboss.proxy.TransactionInterceptor</interceptor>
- <interceptor>org.jboss.invocation.InvokerInterceptor</interceptor>
- </home>
- <bean>
- <interceptor>org.jboss.proxy.ejb.EntityInterceptor</interceptor>
- <interceptor>org.jboss.proxy.SecurityInterceptor</interceptor>
- <interceptor>org.jboss.proxy.TransactionInterceptor</interceptor>
- <interceptor>org.jboss.invocation.InvokerInterceptor</interceptor>
- </bean>
- <list-entity>
- <interceptor>org.jboss.proxy.ejb.ListEntityInterceptor</interceptor>
- <interceptor>org.jboss.proxy.SecurityInterceptor</interceptor>
- <interceptor>org.jboss.proxy.TransactionInterceptor</interceptor>
- <interceptor>org.jboss.invocation.InvokerInterceptor</interceptor>
- </list-entity>
- </client-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>
-
<locking-policy>org.jboss.ejb.plugins.lock.SimplePessimisticEJBLock</locking-policy>
- <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-configuration>
- <container-name>EntityBean_A_Queued</container-name>
- <call-logging>false</call-logging>
- <container-invoker>org.jboss.proxy.ejb.ProxyFactory</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.EntityLockInterceptor</interceptor>
- <interceptor>org.jboss.ejb.plugins.EntityInstanceInterceptor</interceptor>
-
<interceptor>org.jboss.ejb.plugins.EntitySynchronizationInterceptor</interceptor>
- </container-interceptors>
- <client-interceptors>
- <home>
- <interceptor>org.jboss.proxy.ejb.HomeInterceptor</interceptor>
- <interceptor>org.jboss.proxy.SecurityInterceptor</interceptor>
- <interceptor>org.jboss.proxy.TransactionInterceptor</interceptor>
- <interceptor>org.jboss.invocation.InvokerInterceptor</interceptor>
- </home>
- <bean>
- <interceptor>org.jboss.proxy.ejb.EntityInterceptor</interceptor>
- <interceptor>org.jboss.proxy.SecurityInterceptor</interceptor>
- <interceptor>org.jboss.proxy.TransactionInterceptor</interceptor>
- <interceptor>org.jboss.invocation.InvokerInterceptor</interceptor>
- </bean>
- <list-entity>
- <interceptor>org.jboss.proxy.ejb.ListEntityInterceptor</interceptor>
- <interceptor>org.jboss.proxy.SecurityInterceptor</interceptor>
- <interceptor>org.jboss.proxy.TransactionInterceptor</interceptor>
- <interceptor>org.jboss.invocation.InvokerInterceptor</interceptor>
- </list-entity>
- </client-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>
<locking-policy>org.jboss.ejb.plugins.lock.QueuedPessimisticEJBLock</locking-policy>
<container-invoker-conf>
<!-- <RMIObjectPort>4444</RMIObjectPort> -->
@@ -315,7 +67,7 @@
</container-configuration>
<container-configuration>
- <container-name>EntityBean_B_Queued</container-name>
+ <container-name>EntityBean_B</container-name>
<call-logging>false</call-logging>
<container-invoker>org.jboss.proxy.ejb.ProxyFactory</container-invoker>
<container-interceptors>
@@ -377,7 +129,7 @@
</container-configuration>
<container-configuration>
- <container-name>EntityBean_C_Queued</container-name>
+ <container-name>EntityBean_C</container-name>
<call-logging>false</call-logging>
<container-invoker>org.jboss.proxy.ejb.ProxyFactory</container-invoker>
<container-interceptors>
@@ -439,7 +191,7 @@
</container-configuration>
<container-configuration>
- <container-name>EntityBean_D_Queued</container-name>
+ <container-name>EntityBean_D</container-name>
<call-logging>false</call-logging>
<container-invoker>org.jboss.proxy.ejb.ProxyFactory</container-invoker>
<container-interceptors>
@@ -500,7 +252,6 @@
<commit-option>D</commit-option>
</container-configuration>
-
<container-configuration>
<container-name>EntityBean_B_Multi</container-name>
<call-logging>false</call-logging>
@@ -651,30 +402,6 @@
<jndi-name>EnterpriseEntity_D</jndi-name>
<configuration-name>EntityBean_D</configuration-name>
</entity>
- <entity>
- <ejb-name>EnterpriseEntity_A_Queued</ejb-name>
- <jndi-name>EnterpriseEntity_A_Queued</jndi-name>
- <configuration-name>EntityBean_A_Queued</configuration-name>
- </entity>
-
- <entity>
- <ejb-name>EnterpriseEntity_B_Queued</ejb-name>
- <jndi-name>EnterpriseEntity_B_Queued</jndi-name>
- <configuration-name>EntityBean_B_Queued</configuration-name>
- </entity>
-
- <entity>
- <ejb-name>EnterpriseEntity_C_Queued</ejb-name>
- <jndi-name>EnterpriseEntity_C_Queued</jndi-name>
- <configuration-name>EntityBean_C_Queued</configuration-name>
- </entity>
-
- <entity>
- <ejb-name>EnterpriseEntity_D_Queued</ejb-name>
- <jndi-name>EnterpriseEntity_D_Queued</jndi-name>
- <configuration-name>EntityBean_D_Queued</configuration-name>
- </entity>
-
<entity>
<ejb-name>EnterpriseEntity_B_Multi</ejb-name>
<jndi-name>EnterpriseEntity_B_Multi</jndi-name>
_______________________________________________
Jboss-development mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/jboss-development
