[jboss-cvs] JBossAS SVN: r88801 - in branches/Branch_5_x: server/src/etc/conf/all and 1 other directory.

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

Author: alex.loubyansky at jboss.com
Date: 2009-05-13 06:52:10 -0400 (Wed, 13 May 2009)
New Revision: 88801

Modified:
   branches/Branch_5_x/component-matrix/pom.xml
   branches/Branch_5_x/server/src/etc/conf/all/standardjboss.xml
Log:
JBAS-6907, JBAS-6908

Modified: branches/Branch_5_x/component-matrix/pom.xml
===================================================================
--- branches/Branch_5_x/component-matrix/pom.xml	2009-05-13 09:58:14 UTC (rev 88800)
+++ branches/Branch_5_x/component-matrix/pom.xml	2009-05-13 10:52:10 UTC (rev 88801)
@@ -81,7 +81,7 @@
     <version.org.jboss.logmanager>1.0.0.GA</version.org.jboss.logmanager>
     <version.org.jboss.man>2.1.0.CR8</version.org.jboss.man>
     <version.org.jboss.mdr>2.0.1.GA</version.org.jboss.mdr>
-    <version.org.jboss.metadata>1.0.0.CR18</version.org.jboss.metadata>
+    <version.org.jboss.metadata>1.0.0.GA</version.org.jboss.metadata>
     <version.org.jboss.microcontainer>2.0.5.GA</version.org.jboss.microcontainer>
     <version.org.jboss.naming>5.0.3.GA</version.org.jboss.naming>
     <version.org.jboss.reflect>2.0.2.GA</version.org.jboss.reflect>

Modified: branches/Branch_5_x/server/src/etc/conf/all/standardjboss.xml
===================================================================
--- branches/Branch_5_x/server/src/etc/conf/all/standardjboss.xml	2009-05-13 09:58:14 UTC (rev 88800)
+++ branches/Branch_5_x/server/src/etc/conf/all/standardjboss.xml	2009-05-13 10:52:10 UTC (rev 88801)
@@ -341,12 +341,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>
@@ -389,6 +383,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>