[jboss-cvs] JBossAS SVN: r67945 - in trunk/embedded/src/main/resources/javase: deployers and 1 other directory.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Wed Dec 5 09:37:33 EST 2007 

Author: petemuir
Date: 2007-12-05 09:37:32 -0500 (Wed, 05 Dec 2007)
New Revision: 67945

Added:
   trunk/embedded/src/main/resources/javase/deploy/ejb3-interceptors-aop.xml
   trunk/embedded/src/main/resources/javase/deployers/ejb-deployer-beans.xml
   trunk/embedded/src/main/resources/javase/deployers/ejb3-deployers-beans.xml
   trunk/embedded/src/main/resources/javase/deployers/metadata-beans.xml
Removed:
   trunk/embedded/src/main/resources/javase/deploy/ejb3-interceptors-aop.xml
   trunk/embedded/src/main/resources/javase/deployers/ejb3-deployers-beans.xml
Log:
Working deployers

Deleted: trunk/embedded/src/main/resources/javase/deploy/ejb3-interceptors-aop.xml
===================================================================
--- trunk/embedded/src/main/resources/javase/deploy/ejb3-interceptors-aop.xml	2007-12-05 14:34:12 UTC (rev 67944)
+++ trunk/embedded/src/main/resources/javase/deploy/ejb3-interceptors-aop.xml	2007-12-05 14:37:32 UTC (rev 67945)
@@ -1,360 +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.aspects.security.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.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.aspects.security.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.aspects.security.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.aspects.security.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.aspects.security.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.aspects.security.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.IsLocalInterceptor"/>
-      <interceptor-ref name="org.jboss.aspects.security.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.IsLocalInterceptor"/>
-      <interceptor-ref name="org.jboss.aspects.security.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.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.TxInterceptorFactory" 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"/>
-
-   <domain name="Stateless Bean">
-      <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.annotation.security.SecurityDomain->*(..))">
-         <interceptor-ref name="Basic Authorization"/>
-      </bind>
-      <bind pointcut="execution(public * @javax.annotation.security.RunAs->*(..))">
-         <interceptor-ref name="org.jboss.ejb3.security.RunAsSecurityInterceptorFactory"/>
-      </bind>
-      <bind pointcut="execution(public * @org.jboss.annotation.ejb.Clustered->*(..))">
-         <interceptor-ref name="org.jboss.ejb3.remoting.ReplicantsManagerInterceptorFactory"/>
-      </bind>
-      <bind pointcut="execution(public * *->*(..))">
-         <interceptor-ref name="org.jboss.ejb3.stateless.StatelessInstanceInterceptor"/>
-         <interceptor-ref name="org.jboss.aspects.tx.TxPropagationInterceptor"/>
-         <interceptor-ref name="org.jboss.ejb3.tx.TxInterceptorFactory"/>
-         <interceptor-ref name="org.jboss.ejb3.AllowedOperationsInterceptor"/>
-         <interceptor-ref name="org.jboss.ejb3.entity.TransactionScopedEntityManagerInterceptor"/>
-         <interceptor-ref name="org.jboss.ejb3.interceptor.EJB3InterceptorsFactory"/>
-      </bind>
-      <annotation expr="!class(@org.jboss.annotation.ejb.Pool)">
-         @org.jboss.annotation.ejb.Pool (value="ThreadlocalPool", maxSize=30, timeout=10000)
-      </annotation>
-   </domain>
-
-   <domain name="JACC Stateless Bean">
-      <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.annotation.security.SecurityDomain->*(..))">
-         <interceptor-ref name="JACC Authorization"/>
-      </bind>
-      <bind pointcut="execution(public * @javax.annotation.security.RunAs->*(..))">
-         <interceptor-ref name="org.jboss.ejb3.security.RunAsSecurityInterceptorFactory"/>
-      </bind>
-      <bind pointcut="execution(public * @org.jboss.annotation.ejb.Clustered->*(..))">
-         <interceptor-ref name="org.jboss.ejb3.remoting.ReplicantsManagerInterceptorFactory"/>
-      </bind>
-      <bind pointcut="execution(public * *->*(..))">
-         <interceptor-ref name="org.jboss.ejb3.stateless.StatelessInstanceInterceptor"/>
-         <interceptor-ref name="org.jboss.aspects.tx.TxPropagationInterceptor"/>
-         <interceptor-ref name="org.jboss.ejb3.tx.TxInterceptorFactory"/>
-         <interceptor-ref name="org.jboss.ejb3.AllowedOperationsInterceptor"/>
-         <interceptor-ref name="org.jboss.ejb3.entity.TransactionScopedEntityManagerInterceptor"/>
-         <interceptor-ref name="org.jboss.ejb3.interceptor.EJB3InterceptorsFactory"/>
-      </bind>
-      <annotation expr="!class(@org.jboss.annotation.ejb.PoolClass)">
-         @org.jboss.annotation.ejb.PoolClass (value=org.jboss.ejb3.ThreadlocalPool.class, maxSize=30, timeout=10000)
-      </annotation>
-   </domain>
-
-   <domain name="Base Stateful Bean">
-      <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.annotation.security.SecurityDomain->*(..))">
-         <interceptor-ref name="Basic Authorization"/>
-      </bind>
-      <bind pointcut="execution(public * @javax.annotation.security.RunAs->*(..))">
-         <interceptor-ref name="org.jboss.ejb3.security.RunAsSecurityInterceptorFactory"/>
-      </bind>
-      <bind pointcut="execution(public * @org.jboss.annotation.ejb.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.ejb3.stateful.StatefulInstanceInterceptor"/>
-         <interceptor-ref name="org.jboss.aspects.tx.TxPropagationInterceptor"/>
-         <interceptor-ref name="org.jboss.ejb3.tx.TxInterceptorFactory"/>
-         <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"/>
-      </bind>
-
-      <bind pointcut="execution(public * @org.jboss.annotation.ejb.Clustered->*(..)) AND !execution(public * *->@javax.ejb.Remove(..))">
-         <interceptor-ref name="org.jboss.ejb3.cache.StatefulReplicationInterceptor"/>
-      </bind>
-      <annotation expr="!class(@org.jboss.annotation.ejb.PoolClass)">
-         @org.jboss.annotation.ejb.PoolClass (value=org.jboss.ejb3.ThreadlocalPool.class, maxSize=30, timeout=10000)
-      </annotation>
-   </domain>
-
-   <domain name="Stateful Bean" extends="Base Stateful Bean" inheritBindings="true">
-      <!-- NON Clustered cache configuration -->
-      <annotation expr="!class(@org.jboss.annotation.ejb.cache.Cache) AND !class(@org.jboss.annotation.ejb.Clustered)">
-         @org.jboss.annotation.ejb.cache.Cache (org.jboss.ejb3.cache.simple.SimpleStatefulCache.class)
-      </annotation>
-      <annotation expr="!class(@org.jboss.annotation.ejb.cache.simple.PersistenceManager) AND !class(@org.jboss.annotation.ejb.Clustered)">
-         @org.jboss.annotation.ejb.cache.simple.PersistenceManager (org.jboss.ejb3.cache.simple.StatefulSessionFilePersistenceManager.class)
-      </annotation>
-      <annotation expr="!class(@org.jboss.annotation.ejb.cache.simple.CacheConfig) AND !class(@org.jboss.annotation.ejb.Clustered)">
-         @org.jboss.annotation.ejb.cache.simple.CacheConfig (maxSize=100000, idleTimeoutSeconds=300)
-      </annotation>
-
-      <!-- Clustered cache configuration -->
-      <annotation expr="!class(@org.jboss.annotation.ejb.cache.Cache) AND class(@org.jboss.annotation.ejb.Clustered)">
-         @org.jboss.annotation.ejb.cache.Cache (org.jboss.ejb3.cache.tree.StatefulTreeCache.class)
-      </annotation>
-      <annotation expr="!class(@org.jboss.annotation.ejb.cache.tree.CacheConfig) AND class(@org.jboss.annotation.ejb.Clustered)">
-         @org.jboss.annotation.ejb.cache.tree.CacheConfig (name="jboss.cache:service=EJB3SFSBClusteredCache", maxSize=100000, idleTimeoutSeconds=300)
-      </annotation>
-   </domain>
-
-   <domain name="JACC Stateful Bean">
-      <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.annotation.security.SecurityDomain->*(..))">
-         <interceptor-ref name="JACC Authorization"/>
-      </bind>
-      <bind pointcut="execution(public * @javax.annotation.security.RunAs->*(..))">
-         <interceptor-ref name="org.jboss.ejb3.security.RunAsSecurityInterceptorFactory"/>
-      </bind>
-      <bind pointcut="execution(public * @org.jboss.annotation.ejb.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.ejb3.stateful.StatefulInstanceInterceptor"/>
-         <interceptor-ref name="org.jboss.aspects.tx.TxPropagationInterceptor"/>
-         <interceptor-ref name="org.jboss.ejb3.tx.TxInterceptorFactory"/>
-         <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"/>
-      </bind>
-
-      <bind pointcut="execution(public * @org.jboss.annotation.ejb.Clustered->*(..)) AND !execution(public * *->@javax.ejb.Remove(..))">
-         <interceptor-ref name="org.jboss.ejb3.cache.StatefulReplicationInterceptor"/>
-      </bind>
-      <annotation expr="!class(@org.jboss.annotation.ejb.PoolClass)">
-         @org.jboss.annotation.ejb.PoolClass (value=org.jboss.ejb3.ThreadlocalPool.class, maxSize=30, timeout=10000)
-      </annotation>
-
-      <!-- NON Clustered cache configuration -->
-      <annotation expr="!class(@org.jboss.annotation.ejb.cache.Cache) AND !class(@org.jboss.annotation.ejb.Clustered)">
-         @org.jboss.annotation.ejb.cache.Cache (org.jboss.ejb3.cache.simple.SimpleStatefulCache.class)
-      </annotation>
-      <annotation expr="!class(@org.jboss.annotation.ejb.cache.simple.PersistenceManager) AND !class(@org.jboss.annotation.ejb.Clustered)">
-         @org.jboss.annotation.ejb.cache.simple.PersistenceManager (org.jboss.ejb3.cache.simple.StatefulSessionFilePersistenceManager.class)
-      </annotation>
-      <annotation expr="!class(@org.jboss.annotation.ejb.cache.simple.CacheConfig) AND !class(@org.jboss.annotation.ejb.Clustered)">
-         @org.jboss.annotation.ejb.cache.simple.CacheConfig (maxSize=100000, idleTimeoutSeconds=300)
-      </annotation>
-
-      <!-- Clustered cache configuration -->
-      <annotation expr="!class(@org.jboss.annotation.ejb.cache.Cache) AND class(@org.jboss.annotation.ejb.Clustered)">
-         @org.jboss.annotation.ejb.cache.Cache (org.jboss.ejb3.cache.tree.StatefulTreeCache.class)
-      </annotation>
-      <annotation expr="!class(@org.jboss.annotation.ejb.cache.tree.CacheConfig) AND class(@org.jboss.annotation.ejb.Clustered)">
-         @org.jboss.annotation.ejb.cache.tree.CacheConfig (name="jboss.cache:service=EJB3SFSBClusteredCache", maxSize=100000, idleTimeoutSeconds=300)
-      </annotation>
-   </domain>
-
-   <domain name="Embedded Stateful Bean" extends="Base Stateful Bean" inheritBindings="true">
-      <!-- NON Clustered cache configuration -->
-      <annotation expr="!class(@org.jboss.annotation.ejb.cache.Cache)">
-         @org.jboss.annotation.ejb.cache.Cache (org.jboss.ejb3.cache.NoPassivationCache.class)
-      </annotation>
-
-   </domain>
-
-   <domain name="Message Driven Bean">
-      <bind pointcut="execution(public * @javax.annotation.security.RunAs->*(..))">
-         <interceptor-ref name="org.jboss.ejb3.security.RunAsSecurityInterceptorFactory"/>
-      </bind>
-      <bind pointcut="execution(public * *->*(..))">
-         <interceptor-ref name="org.jboss.ejb3.stateless.StatelessInstanceInterceptor"/>
-         <interceptor-ref name="org.jboss.ejb3.tx.TxInterceptorFactory"/>
-         <interceptor-ref name="org.jboss.ejb3.AllowedOperationsInterceptor"/>
-         <interceptor-ref name="org.jboss.ejb3.entity.TransactionScopedEntityManagerInterceptor"/>
-         <interceptor-ref name="org.jboss.ejb3.interceptor.EJB3InterceptorsFactory"/>
-      </bind>
-      <annotation expr="!class(@org.jboss.annotation.ejb.PoolClass)">
-         @org.jboss.annotation.ejb.PoolClass (value=org.jboss.ejb3.StrictMaxPool.class, maxSize=30, timeout=10000)
-      </annotation>
-   </domain>
-
-   <domain name="Consumer Bean">
-      <bind pointcut="execution(public * @javax.annotation.security.RunAs->*(..))">
-         <interceptor-ref name="org.jboss.ejb3.security.RunAsSecurityInterceptorFactory"/>
-      </bind>
-      <bind pointcut="execution(public * *->*(..))">
-         <interceptor-ref name="org.jboss.ejb3.stateless.StatelessInstanceInterceptor"/>
-         <interceptor-ref name="org.jboss.ejb3.tx.TxInterceptorFactory"/>
-         <interceptor-ref name="org.jboss.ejb3.AllowedOperationsInterceptor"/>
-         <interceptor-ref name="org.jboss.ejb3.entity.TransactionScopedEntityManagerInterceptor"/>
-      </bind>
-      <bind pointcut="execution(public * *->*(..)) AND (has(* *->@org.jboss.annotation.ejb.CurrentMessage(..)) OR hasfield(* *->@org.jboss.annotation.ejb.CurrentMessage))">
-         <interceptor-ref name="org.jboss.ejb3.mdb.CurrentMessageInjectorInterceptorFactory"/>
-      </bind>
-      <bind pointcut="execution(public * *->*(..))">
-         <interceptor-ref name="org.jboss.ejb3.interceptor.EJB3InterceptorsFactory"/>
-      </bind>
-      <annotation expr="!class(@org.jboss.annotation.ejb.PoolClass)">
-         @org.jboss.annotation.ejb.PoolClass (value=org.jboss.ejb3.StrictMaxPool.class, maxSize=30, timeout=10000)
-      </annotation>
-   </domain>
-
-   <domain name="Service Bean">
-      <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.annotation.security.SecurityDomain->*(..))">
-         <interceptor-ref name="Basic Authorization"/>
-      </bind>
-      <bind pointcut="execution(public * @javax.annotation.security.RunAs->*(..))">
-         <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.TxInterceptorFactory"/>
-         <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"/>
-      </bind>
-   </domain>
-
-   <domain name="JACC Service Bean">
-      <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.annotation.security.SecurityDomain->*(..))">
-         <interceptor-ref name="Basic Authorization"/>
-      </bind>
-      <bind pointcut="execution(public * @javax.annotation.security.RunAs->*(..))">
-         <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.TxInterceptorFactory"/>
-         <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"/>
-      </bind>
-   </domain>
-
-
-</aop>
\ No newline at end of file

