[jboss-cvs] JBossAS SVN: r86049 - in projects/metadata/trunk/src: test/resources/org/jboss/test/metadata/ejb and 1 other directory.

[jboss-cvs-commits at lists.jboss.org]

Author: alex.loubyansky at jboss.com
Date: 2009-03-18 10:24:07 -0400 (Wed, 18 Mar 2009)
New Revision: 86049

Modified:
   projects/metadata/trunk/src/main/resources/dtd/jboss_4_2.dtd
   projects/metadata/trunk/src/main/resources/dtd/jboss_5_0.dtd
   projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/JBoss5xEverything_testStandard.xml
Log:
JBMETA-171

Modified: projects/metadata/trunk/src/main/resources/dtd/jboss_4_2.dtd
===================================================================
--- projects/metadata/trunk/src/main/resources/dtd/jboss_4_2.dtd	2009-03-18 14:10:58 UTC (rev 86048)
+++ projects/metadata/trunk/src/main/resources/dtd/jboss_4_2.dtd	2009-03-18 14:24:07 UTC (rev 86049)
@@ -291,8 +291,8 @@
 <!-- The proxy-factory-config defines the client-interceptors stack
 and other configuration options to use for the various EJB proxies.
 -->
-<!ELEMENT proxy-factory-config (client-interceptors?, endpoint-interceptors? , web-class-loader? ,
-activation-config?, JMSProviderAdapterJNDI? , ServerSessionPoolFactoryJNDI? , 
+<!ELEMENT proxy-factory-config (client-interceptors? , activation-config? , endpoint-interceptors? , 
+web-class-loader? , JMSProviderAdapterJNDI? , ServerSessionPoolFactoryJNDI? ,
 CreateJBossMQDestination? , MinimumSize? , MaximumSize? ,
 KeepAliveMillis? , MaxMessages? , MDBConfig? , poa? , register-ejbs-in-jnp-context? , 
 jnp-context? , interface-repository-supported?)>

Modified: projects/metadata/trunk/src/main/resources/dtd/jboss_5_0.dtd
===================================================================
--- projects/metadata/trunk/src/main/resources/dtd/jboss_5_0.dtd	2009-03-18 14:10:58 UTC (rev 86048)
+++ projects/metadata/trunk/src/main/resources/dtd/jboss_5_0.dtd	2009-03-18 14:24:07 UTC (rev 86049)
@@ -290,8 +290,8 @@
 <!-- The proxy-factory-config defines the client-interceptors stack
 and other configuration options to use for the various EJB proxies.
 -->
-<!ELEMENT proxy-factory-config (client-interceptors?, endpoint-interceptors? , web-class-loader? ,
-activation-config?, JMSProviderAdapterJNDI? , ServerSessionPoolFactoryJNDI? , 
+<!ELEMENT proxy-factory-config (client-interceptors? , activation-config? , endpoint-interceptors? , 
+web-class-loader? , JMSProviderAdapterJNDI? , ServerSessionPoolFactoryJNDI? ,
 CreateJBossMQDestination? , MinimumSize? , MaximumSize? ,
 KeepAliveMillis? , MaxMessages? , MDBConfig? , poa? , register-ejbs-in-jnp-context? , 
 jnp-context? , interface-repository-supported?)>

Modified: projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/JBoss5xEverything_testStandard.xml
===================================================================
--- projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/JBoss5xEverything_testStandard.xml	2009-03-18 14:10:58 UTC (rev 86048)
+++ projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/ejb/JBoss5xEverything_testStandard.xml	2009-03-18 14:24:07 UTC (rev 86049)
@@ -300,12 +300,6 @@
       <invoker-mbean>default</invoker-mbean>
       <proxy-factory>org.jboss.ejb.plugins.inflow.JBossJMSMessageEndpointFactory</proxy-factory>
       <proxy-factory-config>
-        <endpoint-interceptors>
-          <interceptor>org.jboss.proxy.ClientMethodInterceptor</interceptor>
-          <interceptor>org.jboss.ejb.plugins.inflow.MessageEndpointInterceptor</interceptor>
-          <interceptor>org.jboss.proxy.TransactionInterceptor</interceptor>
-          <interceptor>org.jboss.invocation.InvokerInterceptor</interceptor>
-        </endpoint-interceptors>
         <activation-config>
            <activation-config-property>
               <activation-config-property-name>providerAdapterJNDI</activation-config-property-name>
@@ -348,6 +342,12 @@
               <activation-config-property-value>10</activation-config-property-value>
            </activation-config-property>
         </activation-config>
+        <endpoint-interceptors>
+          <interceptor>org.jboss.proxy.ClientMethodInterceptor</interceptor>
+          <interceptor>org.jboss.ejb.plugins.inflow.MessageEndpointInterceptor</interceptor>
+          <interceptor>org.jboss.proxy.TransactionInterceptor</interceptor>
+          <interceptor>org.jboss.invocation.InvokerInterceptor</interceptor>
+        </endpoint-interceptors>
       </proxy-factory-config>
     </invoker-proxy-binding>
   </invoker-proxy-bindings>