[jboss-cvs] JBossAS SVN: r83973 - in projects/metadata/trunk/src/test: resources/org/jboss/test/metadata/rar and 1 other directory.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Sun Feb 8 21:19:26 EST 2009
Author: jeff.zhang
Date: 2009-02-08 21:19:26 -0500 (Sun, 08 Feb 2009)
New Revision: 83973
Added:
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/rar/JcaDs50UnitTestCase.java
projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/rar/JcaDs50_testBasic.xml
projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/rar/JcaDs50_testLocalTxDsEverything.xml
projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/rar/JcaDs50_testMinimal.xml
projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/rar/JcaDs50_testNoTxDsEverything.xml
projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/rar/JcaDs50_testXaDsEverything.xml
Removed:
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/rar/JcaDs60UnitTestCase.java
projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/rar/JcaDs60_testBasic.xml
projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/rar/JcaDs60_testLocalTxDsEverything.xml
projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/rar/JcaDs60_testMinimal.xml
projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/rar/JcaDs60_testNoTxDsEverything.xml
projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/rar/JcaDs60_testXaDsEverything.xml
Modified:
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/rar/JbossRA10UnitTestCase.java
Log:
[JBMETA-167] change ds.xml test resource file from version 6 to 5
Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/rar/JbossRA10UnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/rar/JbossRA10UnitTestCase.java 2009-02-09 01:54:49 UTC (rev 83972)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/rar/JbossRA10UnitTestCase.java 2009-02-09 02:19:26 UTC (rev 83973)
@@ -26,6 +26,12 @@
import org.jboss.xb.binding.sunday.unmarshalling.DefaultSchemaResolver;
import org.jboss.xb.binding.sunday.unmarshalling.SchemaBindingResolver;
+/**
+ * Test JCA jboss-ra.xml metadata.
+ *
+ * @author Jeff Zhang
+ * @version $Revision$
+ */
public class JbossRA10UnitTestCase extends AbstractJavaEEMetaDataTest
{
public static SchemaBindingResolver initResolver()
Property changes on: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/rar/JbossRA10UnitTestCase.java
___________________________________________________________________
Name: svn:keywords
- Author Date Id Revision
+ Revision Author Id Date
Copied: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/rar/JcaDs50UnitTestCase.java (from rev 83972, projects/metadata/trunk/src/test/java/org/jboss/test/metadata/rar/JcaDs60UnitTestCase.java)
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/rar/JcaDs50UnitTestCase.java (rev 0)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/rar/JcaDs50UnitTestCase.java 2009-02-09 02:19:26 UTC (rev 83973)
@@ -0,0 +1,242 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.jboss.test.metadata.rar;
+
+import org.jboss.metadata.rar.jboss.mcf.DataSourceDeploymentMetaData;
+import org.jboss.metadata.rar.jboss.mcf.LocalDataSourceDeploymentMetaData;
+import org.jboss.metadata.rar.jboss.mcf.ManagedConnectionFactoryDeploymentGroup;
+import org.jboss.metadata.rar.jboss.mcf.ManagedConnectionFactoryDeploymentMetaData;
+import org.jboss.metadata.rar.jboss.mcf.NonXADataSourceDeploymentMetaData;
+import org.jboss.metadata.rar.jboss.mcf.XADataSourceDeploymentMetaData;
+import org.jboss.test.metadata.javaee.AbstractJavaEEMetaDataTest;
+import org.jboss.xb.binding.sunday.unmarshalling.DefaultSchemaResolver;
+import org.jboss.xb.binding.sunday.unmarshalling.SchemaBindingResolver;
+
+/**
+ * Test JCA ds.xml metadata.
+ *
+ * @author Jeff Zhang
+ * @version $Revision$
+ */
+public class JcaDs50UnitTestCase extends AbstractJavaEEMetaDataTest
+{
+ public static SchemaBindingResolver initResolver()
+ {
+ DefaultSchemaResolver resolver = new DefaultSchemaResolver();
+ //resolver.addClassBinding("", ManagedConnectionFactoryDeploymentGroup.class);
+ //resolver.addClassBindingForLocation("jboss-ds_5_0.dtd", ManagedConnectionFactoryDeploymentGroup.class);
+ resolver.addClassBindingForLocation("jboss-ds_5_0.xsd", ManagedConnectionFactoryDeploymentGroup.class);
+ return resolver;
+ }
+
+ public JcaDs50UnitTestCase(String name) {
+ super(name);
+ }
+
+ protected ManagedConnectionFactoryDeploymentGroup unmarshalMCFD() throws Exception
+ {
+ return unmarshal(ManagedConnectionFactoryDeploymentGroup.class);
+ }
+
+ /**
+ * test a minimal local-tx-datasource
+ */
+ public void testMinimal() throws Exception
+ {
+
+ ManagedConnectionFactoryDeploymentGroup ds = unmarshalMCFD();
+ assertNotNull(ds);
+ assertEquals(ds.getDeployments().size(), 1);
+ assertNotNull(ds.getDeployments().get(0));
+ assertTrue(ds.getDeployments().get(0) instanceof LocalDataSourceDeploymentMetaData);
+ LocalDataSourceDeploymentMetaData ld = (LocalDataSourceDeploymentMetaData)ds.getDeployments().get(0);
+ assertTestNoXAMinimal(ld);
+ }
+
+ /**
+ * test a basic local-tx-datasource, for example hsql-ds.xml
+ */
+ public void testBasic() throws Exception
+ {
+
+ ManagedConnectionFactoryDeploymentGroup ds = unmarshalMCFD();
+ LocalDataSourceDeploymentMetaData ld = (LocalDataSourceDeploymentMetaData)ds.getDeployments().get(0);
+ assertTestNoXAMinimal(ld);
+ assertEquals(ld.getConnectionProperties().size(), 0);
+ assertEquals(ld.getUserName(), "sa");
+ assertEquals(ld.getPassWord(), "");
+
+ assertEquals(ld.getSecurityMetaData().getDomain(), "HsqlDbRealm");
+ assertEquals(ld.getMinSize(), 5);
+ assertEquals(ld.getMaxSize(), 20);
+ assertEquals(ld.getIdleTimeoutMinutes(), 0);
+
+
+ assertEquals(ld.getTrackStatements(), "");
+ assertEquals(ld.getPreparedStatementCacheSize(), 32);
+ assertNotNull(ld.getDbmsMetaData());
+ assertEquals(ld.getDbmsMetaData().getTypeMapping(), "Hypersonic SQL");
+ }
+
+ /**
+ * test a everything of no-tx-datasource
+ */
+ public void testNoTxDsEverything() throws Exception
+ {
+ ManagedConnectionFactoryDeploymentGroup ds = unmarshalMCFD();
+ NonXADataSourceDeploymentMetaData ld = (NonXADataSourceDeploymentMetaData)ds.getDeployments().get(0);
+ assertTestNoXAMinimal(ld);
+
+ assertFalse(ld.isUseJavaContext());
+ assertTestUrl(ld);
+
+ assertEquals(ld.getConnectionProperties().size(), 2);
+ assertTrue(ld.getConnectionProperties().get(0).getName().equals("char.encoding"));
+ assertTrue(ld.getConnectionProperties().get(1).getValue().equals("+8"));
+ assertTestUser(ld);
+ assertEquals(ld.getSecurityMetaData().getDomain(), "HsqlDbRealm");
+ assertTestConnectionPool(ld);
+ assertTrue(ld.isValidateOnMatch());
+ assertTestDatasource(ld);
+
+ assertTestAddition(ld);
+ assertTestOption(ld);
+ }
+
+ /**
+ * test a everything of local-tx-datasource
+ */
+ public void testLocalTxDsEverything() throws Exception
+ {
+ ManagedConnectionFactoryDeploymentGroup ds = unmarshalMCFD();
+ LocalDataSourceDeploymentMetaData ld = (LocalDataSourceDeploymentMetaData)ds.getDeployments().get(0);
+ assertTestNoXAMinimal(ld);
+
+ assertFalse(ld.isUseJavaContext());
+ assertTestUrl(ld);
+ assertNotNull(ld.getTransactionIsolation());
+ assertEquals(ld.getConnectionProperties().size(), 2);
+ assertTrue(ld.getConnectionProperties().get(0).getName().equals("char.encoding"));
+ assertTrue(ld.getConnectionProperties().get(1).getValue().equals("+8"));
+ assertTestUser(ld);
+ assertEquals(ld.getSecurityMetaData().getDomain(), "HsqlDbRealm");
+ assertTestConnectionPool(ld);
+ assertTrue(ld.isValidateOnMatch());
+ //assertTrue(ld.getNoTxSeparatePools());
+ assertTestDatasource(ld);
+
+ assertTestAddition(ld);
+ assertTestOption(ld);
+ }
+
+ /**
+ * test a everything of xa-datasource
+ */
+ public void testXaDsEverything() throws Exception
+ {
+ ManagedConnectionFactoryDeploymentGroup ds = unmarshalMCFD();
+ XADataSourceDeploymentMetaData ld = (XADataSourceDeploymentMetaData)ds.getDeployments().get(0);
+
+ assertFalse(ld.isUseJavaContext());
+ //assertTrue(ld.getTrackConnectionByTransaction());
+ assertTrue(ld.isInterleaving());
+
+ assertTrue(ld.getXaDataSourceClass().startsWith("oracle"));
+ assertEquals(ld.getXaDataSourceProperties().size(), 3);
+ assertEquals(ld.getXaDataSourceProperties().get(0).getName(), "URL");
+ assertEquals(ld.getXaDataSourceProperties().get(2).getValue(), "tiger");
+ assertTestUrl(ld);
+
+ assertFalse(ld.getIsSameRMOverrideValue());
+ //transaction-isolation
+
+ assertTestUser(ld);
+ assertEquals(ld.getSecurityMetaData().getDomain(), "HsqlDbRealm");
+ assertTestConnectionPool(ld);
+ assertTrue(ld.isValidateOnMatch());
+ //assertTrue(ld.getNoTxSeparatePools());
+ assertEquals(ld.getXaResourceTimeout(), 300);
+ assertTestDatasource(ld);
+
+ assertTestAddition(ld);
+ assertTestOption(ld);
+ }
+
+ private void assertTestUrl(DataSourceDeploymentMetaData ld)
+ {
+ assertEquals(ld.getUrlDelimiter(), "|");
+ assertTrue(ld.getUrlSelectorStrategyClassName().endsWith("Stratery"));
+ }
+
+ private void assertTestUser(DataSourceDeploymentMetaData ld)
+ {
+ assertEquals(ld.getUserName(), "sa");
+ assertEquals(ld.getPassWord(), "");
+ }
+
+ private void assertTestConnectionPool(ManagedConnectionFactoryDeploymentMetaData ld)
+ {
+ assertEquals(ld.getMinSize(), 5);
+ assertEquals(ld.getMaxSize(), 20);
+ assertEquals(ld.getBlockingTimeoutMilliSeconds(), 30000);
+ assertTrue(ld.isBackgroundValidation());
+ assertEquals(ld.getBackgroundValidationMillis(), 3000);
+ assertEquals(ld.getIdleTimeoutMinutes(), 0);
+ assertEquals(ld.getAllocationRetry(), 0);
+ assertEquals(ld.getAllocationRetryWaitMillis(), 5000);
+ }
+
+ private void assertTestDatasource(DataSourceDeploymentMetaData ld)
+ {
+ assertTrue(ld.getNewConnectionSQL().endsWith("sql"));
+ assertTrue(ld.getValidConnectionCheckerClassName().endsWith("Checker"));
+ assertTrue(ld.getCheckValidConnectionSQL().startsWith("select"));
+ assertTrue(ld.getExceptionSorterClassName().endsWith("Sorter"));
+ assertTrue(ld.getStaleConnectionCheckerClassName().endsWith("Checker"));
+ }
+
+ private void assertTestAddition(DataSourceDeploymentMetaData ld)
+ {
+ assertEquals(ld.getPreparedStatementCacheSize(), 32);
+ assertTrue(ld.isSharePreparedStatements());
+ assertTrue(ld.isUseQueryTimeout());
+ assertEquals(ld.getQueryTimeout(), 300);
+ assertEquals(ld.getUseTryLock(), 300000);
+ assertEquals(ld.getTrackStatements(), "");
+ }
+
+ private void assertTestOption(ManagedConnectionFactoryDeploymentMetaData ld)
+ {
+ assertEquals(ld.getTypeMapping(), "Hypersonic SQL");
+ assertEquals(ld.getDependsNames().size(), 2);
+ assertTrue(ld.getDependsNames().get(0).startsWith("jboss"));
+ }
+
+ protected void assertTestNoXAMinimal(NonXADataSourceDeploymentMetaData xad) throws Exception
+ {
+ assertNotNull(xad);
+ assertEquals(xad.getJndiName(), "DefaultDS");
+ assertTrue(xad.getConnectionUrl().startsWith("jdbc"));
+ assertEquals(xad.getDriverClass(), "org.hsqldb.jdbcDriver");
+ }
+}
+
Property changes on: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/rar/JcaDs50UnitTestCase.java
___________________________________________________________________
Name: svn:keywords
+ Revision Author Id Date
Name: svn:mergeinfo
+
Deleted: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/rar/JcaDs60UnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/rar/JcaDs60UnitTestCase.java 2009-02-09 01:54:49 UTC (rev 83972)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/rar/JcaDs60UnitTestCase.java 2009-02-09 02:19:26 UTC (rev 83973)
@@ -1,236 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2006, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.test.metadata.rar;
-
-import org.jboss.metadata.rar.jboss.mcf.DataSourceDeploymentMetaData;
-import org.jboss.metadata.rar.jboss.mcf.LocalDataSourceDeploymentMetaData;
-import org.jboss.metadata.rar.jboss.mcf.ManagedConnectionFactoryDeploymentGroup;
-import org.jboss.metadata.rar.jboss.mcf.ManagedConnectionFactoryDeploymentMetaData;
-import org.jboss.metadata.rar.jboss.mcf.NonXADataSourceDeploymentMetaData;
-import org.jboss.metadata.rar.jboss.mcf.XADataSourceDeploymentMetaData;
-import org.jboss.test.metadata.javaee.AbstractJavaEEMetaDataTest;
-import org.jboss.xb.binding.sunday.unmarshalling.DefaultSchemaResolver;
-import org.jboss.xb.binding.sunday.unmarshalling.SchemaBindingResolver;
-
-public class JcaDs60UnitTestCase extends AbstractJavaEEMetaDataTest
-{
- public static SchemaBindingResolver initResolver()
- {
- DefaultSchemaResolver resolver = new DefaultSchemaResolver();
- //resolver.addClassBinding("", ManagedConnectionFactoryDeploymentGroup.class);
- //resolver.addClassBindingForLocation("jboss-ds_5_0.dtd", ManagedConnectionFactoryDeploymentGroup.class);
- resolver.addClassBindingForLocation("jboss-ds_5_0.xsd", ManagedConnectionFactoryDeploymentGroup.class);
- return resolver;
- }
-
- public JcaDs60UnitTestCase(String name) {
- super(name);
- }
-
- protected ManagedConnectionFactoryDeploymentGroup unmarshalMCFD() throws Exception
- {
- return unmarshal(ManagedConnectionFactoryDeploymentGroup.class);
- }
-
- /**
- * test a minimal local-tx-datasource
- */
- public void testMinimal() throws Exception
- {
-
- ManagedConnectionFactoryDeploymentGroup ds = unmarshalMCFD();
- assertNotNull(ds);
- assertEquals(ds.getDeployments().size(), 1);
- assertNotNull(ds.getDeployments().get(0));
- assertTrue(ds.getDeployments().get(0) instanceof LocalDataSourceDeploymentMetaData);
- LocalDataSourceDeploymentMetaData ld = (LocalDataSourceDeploymentMetaData)ds.getDeployments().get(0);
- assertTestNoXAMinimal(ld);
- }
-
- /**
- * test a basic local-tx-datasource, for example hsql-ds.xml
- */
- public void testBasic() throws Exception
- {
-
- ManagedConnectionFactoryDeploymentGroup ds = unmarshalMCFD();
- LocalDataSourceDeploymentMetaData ld = (LocalDataSourceDeploymentMetaData)ds.getDeployments().get(0);
- assertTestNoXAMinimal(ld);
- assertEquals(ld.getConnectionProperties().size(), 0);
- assertEquals(ld.getUserName(), "sa");
- assertEquals(ld.getPassWord(), "");
-
- assertEquals(ld.getSecurityMetaData().getDomain(), "HsqlDbRealm");
- assertEquals(ld.getMinSize(), 5);
- assertEquals(ld.getMaxSize(), 20);
- assertEquals(ld.getIdleTimeoutMinutes(), 0);
-
-
- assertEquals(ld.getTrackStatements(), "");
- assertEquals(ld.getPreparedStatementCacheSize(), 32);
- assertNotNull(ld.getDbmsMetaData());
- assertEquals(ld.getDbmsMetaData().getTypeMapping(), "Hypersonic SQL");
- }
-
- /**
- * test a everything of no-tx-datasource
- */
- public void testNoTxDsEverything() throws Exception
- {
- ManagedConnectionFactoryDeploymentGroup ds = unmarshalMCFD();
- NonXADataSourceDeploymentMetaData ld = (NonXADataSourceDeploymentMetaData)ds.getDeployments().get(0);
- assertTestNoXAMinimal(ld);
-
- assertFalse(ld.isUseJavaContext());
- assertTestUrl(ld);
-
- assertEquals(ld.getConnectionProperties().size(), 2);
- assertTrue(ld.getConnectionProperties().get(0).getName().equals("char.encoding"));
- assertTrue(ld.getConnectionProperties().get(1).getValue().equals("+8"));
- assertTestUser(ld);
- assertEquals(ld.getSecurityMetaData().getDomain(), "HsqlDbRealm");
- assertTestConnectionPool(ld);
- assertTrue(ld.isValidateOnMatch());
- assertTestDatasource(ld);
-
- assertTestAddition(ld);
- assertTestOption(ld);
- }
-
- /**
- * test a everything of local-tx-datasource
- */
- public void testLocalTxDsEverything() throws Exception
- {
- ManagedConnectionFactoryDeploymentGroup ds = unmarshalMCFD();
- LocalDataSourceDeploymentMetaData ld = (LocalDataSourceDeploymentMetaData)ds.getDeployments().get(0);
- assertTestNoXAMinimal(ld);
-
- assertFalse(ld.isUseJavaContext());
- assertTestUrl(ld);
- assertNotNull(ld.getTransactionIsolation());
- assertEquals(ld.getConnectionProperties().size(), 2);
- assertTrue(ld.getConnectionProperties().get(0).getName().equals("char.encoding"));
- assertTrue(ld.getConnectionProperties().get(1).getValue().equals("+8"));
- assertTestUser(ld);
- assertEquals(ld.getSecurityMetaData().getDomain(), "HsqlDbRealm");
- assertTestConnectionPool(ld);
- assertTrue(ld.isValidateOnMatch());
- //assertTrue(ld.getNoTxSeparatePools());
- assertTestDatasource(ld);
-
- assertTestAddition(ld);
- assertTestOption(ld);
- }
-
- /**
- * test a everything of xa-datasource
- */
- public void testXaDsEverything() throws Exception
- {
- ManagedConnectionFactoryDeploymentGroup ds = unmarshalMCFD();
- XADataSourceDeploymentMetaData ld = (XADataSourceDeploymentMetaData)ds.getDeployments().get(0);
-
- assertFalse(ld.isUseJavaContext());
- //assertTrue(ld.getTrackConnectionByTransaction());
- assertTrue(ld.isInterleaving());
-
- assertTrue(ld.getXaDataSourceClass().startsWith("oracle"));
- assertEquals(ld.getXaDataSourceProperties().size(), 3);
- assertEquals(ld.getXaDataSourceProperties().get(0).getName(), "URL");
- assertEquals(ld.getXaDataSourceProperties().get(2).getValue(), "tiger");
- assertTestUrl(ld);
-
- assertFalse(ld.getIsSameRMOverrideValue());
- //transaction-isolation
-
- assertTestUser(ld);
- assertEquals(ld.getSecurityMetaData().getDomain(), "HsqlDbRealm");
- assertTestConnectionPool(ld);
- assertTrue(ld.isValidateOnMatch());
- //assertTrue(ld.getNoTxSeparatePools());
- assertEquals(ld.getXaResourceTimeout(), 300);
- assertTestDatasource(ld);
-
- assertTestAddition(ld);
- assertTestOption(ld);
- }
-
- private void assertTestUrl(DataSourceDeploymentMetaData ld)
- {
- assertEquals(ld.getUrlDelimiter(), "|");
- assertTrue(ld.getUrlSelectorStrategyClassName().endsWith("Stratery"));
- }
-
- private void assertTestUser(DataSourceDeploymentMetaData ld)
- {
- assertEquals(ld.getUserName(), "sa");
- assertEquals(ld.getPassWord(), "");
- }
-
- private void assertTestConnectionPool(ManagedConnectionFactoryDeploymentMetaData ld)
- {
- assertEquals(ld.getMinSize(), 5);
- assertEquals(ld.getMaxSize(), 20);
- assertEquals(ld.getBlockingTimeoutMilliSeconds(), 30000);
- assertTrue(ld.isBackgroundValidation());
- assertEquals(ld.getBackgroundValidationMillis(), 3000);
- assertEquals(ld.getIdleTimeoutMinutes(), 0);
- assertEquals(ld.getAllocationRetry(), 0);
- assertEquals(ld.getAllocationRetryWaitMillis(), 5000);
- }
-
- private void assertTestDatasource(DataSourceDeploymentMetaData ld)
- {
- assertTrue(ld.getNewConnectionSQL().endsWith("sql"));
- assertTrue(ld.getValidConnectionCheckerClassName().endsWith("Checker"));
- assertTrue(ld.getCheckValidConnectionSQL().startsWith("select"));
- assertTrue(ld.getExceptionSorterClassName().endsWith("Sorter"));
- assertTrue(ld.getStaleConnectionCheckerClassName().endsWith("Checker"));
- }
-
- private void assertTestAddition(DataSourceDeploymentMetaData ld)
- {
- assertEquals(ld.getPreparedStatementCacheSize(), 32);
- assertTrue(ld.isSharePreparedStatements());
- assertTrue(ld.isUseQueryTimeout());
- assertEquals(ld.getQueryTimeout(), 300);
- assertEquals(ld.getUseTryLock(), 300000);
- assertEquals(ld.getTrackStatements(), "");
- }
-
- private void assertTestOption(ManagedConnectionFactoryDeploymentMetaData ld)
- {
- assertEquals(ld.getTypeMapping(), "Hypersonic SQL");
- assertEquals(ld.getDependsNames().size(), 2);
- assertTrue(ld.getDependsNames().get(0).startsWith("jboss"));
- }
-
- protected void assertTestNoXAMinimal(NonXADataSourceDeploymentMetaData xad) throws Exception
- {
- assertNotNull(xad);
- assertEquals(xad.getJndiName(), "DefaultDS");
- assertTrue(xad.getConnectionUrl().startsWith("jdbc"));
- assertEquals(xad.getDriverClass(), "org.hsqldb.jdbcDriver");
- }
-}
-
Copied: projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/rar/JcaDs50_testBasic.xml (from rev 83971, projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/rar/JcaDs60_testBasic.xml)
===================================================================
--- projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/rar/JcaDs50_testBasic.xml (rev 0)
+++ projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/rar/JcaDs50_testBasic.xml 2009-02-09 02:19:26 UTC (rev 83973)
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- $Id: $ -->
+
+<datasources xmlns="http://www.jboss.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.jboss.com/xml/ns/javaee
+ http://www.jboss.org/j2ee/schema/jboss-ds_5_0.xsd">
+ <local-tx-datasource>
+
+ <!-- The jndi name of the DataSource, it is prefixed with java:/ -->
+ <!-- Datasources are not available outside the virtual machine -->
+ <jndi-name>DefaultDS</jndi-name>
+
+ <!-- For in-process persistent db, saved when jboss stops.
+ The org.jboss.jdbc.HypersonicDatabase mbean is required for proper db shutdown
+ -->
+ <connection-url>jdbc:hsqldb:${jboss.server.data.dir}${/}hypersonic${/}localDB</connection-url>
+
+ <!-- The driver class -->
+ <driver-class>org.hsqldb.jdbcDriver</driver-class>
+
+ <!-- The login and password -->
+ <user-name>sa</user-name>
+ <password></password>
+
+
+ <!-- Use the getConnection(user, pw) for logins
+ <application-managed-security/>
+ -->
+
+ <!-- Use the security domain defined in conf/login-config.xml -->
+ <security-domain>HsqlDbRealm</security-domain>
+
+ <!-- Use the security domain defined in conf/login-config.xml or the
+ getConnection(user, pw) for logins. The security domain takes precedence.
+ <security-domain-and-application>HsqlDbRealm</security-domain-and-application>
+ -->
+
+ <!--example of how to specify class that determines if exception means connection should be destroyed-->
+ <!--exception-sorter-class-name>org.jboss.resource.adapter.jdbc.vendor.DummyExceptionSorter</exception-sorter-class-name-->
+
+ <!-- this will be run before a managed connection is removed from the pool for use by a client-->
+ <!--<check-valid-connection-sql>select * from something</check-valid-connection-sql> -->
+
+ <!-- The minimum connections in a pool/sub-pool. Pools are lazily constructed on first use -->
+ <min-pool-size>5</min-pool-size>
+
+ <!-- The maximum connections in a pool/sub-pool -->
+ <max-pool-size>20</max-pool-size>
+
+ <!-- The time before an unused connection is destroyed -->
+ <!-- NOTE: This is the check period. It will be destroyed somewhere between 1x and 2x this timeout after last use -->
+ <!-- TEMPORARY FIX! - Disable idle connection removal, HSQLDB has a problem with not reaping threads on closed connections -->
+ <idle-timeout-minutes>0</idle-timeout-minutes>
+
+ <!-- sql to call when connection is created
+ <new-connection-sql>some arbitrary sql</new-connection-sql>
+ -->
+
+ <!-- sql to call on an existing pooled connection when it is obtained from pool
+ <check-valid-connection-sql>some arbitrary sql</check-valid-connection-sql>
+ -->
+
+ <!-- example of how to specify a class that determines a connection is valid before it is handed out from the pool
+ <valid-connection-checker-class-name>org.jboss.resource.adapter.jdbc.vendor.DummyValidConnectionChecker</valid-connection-checker-class-name>
+ -->
+
+ <!-- Whether to check all statements are closed when the connection is returned to the pool,
+ this is a debugging feature that should be turned off in production -->
+ <track-statements/>
+
+ <!-- HSQL DB benefits from prepared statement caching -->
+ <prepared-statement-cache-size>32</prepared-statement-cache-size>
+
+ <!-- corresponding type-mapping in the standardjbosscmp-jdbc.xml (optional) -->
+ <metadata>
+ <type-mapping>Hypersonic SQL</type-mapping>
+ </metadata>
+
+ <!--
+ When using in-process (standalone) mode
+ <depends>jboss:service=Hypersonic,database=localDB</depends>
+ Uncomment when using hsqldb in server mode
+ <depends>jboss:service=Hypersonic</depends>
+ -->
+ </local-tx-datasource>
+
+</datasources>
Property changes on: projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/rar/JcaDs50_testBasic.xml
___________________________________________________________________
Name: svn:mergeinfo
+
Copied: projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/rar/JcaDs50_testLocalTxDsEverything.xml (from rev 83971, projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/rar/JcaDs60_testLocalTxDsEverything.xml)
===================================================================
--- projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/rar/JcaDs50_testLocalTxDsEverything.xml (rev 0)
+++ projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/rar/JcaDs50_testLocalTxDsEverything.xml 2009-02-09 02:19:26 UTC (rev 83973)
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- $Id: $ -->
+
+<datasources xmlns="http://www.jboss.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.jboss.com/xml/ns/javaee
+ http://www.jboss.org/j2ee/schema/jboss-ds_5_0.xsd">
+ <local-tx-datasource>
+
+ <!-- The jndi name of the DataSource, it is prefixed with java:/ -->
+ <!-- Datasources are not available outside the virtual machine -->
+ <jndi-name>DefaultDS</jndi-name>
+
+ <use-java-context>false</use-java-context>
+
+ <!-- For in-process persistent db, saved when jboss stops.
+ The org.jboss.jdbc.HypersonicDatabase mbean is required for proper db shutdown
+ -->
+ <connection-url>jdbc:hsqldb:${jboss.server.data.dir}${/}hypersonic${/}localDB</connection-url>
+
+ <url-delimiter>|</url-delimiter>
+
+ <url-selector-strategy-class-name>org.jboss.jca.UrlStratery</url-selector-strategy-class-name>
+
+ <!-- The driver class -->
+ <driver-class>org.hsqldb.jdbcDriver</driver-class>
+
+ <transaction-isolation>TRANSACTION_READ_COMMITTED</transaction-isolation>
+
+ <connection-property name="char.encoding">UTF-8</connection-property>
+ <connection-property name="time.zone">+8</connection-property>
+
+ <!-- The login and password -->
+ <user-name>sa</user-name>
+ <password></password>
+
+
+ <!-- Use the getConnection(user, pw) for logins
+ <application-managed-security/>
+ -->
+
+ <!-- Use the security domain defined in conf/login-config.xml -->
+ <security-domain>HsqlDbRealm</security-domain>
+
+ <!-- Use the security domain defined in conf/login-config.xml or the
+ getConnection(user, pw) for logins. The security domain takes precedence.
+ <security-domain-and-application>HsqlDbRealm</security-domain-and-application>
+ -->
+
+
+ <!-- The minimum connections in a pool/sub-pool. Pools are lazily constructed on first use -->
+ <min-pool-size>5</min-pool-size>
+
+ <!-- The maximum connections in a pool/sub-pool -->
+ <max-pool-size>20</max-pool-size>
+
+ <blocking-timeout-millis>30000</blocking-timeout-millis>
+
+ <background-validation>true</background-validation>
+ <background-validation-millis>3000</background-validation-millis>
+
+ <!-- The time before an unused connection is destroyed -->
+ <!-- NOTE: This is the check period. It will be destroyed somewhere between 1x and 2x this timeout after last use -->
+ <!-- TEMPORARY FIX! - Disable idle connection removal, HSQLDB has a problem with not reaping threads on closed connections -->
+ <idle-timeout-minutes>0</idle-timeout-minutes>
+
+ <allocation-retry>0</allocation-retry>
+ <allocation-retry-wait-millis>5000</allocation-retry-wait-millis>
+
+ <validate-on-match>true</validate-on-match>
+ <no-tx-separate-pools/>
+
+ <!-- sql to call when connection is created -->
+ <new-connection-sql>some arbitrary sql</new-connection-sql>
+
+
+ <!-- this will be run before a managed connection is removed from the pool for use by a client-->
+ <check-valid-connection-sql>select * from something</check-valid-connection-sql>
+
+
+ <!-- example of how to specify a class that determines a connection is valid before it is handed out from the pool -->
+ <valid-connection-checker-class-name>org.jboss.resource.adapter.jdbc.vendor.DummyValidConnectionChecker</valid-connection-checker-class-name>
+
+ <!--example of how to specify class that determines if exception means connection should be destroyed-->
+ <exception-sorter-class-name>org.jboss.resource.adapter.jdbc.vendor.DummyExceptionSorter</exception-sorter-class-name>
+ <stale-connection-checker-class-name>org.jboss.resource.adapter.jdbc.vendor.StaleConnectionChecker</stale-connection-checker-class-name>
+
+ <!-- Whether to check all statements are closed when the connection is returned to the pool,
+ this is a debugging feature that should be turned off in production -->
+ <track-statements/>
+
+ <prefill>true</prefill>
+
+ <!-- HSQL DB benefits from prepared statement caching -->
+ <prepared-statement-cache-size>32</prepared-statement-cache-size>
+ <share-prepared-statements>true</share-prepared-statements>
+
+ <set-tx-query-timeout>true</set-tx-query-timeout>
+
+ <query-timeout>300</query-timeout>
+ <use-try-lock>300000</use-try-lock>
+
+ <!-- corresponding type-mapping in the standardjbosscmp-jdbc.xml (optional) -->
+ <type-mapping>Hypersonic SQL</type-mapping>
+
+ <!--
+ When using in-process (standalone) mode
+ Uncomment when using hsqldb in server mode
+ -->
+
+ <depends>jboss:service=Hypersonic,database=localDB</depends>
+ <depends>jboss:service=Hypersonic</depends>
+ </local-tx-datasource>
+
+</datasources>
Property changes on: projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/rar/JcaDs50_testLocalTxDsEverything.xml
___________________________________________________________________
Name: svn:mergeinfo
+
Copied: projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/rar/JcaDs50_testMinimal.xml (from rev 83971, projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/rar/JcaDs60_testMinimal.xml)
===================================================================
--- projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/rar/JcaDs50_testMinimal.xml (rev 0)
+++ projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/rar/JcaDs50_testMinimal.xml 2009-02-09 02:19:26 UTC (rev 83973)
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- $Id: $ -->
+
+<datasources xmlns="http://www.jboss.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.jboss.com/xml/ns/javaee
+ http://www.jboss.org/j2ee/schema/jboss-ds_5_0.xsd">
+ <local-tx-datasource>
+ <jndi-name>DefaultDS</jndi-name>
+ <connection-url>jdbc:hsqldb:${jboss.server.data.dir}${/}hypersonic${/}localDB</connection-url>
+ <driver-class>org.hsqldb.jdbcDriver</driver-class>
+ </local-tx-datasource>
+</datasources>
Property changes on: projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/rar/JcaDs50_testMinimal.xml
___________________________________________________________________
Name: svn:mergeinfo
+
Copied: projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/rar/JcaDs50_testNoTxDsEverything.xml (from rev 83971, projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/rar/JcaDs60_testNoTxDsEverything.xml)
===================================================================
--- projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/rar/JcaDs50_testNoTxDsEverything.xml (rev 0)
+++ projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/rar/JcaDs50_testNoTxDsEverything.xml 2009-02-09 02:19:26 UTC (rev 83973)
@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- $Id: $ -->
+
+<datasources xmlns="http://www.jboss.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.jboss.com/xml/ns/javaee
+ http://www.jboss.org/j2ee/schema/jboss-ds_5_0.xsd">
+ <no-tx-datasource>
+
+ <!-- The jndi name of the DataSource, it is prefixed with java:/ -->
+ <!-- Datasources are not available outside the virtual machine -->
+ <jndi-name>DefaultDS</jndi-name>
+
+ <use-java-context>false</use-java-context>
+
+ <!-- For in-process persistent db, saved when jboss stops.
+ The org.jboss.jdbc.HypersonicDatabase mbean is required for proper db shutdown
+ -->
+ <connection-url>jdbc:hsqldb:${jboss.server.data.dir}${/}hypersonic${/}localDB</connection-url>
+
+ <url-delimiter>|</url-delimiter>
+
+ <url-selector-strategy-class-name>org.jboss.jca.UrlStratery</url-selector-strategy-class-name>
+
+ <!-- The driver class -->
+ <driver-class>org.hsqldb.jdbcDriver</driver-class>
+
+ <connection-property name="char.encoding">UTF-8</connection-property>
+ <connection-property name="time.zone">+8</connection-property>
+
+ <!-- The login and password -->
+ <user-name>sa</user-name>
+ <password></password>
+
+
+ <!-- Use the getConnection(user, pw) for logins
+ <application-managed-security/>
+ -->
+
+ <!-- Use the security domain defined in conf/login-config.xml -->
+ <security-domain>HsqlDbRealm</security-domain>
+
+ <!-- Use the security domain defined in conf/login-config.xml or the
+ getConnection(user, pw) for logins. The security domain takes precedence.
+ <security-domain-and-application>HsqlDbRealm</security-domain-and-application>
+ -->
+
+
+ <!-- The minimum connections in a pool/sub-pool. Pools are lazily constructed on first use -->
+ <min-pool-size>5</min-pool-size>
+
+ <!-- The maximum connections in a pool/sub-pool -->
+ <max-pool-size>20</max-pool-size>
+
+ <blocking-timeout-millis>30000</blocking-timeout-millis>
+
+ <background-validation>true</background-validation>
+ <background-validation-millis>3000</background-validation-millis>
+
+ <!-- The time before an unused connection is destroyed -->
+ <!-- NOTE: This is the check period. It will be destroyed somewhere between 1x and 2x this timeout after last use -->
+ <!-- TEMPORARY FIX! - Disable idle connection removal, HSQLDB has a problem with not reaping threads on closed connections -->
+ <idle-timeout-minutes>0</idle-timeout-minutes>
+
+ <allocation-retry>0</allocation-retry>
+ <allocation-retry-wait-millis>5000</allocation-retry-wait-millis>
+
+ <validate-on-match>true</validate-on-match>
+
+ <!-- sql to call when connection is created -->
+ <new-connection-sql>some arbitrary sql</new-connection-sql>
+
+
+ <!-- this will be run before a managed connection is removed from the pool for use by a client-->
+ <check-valid-connection-sql>select * from something</check-valid-connection-sql>
+
+
+ <!-- example of how to specify a class that determines a connection is valid before it is handed out from the pool -->
+ <valid-connection-checker-class-name>org.jboss.resource.adapter.jdbc.vendor.DummyValidConnectionChecker</valid-connection-checker-class-name>
+
+ <!--example of how to specify class that determines if exception means connection should be destroyed-->
+ <exception-sorter-class-name>org.jboss.resource.adapter.jdbc.vendor.DummyExceptionSorter</exception-sorter-class-name>
+ <stale-connection-checker-class-name>org.jboss.resource.adapter.jdbc.vendor.StaleConnectionChecker</stale-connection-checker-class-name>
+
+ <!-- Whether to check all statements are closed when the connection is returned to the pool,
+ this is a debugging feature that should be turned off in production -->
+ <track-statements/>
+
+ <prefill>true</prefill>
+
+ <!-- HSQL DB benefits from prepared statement caching -->
+ <prepared-statement-cache-size>32</prepared-statement-cache-size>
+ <share-prepared-statements>true</share-prepared-statements>
+
+ <set-tx-query-timeout>true</set-tx-query-timeout>
+
+ <query-timeout>300</query-timeout>
+ <use-try-lock>300000</use-try-lock>
+
+ <!-- corresponding type-mapping in the standardjbosscmp-jdbc.xml (optional) -->
+ <type-mapping>Hypersonic SQL</type-mapping>
+
+ <!--
+ When using in-process (standalone) mode
+ Uncomment when using hsqldb in server mode
+ -->
+
+ <depends>jboss:service=Hypersonic,database=localDB</depends>
+ <depends>jboss:service=Hypersonic</depends>
+ </no-tx-datasource>
+
+</datasources>
Property changes on: projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/rar/JcaDs50_testNoTxDsEverything.xml
___________________________________________________________________
Name: svn:mergeinfo
+
Copied: projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/rar/JcaDs50_testXaDsEverything.xml (from rev 83971, projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/rar/JcaDs60_testXaDsEverything.xml)
===================================================================
--- projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/rar/JcaDs50_testXaDsEverything.xml (rev 0)
+++ projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/rar/JcaDs50_testXaDsEverything.xml 2009-02-09 02:19:26 UTC (rev 83973)
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- $Id: $ -->
+
+<datasources xmlns="http://www.jboss.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.jboss.com/xml/ns/javaee
+ http://www.jboss.org/j2ee/schema/jboss-ds_5_0.xsd">
+ <xa-datasource>
+
+ <!-- The jndi name of the DataSource, it is prefixed with java:/ -->
+ <!-- Datasources are not available outside the virtual machine -->
+ <jndi-name>DefaultDS</jndi-name>
+
+ <use-java-context>false</use-java-context>
+
+ <track-connection-by-tx/>
+ <interleaving/>
+ <xa-datasource-class>oracle.jdbc.xa.client.OracleXADataSource</xa-datasource-class>
+ <xa-datasource-property name="URL">jdbc:oracle:oci8:@tc</xa-datasource-property>
+ <xa-datasource-property name="User">scott</xa-datasource-property>
+ <xa-datasource-property name="Password">tiger</xa-datasource-property>
+
+ <url-property>UrlProperty</url-property>
+
+ <url-delimiter>|</url-delimiter>
+
+ <url-selector-strategy-class-name>org.jboss.jca.UrlStratery</url-selector-strategy-class-name>
+
+ <isSameRM-override-value>false</isSameRM-override-value>
+
+ <transaction-isolation>TRANSACTION_READ_COMMITTED</transaction-isolation>
+
+ <!-- The login and password -->
+ <user-name>sa</user-name>
+ <password></password>
+
+
+ <!-- Use the getConnection(user, pw) for logins
+ <application-managed-security/>
+ -->
+
+ <!-- Use the security domain defined in conf/login-config.xml -->
+ <security-domain>HsqlDbRealm</security-domain>
+
+ <!-- Use the security domain defined in conf/login-config.xml or the
+ getConnection(user, pw) for logins. The security domain takes precedence.
+ <security-domain-and-application>HsqlDbRealm</security-domain-and-application>
+ -->
+
+
+ <!-- The minimum connections in a pool/sub-pool. Pools are lazily constructed on first use -->
+ <min-pool-size>5</min-pool-size>
+
+ <!-- The maximum connections in a pool/sub-pool -->
+ <max-pool-size>20</max-pool-size>
+
+ <blocking-timeout-millis>30000</blocking-timeout-millis>
+
+ <background-validation>true</background-validation>
+ <background-validation-millis>3000</background-validation-millis>
+
+ <!-- The time before an unused connection is destroyed -->
+ <!-- NOTE: This is the check period. It will be destroyed somewhere between 1x and 2x this timeout after last use -->
+ <!-- TEMPORARY FIX! - Disable idle connection removal, HSQLDB has a problem with not reaping threads on closed connections -->
+ <idle-timeout-minutes>0</idle-timeout-minutes>
+
+ <allocation-retry>0</allocation-retry>
+ <allocation-retry-wait-millis>5000</allocation-retry-wait-millis>
+
+ <validate-on-match>true</validate-on-match>
+ <no-tx-separate-pools/>
+ <xa-resource-timeout>300</xa-resource-timeout>
+
+ <!-- sql to call when connection is created -->
+ <new-connection-sql>some arbitrary sql</new-connection-sql>
+
+
+ <!-- this will be run before a managed connection is removed from the pool for use by a client-->
+ <check-valid-connection-sql>select * from something</check-valid-connection-sql>
+
+
+ <!-- example of how to specify a class that determines a connection is valid before it is handed out from the pool -->
+ <valid-connection-checker-class-name>org.jboss.resource.adapter.jdbc.vendor.DummyValidConnectionChecker</valid-connection-checker-class-name>
+
+ <!--example of how to specify class that determines if exception means connection should be destroyed-->
+ <exception-sorter-class-name>org.jboss.resource.adapter.jdbc.vendor.DummyExceptionSorter</exception-sorter-class-name>
+ <stale-connection-checker-class-name>org.jboss.resource.adapter.jdbc.vendor.StaleConnectionChecker</stale-connection-checker-class-name>
+
+ <!-- Whether to check all statements are closed when the connection is returned to the pool,
+ this is a debugging feature that should be turned off in production -->
+ <track-statements/>
+
+ <prefill>true</prefill>
+
+ <!-- HSQL DB benefits from prepared statement caching -->
+ <prepared-statement-cache-size>32</prepared-statement-cache-size>
+ <share-prepared-statements>true</share-prepared-statements>
+
+ <set-tx-query-timeout>true</set-tx-query-timeout>
+
+ <query-timeout>300</query-timeout>
+ <use-try-lock>300000</use-try-lock>
+
+ <!-- corresponding type-mapping in the standardjbosscmp-jdbc.xml (optional) -->
+ <type-mapping>Hypersonic SQL</type-mapping>
+
+ <!--
+ When using in-process (standalone) mode
+ Uncomment when using hsqldb in server mode
+ -->
+
+ <depends>jboss:service=Hypersonic,database=localDB</depends>
+ <depends>jboss:service=Hypersonic</depends>
+ </xa-datasource>
+
+</datasources>
Property changes on: projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/rar/JcaDs50_testXaDsEverything.xml
___________________________________________________________________
Name: svn:mergeinfo
+
Deleted: projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/rar/JcaDs60_testBasic.xml
===================================================================
--- projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/rar/JcaDs60_testBasic.xml 2009-02-09 01:54:49 UTC (rev 83972)
+++ projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/rar/JcaDs60_testBasic.xml 2009-02-09 02:19:26 UTC (rev 83973)
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<datasources xmlns="http://www.jboss.com/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.jboss.com/xml/ns/javaee
- http://www.jboss.org/j2ee/schema/jboss-ds_6_0.xsd">
- <local-tx-datasource>
-
- <!-- The jndi name of the DataSource, it is prefixed with java:/ -->
- <!-- Datasources are not available outside the virtual machine -->
- <jndi-name>DefaultDS</jndi-name>
-
- <!-- For in-process persistent db, saved when jboss stops.
- The org.jboss.jdbc.HypersonicDatabase mbean is required for proper db shutdown
- -->
- <connection-url>jdbc:hsqldb:${jboss.server.data.dir}${/}hypersonic${/}localDB</connection-url>
-
- <!-- The driver class -->
- <driver-class>org.hsqldb.jdbcDriver</driver-class>
-
- <!-- The login and password -->
- <user-name>sa</user-name>
- <password></password>
-
-
- <!-- Use the getConnection(user, pw) for logins
- <application-managed-security/>
- -->
-
- <!-- Use the security domain defined in conf/login-config.xml -->
- <security-domain>HsqlDbRealm</security-domain>
-
- <!-- Use the security domain defined in conf/login-config.xml or the
- getConnection(user, pw) for logins. The security domain takes precedence.
- <security-domain-and-application>HsqlDbRealm</security-domain-and-application>
- -->
-
- <!--example of how to specify class that determines if exception means connection should be destroyed-->
- <!--exception-sorter-class-name>org.jboss.resource.adapter.jdbc.vendor.DummyExceptionSorter</exception-sorter-class-name-->
-
- <!-- this will be run before a managed connection is removed from the pool for use by a client-->
- <!--<check-valid-connection-sql>select * from something</check-valid-connection-sql> -->
-
- <!-- The minimum connections in a pool/sub-pool. Pools are lazily constructed on first use -->
- <min-pool-size>5</min-pool-size>
-
- <!-- The maximum connections in a pool/sub-pool -->
- <max-pool-size>20</max-pool-size>
-
- <!-- The time before an unused connection is destroyed -->
- <!-- NOTE: This is the check period. It will be destroyed somewhere between 1x and 2x this timeout after last use -->
- <!-- TEMPORARY FIX! - Disable idle connection removal, HSQLDB has a problem with not reaping threads on closed connections -->
- <idle-timeout-minutes>0</idle-timeout-minutes>
-
- <!-- sql to call when connection is created
- <new-connection-sql>some arbitrary sql</new-connection-sql>
- -->
-
- <!-- sql to call on an existing pooled connection when it is obtained from pool
- <check-valid-connection-sql>some arbitrary sql</check-valid-connection-sql>
- -->
-
- <!-- example of how to specify a class that determines a connection is valid before it is handed out from the pool
- <valid-connection-checker-class-name>org.jboss.resource.adapter.jdbc.vendor.DummyValidConnectionChecker</valid-connection-checker-class-name>
- -->
-
- <!-- Whether to check all statements are closed when the connection is returned to the pool,
- this is a debugging feature that should be turned off in production -->
- <track-statements/>
-
- <!-- HSQL DB benefits from prepared statement caching -->
- <prepared-statement-cache-size>32</prepared-statement-cache-size>
-
- <!-- corresponding type-mapping in the standardjbosscmp-jdbc.xml (optional) -->
- <metadata>
- <type-mapping>Hypersonic SQL</type-mapping>
- </metadata>
-
- <!--
- When using in-process (standalone) mode
- <depends>jboss:service=Hypersonic,database=localDB</depends>
- Uncomment when using hsqldb in server mode
- <depends>jboss:service=Hypersonic</depends>
- -->
- </local-tx-datasource>
-
-</datasources>
Deleted: projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/rar/JcaDs60_testLocalTxDsEverything.xml
===================================================================
--- projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/rar/JcaDs60_testLocalTxDsEverything.xml 2009-02-09 01:54:49 UTC (rev 83972)
+++ projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/rar/JcaDs60_testLocalTxDsEverything.xml 2009-02-09 02:19:26 UTC (rev 83973)
@@ -1,113 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<datasources xmlns="http://www.jboss.com/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.jboss.com/xml/ns/javaee
- http://www.jboss.org/j2ee/schema/jboss-ds_6_0.xsd">
- <local-tx-datasource>
-
- <!-- The jndi name of the DataSource, it is prefixed with java:/ -->
- <!-- Datasources are not available outside the virtual machine -->
- <jndi-name>DefaultDS</jndi-name>
-
- <use-java-context>false</use-java-context>
-
- <!-- For in-process persistent db, saved when jboss stops.
- The org.jboss.jdbc.HypersonicDatabase mbean is required for proper db shutdown
- -->
- <connection-url>jdbc:hsqldb:${jboss.server.data.dir}${/}hypersonic${/}localDB</connection-url>
-
- <url-delimiter>|</url-delimiter>
-
- <url-selector-strategy-class-name>org.jboss.jca.UrlStratery</url-selector-strategy-class-name>
-
- <!-- The driver class -->
- <driver-class>org.hsqldb.jdbcDriver</driver-class>
-
- <transaction-isolation>TRANSACTION_READ_COMMITTED</transaction-isolation>
-
- <connection-property name="char.encoding">UTF-8</connection-property>
- <connection-property name="time.zone">+8</connection-property>
-
- <!-- The login and password -->
- <user-name>sa</user-name>
- <password></password>
-
-
- <!-- Use the getConnection(user, pw) for logins
- <application-managed-security/>
- -->
-
- <!-- Use the security domain defined in conf/login-config.xml -->
- <security-domain>HsqlDbRealm</security-domain>
-
- <!-- Use the security domain defined in conf/login-config.xml or the
- getConnection(user, pw) for logins. The security domain takes precedence.
- <security-domain-and-application>HsqlDbRealm</security-domain-and-application>
- -->
-
-
- <!-- The minimum connections in a pool/sub-pool. Pools are lazily constructed on first use -->
- <min-pool-size>5</min-pool-size>
-
- <!-- The maximum connections in a pool/sub-pool -->
- <max-pool-size>20</max-pool-size>
-
- <blocking-timeout-millis>30000</blocking-timeout-millis>
-
- <background-validation>true</background-validation>
- <background-validation-millis>3000</background-validation-millis>
-
- <!-- The time before an unused connection is destroyed -->
- <!-- NOTE: This is the check period. It will be destroyed somewhere between 1x and 2x this timeout after last use -->
- <!-- TEMPORARY FIX! - Disable idle connection removal, HSQLDB has a problem with not reaping threads on closed connections -->
- <idle-timeout-minutes>0</idle-timeout-minutes>
-
- <allocation-retry>0</allocation-retry>
- <allocation-retry-wait-millis>5000</allocation-retry-wait-millis>
-
- <validate-on-match>true</validate-on-match>
- <no-tx-separate-pools/>
-
- <!-- sql to call when connection is created -->
- <new-connection-sql>some arbitrary sql</new-connection-sql>
-
-
- <!-- this will be run before a managed connection is removed from the pool for use by a client-->
- <check-valid-connection-sql>select * from something</check-valid-connection-sql>
-
-
- <!-- example of how to specify a class that determines a connection is valid before it is handed out from the pool -->
- <valid-connection-checker-class-name>org.jboss.resource.adapter.jdbc.vendor.DummyValidConnectionChecker</valid-connection-checker-class-name>
-
- <!--example of how to specify class that determines if exception means connection should be destroyed-->
- <exception-sorter-class-name>org.jboss.resource.adapter.jdbc.vendor.DummyExceptionSorter</exception-sorter-class-name>
- <stale-connection-checker-class-name>org.jboss.resource.adapter.jdbc.vendor.StaleConnectionChecker</stale-connection-checker-class-name>
-
- <!-- Whether to check all statements are closed when the connection is returned to the pool,
- this is a debugging feature that should be turned off in production -->
- <track-statements/>
-
- <prefill>true</prefill>
-
- <!-- HSQL DB benefits from prepared statement caching -->
- <prepared-statement-cache-size>32</prepared-statement-cache-size>
- <share-prepared-statements>true</share-prepared-statements>
-
- <set-tx-query-timeout>true</set-tx-query-timeout>
-
- <query-timeout>300</query-timeout>
- <use-try-lock>300000</use-try-lock>
-
- <!-- corresponding type-mapping in the standardjbosscmp-jdbc.xml (optional) -->
- <type-mapping>Hypersonic SQL</type-mapping>
-
- <!--
- When using in-process (standalone) mode
- Uncomment when using hsqldb in server mode
- -->
-
- <depends>jboss:service=Hypersonic,database=localDB</depends>
- <depends>jboss:service=Hypersonic</depends>
- </local-tx-datasource>
-
-</datasources>
Deleted: projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/rar/JcaDs60_testMinimal.xml
===================================================================
--- projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/rar/JcaDs60_testMinimal.xml 2009-02-09 01:54:49 UTC (rev 83972)
+++ projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/rar/JcaDs60_testMinimal.xml 2009-02-09 02:19:26 UTC (rev 83973)
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<datasources xmlns="http://www.jboss.com/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.jboss.com/xml/ns/javaee
- http://www.jboss.org/j2ee/schema/jboss-ds_6_0.xsd">
- <local-tx-datasource>
- <jndi-name>DefaultDS</jndi-name>
- <connection-url>jdbc:hsqldb:${jboss.server.data.dir}${/}hypersonic${/}localDB</connection-url>
- <driver-class>org.hsqldb.jdbcDriver</driver-class>
- </local-tx-datasource>
-</datasources>
Deleted: projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/rar/JcaDs60_testNoTxDsEverything.xml
===================================================================
--- projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/rar/JcaDs60_testNoTxDsEverything.xml 2009-02-09 01:54:49 UTC (rev 83972)
+++ projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/rar/JcaDs60_testNoTxDsEverything.xml 2009-02-09 02:19:26 UTC (rev 83973)
@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<datasources xmlns="http://www.jboss.com/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.jboss.com/xml/ns/javaee
- http://www.jboss.org/j2ee/schema/jboss-ds_6_0.xsd">
- <no-tx-datasource>
-
- <!-- The jndi name of the DataSource, it is prefixed with java:/ -->
- <!-- Datasources are not available outside the virtual machine -->
- <jndi-name>DefaultDS</jndi-name>
-
- <use-java-context>false</use-java-context>
-
- <!-- For in-process persistent db, saved when jboss stops.
- The org.jboss.jdbc.HypersonicDatabase mbean is required for proper db shutdown
- -->
- <connection-url>jdbc:hsqldb:${jboss.server.data.dir}${/}hypersonic${/}localDB</connection-url>
-
- <url-delimiter>|</url-delimiter>
-
- <url-selector-strategy-class-name>org.jboss.jca.UrlStratery</url-selector-strategy-class-name>
-
- <!-- The driver class -->
- <driver-class>org.hsqldb.jdbcDriver</driver-class>
-
- <connection-property name="char.encoding">UTF-8</connection-property>
- <connection-property name="time.zone">+8</connection-property>
-
- <!-- The login and password -->
- <user-name>sa</user-name>
- <password></password>
-
-
- <!-- Use the getConnection(user, pw) for logins
- <application-managed-security/>
- -->
-
- <!-- Use the security domain defined in conf/login-config.xml -->
- <security-domain>HsqlDbRealm</security-domain>
-
- <!-- Use the security domain defined in conf/login-config.xml or the
- getConnection(user, pw) for logins. The security domain takes precedence.
- <security-domain-and-application>HsqlDbRealm</security-domain-and-application>
- -->
-
-
- <!-- The minimum connections in a pool/sub-pool. Pools are lazily constructed on first use -->
- <min-pool-size>5</min-pool-size>
-
- <!-- The maximum connections in a pool/sub-pool -->
- <max-pool-size>20</max-pool-size>
-
- <blocking-timeout-millis>30000</blocking-timeout-millis>
-
- <background-validation>true</background-validation>
- <background-validation-millis>3000</background-validation-millis>
-
- <!-- The time before an unused connection is destroyed -->
- <!-- NOTE: This is the check period. It will be destroyed somewhere between 1x and 2x this timeout after last use -->
- <!-- TEMPORARY FIX! - Disable idle connection removal, HSQLDB has a problem with not reaping threads on closed connections -->
- <idle-timeout-minutes>0</idle-timeout-minutes>
-
- <allocation-retry>0</allocation-retry>
- <allocation-retry-wait-millis>5000</allocation-retry-wait-millis>
-
- <validate-on-match>true</validate-on-match>
-
- <!-- sql to call when connection is created -->
- <new-connection-sql>some arbitrary sql</new-connection-sql>
-
-
- <!-- this will be run before a managed connection is removed from the pool for use by a client-->
- <check-valid-connection-sql>select * from something</check-valid-connection-sql>
-
-
- <!-- example of how to specify a class that determines a connection is valid before it is handed out from the pool -->
- <valid-connection-checker-class-name>org.jboss.resource.adapter.jdbc.vendor.DummyValidConnectionChecker</valid-connection-checker-class-name>
-
- <!--example of how to specify class that determines if exception means connection should be destroyed-->
- <exception-sorter-class-name>org.jboss.resource.adapter.jdbc.vendor.DummyExceptionSorter</exception-sorter-class-name>
- <stale-connection-checker-class-name>org.jboss.resource.adapter.jdbc.vendor.StaleConnectionChecker</stale-connection-checker-class-name>
-
- <!-- Whether to check all statements are closed when the connection is returned to the pool,
- this is a debugging feature that should be turned off in production -->
- <track-statements/>
-
- <prefill>true</prefill>
-
- <!-- HSQL DB benefits from prepared statement caching -->
- <prepared-statement-cache-size>32</prepared-statement-cache-size>
- <share-prepared-statements>true</share-prepared-statements>
-
- <set-tx-query-timeout>true</set-tx-query-timeout>
-
- <query-timeout>300</query-timeout>
- <use-try-lock>300000</use-try-lock>
-
- <!-- corresponding type-mapping in the standardjbosscmp-jdbc.xml (optional) -->
- <type-mapping>Hypersonic SQL</type-mapping>
-
- <!--
- When using in-process (standalone) mode
- Uncomment when using hsqldb in server mode
- -->
-
- <depends>jboss:service=Hypersonic,database=localDB</depends>
- <depends>jboss:service=Hypersonic</depends>
- </no-tx-datasource>
-
-</datasources>
Deleted: projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/rar/JcaDs60_testXaDsEverything.xml
===================================================================
--- projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/rar/JcaDs60_testXaDsEverything.xml 2009-02-09 01:54:49 UTC (rev 83972)
+++ projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/rar/JcaDs60_testXaDsEverything.xml 2009-02-09 02:19:26 UTC (rev 83973)
@@ -1,114 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<datasources xmlns="http://www.jboss.com/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.jboss.com/xml/ns/javaee
- http://www.jboss.org/j2ee/schema/jboss-ds_6_0.xsd">
- <xa-datasource>
-
- <!-- The jndi name of the DataSource, it is prefixed with java:/ -->
- <!-- Datasources are not available outside the virtual machine -->
- <jndi-name>DefaultDS</jndi-name>
-
- <use-java-context>false</use-java-context>
-
- <track-connection-by-tx/>
- <interleaving/>
- <xa-datasource-class>oracle.jdbc.xa.client.OracleXADataSource</xa-datasource-class>
- <xa-datasource-property name="URL">jdbc:oracle:oci8:@tc</xa-datasource-property>
- <xa-datasource-property name="User">scott</xa-datasource-property>
- <xa-datasource-property name="Password">tiger</xa-datasource-property>
-
- <url-property>UrlProperty</url-property>
-
- <url-delimiter>|</url-delimiter>
-
- <url-selector-strategy-class-name>org.jboss.jca.UrlStratery</url-selector-strategy-class-name>
-
- <isSameRM-override-value>false</isSameRM-override-value>
-
- <transaction-isolation>TRANSACTION_READ_COMMITTED</transaction-isolation>
-
- <!-- The login and password -->
- <user-name>sa</user-name>
- <password></password>
-
-
- <!-- Use the getConnection(user, pw) for logins
- <application-managed-security/>
- -->
-
- <!-- Use the security domain defined in conf/login-config.xml -->
- <security-domain>HsqlDbRealm</security-domain>
-
- <!-- Use the security domain defined in conf/login-config.xml or the
- getConnection(user, pw) for logins. The security domain takes precedence.
- <security-domain-and-application>HsqlDbRealm</security-domain-and-application>
- -->
-
-
- <!-- The minimum connections in a pool/sub-pool. Pools are lazily constructed on first use -->
- <min-pool-size>5</min-pool-size>
-
- <!-- The maximum connections in a pool/sub-pool -->
- <max-pool-size>20</max-pool-size>
-
- <blocking-timeout-millis>30000</blocking-timeout-millis>
-
- <background-validation>true</background-validation>
- <background-validation-millis>3000</background-validation-millis>
-
- <!-- The time before an unused connection is destroyed -->
- <!-- NOTE: This is the check period. It will be destroyed somewhere between 1x and 2x this timeout after last use -->
- <!-- TEMPORARY FIX! - Disable idle connection removal, HSQLDB has a problem with not reaping threads on closed connections -->
- <idle-timeout-minutes>0</idle-timeout-minutes>
-
- <allocation-retry>0</allocation-retry>
- <allocation-retry-wait-millis>5000</allocation-retry-wait-millis>
-
- <validate-on-match>true</validate-on-match>
- <no-tx-separate-pools/>
- <xa-resource-timeout>300</xa-resource-timeout>
-
- <!-- sql to call when connection is created -->
- <new-connection-sql>some arbitrary sql</new-connection-sql>
-
-
- <!-- this will be run before a managed connection is removed from the pool for use by a client-->
- <check-valid-connection-sql>select * from something</check-valid-connection-sql>
-
-
- <!-- example of how to specify a class that determines a connection is valid before it is handed out from the pool -->
- <valid-connection-checker-class-name>org.jboss.resource.adapter.jdbc.vendor.DummyValidConnectionChecker</valid-connection-checker-class-name>
-
- <!--example of how to specify class that determines if exception means connection should be destroyed-->
- <exception-sorter-class-name>org.jboss.resource.adapter.jdbc.vendor.DummyExceptionSorter</exception-sorter-class-name>
- <stale-connection-checker-class-name>org.jboss.resource.adapter.jdbc.vendor.StaleConnectionChecker</stale-connection-checker-class-name>
-
- <!-- Whether to check all statements are closed when the connection is returned to the pool,
- this is a debugging feature that should be turned off in production -->
- <track-statements/>
-
- <prefill>true</prefill>
-
- <!-- HSQL DB benefits from prepared statement caching -->
- <prepared-statement-cache-size>32</prepared-statement-cache-size>
- <share-prepared-statements>true</share-prepared-statements>
-
- <set-tx-query-timeout>true</set-tx-query-timeout>
-
- <query-timeout>300</query-timeout>
- <use-try-lock>300000</use-try-lock>
-
- <!-- corresponding type-mapping in the standardjbosscmp-jdbc.xml (optional) -->
- <type-mapping>Hypersonic SQL</type-mapping>
-
- <!--
- When using in-process (standalone) mode
- Uncomment when using hsqldb in server mode
- -->
-
- <depends>jboss:service=Hypersonic,database=localDB</depends>
- <depends>jboss:service=Hypersonic</depends>
- </xa-datasource>
-
-</datasources>
More information about the jboss-cvs-commits
mailing list