[jboss-cvs] JBossAS SVN: r82688 - 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
Thu Jan 8 02:43:47 EST 2009
Author: jeff.zhang
Date: 2009-01-08 02:43:47 -0500 (Thu, 08 Jan 2009)
New Revision: 82688
Modified:
projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/jboss/mcf/LocalDataSourceDeploymentMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/jboss/mcf/ManagedConnectionFactoryDeploymentMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/jboss/mcf/NoTxConnectionFactoryDeploymentMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/jboss/mcf/NoTxDataSourceDeploymentMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/jboss/mcf/TxConnectionFactoryDeploymentMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/jboss/mcf/XADataSourceDeploymentMetaData.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_testEverything.xml
Log:
[JBMETA-158] rar testcase cover all description
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/jboss/mcf/LocalDataSourceDeploymentMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/jboss/mcf/LocalDataSourceDeploymentMetaData.java 2009-01-08 07:01:31 UTC (rev 82687)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/jboss/mcf/LocalDataSourceDeploymentMetaData.java 2009-01-08 07:43:47 UTC (rev 82688)
@@ -37,8 +37,8 @@
"maxSize", "blockingTimeoutMilliSeconds", "backgroundValidation", "backgroundValidationMillis", "validateOnMatch", "idleTimeoutMinutes",
"allocationRetry", "allocationRetryWaitMillis", "noTxSeparatePools", "newConnectionSQL", "checkValidConnectionSQL",
"validConnectionCheckerClassName", "exceptionSorterClassName", "staleConnectionCheckerClassName", "trackStatements", "prefill",
- "preparedStatementCacheSize", "sharePreparedStatements", "useQueryTimeout", "queryTimeout", "useTryLock"}) //, "dbmsMetaData", "typeMapping",
- //"dependsNames"})
+ "preparedStatementCacheSize", "sharePreparedStatements", "useQueryTimeout", "queryTimeout", "useTryLock", "dbmsMetaData", "typeMapping",
+ "dependsNames"})
@XmlAccessorType(XmlAccessType.FIELD)
public class LocalDataSourceDeploymentMetaData extends NonXADataSourceDeploymentMetaData
{
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/jboss/mcf/ManagedConnectionFactoryDeploymentMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/jboss/mcf/ManagedConnectionFactoryDeploymentMetaData.java 2009-01-08 07:01:31 UTC (rev 82687)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/jboss/mcf/ManagedConnectionFactoryDeploymentMetaData.java 2009-01-08 07:43:47 UTC (rev 82688)
@@ -64,10 +64,6 @@
@XmlElement(name="connection-definition")
protected String connectionDefinition;
- /** The jmxInvokerName */
- @XmlElement(name="jmx-invoker-name")
- private String jmxInvokerName = "jboss:service=invoker,type=jrmp";
-
//@XmlElement(name="min-pool-size")
private int minSize = 0;
@@ -140,7 +136,7 @@
//@XmlTransient
//private List<ServiceMetaData> dependsServices = new ArrayList<ServiceMetaData>();
- @XmlElement(name="metadata")
+ //@XmlElement(name="metadata")
private DBMSMetaData dbmsMetaData;
// todo: this should be wrapped into <metadata> element
@@ -324,26 +320,6 @@
}
/**
- * Get the jmxInvokerName.
- *
- * @return the jmxInvokerName.
- */
- public String getJmxInvokerName()
- {
- return jmxInvokerName;
- }
-
- /**
- * Set the jmxInvokerName.
- *
- * @param jmxInvokerName The jmxInvokerName to set.
- */
- public void setJmxInvokerName(String jmxInvokerName)
- {
- this.jmxInvokerName = jmxInvokerName;
- }
-
- /**
* Get the dependsNames.
*
* @return the dependsNames.
@@ -549,12 +525,13 @@
this.noTxSeparatePools = notxpool;
}
- public DBMSMetaData getDBMSMetaData()
+ public DBMSMetaData getDbmsMetaData()
{
return dbmsMetaData;
}
- public void setDBMSMetaData(DBMSMetaData dbmsMetaData)
+ @XmlElement(name="metadata")
+ public void setDbmsMetaData(DBMSMetaData dbmsMetaData)
{
this.dbmsMetaData = dbmsMetaData;
}
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/jboss/mcf/NoTxConnectionFactoryDeploymentMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/jboss/mcf/NoTxConnectionFactoryDeploymentMetaData.java 2009-01-08 07:01:31 UTC (rev 82687)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/jboss/mcf/NoTxConnectionFactoryDeploymentMetaData.java 2009-01-08 07:43:47 UTC (rev 82688)
@@ -32,7 +32,7 @@
*/
@XmlType(name="no-tx-connection-factory", propOrder={"jndiName", "rarName", "connectionDefinition", "managedConnectionFactoryProperties",
"securityMetaData", "minSize", "maxSize", "blockingTimeoutMilliSeconds", "backgroundValidation", "backgroundValidationMillis",
- "idleTimeoutMinutes", "allocationRetry", "allocationRetryWaitMillis", "prefill"})//, "dbmsMetaData", "typeMapping"})
+ "idleTimeoutMinutes", "allocationRetry", "allocationRetryWaitMillis", "prefill", "dbmsMetaData", "typeMapping"})
public class NoTxConnectionFactoryDeploymentMetaData extends ManagedConnectionFactoryDeploymentMetaData
{
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/jboss/mcf/NoTxDataSourceDeploymentMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/jboss/mcf/NoTxDataSourceDeploymentMetaData.java 2009-01-08 07:01:31 UTC (rev 82687)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/jboss/mcf/NoTxDataSourceDeploymentMetaData.java 2009-01-08 07:43:47 UTC (rev 82688)
@@ -35,7 +35,7 @@
"backgroundValidation", "backgroundValidationMillis", "idleTimeoutMinutes", "allocationRetry", "allocationRetryWaitMillis",
"validateOnMatch", "newConnectionSQL", "checkValidConnectionSQL", "validConnectionCheckerClassName", "exceptionSorterClassName",
"staleConnectionCheckerClassName", "trackStatements", "prefill", "preparedStatementCacheSize", "sharePreparedStatements",
- "useQueryTimeout", "queryTimeout", "useTryLock"})//, "dbmsMetaData", "typeMapping", "dependsNames"})
+ "useQueryTimeout", "queryTimeout", "useTryLock", "dbmsMetaData", "typeMapping", "dependsNames"})
public class NoTxDataSourceDeploymentMetaData extends NonXADataSourceDeploymentMetaData
{
/** The serialVersionUID */
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/jboss/mcf/TxConnectionFactoryDeploymentMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/jboss/mcf/TxConnectionFactoryDeploymentMetaData.java 2009-01-08 07:01:31 UTC (rev 82687)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/jboss/mcf/TxConnectionFactoryDeploymentMetaData.java 2009-01-08 07:43:47 UTC (rev 82688)
@@ -37,7 +37,7 @@
@XmlType(name="tx-connection-factory", propOrder={"jndiName", "localTransactions", "xaTransaction", "trackConnectionByTransaction",
"rarName", "connectionDefinition", "managedConnectionFactoryProperties", "securityMetaData", "minSize", "maxSize",
"blockingTimeoutMilliSeconds", "backgroundValidation", "backgroundValidationMillis", "idleTimeoutMinutes", "allocationRetry", "allocationRetryWaitMillis",
- "noTxSeparatePools", "prefill", "xaResourceTimeout"})//, "dbmsMetaData", "typeMapping", "dependsNames"})
+ "noTxSeparatePools", "prefill", "xaResourceTimeout", "dbmsMetaData", "typeMapping", "dependsNames"})
@XmlAccessorType(XmlAccessType.FIELD)
public class TxConnectionFactoryDeploymentMetaData extends ManagedConnectionFactoryDeploymentMetaData
{
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/jboss/mcf/XADataSourceDeploymentMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/jboss/mcf/XADataSourceDeploymentMetaData.java 2009-01-08 07:01:31 UTC (rev 82687)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/jboss/mcf/XADataSourceDeploymentMetaData.java 2009-01-08 07:43:47 UTC (rev 82688)
@@ -42,8 +42,8 @@
"backgroundValidation", "backgroundValidationMillis", "idleTimeoutMinutes", "allocationRetry", "allocationRetryWaitMillis",
"validateOnMatch", "noTxSeparatePools", "xaResourceTimeout", "newConnectionSQL", "checkValidConnectionSQL",
"validConnectionCheckerClassName", "exceptionSorterClassName", "staleConnectionCheckerClassName", "trackStatements",
- "prefill", "preparedStatementCacheSize", "sharePreparedStatements", "useQueryTimeout", "queryTimeout", "useTryLock"})
- //"dbmsMetaData", "typeMapping", "dependsNames"})
+ "prefill", "preparedStatementCacheSize", "sharePreparedStatements", "useQueryTimeout", "queryTimeout", "useTryLock",
+ "dbmsMetaData", "typeMapping", "dependsNames"})
@XmlAccessorType(XmlAccessType.FIELD)
public class XADataSourceDeploymentMetaData extends DataSourceDeploymentMetaData
{
Modified: 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_testBasic.xml 2009-01-08 07:01:31 UTC (rev 82687)
+++ projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/rar/JcaDs50_testBasic.xml 2009-01-08 07:43:47 UTC (rev 82688)
@@ -79,11 +79,12 @@
<!-- 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)
+ <!-- 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
Modified: projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/rar/JcaDs50_testEverything.xml
===================================================================
--- projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/rar/JcaDs50_testEverything.xml 2009-01-08 07:01:31 UTC (rev 82687)
+++ projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/rar/JcaDs50_testEverything.xml 2009-01-08 07:43:47 UTC (rev 82688)
@@ -77,11 +77,12 @@
<!-- 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)
+ <!-- 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
More information about the jboss-cvs-commits
mailing list