[jboss-cvs] JBossAS SVN: r66228 - in projects/metadata/trunk/src: test/java/org/jboss/test/metadata/client and 1 other directory.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Oct 17 23:19:41 EDT 2007
Author: scott.stark at jboss.org
Date: 2007-10-17 23:19:40 -0400 (Wed, 17 Oct 2007)
New Revision: 66228
Modified:
projects/metadata/trunk/src/main/java/org/jboss/metadata/client/spec/ApplicationClient14MetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/client/spec/ApplicationClient5MetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/client/spec/ApplicationClientMetaData.java
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/client/ApplicationClient14EverythingUnitTestCase.java
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/client/ApplicationClient5EverythingUnitTestCase.java
Log:
Make the base class concrete and add version support
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/client/spec/ApplicationClient14MetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/client/spec/ApplicationClient14MetaData.java 2007-10-17 23:23:13 UTC (rev 66227)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/client/spec/ApplicationClient14MetaData.java 2007-10-18 03:19:40 UTC (rev 66228)
@@ -21,6 +21,7 @@
*/
package org.jboss.metadata.client.spec;
+import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlNs;
import javax.xml.bind.annotation.XmlNsForm;
import javax.xml.bind.annotation.XmlRootElement;
@@ -33,6 +34,7 @@
* The application client meta data for J2EE 1.4 clients.
*
* @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
+ * @author Scott.Stark at jboss.org
* @version $Revision: $
*/
@XmlRootElement(name="application-client", namespace=JavaEEMetaDataConstants.J2EE_NS)
@@ -41,14 +43,16 @@
ignoreUnresolvedFieldOrClass=false,
namespace=JavaEEMetaDataConstants.J2EE_NS,
elementFormDefault=XmlNsForm.QUALIFIED)
-//// TODO: how to set propOrder?
-//@XmlType(name="application-clientType",
-// namespace=JavaEEMetaDataConstants.J2EE_NS,
-// propOrder={"descriptionGroup", "environmentEntries", "ejbReferences", "resourceReferences", "resourceEnvironmentReferences", "messageDestinationReferences", "callbackHandler", "messageDestinations"})
@XmlType(name="application-clientType",
namespace=JavaEEMetaDataConstants.J2EE_NS)
public class ApplicationClient14MetaData extends ApplicationClientMetaData
{
private static final long serialVersionUID = 1L;
+ @Override
+ @XmlAttribute(name="version")
+ public void setVersion(String version)
+ {
+ super.setVersion(version);
+ }
}
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/client/spec/ApplicationClient5MetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/client/spec/ApplicationClient5MetaData.java 2007-10-17 23:23:13 UTC (rev 66227)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/client/spec/ApplicationClient5MetaData.java 2007-10-18 03:19:40 UTC (rev 66228)
@@ -21,6 +21,7 @@
*/
package org.jboss.metadata.client.spec;
+import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlNs;
import javax.xml.bind.annotation.XmlNsForm;
import javax.xml.bind.annotation.XmlRootElement;
@@ -33,6 +34,7 @@
* Application client meta data for Java EE 5 clients. See JavaEE 5 chapter 9.
*
* @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
+ * @author Scott.Stark at jboss.org
* @version $Revision: $
*/
@XmlRootElement(name="application-client", namespace=JavaEEMetaDataConstants.JAVAEE_NS)
@@ -41,13 +43,17 @@
ignoreUnresolvedFieldOrClass=false,
namespace=JavaEEMetaDataConstants.JAVAEE_NS,
elementFormDefault=XmlNsForm.QUALIFIED)
-// TODO: how to set propOrder?
-//@XmlType(name="application-clientType",
-// namespace=JavaEEMetaDataConstants.JAVAEE_NS,
-// propOrder={"descriptionGroup", "environmentEntries", "ejbReferences", "resourceReferences", "resourceEnvironmentReferences", "messageDestinationReferences", "postConstructs", "preDestroys", "callbackHandler", "messageDestinations"})
@XmlType(name="application-clientType",
namespace=JavaEEMetaDataConstants.JAVAEE_NS)
public class ApplicationClient5MetaData extends ApplicationClientMetaData
{
private static final long serialVersionUID = 1L;
+
+ @Override
+ @XmlAttribute(name="version")
+ public void setVersion(String version)
+ {
+ super.setVersion(version);
+ }
+
}
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/client/spec/ApplicationClientMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/client/spec/ApplicationClientMetaData.java 2007-10-17 23:23:13 UTC (rev 66227)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/client/spec/ApplicationClientMetaData.java 2007-10-18 03:19:40 UTC (rev 66228)
@@ -52,13 +52,16 @@
* @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
* @version $Revision: $
*/
-public abstract class ApplicationClientMetaData extends IdMetaDataImplWithDescriptionGroup implements RemoteEnvironment
+public class ApplicationClientMetaData extends IdMetaDataImplWithDescriptionGroup implements RemoteEnvironment
{
+ private static final long serialVersionUID = 1;
/** The environment */
private RemoteEnvironmentRefsGroupMetaData jndiEnvironmentRefsGroup;
private String dtdPublicId;
private String dtdSystemId;
+ /** The version of the client */
+ private String version;
/** The callback handler */
private String callbackHandler;
@@ -76,6 +79,14 @@
{
this.dtdPublicId = publicId;
this.dtdSystemId = systemId;
+ // Set the version from legacy public ids
+ if(dtdPublicId != null)
+ {
+ if(dtdPublicId.contains("1.2"))
+ setVersion("1.2");
+ if(dtdPublicId.contains("1.3"))
+ setVersion("1.3");
+ }
}
/**
* Get the DTD public id if one was seen
@@ -96,6 +107,16 @@
return dtdSystemId;
}
+
+ public String getVersion()
+ {
+ return version;
+ }
+ public void setVersion(String version)
+ {
+ this.version = version;
+ }
+
public String getCallbackHandler()
{
return callbackHandler;
Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/client/ApplicationClient14EverythingUnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/client/ApplicationClient14EverythingUnitTestCase.java 2007-10-17 23:23:13 UTC (rev 66227)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/client/ApplicationClient14EverythingUnitTestCase.java 2007-10-18 03:19:40 UTC (rev 66228)
@@ -97,6 +97,7 @@
{
ApplicationClient14MetaData appClientMetaData = unmarshal();
//assertEverythingWithAppMetaData(appClientMetaData);
+ assertEquals("1.4", appClientMetaData.getVersion());
assertDescriptionGroup("application-client", appClientMetaData.getDescriptionGroup());
assertRemoteEnvironment("appClient", appClientMetaData, true);
assertEquals("org.jboss.test.metadata.client.AppClientCallbackHandler", appClientMetaData.getCallbackHandler());
Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/client/ApplicationClient5EverythingUnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/client/ApplicationClient5EverythingUnitTestCase.java 2007-10-17 23:23:13 UTC (rev 66227)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/client/ApplicationClient5EverythingUnitTestCase.java 2007-10-18 03:19:40 UTC (rev 66228)
@@ -48,6 +48,7 @@
protected void assertEverything(ApplicationClientMetaData appClientMetaData)
{
//assertEverythingWithAppMetaData(appClientMetaData);
+ assertEquals("5", appClientMetaData.getVersion());
assertDescriptionGroup("application-client", appClientMetaData.getDescriptionGroup());
assertRemoteEnvironment("appClient", appClientMetaData, true);
assertEquals("org.jboss.test.metadata.client.AppClientCallbackHandler", appClientMetaData.getCallbackHandler());
More information about the jboss-cvs-commits
mailing list