[jboss-cvs] JBossAS SVN: r58181 - in trunk/server/src: etc/conf/default resources/dtd

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

Author: alex.loubyansky at jboss.com
Date: 2006-11-07 09:55:59 -0500 (Tue, 07 Nov 2006)
New Revision: 58181

Modified:
   trunk/server/src/etc/conf/default/standardjboss.xml
   trunk/server/src/resources/dtd/jboss_4_0.dtd
   trunk/server/src/resources/dtd/jboss_5_0.dtd
Log:
fix the order of elements in the standardjboss.xml, declare elements used as the content of ANY

Modified: trunk/server/src/etc/conf/default/standardjboss.xml
===================================================================
--- trunk/server/src/etc/conf/default/standardjboss.xml	2006-11-07 13:34:26 UTC (rev 58180)
+++ trunk/server/src/etc/conf/default/standardjboss.xml	2006-11-07 14:55:59 UTC (rev 58181)
@@ -324,6 +324,12 @@
       <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>
@@ -366,12 +372,6 @@
               <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>

Modified: trunk/server/src/resources/dtd/jboss_4_0.dtd
===================================================================
--- trunk/server/src/resources/dtd/jboss_4_0.dtd	2006-11-07 13:34:26 UTC (rev 58180)
+++ trunk/server/src/resources/dtd/jboss_4_0.dtd	2006-11-07 14:55:59 UTC (rev 58181)
@@ -1494,6 +1494,12 @@
 <!ELEMENT cache-policy-conf-other ANY>
 
 <!--
+  Possible content for the cache-policy-conf-other
+-->
+<!ELEMENT partitions (#PCDATA)>
+<!ELEMENT batch-commit-strategy (#PCDATA)>
+
+<!--
   The container-pool-conf element holds configuration data for the
   instance pool.
   jboss does not read directly the subtree for this element: instead,

Modified: trunk/server/src/resources/dtd/jboss_5_0.dtd
===================================================================
--- trunk/server/src/resources/dtd/jboss_5_0.dtd	2006-11-07 13:34:26 UTC (rev 58180)
+++ trunk/server/src/resources/dtd/jboss_5_0.dtd	2006-11-07 14:55:59 UTC (rev 58181)
@@ -1411,6 +1411,12 @@
 <!ELEMENT cache-policy-conf-other ANY>
 
 <!--
+  Possible content for the cache-policy-conf-other
+-->
+<!ELEMENT partitions (#PCDATA)>
+<!ELEMENT batch-commit-strategy (#PCDATA)>
+
+<!--
   The container-pool-conf element holds configuration data for the
   instance pool.
   jboss does not read directly the subtree for this element: instead,