[prev in list] [next in list] [prev in thread] [next in thread]
List: jboss-cvs-commits
Subject: [jboss-cvs] jbosscx/src/resources/stylesheets ...
From: Weston Price <weston.price () jboss ! com>
Date: 2006-05-31 20:39:15
Message-ID: E1FlXTH-0003aH-Ud () committer01 ! frg ! pub ! inap ! atl ! jboss ! com
[Download RAW message or body]
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>
-------------------------------------------------------
All the advantages of Linux Managed Hosting--Without the Cost and Risk!
Fully trained technicians. The highest number of Red Hat certifications in
the hosting industry. Fanatical Support. Click to learn more
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=107521&bid=248729&dat=121642
_______________________________________________
jboss-cvs-commits mailing list
jboss-cvs-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/jboss-cvs-commits
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic