[jboss-cvs] JBossAS SVN: r82477 - in projects/metadata/trunk/src: test/java/org/jboss/test/metadata/rar and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Dec 22 11:06:46 EST 2008
Author: jeff.zhang
Date: 2008-12-22 11:06:45 -0500 (Mon, 22 Dec 2008)
New Revision: 82477
Modified:
projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/jboss/mcf/DataSourceDeploymentMetaData.java
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/ManagedConnectionFactoryDeploymentGroup.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/NonXADataSourceDeploymentMetaData.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/java/org/jboss/test/metadata/rar/JcaDs50UnitTestCase.java
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/xml/XmlValidationUnitTestCase.java
projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/rar/JcaDs50_testBasic.xml
Log:
[JBMETA-116] make ds.xml parser test pass: org.jboss.test.metadata.rar.JcaDs50UnitTestCase
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/jboss/mcf/DataSourceDeploymentMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/jboss/mcf/DataSourceDeploymentMetaData.java 2008-12-22 16:05:59 UTC (rev 82476)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/jboss/mcf/DataSourceDeploymentMetaData.java 2008-12-22 16:06:45 UTC (rev 82477)
@@ -50,7 +50,7 @@
@XmlElement(name="user-name")
private String userName;
- @XmlElement(name="password")
+ //@XmlElement(name="password")
private String passWord;
@XmlElement(name="new-connection-sql")
@@ -113,7 +113,7 @@
{
return passWord;
}
-
+ @XmlElement(name="password")
public void setPassWord(String passWord)
{
this.passWord = passWord;
@@ -180,22 +180,22 @@
this.staleConnectionCheckerClassName = staleConnectionCheckerClassName;
}
- public String getURLDelimiter()
+ public String getUrlDelimiter()
{
return urlDelimiter;
}
- public void setURLDelimiter(String urlDelimiter)
+ public void setUrlDelimiter(String urlDelimiter)
{
this.urlDelimiter = urlDelimiter;
}
- public String getURLSelectorStrategyClassName()
+ public String getUrlSelectorStrategyClassName()
{
return urlSelectorStrategyClassName;
}
- public void setURLSelectorStrategyClassName(String urlSelectorStrategyClassName)
+ public void setUrlSelectorStrategyClassName(String urlSelectorStrategyClassName)
{
this.urlSelectorStrategyClassName = urlSelectorStrategyClassName;
}
@@ -335,19 +335,19 @@
properties.add(property);
}
- if(getURLSelectorStrategyClassName() != null)
+ if(getUrlSelectorStrategyClassName() != null)
{
property = new ManagedConnectionFactoryPropertyMetaData();
property.setName("URLSelectorStrategyClassName");
- property.setValue(getURLSelectorStrategyClassName());
+ property.setValue(getUrlSelectorStrategyClassName());
properties.add(property);
}
- if(getURLDelimiter() != null)
+ if(getUrlDelimiter() != null)
{
property = new ManagedConnectionFactoryPropertyMetaData();
property.setName("URLDelimiter");
- property.setValue(getURLDelimiter());
+ property.setValue(getUrlDelimiter());
properties.add(property);
}
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 2008-12-22 16:05:59 UTC (rev 82476)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/jboss/mcf/LocalDataSourceDeploymentMetaData.java 2008-12-22 16:06:45 UTC (rev 82477)
@@ -34,11 +34,11 @@
*/
@XmlType(name="local-tx-datasource", propOrder={"jndiName", "useJavaContext", "connectionUrl", "urlDelimiter", "urlSelectorStrategyClassName",
"driverClass", "transactionIsolation", "connectionProperties", "userName", "passWord", "securityMetaData", "minSize",
- "maxPoolSize", "blockingTimeout", "backgroundValidation", "backgroundValidationMillis", "validateOnMatch", "idleTimeout",
+ "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/ManagedConnectionFactoryDeploymentGroup.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/jboss/mcf/ManagedConnectionFactoryDeploymentGroup.java 2008-12-22 16:05:59 UTC (rev 82476)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/jboss/mcf/ManagedConnectionFactoryDeploymentGroup.java 2008-12-22 16:06:45 UTC (rev 82477)
@@ -23,6 +23,7 @@
import java.io.Serializable;
import java.net.URL;
+import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
@@ -31,6 +32,7 @@
import javax.xml.bind.annotation.XmlNs;
import javax.xml.bind.annotation.XmlNsForm;
import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
import org.jboss.xb.annotations.JBossXmlSchema;
@@ -44,11 +46,12 @@
*/
@XmlRootElement(name="datasources", namespace="")
@JBossXmlSchema(
- xmlns={@XmlNs(namespaceURI = "", prefix = "")},
+ xmlns={@XmlNs(namespaceURI = "", prefix = "jee")},
+ ignoreUnresolvedFieldOrClass=false,
namespace="",
elementFormDefault=XmlNsForm.UNSET,
normalizeSpace=true)
-//@XmlType(name="datasources", namespace="")
+ at XmlType(name="datasources", namespace="")
public class ManagedConnectionFactoryDeploymentGroup implements Serializable
{
/** The serialVersionUID */
@@ -59,12 +62,7 @@
/** The deployments */
- @XmlElements({@XmlElement(name="local-tx-datasource", type=LocalDataSourceDeploymentMetaData.class),
- @XmlElement(name="no-tx-datasource", type=NoTxDataSourceDeploymentMetaData.class),
- @XmlElement(name="xa-datasource", type=XADataSourceDeploymentMetaData.class),
- @XmlElement(name="no-tx-connection-factory", type=NoTxConnectionFactoryDeploymentMetaData.class),
- @XmlElement(name="tx-connection-factory",type=TxConnectionFactoryDeploymentMetaData.class)})
- private List<ManagedConnectionFactoryDeploymentMetaData> deployments;// = new ArrayList<ManagedConnectionFactoryDeploymentMetaData>();
+ private List<ManagedConnectionFactoryDeploymentMetaData> deployments = new ArrayList<ManagedConnectionFactoryDeploymentMetaData>();
//TODO ingore loaderRepositoryAdapter and ServiceMetaDataAdapter for avoiding package depends.
/** The services
@@ -85,7 +83,7 @@
public List<ManagedConnectionFactoryDeploymentMetaData> getDeployments()
{
- return Collections.unmodifiableList(deployments);
+ return deployments;
}
/**
@@ -93,6 +91,12 @@
*
* @param deployments The deployments to set.
*/
+
+ @XmlElements({@XmlElement(name="local-tx-datasource", type=LocalDataSourceDeploymentMetaData.class),
+ @XmlElement(name="no-tx-datasource", type=NoTxDataSourceDeploymentMetaData.class),
+ @XmlElement(name="xa-datasource", type=XADataSourceDeploymentMetaData.class),
+ @XmlElement(name="no-tx-connection-factory", type=NoTxConnectionFactoryDeploymentMetaData.class),
+ @XmlElement(name="tx-connection-factory",type=TxConnectionFactoryDeploymentMetaData.class)})
public void setDeployments(List<ManagedConnectionFactoryDeploymentMetaData> deployments)
{
this.deployments = deployments;
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 2008-12-22 16:05:59 UTC (rev 82476)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/jboss/mcf/ManagedConnectionFactoryDeploymentMetaData.java 2008-12-22 16:06:45 UTC (rev 82477)
@@ -68,17 +68,17 @@
@XmlElement(name="jmx-invoker-name")
private String jmxInvokerName = "jboss:service=invoker,type=jrmp";
- @XmlElement(name="min-pool-size")
+ //@XmlElement(name="min-pool-size")
private int minSize = 0;
- @XmlElement(name="max-pool-size")
- private int maxPoolSize = 10;
+ //@XmlElement(name="max-pool-size")
+ private int maxSize = 10;
@XmlElement(name="blocking-timeout-millis")
- private long blockingTimeout = 30000;
+ private long blockingTimeoutMilliSeconds = 30000;
@XmlElement(name="idle-timeout-minutes")
- private int idleTimeout = 30;
+ private int idleTimeoutMinutes = 30;
@XmlElement(name="allocation-retry")
private int allocationRetry = 0;
@@ -131,10 +131,7 @@
private List<ManagedConnectionFactoryPropertyMetaData> managedConnectionFactoryProperties;// = new ArrayList<ManagedConnectionFactoryPropertyMetaData>();
/** The securityMetaData */
- @XmlElements({
- @XmlElement(name="security-domain", type=SecurityDomainMetaData.class),
- @XmlElement(name="security-domain-and-application",type=SecurityDomainApplicationManagedMetaData.class),
- @XmlElement(name="application-managed-security",type=ApplicationManagedSecurityMetaData.class)})
+
private SecurityMetaData securityMetaData;
@XmlElement(name="depends")
@@ -296,6 +293,10 @@
*
* @param securityMetaData The securityMetaData to set.
*/
+ @XmlElements({
+ @XmlElement(name="security-domain", type=SecurityDomainMetaData.class),
+ @XmlElement(name="security-domain-and-application",type=SecurityDomainApplicationManagedMetaData.class),
+ @XmlElement(name="application-managed-security",type=ApplicationManagedSecurityMetaData.class)})
public void setSecurityMetaData(SecurityMetaData securityMetaData)
{
this.securityMetaData = securityMetaData;
@@ -361,7 +362,8 @@
{
this.dependsNames = dependsNames;
}
-
+
+ @XmlElement(name="min-pool-size")
public void setMinSize(int minSize)
{
this.minSize = minSize;
@@ -372,17 +374,17 @@
return this.minSize;
}
-
+ @XmlElement(name="max-pool-size")
public void setMaxSize(int maxSize)
{
- this.maxPoolSize = maxSize;
+ this.maxSize = maxSize;
}
public int getMaxSize()
{
- if (this.maxPoolSize >= this.minSize)
+ if (this.maxSize >= this.minSize)
{
- return this.maxPoolSize;
+ return this.maxSize;
} else {
return this.minSize;
}
@@ -391,24 +393,24 @@
public void setBlockingTimeoutMilliSeconds(long blockTimeout)
{
- this.blockingTimeout = blockTimeout;
+ this.blockingTimeoutMilliSeconds = blockTimeout;
}
public long getBlockingTimeoutMilliSeconds()
{
- return this.blockingTimeout;
+ return this.blockingTimeoutMilliSeconds;
}
public void setIdleTimeoutMinutes(int idleTimeout)
{
- this.idleTimeout = idleTimeout;
+ this.idleTimeoutMinutes = idleTimeout;
}
public int getIdleTimeoutMinutes()
{
- return this.idleTimeout;
+ return this.idleTimeoutMinutes;
}
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 2008-12-22 16:05:59 UTC (rev 82476)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/jboss/mcf/NoTxConnectionFactoryDeploymentMetaData.java 2008-12-22 16:06:45 UTC (rev 82477)
@@ -31,8 +31,8 @@
* @version $Revision: $
*/
@XmlType(name="no-tx-connection-factory", propOrder={"jndiName", "rarName", "connectionDefinition", "managedConnectionFactoryProperties",
- "securityMetaData", "minSize", "maxPoolSize", "blockingTimeout", "backgroundValidation", "backgroundValidationMillis",
- "idleTimeout", "allocationRetry", "allocationRetryWaitMillis", "prefill", "dbmsMetaData", "typeMapping"})
+ "securityMetaData", "minSize", "maxSize", "blockingTimeoutMilliSeconds", "backgroundValidation", "backgroundValidationMillis",
+ "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 2008-12-22 16:05:59 UTC (rev 82476)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/jboss/mcf/NoTxDataSourceDeploymentMetaData.java 2008-12-22 16:06:45 UTC (rev 82477)
@@ -31,11 +31,11 @@
* @version $Revision: $
*/
@XmlType(name="no-tx-datasource", propOrder={"jndiName", "useJavaContext", "connectionUrl", "urlDelimiter", "urlSelectorStrategyClassName",
- "driverClass", "connectionProperties", "userName", "passWord", "securityMetaData", "minSize", "maxPoolSize", "blockingTimeout",
- "backgroundValidation", "backgroundValidationMillis", "idleTimeout", "allocationRetry", "allocationRetryWaitMillis",
+ "driverClass", "connectionProperties", "userName", "passWord", "securityMetaData", "minSize", "maxSize", "blockingTimeoutMilliSeconds",
+ "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/NonXADataSourceDeploymentMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/jboss/mcf/NonXADataSourceDeploymentMetaData.java 2008-12-22 16:05:59 UTC (rev 82476)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/jboss/mcf/NonXADataSourceDeploymentMetaData.java 2008-12-22 16:06:45 UTC (rev 82477)
@@ -53,7 +53,7 @@
private String connectionUrl;
@XmlElement(name="connection-property")
- private List<DataSourceConnectionPropertyMetaData> connectionProperties;// = new ArrayList<DataSourceConnectionPropertyMetaData>();
+ private List<DataSourceConnectionPropertyMetaData> connectionProperties = new ArrayList<DataSourceConnectionPropertyMetaData>();
public String getConnectionUrl()
{
@@ -75,12 +75,12 @@
this.driverClass = driverClass;
}
- public List<DataSourceConnectionPropertyMetaData> getDataSourceConnectionProperties()
+ public List<DataSourceConnectionPropertyMetaData> getConnectionProperties()
{
return this.connectionProperties;
}
- public void setDataSourceConnectionProperties(List<DataSourceConnectionPropertyMetaData> connectionProperties)
+ public void setConnectionProperties(List<DataSourceConnectionPropertyMetaData> connectionProperties)
{
this.connectionProperties = connectionProperties;
}
@@ -110,7 +110,7 @@
}
StringBuffer propBuff = new StringBuffer();
- List<DataSourceConnectionPropertyMetaData> dsProps = getDataSourceConnectionProperties();
+ List<DataSourceConnectionPropertyMetaData> dsProps = getConnectionProperties();
if (dsProps != null)
{
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 2008-12-22 16:05:59 UTC (rev 82476)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/jboss/mcf/TxConnectionFactoryDeploymentMetaData.java 2008-12-22 16:06:45 UTC (rev 82477)
@@ -35,9 +35,9 @@
* @version $Revision: $
*/
@XmlType(name="tx-connection-factory", propOrder={"jndiName", "localTransactions", "xaTransaction", "trackConnectionByTransaction",
- "rarName", "connectionDefinition", "managedConnectionFactoryProperties", "securityMetaData", "minSize", "maxPoolSize",
- "blockingTimeout", "backgroundValidation", "backgroundValidationMillis", "idleTimeout", "allocationRetry", "allocationRetryWaitMillis",
- "noTxSeparatePools", "prefill", "xaResourceTimeout", "dbmsMetaData", "typeMapping", "dependsNames"})
+ "rarName", "connectionDefinition", "managedConnectionFactoryProperties", "securityMetaData", "minSize", "maxSize",
+ "blockingTimeoutMilliSeconds", "backgroundValidation", "backgroundValidationMillis", "idleTimeoutMinutes", "allocationRetry", "allocationRetryWaitMillis",
+ "noTxSeparatePools", "prefill", "xaResourceTimeout"})//, "dbmsMetaData", "typeMapping", "dependsNames"})
@XmlAccessorType(XmlAccessType.FIELD)
public class TxConnectionFactoryDeploymentMetaData extends ManagedConnectionFactoryDeploymentMetaData
{
@@ -61,12 +61,12 @@
return xaResourceTimeout;
}
- public Boolean getXATransaction()
+ public Boolean getXaTransaction()
{
return xaTransaction;
}
- public void setXATransaction(Boolean xaTransaction)
+ public void setXaTransaction(Boolean xaTransaction)
{
this.xaTransaction = xaTransaction;
@@ -79,7 +79,7 @@
@Override
public Boolean getLocalTransactions()
{
- return !getXATransaction();
+ return !getXaTransaction();
}
@Override
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 2008-12-22 16:05:59 UTC (rev 82476)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/jboss/mcf/XADataSourceDeploymentMetaData.java 2008-12-22 16:06:45 UTC (rev 82477)
@@ -38,12 +38,12 @@
*/
@XmlType(name="xa-datasource", propOrder={"jndiName", "useJavaContext", "trackConnectionByTransaction", "interleaving", "xaDataSourceClass",
"xaDataSourceProperties", "urlProperty", "urlDelimiter", "urlSelectorStrategyClassName", "isSameRMOverrideValue",
- "transactionIsolation", "userName", "passWord", "securityMetaData", "minSize", "maxPoolSize", "blockingTimeout",
- "backgroundValidation", "backgroundValidationMillis", "idleTimeout", "allocationRetry", "allocationRetryWaitMillis",
+ "transactionIsolation", "userName", "passWord", "securityMetaData", "minSize", "maxSize", "blockingTimeoutMilliSeconds",
+ "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
{
@@ -79,12 +79,12 @@
{
this.xaDataSourceClass = xaDataSourceClass;
}
- public String getURLProperty()
+ public String getUrlProperty()
{
return urlProperty;
}
- public void setURLProperty(String urlProperty)
+ public void setUrlProperty(String urlProperty)
{
this.urlProperty = urlProperty;
}
@@ -97,12 +97,12 @@
{
this.xaResourceTimeout = xaResourceTimeout;
}
- public List<XAConnectionPropertyMetaData> getXADataSourceProperties()
+ public List<XAConnectionPropertyMetaData> getXaDataSourceProperties()
{
return this.xaDataSourceProperties;
}
- public void setXADataSourceProperties(List<XAConnectionPropertyMetaData> xaDataSourceProperties)
+ public void setXaDataSourceProperties(List<XAConnectionPropertyMetaData> xaDataSourceProperties)
{
this.xaDataSourceProperties = xaDataSourceProperties;
}
@@ -120,7 +120,7 @@
properties.add(property);
}
- List<XAConnectionPropertyMetaData> dsProps = getXADataSourceProperties();
+ List<XAConnectionPropertyMetaData> dsProps = getXaDataSourceProperties();
StringBuffer dsBuff = new StringBuffer();
@@ -137,11 +137,11 @@
property.setValue(dsBuff.toString());
properties.add(property);
- if(getURLProperty() != null)
+ if(getUrlProperty() != null)
{
property = new ManagedConnectionFactoryPropertyMetaData();
property.setName("URLProperty");
- property.setValue(getURLProperty());
+ property.setValue(getUrlProperty());
properties.add(property);
}
Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/rar/JcaDs50UnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/rar/JcaDs50UnitTestCase.java 2008-12-22 16:05:59 UTC (rev 82476)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/rar/JcaDs50UnitTestCase.java 2008-12-22 16:06:45 UTC (rev 82477)
@@ -21,6 +21,7 @@
*/
package org.jboss.test.metadata.rar;
+import org.jboss.metadata.rar.jboss.mcf.LocalDataSourceDeploymentMetaData;
import org.jboss.metadata.rar.jboss.mcf.ManagedConnectionFactoryDeploymentGroup;
import org.jboss.test.metadata.javaee.AbstractJavaEEMetaDataTest;
import org.jboss.xb.binding.sunday.unmarshalling.DefaultSchemaResolver;
@@ -43,10 +44,17 @@
public void testBasic() throws Exception
{
- //TODO DTD test case fail
- //ManagedConnectionFactoryDeploymentGroup ds = unmarshal(ManagedConnectionFactoryDeploymentGroup.class);
- //assertNotNull(ds);
+ ManagedConnectionFactoryDeploymentGroup ds = unmarshal(ManagedConnectionFactoryDeploymentGroup.class);
+ 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);
+ assertEquals(ld.getJndiName(), "DefaultDS");
+ assertTrue(ld.getConnectionUrl().startsWith("jdbc"));
+ assertEquals(ld.getConnectionProperties().size(), 0);
+
}
}
Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/xml/XmlValidationUnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/xml/XmlValidationUnitTestCase.java 2008-12-22 16:05:59 UTC (rev 82476)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/xml/XmlValidationUnitTestCase.java 2008-12-22 16:06:45 UTC (rev 82477)
@@ -103,8 +103,8 @@
}
});
- // TODO there are currently 31 expected
- assertEquals("Zero invalid files among total of " + total, 31, invalid);
+ // TODO there are currently 30 expected
+ assertEquals("Zero invalid files among total of " + total, 30, invalid);
}
private static boolean validate(File xmlFile) throws SAXException
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 2008-12-22 16:05:59 UTC (rev 82476)
+++ projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/rar/JcaDs50_testBasic.xml 2008-12-22 16:06:45 UTC (rev 82477)
@@ -29,7 +29,20 @@
<!-- 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-->
@@ -63,29 +76,17 @@
this is a debugging feature that should be turned off in production -->
<track-statements/>
- <!-- 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>
- -->
-
<!-- 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 -->
+ When using in-process (standalone) mode
<depends>jboss:service=Hypersonic,database=localDB</depends>
- <!-- Uncomment when using hsqldb in server mode
+ Uncomment when using hsqldb in server mode
<depends>jboss:service=Hypersonic</depends>
-->
</local-tx-datasource>
More information about the jboss-cvs-commits
mailing list