Added: trunk/embedded/src/main/resources/javase/deploy/ejb3-interceptors-aop.xml
===================================================================
--- trunk/embedded/src/main/resources/javase/deploy/ejb3-interceptors-aop.xml	                        (rev 0)
+++ trunk/embedded/src/main/resources/javase/deploy/ejb3-interceptors-aop.xml	2007-12-05 14:37:32 UTC (rev 67945)
@@ -0,0 +1,392 @@
+<?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.aspects.security.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.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.aspects.security.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.aspects.security.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.aspects.security.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.aspects.security.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.aspects.security.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.IsLocalInterceptor"/>
+      <interceptor-ref name="org.jboss.aspects.security.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.IsLocalInterceptor"/>
+      <interceptor-ref name="org.jboss.aspects.security.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.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.TxInterceptorFactory" 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"/>
+
+   <domain name="Stateless Bean">
+      <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.ejb3.stateless.StatelessInstanceInterceptor"/>
+         <interceptor-ref name="org.jboss.aspects.tx.TxPropagationInterceptor"/>
+         <interceptor-ref name="org.jboss.ejb3.tx.TxInterceptorFactory"/>
+         <interceptor-ref name="org.jboss.ejb3.AllowedOperationsInterceptor"/>
+         <interceptor-ref name="org.jboss.ejb3.entity.TransactionScopedEntityManagerInterceptor"/>
+         <interceptor-ref name="org.jboss.ejb3.interceptor.EJB3InterceptorsFactory"/>
+      </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">
+      <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.ejb3.stateless.StatelessInstanceInterceptor"/>
+         <interceptor-ref name="org.jboss.aspects.tx.TxPropagationInterceptor"/>
+         <interceptor-ref name="org.jboss.ejb3.tx.TxInterceptorFactory"/>
+         <interceptor-ref name="org.jboss.ejb3.AllowedOperationsInterceptor"/>
+         <interceptor-ref name="org.jboss.ejb3.entity.TransactionScopedEntityManagerInterceptor"/>
+         <interceptor-ref name="org.jboss.ejb3.interceptor.EJB3InterceptorsFactory"/>
+      </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">
+      <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.ejb3.stateful.StatefulInstanceInterceptor"/>
+         <interceptor-ref name="org.jboss.aspects.tx.TxPropagationInterceptor"/>
+         <interceptor-ref name="org.jboss.ejb3.tx.TxInterceptorFactory"/>
+         <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"/>
+      </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">
+      <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.ejb3.stateful.StatefulInstanceInterceptor"/>
+         <interceptor-ref name="org.jboss.aspects.tx.TxPropagationInterceptor"/>
+         <interceptor-ref name="org.jboss.ejb3.tx.TxInterceptorFactory"/>
+         <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"/>
+      </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">
+      <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.stateless.StatelessInstanceInterceptor"/>
+         <interceptor-ref name="org.jboss.ejb3.tx.TxInterceptorFactory"/>
+         <interceptor-ref name="org.jboss.ejb3.AllowedOperationsInterceptor"/>
+         <interceptor-ref name="org.jboss.ejb3.entity.TransactionScopedEntityManagerInterceptor"/>
+         <interceptor-ref name="org.jboss.ejb3.interceptor.EJB3InterceptorsFactory"/>
+      </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">
+      <bind pointcut="execution(public * *->*(..))">
+         <interceptor-ref name="org.jboss.ejb3.security.RunAsSecurityInterceptorFactory"/>
+      </bind>
+      <bind pointcut="execution(public * *->*(..))">
+         <interceptor-ref name="org.jboss.ejb3.stateless.StatelessInstanceInterceptor"/>
+         <interceptor-ref name="org.jboss.ejb3.tx.TxInterceptorFactory"/>
+         <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"/>
+      </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">
+      <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.TxInterceptorFactory"/>
+         <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"/>
+      </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">
+      <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.TxInterceptorFactory"/>
+         <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"/>
+      </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


