[jboss-cvs] JBossAS SVN: r63702 - in trunk/testsuite/src/resources/testbeancluster: META-INF and 1 other directory.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Jun 27 21:16:00 EDT 2007
Author: bstansberry at jboss.com
Date: 2007-06-27 21:16:00 -0400 (Wed, 27 Jun 2007)
New Revision: 63702
Modified:
trunk/testsuite/src/resources/testbeancluster/META-INF/jboss.xml
trunk/testsuite/src/resources/testbeancluster/retry-jboss.xml
Log:
Add PreSecurityInterceptor
Use UnifiedInvoker
Modified: trunk/testsuite/src/resources/testbeancluster/META-INF/jboss.xml
===================================================================
--- trunk/testsuite/src/resources/testbeancluster/META-INF/jboss.xml 2007-06-28 01:11:11 UTC (rev 63701)
+++ trunk/testsuite/src/resources/testbeancluster/META-INF/jboss.xml 2007-06-28 01:16:00 UTC (rev 63702)
@@ -90,7 +90,7 @@
<!-- Override default clustered invoker bindings -->
<invoker-proxy-binding>
<name>clustered-entity-rmi-invoker</name>
- <invoker-mbean>jboss:service=invoker,type=jrmpha</invoker-mbean>
+ <invoker-mbean>jboss:service=invoker,type=unifiedha</invoker-mbean>
<proxy-factory>org.jboss.proxy.ejb.ProxyFactoryHA</proxy-factory>
<proxy-factory-config>
<client-interceptors>
@@ -121,7 +121,7 @@
<invoker-proxy-binding>
<name>clustered-stateless-rmi-invoker</name>
- <invoker-mbean>jboss:service=invoker,type=jrmpha</invoker-mbean>
+ <invoker-mbean>jboss:service=invoker,type=unifiedha</invoker-mbean>
<proxy-factory>org.jboss.proxy.ejb.ProxyFactoryHA</proxy-factory>
<proxy-factory-config>
<client-interceptors>
@@ -145,7 +145,7 @@
<invoker-proxy-binding>
<name>clustered-stateful-rmi-invoker</name>
- <invoker-mbean>jboss:service=invoker,type=jrmpha</invoker-mbean>
+ <invoker-mbean>jboss:service=invoker,type=unifiedha</invoker-mbean>
<proxy-factory>org.jboss.proxy.ejb.ProxyFactoryHA</proxy-factory>
<proxy-factory-config>
<client-interceptors>
@@ -178,6 +178,7 @@
<interceptor>org.jboss.ha.framework.test.ExplicitFailoverServerInterceptor</interceptor> <!-- must be before CleanShutdown -->
<interceptor>org.jboss.ejb.plugins.CleanShutdownInterceptor</interceptor>
<interceptor>org.jboss.ejb.plugins.LogInterceptor</interceptor>
+ <interceptor>org.jboss.ejb.plugins.security.PreSecurityInterceptor</interceptor>
<interceptor>org.jboss.ejb.plugins.SecurityInterceptor</interceptor>
<interceptor>org.jboss.ejb.plugins.TxInterceptorCMT</interceptor>
<interceptor>org.jboss.ejb.plugins.EntityCreationInterceptor</interceptor>
@@ -186,6 +187,7 @@
<interceptor>org.jboss.ejb.plugins.EntityReentranceInterceptor</interceptor>
<interceptor>org.jboss.resource.connectionmanager.CachedConnectionInterceptor</interceptor>
<interceptor>org.jboss.ejb.plugins.EntitySynchronizationInterceptor</interceptor>
+ <interceptor>org.jboss.ejb.plugins.cmp.jdbc.JDBCRelationInterceptor</interceptor>
</container-interceptors>
<commit-option>A</commit-option>
</container-configuration>
@@ -198,15 +200,14 @@
<interceptor>org.jboss.ha.framework.test.ExplicitFailoverServerInterceptor</interceptor> <!-- must be before CleanShutdown -->
<interceptor>org.jboss.ejb.plugins.CleanShutdownInterceptor</interceptor>
<interceptor>org.jboss.ejb.plugins.LogInterceptor</interceptor>
+ <interceptor>org.jboss.ejb.plugins.security.PreSecurityInterceptor</interceptor>
<interceptor>org.jboss.ejb.plugins.SecurityInterceptor</interceptor>
<!-- CMT -->
<interceptor transaction="Container">org.jboss.ejb.plugins.TxInterceptorCMT</interceptor>
- <interceptor transaction="Container" metricsEnabled="true">org.jboss.ejb.plugins.MetricsInterceptor</interceptor>
<interceptor transaction="Container">org.jboss.ejb.plugins.StatelessSessionInstanceInterceptor</interceptor>
<!-- BMT -->
<interceptor transaction="Bean">org.jboss.ejb.plugins.StatelessSessionInstanceInterceptor</interceptor>
<interceptor transaction="Bean">org.jboss.ejb.plugins.TxInterceptorBMT</interceptor>
- <interceptor transaction="Bean" metricsEnabled="true">org.jboss.ejb.plugins.MetricsInterceptor</interceptor>
<interceptor>org.jboss.resource.connectionmanager.CachedConnectionInterceptor</interceptor>
</container-interceptors>
</container-configuration>
@@ -219,14 +220,13 @@
<interceptor>org.jboss.ha.framework.test.ExplicitFailoverServerInterceptor</interceptor> <!-- must be before CleanShutdown -->
<interceptor>org.jboss.ejb.plugins.CleanShutdownInterceptor</interceptor>
<interceptor>org.jboss.ejb.plugins.LogInterceptor</interceptor>
+ <interceptor>org.jboss.ejb.plugins.security.PreSecurityInterceptor</interceptor>
<!-- CMT -->
<interceptor transaction="Container">org.jboss.ejb.plugins.TxInterceptorCMT</interceptor>
- <interceptor transaction="Container" metricsEnabled="true">org.jboss.ejb.plugins.MetricsInterceptor</interceptor>
<interceptor transaction="Container">org.jboss.ejb.plugins.StatefulSessionInstanceInterceptor</interceptor>
<!-- BMT -->
<interceptor transaction="Bean">org.jboss.ejb.plugins.StatefulSessionInstanceInterceptor</interceptor>
<interceptor transaction="Bean">org.jboss.ejb.plugins.TxInterceptorBMT</interceptor>
- <interceptor transaction="Bean" metricsEnabled="true">org.jboss.ejb.plugins.MetricsInterceptor</interceptor>
<interceptor>org.jboss.ejb.plugins.SecurityInterceptor</interceptor>
<interceptor>org.jboss.resource.connectionmanager.CachedConnectionInterceptor</interceptor>
<interceptor>org.jboss.ejb.plugins.StatefulHASessionSynchronisationInterceptor</interceptor>
@@ -263,9 +263,9 @@
<interceptor>org.jboss.ha.framework.test.ExplicitFailoverServerInterceptor</interceptor> <!-- must be before CleanShutdown -->
<interceptor>org.jboss.ejb.plugins.CleanShutdownInterceptor</interceptor>
<interceptor>org.jboss.ejb.plugins.LogInterceptor</interceptor>
+ <interceptor>org.jboss.ejb.plugins.security.PreSecurityInterceptor</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.EntityCreationInterceptor</interceptor>
<interceptor>org.jboss.ejb.plugins.EntityLockInterceptor</interceptor>
<interceptor>org.jboss.ejb.plugins.EntityInstanceInterceptor</interceptor>
Modified: trunk/testsuite/src/resources/testbeancluster/retry-jboss.xml
===================================================================
--- trunk/testsuite/src/resources/testbeancluster/retry-jboss.xml 2007-06-28 01:11:11 UTC (rev 63701)
+++ trunk/testsuite/src/resources/testbeancluster/retry-jboss.xml 2007-06-28 01:16:00 UTC (rev 63702)
@@ -82,7 +82,7 @@
<!-- Override default clustered invoker bindings -->
<invoker-proxy-binding>
<name>clustered-stateless-rmi-invoker-retry</name>
- <invoker-mbean>jboss:service=invoker,type=jrmpha</invoker-mbean>
+ <invoker-mbean>jboss:service=invoker,type=unifiedha</invoker-mbean>
<proxy-factory>org.jboss.proxy.ejb.ProxyFactoryHA</proxy-factory>
<proxy-factory-config>
<client-interceptors>
@@ -110,7 +110,7 @@
<invoker-proxy-binding>
<name>clustered-stateless-rmi-invoker-singleretry</name>
- <invoker-mbean>jboss:service=invoker,type=jrmpha</invoker-mbean>
+ <invoker-mbean>jboss:service=invoker,type=unifiedha</invoker-mbean>
<proxy-factory>org.jboss.proxy.ejb.ProxyFactoryHA</proxy-factory>
<proxy-factory-config>
<client-interceptors>
@@ -138,7 +138,7 @@
<invoker-proxy-binding>
<name>clustered-stateful-rmi-invoker-retry</name>
- <invoker-mbean>jboss:service=invoker,type=jrmpha</invoker-mbean>
+ <invoker-mbean>jboss:service=invoker,type=unifiedha</invoker-mbean>
<proxy-factory>org.jboss.proxy.ejb.ProxyFactoryHA</proxy-factory>
<proxy-factory-config>
<client-interceptors>
@@ -166,7 +166,7 @@
<invoker-proxy-binding>
<name>clustered-stateful-rmi-invoker-singleretry</name>
- <invoker-mbean>jboss:service=invoker,type=jrmpha</invoker-mbean>
+ <invoker-mbean>jboss:service=invoker,type=unifiedha</invoker-mbean>
<proxy-factory>org.jboss.proxy.ejb.ProxyFactoryHA</proxy-factory>
<proxy-factory-config>
<client-interceptors>
@@ -194,7 +194,7 @@
<invoker-proxy-binding>
<name>clustered-entity-rmi-invoker-retry</name>
- <invoker-mbean>jboss:service=invoker,type=jrmpha</invoker-mbean>
+ <invoker-mbean>jboss:service=invoker,type=unifiedha</invoker-mbean>
<proxy-factory>org.jboss.proxy.ejb.ProxyFactoryHA</proxy-factory>
<proxy-factory-config>
<client-interceptors>
@@ -231,7 +231,7 @@
<invoker-proxy-binding>
<name>clustered-entity-rmi-invoker-singleretry</name>
- <invoker-mbean>jboss:service=invoker,type=jrmpha</invoker-mbean>
+ <invoker-mbean>jboss:service=invoker,type=unifiedha</invoker-mbean>
<proxy-factory>org.jboss.proxy.ejb.ProxyFactoryHA</proxy-factory>
<proxy-factory-config>
<client-interceptors>
@@ -278,6 +278,7 @@
<interceptor>org.jboss.ha.framework.test.ExplicitFailoverServerInterceptor</interceptor> <!-- must be before CleanShutdown -->
<interceptor>org.jboss.ejb.plugins.CleanShutdownInterceptor</interceptor>
<interceptor>org.jboss.ejb.plugins.LogInterceptor</interceptor>
+ <interceptor>org.jboss.ejb.plugins.security.PreSecurityInterceptor</interceptor>
<interceptor>org.jboss.ejb.plugins.SecurityInterceptor</interceptor>
<interceptor>org.jboss.ejb.plugins.TxInterceptorCMT</interceptor>
<interceptor>org.jboss.ejb.plugins.EntityCreationInterceptor</interceptor>
@@ -298,15 +299,14 @@
<interceptor>org.jboss.ha.framework.test.ExplicitFailoverServerInterceptor</interceptor> <!-- must be before CleanShutdown -->
<interceptor>org.jboss.ejb.plugins.CleanShutdownInterceptor</interceptor>
<interceptor>org.jboss.ejb.plugins.LogInterceptor</interceptor>
+ <interceptor>org.jboss.ejb.plugins.security.PreSecurityInterceptor</interceptor>
<interceptor>org.jboss.ejb.plugins.SecurityInterceptor</interceptor>
<!-- CMT -->
<interceptor transaction="Container">org.jboss.ejb.plugins.TxInterceptorCMT</interceptor>
- <interceptor transaction="Container" metricsEnabled="true">org.jboss.ejb.plugins.MetricsInterceptor</interceptor>
<interceptor transaction="Container">org.jboss.ejb.plugins.StatelessSessionInstanceInterceptor</interceptor>
<!-- BMT -->
<interceptor transaction="Bean">org.jboss.ejb.plugins.StatelessSessionInstanceInterceptor</interceptor>
<interceptor transaction="Bean">org.jboss.ejb.plugins.TxInterceptorBMT</interceptor>
- <interceptor transaction="Bean" metricsEnabled="true">org.jboss.ejb.plugins.MetricsInterceptor</interceptor>
<interceptor>org.jboss.resource.connectionmanager.CachedConnectionInterceptor</interceptor>
</container-interceptors>
</container-configuration>
@@ -319,14 +319,13 @@
<interceptor>org.jboss.ha.framework.test.ExplicitFailoverServerInterceptor</interceptor> <!-- must be before CleanShutdown -->
<interceptor>org.jboss.ejb.plugins.CleanShutdownInterceptor</interceptor>
<interceptor>org.jboss.ejb.plugins.LogInterceptor</interceptor>
+ <interceptor>org.jboss.ejb.plugins.security.PreSecurityInterceptor</interceptor>
<!-- CMT -->
<interceptor transaction="Container">org.jboss.ejb.plugins.TxInterceptorCMT</interceptor>
- <interceptor transaction="Container" metricsEnabled="true">org.jboss.ejb.plugins.MetricsInterceptor</interceptor>
<interceptor transaction="Container">org.jboss.ejb.plugins.StatefulSessionInstanceInterceptor</interceptor>
<!-- BMT -->
<interceptor transaction="Bean">org.jboss.ejb.plugins.StatefulSessionInstanceInterceptor</interceptor>
<interceptor transaction="Bean">org.jboss.ejb.plugins.TxInterceptorBMT</interceptor>
- <interceptor transaction="Bean" metricsEnabled="true">org.jboss.ejb.plugins.MetricsInterceptor</interceptor>
<interceptor>org.jboss.ejb.plugins.SecurityInterceptor</interceptor>
<interceptor>org.jboss.resource.connectionmanager.CachedConnectionInterceptor</interceptor>
<interceptor>org.jboss.ejb.plugins.StatefulHASessionSynchronisationInterceptor</interceptor>
More information about the jboss-cvs-commits
mailing list