[jboss-cvs] JBossAS SVN: r72856 - in trunk/ejb3: src/resources and 1 other directory.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Tue Apr 29 02:44:56 EDT 2008


Author: ALRubinger
Date: 2008-04-29 02:44:55 -0400 (Tue, 29 Apr 2008)
New Revision: 72856

Removed:
   trunk/ejb3/src/resources/META-INF/
   trunk/ejb3/src/resources/ejb3-clustered-sfsbcache-beans.xml
   trunk/ejb3/src/resources/ejb3-clustered-sfsbcache-service.xml
   trunk/ejb3/src/resources/ejb3-connectors-service.xml
   trunk/ejb3/src/resources/ejb3-entity-cache-beans.xml
   trunk/ejb3/src/resources/ejb3-entity-cache-service.xml
   trunk/ejb3/src/resources/ejb3-interceptors-aop.xml
   trunk/ejb3/src/resources/ejb3-timer-service.xml
Modified:
   trunk/ejb3/build.xml
Log:
[EJBTHREE-1333] Removed duplicate resources from AS ejb3 Module, will be used from EJB3 Core

Modified: trunk/ejb3/build.xml
===================================================================
--- trunk/ejb3/build.xml	2008-04-29 06:44:12 UTC (rev 72855)
+++ trunk/ejb3/build.xml	2008-04-29 06:44:55 UTC (rev 72856)
@@ -310,6 +310,15 @@
             <include name="org/jboss/ejb3/clientmodule/*"/>
          </fileset>
       </jar>
+			
+			<mkdir dir="${resources}"/>
+			<unjar src="../thirdparty/jboss/jboss-ejb3-core/lib/jboss-ejb3-core.jar" dest="${resources}">
+        <patternset>
+          <include name="*.xml" />
+          <include name="META-INF/*.xml" />
+          <include name="META-INF/*.properties" />
+        </patternset>
+			</unjar>
 
       <mkdir dir="${build.lib}/ejb3.deployer"/>
       <copy todir="${build.lib}/ejb3.deployer">

Deleted: trunk/ejb3/src/resources/ejb3-clustered-sfsbcache-beans.xml
===================================================================
--- trunk/ejb3/src/resources/ejb3-clustered-sfsbcache-beans.xml	2008-04-29 06:44:12 UTC (rev 72855)
+++ trunk/ejb3/src/resources/ejb3-clustered-sfsbcache-beans.xml	2008-04-29 06:44:55 UTC (rev 72856)
@@ -1,126 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
-
-   <!-- First we create a Configuration object for the cache -->
-   <bean name="EJB3SFSBCacheConfig"
-   		 class="org.jboss.cache.config.Configuration">
-      
-      <!-- Externally injected services -->  
-      <property name="runtimeConfig">
-         <bean name="EJB3SFSBCacheRuntimeConfig" class="org.jboss.cache.config.RuntimeConfig">
-            <!--property name="transactionManager"><inject bean="jboss:service=TransactionManager" property="transactionManager"/></property-->
-            <property name="muxChannelFactory"><inject bean="JChannelFactory"/></property>
-         </bean>
-      </property>
-      
-      <property name="multiplexerStack">${jboss.multiplexer.stack:udp}</property>
-
-      <property name="clusterName">${jboss.partition.name:DefaultPartition}-SFSBCache</property>
-      
-      <!--
-              Node locking level : SERIALIZABLE
-                                   REPEATABLE_READ (default)
-                                   READ_COMMITTED
-                                   READ_UNCOMMITTED
-                                   NONE
-      -->
-      <property name="isolationLevelString">REPEATABLE_READ</property>
-
-      <!--     Valid modes are LOCAL
-                               REPL_ASYNC
-                               REPL_SYNC
-      -->
-      <property name="cacheModeString">REPL_ASYNC</property>
-
-      <!--    Number of milliseconds to wait until all responses for a
-              synchronous call have been received.
-      -->
-      <property name="syncReplTimeout">17500</property>
-      <!--  Max number of milliseconds to wait for a lock acquisition -->
-      <property name="lockAcquisitionTimeout">15000</property>
-      <property name="stateRetrievalTimeout">60000</property>
-        
-      <property name="exposeManagementStatistics">true</property>
-
-      <!-- We want to activate/inactivate regions as beans are deployed -->
-      <property name="useRegionBasedMarshalling">true</property>
-      <!-- Must match the value of "useRegionBasedMarshalling" -->
-      <property name="inactiveOnStartup">true</property>
-
-      <property name="evictionConfig">
-      	 <bean name="EJB3SFSBEvictionConfig" class="org.jboss.cache.config.EvictionConfig">
-      	   <property name="defaultEvictionPolicyClass">org.jboss.cache.eviction.NullEvictionPolicyConfig</property>
-            <property name="wakeupIntervalSeconds">5</property>
-            <property name="evictionRegionConfigs">
-            	<list>
-            		<!-- Default region would never timeout -->
-            		<bean name="EJB3SFSBDefaultEvictionRegionConfig" class="org.jboss.cache.config.EvictionRegionConfig">
-            			<property name="regionName">/_default_</property>
-            			<property name="evictionPolicyConfig">
-            				<bean name="EJB3SFSBDefaultLRUConfig" 
-            				      class="org.jboss.cache.eviction.NullEvictionPolicyConfig"/>
-               			</property>
-            		</bean>
-            		<!-- EJB3 integration code will programatically create other
-                       regions as beans are deployed -->
-            	</list>
-			</property>
-         </bean>
-      </property>
-   
-      <property name="buddyReplicationConfig">
-      	<bean name="EJB3SFSBBuddyReplicationConfig" 
-      		class="org.jboss.cache.config.BuddyReplicationConfig">
-      		
-      		<property name="enabled">true</property>
-            <property name="buddyPoolName">default</property>
-            <property name="buddyCommunicationTimeout">17500</property>
-
-            <property name="autoDataGravitation">false</property>
-            <property name="dataGravitationRemoveOnFind">true</property>
-            <property name="dataGravitationSearchBackupTrees">true</property>
-            
-            <property name="buddyLocatorConfig">
-            	<bean name="EJB3SFSBBuddyLocatorConfig" class="org.jboss.cache.buddyreplication.NextMemberBuddyLocatorConfig">
-            		<property name="numBuddies">1</property>
-            		<property name="ignoreColocatedBuddies">true</property>
-                </bean>
-      		</property>
-      	</bean>
-      </property>
-      
-      <property name="cacheLoaderConfig">
-      	<bean name="EJB3SFSBCacheLoaderConfig" 
-      		class="org.jboss.cache.config.CacheLoaderConfig">
-      		
-      		<property name="passivation">true</property>
-            <property name="shared">false</property>
-            <property name="individualCacheLoaderConfigs">
-              	<list>
-              		<bean name="EJB3SFSBFileCacheLoader" class="org.jboss.cache.loader.FileCacheLoaderConfig">
-               			<!-- Temporary workaround to a bug in JBC 2.0.0.ALPHA1 -->
-               			<property name="className">org.jboss.ejb3.cache.tree.SFSBFileCacheLoader</property>
-               			<property name="location">${jboss.server.data.dir}${/}sfsb</property>
-                   		<property name="async">false</property>
-                   		<property name="fetchPersistentState">true</property>
-                   		<property name="ignoreModifications">false</property>
-                        <property name="checkCharacterPortability">false</property>
-               		</bean>
-               	</list>
-            </property>
-      	 </bean>
-      </property>     
-   </bean>
-    
-   <!-- Now we use the above configuration to construct the cache itself -->
-   <bean name="EJB3SFSBClusteredCache" class="org.jboss.cache.jmx.CacheJmxWrapper">
-      
-      <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss.cache:service=EJB3SFSBClusteredCache", exposedInterface=org.jboss.cache.jmx.CacheJmxWrapperMBean.class, registerDirectly=true)</annotation>
-      
-      <property name="configuration"><inject bean="EJB3SFSBCacheConfig"/></property>
-        
-   </bean>
-
-</deployment>
-

