[jboss-cvs] JBossAS SVN: r110055 - in projects/metadata/client/trunk/src: test/java/org/jboss/test/metadata/client and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Dec 20 21:12:53 EST 2010
Author: weston.price at jboss.com
Date: 2010-12-20 21:12:53 -0500 (Mon, 20 Dec 2010)
New Revision: 110055
Modified:
projects/metadata/client/trunk/src/main/java/org/jboss/metadata/client/spec/ApplicationClient6MetaData.java
projects/metadata/client/trunk/src/main/java/org/jboss/metadata/client/spec/ApplicationClientMetaData.java
projects/metadata/client/trunk/src/test/java/org/jboss/test/metadata/client/ApplicationClient6EverythingUnitTestCase.java
projects/metadata/client/trunk/src/test/resources/org/jboss/test/metadata/client/ApplicationClient6Everything_testEverything.xml
Log:
[JBMETA-322] Add data-source support to application client meta data. This is required to complete the [JBAS-8559] task.
Modified: projects/metadata/client/trunk/src/main/java/org/jboss/metadata/client/spec/ApplicationClient6MetaData.java
===================================================================
--- projects/metadata/client/trunk/src/main/java/org/jboss/metadata/client/spec/ApplicationClient6MetaData.java 2010-12-20 23:10:30 UTC (rev 110054)
+++ projects/metadata/client/trunk/src/main/java/org/jboss/metadata/client/spec/ApplicationClient6MetaData.java 2010-12-21 02:12:53 UTC (rev 110055)
@@ -22,11 +22,13 @@
package org.jboss.metadata.client.spec;
import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
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.metadata.javaee.spec.DataSourcesMetaData;
import org.jboss.metadata.javaee.spec.JavaEEMetaDataConstants;
import org.jboss.xb.annotations.JBossXmlSchema;
@@ -45,11 +47,11 @@
elementFormDefault=XmlNsForm.QUALIFIED,
normalizeSpace=true)
@XmlType(name="application-clientType",
- namespace=JavaEEMetaDataConstants.JAVAEE_NS, propOrder={"moduleName", "descriptionGroup", "jndiEnvironmentRefsGroup", "callbackHandler", "messageDestinations"})
+ namespace=JavaEEMetaDataConstants.JAVAEE_NS, propOrder={"moduleName", "descriptionGroup", "jndiEnvironmentRefsGroup", "callbackHandler", "messageDestinations", "dataSources"})
public class ApplicationClient6MetaData extends ApplicationClientMetaData
{
private static final long serialVersionUID = 1914939966505073042L;
-
+
@Override
@XmlAttribute(name="module-name")
public void setModuleName(String moduleName)
@@ -64,4 +66,7 @@
super.setVersion(version);
}
+
+
+
}
Modified: projects/metadata/client/trunk/src/main/java/org/jboss/metadata/client/spec/ApplicationClientMetaData.java
===================================================================
--- projects/metadata/client/trunk/src/main/java/org/jboss/metadata/client/spec/ApplicationClientMetaData.java 2010-12-20 23:10:30 UTC (rev 110054)
+++ projects/metadata/client/trunk/src/main/java/org/jboss/metadata/client/spec/ApplicationClientMetaData.java 2010-12-21 02:12:53 UTC (rev 110055)
@@ -27,6 +27,7 @@
import org.jboss.metadata.javaee.jboss.NamedModule;
import org.jboss.metadata.javaee.spec.AnnotatedEJBReferencesMetaData;
+import org.jboss.metadata.javaee.spec.DataSourcesMetaData;
import org.jboss.metadata.javaee.spec.EJBReferenceMetaData;
import org.jboss.metadata.javaee.spec.EJBReferencesMetaData;
import org.jboss.metadata.javaee.spec.EnvironmentEntriesMetaData;
@@ -72,7 +73,10 @@
/** The message destinations */
private MessageDestinationsMetaData messageDestinations;
-
+
+ /** The data source(s) **/
+ private DataSourcesMetaData dataSources;
+
private String moduleName;
/**
@@ -309,4 +313,27 @@
throw new IllegalArgumentException("Null messageDestinations");
this.messageDestinations = messageDestinations;
}
+
+
+ public DataSourcesMetaData getDataSources()
+ {
+ return dataSources;
+ }
+
+ /**
+ * Set the dataSources
+ *
+ * @param dataSources the dataSources
+ * @throws IllegalArgumentException for a null messageDestinations
+ */
+ @XmlElement(name="data-source")
+ public void setDataSources(DataSourcesMetaData dataSources)
+ {
+ if(dataSources == null)
+ {
+
+ }
+
+ this.dataSources = dataSources;
+ }
}
Modified: projects/metadata/client/trunk/src/test/java/org/jboss/test/metadata/client/ApplicationClient6EverythingUnitTestCase.java
===================================================================
--- projects/metadata/client/trunk/src/test/java/org/jboss/test/metadata/client/ApplicationClient6EverythingUnitTestCase.java 2010-12-20 23:10:30 UTC (rev 110054)
+++ projects/metadata/client/trunk/src/test/java/org/jboss/test/metadata/client/ApplicationClient6EverythingUnitTestCase.java 2010-12-21 02:12:53 UTC (rev 110055)
@@ -23,6 +23,7 @@
import org.jboss.metadata.client.spec.ApplicationClient6MetaData;
import org.jboss.metadata.client.spec.ApplicationClientMetaData;
+import org.jboss.metadata.javaee.spec.DataSourcesMetaData;
import org.jboss.metadata.javaee.spec.MessageDestinationMetaData;
import org.jboss.metadata.javaee.spec.MessageDestinationsMetaData;
import org.jboss.test.metadata.javaee.AbstractJavaEEEverythingTest;
@@ -50,6 +51,7 @@
assertRemoteEnvironment("appClient", appClientMetaData, true, mode);
assertEquals("org.jboss.test.metadata.client.AppClientCallbackHandler", appClientMetaData.getCallbackHandler());
assertMessageDestinations5("appClientMessageDestination", 2, appClientMetaData.getMessageDestinations(), true);
+ assertDataSources6(2, appClientMetaData.getDataSources(), true);
}
protected void assertMessageDestinations5(String prefix, int size, MessageDestinationsMetaData messageDestinations, boolean full)
{
@@ -62,7 +64,14 @@
count++;
}
}
+ protected void assertDataSources6(int size, DataSourcesMetaData dataSources, boolean full)
+ {
+ assertNotNull("no data sources are set", dataSources);
+ assertEquals(size, dataSources.size());
+
+ }
+
public void testEverything() throws Exception
{
ApplicationClientMetaData appClientMetaData = unmarshal();
Modified: projects/metadata/client/trunk/src/test/resources/org/jboss/test/metadata/client/ApplicationClient6Everything_testEverything.xml
===================================================================
--- projects/metadata/client/trunk/src/test/resources/org/jboss/test/metadata/client/ApplicationClient6Everything_testEverything.xml 2010-12-20 23:10:30 UTC (rev 110054)
+++ projects/metadata/client/trunk/src/test/resources/org/jboss/test/metadata/client/ApplicationClient6Everything_testEverything.xml 2010-12-21 02:12:53 UTC (rev 110055)
@@ -351,4 +351,58 @@
<message-destination-name>appClientMessageDestination2Name</message-destination-name>
<mapped-name>appClientMessageDestination2MappedName</mapped-name>
</message-destination>
+ <data-source>
+ <description>en-dataSource1-desc</description>
+ <name>dataSource1Name</name>
+ <class-name>dataSource1ClassName</class-name>
+ <server-name>dataSource1ServerName</server-name>
+ <port-number>1</port-number>
+ <database-name>dataSource1DatabaseName</database-name>
+ <url>jdbc:dataSource1:url</url>
+ <user>dataSource1User</user>
+ <password>dataSource1Password</password>
+ <property id="dataSource1Property1-id">
+ <name>dataSource1Property1Name</name>
+ <value>dataSource1Property1Value</value>
+ </property>
+ <property id="dataSource1Property2-id">
+ <name>dataSource1Property2Name</name>
+ <value>dataSource1Property2Value</value>
+ </property>
+ <login-timeout>1</login-timeout>
+ <transactional>false</transactional>
+ <isolation-level>TRANSACTION_READ_UNCOMMITTED</isolation-level>
+ <initial-pool-size>1</initial-pool-size>
+ <max-pool-size>1</max-pool-size>
+ <min-pool-size>1</min-pool-size>
+ <max-idle-time>1</max-idle-time>
+ <max-statements>1</max-statements>
+ </data-source>
+ <data-source>
+ <description>en-dataSource2-desc</description>
+ <name>dataSource2Name</name>
+ <class-name>dataSource2ClassName</class-name>
+ <server-name>dataSource2ServerName</server-name>
+ <port-number>2</port-number>
+ <database-name>dataSource2DatabaseName</database-name>
+ <url>jdbc:dataSource2:url</url>
+ <user>dataSource2User</user>
+ <password>dataSource2Password</password>
+ <property id="dataSource2Property1-id">
+ <name>dataSource2Property1Name</name>
+ <value>dataSource2Property1Value</value>
+ </property>
+ <property id="dataSource2Property2-id">
+ <name>dataSource2Property2Name</name>
+ <value>dataSource2Property2Value</value>
+ </property>
+ <login-timeout>2</login-timeout>
+ <transactional>true</transactional>
+ <isolation-level>TRANSACTION_READ_COMMITTED</isolation-level>
+ <initial-pool-size>2</initial-pool-size>
+ <max-pool-size>2</max-pool-size>
+ <min-pool-size>2</min-pool-size>
+ <max-idle-time>2</max-idle-time>
+ <max-statements>2</max-statements>
+ </data-source>
</application-client>
\ No newline at end of file
More information about the jboss-cvs-commits
mailing list