[jboss-cvs] JBossAS SVN: r85148 - in projects/metadata/trunk/src: main/resources/schema and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Mar 3 01:51:26 EST 2009
Author: jeff.zhang
Date: 2009-03-03 01:51:26 -0500 (Tue, 03 Mar 2009)
New Revision: 85148
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/ManagedConnectionFactoryPropertyMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/jboss/mcf/TxConnectionFactoryDeploymentMetaData.java
projects/metadata/trunk/src/main/resources/schema/jboss-ds_5_0.xsd
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_testCfBasic.xml
Log:
[JBMETA-167] finish 2 roots tests
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 2009-03-03 06:40:50 UTC (rev 85147)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/jboss/mcf/ManagedConnectionFactoryDeploymentGroup.java 2009-03-03 06:51:26 UTC (rev 85148)
@@ -97,9 +97,7 @@
@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)})
+ @XmlElement(name="xa-datasource", type=XADataSourceDeploymentMetaData.class)})
public void setDeployments(List<ManagedConnectionFactoryDeploymentMetaData> deployments)
{
this.deployments = deployments;
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/jboss/mcf/ManagedConnectionFactoryPropertyMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/jboss/mcf/ManagedConnectionFactoryPropertyMetaData.java 2009-03-03 06:40:50 UTC (rev 85147)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/jboss/mcf/ManagedConnectionFactoryPropertyMetaData.java 2009-03-03 06:51:26 UTC (rev 85148)
@@ -42,14 +42,11 @@
private static final long serialVersionUID = 4978655092571661074L;
/** The name */
- @XmlAttribute(name="name")
private String name;
/** The type */
- @XmlAttribute(name="type")
private String type = "java.lang.String";
- @XmlValue
private String value;
/**
@@ -61,15 +58,18 @@
{
return name;
}
+
/**
* Set the name.
*
* @param name The name to set.
*/
+ @XmlAttribute(name="name")
public void setName(String name)
{
this.name = name;
}
+
/**
* Get the type.
*
@@ -79,15 +79,18 @@
{
return type;
}
+
/**
* Set the type.
*
* @param type The type to set.
*/
+ @XmlAttribute(name="type")
public void setType(String type)
{
this.type = type;
}
+
/**
* Get the value.
*
@@ -97,11 +100,13 @@
{
return value;
}
+
/**
* Set the value.
*
* @param value The value to set.
*/
+ @XmlValue
public void setValue(String value)
{
this.value = value;
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-03-03 06:40:50 UTC (rev 85147)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/jboss/mcf/TxConnectionFactoryDeploymentMetaData.java 2009-03-03 06:51:26 UTC (rev 85148)
@@ -49,11 +49,9 @@
{
}
- @XmlElement(name="xa-resource-timeout")
private int xaResourceTimeout;
- @XmlJavaTypeAdapter(ManagedConnectionEmptyContentAdapter.class)
- @XmlElement(name="xa-transaction")
+
private Boolean xaTransaction = Boolean.FALSE;
public int getXaResourceTimeout()
@@ -66,11 +64,15 @@
return xaTransaction;
}
+ @XmlJavaTypeAdapter(ManagedConnectionEmptyContentAdapter.class)
+ @XmlElement(name="xa-transaction")
public void setXaTransaction(Boolean xaTransaction)
{
this.xaTransaction = xaTransaction;
}
+
+ @XmlElement(name="xa-resource-timeout")
public void setXaResourceTimeout(int xaResourceTimeout)
{
this.xaResourceTimeout = xaResourceTimeout;
Modified: projects/metadata/trunk/src/main/resources/schema/jboss-ds_5_0.xsd
===================================================================
--- projects/metadata/trunk/src/main/resources/schema/jboss-ds_5_0.xsd 2009-03-03 06:40:50 UTC (rev 85147)
+++ projects/metadata/trunk/src/main/resources/schema/jboss-ds_5_0.xsd 2009-03-03 06:51:26 UTC (rev 85148)
@@ -954,9 +954,14 @@
-->
<!-- The config-property specifies a mannaged connection factory property. -->
- <xsd:complexType name="config-propertyType" mixed="true">
- <xsd:attribute name="name" use="required"/>
- <xsd:attribute name="type" use="required"/>
+ <xsd:complexType name="config-propertyType">
+ <xsd:simpleContent>
+ <xsd:extension base="javaee:string">
+ <xsd:attribute name="name" type="xsd:string" use="required"/>
+ <xsd:attribute name="type" type="xsd:string" use="required"/>
+ </xsd:extension>
+ </xsd:simpleContent>
+
</xsd:complexType>
<!--
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 2009-03-03 06:40:50 UTC (rev 85147)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/rar/JcaDs50UnitTestCase.java 2009-03-03 06:51:26 UTC (rev 85148)
@@ -26,10 +26,13 @@
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.ManagedConnectionFactoryTransactionSupportMetaData;
import org.jboss.metadata.rar.jboss.mcf.NonXADataSourceDeploymentMetaData;
+import org.jboss.metadata.rar.jboss.mcf.SecurityDeploymentType;
+import org.jboss.metadata.rar.jboss.mcf.TxConnectionFactoryDeploymentMetaData;
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.MultiClassSchemaResolver;
import org.jboss.xb.binding.sunday.unmarshalling.SchemaBindingResolver;
/**
@@ -42,9 +45,10 @@
{
public static SchemaBindingResolver initResolver()
{
- DefaultSchemaResolver resolver = new DefaultSchemaResolver();
- resolver.addClassBindingForLocation("jboss-ds_5_0.xsd", ManagedConnectionFactoryDeploymentGroup.class);
- //resolver.addClassBindingForLocation("jboss-ds_5_0.xsd", ConnectionFactoryDeploymentGroup.class);
+ MultiClassSchemaResolver resolver = new MultiClassSchemaResolver();
+ resolver.addClassBindingForLocation("jboss-ds_5_0.xsd",
+ ManagedConnectionFactoryDeploymentGroup.class,
+ ConnectionFactoryDeploymentGroup.class);
return resolver;
}
@@ -105,15 +109,25 @@
/**
* test a basic connection-factories, for example jms-ds.xml
*/
- /*
public void testCfBasic() throws Exception
{
ConnectionFactoryDeploymentGroup ds = unmarshalCFD();
ManagedConnectionFactoryDeploymentMetaData mcfd = (ManagedConnectionFactoryDeploymentMetaData)ds.getDeployments().get(0);
assertNotNull(mcfd);
+ assertTrue(mcfd instanceof TxConnectionFactoryDeploymentMetaData);
+ assertEquals(mcfd.getJndiName(), "JmsXA");
+ assertTrue(((TxConnectionFactoryDeploymentMetaData)mcfd).getXaTransaction());
+ assertEquals(mcfd.getRarName(), "jms-ra.rar");
+ assertTrue(mcfd.getConnectionDefinition().endsWith("JmsConnectionFactory"));
+ assertEquals(mcfd.getManagedConnectionFactoryProperties().size(), 2);
+ assertEquals(mcfd.getManagedConnectionFactoryProperties().get(0).getName(), "SessionDefaultType");
+ assertEquals(mcfd.getManagedConnectionFactoryProperties().get(1).getValue(), "java:/DefaultJMSProvider");
+
+ assertEquals(mcfd.getSecurityMetaData().getSecurityDeploymentType(), SecurityDeploymentType.DOMAIN_AND_APPLICATION);
+ assertEquals(mcfd.getMaxSize(), 20);
}
- */
+
/**
* test a everything of no-tx-datasource
*/
Modified: projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/rar/JcaDs50_testCfBasic.xml
===================================================================
--- projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/rar/JcaDs50_testCfBasic.xml 2009-03-03 06:40:50 UTC (rev 85147)
+++ projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/rar/JcaDs50_testCfBasic.xml 2009-03-03 06:51:26 UTC (rev 85148)
@@ -13,8 +13,10 @@
<xa-transaction/>
<rar-name>jms-ra.rar</rar-name>
<connection-definition>org.jboss.resource.adapter.jms.JmsConnectionFactory</connection-definition>
+
<config-property name="SessionDefaultType" type="java.lang.String">javax.jms.Topic</config-property>
<config-property name="JmsProviderAdapterJNDI" type="java.lang.String">java:/DefaultJMSProvider</config-property>
+
<security-domain-and-application>JmsXARealm</security-domain-and-application>
<max-pool-size>20</max-pool-size>
</tx-connection-factory>
More information about the jboss-cvs-commits
mailing list