[jboss-cvs] JBossAS SVN: r104681 - in trunk/connector/src: resources/stylesheets and 1 other directory.

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

Author: bstansberry at jboss.com
Date: 2010-05-11 09:37:08 -0400 (Tue, 11 May 2010)
New Revision: 104681

Modified:
   trunk/connector/src/main/java/org/jboss/resource/metadata/mcf/ManagedConnectionFactoryDeploymentMetaData.java
   trunk/connector/src/resources/stylesheets/ConnectionFactoryTemplate.xsl
Log:
[JBAS-7563] Use the unified invoker

Modified: trunk/connector/src/main/java/org/jboss/resource/metadata/mcf/ManagedConnectionFactoryDeploymentMetaData.java
===================================================================
--- trunk/connector/src/main/java/org/jboss/resource/metadata/mcf/ManagedConnectionFactoryDeploymentMetaData.java	2010-05-11 13:22:37 UTC (rev 104680)
+++ trunk/connector/src/main/java/org/jboss/resource/metadata/mcf/ManagedConnectionFactoryDeploymentMetaData.java	2010-05-11 13:37:08 UTC (rev 104681)
@@ -84,7 +84,7 @@
    /** The jmxInvokerName */
    @XmlElement(name="jmx-invoker-name")
    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-   private String jmxInvokerName = "jboss:service=invoker,type=jrmp";
+   private String jmxInvokerName = "jboss:service=invoker,type=unified";
    
    @XmlElement(name="min-pool-size")
    private int minSize = 0;

Modified: trunk/connector/src/resources/stylesheets/ConnectionFactoryTemplate.xsl
===================================================================
--- trunk/connector/src/resources/stylesheets/ConnectionFactoryTemplate.xsl	2010-05-11 13:22:37 UTC (rev 104680)
+++ trunk/connector/src/resources/stylesheets/ConnectionFactoryTemplate.xsl	2010-05-11 13:37:08 UTC (rev 104681)
@@ -566,7 +566,7 @@
           <depends optional-attribute-name="JMXInvokerName"><xsl:value-of select="jmx-invoker-name"/></depends>
         </xsl:when>
         <xsl:otherwise>
-          <depends optional-attribute-name="JMXInvokerName">jboss:service=invoker,type=jrmp</depends>
+          <depends optional-attribute-name="JMXInvokerName">jboss:service=invoker,type=unified</depends>
         </xsl:otherwise>
       </xsl:choose>
     
@@ -583,7 +583,7 @@
                <depends optional-attribute-name="JMXInvokerName"><xsl:value-of select="jmx-invoker-name"/></depends>
             </xsl:when>
             <xsl:otherwise>
-               <depends optional-attribute-name="JMXInvokerName">jboss:service=invoker,type=jrmp</depends>
+               <depends optional-attribute-name="JMXInvokerName">jboss:service=invoker,type=unified</depends>
             </xsl:otherwise>
          </xsl:choose>
       </xsl:if>