Deleted: trunk/ejb3/src/resources/ejb3-clustered-sfsbcache-service.xml
===================================================================
--- trunk/ejb3/src/resources/ejb3-clustered-sfsbcache-service.xml	2008-04-29 06:44:12 UTC (rev 72855)
+++ trunk/ejb3/src/resources/ejb3-clustered-sfsbcache-service.xml	2008-04-29 06:44:55 UTC (rev 72856)
@@ -1,142 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<server>
-
-   <!-- ========================================================== -->
-   <!-- Clustered SFSB cache config for use with JBoss Cache 1.4.x --> 
-   <!-- ========================================================== -->
-   <mbean code="org.jboss.cache.TreeCache" 
-          name="jboss.cache:service=EJB3SFSBClusteredCache">
-        
-      <attribute name="ClusterName">${jboss.partition.name:DefaultPartition}-SFSBCache</attribute>
-      
-      <!--
-              Node locking level : SERIALIZABLE
-                                   REPEATABLE_READ (default)
-                                   READ_COMMITTED
-                                   READ_UNCOMMITTED
-                                   NONE
-      -->
-      <attribute name="IsolationLevel">REPEATABLE_READ</attribute>
-
-      <!--     Valid modes are LOCAL
-                               REPL_ASYNC
-                               REPL_SYNC
-      -->
-      <attribute name="CacheMode">REPL_ASYNC</attribute>
-
-	  <!-- We want to activate/inactivate regions as beans are deployed -->
-      <attribute name="UseRegionBasedMarshalling">true</attribute>
-      <!-- Must match the value of "useRegionBasedMarshalling" -->
-      <attribute name="InactiveOnStartup">true</attribute>
-
-	  <!-- 
-	       JGroups protocol stack config in XML format.
-		   If your CacheMode is set to REPL_SYNC we recommend you comment
-           out the FC (flow control) protocol
-			 
-           On Windows machines, because of the media sense feature
-           being broken with multicast (even after disabling media sense)
-           set the UDP.loopback attribute to true
-	  -->     
-      <attribute name="ClusterConfig">
-         <config>
-            <UDP mcast_addr="${jgroups.udp.mcast_addr:228.1.2.3}" 
-             mcast_port="${jboss.ejb3sfsbpartition.mcast_port:45551}"
-             tos="8"
-             ucast_recv_buf_size="20000000"
-             ucast_send_buf_size="640000"
-             mcast_recv_buf_size="25000000"
-             mcast_send_buf_size="640000"
-             loopback="false"
-             discard_incompatible_packets="true"
-             max_bundle_size="64000"
-             max_bundle_timeout="30"
-             use_incoming_packet_handler="true"
-             use_outgoing_packet_handler="false"
-             ip_ttl="${jgroups.udp.ip_ttl:2}"
-             down_thread="false" up_thread="false"
-             enable_bundling="true"/>
-          <PING timeout="2000"
-             down_thread="false" up_thread="false" num_initial_members="3"/>
-          <MERGE2 max_interval="100000"
-             down_thread="false" up_thread="false" min_interval="20000"/>
-          <FD_SOCK down_thread="false" up_thread="false"/>
-          <FD timeout="10000" max_tries="5" down_thread="false" up_thread="false" shun="true"/>
-          <VERIFY_SUSPECT timeout="1500" down_thread="false" up_thread="false"/>
-          <pbcast.NAKACK max_xmit_size="60000"
-                   use_mcast_xmit="false" gc_lag="0"
-                   retransmit_timeout="300,600,1200,2400,4800"
-                   down_thread="false" up_thread="false"
-                   discard_delivered_msgs="true"/>
-          <UNICAST timeout="300,600,1200,2400,3600"
-             down_thread="false" up_thread="false"/>
-          <pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000"
-                   down_thread="false" up_thread="false"
-                   max_bytes="400000"/>
-          <pbcast.GMS print_local_addr="true" join_timeout="3000"
-                   down_thread="false" up_thread="false"
-                   join_retry_timeout="2000" shun="true"
-                   view_bundling="true"
-                   view_ack_collection_timeout="5000"/>
-          <FC max_credits="2000000" down_thread="false" up_thread="false"
-              min_threshold="0.10"/>
-          <FRAG2 frag_size="60000" down_thread="false" up_thread="false"/>
-          <pbcast.STATE_TRANSFER down_thread="false" up_thread="false" use_flush="false"/>
-        </config>
-      </attribute>
-
-      <!--    The max amount of time (in milliseconds) we wait until the
-            initial state (ie. the contents of the cache) are retrieved from
-            existing members.
-      -->
-      <attribute name="InitialStateRetrievalTimeout">17500</attribute>
-
-      <!--    Number of milliseconds to wait until all responses for a
-              synchronous call have been received.
-      -->
-      <attribute name="SyncReplTimeout">17500</attribute>
-
-      <!--  Max number of milliseconds to wait for a lock acquisition -->
-      <attribute name="LockAcquisitionTimeout">15000</attribute>
-
-      <!--  Name of the eviction policy class. -->
-      <attribute name="EvictionPolicyClass">org.jboss.cache.eviction.LRUPolicy</attribute>
-
-      <!--  Specific eviction policy configurations. -->
-      <attribute name="EvictionPolicyConfig">
-         <config>
-            <attribute name="wakeUpIntervalSeconds">5</attribute>
-            <name>statefulClustered</name>
-            <!-- So default region would never timeout -->
-            <region name="/_default_">
-               <attribute name="maxNodes">0</attribute>
-               <attribute name="timeToIdleSeconds">0</attribute>
-            </region>
-
-         </config>
-      </attribute>
-
-      <!-- Store passivated sessions to the file system -->
-      <attribute name="CacheLoaderConfiguration">
-          <config>
-              
-              <passivation>true</passivation>
-              <shared>false</shared>
-
-              <cacheloader>
-                  <class>org.jboss.cache.loader.FileCacheLoader</class>
-                  <!-- Passivate to the server data dir -->
-                  <properties>
-                       location=${jboss.server.data.dir}${/}sfsb 
-                  </properties>
-                  <async>false</async>
-                  <fetchPersistentState>true</fetchPersistentState>
-                  <ignoreModifications>false</ignoreModifications>
-              </cacheloader>
-
-          </config>
-      </attribute>
-   </mbean>
-
-</server>
-

Deleted: trunk/ejb3/src/resources/ejb3-connectors-service.xml
===================================================================
--- trunk/ejb3/src/resources/ejb3-connectors-service.xml	2008-04-29 06:44:12 UTC (rev 72855)
+++ trunk/ejb3/src/resources/ejb3-connectors-service.xml	2008-04-29 06:44:55 UTC (rev 72856)
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-   JBoss EJB3Deployer
-   
-   $Id: jboss-service.xml 41488 2006-02-25 00:14:09Z dimitris $
--->
-<server>
-
-   <mbean code="org.jboss.remoting.transport.Connector"
-          name="jboss.remoting:type=Connector,name=DefaultEjb3Connector,handler=ejb3">
-      <attribute name="InvokerLocator">socket://${jboss.bind.address}:3873</attribute>
-      <attribute name="Configuration">
-         <handlers>
-            <handler subsystem="AOP">org.jboss.aspects.remoting.AOPRemotingInvocationHandler</handler>
-         </handlers>
-      </attribute>
-   </mbean>
-
-</server>

Deleted: trunk/ejb3/src/resources/ejb3-entity-cache-beans.xml
===================================================================
--- trunk/ejb3/src/resources/ejb3-entity-cache-beans.xml	2008-04-29 06:44:12 UTC (rev 72855)
+++ trunk/ejb3/src/resources/ejb3-entity-cache-beans.xml	2008-04-29 06:44:55 UTC (rev 72856)
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
-
-   <!-- First we create a Configuration object for the cache -->
-   <bean name="EJB3EntityCacheConfig"
-   		 class="org.jboss.cache.config.Configuration">
-      
-      <!-- Externally injected services -->  
-      <property name="runtimeConfig">
-         <bean name="EJB3EntityCacheRuntimeConfig" class="org.jboss.cache.config.RuntimeConfig">
-            <property name="transactionManager"><inject bean="jboss:service=TransactionManager" property="TransactionManager"/></property>
-            <property name="muxChannelFactory"><inject bean="JChannelFactory"/></property>
-         </bean>
-      </property>
-      
-      <property name="multiplexerStack">${jboss.multiplexer.stack:udp}</property>
-
-      <property name="clusterName">${jboss.partition.name:DefaultPartition}-EntityCache</property>
-        
-      <!--
-              Node locking level : SERIALIZABLE
-                                   REPEATABLE_READ (default)
-                                   READ_COMMITTED
-                                   READ_UNCOMMITTED
-                                   NONE
-      -->
-      <property name="isolationLevelString">REPEATABLE_READ</property>
-
-      <!--     Valid modes are LOCAL
-                               REPL_ASYNC
-                               REPL_SYNC
-      -->
-      <property name="cacheModeString">REPL_SYNC</property>
-
-      <!--  The max amount of time (in milliseconds) we wait until the
-            initial state (ie. the contents of the cache) are retrieved from
-            existing members in a clustered environment
-      -->
-      <property name="stateRetrievalTimeout">15000</property>
-
-      <!--    Number of milliseconds to wait until all responses for a
-              synchronous call have been received.
-      -->
-      <property name="syncReplTimeout">20000</property>
-
-      <!--  Max number of milliseconds to wait for a lock acquisition -->
-      <property name="lockAcquisitionTimeout">15000</property>
-        
-      <property name="exposeManagementStatistics">true</property>
-      
-      <!-- Must be true if any entity deployment uses a scoped classloader -->
-      <property name="useRegionBasedMarshalling">true</property>
-      <!-- Must match the value of "useRegionBasedMarshalling" -->
-      <property name="inactiveOnStartup">true</property>
-
-      <!--  Specific eviction policy configurations. This is LRU -->
-      <property name="evictionConfig">
-      	 <bean name="EJB3EntityEvictionConfig" class="org.jboss.cache.config.EvictionConfig">
-      	    <property name="defaultEvictionPolicyClass">org.jboss.cache.eviction.LRUPolicy</property>
-            <property name="wakeupIntervalSeconds">5</property>
-            <property name="evictionRegionConfigs">
-            	<list>
-            		<!-- Default region will never timeout -->
-            		<bean name="EJB3EntityDefaultEvictionRegionConfig" class="org.jboss.cache.config.EvictionRegionConfig">
-            			<property name="regionName">/_default_</property>
-            			<property name="evictionPolicyConfig">
-            				<bean name="EJB3EntityDefaultLRUConfig" class="org.jboss.cache.eviction.LRUConfiguration">
-               					<property name="maxNodes">5000</property>
-               					<property name="timeToLiveSeconds">1000</property>
-               				</bean>
-               			</property>
-            		</bean>
-            		<!-- EJB3 integration code will programatically create other
-            		     regions as beans are deployed -->
-            	</list>
-			</property>
-         </bean>
-      </property>
-      
-   </bean>
-    
-   <!-- Now we use the above configuration to construct the cache itself -->
-   <bean name="EJB3EntityCache" class="org.jboss.cache.jmx.CacheJmxWrapper">
-      
-      <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss.cache:service=EJB3EntityTreeCache", exposedInterface=org.jboss.cache.jmx.CacheJmxWrapperMBean.class, registerDirectly=true)</annotation>
-      
-      <property name="configuration"><inject bean="EJB3EntityCacheConfig"/></property>
-          
-   </bean>
-
-</deployment>
-