Property changes on: trunk/embedded/src/main/resources/javase/deploy/ejb3-interceptors-aop.xml
___________________________________________________________________
Name: svn:mime-type
   + text/plain

Added: trunk/embedded/src/main/resources/javase/deployers/ejb-deployer-beans.xml
===================================================================
--- trunk/embedded/src/main/resources/javase/deployers/ejb-deployer-beans.xml	                        (rev 0)
+++ trunk/embedded/src/main/resources/javase/deployers/ejb-deployer-beans.xml	2007-12-05 14:37:32 UTC (rev 67945)
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    EJB 2.x Deployer
+-->
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+   <!-- ejb-jar.xml parsing deployer -->
+   <bean name="Ejb2ParsingDeployer" class="org.jboss.deployment.EjbParsingDeployer">
+      <property name="type">ejb2x</property>   
+      <property name="useSchemaValidation">false</property>
+      <property name="relativeOrder">3000</property>
+   </bean>
+   <bean name="JBossEjb2ParsingDeployer" class="org.jboss.deployment.JBossEjbParsingDeployer">
+      <property name="type">ejb2x</property>      
+      <property name="relativeOrder">3001</property>
+      <property name="useSchemaValidation">false</property>
+      <property name="ignoreMissingStandardJBossXml">true</property>
+   </bean>
+
+    <bean name="EJB2xDeployer" class="org.jboss.ejb.deployers.EjbDeployer">
+        <!-- The EJBDeployer needs the JTA transaction manager service -->
+        <property name="transactionManagerServiceName">jboss:service=TransactionManager</property>
+       <!-- The dynamic class loading simple web server -->
+       <property name="webServiceName">jboss:service=WebService</property>
+       <!-- The CachedConnectionManager service used by the CachedConnectionInterceptor -->
+       <property name="cachedConnectionManagerName">jboss.jca:service=CachedConnectionManager</property>
+       <!-- The ejb timer service -->
+       <property name="timerServiceName">jboss.ejb:service=EJBTimerService</property>
+       <!-- A flag indicating if the ejb components should have in VM call
+          optimization disabled.
+       -->
+       <property name="callByValue">false</property>
+        
+       <!-- Specify an unauthenticated identity -->
+       <property name="unauthenticatedIdentity">anonymous</property>
+       
+       <!-- Specify a SecurityManagement Wrapper -->
+       <property name="securityManagement">
+         <inject bean="JNDIBasedSecurityManagement"/>
+       </property>
+       <!-- Specify a SecurityContext FQN class name -->
+       <property name="securityContextClassName">org.jboss.security.plugins.JBossSecurityContext</property>
+
+       <!-- Specify a SecurityDomain as fallback -->
+       <property name="defaultSecurityDomain">jboss-ejb-policy</property>
+
+       <depends>SecurityDeployer</depends>
+    </bean>
+
+   <bean name="MergedJBossMetaDataDeployer" class="org.jboss.ejb.deployers.MergedJBossMetaDataDeployer">
+   </bean>
+   <bean name="StandardJBossMetaDataDeployer" class="org.jboss.ejb.deployers.StandardJBossMetaDataDeployer">
+   </bean>
+</deployment>


