From: Scott S. <sco...@jb...> - 2005-07-21 16:16:56
|
User: starksm Date: 05/07/21 12:15:48 Modified: src/resources/stylesheets Tag: Branch_4_0 ConnectionFactoryTemplate.xsl Log: Fix for (JBAS-2033) ConnectionFactoryTemplate.xsl contains invalid markup. Revision Changes Path No revision No revision 1.22.2.7 +2 -2 jbosscx/src/resources/stylesheets/ConnectionFactoryTemplate.xsl (In the diff below, changes in quantity of whitespace are not shown.) Index: ConnectionFactoryTemplate.xsl =================================================================== RCS file: /cvsroot/jboss/jbosscx/src/resources/stylesheets/ConnectionFactoryTemplate.xsl,v retrieving revision 1.22.2.6 retrieving revision 1.22.2.7 diff -u -b -r1.22.2.6 -r1.22.2.7 --- ConnectionFactoryTemplate.xsl 3 Apr 2005 14:32:51 -0000 1.22.2.6 +++ ConnectionFactoryTemplate.xsl 21 Jul 2005 16:15:48 -0000 1.22.2.7 @@ -240,7 +240,7 @@ <depends optional-attribute-name="ManagedConnectionFactoryName"> <!--embedded mbean--> <mbean code="org.jboss.resource.connectionmanager.RARDeployment" - name="jboss.jca:service=ManagedConnectionFactory,name={jndi-name}"> + name="jboss.jca:service=ManagedConnectionFactory,name={jndi-name}" displayname="ManagedConnectionFactory for DataSource {jndi-name}"> <xsl:apply-templates select="depends" mode="anonymous"/> @@ -605,7 +605,7 @@ <depends optional-attribute-name="ManagedConnectionFactoryName"> <!--embedded mbean--> <mbean code="org.jboss.resource.connectionmanager.RARDeployment" - name="jboss.jca:service=ManagedConnectionFactory,name={jndi-name}"> + name="jboss.jca:service=ManagedConnectionFactory,name={jndi-name}" displayname="ManagedConnectionFactory for DataSource {jndi-name}"> <xsl:apply-templates select="depends" mode="anonymous"/> |
From: Scott S. <sco...@jb...> - 2005-07-21 16:18:12
|
User: starksm Date: 05/07/21 12:17:10 Modified: src/resources/stylesheets ConnectionFactoryTemplate.xsl Log: Fix for (JBAS-2033) ConnectionFactoryTemplate.xsl contains invalid markup. Revision Changes Path 1.33 +2 -2 jbosscx/src/resources/stylesheets/ConnectionFactoryTemplate.xsl (In the diff below, changes in quantity of whitespace are not shown.) Index: ConnectionFactoryTemplate.xsl =================================================================== RCS file: /cvsroot/jboss/jbosscx/src/resources/stylesheets/ConnectionFactoryTemplate.xsl,v retrieving revision 1.32 retrieving revision 1.33 diff -u -b -r1.32 -r1.33 --- ConnectionFactoryTemplate.xsl 31 Mar 2005 15:41:21 -0000 1.32 +++ ConnectionFactoryTemplate.xsl 21 Jul 2005 16:17:10 -0000 1.33 @@ -240,7 +240,7 @@ <depends optional-attribute-name="ManagedConnectionFactoryName"> <!--embedded mbean--> <mbean code="org.jboss.resource.connectionmanager.RARDeployment" - name="jboss.jca:service=ManagedConnectionFactory,name={jndi-name}"> + name="jboss.jca:service=ManagedConnectionFactory,name={jndi-name}" displayname="ManagedConnectionFactory for DataSource {jndi-name}"> <xsl:apply-templates select="depends" mode="anonymous"/> @@ -605,7 +605,7 @@ <depends optional-attribute-name="ManagedConnectionFactoryName"> <!--embedded mbean--> <mbean code="org.jboss.resource.connectionmanager.RARDeployment" - name="jboss.jca:service=ManagedConnectionFactory,name={jndi-name}"> + name="jboss.jca:service=ManagedConnectionFactory,name={jndi-name}" displayname="ManagedConnectionFactory for DataSource {jndi-name}"> <xsl:apply-templates select="depends" mode="anonymous"/> |
From: Scott S. <sco...@jb...> - 2005-07-21 16:22:29
|
User: starksm Date: 05/07/21 12:21:27 Modified: src/resources/stylesheets Tag: Branch_3_2 ConnectionFactoryTemplate.xsl Log: Fix for (JBAS-2033) ConnectionFactoryTemplate.xsl contains invalid markup. Revision Changes Path No revision No revision 1.2.2.18 +1 -1 jbosscx/src/resources/stylesheets/ConnectionFactoryTemplate.xsl (In the diff below, changes in quantity of whitespace are not shown.) Index: ConnectionFactoryTemplate.xsl =================================================================== RCS file: /cvsroot/jboss/jbosscx/src/resources/stylesheets/ConnectionFactoryTemplate.xsl,v retrieving revision 1.2.2.17 retrieving revision 1.2.2.18 diff -u -b -r1.2.2.17 -r1.2.2.18 --- ConnectionFactoryTemplate.xsl 13 Jul 2004 14:56:12 -0000 1.2.2.17 +++ ConnectionFactoryTemplate.xsl 21 Jul 2005 16:21:27 -0000 1.2.2.18 @@ -191,7 +191,7 @@ <depends optional-attribute-name="ManagedConnectionFactoryName"> <!--embedded mbean--> <mbean code="org.jboss.resource.connectionmanager.RARDeployment" - name="jboss.jca:service=ManagedConnectionFactory,name={jndi-name}"> + name="jboss.jca:service=ManagedConnectionFactory,name={jndi-name}" displayname="ManagedConnectionFactory for DataSource {jndi-name}"> <xsl:apply-templates select="depends" mode="anonymous"/> |
From: Adrian B. <adr...@jb...> - 2005-08-07 00:40:09
|
User: adrian Date: 05/08/06 20:38:49 Modified: src/resources/stylesheets Tag: Branch_4_0 ConnectionFactoryTemplate.xsl Log: [JBAS-2027] - Forward port <set-tx-query-timeout/> from 3.2.x. Add an additional <query-timeout/> See the dtd for more info. Revision Changes Path No revision No revision 1.22.2.8 +6 -2 jbosscx/src/resources/stylesheets/ConnectionFactoryTemplate.xsl (In the diff below, changes in quantity of whitespace are not shown.) Index: ConnectionFactoryTemplate.xsl =================================================================== RCS file: /cvsroot/jboss/jbosscx/src/resources/stylesheets/ConnectionFactoryTemplate.xsl,v retrieving revision 1.22.2.7 retrieving revision 1.22.2.8 diff -u -b -r1.22.2.7 -r1.22.2.8 --- ConnectionFactoryTemplate.xsl 21 Jul 2005 16:15:48 -0000 1.22.2.7 +++ ConnectionFactoryTemplate.xsl 7 Aug 2005 00:38:49 -0000 1.22.2.8 @@ -275,7 +275,6 @@ <xsl:if test="transaction-isolation"> <config-property name="TransactionIsolation" type="java.lang.String"><xsl:value-of select="normalize-space(transaction-isolation)"/></config-property> </xsl:if> - <xsl:if test="user-name"> <config-property name="UserName" type="java.lang.String"><xsl:value-of select="normalize-space(user-name)"/></config-property> </xsl:if> @@ -303,7 +302,12 @@ <xsl:if test="share-prepared-statements"> <config-property name="SharePreparedStatements" type="boolean"><xsl:value-of select="normalize-space(share-prepared-statements)"/></config-property> </xsl:if> - + <xsl:if test="set-tx-query-timeout"> + <config-property name="TransactionQueryTimeout" type="boolean">true</config-property> + </xsl:if> + <xsl:if test="query-timeout"> + <config-property name="QueryTimeout" type="int"><xsl:value-of select="normalize-space(query-timeout)"/></config-property> + </xsl:if> <xsl:if test="url-delimeter"> <config-property name="URLDelimeter" type="java.lang.String"><xsl:value-of select="normalize-space(url-delimeter)"/></config-property> </xsl:if> |
From: Adrian B. <adr...@jb...> - 2005-08-07 00:40:15
|
User: adrian Date: 05/08/06 20:38:59 Modified: src/resources/stylesheets ConnectionFactoryTemplate.xsl Log: [JBAS-2027] - Forward port <set-tx-query-timeout/> from 3.2.x. Add an additional <query-timeout/> See the dtd for more info. Revision Changes Path 1.34 +6 -2 jbosscx/src/resources/stylesheets/ConnectionFactoryTemplate.xsl (In the diff below, changes in quantity of whitespace are not shown.) Index: ConnectionFactoryTemplate.xsl =================================================================== RCS file: /cvsroot/jboss/jbosscx/src/resources/stylesheets/ConnectionFactoryTemplate.xsl,v retrieving revision 1.33 retrieving revision 1.34 diff -u -b -r1.33 -r1.34 --- ConnectionFactoryTemplate.xsl 21 Jul 2005 16:17:10 -0000 1.33 +++ ConnectionFactoryTemplate.xsl 7 Aug 2005 00:38:59 -0000 1.34 @@ -275,7 +275,6 @@ <xsl:if test="transaction-isolation"> <config-property name="TransactionIsolation" type="java.lang.String"><xsl:value-of select="normalize-space(transaction-isolation)"/></config-property> </xsl:if> - <xsl:if test="user-name"> <config-property name="UserName" type="java.lang.String"><xsl:value-of select="normalize-space(user-name)"/></config-property> </xsl:if> @@ -303,7 +302,12 @@ <xsl:if test="share-prepared-statements"> <config-property name="SharePreparedStatements" type="boolean"><xsl:value-of select="normalize-space(share-prepared-statements)"/></config-property> </xsl:if> - + <xsl:if test="set-tx-query-timeout"> + <config-property name="TransactionQueryTimeout" type="boolean">true</config-property> + </xsl:if> + <xsl:if test="query-timeout"> + <config-property name="QueryTimeout" type="int"><xsl:value-of select="normalize-space(query-timeout)"/></config-property> + </xsl:if> <xsl:if test="url-delimeter"> <config-property name="URLDelimeter" type="java.lang.String"><xsl:value-of select="normalize-space(url-delimeter)"/></config-property> </xsl:if> |
From: Adrian B. <adr...@jb...> - 2005-08-07 01:34:22
|
User: adrian Date: 05/08/06 21:33:03 Modified: src/resources/stylesheets Tag: Branch_4_0 ConnectionFactoryTemplate.xsl Log: [JBAS-2027] - Add <xa-resource-timeout/> See the dtd for more info. Revision Changes Path No revision No revision 1.22.2.9 +12 -0 jbosscx/src/resources/stylesheets/ConnectionFactoryTemplate.xsl (In the diff below, changes in quantity of whitespace are not shown.) Index: ConnectionFactoryTemplate.xsl =================================================================== RCS file: /cvsroot/jboss/jbosscx/src/resources/stylesheets/ConnectionFactoryTemplate.xsl,v retrieving revision 1.22.2.8 retrieving revision 1.22.2.9 diff -u -b -r1.22.2.8 -r1.22.2.9 --- ConnectionFactoryTemplate.xsl 7 Aug 2005 00:38:49 -0000 1.22.2.8 +++ ConnectionFactoryTemplate.xsl 7 Aug 2005 01:33:02 -0000 1.22.2.9 @@ -38,6 +38,10 @@ </xsl:otherwise> </xsl:choose> + <xsl:if test="xa-resource-timeout"> + <attribute name="XAResourceTransactionTimeout"><xsl:value-of select="normalize-space(xa-resource-timeout)"/></attribute> + </xsl:if> + <xsl:call-template name="pool"> <xsl:with-param name="mcf-template">generic-mcf</xsl:with-param> </xsl:call-template> @@ -142,6 +146,10 @@ </xsl:otherwise> </xsl:choose> + <xsl:if test="xa-resource-timeout"> + <attribute name="XAResourceTransactionTimeout"><xsl:value-of select="normalize-space(xa-resource-timeout)"/></attribute> + </xsl:if> + <xsl:call-template name="pool"> <xsl:with-param name="mcf-template">xa-wrapper</xsl:with-param> </xsl:call-template> @@ -589,6 +597,10 @@ </xsl:otherwise> </xsl:choose> + <xsl:if test="xa-resource-timeout"> + <attribute name="XAResourceTransactionTimeout"><xsl:value-of select="normalize-space(xa-resource-timeout)"/></attribute> + </xsl:if> + <xsl:call-template name="pool"> <xsl:with-param name="mcf-template">ha-xa-wrapper</xsl:with-param> </xsl:call-template> |
From: Adrian B. <adr...@jb...> - 2005-08-07 01:34:23
|
User: adrian Date: 05/08/06 21:33:06 Modified: src/resources/stylesheets ConnectionFactoryTemplate.xsl Log: [JBAS-2027] - Add <xa-resource-timeout/> See the dtd for more info. Revision Changes Path 1.35 +12 -0 jbosscx/src/resources/stylesheets/ConnectionFactoryTemplate.xsl (In the diff below, changes in quantity of whitespace are not shown.) Index: ConnectionFactoryTemplate.xsl =================================================================== RCS file: /cvsroot/jboss/jbosscx/src/resources/stylesheets/ConnectionFactoryTemplate.xsl,v retrieving revision 1.34 retrieving revision 1.35 diff -u -b -r1.34 -r1.35 --- ConnectionFactoryTemplate.xsl 7 Aug 2005 00:38:59 -0000 1.34 +++ ConnectionFactoryTemplate.xsl 7 Aug 2005 01:33:06 -0000 1.35 @@ -38,6 +38,10 @@ </xsl:otherwise> </xsl:choose> + <xsl:if test="xa-resource-timeout"> + <attribute name="XAResourceTransactionTimeout"><xsl:value-of select="normalize-space(xa-resource-timeout)"/></attribute> + </xsl:if> + <xsl:call-template name="pool"> <xsl:with-param name="mcf-template">generic-mcf</xsl:with-param> </xsl:call-template> @@ -142,6 +146,10 @@ </xsl:otherwise> </xsl:choose> + <xsl:if test="xa-resource-timeout"> + <attribute name="XAResourceTransactionTimeout"><xsl:value-of select="normalize-space(xa-resource-timeout)"/></attribute> + </xsl:if> + <xsl:call-template name="pool"> <xsl:with-param name="mcf-template">xa-wrapper</xsl:with-param> </xsl:call-template> @@ -589,6 +597,10 @@ </xsl:otherwise> </xsl:choose> + <xsl:if test="xa-resource-timeout"> + <attribute name="XAResourceTransactionTimeout"><xsl:value-of select="normalize-space(xa-resource-timeout)"/></attribute> + </xsl:if> + <xsl:call-template name="pool"> <xsl:with-param name="mcf-template">ha-xa-wrapper</xsl:with-param> </xsl:call-template> |
From: Scott S. <sco...@jb...> - 2005-09-05 05:05:05
|
User: starksm Date: 05/09/05 01:05:01 Modified: src/resources/stylesheets Tag: Branch_4_0 ConnectionFactoryTemplate.xsl Log: JBAS-2215, only conditionally create a JMXInvoker dependency when the use-java-context is false to indicate that the proxy is bound into the global jndi namespace. Revision Changes Path No revision No revision 1.22.2.10 +19 -9 jbosscx/src/resources/stylesheets/ConnectionFactoryTemplate.xsl (In the diff below, changes in quantity of whitespace are not shown.) Index: ConnectionFactoryTemplate.xsl =================================================================== RCS file: /cvsroot/jboss/jbosscx/src/resources/stylesheets/ConnectionFactoryTemplate.xsl,v retrieving revision 1.22.2.9 retrieving revision 1.22.2.10 diff -u -b -r1.22.2.9 -r1.22.2.10 --- ConnectionFactoryTemplate.xsl 7 Aug 2005 01:33:02 -0000 1.22.2.9 +++ ConnectionFactoryTemplate.xsl 5 Sep 2005 05:05:01 -0000 1.22.2.10 @@ -428,7 +428,9 @@ <attribute name="JndiName"><xsl:value-of select="jndi-name"/></attribute> <xsl:choose> <xsl:when test="use-java-context"> - <attribute name="UseJavaContext"><xsl:value-of select="use-java-context"/></attribute> + <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> @@ -437,6 +439,14 @@ <depends optional-attribute-name="ConnectionManager"> <xsl:value-of select="$cm-name"/>,name=<xsl:value-of select="jndi-name"/> </depends> + </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> @@ -445,7 +455,7 @@ <depends optional-attribute-name="JMXInvokerName">jboss:service=invoker,type=jrmp</depends> </xsl:otherwise> </xsl:choose> - </mbean> + </xsl:if> </xsl:template> <!-- Connection factory binding --> |
From: Scott S. <sco...@jb...> - 2005-09-05 05:08:00
|
User: starksm Date: 05/09/05 01:07:58 Modified: src/resources/stylesheets ConnectionFactoryTemplate.xsl Log: JBAS-2215, only conditionally create a JMXInvoker dependency when the use-java-context is false to indicate that the proxy is bound into the global jndi namespace. Revision Changes Path 1.36 +12 -2 jbosscx/src/resources/stylesheets/ConnectionFactoryTemplate.xsl (In the diff below, changes in quantity of whitespace are not shown.) Index: ConnectionFactoryTemplate.xsl =================================================================== RCS file: /cvsroot/jboss/jbosscx/src/resources/stylesheets/ConnectionFactoryTemplate.xsl,v retrieving revision 1.35 retrieving revision 1.36 diff -u -b -r1.35 -r1.36 --- ConnectionFactoryTemplate.xsl 7 Aug 2005 01:33:06 -0000 1.35 +++ ConnectionFactoryTemplate.xsl 5 Sep 2005 05:07:58 -0000 1.36 @@ -428,7 +428,9 @@ <attribute name="JndiName"><xsl:value-of select="jndi-name"/></attribute> <xsl:choose> <xsl:when test="use-java-context"> - <attribute name="UseJavaContext"><xsl:value-of select="use-java-context"/></attribute> + <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> @@ -437,6 +439,14 @@ <depends optional-attribute-name="ConnectionManager"> <xsl:value-of select="$cm-name"/>,name=<xsl:value-of select="jndi-name"/> </depends> + </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> @@ -445,7 +455,7 @@ <depends optional-attribute-name="JMXInvokerName">jboss:service=invoker,type=jrmp</depends> </xsl:otherwise> </xsl:choose> - </mbean> + </xsl:if> </xsl:template> <!-- Connection factory binding --> |
From: Adrian B. <adr...@jb...> - 2005-11-23 08:13:25
|
User: adrian Date: 05/11/23 03:13:23 Modified: src/resources/stylesheets Tag: Branch_3_2 jboss-ds_1_0.dtd Log: [JBAS-1615] - Backport latest JDBC rars from JBoss4 TODO Make it compile on JDK1.3 Link up the transaction timeout via the connection manager Revision Changes Path No revision No revision 1.1.2.21 +28 -5 jbosscx/src/resources/stylesheets/Attic/jboss-ds_1_0.dtd (In the diff below, changes in quantity of whitespace are not shown.) Index: jboss-ds_1_0.dtd =================================================================== RCS file: /cvsroot/jboss/jbosscx/src/resources/stylesheets/Attic/jboss-ds_1_0.dtd,v retrieving revision 1.1.2.20 retrieving revision 1.1.2.21 diff -u -b -r1.1.2.20 -r1.1.2.21 --- jboss-ds_1_0.dtd 13 Jul 2004 14:56:12 -0000 1.1.2.20 +++ jboss-ds_1_0.dtd 23 Nov 2005 08:13:23 -0000 1.1.2.21 @@ -2,7 +2,7 @@ <!--dtd for jboss 3.2 datasource configurations (*-ds.xml), transformed by ConnectionFactoryTemplate.xsl -$Id: jboss-ds_1_0.dtd,v 1.1.2.20 2004/07/13 14:56:12 ejort Exp $ +$Id: jboss-ds_1_0.dtd,v 1.1.2.21 2005/11/23 08:13:23 adrian Exp $ The datasources element is the root of the jdbc datasource configuration --> @@ -15,7 +15,8 @@ (application-managed-security | security-domain | security-domain-and-application)? , min-pool-size? , max-pool-size? , blocking-timeout-millis? , idle-timeout-minutes? , new-connection-sql, check-valid-connection-sql, valid-connection-checker-class-name, -exception-sorter-class-name, track-statements, prepared-statement-cache-size , depends*)> +exception-sorter-class-name, track-statements, prepared-statement-cache-size , +share-prepared-statements? , query-timeout?, depends*)> <!-- Specify a jca-jdbc non-XADatasource (local) wrapper, using local transactions @@ -26,7 +27,8 @@ min-pool-size? , max-pool-size? , blocking-timeout-millis? , idle-timeout-minutes? , no-tx-separate-pools? , new-connection-sql? , check-valid-connection-sql? , valid-connection-checker-class-name? , exception-sorter-class-name? , track-statements? , -prepared-statement-cache-size? , set-tx-query-timeout , depends*)> +prepared-statement-cache-size? , +share-prepared-statements? , set-tx-query-timeout?, query-timeout?, depends*)> <!-- Specify a jca-jdbc XADatasource wrapper --> @@ -36,7 +38,8 @@ min-pool-size? , max-pool-size? , blocking-timeout-millis? , idle-timeout-minutes? , no-tx-separate-pools? , new-connection-sql? , check-valid-connection-sql? , valid-connection-checker-class-name? , exception-sorter-class-name? , track-statements? , -prepared-statement-cache-size? , set-tx-query-timeout , depends*)> +prepared-statement-cache-size? , +share-prepared-statements? , set-tx-query-timeout?, query-timeout?, depends*)> <!-- The JNDI name under which the DataSource wrapper will be bound. Note that this name is relative to the "java:/" prefix. The full JNDI name of the @@ -268,12 +271,32 @@ --> <!ELEMENT prepared-statement-cache-size (#PCDATA)> -<!-- Whether to set the query timeout based upon the time left until the transaction timeout +<!-- whether to share prepare statements, i.e. whether asking for same + statement twice without closing uses the same underlying prepared statement. + + The default is false. + e.g. + <share-prepared-statements/> +--> +<!ELEMENT share-prepared-statements EMPTY> + +<!-- whether to set the query timeout based on the time remaining until transaction timeout, + any configured query timeout will be used if there is no transaction. + + The default is false. e.g. <set-tx-query-timeout/> --> <!ELEMENT set-tx-query-timeout EMPTY> +<!-- Any configured query timeout in seconds + + The default is no timeout + e.g. 5 minutes + <query-timeout>300</query-timeout> +--> +<!ELEMENT query-timeout (#PCDATA)> + <!-- The depends element specifies the JMX ObjectName string of a service that the connection manager services depend on. |
From: Adrian B. <adr...@jb...> - 2005-11-23 08:13:59
|
User: adrian Date: 05/11/23 03:13:56 Modified: src/resources/stylesheets Tag: Branch_3_2 ConnectionFactoryTemplate.xsl Log: [JBAS-1615] - Backport latest JDBC rars from JBoss4 TODO Make it compile on JDK1.3 Link up the transaction timeout via the connection manager Revision Changes Path No revision No revision 1.2.2.19 +10 -1 jbosscx/src/resources/stylesheets/ConnectionFactoryTemplate.xsl (In the diff below, changes in quantity of whitespace are not shown.) Index: ConnectionFactoryTemplate.xsl =================================================================== RCS file: /cvsroot/jboss/jbosscx/src/resources/stylesheets/ConnectionFactoryTemplate.xsl,v retrieving revision 1.2.2.18 retrieving revision 1.2.2.19 diff -u -b -r1.2.2.18 -r1.2.2.19 --- ConnectionFactoryTemplate.xsl 21 Jul 2005 16:21:27 -0000 1.2.2.18 +++ ConnectionFactoryTemplate.xsl 23 Nov 2005 08:13:56 -0000 1.2.2.19 @@ -243,14 +243,23 @@ <xsl:if test="exception-sorter-class-name"> <config-property name="ExceptionSorterClassName" type="java.lang.String"><xsl:value-of select="normalize-space(exception-sorter-class-name)"/></config-property> </xsl:if> + <xsl:if test="prepared-statement-cache-size"> + <config-property name="PreparedStatementCacheSize" type="int"><xsl:value-of select="normalize-space(prepared-statement-cache-size)"/></config-property> + </xsl:if> + <xsl:if test="share-prepared-statements"> + <config-property name="SharePreparedStatements" type="boolean"><xsl:value-of select="normalize-space(share-prepared-statements)"/></config-property> + </xsl:if> <xsl:if test="track-statements"> <config-property name="TrackStatements" type="java.lang.String"><xsl:value-of select="normalize-space(track-statements)"/></config-property> </xsl:if> <xsl:if test="prepared-statement-cache-size"> <config-property name="PreparedStatementCacheSize" type="int"><xsl:value-of select="normalize-space(prepared-statement-cache-size)"/></config-property> </xsl:if> + <xsl:if test="query-timeout"> + <config-property name="QueryTimeout" type="int"><xsl:value-of select="normalize-space(query-timeout)"/></config-property> + </xsl:if> <xsl:if test="set-tx-query-timeout"> - <config-property name="TxQueryTimeout" type="boolean">true</config-property> + <config-property name="TransactionQueryTimeout" type="boolean">true</config-property> </xsl:if> </xsl:template> |
From: Weston P. <wes...@jb...> - 2006-04-14 00:14:38
|
User: wprice Date: 06/04/13 20:14:37 Modified: src/resources/stylesheets ConnectionFactoryTemplate.xsl Log: New template to allow for prefilling connection pools. Revision Changes Path 1.37 +24 -1 jbosscx/src/resources/stylesheets/ConnectionFactoryTemplate.xsl (In the diff below, changes in quantity of whitespace are not shown.) Index: ConnectionFactoryTemplate.xsl =================================================================== RCS file: /cvsroot/jboss/jbosscx/src/resources/stylesheets/ConnectionFactoryTemplate.xsl,v retrieving revision 1.36 retrieving revision 1.37 diff -u -b -r1.36 -r1.37 --- ConnectionFactoryTemplate.xsl 5 Sep 2005 05:07:58 -0000 1.36 +++ ConnectionFactoryTemplate.xsl 14 Apr 2006 00:14:37 -0000 1.37 @@ -404,6 +404,29 @@ </depends> </xsl:template> + <!-- template to generate poolfiller --> + + <xsl:template name="poolfiller"> + <xsl:param name="jndi-name"/> + <xsl:if test="prefill"> + + <xsl:choose> + <xsl:when test="application-managed-security"/> + + <xsl:otherwise> + + <mbean code="org.jboss.resource.connectionmanager.PoolFillerService" + name="jboss.jca:service=PoolFiller,name={jndi-name}"> + <depends optional-attribute-name="BindingName">jboss.jca:service=DataSourceBinding,name=<xsl:value-of select='jndi-name'/></depends> + </mbean> + + </xsl:otherwise> + + </xsl:choose> + + </xsl:if> + + </xsl:template> <!-- template for ConnectionManager attributes shared among all ConnectionManagers.--> <xsl:template name="cm-common"> |
From: Weston P. <wes...@jb...> - 2006-05-16 21:36:51
|
User: wprice Date: 06/05/16 17:36:49 Modified: src/resources/stylesheets ConnectionFactoryTemplate.xsl Log: [JBAS-1436] and [JBAS-1466] support for prefilling pools as well as statistics reporting. Primary changes including adding prefill support interface, as well as statistics reporting interface. Note, old pool filler implementation has been removed. Revision Changes Path 1.38 +76 -27 jbosscx/src/resources/stylesheets/ConnectionFactoryTemplate.xsl (In the diff below, changes in quantity of whitespace are not shown.) Index: ConnectionFactoryTemplate.xsl =================================================================== RCS file: /cvsroot/jboss/jbosscx/src/resources/stylesheets/ConnectionFactoryTemplate.xsl,v retrieving revision 1.37 retrieving revision 1.38 diff -u -b -r1.37 -r1.38 --- ConnectionFactoryTemplate.xsl 14 Apr 2006 00:14:37 -0000 1.37 +++ ConnectionFactoryTemplate.xsl 16 May 2006 21:36:49 -0000 1.38 @@ -378,6 +378,15 @@ <attribute name="IdleTimeoutMinutes">15</attribute> </xsl:otherwise> </xsl:choose> + <xsl:choose> + <xsl:when test="prefill"> + <attribute name="PreFill">True</attribute> + </xsl:when> + <xsl:otherwise> + <attribute name="PreFill">False</attribute> + </xsl:otherwise> + </xsl:choose> + <!-- criteria indicates if Subject (from security domain) or app supplied parameters (such as from getConnection(user, pw)) are used to distinguish @@ -400,32 +409,16 @@ <attribute name="NoTxSeparatePools">true</attribute> </xsl:when> </xsl:choose> - </mbean> - </depends> - </xsl:template> - - <!-- template to generate poolfiller --> - - <xsl:template name="poolfiller"> - <xsl:param name="jndi-name"/> - <xsl:if test="prefill"> - <xsl:choose> - <xsl:when test="application-managed-security"/> - + <xsl:when test="statistics-formatter"> + <attribute name="StatisticsFormatter"><xsl:value-of select="statistics-formatter"/></attribute> + </xsl:when> <xsl:otherwise> - - <mbean code="org.jboss.resource.connectionmanager.PoolFillerService" - name="jboss.jca:service=PoolFiller,name={jndi-name}"> - <depends optional-attribute-name="BindingName">jboss.jca:service=DataSourceBinding,name=<xsl:value-of select='jndi-name'/></depends> - </mbean> - + <attribute name="StatisticsFormatter">org.jboss.resource.statistic.pool.JBossDefaultSubPoolStatisticFormatter</attribute> </xsl:otherwise> - </xsl:choose> - - </xsl:if> - + </mbean> + </depends> </xsl:template> <!-- template for ConnectionManager attributes shared among all ConnectionManagers.--> @@ -441,7 +434,32 @@ </xsl:template> - <!-- Datasource binding --> + <!-- Datasource binding + <xsl:template name="ds-binding"> + <xsl:param name="cm-name"></xsl:param> + + <mbean code="org.jboss.resource.binding.remote.RemoteConnectionFactoryService" + name="jboss.jca:service=ConnectionFactoryBinding,name={jndi-name}" + display-name="Binding for ConnectionFactory {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> + + <depends optional-attribute-name="ConnectionManager"> + <xsl:value-of select="$cm-name"/>,name=<xsl:value-of select="jndi-name"/> + </depends> + </mbean> + --> + <!-- --> <xsl:template name="ds-binding"> <xsl:param name="cm-name"></xsl:param> @@ -463,6 +481,8 @@ <xsl:value-of select="$cm-name"/>,name=<xsl:value-of select="jndi-name"/> </depends> </mbean> + + </xsl:template> <xsl:template name="use-java-context"> @@ -482,6 +502,7 @@ </xsl:template> <!-- Connection factory binding --> + <xsl:template name="cf-binding"> <xsl:param name="cm-name"></xsl:param> @@ -502,7 +523,35 @@ </depends> </mbean> </xsl:template> + <!-- + + + <xsl:template name="cf-binding"> + <xsl:param name="cm-name"></xsl:param> + + <mbean code="org.jboss.resource.binding.remote.RemoteConnectionFactoryService" + name="jboss.jca:service=ConnectionFactoryBinding,name={jndi-name}" + display-name="Binding for ConnectionFactory {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> + + <depends optional-attribute-name="ConnectionManager"> + <xsl:value-of select="$cm-name"/>,name=<xsl:value-of select="jndi-name"/> + </depends> + </mbean> + </xsl:template> + --> <xsl:template name="tx-manager"> <depends optional-attribute-name="TransactionManagerService">jboss:service=TransactionManager</depends> </xsl:template> |
From: Weston P. <wes...@jb...> - 2006-05-25 15:17:21
|
User: wprice Date: 06/05/25 11:04:47 Modified: src/resources/stylesheets Tag: Branch_4_0 ConnectionFactoryTemplate.xsl Log: [JBAS-1241] Added support for JDBC background validation checking as well as modifying the matchManagedConnections algorithm used in getting a new managed connection from the pool. Added <background-validation> <background-validation-minutes> <validate-on-match> elements to DTD and XSLT deployment. JDBC ra.xml was also modified to accomodate new matching attributes. Revision Changes Path No revision No revision 1.22.2.11 +27 -0 jbosscx/src/resources/stylesheets/ConnectionFactoryTemplate.xsl (In the diff below, changes in quantity of whitespace are not shown.) Index: ConnectionFactoryTemplate.xsl =================================================================== RCS file: /cvsroot/jboss/jbosscx/src/resources/stylesheets/ConnectionFactoryTemplate.xsl,v retrieving revision 1.22.2.10 retrieving revision 1.22.2.11 diff -u -b -r1.22.2.10 -r1.22.2.11 --- ConnectionFactoryTemplate.xsl 5 Sep 2005 05:05:01 -0000 1.22.2.10 +++ ConnectionFactoryTemplate.xsl 25 May 2006 15:04:46 -0000 1.22.2.11 @@ -319,6 +319,15 @@ <xsl:if test="url-delimeter"> <config-property name="URLDelimeter" type="java.lang.String"><xsl:value-of select="normalize-space(url-delimeter)"/></config-property> </xsl:if> + <!-- new matching/background validation--> + <xsl:choose> + <xsl:when test="validate-on-match"> + <config-property name="ValidateOnMatch" type="boolean"><xsl:value-of select="normalize-space(validate-on-match)"/></config-property> + </xsl:when> + <xsl:otherwise> + <config-property name="ValidateOnMatch" type="boolean">true</config-property> + </xsl:otherwise> + </xsl:choose> </xsl:template> <!-- template to generate the pool mbean --> @@ -378,6 +387,24 @@ <attribute name="IdleTimeoutMinutes">15</attribute> </xsl:otherwise> </xsl:choose> + <!-- background validation --> + <xsl:choose> + <xsl:when test="background-validation"> + <attribute name="BackGroundValidation"><xsl:value-of select="background-validation"/></attribute> + </xsl:when> + <xsl:otherwise> + <attribute name="BackGroundValidation">False</attribute> + </xsl:otherwise> + </xsl:choose> + <xsl:choose> + <xsl:when test="background-validation-minutes"> + <attribute name="BackGroundValidationMinutes"><xsl:value-of select="background-validation-minutes"/></attribute> + </xsl:when> + <xsl:otherwise> + <attribute name="BackGroundValidationMinutes">10</attribute> + </xsl:otherwise> + </xsl:choose> + <!-- criteria indicates if Subject (from security domain) or app supplied parameters (such as from getConnection(user, pw)) are used to distinguish |
From: Weston P. <wes...@jb...> - 2006-05-25 21:35:11
|
User: wprice Date: 06/05/25 17:35:10 Modified: src/resources/stylesheets Tag: Branch_4_0 ConnectionFactoryTemplate.xsl Log: [JBAS-1466] Backport from head with improvements in non-compliant pools. Revision Changes Path No revision No revision 1.22.2.12 +9 -0 jbosscx/src/resources/stylesheets/ConnectionFactoryTemplate.xsl (In the diff below, changes in quantity of whitespace are not shown.) Index: ConnectionFactoryTemplate.xsl =================================================================== RCS file: /cvsroot/jboss/jbosscx/src/resources/stylesheets/ConnectionFactoryTemplate.xsl,v retrieving revision 1.22.2.11 retrieving revision 1.22.2.12 diff -u -b -r1.22.2.11 -r1.22.2.12 --- ConnectionFactoryTemplate.xsl 25 May 2006 15:04:46 -0000 1.22.2.11 +++ ConnectionFactoryTemplate.xsl 25 May 2006 21:35:10 -0000 1.22.2.12 @@ -404,6 +404,15 @@ <attribute name="BackGroundValidationMinutes">10</attribute> </xsl:otherwise> </xsl:choose> + <xsl:choose> + <xsl:when test="prefill"> + <attribute name="PreFill"><xsl:value-of select="prefill"/></attribute> + </xsl:when> + <xsl:otherwise> + <attribute name="PreFill">False</attribute> + </xsl:otherwise> + </xsl:choose> + <!-- criteria indicates if Subject (from security domain) or app supplied |
From: Weston P. <wes...@jb...> - 2006-05-29 20:26:19
|
User: wprice Date: 06/05/29 15:43:33 Modified: src/resources/stylesheets Tag: Branch_4_0 ConnectionFactoryTemplate.xsl Log: [JBAS-1466] Reworked pre filled pool implementation for logging. Added jndi name injection via XSLT to allow for logging JNDI name of pool in prefilling. This will also be used in connection validation and idle removing. Added constructor to BasePool, and children, for new jndi name attribute. Revision Changes Path No revision No revision 1.22.2.13 +3 -1 jbosscx/src/resources/stylesheets/ConnectionFactoryTemplate.xsl (In the diff below, changes in quantity of whitespace are not shown.) Index: ConnectionFactoryTemplate.xsl =================================================================== RCS file: /cvsroot/jboss/jbosscx/src/resources/stylesheets/ConnectionFactoryTemplate.xsl,v retrieving revision 1.22.2.12 retrieving revision 1.22.2.13 diff -u -b -r1.22.2.12 -r1.22.2.13 --- ConnectionFactoryTemplate.xsl 25 May 2006 21:35:10 -0000 1.22.2.12 +++ ConnectionFactoryTemplate.xsl 29 May 2006 19:43:32 -0000 1.22.2.13 @@ -355,6 +355,8 @@ </xsl:when> </xsl:choose> + <attribute name="PoolJndiName"><xsl:value-of select="jndi-name"/></attribute> + <xsl:choose> <xsl:when test="min-pool-size"> <attribute name="MinSize"><xsl:value-of select="min-pool-size"/></attribute> |
From: Weston P. <wes...@jb...> - 2006-05-31 15:34:34
|
User: wprice Date: 06/05/31 11:34:31 Modified: src/resources/stylesheets Tag: Branch_4_0 ConnectionFactoryTemplate.xsl Log: [JBAS-1466] Continued rework for prefilling connection pools. Prefilling for PoolBySubject was removed to specifically address [JBAS-3251] wherein dynamic login configs were not working with prefilling. More generally, this feature was reworked for exclusive use by OnePool strategies. Revision Changes Path No revision No revision 1.22.2.14 +19 -0 jbosscx/src/resources/stylesheets/ConnectionFactoryTemplate.xsl (In the diff below, changes in quantity of whitespace are not shown.) Index: ConnectionFactoryTemplate.xsl =================================================================== RCS file: /cvsroot/jboss/jbosscx/src/resources/stylesheets/ConnectionFactoryTemplate.xsl,v retrieving revision 1.22.2.13 retrieving revision 1.22.2.14 diff -u -b -r1.22.2.13 -r1.22.2.14 --- ConnectionFactoryTemplate.xsl 29 May 2006 19:43:32 -0000 1.22.2.13 +++ ConnectionFactoryTemplate.xsl 31 May 2006 15:34:31 -0000 1.22.2.14 @@ -464,6 +464,7 @@ 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"> @@ -474,9 +475,27 @@ <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:when> + <xsl:otherwise> + <attribute name="UseJavaContext">true</attribute> + </xsl:otherwise> + </xsl:choose> <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> |
From: Weston P. <wes...@jb...> - 2006-05-31 20:39:26
|
User: wprice Date: 06/05/31 16:39:15 Modified: src/resources/stylesheets ConnectionFactoryTemplate.xsl Log: [JBAS-1466] reworked prefill pool implementation to be in line with Branch_4_0 [JBAS-3251] fixed inappropriate implementation for prefilled subject pools. Removed this feature to only support prefilling by OnePool. [1241] Port of background validation checking from Branch_4_0. Added ValidateOnMatch attribute to ConnectionFactories to allow for disabling validation on matchManagedConnections. Revision Changes Path 1.39 +71 -79 jbosscx/src/resources/stylesheets/ConnectionFactoryTemplate.xsl (In the diff below, changes in quantity of whitespace are not shown.) Index: ConnectionFactoryTemplate.xsl =================================================================== RCS file: /cvsroot/jboss/jbosscx/src/resources/stylesheets/ConnectionFactoryTemplate.xsl,v retrieving revision 1.38 retrieving revision 1.39 diff -u -b -r1.38 -r1.39 --- ConnectionFactoryTemplate.xsl 16 May 2006 21:36:49 -0000 1.38 +++ ConnectionFactoryTemplate.xsl 31 May 2006 20:39:15 -0000 1.39 @@ -319,6 +319,15 @@ <xsl:if test="url-delimeter"> <config-property name="URLDelimeter" type="java.lang.String"><xsl:value-of select="normalize-space(url-delimeter)"/></config-property> </xsl:if> + <!-- new matching/background validation--> + <xsl:choose> + <xsl:when test="validate-on-match"> + <config-property name="ValidateOnMatch" type="boolean"><xsl:value-of select="normalize-space(validate-on-match)"/></config-property> + </xsl:when> + <xsl:otherwise> + <config-property name="ValidateOnMatch" type="boolean">true</config-property> + </xsl:otherwise> + </xsl:choose> </xsl:template> <!-- template to generate the pool mbean --> @@ -346,6 +355,8 @@ </xsl:when> </xsl:choose> + <attribute name="PoolJndiName"><xsl:value-of select="jndi-name"/></attribute> + <xsl:choose> <xsl:when test="min-pool-size"> <attribute name="MinSize"><xsl:value-of select="min-pool-size"/></attribute> @@ -378,14 +389,39 @@ <attribute name="IdleTimeoutMinutes">15</attribute> </xsl:otherwise> </xsl:choose> + <!-- background validation --> + <xsl:choose> + <xsl:when test="background-validation"> + <attribute name="BackGroundValidation"><xsl:value-of select="background-validation"/></attribute> + </xsl:when> + <xsl:otherwise> + <attribute name="BackGroundValidation">False</attribute> + </xsl:otherwise> + </xsl:choose> + <xsl:choose> + <xsl:when test="background-validation-minutes"> + <attribute name="BackGroundValidationMinutes"><xsl:value-of select="background-validation-minutes"/></attribute> + </xsl:when> + <xsl:otherwise> + <attribute name="BackGroundValidationMinutes">10</attribute> + </xsl:otherwise> + </xsl:choose> <xsl:choose> <xsl:when test="prefill"> - <attribute name="PreFill">True</attribute> + <attribute name="PreFill"><xsl:value-of select="prefill"/></attribute> </xsl:when> <xsl:otherwise> <attribute name="PreFill">False</attribute> </xsl:otherwise> </xsl:choose> + <xsl:choose> + <xsl:when test="statistics-formatter"> + <attribute name="StatisticsFormatter"><xsl:value-of select="statistics-formatter"/></attribute> + </xsl:when> + <xsl:otherwise> + <attribute name="StatisticsFormatter">org.jboss.resource.statistic.pool.JBossDefaultSubPoolStatisticFormatter</attribute> + </xsl:otherwise> + </xsl:choose> <!-- criteria indicates if Subject (from security domain) or app supplied @@ -409,18 +445,11 @@ <attribute name="NoTxSeparatePools">true</attribute> </xsl:when> </xsl:choose> - <xsl:choose> - <xsl:when test="statistics-formatter"> - <attribute name="StatisticsFormatter"><xsl:value-of select="statistics-formatter"/></attribute> - </xsl:when> - <xsl:otherwise> - <attribute name="StatisticsFormatter">org.jboss.resource.statistic.pool.JBossDefaultSubPoolStatisticFormatter</attribute> - </xsl:otherwise> - </xsl:choose> </mbean> </depends> </xsl:template> + <!-- template for ConnectionManager attributes shared among all ConnectionManagers.--> <xsl:template name="cm-common"> @@ -434,15 +463,15 @@ </xsl:template> - <!-- Datasource binding + <!-- Datasource binding --> <xsl:template name="ds-binding"> <xsl:param name="cm-name"></xsl:param> - <mbean code="org.jboss.resource.binding.remote.RemoteConnectionFactoryService" - name="jboss.jca:service=ConnectionFactoryBinding,name={jndi-name}" - display-name="Binding for ConnectionFactory {jndi-name}"> + <mbean code="org.jboss.resource.adapter.jdbc.remote.WrapperDataSourceService" + 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"> @@ -453,25 +482,10 @@ <attribute name="UseJavaContext">true</attribute> </xsl:otherwise> </xsl:choose> - - <depends optional-attribute-name="ConnectionManager"> - <xsl:value-of select="$cm-name"/>,name=<xsl:value-of select="jndi-name"/> - </depends> - </mbean> --> - <!-- --> - <xsl:template name="ds-binding"> - <xsl:param name="cm-name"></xsl:param> - - <mbean code="org.jboss.resource.adapter.jdbc.remote.WrapperDataSourceService" - 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> + <attribute name="UseJavaContext"><xsl:value-of select="use-java-context"/></attribute> </xsl:when> <xsl:otherwise> <attribute name="UseJavaContext">true</attribute> @@ -480,9 +494,16 @@ <depends optional-attribute-name="ConnectionManager"> <xsl:value-of select="$cm-name"/>,name=<xsl:value-of select="jndi-name"/> </depends> - </mbean> - + <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"> @@ -502,7 +523,6 @@ </xsl:template> <!-- Connection factory binding --> - <xsl:template name="cf-binding"> <xsl:param name="cm-name"></xsl:param> @@ -523,35 +543,7 @@ </depends> </mbean> </xsl:template> - <!-- - - <xsl:template name="cf-binding"> - <xsl:param name="cm-name"></xsl:param> - - <mbean code="org.jboss.resource.binding.remote.RemoteConnectionFactoryService" - name="jboss.jca:service=ConnectionFactoryBinding,name={jndi-name}" - display-name="Binding for ConnectionFactory {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> - - <depends optional-attribute-name="ConnectionManager"> - <xsl:value-of select="$cm-name"/>,name=<xsl:value-of select="jndi-name"/> - </depends> - </mbean> - </xsl:template> - - --> <xsl:template name="tx-manager"> <depends optional-attribute-name="TransactionManagerService">jboss:service=TransactionManager</depends> </xsl:template> |