Deleted: trunk/ejb3/src/resources/ejb3-entity-cache-service.xml
===================================================================
--- trunk/ejb3/src/resources/ejb3-entity-cache-service.xml	2008-04-29 06:44:12 UTC (rev 72855)
+++ trunk/ejb3/src/resources/ejb3-entity-cache-service.xml	2008-04-29 06:44:55 UTC (rev 72856)
@@ -1,123 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<server>
-
-   <!-- ============================================================ -->
-   <!-- Clustered entity cache config for use with JBoss Cache 1.4.x --> 
-   <!-- ============================================================ -->
-   <mbean code="org.jboss.cache.TreeCache" 
-         name="jboss.cache:service=EJB3EntityTreeCache">
-         
-    <depends>jboss:service=Naming</depends>
-    <depends>jboss:service=TransactionManager</depends>
-    
-    <!-- Name of cluster. Needs to be the same on all nodes in the clusters, 
-         in order to find each other -->
-    <attribute name="ClusterName">${jboss.partition.name:DefaultPartition}-EntityCache</attribute>
-        
-    <!-- Configure the TransactionManager -->
-    <attribute name="TransactionManagerLookupClass">org.jboss.cache.JBossTransactionManagerLookup</attribute>
-
-    <!--
-            Node locking level : SERIALIZABLE
-                                 REPEATABLE_READ (default)
-                                 READ_COMMITTED
-                                 READ_UNCOMMITTED
-                                 NONE
-    -->
-    <attribute name="IsolationLevel">REPEATABLE_READ</attribute>
-
-    <!--     Valid modes are LOCAL
-                             REPL_ASYNC
-                             REPL_SYNC
-    -->
-    <attribute name="CacheMode">REPL_SYNC</attribute>
-      
-      <!-- Must be true if any entity deployment uses a scoped classloader -->
-      <attribute name="UseRegionBasedMarshalling">true</attribute>
-      <!-- Must match the value of "useRegionBasedMarshalling" -->
-      <attribute name="InactiveOnStartup">true</attribute>
-
-	  <!-- 
-	        JGroups protocol stack config in XML format.
-		    
-		    On Windows machines, because of the media sense feature
-            being broken with multicast (even after disabling media sense)
-            set the UDP.loopback attribute to true
-      -->     
-      <attribute name="ClusterConfig">
-         <config>
-            <UDP mcast_addr="${jgroups.udp.mcast_addr:228.1.2.3}" 
-                 mcast_port="${jboss.ejb3entitypartition.mcast_port:43333}"
-                 tos="8"
-                 ucast_recv_buf_size="20000000"
-                 ucast_send_buf_size="640000"
-                 mcast_recv_buf_size="25000000"
-                 mcast_send_buf_size="640000"
-                 loopback="false"
-                 discard_incompatible_packets="true"
-                 max_bundle_size="64000"
-                 max_bundle_timeout="30"
-                 use_incoming_packet_handler="true"
-                 use_outgoing_packet_handler="false"
-                 ip_ttl="${jgroups.udp.ip_ttl:2}"
-                 down_thread="false" up_thread="false"
-                 enable_bundling="false"/>
-            <PING timeout="2000"
-                  down_thread="false" up_thread="false" num_initial_members="3"/>
-            <MERGE2 max_interval="100000"
-                    down_thread="false" up_thread="false" min_interval="20000"/>
-            <FD_SOCK down_thread="false" up_thread="false"/>
-            <FD timeout="10000" max_tries="5" down_thread="false" up_thread="false" shun="true"/>
-            <VERIFY_SUSPECT timeout="1500" down_thread="false" up_thread="false"/>
-            <pbcast.NAKACK max_xmit_size="60000"
-                    use_mcast_xmit="false" gc_lag="0"
-                    retransmit_timeout="300,600,1200,2400,4800"
-                    down_thread="false" up_thread="false"
-                    discard_delivered_msgs="true"/>
-            <UNICAST timeout="300,600,1200,2400,3600"
-                    down_thread="false" up_thread="false"/>
-            <pbcast.STABLE stability_delay="1000" desired_avg_gossip="50000"
-                    down_thread="false" up_thread="false"
-                    max_bytes="400000"/>
-            <pbcast.GMS print_local_addr="true" join_timeout="3000"
-                    down_thread="false" up_thread="false"
-                    join_retry_timeout="2000" shun="true"
-                    view_bundling="true"/>
-            <FRAG2 frag_size="60000" down_thread="false" up_thread="false"/>
-            <pbcast.STATE_TRANSFER down_thread="false" up_thread="false" use_flush="false"/>
-        </config>
-      </attribute>
-
-    <!--    The max amount of time (in milliseconds) we wait until the
-            initial state (ie. the contents of the cache) are retrieved from
-            existing members.
-    -->
-    <attribute name="InitialStateRetrievalTimeout">17500</attribute>
-
-    <!--    Number of milliseconds to wait until all responses for a
-            synchronous call have been received.
-    -->
-    <attribute name="SyncReplTimeout">17500</attribute>
-
-    <!--  Max number of milliseconds to wait for a lock acquisition -->
-    <attribute name="LockAcquisitionTimeout">15000</attribute>
-
-    <!--  Name of the eviction policy class. -->
-    <attribute name="EvictionPolicyClass">org.jboss.cache.eviction.LRUPolicy</attribute>
-
-    <!--  Specific eviction policy configurations. This is LRU -->
-    <attribute name="EvictionPolicyConfig">
-      <config>
-        <attribute name="wakeUpIntervalSeconds">5</attribute>
-        <!--  Cache wide default -->
-        <region name="/_default_">
-         <attribute name="maxNodes">5000</attribute>
-         <attribute name="timeToLiveSeconds">1000</attribute>
-       </region>
-      </config>
-    </attribute>
-
-  </mbean>
-
-</server>
-