Property changes on: trunk/embedded/src/main/resources/javase/deployers/ejb-deployer-beans.xml
___________________________________________________________________
Name: svn:mime-type
   + text/plain

Deleted: trunk/embedded/src/main/resources/javase/deployers/ejb3-deployers-beans.xml
===================================================================
--- trunk/embedded/src/main/resources/javase/deployers/ejb3-deployers-beans.xml	2007-12-05 14:34:12 UTC (rev 67944)
+++ trunk/embedded/src/main/resources/javase/deployers/ejb3-deployers-beans.xml	2007-12-05 14:37:32 UTC (rev 67945)
@@ -1,191 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-    EJB3 Deployers
--->
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
-
-   <!-- TODO this should be removed later on when ENC gets changed -->
-   <bean name="java:comp/Initializer" class="org.jboss.ejb3.embedded.JavaCompInitializer"/>
-   <bean name="DefaultPersistenceProperties" class="org.jboss.ejb3.DefaultPersistenceProperties"/>
-
-   <bean name="Ejb3Deployer" class="org.jboss.ejb3.deployers.Ejb3Deployer">
-      <property name="type">ejb3x</property>
-      <property name="kernel"><inject bean="jboss.kernel:service=Kernel"/></property>
-      <property name="mbeanServer"><inject bean="JMXKernel" property="mbeanServer"/></property>
-      <property name="defaultPersistenceProperties"><inject bean="DefaultPersistenceProperties" property="properties"/></property>
-      <property name="cacheFactoryRegistry"><inject bean="EJB3CacheFactoryRegistry" /></property>
-      <property name="poolFactoryRegistry"><inject bean="EJB3PoolFactoryRegistry" /></property>
-
-      <!--
-
-      Configure the deployer to optionally require a deployment
-      descriptor for deployable units.  By turning this switch to "true",
-      "META-INF/jboss.xml" or the EJB3 Deployment Descriptor "META-INF/ejb-jar.xml"
-      will be required for deployment, enabling a performance increace in deployment by
-      not scanning for annotations in non-deployable EJB3 JARs.
-
-      Default for this value is "false".
-
-      -->
-      <property name="deploymentDescriptorRequired">false</property>
-
-      <property name="ignoredJarsSet">
-         <set elementClass="java.lang.String">
-            <value>snmp-adaptor.jar</value>
-            <value>otherimages.jar</value>
-            <value>applet.jar</value>
-            <value>jcommon.jar</value>
-            <value>console-mgr-classes.jar</value>
-            <value>jfreechart.jar</value>
-            <value>juddi-service.jar</value>
-            <value>wsdl4j.jar</value>
-            <value>commons-collections.jar</value>
-            <value>commons-pool.jar</value>
-            <value>juddi.jar</value>
-            <value>commons-discovery.jar</value>
-            <value>uddi4j.jar</value>
-            <value>axis.jar</value>
-            <value>commons-dbcp.jar</value>
-            <value>jboss-juddiaxis.jar</value>
-            <value>trove.jar</value>
-            <value>javassist.jar</value>
-            <value>jboss-aop-jdk50.jar</value>
-            <value>jboss-aspect-library-jdk50.jar</value>
-            <value>ejb3-persistence.jar</value>
-            <value>commons-validator-1.1.3.jar</value>
-            <value>commons-collections.jar</value>
-            <value>commons-fileupload.jar</value>
-            <value>commons-pool.jar</value>
-            <value>hibernate-entitymanager.jar</value>
-            <value>jboss-ejb3x.jar</value>
-            <value>commons-digester-1.6.jar</value>
-            <value>cglib-2.1.1.jar</value>
-            <value>commons-discovery.jar</value>
-            <value>jboss-annotations-ejb3.jar</value>
-            <value>jaxen-1.1-beta-4.jar</value>
-            <value>hibernate-annotations.jar</value>
-            <value>commons-httpclient.jar</value>
-            <value>commons-logging.jar</value>
-            <value>commons-vfs.jar</value>
-            <value>hibernate3.jar</value>
-            <value>commons-logging-api.jar</value>
-            <value>asm.jar</value>
-            <value>asm-attrs.jar</value>
-            <value>commons-lang-2.0.jar</value>
-            <value>commons-beanutils.jar</value>
-            <value>jboss-ejb3.jar</value>
-            <value>dom4j.jar</value>
-            <value>commons-codec-1.2.jar</value>
-            <value>wsdl4j.jar</value>
-            <value>xmlsec.jar</value>
-            <value>jbossws.jar</value>
-            <value>jboss-bean-deployer.jar</value>
-            <value>jboss-microcontainer.jar</value>
-            <value>jboss-dependency.jar</value>
-            <value>jboss-container.jar</value>
-            <value>tomcat-coyote.jar</value>
-            <value>commons-collections.jar</value>
-            <value>myfaces.jar</value>
-            <value>jstl.jar</value>
-            <value>commons-digester-1.6.jar</value>
-            <value>myfaces-impl.jar</value>
-            <value>commons-beanutils.jar</value>
-            <value>myfaces-jsf-api.jar</value>
-            <value>commons-codec-1.2.jar</value>
-            <value>catalina-optional.jar</value>
-            <value>tomcat-util.jar</value>
-            <value>jasper-compiler.jar</value>
-            <value>commons-el.jar</value>
-            <value>jasper-compiler-jdt.jar</value>
-            <value>tomcat-http.jar</value>
-            <value>catalina-manager.jar</value>
-            <value>jasper-runtime.jar</value>
-            <value>tomcat55-service.jar</value>
-            <value>servlets-invoker.jar</value>
-            <value>catalina.jar</value>
-            <value>naming-resources.jar</value>
-            <value>servlets-default.jar</value>
-            <value>tomcat-ajp.jar</value>
-            <value>commons-modeler.jar</value>
-            <value>tomcat-apr.jar</value>
-            <value>servlets-webdav.jar</value>
-         </set>
-      </property>
-      <depends>AspectLibrary</depends>
-   </bean>
-   <bean name="EJBStage2Deployer" class="org.jboss.ejb3.deployers.EJBStage2Deployer">
-      <depends>AspectLibrary</depends>
-   </bean>
-
-   <bean name="AppClientParsingDeployer" class="org.jboss.ejb3.deployers.AppClientParsingDeployer">
-      <property name="type">car</property>
-      <!-- TODO: check depends -->
-      <depends>AspectLibrary</depends>
-   </bean>
-
-   <bean name="JBossClientParsingDeployer" class="org.jboss.ejb3.deployers.JBossClientParsingDeployer">
-      <property name="type">car</property>
-      <depends>AppClientParsingDeployer</depends>
-   </bean>
-
-   <bean name="AppClientScanningDeployer" class="org.jboss.ejb3.deployers.AppClientScanningDeployer">
-      <depends>JBossClientParsingDeployer</depends>
-   </bean>
-
-   <bean name="Ejb3ClientDeployer" class="org.jboss.ejb3.deployers.Ejb3ClientDeployer">
-      <property name="type">car</property>
-      <property name="kernel"><inject bean="jboss.kernel:service=Kernel"/></property>
-      <property name="mbeanServer"><inject bean="JMXKernel" property="mbeanServer"/></property>
-      <!-- TODO: check depends -->
-      <depends>AspectLibrary</depends>
-      <depends>AppClientScanningDeployer</depends>
-   </bean>
-
-   <!-- EJB3 Cache Factory Registry -->
-   <bean name="EJB3CacheFactoryRegistry" class="org.jboss.ejb3.cache.CacheFactoryRegistry">
-      <property name="factories">
-         <!-- Define each of the registered factories -->
-         <map class="java.util.HashMap" keyClass="java.lang.String"
-            valueClass="java.lang.Class">
-            <!-- NoPassivationCache -->
-            <entry>
-               <key>NoPassivationCache</key>
-               <value>org.jboss.ejb3.cache.NoPassivationCacheFactory</value>
-            </entry>
-            <!-- SimpleStatefulCache -->
-            <entry>
-               <key>SimpleStatefulCache</key>
-               <value>org.jboss.ejb3.cache.simple.SimpleStatefulCacheFactory</value>
-            </entry>
-            <!-- StatefulTreeCache -->
-            <entry>
-               <key>StatefulTreeCache</key>
-               <value>org.jboss.ejb3.cache.tree.StatefulTreeCacheFactory</value>
-            </entry>
-         </map>
-      </property>
-   </bean>
-
-   <!-- EJB3 Pool Factory Registry -->
-   <bean name="EJB3PoolFactoryRegistry" class="org.jboss.ejb3.pool.PoolFactoryRegistry">
-      <property name="factories">
-         <!-- Define each of the registered factories -->
-         <map class="java.util.HashMap" keyClass="java.lang.String"
-            valueClass="java.lang.Class">
-            <!-- ThreadlocalPool -->
-            <entry>
-               <key>ThreadlocalPool</key>
-               <value>org.jboss.ejb3.pool.ThreadlocalPoolFactory</value>
-            </entry>
-            <!-- StrictMaxPool -->
-            <entry>
-               <key>StrictMaxPool</key>
-               <value>org.jboss.ejb3.pool.StrictMaxPoolFactory</value>
-            </entry>
-         </map>
-      </property>
-   </bean>
-
-   <bean name="JNDIKernelRegistryPlugin" class="org.jboss.ejb3.kernel.JNDIKernelRegistryPlugin"/>
-</deployment>

