[jboss-cvs] JBossAS SVN: r96136 - in projects/metadata/rar/trunk/src: main/resources/schema and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Sun Nov 8 21:28:39 EST 2009
Author: jeff.zhang
Date: 2009-11-08 21:28:39 -0500 (Sun, 08 Nov 2009)
New Revision: 96136
Modified:
projects/metadata/rar/trunk/src/main/java/org/jboss/metadata/rar/spec/JCA16Base.java
projects/metadata/rar/trunk/src/main/java/org/jboss/metadata/rar/spec/JCA16DTDMetaData.java
projects/metadata/rar/trunk/src/main/java/org/jboss/metadata/rar/spec/JCA16DefaultNSMetaData.java
projects/metadata/rar/trunk/src/main/java/org/jboss/metadata/rar/spec/JCA16MetaData.java
projects/metadata/rar/trunk/src/main/resources/schema/connector_1_6.xsd
projects/metadata/rar/trunk/src/test/java/org/jboss/test/metadata/rar/RA16EverythingUnitTestCase.java
projects/metadata/rar/trunk/src/test/resources/org/jboss/test/metadata/rar/RA16Everything_testEverything.xml
Log:
[JBMETA-225] connector_1_6.xsd update
Modified: projects/metadata/rar/trunk/src/main/java/org/jboss/metadata/rar/spec/JCA16Base.java
===================================================================
--- projects/metadata/rar/trunk/src/main/java/org/jboss/metadata/rar/spec/JCA16Base.java 2009-11-08 21:32:55 UTC (rev 96135)
+++ projects/metadata/rar/trunk/src/main/java/org/jboss/metadata/rar/spec/JCA16Base.java 2009-11-09 02:28:39 UTC (rev 96136)
@@ -45,8 +45,9 @@
private boolean metadataComplete;
private List<String> requiredWorkContexts;
+
+ private String moduleName;
-
public boolean isMetadataComplete()
{
return metadataComplete;
@@ -68,4 +69,21 @@
{
this.requiredWorkContexts = requiredWorkContexts;
}
+
+ /**
+ * @return the moduleName
+ */
+ public String getModuleName()
+ {
+ return moduleName;
+ }
+
+ /**
+ * @param moduleName the moduleName to set
+ */
+ @XmlElement(name = "module-name")
+ public void setModuleName(String moduleName)
+ {
+ this.moduleName = moduleName;
+ }
}
Modified: projects/metadata/rar/trunk/src/main/java/org/jboss/metadata/rar/spec/JCA16DTDMetaData.java
===================================================================
--- projects/metadata/rar/trunk/src/main/java/org/jboss/metadata/rar/spec/JCA16DTDMetaData.java 2009-11-08 21:32:55 UTC (rev 96135)
+++ projects/metadata/rar/trunk/src/main/java/org/jboss/metadata/rar/spec/JCA16DTDMetaData.java 2009-11-09 02:28:39 UTC (rev 96136)
@@ -45,7 +45,7 @@
elementFormDefault=XmlNsForm.QUALIFIED,
normalizeSpace=true,
strict=false)
- at XmlType(name="connectorType", propOrder={"descriptionGroup", "vendorName", "EISType", "RAVersion", "license", "ra", "requiredWorkContexts"})
+ at XmlType(name="connectorType", propOrder={"moduleName", "descriptionGroup", "vendorName", "EISType", "RAVersion", "license", "ra", "requiredWorkContexts"})
public class JCA16DTDMetaData extends JCA16Base
{
private static final long serialVersionUID = 7047130842344140262L;
Modified: projects/metadata/rar/trunk/src/main/java/org/jboss/metadata/rar/spec/JCA16DefaultNSMetaData.java
===================================================================
--- projects/metadata/rar/trunk/src/main/java/org/jboss/metadata/rar/spec/JCA16DefaultNSMetaData.java 2009-11-08 21:32:55 UTC (rev 96135)
+++ projects/metadata/rar/trunk/src/main/java/org/jboss/metadata/rar/spec/JCA16DefaultNSMetaData.java 2009-11-09 02:28:39 UTC (rev 96136)
@@ -45,7 +45,7 @@
elementFormDefault=XmlNsForm.QUALIFIED,
normalizeSpace=true,
strict=false)
- at XmlType(name="connectorType", propOrder={"descriptionGroup", "vendorName", "EISType", "RAVersion", "license", "ra", "requiredWorkContexts"})
+ at XmlType(name="connectorType", propOrder={"moduleName", "descriptionGroup", "vendorName", "EISType", "RAVersion", "license", "ra", "requiredWorkContexts"})
public class JCA16DefaultNSMetaData extends JCA16Base
{
private static final long serialVersionUID = 7047130842344140262L;
Modified: projects/metadata/rar/trunk/src/main/java/org/jboss/metadata/rar/spec/JCA16MetaData.java
===================================================================
--- projects/metadata/rar/trunk/src/main/java/org/jboss/metadata/rar/spec/JCA16MetaData.java 2009-11-08 21:32:55 UTC (rev 96135)
+++ projects/metadata/rar/trunk/src/main/java/org/jboss/metadata/rar/spec/JCA16MetaData.java 2009-11-09 02:28:39 UTC (rev 96136)
@@ -46,7 +46,7 @@
namespace=JavaEEMetaDataConstants.JAVAEE_NS,
elementFormDefault=XmlNsForm.QUALIFIED,
normalizeSpace=true)
- at XmlType(name="connectorType", propOrder={"descriptionGroup", "vendorName", "EISType", "RAVersion", "license", "ra", "requiredWorkContexts"})
+ at XmlType(name="connectorType", propOrder={"moduleName", "descriptionGroup", "vendorName", "EISType", "RAVersion", "license", "ra", "requiredWorkContexts"})
public class JCA16MetaData extends JCA16Base
{
private static final long serialVersionUID = 7047130842344140262L;
Modified: projects/metadata/rar/trunk/src/main/resources/schema/connector_1_6.xsd
===================================================================
--- projects/metadata/rar/trunk/src/main/resources/schema/connector_1_6.xsd 2009-11-08 21:32:55 UTC (rev 96135)
+++ projects/metadata/rar/trunk/src/main/resources/schema/connector_1_6.xsd 2009-11-09 02:28:39 UTC (rev 96136)
@@ -678,6 +678,23 @@
</xsd:documentation>
</xsd:annotation>
<xsd:sequence>
+ <xsd:element name="module-name"
+ type="javaee:string"
+ minOccurs="0">
+ <xsd:annotation>
+ <xsd:documentation>
+
+ The element module-name specifies the name of the
+ resource adapter.
+
+ If there is no module-name specified, the module-name
+ is determined as defined in Section EE.8.1.1 and EE.8.1.2
+ of the Java Platform, Enterprise Edition (Java EE)
+ Specification, version 6.
+
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
<xsd:group ref="javaee:descriptionGroup"/>
<xsd:element name="vendor-name"
type="javaee:xsdStringType"
@@ -990,27 +1007,31 @@
provided, one or more authentication mechanisms supported
and additional required security permissions.
- If there is no connection-definition specified as part of
- resource adapter element, then the application server must
- search for connection definitions specified through annotations
- in the resource adapter archive. If no connection-definition
- is specified as part of the resource adapter element and the
- application server cannot discover Connection definitions
- through annotations, the application server must consider
- this as an error and fail deployment.
+ If any of the outbound resource adapter elements (transaction-support,
+ authentication-mechanism, reauthentication-support) is specified through
+ this element or metadata annotations, and no connection-definition is
+ specified as part of this element or through annotations, the
+ application server must consider this an error and fail deployment.
If there is no authentication-mechanism specified as part of
- resource adapter element then the resource adapter does not
- support any standard security authentication mechanisms as
- part of security contract. The application server ignores
- the security part of the system contracts in this case.
+ this element or metadata annotations, then the resource adapter does
+ not support any standard security authentication mechanisms as
+ part of security contract. The application server ignores the security
+ part of the system contracts in this case.
- If there is no transaction-support specified as part of
- resource adapter element, then the application server must
- consider that the resource adapter does not support either
- the resource manager local or JTA transactions and must consider
- the transaction support as NoTransaction.
+ If there is no transaction-support specified as part of this element
+ or metadata annotation, then the application server must consider that
+ the resource adapter does not support either the resource manager local
+ or JTA transactions and must consider the transaction support as
+ NoTransaction. Note that resource adapters may specify the level of
+ transaction support to be used at runtime for a ManagedConnectionFactory
+ through the TransactionSupport interface.
+ If there is no reauthentication-support specified as part of
+ this element or metadata annotation, then the application server must consider
+ that the resource adapter does not support re-authentication of
+ ManagedConnections.
+
</xsd:documentation>
</xsd:annotation>
<xsd:sequence>
Modified: projects/metadata/rar/trunk/src/test/java/org/jboss/test/metadata/rar/RA16EverythingUnitTestCase.java
===================================================================
--- projects/metadata/rar/trunk/src/test/java/org/jboss/test/metadata/rar/RA16EverythingUnitTestCase.java 2009-11-08 21:32:55 UTC (rev 96135)
+++ projects/metadata/rar/trunk/src/test/java/org/jboss/test/metadata/rar/RA16EverythingUnitTestCase.java 2009-11-09 02:28:39 UTC (rev 96136)
@@ -71,6 +71,7 @@
assertRA(connector.getRa());
assertEquals(connector.getRequiredWorkContexts().size(), 2);
assertEquals(connector.getRequiredWorkContexts().get(0), "java.work.Context1");
+ assertEquals(connector.getModuleName(), "JCA module");
}
@Override
Modified: projects/metadata/rar/trunk/src/test/resources/org/jboss/test/metadata/rar/RA16Everything_testEverything.xml
===================================================================
--- projects/metadata/rar/trunk/src/test/resources/org/jboss/test/metadata/rar/RA16Everything_testEverything.xml 2009-11-08 21:32:55 UTC (rev 96135)
+++ projects/metadata/rar/trunk/src/test/resources/org/jboss/test/metadata/rar/RA16Everything_testEverything.xml 2009-11-09 02:28:39 UTC (rev 96136)
@@ -7,8 +7,9 @@
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
http://java.sun.com/xml/ns/j2ee/connector_1_6.xsd"
version="1.6" metadata-complete="true">
+
+ <module-name>JCA module</module-name>
-
<!-- description group -->
<description>en-connector-desc</description>
<description xml:lang="fr">fr-connector-desc</description>
More information about the jboss-cvs-commits
mailing list