Deleted: trunk/ejb3/src/resources/ejb3-interceptors-aop.xml
===================================================================
--- trunk/ejb3/src/resources/ejb3-interceptors-aop.xml	2008-04-29 06:44:12 UTC (rev 72855)
+++ trunk/ejb3/src/resources/ejb3-interceptors-aop.xml	2008-04-29 06:44:55 UTC (rev 72856)
@@ -1,473 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE aop PUBLIC
-   "-//JBoss//DTD JBOSS AOP 1.0//EN"
-   "http://labs.jboss.com/portal/jbossaop/dtd/jboss-aop_1_0.dtd">
-
-<aop>
-   <interceptor class="org.jboss.aspects.remoting.InvokeRemoteInterceptor" scope="PER_VM"/>
-   <interceptor class="org.jboss.ejb3.security.client.SecurityClientInterceptor" scope="PER_VM"/>
-   <interceptor class="org.jboss.aspects.tx.ClientTxPropagationInterceptor" scope="PER_VM"/>
-   <interceptor class="org.jboss.ejb3.remoting.IsLocalInterceptor" scope="PER_VM"/>
-   <interceptor class="org.jboss.ejb3.remoting.ClusteredIsLocalInterceptor" scope="PER_VM"/>
-   <interceptor class="org.jboss.aspects.remoting.ClusterChooserInterceptor" scope="PER_VM"/>
-
-   <interceptor class="org.jboss.aspects.tx.TxPropagationInterceptor" scope="PER_VM"/>
-
-   <stack name="ServiceClientInterceptors">
-      <interceptor-ref name="org.jboss.ejb3.remoting.IsLocalInterceptor"/>
-      <interceptor-ref name="org.jboss.ejb3.security.client.SecurityClientInterceptor"/>
-      <interceptor-ref name="org.jboss.aspects.tx.ClientTxPropagationInterceptor"/>
-      <interceptor-ref name="org.jboss.aspects.remoting.InvokeRemoteInterceptor"/>
-   </stack>
-
-   <stack name="AsynchronousStatelessSessionClientInterceptors">
-      <interceptor-ref name="org.jboss.ejb3.remoting.IsLocalInterceptor"/>
-      <interceptor-ref name="org.jboss.ejb3.security.client.SecurityClientInterceptor"/>
-      <interceptor-ref name="org.jboss.aspects.tx.ClientTxPropagationInterceptor"/>
-      <interceptor-ref name="org.jboss.aspects.remoting.InvokeRemoteInterceptor"/>
-   </stack>
-
-   <stack name="AsynchronousStatefulSessionClientInterceptors">
-      <interceptor-ref name="org.jboss.ejb3.remoting.IsLocalInterceptor"/>
-      <interceptor-ref name="org.jboss.ejb3.security.client.SecurityClientInterceptor"/>
-      <interceptor-ref name="org.jboss.aspects.tx.ClientTxPropagationInterceptor"/>
-      <interceptor-ref name="org.jboss.aspects.remoting.InvokeRemoteInterceptor"/>
-   </stack>
-
-   <stack name="StatelessSessionClientInterceptors">
-      <interceptor-ref name="org.jboss.ejb3.remoting.IsLocalInterceptor"/>
-      <interceptor-ref name="org.jboss.ejb3.security.client.SecurityClientInterceptor"/>
-      <interceptor-ref name="org.jboss.aspects.tx.ClientTxPropagationInterceptor"/>
-      <interceptor-ref name="org.jboss.aspects.remoting.InvokeRemoteInterceptor"/>
-   </stack>
-
-   <stack name="StatefulSessionClientInterceptors">
-      <interceptor-ref name="org.jboss.ejb3.remoting.IsLocalInterceptor"/>
-      <interceptor-ref name="org.jboss.ejb3.security.client.SecurityClientInterceptor"/>
-      <interceptor-ref name="org.jboss.aspects.tx.ClientTxPropagationInterceptor"/>
-      <interceptor-ref name="org.jboss.aspects.remoting.InvokeRemoteInterceptor"/>
-   </stack>
-
-   <stack name="ClusteredStatelessSessionClientInterceptors">
-      <interceptor-ref name="org.jboss.ejb3.remoting.ClusteredIsLocalInterceptor"/>
-      <interceptor-ref name="org.jboss.ejb3.security.client.SecurityClientInterceptor"/>
-      <interceptor-ref name="org.jboss.aspects.tx.ClientTxPropagationInterceptor"/>
-      <interceptor-ref name="org.jboss.aspects.remoting.ClusterChooserInterceptor"/>
-      <interceptor-ref name="org.jboss.aspects.remoting.InvokeRemoteInterceptor"/>
-   </stack>
-
-   <stack name="ClusteredStatefulSessionClientInterceptors">
-      <interceptor-ref name="org.jboss.ejb3.remoting.ClusteredIsLocalInterceptor"/>
-      <interceptor-ref name="org.jboss.ejb3.security.client.SecurityClientInterceptor"/>
-      <interceptor-ref name="org.jboss.aspects.tx.ClientTxPropagationInterceptor"/>
-      <interceptor-ref name="org.jboss.aspects.remoting.ClusterChooserInterceptor"/>
-      <interceptor-ref name="org.jboss.aspects.remoting.InvokeRemoteInterceptor"/>
-   </stack>
-
-   <interceptor class="org.jboss.aspects.currentinvocation.CurrentInvocationInterceptor" scope="PER_VM"/>
-   <interceptor class="org.jboss.ejb3.asynchronous.AsynchronousInterceptor" scope="PER_CLASS"/>
-   <interceptor class="org.jboss.ejb3.ENCPropagationInterceptor" scope="PER_VM"/>
-   <interceptor name="Basic Authorization" factory="org.jboss.ejb3.security.RoleBasedAuthorizationInterceptorFactory" scope="PER_CLASS"/>
-   <interceptor name="JACC Authorization" factory="org.jboss.ejb3.security.JaccAuthorizationInterceptorFactory" scope="PER_CLASS"/>
-   <interceptor factory="org.jboss.ejb3.security.AuthenticationInterceptorFactory" scope="PER_CLASS"/>
-   <interceptor factory="org.jboss.ejb3.security.RunAsSecurityInterceptorFactory" scope="PER_CLASS"/>
-   <interceptor class="org.jboss.ejb3.entity.ExtendedPersistenceContextPropagationInterceptor" scope="PER_VM"/>
-   <interceptor class="org.jboss.ejb3.stateless.StatelessInstanceInterceptor" scope="PER_VM"/>
-   <interceptor class="org.jboss.ejb3.stateful.StatefulInstanceInterceptor" scope="PER_VM"/>
-   <interceptor class="org.jboss.ejb3.stateful.SessionSynchronizationInterceptor" scope="PER_VM"/>
-   <interceptor class="org.jboss.ejb3.service.ServiceSingletonInterceptor" scope="PER_VM"/>
-   <interceptor class="org.jboss.ejb3.cache.StatefulReplicationInterceptor" scope="PER_VM"/>
-   <interceptor factory="org.jboss.ejb3.stateful.StatefulRemoveFactory" scope="PER_CLASS_JOINPOINT"/>
-   <interceptor factory="org.jboss.ejb3.tx.BMTTxInterceptorFactory" scope="PER_CLASS_JOINPOINT"/>
-   <interceptor factory="org.jboss.ejb3.tx.CMTTxInterceptorFactory" scope="PER_CLASS_JOINPOINT"/>
-   <!-- interceptor factory="org.jboss.ejb3.interceptor.EJB3InterceptorsFactory" scope="PER_CLASS_JOINPOINT"/ -->
-   <interceptor factory="org.jboss.ejb3.remoting.ReplicantsManagerInterceptorFactory" scope="PER_CLASS"/>
-   <interceptor class="org.jboss.ejb3.AllowedOperationsInterceptor" scope="PER_VM"/>
-   <interceptor factory="org.jboss.ejb3.mdb.CurrentMessageInjectorInterceptorFactory" scope="PER_CLASS"/>
-   <interceptor class="org.jboss.ejb3.entity.TransactionScopedEntityManagerInterceptor" scope="PER_VM"/>
-
-   <!--
-         INTERCEPTORS
-     -->
-   
-   <aspect name="InjectInterceptorsFactory" factory="org.jboss.ejb3.interceptors.aop.InjectInterceptorsFactory" scope="PER_JOINPOINT"/>
-   <aspect name="InterceptorsFactory" factory="org.jboss.ejb3.interceptors.aop.InterceptorsFactory" scope="PER_INSTANCE"/>
-   <aspect name="InvocationContextInterceptor" class="org.jboss.ejb3.interceptors.aop.InvocationContextInterceptor" scope="PER_VM"/>
-
-   <!-- TODO: this is actually the bootstrap container -->
-   <domain name="Intercepted Bean">
-      <pointcut name="beanAroundInvokeCallbackMethods" expr="execution(* @org.jboss.ejb3.interceptors.ManagedObject->@javax.interceptor.AroundInvoke(..))"/>
-      <pointcut name="beanPostConstructCallbackMethods" expr="execution(* @org.jboss.ejb3.interceptors.ManagedObject->@javax.interceptor.PostConstruct(..))"/>
-      <pointcut name="beanPreDestroyCallbackMethods" expr="execution(* @org.jboss.ejb3.interceptors.ManagedObject->@javax.interceptor.PreDestroy(..))"/>
-      
-      <pointcut name="beanLifecycleCallbackMethods" expr="beanAroundInvokeCallbackMethods OR beanPostConstructCallbackMethods OR beanPreDestroyCallbackMethods"/>
-      
-      <!-- Prepare for dynamic AOP -->
-      <!-- TODO: optimize, we only need managed objects (and interceptors!) to be aspectized -->
-      <!-- prepare expr="all(*) AND has(@org.jboss.ejb3.interceptors.ManagedObject->new(..))"/ -->
-      <!-- TODO: let's see if we can do without 
-      <prepare expr="all(*)"/>
-      -->
-      
-      <!-- Setup AOP interceptors based on spec interceptors -->
-      <bind pointcut="construction(@org.jboss.ejb3.interceptors.ManagedObject->new(..))">
-         <!-- interceptor-ref name="LoggingInterceptor"/ -->
-         <!-- TODO: we don't need invocation context here -->
-         <!-- TODO: we do until we've seperated the post constructs -->
-         <advice name="setup" aspect="InvocationContextInterceptor"/>
-         <advice name="invoke" aspect="InterceptorsFactory"/>
-      </bind>
-      
-      <!-- Lifecycle Event Callbacks (EJB 3 12.4) -->
-      
-      <!-- TODO: for now handled in EJBContainer.invokePostConstruct until injection is refactored 
-      <bind pointcut="construction(@org.jboss.ejb3.interceptors.ManagedObject->new(..))">
-         <advice name="setup" aspect="InvocationContextInterceptor"/>
-         <advice name="postConstruct" aspect="InjectInterceptorsFactory"/>
-      </bind>
-      -->
-      
-      <!-- this is the usual way, now we move it into the other domains, because the
-           invocation of EJB interceptors must be the last in the chain 
-      <bind pointcut="execution(* @org.jboss.ejb3.interceptors.ManagedObject->*(..)) AND !beanLifecycleCallbackMethods">
-         <advice name="setup" aspect="InvocationContextInterceptor"/>
-         <advice name="fillMethod" aspect="InvocationContextInterceptor"/>
-         <advice name="aroundInvoke" aspect="InjectInterceptorsFactory"/>
-      </bind>
-      -->
-      <stack name="EJBInterceptors">
-         <advice name="setup" aspect="InvocationContextInterceptor"/>
-         <advice name="fillMethod" aspect="InvocationContextInterceptor"/>
-         <advice name="aroundInvoke" aspect="InjectInterceptorsFactory"/>
-      </stack>
-      
-      <bind pointcut="execution(public * *->*(..))">
-         <interceptor-ref name="org.jboss.aspects.currentinvocation.CurrentInvocationInterceptor"/>
-      </bind>
-   </domain>
-   
-   
-   
-   <domain name="Stateless Bean" extends="Intercepted Bean" inheritBindings="true">
-      <bind pointcut="execution(public * *->*(..))">
-         <interceptor-ref name="org.jboss.ejb3.asynchronous.AsynchronousInterceptor"/>
-         <interceptor-ref name="org.jboss.ejb3.ENCPropagationInterceptor"/>
-         <interceptor-ref name="org.jboss.ejb3.security.AuthenticationInterceptorFactory"/>
-      </bind>
-      <bind pointcut="execution(public * @org.jboss.ejb3.annotation.SecurityDomain->*(..))">
-         <interceptor-ref name="Basic Authorization"/>
-      </bind>
-      <bind pointcut="execution(public * *->*(..))">
-         <interceptor-ref name="org.jboss.ejb3.security.RunAsSecurityInterceptorFactory"/>
-      </bind>
-      <bind pointcut="execution(public * @org.jboss.ejb3.annotation.Clustered->*(..))">
-         <interceptor-ref name="org.jboss.ejb3.remoting.ReplicantsManagerInterceptorFactory"/>
-      </bind>
-      <bind pointcut="execution(public * *->*(..))">
-         <interceptor-ref name="org.jboss.aspects.tx.TxPropagationInterceptor"/>
-         <interceptor-ref name="org.jboss.ejb3.tx.CMTTxInterceptorFactory"/>
-         <interceptor-ref name="org.jboss.ejb3.stateless.StatelessInstanceInterceptor"/>
-         <interceptor-ref name="org.jboss.ejb3.tx.BMTTxInterceptorFactory"/>
-         <interceptor-ref name="org.jboss.ejb3.AllowedOperationsInterceptor"/>
-         <interceptor-ref name="org.jboss.ejb3.entity.TransactionScopedEntityManagerInterceptor"/>
-         <!-- interceptor-ref name="org.jboss.ejb3.interceptor.EJB3InterceptorsFactory"/ -->
-         <stack-ref name="EJBInterceptors"/>
-      </bind>
-      <annotation expr="!class(@org.jboss.ejb3.annotation.Pool)">
-         @org.jboss.ejb3.annotation.Pool (value="ThreadlocalPool", maxSize=30, timeout=10000)
-      </annotation>
-      <annotation expr="!class(@org.jboss.ejb3.annotation.JndiBindingPolicy)">
-         @org.jboss.ejb3.annotation.JndiBindingPolicy (policy=org.jboss.ejb3.jndipolicy.impl.PackagingBasedJndiBindingPolicy.class)
-      </annotation>
-   </domain>
-
-   <domain name="JACC Stateless Bean" extends="Intercepted Bean" inheritBindings="true">
-      <bind pointcut="execution(public * *->*(..))">
-         <interceptor-ref name="org.jboss.ejb3.asynchronous.AsynchronousInterceptor"/>
-         <interceptor-ref name="org.jboss.ejb3.ENCPropagationInterceptor"/>
-         <interceptor-ref name="org.jboss.ejb3.security.AuthenticationInterceptorFactory"/>
-      </bind>
-      <bind pointcut="execution(public * @org.jboss.ejb3.annotation.SecurityDomain->*(..))">
-         <interceptor-ref name="JACC Authorization"/>
-      </bind>
-      <bind pointcut="execution(public * *->*(..))">
-         <interceptor-ref name="org.jboss.ejb3.security.RunAsSecurityInterceptorFactory"/>
-      </bind>
-      <bind pointcut="execution(public * @org.jboss.ejb3.annotation.Clustered->*(..))">
-         <interceptor-ref name="org.jboss.ejb3.remoting.ReplicantsManagerInterceptorFactory"/>
-      </bind>
-      <bind pointcut="execution(public * *->*(..))">
-         <interceptor-ref name="org.jboss.aspects.tx.TxPropagationInterceptor"/>
-         <interceptor-ref name="org.jboss.ejb3.tx.CMTTxInterceptorFactory"/>
-         <interceptor-ref name="org.jboss.ejb3.stateless.StatelessInstanceInterceptor"/>
-         <interceptor-ref name="org.jboss.ejb3.tx.BMTTxInterceptorFactory"/>
-         <interceptor-ref name="org.jboss.ejb3.AllowedOperationsInterceptor"/>
-         <interceptor-ref name="org.jboss.ejb3.entity.TransactionScopedEntityManagerInterceptor"/>
-         <!-- interceptor-ref name="org.jboss.ejb3.interceptor.EJB3InterceptorsFactory"/ -->
-         <stack-ref name="EJBInterceptors"/>
-      </bind>
-      <annotation expr="!class(@org.jboss.ejb3.annotation.Pool)">
-         @org.jboss.ejb3.annotation.Pool (value="ThreadlocalPool", maxSize=30, timeout=10000)
-      </annotation>
-      <annotation expr="!class(@org.jboss.ejb3.annotation.JndiBindingPolicy)">
-         @org.jboss.ejb3.annotation.JndiBindingPolicy (policy=org.jboss.ejb3.jndipolicy.impl.PackagingBasedJndiBindingPolicy.class)
-      </annotation>
-   </domain>
-
-   <domain name="Base Stateful Bean" extends="Intercepted Bean" inheritBindings="true">
-      <bind pointcut="execution(public * *->*(..))">
-         <interceptor-ref name="org.jboss.ejb3.asynchronous.AsynchronousInterceptor"/>
-         <interceptor-ref name="org.jboss.ejb3.ENCPropagationInterceptor"/>
-         <interceptor-ref name="org.jboss.ejb3.security.AuthenticationInterceptorFactory"/>
-      </bind>
-      <bind pointcut="execution(public * @org.jboss.ejb3.annotation.SecurityDomain->*(..))">
-         <interceptor-ref name="Basic Authorization"/>
-      </bind>
-      <bind pointcut="execution(public * *->*(..))">
-         <interceptor-ref name="org.jboss.ejb3.security.RunAsSecurityInterceptorFactory"/>
-      </bind>
-      <bind pointcut="execution(public * @org.jboss.ejb3.annotation.Clustered->*(..))">
-         <interceptor-ref name="org.jboss.ejb3.remoting.ReplicantsManagerInterceptorFactory"/>
-      </bind>
-      <bind pointcut="execution(public * *->@javax.ejb.Remove(..))">
-         <interceptor-ref name="org.jboss.ejb3.stateful.StatefulRemoveFactory"/>
-      </bind>
-      <bind pointcut="execution(public * *->*(..))">
-         <interceptor-ref name="org.jboss.aspects.tx.TxPropagationInterceptor"/>
-         <interceptor-ref name="org.jboss.ejb3.tx.CMTTxInterceptorFactory"/>
-         <interceptor-ref name="org.jboss.ejb3.stateful.StatefulInstanceInterceptor"/>
-         <interceptor-ref name="org.jboss.ejb3.tx.BMTTxInterceptorFactory"/>
-         <interceptor-ref name="org.jboss.ejb3.AllowedOperationsInterceptor"/>
-      </bind>
-      <bind pointcut="execution(public * $instanceof{javax.ejb.SessionSynchronization}->*(..))">
-         <interceptor-ref name="org.jboss.ejb3.stateful.SessionSynchronizationInterceptor"/>
-      </bind>
-      <bind pointcut="execution(public * *->*(..))">
-         <interceptor-ref name="org.jboss.ejb3.entity.TransactionScopedEntityManagerInterceptor"/>
-         <interceptor-ref name="org.jboss.ejb3.entity.ExtendedPersistenceContextPropagationInterceptor"/>
-      </bind>
-
-      <bind pointcut="execution(public * @org.jboss.ejb3.annotation.Clustered->*(..)) AND !execution(public * *->@javax.ejb.Remove(..))">
-         <interceptor-ref name="org.jboss.ejb3.cache.StatefulReplicationInterceptor"/>
-      </bind>
-
-      <bind pointcut="execution(public * *->*(..))">
-         <!-- interceptor-ref name="org.jboss.ejb3.interceptor.EJB3InterceptorsFactory"/ -->
-         <stack-ref name="EJBInterceptors"/>
-      </bind>
-
-      <annotation expr="!class(@org.jboss.ejb3.annotation.Pool)">
-         @org.jboss.ejb3.annotation.Pool (value="ThreadlocalPool", maxSize=30, timeout=10000)
-      </annotation>
-      <annotation expr="!class(@org.jboss.ejb3.annotation.JndiBindingPolicy)">
-         @org.jboss.ejb3.annotation.JndiBindingPolicy (policy=org.jboss.ejb3.jndipolicy.impl.PackagingBasedJndiBindingPolicy.class)
-      </annotation>
-   </domain>
-
-   <domain name="Stateful Bean" extends="Base Stateful Bean" inheritBindings="true">
-      <!-- NON Clustered cache configuration -->
-      <annotation expr="!class(@org.jboss.ejb3.annotation.Cache) AND !class(@org.jboss.ejb3.annotation.Clustered)">
-         @org.jboss.ejb3.annotation.Cache ("SimpleStatefulCache")
-      </annotation>
-      <annotation expr="!class(@org.jboss.ejb3.annotation.PersistenceManager) AND !class(@org.jboss.ejb3.annotation.Clustered)">
-         @org.jboss.ejb3.annotation.PersistenceManager ("StatefulSessionFilePersistenceManager")
-      </annotation>
-      <annotation expr="!class(@org.jboss.ejb3.annotation.CacheConfig) AND !class(@org.jboss.ejb3.annotation.Clustered)">
-         @org.jboss.ejb3.annotation.CacheConfig (maxSize=100000, idleTimeoutSeconds=300, removalTimeoutSeconds=0)
-      </annotation>
-
-      <!-- Clustered cache configuration -->
-      <annotation expr="!class(@org.jboss.ejb3.annotation.Cache) AND class(@org.jboss.ejb3.annotation.Clustered)">
-         @org.jboss.ejb3.annotation.Cache ("StatefulTreeCache")
-      </annotation>
-      <annotation expr="!class(@org.jboss.ejb3.annotation.CacheConfig) AND class(@org.jboss.ejb3.annotation.Clustered)">
-         @org.jboss.ejb3.annotation.CacheConfig (name="jboss.cache:service=EJB3SFSBClusteredCache", maxSize=100000, idleTimeoutSeconds=300, removalTimeoutSeconds=0)
-      </annotation>
-   </domain>
-
-   <domain name="JACC Stateful Bean" extends="Intercepted Bean" inheritBindings="true">
-      <bind pointcut="execution(public * *->*(..))">
-         <interceptor-ref name="org.jboss.ejb3.asynchronous.AsynchronousInterceptor"/>
-         <interceptor-ref name="org.jboss.ejb3.ENCPropagationInterceptor"/>
-         <interceptor-ref name="org.jboss.ejb3.security.AuthenticationInterceptorFactory"/>
-      </bind>
-      <bind pointcut="execution(public * @org.jboss.ejb3.annotation.SecurityDomain->*(..))">
-         <interceptor-ref name="JACC Authorization"/>
-      </bind>
-      <bind pointcut="execution(public * *->*(..))">
-         <interceptor-ref name="org.jboss.ejb3.security.RunAsSecurityInterceptorFactory"/>
-      </bind>
-      <bind pointcut="execution(public * @org.jboss.ejb3.annotation.Clustered->*(..))">
-         <interceptor-ref name="org.jboss.ejb3.remoting.ReplicantsManagerInterceptorFactory"/>
-      </bind>
-      <bind pointcut="execution(public * *->@javax.ejb.Remove(..))">
-         <interceptor-ref name="org.jboss.ejb3.stateful.StatefulRemoveFactory"/>
-      </bind>
-      <bind pointcut="execution(public * *->*(..))">
-         <interceptor-ref name="org.jboss.aspects.tx.TxPropagationInterceptor"/>
-         <interceptor-ref name="org.jboss.ejb3.tx.CMTTxInterceptorFactory"/>
-         <interceptor-ref name="org.jboss.ejb3.stateful.StatefulInstanceInterceptor"/>
-         <interceptor-ref name="org.jboss.ejb3.tx.BMTTxInterceptorFactory"/>
-         <interceptor-ref name="org.jboss.ejb3.AllowedOperationsInterceptor"/>
-      </bind>
-      <bind pointcut="execution(public * $instanceof{javax.ejb.SessionSynchronization}->*(..))">
-         <interceptor-ref name="org.jboss.ejb3.stateful.SessionSynchronizationInterceptor"/>
-      </bind>
-      <bind pointcut="execution(public * *->*(..))">
-         <interceptor-ref name="org.jboss.ejb3.entity.TransactionScopedEntityManagerInterceptor"/>
-         <interceptor-ref name="org.jboss.ejb3.entity.ExtendedPersistenceContextPropagationInterceptor"/>
-         <!-- interceptor-ref name="org.jboss.ejb3.interceptor.EJB3InterceptorsFactory"/ -->
-         <stack-ref name="EJBInterceptors"/>
-      </bind>
-
-      <bind pointcut="execution(public * @org.jboss.ejb3.annotation.Clustered->*(..)) AND !execution(public * *->@javax.ejb.Remove(..))">
-         <interceptor-ref name="org.jboss.ejb3.cache.StatefulReplicationInterceptor"/>
-      </bind>
-      <annotation expr="!class(@org.jboss.ejb3.annotation.Pool)">
-         @org.jboss.ejb3.annotation.Pool (value="ThreadlocalPool", maxSize=30, timeout=10000)
-      </annotation>
-      <annotation expr="!class(@org.jboss.ejb3.annotation.JndiBindingPolicy)">
-         @org.jboss.ejb3.annotation.JndiBindingPolicy (policy=org.jboss.ejb3.jndipolicy.impl.PackagingBasedJndiBindingPolicy.class)
-      </annotation>
-
-      <!-- NON Clustered cache configuration -->
-      <annotation expr="!class(@org.jboss.ejb3.annotation.Cache) AND !class(@org.jboss.ejb3.annotation.Clustered)">
-         @org.jboss.ejb3.annotation.Cache ("SimpleStatefulCache")
-      </annotation>
-      <annotation expr="!class(@org.jboss.ejb3.annotation.PersistenceManager) AND !class(@org.jboss.ejb3.annotation.Clustered)">
-         @org.jboss.ejb3.annotation.PersistenceManager ("StatefulSessionFilePersistenceManager")
-      </annotation>
-      <annotation expr="!class(@org.jboss.ejb3.annotation.CacheConfig) AND !class(@org.jboss.ejb3.annotation.Clustered)">
-         @org.jboss.ejb3.annotation.CacheConfig (maxSize=100000, idleTimeoutSeconds=300, removalTimeoutSeconds=0)
-      </annotation>
-
-      <!-- Clustered cache configuration -->
-      <annotation expr="!class(@org.jboss.ejb3.annotation.Cache) AND class(@org.jboss.ejb3.annotation.Clustered)">
-         @org.jboss.ejb3.annotation.Cache ("StatefulTreeCache")
-      </annotation>
-      <annotation expr="!class(@org.jboss.ejb3.annotation.CacheConfig) AND class(@org.jboss.ejb3.annotation.Clustered)">
-         @org.jboss.ejb3.annotation.CacheConfig (name="jboss.cache:service=EJB3SFSBClusteredCache", maxSize=100000, idleTimeoutSeconds=300, removalTimeoutSeconds=0)
-      </annotation>
-   </domain>
-
-   <domain name="Embedded Stateful Bean" extends="Base Stateful Bean" inheritBindings="true">
-      <!-- NON Clustered cache configuration -->
-      <annotation expr="!class(@org.jboss.ejb3.annotation.Cache)">
-         @org.jboss.ejb3.annotation.Cache ("NoPassivationCache")
-      </annotation>
-      <annotation expr="!class(@org.jboss.ejb3.annotation.JndiBindingPolicy)">
-         @org.jboss.ejb3.annotation.JndiBindingPolicy (policy=org.jboss.ejb3.jndipolicy.impl.PackagingBasedJndiBindingPolicy.class)
-      </annotation>
-
-   </domain>
-
-   <domain name="Message Driven Bean" extends="Intercepted Bean" inheritBindings="true">
-      <bind pointcut="execution(public * *->*(..))">
-         <interceptor-ref name="org.jboss.ejb3.security.AuthenticationInterceptorFactory"/>
-         <interceptor-ref name="org.jboss.ejb3.security.RunAsSecurityInterceptorFactory"/>
-      </bind>
-      <!-- TODO: Authorization? -->
-      <bind pointcut="execution(public * *->*(..))">
-         <interceptor-ref name="org.jboss.ejb3.tx.CMTTxInterceptorFactory"/>
-         <interceptor-ref name="org.jboss.ejb3.stateless.StatelessInstanceInterceptor"/>
-         <interceptor-ref name="org.jboss.ejb3.tx.BMTTxInterceptorFactory"/>
-         <interceptor-ref name="org.jboss.ejb3.AllowedOperationsInterceptor"/>
-         <interceptor-ref name="org.jboss.ejb3.entity.TransactionScopedEntityManagerInterceptor"/>
-         <!-- interceptor-ref name="org.jboss.ejb3.interceptor.EJB3InterceptorsFactory"/ -->
-         <stack-ref name="EJBInterceptors"/>
-      </bind>
-      <annotation expr="!class(@org.jboss.ejb3.annotation.Pool)">
-         @org.jboss.ejb3.annotation.Pool (value="StrictMaxPool", maxSize=15, timeout=10000)
-      </annotation>
-      <annotation expr="!class(@org.jboss.ejb3.annotation.JndiBindingPolicy)">
-         @org.jboss.ejb3.annotation.JndiBindingPolicy (policy=org.jboss.ejb3.jndipolicy.impl.PackagingBasedJndiBindingPolicy.class)
-      </annotation>
-   </domain>
-
-   <domain name="Consumer Bean" extends="Intercepted Bean" inheritBindings="true">
-      <bind pointcut="execution(public * *->*(..))">
-         <interceptor-ref name="org.jboss.ejb3.security.RunAsSecurityInterceptorFactory"/>
-      </bind>
-      <bind pointcut="execution(public * *->*(..))">
-         <interceptor-ref name="org.jboss.ejb3.tx.CMTTxInterceptorFactory"/>
-         <interceptor-ref name="org.jboss.ejb3.stateless.StatelessInstanceInterceptor"/>
-         <interceptor-ref name="org.jboss.ejb3.tx.BMTTxInterceptorFactory"/>
-         <interceptor-ref name="org.jboss.ejb3.AllowedOperationsInterceptor"/>
-         <interceptor-ref name="org.jboss.ejb3.entity.TransactionScopedEntityManagerInterceptor"/>
-      </bind>
-      <bind pointcut="execution(public * *->*(..)) AND (has(* *->@org.jboss.ejb3.annotation.CurrentMessage(..)) OR hasfield(* *->@org.jboss.ejb3.annotation.CurrentMessage))">
-         <interceptor-ref name="org.jboss.ejb3.mdb.CurrentMessageInjectorInterceptorFactory"/>
-      </bind>
-      <bind pointcut="execution(public * *->*(..))">
-         <!-- interceptor-ref name="org.jboss.ejb3.interceptor.EJB3InterceptorsFactory"/ -->
-         <stack-ref name="EJBInterceptors"/>
-      </bind>
-      <annotation expr="!class(@org.jboss.ejb3.annotation.Pool)">
-         @org.jboss.ejb3.annotation.Pool (value="StrictMaxPool", maxSize=15, timeout=10000)
-      </annotation>
-      <annotation expr="!class(@org.jboss.ejb3.annotation.JndiBindingPolicy)">
-         @org.jboss.ejb3.annotation.JndiBindingPolicy (policy=org.jboss.ejb3.jndipolicy.impl.PackagingBasedJndiBindingPolicy.class)
-      </annotation>
-   </domain>
-
-   <domain name="Service Bean" extends="Intercepted Bean" inheritBindings="true">
-      <bind pointcut="execution(public * *->*(..))">
-         <interceptor-ref name="org.jboss.ejb3.asynchronous.AsynchronousInterceptor"/>
-         <interceptor-ref name="org.jboss.ejb3.ENCPropagationInterceptor"/>
-      </bind>
-      <bind pointcut="!execution(* *->create()) AND !execution(* *->start()) AND !execution(*->new(..))">
-         <interceptor-ref name="org.jboss.ejb3.security.AuthenticationInterceptorFactory"/>
-      </bind>
-      <bind pointcut="execution(public * @org.jboss.ejb3.annotation.SecurityDomain->*(..))">
-         <interceptor-ref name="Basic Authorization"/>
-      </bind>
-      <bind pointcut="execution(public * *->*(..))">
-         <interceptor-ref name="org.jboss.ejb3.security.RunAsSecurityInterceptorFactory"/>
-      </bind>
-      <bind pointcut="execution(public * *->*(..))">
-         <interceptor-ref name="org.jboss.aspects.tx.TxPropagationInterceptor"/>
-         <interceptor-ref name="org.jboss.ejb3.tx.CMTTxInterceptorFactory"/>
-         <interceptor-ref name="org.jboss.ejb3.tx.BMTTxInterceptorFactory"/>
-         <interceptor-ref name="org.jboss.ejb3.AllowedOperationsInterceptor"/>
-         <interceptor-ref name="org.jboss.ejb3.entity.TransactionScopedEntityManagerInterceptor"/>
-      </bind>
-      <bind pointcut="execution(public * *->*(..)) AND !execution(* *->create()) AND !execution(* *->start())">
-         <!-- interceptor-ref name="org.jboss.ejb3.interceptor.EJB3InterceptorsFactory"/ -->
-         <stack-ref name="EJBInterceptors"/>
-      </bind>
-      <annotation expr="!class(@org.jboss.ejb3.annotation.JndiBindingPolicy)">
-         @org.jboss.ejb3.annotation.JndiBindingPolicy (policy=org.jboss.ejb3.jndipolicy.impl.PackagingBasedJndiBindingPolicy.class)
-      </annotation>
-   </domain>
-
-   <domain name="JACC Service Bean" extends="Intercepted Bean" inheritBindings="true">
-      <bind pointcut="execution(public * *->*(..))">
-         <interceptor-ref name="org.jboss.ejb3.asynchronous.AsynchronousInterceptor"/>
-         <interceptor-ref name="org.jboss.ejb3.ENCPropagationInterceptor"/>
-      </bind>
-      <bind pointcut="!execution(* *->create()) AND !execution(* *->start()) AND !execution(*->new(..))">
-         <interceptor-ref name="org.jboss.ejb3.security.AuthenticationInterceptorFactory"/>
-      </bind>
-      <bind pointcut="execution(public * @org.jboss.ejb3.annotation.SecurityDomain->*(..))">
-         <interceptor-ref name="Basic Authorization"/>
-      </bind>
-      <bind pointcut="execution(public * *->*(..))">
-         <interceptor-ref name="org.jboss.ejb3.security.RunAsSecurityInterceptorFactory"/>
-      </bind>
-      <bind pointcut="execution(public * *->*(..))">
-         <interceptor-ref name="org.jboss.aspects.tx.TxPropagationInterceptor"/>
-         <interceptor-ref name="org.jboss.ejb3.tx.CMTTxInterceptorFactory"/>
-         <interceptor-ref name="org.jboss.ejb3.tx.BMTTxInterceptorFactory"/>
-         <interceptor-ref name="org.jboss.ejb3.AllowedOperationsInterceptor"/>
-         <interceptor-ref name="org.jboss.ejb3.entity.TransactionScopedEntityManagerInterceptor"/>
-      </bind>
-      <bind pointcut="execution(public * *->*(..)) AND !execution(* *->create()) AND !execution(* *->start())">
-         <!-- interceptor-ref name="org.jboss.ejb3.interceptor.EJB3InterceptorsFactory"/ -->
-         <stack-ref name="EJBInterceptors"/>
-      </bind>
-      <annotation expr="!class(@org.jboss.ejb3.annotation.JndiBindingPolicy)">
-         @org.jboss.ejb3.annotation.JndiBindingPolicy (policy=org.jboss.ejb3.jndipolicy.impl.PackagingBasedJndiBindingPolicy.class)
-      </annotation>
-   </domain>
-
-</aop>
\ No newline at end of file