Added: trunk/embedded/src/main/resources/javase/deployers/ejb3-deployers-beans.xml
===================================================================
--- trunk/embedded/src/main/resources/javase/deployers/ejb3-deployers-beans.xml	                        (rev 0)
+++ trunk/embedded/src/main/resources/javase/deployers/ejb3-deployers-beans.xml	2007-12-05 14:37:32 UTC (rev 67945)
@@ -0,0 +1,259 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+    JCA Deployers
+-->
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+   <!-- TODO this should be removed later on when ENC gets changed -->
+   <bean name="java:comp/Initializer" class="org.jboss.ejb3.embedded.JavaCompInitializer"/>
+   <bean name="DefaultPersistenceProperties" class="org.jboss.ejb3.DefaultPersistenceProperties"/>
+
+   <bean name="Ejb3Deployer" class="org.jboss.ejb3.deployers.Ejb3Deployer">
+      <property name="type">ejb3x</property>
+      <property name="kernel"><inject bean="jboss.kernel:service=Kernel"/></property>
+      <property name="mbeanServer"><inject bean="JMXKernel" property="mbeanServer"/></property>
+      <property name="defaultPersistenceProperties"><inject bean="DefaultPersistenceProperties" property="properties"/></property>
+      <property name="cacheFactoryRegistry"><inject bean="EJB3CacheFactoryRegistry" /></property>
+      <property name="poolFactoryRegistry"><inject bean="EJB3PoolFactoryRegistry" /></property>
+      <property name="remoteProxyFactoryRegistry"><inject bean="EJB3RemoteProxyFactoryRegistry" /></property>
+      <property name="persistenceManagerFactoryRegistry"><inject bean="EJB3PersistenceManagerFactoryRegistry" /></property>
+      
+      <!-- 
+   
+      Configure the deployer to optionally require a deployment 
+      descriptor for deployable units.  By turning this switch to "true", 
+      "META-INF/jboss.xml" or the EJB3 Deployment Descriptor "META-INF/ejb-jar.xml" 
+      will be required for deployment, enabling a performance increace in deployment by
+      not scanning for annotations in non-deployable EJB3 JARs.
+      
+      Default for this value is "false".
+      
+      -->
+      <property name="deploymentDescriptorRequired">true</property>
+      
+      <property name="ignoredJarsSet">
+         <set elementClass="java.lang.String">
+            <value>snmp-adaptor.jar</value>
+            <value>otherimages.jar</value>
+            <value>applet.jar</value>
+            <value>jcommon.jar</value>
+            <value>console-mgr-classes.jar</value>
+            <value>jfreechart.jar</value>
+            <value>juddi-service.jar</value>
+            <value>wsdl4j.jar</value>
+            <value>commons-collections.jar</value>
+            <value>commons-pool.jar</value>
+            <value>juddi.jar</value>
+            <value>commons-discovery.jar</value>
+            <value>uddi4j.jar</value>
+            <value>axis.jar</value>
+            <value>commons-dbcp.jar</value>
+            <value>jboss-juddiaxis.jar</value>
+            <value>trove.jar</value>
+            <value>javassist.jar</value>
+            <value>jboss-aop-jdk50.jar</value>
+            <value>jboss-aspect-library-jdk50.jar</value>
+            <value>ejb3-persistence.jar</value>
+            <value>commons-validator-1.1.3.jar</value>
+            <value>commons-collections.jar</value>
+            <value>commons-fileupload.jar</value>
+            <value>commons-pool.jar</value>
+            <value>hibernate-entitymanager.jar</value>
+            <value>jboss-ejb3x.jar</value>
+            <value>commons-digester-1.6.jar</value>
+            <value>cglib-2.1.1.jar</value>
+            <value>commons-discovery.jar</value>
+            <value>jboss-annotations-ejb3.jar</value>
+            <value>jaxen-1.1-beta-4.jar</value>
+            <value>hibernate-annotations.jar</value>
+            <value>commons-httpclient.jar</value>
+            <value>commons-logging.jar</value>
+            <value>commons-vfs.jar</value>
+            <value>hibernate3.jar</value>
+            <value>commons-logging-api.jar</value>
+            <value>asm.jar</value>
+            <value>asm-attrs.jar</value>
+            <value>commons-lang-2.0.jar</value>
+            <value>commons-beanutils.jar</value>
+            <value>jboss-ejb3.jar</value>
+            <value>dom4j.jar</value>
+            <value>commons-codec-1.2.jar</value>
+            <value>wsdl4j.jar</value>
+            <value>xmlsec.jar</value>
+            <value>jbossws.jar</value>
+            <value>jboss-bean-deployer.jar</value>
+            <value>jboss-microcontainer.jar</value>
+            <value>jboss-dependency.jar</value>
+            <value>jboss-container.jar</value>
+            <value>tomcat-coyote.jar</value>
+            <value>commons-collections.jar</value>
+            <value>myfaces.jar</value>
+            <value>jstl.jar</value>
+            <value>commons-digester-1.6.jar</value>
+            <value>myfaces-impl.jar</value>
+            <value>commons-beanutils.jar</value>
+            <value>myfaces-jsf-api.jar</value>
+            <value>commons-codec-1.2.jar</value>
+            <value>catalina-optional.jar</value>
+            <value>tomcat-util.jar</value>
+            <value>jasper-compiler.jar</value>
+            <value>commons-el.jar</value>
+            <value>jasper-compiler-jdt.jar</value>
+            <value>tomcat-http.jar</value>
+            <value>catalina-manager.jar</value>
+            <value>jasper-runtime.jar</value>
+            <value>tomcat55-service.jar</value>
+            <value>servlets-invoker.jar</value>
+            <value>catalina.jar</value>
+            <value>naming-resources.jar</value>
+            <value>servlets-default.jar</value>
+            <value>tomcat-ajp.jar</value>
+            <value>commons-modeler.jar</value>
+            <value>tomcat-apr.jar</value>
+            <value>servlets-webdav.jar</value>
+         </set>
+      </property>
+      <depends>AspectLibrary</depends>
+   </bean>
+   <bean name="EJBStage2Deployer" class="org.jboss.ejb3.deployers.EJBStage2Deployer">
+      <depends>AspectLibrary</depends>
+   </bean>
+   
+   <bean name="AppClientParsingDeployer" class="org.jboss.ejb3.deployers.AppClientParsingDeployer">
+      <property name="type">car</property>
+      <!-- TODO: check depends -->
+      <depends>AspectLibrary</depends>
+   </bean>
+   
+   <bean name="JBossClientParsingDeployer" class="org.jboss.ejb3.deployers.JBossClientParsingDeployer">
+      <property name="type">car</property>
+      <depends>AppClientParsingDeployer</depends>
+   </bean>
+   
+   <bean name="AppClientScanningDeployer" class="org.jboss.ejb3.deployers.AppClientScanningDeployer">
+      <depends>JBossClientParsingDeployer</depends>
+   </bean>
+   
+   <bean name="Ejb3ClientDeployer" class="org.jboss.ejb3.deployers.Ejb3ClientDeployer">
+      <property name="type">car</property>
+      <property name="kernel"><inject bean="jboss.kernel:service=Kernel"/></property>
+      <property name="mbeanServer"><inject bean="JMXKernel" property="mbeanServer"/></property>
+      <!-- TODO: check depends -->
+      <depends>AspectLibrary</depends>
+      <depends>AppClientScanningDeployer</depends>
+   </bean>
+   
+   <!-- EJB3 Cache Factory Registry -->
+   <bean name="EJB3CacheFactoryRegistry" class="org.jboss.ejb3.cache.CacheFactoryRegistry">
+      <property name="factories">
+         <!-- Define each of the registered factories -->
+         <map class="java.util.HashMap" keyClass="java.lang.String"
+            valueClass="java.lang.Class">
+            <!-- NoPassivationCache -->
+            <entry>
+               <key>NoPassivationCache</key>
+               <value>org.jboss.ejb3.cache.NoPassivationCacheFactory</value>
+            </entry>
+            <!-- SimpleStatefulCache -->
+            <entry>
+               <key>SimpleStatefulCache</key>
+               <value>org.jboss.ejb3.cache.simple.SimpleStatefulCacheFactory</value>
+            </entry>
+            <!-- StatefulTreeCache -->
+            <entry>
+               <key>StatefulTreeCache</key>
+               <value>org.jboss.ejb3.cache.tree.StatefulTreeCacheFactory</value>
+            </entry>
+         </map>
+      </property>
+   </bean>
+   
+   <!-- EJB3 Pool Factory Registry -->
+   <bean name="EJB3PoolFactoryRegistry" class="org.jboss.ejb3.pool.PoolFactoryRegistry">
+      <property name="factories">
+         <!-- Define each of the registered factories -->
+         <map class="java.util.HashMap" keyClass="java.lang.String"
+            valueClass="java.lang.Class">
+            <!-- ThreadlocalPool -->
+            <entry>
+               <key>ThreadlocalPool</key>
+               <value>org.jboss.ejb3.pool.ThreadlocalPoolFactory</value>
+            </entry>
+            <!-- StrictMaxPool -->
+            <entry>
+               <key>StrictMaxPool</key>
+               <value>org.jboss.ejb3.pool.StrictMaxPoolFactory</value>
+            </entry>
+         </map>
+      </property>
+   </bean>
+   
+   <!-- Remoting Proxy Factory Registry -->
+   <bean name="EJB3RemoteProxyFactoryRegistry" class="org.jboss.ejb3.remoting.RemoteProxyFactoryRegistry">
+      <property name="factories">
+         <!-- Define each of the registered factories -->
+         <map class="java.util.HashMap" keyClass="java.lang.String"
+            valueClass="java.lang.Class">
+            <!-- RemoteProxyFactory -->
+            <entry>
+               <key>RemoteProxyFactory</key>
+               <value>org.jboss.ejb3.remoting.RemoteProxyFactory</value>
+            </entry>
+            <!-- IORFactory -->
+            <entry>
+               <key>IORFactory</key>
+               <value>org.jboss.ejb3.iiop.IORFactory</value>
+            </entry>
+            <!-- ServiceRemoteProxyFactory -->
+            <entry>
+               <key>ServiceRemoteProxyFactory</key>
+               <value>org.jboss.ejb3.service.ServiceRemoteProxyFactory</value>
+            </entry>
+            <!-- StatefulClusterProxyFactory -->
+            <!-- <entry>
+               <key>StatefulClusterProxyFactory</key>
+               <value>org.jboss.ejb3.stateful.StatefulClusterProxyFactory</value>
+            </entry>-->
+            <!-- StatefulRemoteProxyFactory -->
+            <entry>
+               <key>StatefulRemoteProxyFactory</key>
+               <value>org.jboss.ejb3.stateful.StatefulRemoteProxyFactory</value>
+            </entry>
+            <!-- StatelessClusterProxyFactory -->
+            <!-- <entry>
+               <key>StatelessClusterProxyFactory</key>
+               <value>org.jboss.ejb3.stateless.StatelessClusterProxyFactory</value>
+            </entry>-->
+            <!-- StatelessRemoteProxyFactory -->
+            <entry>
+               <key>StatelessRemoteProxyFactory</key>
+               <value>org.jboss.ejb3.stateless.StatelessRemoteProxyFactory</value>
+            </entry>            
+         </map>
+      </property>
+   </bean>
+   
+   <!-- EJB3 Persistence Manager Factory Registry -->
+   <bean name="EJB3PersistenceManagerFactoryRegistry" class="org.jboss.ejb3.cache.persistence.PersistenceManagerFactoryRegistry">
+      <property name="factories">
+         <!-- Define each of the registered factories -->
+         <map class="java.util.HashMap" keyClass="java.lang.String"
+            valueClass="java.lang.Class">
+            <!-- StatefulSessionFilePersistenceManager -->
+            <entry>
+               <key>StatefulSessionFilePersistenceManager</key>
+               <value>org.jboss.ejb3.cache.simple.StatefulSessionFilePersistenceManagerFactory</value>
+            </entry>
+         </map>
+      </property>
+   </bean>
+   
+   <bean name="JNDIKernelRegistryPlugin" class="org.jboss.ejb3.kernel.JNDIKernelRegistryPlugin"/>
+   
+   <!-- Persistence Unit deployers -->
+   <bean name="PersistenceUnitParsingDeployer" class="org.jboss.ejb3.deployers.PersistenceUnitParsingDeployer">
+      <property name="type">car</property>
+   </bean>
+   
+</deployment>


