[jboss-cvs] JBossAS SVN: r97536 - in trunk/connector/src: main/java/org/jboss/resource/connectionmanager and 5 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Dec 8 09:05:07 EST 2009
Author: jesper.pedersen
Date: 2009-12-08 09:05:07 -0500 (Tue, 08 Dec 2009)
New Revision: 97536
Modified:
trunk/connector/src/etc/example-config/db2-400-ds.xml
trunk/connector/src/etc/example-config/db2-ds.xml
trunk/connector/src/etc/example-config/derby-ds.xml
trunk/connector/src/etc/example-config/generic-ds.xml
trunk/connector/src/etc/example-config/hsqldb-ds.xml
trunk/connector/src/etc/example-config/hsqldb-encrypted-ds.xml
trunk/connector/src/etc/example-config/informix-ds.xml
trunk/connector/src/etc/example-config/jdatastore-ds.xml
trunk/connector/src/etc/example-config/jsql-ds.xml
trunk/connector/src/etc/example-config/mimer-ds.xml
trunk/connector/src/etc/example-config/msaccess-ds.xml
trunk/connector/src/etc/example-config/mssql-ds.xml
trunk/connector/src/etc/example-config/mysql-ds.xml
trunk/connector/src/etc/example-config/oracle-ds.xml
trunk/connector/src/etc/example-config/pointbase-ds.xml
trunk/connector/src/etc/example-config/postgres-ds.xml
trunk/connector/src/etc/example-config/progress-ds.xml
trunk/connector/src/etc/example-config/sapdb-ds.xml
trunk/connector/src/etc/example-config/solid-ds.xml
trunk/connector/src/etc/example-config/sybase-ds.xml
trunk/connector/src/main/java/org/jboss/resource/connectionmanager/JBossManagedConnectionPool.java
trunk/connector/src/main/java/org/jboss/resource/connectionmanager/JBossManagedConnectionPoolMBean.java
trunk/connector/src/main/java/org/jboss/resource/connectionmanager/PoolFiller.java
trunk/connector/src/main/java/org/jboss/resource/deployers/RARParserDeployer.java
trunk/connector/src/main/java/org/jboss/resource/deployers/management/DsDataSourceTemplateInfo.java
trunk/connector/src/main/java/org/jboss/resource/metadata/RARDeploymentMetaData.java
trunk/connector/src/main/java/org/jboss/resource/metadata/mcf/ManagedConnectionFactoryDeploymentMetaData.java
trunk/connector/src/resources/dtd/jboss-ds_5_0.dtd
Log:
[JBAS-7500] Sync with 6.0.0.M1
Modified: trunk/connector/src/etc/example-config/db2-400-ds.xml
===================================================================
--- trunk/connector/src/etc/example-config/db2-400-ds.xml 2009-12-08 13:39:40 UTC (rev 97535)
+++ trunk/connector/src/etc/example-config/db2-400-ds.xml 2009-12-08 14:05:07 UTC (rev 97536)
@@ -13,6 +13,8 @@
[systemname] Hostame of the iSeries
[schema] Default schema is needed so jboss could use metadat to test if the tables exists
+
+ See http://www.jboss.org/community/wiki/Multiple1PC for information about local-tx-datasource
-->
<datasources>
Modified: trunk/connector/src/etc/example-config/db2-ds.xml
===================================================================
--- trunk/connector/src/etc/example-config/db2-ds.xml 2009-12-08 13:39:40 UTC (rev 97535)
+++ trunk/connector/src/etc/example-config/db2-ds.xml 2009-12-08 14:05:07 UTC (rev 97536)
@@ -6,6 +6,7 @@
<!-- -->
<!-- ===================================================================== -->
+<!-- See http://www.jboss.org/community/wiki/Multiple1PC for information about local-tx-datasource -->
<!-- $Id$ -->
Modified: trunk/connector/src/etc/example-config/derby-ds.xml
===================================================================
--- trunk/connector/src/etc/example-config/derby-ds.xml 2009-12-08 13:39:40 UTC (rev 97535)
+++ trunk/connector/src/etc/example-config/derby-ds.xml 2009-12-08 14:05:07 UTC (rev 97536)
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- The Derby embedded database JCA connection factory config
-$Id$ -->
+<!-- The Derby embedded database JCA connection factory config -->
+<!-- See http://www.jboss.org/community/wiki/Multiple1PC for information about local-tx-datasource -->
+<!-- $Id$ -->
-
<datasources>
<local-tx-datasource>
Modified: trunk/connector/src/etc/example-config/generic-ds.xml
===================================================================
--- trunk/connector/src/etc/example-config/generic-ds.xml 2009-12-08 13:39:40 UTC (rev 97535)
+++ trunk/connector/src/etc/example-config/generic-ds.xml 2009-12-08 14:05:07 UTC (rev 97536)
@@ -6,6 +6,7 @@
<!-- -->
<!-- ===================================================================== -->
+<!-- See http://www.jboss.org/community/wiki/Multiple1PC for information about local-tx-datasource -->
<!-- $Id$ -->
Modified: trunk/connector/src/etc/example-config/hsqldb-ds.xml
===================================================================
--- trunk/connector/src/etc/example-config/hsqldb-ds.xml 2009-12-08 13:39:40 UTC (rev 97535)
+++ trunk/connector/src/etc/example-config/hsqldb-ds.xml 2009-12-08 14:05:07 UTC (rev 97536)
@@ -2,6 +2,7 @@
<!-- The Hypersonic embedded database JCA connection factory config -->
+<!-- See http://www.jboss.org/community/wiki/Multiple1PC for information about local-tx-datasource -->
<!-- $Id$ -->
<datasources>
Modified: trunk/connector/src/etc/example-config/hsqldb-encrypted-ds.xml
===================================================================
--- trunk/connector/src/etc/example-config/hsqldb-encrypted-ds.xml 2009-12-08 13:39:40 UTC (rev 97535)
+++ trunk/connector/src/etc/example-config/hsqldb-encrypted-ds.xml 2009-12-08 14:05:07 UTC (rev 97536)
@@ -4,6 +4,7 @@
<!-- that illustrates the use of the JaasSecurityDomainIdentityLoginModule -->
<!-- to use encrypted password in the data source configuration. -->
+<!-- See http://www.jboss.org/community/wiki/Multiple1PC for information about local-tx-datasource -->
<!-- $Id$ -->
<datasources>
Modified: trunk/connector/src/etc/example-config/informix-ds.xml
===================================================================
--- trunk/connector/src/etc/example-config/informix-ds.xml 2009-12-08 13:39:40 UTC (rev 97535)
+++ trunk/connector/src/etc/example-config/informix-ds.xml 2009-12-08 14:05:07 UTC (rev 97536)
@@ -6,6 +6,7 @@
<!-- -->
<!-- ===================================================================== -->
+<!-- See http://www.jboss.org/community/wiki/Multiple1PC for information about local-tx-datasource -->
<!-- $Id$ -->
Modified: trunk/connector/src/etc/example-config/jdatastore-ds.xml
===================================================================
--- trunk/connector/src/etc/example-config/jdatastore-ds.xml 2009-12-08 13:39:40 UTC (rev 97535)
+++ trunk/connector/src/etc/example-config/jdatastore-ds.xml 2009-12-08 14:05:07 UTC (rev 97536)
@@ -6,6 +6,7 @@
<!-- -->
<!-- ===================================================================== -->
+<!-- See http://www.jboss.org/community/wiki/Multiple1PC for information about local-tx-datasource -->
<!-- $Id$ -->
<!-- ==================================================================== -->
<!-- Copy these jar's from your JBuilder6/lib to your jboss's lib -->
Modified: trunk/connector/src/etc/example-config/jsql-ds.xml
===================================================================
--- trunk/connector/src/etc/example-config/jsql-ds.xml 2009-12-08 13:39:40 UTC (rev 97535)
+++ trunk/connector/src/etc/example-config/jsql-ds.xml 2009-12-08 14:05:07 UTC (rev 97536)
@@ -6,6 +6,7 @@
<!-- -->
<!-- ===================================================================== -->
+<!-- See http://www.jboss.org/community/wiki/Multiple1PC for information about local-tx-datasource -->
<!-- $Id$ -->
<!-- ======================================================================-->
Modified: trunk/connector/src/etc/example-config/mimer-ds.xml
===================================================================
--- trunk/connector/src/etc/example-config/mimer-ds.xml 2009-12-08 13:39:40 UTC (rev 97535)
+++ trunk/connector/src/etc/example-config/mimer-ds.xml 2009-12-08 14:05:07 UTC (rev 97536)
@@ -8,6 +8,8 @@
<!-- Supplied by fredrik.alund at upright.se -->
<!-- ==================================================================== -->
+<!-- See http://www.jboss.org/community/wiki/Multiple1PC for information about local-tx-datasource -->
+
<datasources>
<local-tx-datasource>
<jndi-name>MimerDS</jndi-name>
Modified: trunk/connector/src/etc/example-config/msaccess-ds.xml
===================================================================
--- trunk/connector/src/etc/example-config/msaccess-ds.xml 2009-12-08 13:39:40 UTC (rev 97535)
+++ trunk/connector/src/etc/example-config/msaccess-ds.xml 2009-12-08 14:05:07 UTC (rev 97536)
@@ -6,6 +6,8 @@
<!-- -->
<!-- ===================================================================== -->
+<!-- See http://www.jboss.org/community/wiki/Multiple1PC for information about local-tx-datasource -->
+
<!-- $Id$ -->
<!-- ==================================================================== -->
<!-- This uses the sun jdbc-odbc driver, so don't expect miracles -->
Modified: trunk/connector/src/etc/example-config/mssql-ds.xml
===================================================================
--- trunk/connector/src/etc/example-config/mssql-ds.xml 2009-12-08 13:39:40 UTC (rev 97535)
+++ trunk/connector/src/etc/example-config/mssql-ds.xml 2009-12-08 14:05:07 UTC (rev 97536)
@@ -6,6 +6,7 @@
<!-- -->
<!-- ===================================================================== -->
+<!-- See http://www.jboss.org/community/wiki/Multiple1PC for information about local-tx-datasource -->
<!-- $Id$ -->
<!-- ======================================================================-->
Modified: trunk/connector/src/etc/example-config/mysql-ds.xml
===================================================================
--- trunk/connector/src/etc/example-config/mysql-ds.xml 2009-12-08 13:39:40 UTC (rev 97535)
+++ trunk/connector/src/etc/example-config/mysql-ds.xml 2009-12-08 14:05:07 UTC (rev 97536)
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!-- See http://www.jboss.org/community/wiki/Multiple1PC for information about local-tx-datasource -->
<!-- $Id$ -->
<!-- Datasource config for MySQL using 3.0.9 available from:
http://www.mysql.com/downloads/api-jdbc-stable.html
Modified: trunk/connector/src/etc/example-config/oracle-ds.xml
===================================================================
--- trunk/connector/src/etc/example-config/oracle-ds.xml 2009-12-08 13:39:40 UTC (rev 97535)
+++ trunk/connector/src/etc/example-config/oracle-ds.xml 2009-12-08 14:05:07 UTC (rev 97536)
@@ -6,6 +6,7 @@
<!-- -->
<!-- ===================================================================== -->
+<!-- See http://www.jboss.org/community/wiki/Multiple1PC for information about local-tx-datasource -->
<!-- $Id$ -->
<!-- ==================================================================== -->
<!-- Datasource config for Oracle originally from Steven Coy -->
Modified: trunk/connector/src/etc/example-config/pointbase-ds.xml
===================================================================
--- trunk/connector/src/etc/example-config/pointbase-ds.xml 2009-12-08 13:39:40 UTC (rev 97535)
+++ trunk/connector/src/etc/example-config/pointbase-ds.xml 2009-12-08 14:05:07 UTC (rev 97536)
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Example of the pointbase 4.8 datasource configuration -->
+<!-- See http://www.jboss.org/community/wiki/Multiple1PC for information about local-tx-datasource -->
<!-- $Id$ -->
<datasources>
Modified: trunk/connector/src/etc/example-config/postgres-ds.xml
===================================================================
--- trunk/connector/src/etc/example-config/postgres-ds.xml 2009-12-08 13:39:40 UTC (rev 97535)
+++ trunk/connector/src/etc/example-config/postgres-ds.xml 2009-12-08 14:05:07 UTC (rev 97536)
@@ -6,6 +6,7 @@
<!-- -->
<!-- ===================================================================== -->
+<!-- See http://www.jboss.org/community/wiki/Multiple1PC for information about local-tx-datasource -->
<!-- $Id$ -->
<!-- ==================================================================== -->
<!-- Datasource config for Postgres -->
Modified: trunk/connector/src/etc/example-config/progress-ds.xml
===================================================================
--- trunk/connector/src/etc/example-config/progress-ds.xml 2009-12-08 13:39:40 UTC (rev 97535)
+++ trunk/connector/src/etc/example-config/progress-ds.xml 2009-12-08 14:05:07 UTC (rev 97536)
@@ -6,6 +6,7 @@
<!-- -->
<!-- ===================================================================== -->
+<!-- See http://www.jboss.org/community/wiki/Multiple1PC for information about local-tx-datasource -->
<!-- $Id$ -->
<!-- ==================================================================== -->
<!-- Datasource config for Progress 9.1 -->
Modified: trunk/connector/src/etc/example-config/sapdb-ds.xml
===================================================================
--- trunk/connector/src/etc/example-config/sapdb-ds.xml 2009-12-08 13:39:40 UTC (rev 97535)
+++ trunk/connector/src/etc/example-config/sapdb-ds.xml 2009-12-08 14:05:07 UTC (rev 97536)
@@ -10,6 +10,7 @@
<!-- This is a minimal example. See the generic example for other stuff -->
<!-- ===================================================================== -->
+<!-- See http://www.jboss.org/community/wiki/Multiple1PC for information about local-tx-datasource -->
<!-- $Id$ -->
Modified: trunk/connector/src/etc/example-config/solid-ds.xml
===================================================================
--- trunk/connector/src/etc/example-config/solid-ds.xml 2009-12-08 13:39:40 UTC (rev 97535)
+++ trunk/connector/src/etc/example-config/solid-ds.xml 2009-12-08 14:05:07 UTC (rev 97536)
@@ -6,6 +6,7 @@
<!-- -->
<!-- ===================================================================== -->
+<!-- See http://www.jboss.org/community/wiki/Multiple1PC for information about local-tx-datasource -->
<!-- $Id$ -->
<!-- ==================================================================== -->
<!-- DataSource configuration for solid using 3.0 driver -->
Modified: trunk/connector/src/etc/example-config/sybase-ds.xml
===================================================================
--- trunk/connector/src/etc/example-config/sybase-ds.xml 2009-12-08 13:39:40 UTC (rev 97535)
+++ trunk/connector/src/etc/example-config/sybase-ds.xml 2009-12-08 14:05:07 UTC (rev 97536)
@@ -9,6 +9,7 @@
<!-- This is a minimal example. See the generic example for other stuff -->
<!-- ===================================================================== -->
+<!-- See http://www.jboss.org/community/wiki/Multiple1PC for information about local-tx-datasource -->
<!-- $Id$ -->
Modified: trunk/connector/src/main/java/org/jboss/resource/connectionmanager/JBossManagedConnectionPool.java
===================================================================
--- trunk/connector/src/main/java/org/jboss/resource/connectionmanager/JBossManagedConnectionPool.java 2009-12-08 13:39:40 UTC (rev 97535)
+++ trunk/connector/src/main/java/org/jboss/resource/connectionmanager/JBossManagedConnectionPool.java 2009-12-08 14:05:07 UTC (rev 97536)
@@ -337,6 +337,43 @@
}
}
+ /**
+ * Test if a connection can be obtained using default values
+ * @return True if a connection was obtained; otherwise false
+ */
+ @ManagementOperation(description="Test if a connection can be obtained",
+ impact=Impact.WriteOnly)
+ public boolean testConnection()
+ {
+ boolean result = false;
+ ConnectionListener cl = null;
+ try
+ {
+ if (getAvailableConnectionCount() > 0)
+ {
+ cl = poolingStrategy.getConnection(null, null, null);
+ result = true;
+ }
+ }
+ catch (ResourceException re)
+ {
+ }
+ finally
+ {
+ if (cl != null)
+ {
+ try
+ {
+ poolingStrategy.returnConnection(cl, false);
+ }
+ catch (ResourceException ire)
+ {
+ }
+ }
+ }
+ return result;
+ }
+
@ManagementProperty(use={ViewUse.STATISTIC})
public int getConnectionCount()
{
@@ -1012,7 +1049,7 @@
final InternalManagedConnectionPool internalPool = subContext.getSubPool();
stat.setAvailableConnections(internalPool.getAvailableConnections());
stat.setConnectionsDestroyed(internalPool.getConnectionDestroyedCount());
- stat.setConnectionsInUse(internalPool.getMaxConnectionsInUseCount());
+ stat.setConnectionsInUse(internalPool.getConnectionInUseCount());
stat.setMaxConnectionsInUse(internalPool.getMaxConnectionsInUseCount());
stat.setTotalBlockTime(internalPool.getTotalBlockTime());
stat.setAverageBlockTime(internalPool.getAverageBlockTime());
Modified: trunk/connector/src/main/java/org/jboss/resource/connectionmanager/JBossManagedConnectionPoolMBean.java
===================================================================
--- trunk/connector/src/main/java/org/jboss/resource/connectionmanager/JBossManagedConnectionPoolMBean.java 2009-12-08 13:39:40 UTC (rev 97535)
+++ trunk/connector/src/main/java/org/jboss/resource/connectionmanager/JBossManagedConnectionPoolMBean.java 2009-12-08 14:05:07 UTC (rev 97536)
@@ -161,6 +161,12 @@
*/
void flush() ;
+ /**
+ * Test if a connection can be obtained using default values
+ * @return True if a connection was obtained; otherwise false
+ */
+ boolean testConnection();
+
/**
* Retrieve the connection count.
* @return the connection count
Modified: trunk/connector/src/main/java/org/jboss/resource/connectionmanager/PoolFiller.java
===================================================================
--- trunk/connector/src/main/java/org/jboss/resource/connectionmanager/PoolFiller.java 2009-12-08 13:39:40 UTC (rev 97535)
+++ trunk/connector/src/main/java/org/jboss/resource/connectionmanager/PoolFiller.java 2009-12-08 14:05:07 UTC (rev 97536)
@@ -47,6 +47,7 @@
public PoolFiller ()
{
fillerThread = new Thread(this, "JCA PoolFiller");
+ fillerThread.setDaemon(true);
fillerThread.start();
}
Modified: trunk/connector/src/main/java/org/jboss/resource/deployers/RARParserDeployer.java
===================================================================
--- trunk/connector/src/main/java/org/jboss/resource/deployers/RARParserDeployer.java 2009-12-08 13:39:40 UTC (rev 97535)
+++ trunk/connector/src/main/java/org/jboss/resource/deployers/RARParserDeployer.java 2009-12-08 14:05:07 UTC (rev 97536)
@@ -69,6 +69,8 @@
public RARParserDeployer()
{
super(RARDeploymentMetaData.class, getCustomMappings());
+ // Enable MO creation of RARDeploymentMetaData
+ setBuildManagedObject(true);
}
protected <U> ObjectModelFactory getObjectModelFactory(Class<U> expectedType, String fileName, U root)
Modified: trunk/connector/src/main/java/org/jboss/resource/deployers/management/DsDataSourceTemplateInfo.java
===================================================================
--- trunk/connector/src/main/java/org/jboss/resource/deployers/management/DsDataSourceTemplateInfo.java 2009-12-08 13:39:40 UTC (rev 97535)
+++ trunk/connector/src/main/java/org/jboss/resource/deployers/management/DsDataSourceTemplateInfo.java 2009-12-08 14:05:07 UTC (rev 97536)
@@ -21,6 +21,7 @@
*/
package org.jboss.resource.deployers.management;
+import java.io.ObjectStreamException;
import java.lang.annotation.Annotation;
import java.lang.reflect.UndeclaredThrowableException;
import java.util.Collections;
@@ -199,4 +200,15 @@
}
}
+ /**
+ * Expose only plain BasicDeploymentTemplateInfo to avoid leaking server types.
+ *
+ * @return simpler ManagedPropertyImpl
+ * @throws java.io.ObjectStreamException for any error
+ */
+ private Object writeReplace() throws ObjectStreamException
+ {
+ BasicDeploymentTemplateInfo info = new BasicDeploymentTemplateInfo(getName(), getDescription(), getProperties());
+ return info;
+ }
}
Modified: trunk/connector/src/main/java/org/jboss/resource/metadata/RARDeploymentMetaData.java
===================================================================
--- trunk/connector/src/main/java/org/jboss/resource/metadata/RARDeploymentMetaData.java 2009-12-08 13:39:40 UTC (rev 97535)
+++ trunk/connector/src/main/java/org/jboss/resource/metadata/RARDeploymentMetaData.java 2009-12-08 14:05:07 UTC (rev 97536)
@@ -23,6 +23,8 @@
import java.io.Serializable;
+import org.jboss.managed.api.annotation.ManagementDeployment;
+import org.jboss.managed.api.annotation.ManagementObject;
/**
* A RARDeploymentMetaData.
@@ -30,6 +32,8 @@
* @author <a href="weston.price at jboss.com">Weston Price</a>
* @version $Revision$
*/
+ at ManagementObject
+ at ManagementDeployment(types = {"rar"})
public class RARDeploymentMetaData implements Serializable
{
private static final long serialVersionUID = 5812689890896027289L;
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 2009-12-08 13:39:40 UTC (rev 97535)
+++ trunk/connector/src/main/java/org/jboss/resource/metadata/mcf/ManagedConnectionFactoryDeploymentMetaData.java 2009-12-08 14:05:07 UTC (rev 97536)
@@ -34,6 +34,7 @@
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import org.jboss.logging.Logger;
+import org.jboss.managed.api.annotation.ActivationPolicy;
import org.jboss.managed.api.annotation.ManagementObject;
import org.jboss.managed.api.annotation.ManagementObjectID;
import org.jboss.managed.api.annotation.ManagementObjectRef;
@@ -56,11 +57,10 @@
public class ManagedConnectionFactoryDeploymentMetaData
implements Serializable, ConnectionPoolMetaData
{
+ private static Logger log = Logger.getLogger(ManagedConnectionFactoryDeploymentMetaData.class);
+
/** The serialVersionUID */
private static final long serialVersionUID = -4591557831734316580L;
-
- /** The logger. */
- private static Logger log = Logger.getLogger(ManagedConnectionFactoryDeploymentMetaData.class);
/** The jndiName */
@XmlElement(name="jndi-name")
@@ -554,7 +554,7 @@
{
log.warn("In case of local transactions track-connection-by-tx must always be true");
trackConnectionByTransaction = Boolean.TRUE;
- }
+ }
setInterleaving(!Boolean.TRUE.equals(trackConnectionByTransaction));
}
@@ -563,7 +563,7 @@
return interleaving == Boolean.TRUE && !Boolean.TRUE.equals(getLocalTransactions());
}
@ManagementProperty(name="interleaving", includeInTemplate=true,
- use={ViewUse.CONFIGURATION})
+ use={ViewUse.CONFIGURATION}, activationPolicy=ActivationPolicy.DEPLOYMENT_RESTART)
public Boolean getInterleaving()
{
return isInterleaving();
Modified: trunk/connector/src/resources/dtd/jboss-ds_5_0.dtd
===================================================================
--- trunk/connector/src/resources/dtd/jboss-ds_5_0.dtd 2009-12-08 13:39:40 UTC (rev 97535)
+++ trunk/connector/src/resources/dtd/jboss-ds_5_0.dtd 2009-12-08 14:05:07 UTC (rev 97536)
@@ -26,7 +26,7 @@
url-delimiter?, url-selector-strategy-class-name?,
driver-class , connection-property* , user-name? , password? ,
(application-managed-security | security-domain | security-domain-and-application)? ,
-min-pool-size? , max-pool-size? , blocking-timeout-millis? , background-validation?, background-validation-minutes? , idle-timeout-minutes?, use-strict-min?,
+min-pool-size? , max-pool-size? , blocking-timeout-millis? , background-validation?, background-validation-minutes? , idle-timeout-minutes?,
allocation-retry?, allocation-retry-wait-millis?, validate-on-match?, new-connection-sql?, check-valid-connection-sql?, valid-connection-checker-class-name?,
exception-sorter-class-name?, stale-connection-checker-class-name?, track-statements?,
prefill?, use-fast-fail?,
@@ -41,7 +41,7 @@
driver-class, transaction-isolation? , connection-property* , user-name? , password? ,
(application-managed-security | security-domain | security-domain-and-application)? ,
min-pool-size? , max-pool-size? , blocking-timeout-millis? , background-validation?, background-validation-minutes?,
-validate-on-match?, idle-timeout-minutes? , use-strict-min?, allocation-retry?, allocation-retry-wait-millis?,
+validate-on-match?, idle-timeout-minutes? , allocation-retry?, allocation-retry-wait-millis?,
no-tx-separate-pools? , new-connection-sql? , check-valid-connection-sql? ,
valid-connection-checker-class-name? , exception-sorter-class-name? , stale-connection-checker-class-name?, track-statements? ,
prefill?, use-fast-fail?,
@@ -54,7 +54,7 @@
xa-datasource-property* , url-property?, url-delimiter?, url-selector-strategy-class-name?,
isSameRM-override-value? , transaction-isolation? , user-name? , password? ,
(application-managed-security | security-domain | security-domain-and-application)? ,
-min-pool-size? , max-pool-size? , blocking-timeout-millis? , background-validation?, background-validation-minutes? , idle-timeout-minutes? , use-strict-min?,
+min-pool-size? , max-pool-size? , blocking-timeout-millis? , background-validation?, background-validation-minutes? , idle-timeout-minutes? ,
allocation-retry?, allocation-retry-wait-millis?, validate-on-match?, no-tx-separate-pools? , xa-resource-timeout?, new-connection-sql? , check-valid-connection-sql? ,
valid-connection-checker-class-name? , exception-sorter-class-name? , stale-connection-checker-class-name?, track-statements? ,
prefill?, use-fast-fail?,
@@ -178,11 +178,6 @@
-->
<!ELEMENT idle-timeout-minutes (#PCDATA)>
-<!-- Whether idle connections should cause connections to be closed
-below the min-pool-size
--->
-<!ELEMENT use-strict-min (#PCDATA)>
-
<!-- The allocation retry element indicates the number of times that allocating
a connection should be tried before throwing an exception. The default is 0.
-->
@@ -417,7 +412,7 @@
<!ELEMENT tx-connection-factory (jndi-name , (local-transaction | xa-transaction) ,
track-connection-by-tx? , rar-name?, connection-definition?, config-property* ,
(application-managed-security | security-domain | security-domain-and-application)? ,
-min-pool-size? , max-pool-size? , blocking-timeout-millis? , background-validation?, background-validation-minutes? , idle-timeout-minutes? , use-strict-min?,
+min-pool-size? , max-pool-size? , blocking-timeout-millis? , background-validation?, background-validation-minutes? , idle-timeout-minutes? ,
allocation-retry?, allocation-retry-wait-millis?, no-tx-separate-pools?, prefill?, use-fast-fail?, xa-resource-timeout?,
metadata?, type-mapping?, depends*)>
@@ -483,7 +478,7 @@
<!ELEMENT ha-local-tx-datasource (jndi-name, use-java-context?, connection-url, url-delimiter,
driver-class, transaction-isolation? , connection-property* , user-name? , password?,
(application-managed-security | security-domain | security-domain-and-application)? ,
-min-pool-size? , max-pool-size? , blocking-timeout-millis? , idle-timeout-minutes? , use-strict-min?,
+min-pool-size? , max-pool-size? , blocking-timeout-millis? , idle-timeout-minutes? ,
allocation-retry?, allocation-retry-wait-millis?, 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?, share-prepared-statements? , set-tx-query-timeout?, query-timeout?, use-try-lock?,
@@ -496,7 +491,7 @@
xa-datasource-property* , url-property, url-delimiter, isSameRM-override-value? , transaction-isolation? ,
user-name? , password? ,
(application-managed-security | security-domain | security-domain-and-application)? ,
-min-pool-size? , max-pool-size? , blocking-timeout-millis? , idle-timeout-minutes? , use-strict-min?,
+min-pool-size? , max-pool-size? , blocking-timeout-millis? , idle-timeout-minutes? ,
allocation-retry?, allocation-retry-wait-millis?, no-tx-separate-pools? , xa-resource-timeout? ,
new-connection-sql? , check-valid-connection-sql? ,
valid-connection-checker-class-name? , exception-sorter-class-name? , track-statements? ,
More information about the jboss-cvs-commits
mailing list