[jboss-cvs] JBossAS SVN: r82794 - in projects/metadata/trunk/src: test/java/org/jboss/test/metadata/rar and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Jan 13 03:24:02 EST 2009
Author: jeff.zhang
Date: 2009-01-13 03:24:02 -0500 (Tue, 13 Jan 2009)
New Revision: 82794
Modified:
projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/spec/ActivationspecMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/spec/AdminObjectMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/spec/AuthenticationMechanismMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/spec/ConfigPropertyMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/spec/ConnectionDefinitionMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/spec/Connector16MetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/spec/ConnectorMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/spec/LicenseMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/spec/MessageListenerMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/spec/OutboundRaMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/spec/RequiredConfigPropertyMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/spec/ResourceAdapterMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/spec/SecurityPermissionMetaData.java
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/rar/RA15EverythingUnitTestCase.java
projects/metadata/trunk/src/test/java/org/jboss/test/metadata/rar/RA16EverythingUnitTestCase.java
projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/rar/RA16Everything_testEverything.xml
Log:
[JBMETA-158] rar testcase cover all description, add required attribute
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/spec/ActivationspecMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/spec/ActivationspecMetaData.java 2009-01-13 08:02:03 UTC (rev 82793)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/spec/ActivationspecMetaData.java 2009-01-13 08:24:02 UTC (rev 82794)
@@ -39,9 +39,9 @@
private String asClass;
private List<RequiredConfigPropertyMetaData> requiredConfigProps;
- private List<RequiredConfigPropertyMetaData> configProps;
+ private List<ConfigPropertyMetaData> configProps;
- @XmlElement(name="activationspec-class")
+ @XmlElement(name="activationspec-class", required=true)
public void setAsClass(String asClass) {
this.asClass = asClass;
}
@@ -59,13 +59,13 @@
return requiredConfigProps;
}
- public List<RequiredConfigPropertyMetaData> getConfigProps()
+ public List<ConfigPropertyMetaData> getConfigProps()
{
return configProps;
}
@XmlElement(name="config-property")
- public void setConfigProps(List<RequiredConfigPropertyMetaData> configProps)
+ public void setConfigProps(List<ConfigPropertyMetaData> configProps)
{
this.configProps = configProps;
}
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/spec/AdminObjectMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/spec/AdminObjectMetaData.java 2009-01-13 08:02:03 UTC (rev 82793)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/spec/AdminObjectMetaData.java 2009-01-13 08:24:02 UTC (rev 82794)
@@ -60,7 +60,7 @@
*
* @param adminObjectInterfaceClass the class name
*/
- @XmlElement(name="adminobject-interface")
+ @XmlElement(name="adminobject-interface", required=true)
public void setAdminObjectInterfaceClass(String adminObjectInterfaceClass)
{
this.adminObjectInterfaceClass = adminObjectInterfaceClass;
@@ -81,7 +81,7 @@
*
* @param adminObjectImplementationClass the class name
*/
- @XmlElement(name="adminobject-class")
+ @XmlElement(name="adminobject-class", required=true)
public void setAdminObjectImplementationClass(String adminObjectImplementationClass)
{
this.adminObjectImplementationClass = adminObjectImplementationClass;
@@ -103,7 +103,7 @@
buffer.append(Integer.toHexString(System.identityHashCode(this)));
buffer.append("[adminObjectInterfaceClass=").append(adminObjectInterfaceClass);
buffer.append(" adminObjectImplementationClass=").append(adminObjectImplementationClass);
- //buffer.append(" properties=").append(getProperties());
+ buffer.append(" properties=").append(configProps);
buffer.append(']');
return buffer.toString();
}
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/spec/AuthenticationMechanismMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/spec/AuthenticationMechanismMetaData.java 2009-01-13 08:02:03 UTC (rev 82793)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/spec/AuthenticationMechanismMetaData.java 2009-01-13 08:24:02 UTC (rev 82794)
@@ -22,9 +22,9 @@
package org.jboss.metadata.rar.spec;
import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlType;
+import org.jboss.metadata.javaee.spec.DescriptionImpl;
-import org.jboss.metadata.javaee.support.IdMetaDataImplWithDescriptionGroup;
-
/**
* Authentication mechanism meta data
*
@@ -32,7 +32,9 @@
* @author Jeff Zhang
* @version $Revision: 71554 $
*/
-public class AuthenticationMechanismMetaData extends IdMetaDataImplWithDescriptionGroup
+ at XmlType(name="authentication-mechanism",
+ propOrder={"description", "authenticationMechanismType", "credentialInterfaceClass"})
+public class AuthenticationMechanismMetaData extends DescriptionImpl
{
static final long serialVersionUID = 1562443409483033688L;
@@ -47,7 +49,7 @@
*
* @return the authentication mechanism type
*/
- public String getAuthenticationMechansimType()
+ public String getAuthenticationMechanismType()
{
return authenticationMechanismType;
}
@@ -57,8 +59,8 @@
*
* @param authenticationMechanismType the type
*/
- @XmlElement(name="authentication-mechanism-type")
- public void setAuthenticationMechansimType(String authenticationMechanismType)
+ @XmlElement(name="authentication-mechanism-type", required=true)
+ public void setAuthenticationMechanismType(String authenticationMechanismType)
{
this.authenticationMechanismType = authenticationMechanismType;
}
@@ -78,7 +80,7 @@
*
* @param credentialInterfaceClass the class
*/
- @XmlElement(name="credential-interface")
+ @XmlElement(name="credential-interface", required=true)
public void setCredentialInterfaceClass(String credentialInterfaceClass)
{
this.credentialInterfaceClass = credentialInterfaceClass;
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/spec/ConfigPropertyMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/spec/ConfigPropertyMetaData.java 2009-01-13 08:02:03 UTC (rev 82793)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/spec/ConfigPropertyMetaData.java 2009-01-13 08:24:02 UTC (rev 82794)
@@ -22,8 +22,9 @@
package org.jboss.metadata.rar.spec;
import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlType;
-import org.jboss.metadata.javaee.support.IdMetaDataImplWithDescriptionGroup;
+import org.jboss.metadata.javaee.spec.DescriptionImpl;
/**
* Config property meta data
@@ -32,7 +33,8 @@
* @author Jeff Zhang
* @version $Revision: 71554 $
*/
-public class ConfigPropertyMetaData extends IdMetaDataImplWithDescriptionGroup
+ at XmlType(name="config-property", propOrder={"description", "name", "type", "value", "ignore"})
+public class ConfigPropertyMetaData extends DescriptionImpl
{
private static final long serialVersionUID = -3247621229521854849L;
@@ -62,7 +64,7 @@
*
* @param name the name
*/
- @XmlElement(name="config-property-name")
+ @XmlElement(name="config-property-name", required=true)
public void setName(String name)
{
this.name = name;
@@ -83,7 +85,7 @@
*
* @param type the type
*/
- @XmlElement(name="config-property-type")
+ @XmlElement(name="config-property-type", required=true)
public void setType(String type)
{
this.type = type;
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/spec/ConnectionDefinitionMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/spec/ConnectionDefinitionMetaData.java 2009-01-13 08:02:03 UTC (rev 82793)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/spec/ConnectionDefinitionMetaData.java 2009-01-13 08:24:02 UTC (rev 82794)
@@ -23,6 +23,7 @@
import java.util.List;
import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlType;
import org.jboss.metadata.javaee.support.IdMetaDataImpl;
/**
@@ -32,6 +33,9 @@
* @author Jeff Zhang
* @version $Revision: 71554 $
*/
+ at XmlType(name="connection-definition",
+ propOrder={"managedConnectionFactoryClass", "configProps", "connectionFactoryInterfaceClass",
+ "connectionFactoryImplementationClass", "connectionInterfaceClass", "connectionImplementationClass"})
public class ConnectionDefinitionMetaData extends IdMetaDataImpl
{
private static final long serialVersionUID = -138227135002730221L;
@@ -71,7 +75,7 @@
*
* @param managedConnectionFactoryClass the class name
*/
- @XmlElement(name="managedconnectionfactory-class")
+ @XmlElement(name="managedconnectionfactory-class", required=true)
public void setManagedConnectionFactoryClass(String managedConnectionFactoryClass)
{
this.managedConnectionFactoryClass = managedConnectionFactoryClass;
@@ -100,7 +104,7 @@
*
* @param connectionFactoryInterfaceClass the class name
*/
- @XmlElement(name="connectionfactory-interface")
+ @XmlElement(name="connectionfactory-interface", required=true)
public void setConnectionFactoryInterfaceClass(String connectionFactoryInterfaceClass)
{
this.connectionFactoryInterfaceClass = connectionFactoryInterfaceClass;
@@ -121,7 +125,7 @@
*
* @param connectionFactoryImplementationClass the class name
*/
- @XmlElement(name="connectionfactory-impl-class")
+ @XmlElement(name="connectionfactory-impl-class", required=true)
public void setConnectionFactoryImplementationClass(String connectionFactoryImplementationClass)
{
this.connectionFactoryImplementationClass = connectionFactoryImplementationClass;
@@ -142,7 +146,7 @@
*
* @param connectionInterfaceClass the class name
*/
- @XmlElement(name="connection-interface")
+ @XmlElement(name="connection-interface", required=true)
public void setConnectionInterfaceClass(String connectionInterfaceClass)
{
this.connectionInterfaceClass = connectionInterfaceClass;
@@ -163,7 +167,7 @@
*
* @param connectionImplementationClass the class name
*/
- @XmlElement(name="connection-impl-class")
+ @XmlElement(name="connection-impl-class", required=true)
public void setConnectionImplementationClass(String connectionImplementationClass)
{
this.connectionImplementationClass = connectionImplementationClass;
@@ -179,7 +183,7 @@
buffer.append(" connectionFactoryImplementationClass=").append(connectionFactoryImplementationClass);
buffer.append(" connectionInterfaceClass=").append(connectionInterfaceClass);
buffer.append(" connectionImplementationClass=").append(connectionImplementationClass);
- //buffer.append(" properties=").append(getProperties());
+ buffer.append(" properties=").append(configProps);
buffer.append(']');
return buffer.toString();
}
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/spec/Connector16MetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/spec/Connector16MetaData.java 2009-01-13 08:02:03 UTC (rev 82793)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/spec/Connector16MetaData.java 2009-01-13 08:24:02 UTC (rev 82794)
@@ -23,6 +23,7 @@
import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlType;
/**
* Connector meta data
@@ -30,7 +31,9 @@
* @author Jeff Zhang
* @version $Revision: $
*/
-
+ at XmlType(name="connector",
+ propOrder={"descriptions", "displayNames", "icons", "vendorName", "eISType", "rAVersion",
+ "license", "ra", "requiredWorkContext"})
public class Connector16MetaData extends ConnectorMetaData
{
private static final long serialVersionUID = 7047130842894140262L;
@@ -44,7 +47,7 @@
return metadataComplete;
}
- @XmlAttribute(name="metadata-complete")
+ @XmlAttribute(name="metadata-complete", required=true)
public void setMetadataComplete(boolean metadataComplete)
{
this.metadataComplete = metadataComplete;
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/spec/ConnectorMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/spec/ConnectorMetaData.java 2009-01-13 08:02:03 UTC (rev 82793)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/spec/ConnectorMetaData.java 2009-01-13 08:24:02 UTC (rev 82794)
@@ -24,10 +24,10 @@
import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlTransient;
+import javax.xml.bind.annotation.XmlType;
+import org.jboss.metadata.javaee.spec.DescriptionGroupMetaData;
-import org.jboss.metadata.javaee.support.IdMetaDataImplWithDescriptionGroup;
-
/**
* Connector meta data
*
@@ -35,7 +35,10 @@
* @author Jeff Zhang
* @version $Revision: $
*/
-public class ConnectorMetaData extends IdMetaDataImplWithDescriptionGroup
+ at XmlType(name="connector",
+ propOrder={"descriptions", "displayNames", "icons", "vendorName", "eISType", "rAVersion",
+ "license", "ra"})
+public class ConnectorMetaData extends DescriptionGroupMetaData
{
private static final long serialVersionUID = 7047130842894140222L;
@@ -102,7 +105,7 @@
*
* @param version the connector version
*/
- @XmlAttribute
+ @XmlAttribute(required=true)
public void setVersion(String version)
{
this.version = version;
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/spec/LicenseMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/spec/LicenseMetaData.java 2009-01-13 08:02:03 UTC (rev 82793)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/spec/LicenseMetaData.java 2009-01-13 08:24:02 UTC (rev 82794)
@@ -22,7 +22,8 @@
package org.jboss.metadata.rar.spec;
import javax.xml.bind.annotation.XmlElement;
-import org.jboss.metadata.javaee.support.IdMetaDataImplWithDescriptions;
+import javax.xml.bind.annotation.XmlType;
+import org.jboss.metadata.javaee.spec.DescriptionImpl;
/**
* License meta data
@@ -31,7 +32,8 @@
* @author Jeff Zhang
* @version $Revision: 71554 $
*/
-public class LicenseMetaData extends IdMetaDataImplWithDescriptions
+ at XmlType(name="license", propOrder={"description", "required"})
+public class LicenseMetaData extends DescriptionImpl
{
private static final long serialVersionUID = -1583292998139497934L;
@@ -65,7 +67,7 @@
buffer.append("LicenseMetaData").append('@');
buffer.append(Integer.toHexString(System.identityHashCode(this)));
buffer.append("[required=").append(required);
- buffer.append(" descriptions=").append(getDescriptions());
+ buffer.append(" descriptions=").append(getDescription());
buffer.append(']');
return buffer.toString();
}
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/spec/MessageListenerMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/spec/MessageListenerMetaData.java 2009-01-13 08:02:03 UTC (rev 82793)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/spec/MessageListenerMetaData.java 2009-01-13 08:24:02 UTC (rev 82794)
@@ -22,7 +22,7 @@
package org.jboss.metadata.rar.spec;
import javax.xml.bind.annotation.XmlElement;
-
+import javax.xml.bind.annotation.XmlType;
import org.jboss.metadata.javaee.support.IdMetaDataImpl;
/**
@@ -32,6 +32,7 @@
* @author Jeff Zhang
* @version $Revision: 75672 $
*/
+ at XmlType(name="messagelistener", propOrder={"type", "activationSpecType"})
public class MessageListenerMetaData extends IdMetaDataImpl
{
private static final long serialVersionUID = -3196418073906964586L;
@@ -57,7 +58,7 @@
*
* @param type the message listener type
*/
- @XmlElement(name="messagelistener-type")
+ @XmlElement(name="messagelistener-type", required=true)
public void setType(String type)
{
this.type = type;
@@ -78,7 +79,7 @@
*
* @param type the activation spec type
*/
- @XmlElement(name="activationspec")
+ @XmlElement(name="activationspec", required=true)
public void setActivationSpecType(ActivationspecMetaData type)
{
this.asType = type;
@@ -92,7 +93,6 @@
buffer.append(Integer.toHexString(System.identityHashCode(this)));
buffer.append("[type=").append(type);
buffer.append(" activationSpecType=").append(asType);
- //buffer.append(" requiredProperties=").append(requiredProperties);
buffer.append(']');
return buffer.toString();
}
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/spec/OutboundRaMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/spec/OutboundRaMetaData.java 2009-01-13 08:02:03 UTC (rev 82793)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/spec/OutboundRaMetaData.java 2009-01-13 08:24:02 UTC (rev 82794)
@@ -23,6 +23,7 @@
import java.util.List;
import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlType;
import org.jboss.metadata.javaee.support.IdMetaDataImpl;
/**
@@ -31,6 +32,7 @@
* @author Jeff Zhang
* @version $Revision: $
*/
+ at XmlType(name="messagelistener", propOrder={"conDefs", "transSupport", "authMechanisms", "reAuthSupport"})
public class OutboundRaMetaData extends IdMetaDataImpl
{
private static final long serialVersionUID = -1583292998339497984L;
@@ -40,7 +42,7 @@
private List<AuthenticationMechanismMetaData> authMechanisms;
private boolean reAuthSupport;
- @XmlElement(name="connection-definition")
+ @XmlElement(name="connection-definition", required=true)
public void setConDefs(List<ConnectionDefinitionMetaData> conDefs) {
this.conDefs = conDefs;
}
@@ -49,7 +51,7 @@
return conDefs;
}
- @XmlElement(name="transaction-support")
+ @XmlElement(name="transaction-support", required=true)
public void setTransSupport(TransactionSupportMetaData transSupport) {
this.transSupport = transSupport;
}
@@ -58,7 +60,7 @@
return transSupport;
}
- @XmlElement(name="authentication-mechanism")
+ @XmlElement(name="authentication-mechanism", required=true)
public void setAuthMechanisms(List<AuthenticationMechanismMetaData> authMechanisms) {
this.authMechanisms = authMechanisms;
}
@@ -67,7 +69,7 @@
return authMechanisms;
}
- @XmlElement(name="reauthentication-support")
+ @XmlElement(name="reauthentication-support", required=true)
public void setReAuthSupport(boolean reAuthSupport) {
this.reAuthSupport = reAuthSupport;
}
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/spec/RequiredConfigPropertyMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/spec/RequiredConfigPropertyMetaData.java 2009-01-13 08:02:03 UTC (rev 82793)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/spec/RequiredConfigPropertyMetaData.java 2009-01-13 08:24:02 UTC (rev 82794)
@@ -23,7 +23,7 @@
import javax.xml.bind.annotation.XmlElement;
-import org.jboss.metadata.javaee.support.IdMetaDataImplWithDescriptionGroup;
+import org.jboss.metadata.javaee.spec.DescriptionImpl;
/**
* Required Config property meta data
@@ -32,7 +32,7 @@
* @author Jeff Zhang
* @version $Revision: 71554 $
*/
-public class RequiredConfigPropertyMetaData extends IdMetaDataImplWithDescriptionGroup
+public class RequiredConfigPropertyMetaData extends DescriptionImpl
{
static final long serialVersionUID = 7276282462933038174L;
@@ -66,7 +66,7 @@
buffer.append("RequiredConfigPropertyMetaData").append('@');
buffer.append(Integer.toHexString(System.identityHashCode(this)));
buffer.append("[name=").append(name);
- //buffer.append(" descriptions=").append(getDescriptions());
+ buffer.append(" descriptions=").append(getDescription());
buffer.append(']');
return buffer.toString();
}
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/spec/ResourceAdapterMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/spec/ResourceAdapterMetaData.java 2009-01-13 08:02:03 UTC (rev 82793)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/spec/ResourceAdapterMetaData.java 2009-01-13 08:24:02 UTC (rev 82794)
@@ -23,7 +23,7 @@
import java.util.List;
import javax.xml.bind.annotation.XmlElement;
-import org.jboss.metadata.javaee.support.IdMetaDataImplWithDescriptions;
+import org.jboss.metadata.javaee.support.IdMetaDataImpl;
/**
* ResourceAdapter meta data
@@ -31,7 +31,7 @@
* @author Jeff Zhang
* @version $Revision: $
*/
-public class ResourceAdapterMetaData extends IdMetaDataImplWithDescriptions
+public class ResourceAdapterMetaData extends IdMetaDataImpl
{
private static final long serialVersionUID = -1583292998139497984L;
@@ -95,4 +95,19 @@
public List<SecurityPermissionMetaData> getSecurityPermissions() {
return securityPermissions;
}
+
+ public String toString()
+ {
+ StringBuffer buffer = new StringBuffer();
+ buffer.append("ResourceAdapterMetaData").append('@');
+ buffer.append(Integer.toHexString(System.identityHashCode(this)));
+ buffer.append("[resourceadapter-class=").append(raClass);
+ buffer.append(" config-property=").append(configProperty);
+ buffer.append(" outbound-resourceadapter=").append(outboundRa);
+ buffer.append(" inbound-resourceadapter=").append(inboundRa);
+ buffer.append(" adminobject=").append(adminObjects);
+ buffer.append(" security-permission=").append(securityPermissions);
+ buffer.append(']');
+ return buffer.toString();
+ }
}
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/spec/SecurityPermissionMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/spec/SecurityPermissionMetaData.java 2009-01-13 08:02:03 UTC (rev 82793)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/spec/SecurityPermissionMetaData.java 2009-01-13 08:24:02 UTC (rev 82794)
@@ -22,9 +22,9 @@
package org.jboss.metadata.rar.spec;
import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlType;
+import org.jboss.metadata.javaee.spec.DescriptionImpl;
-import org.jboss.metadata.javaee.support.IdMetaDataImplWithDescriptionGroup;
-
/**
* Security Permission meta data
*
@@ -32,7 +32,8 @@
* @author Jeff Zhang
* @version $Revision: 71554 $
*/
-public class SecurityPermissionMetaData extends IdMetaDataImplWithDescriptionGroup
+ at XmlType(name="security-permission", propOrder={"description", "securityPermissionSpec"})
+public class SecurityPermissionMetaData extends DescriptionImpl
{
private static final long serialVersionUID = -2819460637074430187L;
@@ -54,7 +55,7 @@
*
* @param securityPermissionSpec the spec
*/
- @XmlElement(name="security-permission-spec")
+ @XmlElement(name="security-permission-spec", required=true)
public void setSecurityPermissionSpec(String securityPermissionSpec)
{
this.securityPermissionSpec = securityPermissionSpec;
@@ -66,7 +67,7 @@
buffer.append("SecurityPermissionMetaData").append('@');
buffer.append(Integer.toHexString(System.identityHashCode(this)));
buffer.append("[spec=").append(securityPermissionSpec);
- //buffer.append(" descriptions=").append(getDescriptions());
+ buffer.append(" descriptions=").append(getDescription());
buffer.append(']');
return buffer.toString();
}
Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/rar/RA15EverythingUnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/rar/RA15EverythingUnitTestCase.java 2009-01-13 08:02:03 UTC (rev 82793)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/rar/RA15EverythingUnitTestCase.java 2009-01-13 08:24:02 UTC (rev 82794)
@@ -74,7 +74,7 @@
protected void assertEverything(ConnectorMetaData connector) throws Exception
{
- assertDescriptionGroup("connector", connector.getDescriptionGroup());
+ //assertDescriptionGroup("connector", connector.getDescriptionGroup());
assertGeneralInfo(connector);
assertRA(connector.getRa());
}
Modified: projects/metadata/trunk/src/test/java/org/jboss/test/metadata/rar/RA16EverythingUnitTestCase.java
===================================================================
--- projects/metadata/trunk/src/test/java/org/jboss/test/metadata/rar/RA16EverythingUnitTestCase.java 2009-01-13 08:02:03 UTC (rev 82793)
+++ projects/metadata/trunk/src/test/java/org/jboss/test/metadata/rar/RA16EverythingUnitTestCase.java 2009-01-13 08:24:02 UTC (rev 82794)
@@ -74,7 +74,7 @@
protected void assertEverything(Connector16MetaData connector) throws Exception
{
- assertDescriptionGroup("connector", connector.getDescriptionGroup());
+ //assertDescriptionGroup("connector", connector.getDescription());
assertGeneralInfo(connector);
assertRA(connector.getRa());
}
@@ -93,6 +93,7 @@
assertNotNull(ra.getRaClass());
assertNotNull(ra.getConfigProperty());
assertEquals(ra.getConfigProperty().size(), 1);
+ assertTrue(ra.getConfigProperty().get(0).getDescription().startsWith("Log"));
assertEquals(ra.getConfigProperty().get(0).getValue(), "DEBUG");
assertOutboundAdapter(ra.getOutboundRa());
assertInoundAdapter(ra.getInboundRa());
@@ -125,6 +126,8 @@
assertTrue(msgListener.getActivationSpecType().getAsClass().endsWith("JmsActivationSpec"));
assertNotNull(msgListener.getActivationSpecType().getRequiredConfigProps());
assertFalse(msgListener.getActivationSpecType().getRequiredConfigProps().isEmpty());
+ assertNotNull(msgListener.getActivationSpecType().getConfigProps());
+ assertFalse(msgListener.getActivationSpecType().getConfigProps().isEmpty());
}
private void assertAdminObject(List<AdminObjectMetaData> adminObjects) {
Modified: projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/rar/RA16Everything_testEverything.xml
===================================================================
--- projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/rar/RA16Everything_testEverything.xml 2009-01-13 08:02:03 UTC (rev 82793)
+++ projects/metadata/trunk/src/test/resources/org/jboss/test/metadata/rar/RA16Everything_testEverything.xml 2009-01-13 08:24:02 UTC (rev 82794)
@@ -117,7 +117,8 @@
<connection-impl-class>org.jboss.resource.adapter.jms.JmsSession</connection-impl-class>
</connection-definition>
<transaction-support>XATransaction</transaction-support>
- <authentication-mechanism>
+ <authentication-mechanism id="amid">
+ <description>authentication-mechanism</description>
<authentication-mechanism-type>BasicPassword</authentication-mechanism-type>
<credential-interface>javax.resource.spi.security.PasswordCredential</credential-interface>
</authentication-mechanism>
@@ -133,12 +134,16 @@
<required-config-property>
<config-property-name>destination</config-property-name>
</required-config-property>
+ <config-property>
+ <config-property-name>StringProperty</config-property-name>
+ <config-property-type>java.lang.String</config-property-type>
+ </config-property>
</activationspec>
</messagelistener>
</messageadapter>
</inbound-resourceadapter>
- <adminobject>
+ <adminobject id="aoid">
<adminobject-interface>org.jboss.test.jca.adminobject.TestInterface</adminobject-interface>
<adminobject-class>org.jboss.test.jca.adminobject.TestImplementation</adminobject-class>
<config-property>
@@ -155,4 +160,4 @@
<security-permission-spec>sa</security-permission-spec>
</security-permission>
</resourceadapter>
-</connector>
\ No newline at end of file
+</connector>
More information about the jboss-cvs-commits
mailing list