[jboss-cvs] JBossAS SVN: r60399 - branches/Branch_4_2/connector/src/resources/stylesheets.

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

Author: weston.price at jboss.com
Date: 2007-02-07 14:27:50 -0500 (Wed, 07 Feb 2007)
New Revision: 60399

Modified:
   branches/Branch_4_2/connector/src/resources/stylesheets/ConnectionFactoryTemplate.xsl
Log:
[JBAS-2215] Reworked ds-binding template to only set JMX invoker name
when use-java-context is set to false. 

Modified: branches/Branch_4_2/connector/src/resources/stylesheets/ConnectionFactoryTemplate.xsl
===================================================================
--- branches/Branch_4_2/connector/src/resources/stylesheets/ConnectionFactoryTemplate.xsl	2007-02-07 19:26:50 UTC (rev 60398)
+++ branches/Branch_4_2/connector/src/resources/stylesheets/ConnectionFactoryTemplate.xsl	2007-02-07 19:27:50 UTC (rev 60399)
@@ -475,21 +475,21 @@
            name="jboss.jca:service=DataSourceBinding,name={jndi-name}" 
            display-name="Binding for DataSource {jndi-name}">
       <attribute name="JndiName"><xsl:value-of select="jndi-name"/></attribute>
-      <!--
+
       <xsl:choose>
-         <xsl:when test="use-java-context">
-            <xsl:call-template name="use-java-context">
-               <xsl:with-param name="use-java"><xsl:value-of select="use-java-context"/></xsl:with-param>
-            </xsl:call-template>
-         </xsl:when>
-         <xsl:otherwise>
-            <attribute name="UseJavaContext">true</attribute>
-         </xsl:otherwise>
-       </xsl:choose>
-      -->
-      <xsl:choose>
         <xsl:when test="use-java-context">
           <attribute name="UseJavaContext"><xsl:value-of select="use-java-context"/></attribute>
+          <xsl:variable name="use-context"><xsl:value-of select="use-java-context"/></xsl:variable>
+          <xsl:if test="$use-context = 'false'">
+              <xsl:choose>
+                <xsl:when test="jmx-invoker-name">
+                  <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>                  
+                </xsl:otherwise>  
+              </xsl:choose>
+          </xsl:if>
         </xsl:when>
         <xsl:otherwise>
           <attribute name="UseJavaContext">true</attribute>
@@ -498,34 +498,9 @@
       <depends optional-attribute-name="ConnectionManager">
          <xsl:value-of select="$cm-name"/>,name=<xsl:value-of select="jndi-name"/>
       </depends>
-      <xsl:choose>
-        <xsl:when test="jmx-invoker-name">
-          <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>
-        </xsl:otherwise>
-      </xsl:choose>
-    
     </mbean>
   </xsl:template>
 
-   <xsl:template name="use-java-context">
-      <xsl:param name="use-java" />
-      <attribute name="UseJavaContext"><xsl:value-of select="$use-java"/></attribute>
-      <!-- Only assign the JMXInvokerName attribute and dependency if use-java-context is false -->
-      <xsl:if test="$use-java = 'false'">
-         <xsl:choose>
-            <xsl:when test="jmx-invoker-name">
-               <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>
-            </xsl:otherwise>
-         </xsl:choose>
-      </xsl:if>
-   </xsl:template>
-
   <!-- Connection factory binding -->
   <xsl:template name="cf-binding">
     <xsl:param name="cm-name"></xsl:param>