Property changes on: trunk/embedded/src/main/resources/javase/deployers/ejb3-deployers-beans.xml
___________________________________________________________________
Name: svn:mime-type
   + text/plain

Added: trunk/embedded/src/main/resources/javase/deployers/metadata-beans.xml
===================================================================
--- trunk/embedded/src/main/resources/javase/deployers/metadata-beans.xml	                        (rev 0)
+++ trunk/embedded/src/main/resources/javase/deployers/metadata-beans.xml	2007-12-05 14:37:32 UTC (rev 67945)
@@ -0,0 +1,236 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+    MetaData configuration
+    $Id: metadata-beans.xml,v 1.1 2007/12/04 19:31:43 pmuir Exp $
+-->
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+	<!-- The reference metdata resolving deployer
+	-->
+   <bean name="ReferenceMetaDataResolverDeployer"
+      class="org.jboss.deployment.ReferenceMetaDataResolverDeployer">
+   </bean>
+   <bean name="AnnotationMetaDataDeployer"
+      class="org.jboss.deployment.AnnotationMetaDataDeployer">
+   </bean>
+
+	<!-- The schema location to JBossXB binding class mappings. We specify the dtd/xsd name
+	of the schema as the location to work with legacy dtd as well as namespace based
+	documents.
+	-->
+   <bean name="SchemaResolverConfig"
+      class="org.jboss.xb.binding.sunday.unmarshalling.SchemaResolverConfig">
+      
+      <!-- schemaLocation to JBossXBuilder binding classes -->
+      <property name="bindingClassesByLocations">
+         <map keyClass="java.lang.String" valueClass="java.lang.String">
+            <!-- EarMetaData -->
+            <entry>
+               <key>application</key>
+               <value>org.jboss.metadata.ear.spec.Ear14MetaData</value>
+            </entry>
+            <entry>
+               <key>application_1_2.dtd</key>
+               <value>org.jboss.metadata.ear.spec.Ear13DTDMetaData</value>
+            </entry>
+            <entry>
+               <key>application_1_3.dtd</key>
+               <value>org.jboss.metadata.ear.spec.Ear13DTDMetaData</value>
+            </entry>
+            <entry>
+               <key>application_1_4.xsd</key>
+               <value>org.jboss.metadata.ear.spec.Ear14MetaData</value>
+            </entry>
+            <entry>
+               <key>application_5.xsd</key>
+               <value>org.jboss.metadata.ear.spec.Ear50MetaData</value>
+            </entry>
+            <!-- JBossAppMetaData -->
+            <entry>
+               <key>jboss-app</key>
+               <value>org.jboss.metadata.ear.jboss.JBoss50DTDAppMetaData</value>
+            </entry>
+            <entry>
+               <key>jboss-app_3_0.dtd</key>
+               <value>org.jboss.metadata.ear.jboss.JBoss50DTDAppMetaData</value>
+            </entry>
+            <entry>
+               <key>jboss-app_3_2.dtd</key>
+               <value>org.jboss.metadata.ear.jboss.JBoss50DTDAppMetaData</value>
+            </entry>
+            <entry>
+               <key>jboss-app_4_0.dtd</key>
+               <value>org.jboss.metadata.ear.jboss.JBoss50DTDAppMetaData</value>
+            </entry>
+            <entry>
+               <key>jboss-app_4_2.dtd</key>
+               <value>org.jboss.metadata.ear.jboss.JBoss50DTDAppMetaData</value>
+            </entry>
+            <entry>
+               <key>jboss-app_5_0.dtd</key>
+               <value>org.jboss.metadata.ear.jboss.JBoss50DTDAppMetaData</value>
+            </entry>
+            <entry>
+               <key>jboss-app_5_0.xsd</key>
+               <value>org.jboss.metadata.ear.jboss.JBoss50AppMetaData</value>
+            </entry>
+
+            <!-- ApplicationClientMetaData -->
+            <entry>
+               <key>application-client</key>
+               <value>org.jboss.metadata.client.spec.ApplicationClient14DTDMetaData</value>
+            </entry>
+            <entry>
+               <key>application-client_1_2.dtd</key>
+               <value>org.jboss.metadata.client.spec.ApplicationClient14DTDMetaData</value>
+            </entry>
+            <entry>
+               <key>application-client_1_3.dtd</key>
+               <value>org.jboss.metadata.client.spec.ApplicationClient14DTDMetaData</value>
+            </entry>
+            <entry>
+               <key>application-client_1_4.xsd</key>
+               <value>org.jboss.metadata.client.spec.ApplicationClient14MetaData</value>
+            </entry>
+            <entry>
+               <key>application-client_5.xsd</key>
+               <value>org.jboss.metadata.client.spec.ApplicationClient5MetaData</value>
+            </entry>
+            <!-- ApplicationClientMetaData -->
+            <entry>
+               <key>jboss-client</key>
+               <value>org.jboss.metadata.client.jboss.JBossClient5DTDMetaData</value>
+            </entry>
+            <entry>
+               <key>jboss-client_3_0.dtd</key>
+               <value>org.jboss.metadata.client.jboss.JBossClient5DTDMetaData</value>
+            </entry>
+            <entry>
+               <key>jboss-client_3_2.dtd</key>
+               <value>org.jboss.metadata.client.jboss.JBossClient5DTDMetaData</value>
+            </entry>
+            <entry>
+               <key>jboss-client_4_0.dtd</key>
+               <value>org.jboss.metadata.client.jboss.JBossClient5DTDMetaData</value>
+            </entry>
+            <entry>
+               <key>jboss-client_4_2.dtd</key>
+               <value>org.jboss.metadata.client.jboss.JBossClient5DTDMetaData</value>
+            </entry>
+            <entry>
+               <key>jboss-client_5_0.dtd</key>
+               <value>org.jboss.metadata.client.jboss.JBossClient5DTDMetaData</value>
+            </entry>
+            <entry>
+               <key>jboss-client_5_0.xsd</key>
+               <value>org.jboss.metadata.client.jboss.JBossClient5MetaData</value>
+            </entry>
+            
+            <!-- EjbJarMetaData -->
+            <entry>
+               <key>ejb-jar</key>
+               <value>org.jboss.metadata.ejb.spec.EjbJar20MetaData</value>
+            </entry>
+            <entry>
+               <key>ejb-jar_1_1.dtd</key>
+               <value>org.jboss.metadata.ejb.spec.EjbJar1xMetaData</value>
+            </entry>
+            <entry>
+               <key>ejb-jar_2_0.dtd</key>
+               <value>org.jboss.metadata.ejb.spec.EjbJar20MetaData</value>
+            </entry>
+            <entry>
+               <key>ejb-jar_2_1.xsd</key>
+               <value>org.jboss.metadata.ejb.spec.EjbJar21MetaData</value>
+            </entry>
+            <entry>
+               <key>ejb-jar_3_0.xsd</key>
+               <value>org.jboss.metadata.ejb.spec.EjbJar30MetaData</value>
+            </entry>
+            
+            <!-- JBossMetaData -->
+            <entry>
+               <key>jboss</key>
+               <value>org.jboss.metadata.ejb.jboss.JBoss50DTDMetaData</value>
+            </entry>            
+            <entry>
+               <key>jboss_3_0.dtd</key>
+               <value>org.jboss.metadata.ejb.jboss.JBoss50DTDMetaData</value>
+            </entry>            
+            <entry>
+               <key>jboss_3_2.dtd</key>
+               <value>org.jboss.metadata.ejb.jboss.JBoss50DTDMetaData</value>
+            </entry>            
+            <entry>
+               <key>jboss_4_0.dtd</key>
+               <value>org.jboss.metadata.ejb.jboss.JBoss50DTDMetaData</value>
+            </entry>            
+            <entry>
+               <key>jboss_4_2.dtd</key>
+               <value>org.jboss.metadata.ejb.jboss.JBoss50DTDMetaData</value>
+            </entry>            
+            <entry>
+               <key>jboss_5_0.dtd</key>
+               <value>org.jboss.metadata.ejb.jboss.JBoss50DTDMetaData</value>
+            </entry>            
+            <entry>
+               <key>jboss_5_0.xsd</key>
+               <value>org.jboss.metadata.ejb.jboss.JBoss50MetaData</value>
+            </entry>
+            
+            <!-- WebMetaData -->
+            <entry>
+               <key>web-app</key>
+               <value>org.jboss.metadata.web.spec.Web23MetaData</value>
+            </entry>
+            <entry>
+               <key>web-app_2_2.dtd</key>
+               <value>org.jboss.metadata.web.spec.Web23MetaData</value>
+            </entry>
+            <entry>
+               <key>web-app_2_3.dtd</key>
+               <value>org.jboss.metadata.web.spec.Web23MetaData</value>
+            </entry>
+            <entry>
+               <key>web-app_2_4.xsd</key>
+               <value>org.jboss.metadata.web.spec.Web24MetaData</value>
+            </entry>
+            <entry>
+               <key>web-app_2_5.xsd</key>
+               <value>org.jboss.metadata.web.spec.Web25MetaData</value>
+            </entry>
+            <!-- JBossWebMetaData -->
+            <entry>
+               <key>jboss-web</key>
+               <value>org.jboss.metadata.web.jboss.JBoss50DTDWebMetaData</value>
+            </entry>
+            <entry>
+               <key>jboss-web_3_0.dtd</key>
+               <value>org.jboss.metadata.web.jboss.JBoss50DTDWebMetaData</value>
+            </entry>
+            <entry>
+               <key>jboss-web_3_2.dtd</key>
+               <value>org.jboss.metadata.web.jboss.JBoss50DTDWebMetaData</value>
+            </entry>
+            <entry>
+               <key>jboss-web_4_0.dtd</key>
+               <value>org.jboss.metadata.web.jboss.JBoss50DTDWebMetaData</value>
+            </entry>
+            <entry>
+               <key>jboss-web_4_2.dtd</key>
+               <value>org.jboss.metadata.web.jboss.JBoss50DTDWebMetaData</value>
+            </entry>
+            <entry>
+               <key>jboss-web_5_0.dtd</key>
+               <value>org.jboss.metadata.web.jboss.JBoss50DTDWebMetaData</value>
+            </entry>
+            <entry>
+               <key>jboss-web_5_0.xsd</key>
+               <value>org.jboss.metadata.web.jboss.JBoss50WebMetaData</value>
+            </entry>
+         </map>
+      </property>
+   </bean>
+   
+</deployment>


Property changes on: trunk/embedded/src/main/resources/javase/deployers/metadata-beans.xml
___________________________________________________________________
Name: svn:mime-type
   + text/plain

More information about the jboss-cvs-commits mailing list