Deleted: trunk/ejb3/src/resources/ejb3-timer-service.xml
===================================================================
--- trunk/ejb3/src/resources/ejb3-timer-service.xml	2008-04-29 06:44:12 UTC (rev 72855)
+++ trunk/ejb3/src/resources/ejb3-timer-service.xml	2008-04-29 06:44:55 UTC (rev 72856)
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<server>
-	<!-- TODO: the ejb deployer must depend on this -->
-	
-	<!--  ================================================ -->
-	<!--  Defines the Quartz configuration for             -->
-	<!--  the EJB3 Timer Service                           -->
-	<!--  ================================================ -->
-	<mbean code="org.jboss.ejb3.timerservice.quartz.jmx.EJB3TimerService" name="jboss.ejb:service=EJB3TimerService">
-		<depends>jboss:service=Naming</depends>
-		<depends>jboss:service=TransactionManager</depends>
-		<depends optional-attribute-name="DataSource">jboss.jca:service=DataSourceBinding,name=DefaultDS</depends>
-		
-		<attribute name="Properties">
-        	org.quartz.jobStore.class=org.quartz.impl.jdbcjobstore.JobStoreCMT
-            org.quartz.jobStore.nonManagedTXDataSource=myDS
-            org.quartz.jobStore.driverDelegateClass=org.quartz.impl.jdbcjobstore.HSQLDBDelegate
-            org.quartz.jobStore.tablePrefix=QRTZ_
-            org.quartz.jobStore.dataSource=myDS
-         
-	        # To get it to work with hypersonic
-	        # FIXME: this doesn't lock the row
-            org.quartz.jobStore.selectWithLockSQL=SELECT * FROM qrtz_locks WHERE lock_name = ?
-         
-        	# from quartz.properties
-            org.quartz.scheduler.instanceName=JBossEJB3QuartzScheduler
-            org.quartz.scheduler.rmi.export=false
-            org.quartz.scheduler.rmi.proxy=false
-            org.quartz.scheduler.wrapJobExecutionInUserTransaction=false
-   
-            org.quartz.threadPool.class=org.quartz.simpl.SimpleThreadPool
-            org.quartz.threadPool.threadCount=10
-            org.quartz.threadPool.threadPriority=5
-            org.quartz.threadPool.threadsInheritContextClassLoaderOfInitializingThread=true
-   
-        	org.quartz.jobStore.misfireThreshold=60000
-		</attribute>
-		<attribute name="SqlProperties">
-			CREATE_DB_ON_STARTUP = TRUE
-			
-			CREATE_TABLE_JOB_DETAILS = CREATE TABLE qrtz_job_details(JOB_NAME VARCHAR(80) NOT NULL, JOB_GROUP VARCHAR(80) NOT NULL, \
-			   DESCRIPTION VARCHAR(120) NULL, JOB_CLASS_NAME VARCHAR(128) NOT NULL, IS_DURABLE VARCHAR(1) NOT NULL, \
-			   IS_VOLATILE VARCHAR(1) NOT NULL, IS_STATEFUL VARCHAR(1) NOT NULL, REQUESTS_RECOVERY VARCHAR(1) NOT NULL, \
-			   JOB_DATA BINARY NULL, PRIMARY KEY (JOB_NAME,JOB_GROUP))
-			CREATE_TABLE_JOB_LISTENERS = CREATE TABLE qrtz_job_listeners(JOB_NAME VARCHAR(80) NOT NULL, JOB_GROUP VARCHAR(80) NOT NULL, \
-			   JOB_LISTENER VARCHAR(80) NOT NULL, PRIMARY KEY (JOB_NAME,JOB_GROUP,JOB_LISTENER), FOREIGN KEY (JOB_NAME,JOB_GROUP) \
-			   REFERENCES QRTZ_JOB_DETAILS(JOB_NAME,JOB_GROUP))
-			CREATE_TABLE_TRIGGERS = CREATE TABLE qrtz_triggers(TRIGGER_NAME VARCHAR(80) NOT NULL, TRIGGER_GROUP VARCHAR(80) NOT NULL, \
-			   JOB_NAME VARCHAR(80) NOT NULL, JOB_GROUP VARCHAR(80) NOT NULL, IS_VOLATILE VARCHAR(1) NOT NULL, DESCRIPTION VARCHAR(120) NULL, \
-			   NEXT_FIRE_TIME NUMERIC(13) NULL, PREV_FIRE_TIME NUMERIC(13) NULL, TRIGGER_STATE VARCHAR(16) NOT NULL, \
-			   TRIGGER_TYPE VARCHAR(8) NOT NULL, START_TIME NUMERIC(13) NOT NULL, END_TIME NUMERIC(13) NULL, CALENDAR_NAME VARCHAR(80) NULL, \
-			   MISFIRE_INSTR NUMERIC(2) NULL, JOB_DATA BINARY NULL, PRIMARY KEY (TRIGGER_NAME,TRIGGER_GROUP), FOREIGN KEY (JOB_NAME,JOB_GROUP) \
-			   REFERENCES QRTZ_JOB_DETAILS(JOB_NAME,JOB_GROUP))
-			CREATE_TABLE_SIMPLE_TRIGGERS = CREATE TABLE qrtz_simple_triggers(TRIGGER_NAME VARCHAR(80) NOT NULL, \
-			   TRIGGER_GROUP VARCHAR(80) NOT NULL, REPEAT_COUNT NUMERIC(7) NOT NULL, REPEAT_INTERVAL NUMERIC(12) NOT NULL, \
-			   TIMES_TRIGGERED NUMERIC(7) NOT NULL, PRIMARY KEY (TRIGGER_NAME,TRIGGER_GROUP), FOREIGN KEY (TRIGGER_NAME,TRIGGER_GROUP) \
-			   REFERENCES QRTZ_TRIGGERS(TRIGGER_NAME,TRIGGER_GROUP))
-			CREATE_TABLE_CRON_TRIGGERS = CREATE TABLE qrtz_cron_triggers(TRIGGER_NAME VARCHAR(80) NOT NULL, \
-			   TRIGGER_GROUP VARCHAR(80) NOT NULL, CRON_EXPRESSION VARCHAR(80) NOT NULL, TIME_ZONE_ID VARCHAR(80), \
-			   PRIMARY KEY (TRIGGER_NAME,TRIGGER_GROUP), FOREIGN KEY (TRIGGER_NAME,TRIGGER_GROUP) \
-			   REFERENCES QRTZ_TRIGGERS(TRIGGER_NAME,TRIGGER_GROUP))
-			CREATE_TABLE_BLOB_TRIGGERS = CREATE TABLE qrtz_blob_triggers(TRIGGER_NAME VARCHAR(80) NOT NULL, \
-			   TRIGGER_GROUP VARCHAR(80) NOT NULL, BLOB_DATA BINARY NULL, PRIMARY KEY (TRIGGER_NAME,TRIGGER_GROUP), \
-			   FOREIGN KEY (TRIGGER_NAME,TRIGGER_GROUP) REFERENCES QRTZ_TRIGGERS(TRIGGER_NAME,TRIGGER_GROUP))
-			CREATE_TABLE_TRIGGER_LISTENERS = CREATE TABLE qrtz_trigger_listeners(TRIGGER_NAME VARCHAR(80) NOT NULL, \
-			   TRIGGER_GROUP VARCHAR(80) NOT NULL, TRIGGER_LISTENER VARCHAR(80) NOT NULL, \
-			   PRIMARY KEY (TRIGGER_NAME,TRIGGER_GROUP,TRIGGER_LISTENER), FOREIGN KEY (TRIGGER_NAME,TRIGGER_GROUP) \
-			   REFERENCES QRTZ_TRIGGERS(TRIGGER_NAME,TRIGGER_GROUP))
-			CREATE_TABLE_CALENDARS = CREATE TABLE qrtz_calendars(CALENDAR_NAME VARCHAR(80) NOT NULL, CALENDAR BINARY NOT NULL, \
-			   PRIMARY KEY (CALENDAR_NAME))
-			CREATE_TABLE_PAUSED_TRIGGER_GRPS = CREATE TABLE qrtz_paused_trigger_grps(TRIGGER_GROUP VARCHAR(80) NOT NULL, \
-			   PRIMARY KEY (TRIGGER_GROUP))
-			CREATE_TABLE_FIRED_TRIGGERS = CREATE TABLE qrtz_fired_triggers(ENTRY_ID VARCHAR(95) NOT NULL, TRIGGER_NAME VARCHAR(80) NOT NULL, \
-			   TRIGGER_GROUP VARCHAR(80) NOT NULL, IS_VOLATILE VARCHAR(1) NOT NULL, INSTANCE_NAME VARCHAR(80) NOT NULL, \
-			   FIRED_TIME NUMERIC(13) NOT NULL, STATE VARCHAR(16) NOT NULL, JOB_NAME VARCHAR(80) NULL, JOB_GROUP VARCHAR(80) NULL, \
-			   IS_STATEFUL VARCHAR(1) NULL, REQUESTS_RECOVERY VARCHAR(1) NULL, PRIMARY KEY (ENTRY_ID))
-			CREATE_TABLE_SCHEDULER_STATE = CREATE TABLE qrtz_scheduler_state(INSTANCE_NAME VARCHAR(80) NOT NULL, \
-			   LAST_CHECKIN_TIME NUMERIC(13) NOT NULL, CHECKIN_INTERVAL NUMERIC(13) NOT NULL, RECOVERER VARCHAR(80) NULL, \
-			   PRIMARY KEY (INSTANCE_NAME))
-			CREATE_TABLE_LOCKS = CREATE TABLE qrtz_locks(LOCK_NAME VARCHAR(40) NOT NULL, PRIMARY KEY (LOCK_NAME))
-			INSERT_TRIGGER_ACCESS = INSERT INTO qrtz_locks values('TRIGGER_ACCESS')
-			INSERT_JOB_ACCESS = INSERT INTO qrtz_locks values('JOB_ACCESS')
-			INSERT_CALENDAR_ACCESS = INSERT INTO qrtz_locks values('CALENDAR_ACCESS')
-			INSERT_STATE_ACCESS = INSERT INTO qrtz_locks values('STATE_ACCESS')
-			INSERT_MISFIRE_ACCESS = INSERT INTO qrtz_locks values('MISFIRE_ACCESS')
-		</attribute>
-	</mbean>
-</server>
\ No newline at end of file




More information about the jboss-cvs-commits mailing list