[jboss-cvs] JBossAS SVN: r107538 - in projects/jboss-jca/trunk/common/src: main/java/org/jboss/jca/common/metadata/ds and 3 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Aug 11 11:40:27 EDT 2010
Author: maeste
Date: 2010-08-11 11:40:26 -0400 (Wed, 11 Aug 2010)
New Revision: 107538
Removed:
projects/jboss-jca/trunk/common/src/main/resources/dtd/connector_1_5.dtd
projects/jboss-jca/trunk/common/src/main/resources/dtd/connector_1_6.dtd
projects/jboss-jca/trunk/common/src/main/resources/dtd/jboss-ds_5_0.dtd
Modified:
projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/ds/XaDataSource.java
projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ds/DsParser.java
projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ds/XADataSourceImpl.java
projects/jboss-jca/trunk/common/src/main/resources/schema/datasources_1_0.xsd
projects/jboss-jca/trunk/common/src/test/resources/ds/db2-jcc-xa-ds.xml
projects/jboss-jca/trunk/common/src/test/resources/ds/db2-xa-ds
Log:
JBJCA-400 jesper's feedbacks about ds xsd
Modified: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/ds/XaDataSource.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/ds/XaDataSource.java 2010-08-11 14:28:09 UTC (rev 107537)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/ds/XaDataSource.java 2010-08-11 15:40:26 UTC (rev 107538)
@@ -21,7 +21,6 @@
*/
package org.jboss.jca.common.api.metadata.ds;
-
import org.jboss.jca.common.api.metadata.JCAMetadata;
import java.util.HashMap;
@@ -94,11 +93,11 @@
public TransactionIsolation getTransactionIsolation();
/**
- * Get the isSameRmOverrideValue.
+ * Get the isSameRmOverride.
*
- * @return the isSameRmOverrideValue.
+ * @return the isSameRmOverride.
*/
- public boolean isSameRmOverrideValue();
+ public boolean isSameRmOverride();
/**
* Get the interleaving.
@@ -192,6 +191,34 @@
public String getJndiName();
/**
+ * Get the xaDataSourceProperty.
+ *
+ * @return the xaDataSourceProperty.
+ */
+ public Map<String, String> getXaDataSourceProperty();
+
+ /**
+ * Get the padXid.
+ *
+ * @return the padXid.
+ */
+ public boolean isPadXid();
+
+ /**
+ * Get the wrapXaDataSource.
+ *
+ * @return the wrapXaDataSource.
+ */
+ public boolean isWrapXaDataSource();
+
+ /**
+ * Get the noTxSeparatePool.
+ *
+ * @return the noTxSeparatePool.
+ */
+ public boolean isNoTxSeparatePool();
+
+ /**
*
* A Tag.
*
@@ -240,7 +267,7 @@
/**
* isSameRmOverrideValue tag
*/
- ISSAMERMOVERRIDEVALUE("is-same-rm-override-value"),
+ ISSAMERMOVERRIDEVALUE("is-same-rm-override"),
/**
* interleaving tag
*/
@@ -276,8 +303,23 @@
/**
* newConnectionSql tag
*/
- NEWCONNECTIONSQL("new-connection-sql");
+ NEWCONNECTIONSQL("new-connection-sql"),
+ /**
+ * pad-xid tag
+ */
+ PAD_XID("pad-xid"),
+
+ /**
+ * wrap-xa-resource tag
+ */
+ WRAP_XA_RESOURCE("wrap-xa-resource"),
+
+ /**
+ * no-tx-separate-pools tag
+ */
+ NO_TX_SEPARATE_POOLS("no-tx-separate-pools");
+
private final String name;
/**
Modified: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ds/DsParser.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ds/DsParser.java 2010-08-11 14:28:09 UTC (rev 107537)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ds/DsParser.java 2010-08-11 15:40:26 UTC (rev 107538)
@@ -180,6 +180,9 @@
boolean isSameRmOverrideValue = false;
String xaDataSourceClass = null;
RecoverySettings recoverySettings = null;
+ boolean padXid = false;
+ boolean noTxSeparatePool = false;
+ boolean wrapXaDataSource = false;
//attributes reading
@@ -222,11 +225,12 @@
if (DataSources.Tag.forName(reader.getLocalName()) == DataSources.Tag.XA_DATASOURCE)
{
+
return new XADataSourceImpl(minPoolSize, maxPoolSize, prefill, userName, password,
xaDataSourceProperty, xaDataSourceClass, transactionIsolation, isSameRmOverrideValue,
interleaving, recoverySettings, timeOutSettings, securitySettings, statementSettings,
validationSettings, urlDelimiter, urlSelectorStrategyClassName, newConnectionSql,
- useJavaContext, poolName, enabled, jndiName);
+ useJavaContext, poolName, enabled, jndiName, padXid, wrapXaDataSource, noTxSeparatePool);
}
else
{
@@ -312,6 +316,18 @@
recoverySettings = parseRecoverySettings(reader);
break;
}
+ case NO_TX_SEPARATE_POOLS : {
+ noTxSeparatePool = elementAsBoolean(reader);
+ break;
+ }
+ case PAD_XID : {
+ padXid = elementAsBoolean(reader);
+ break;
+ }
+ case WRAP_XA_RESOURCE : {
+ wrapXaDataSource = elementAsBoolean(reader);
+ break;
+ }
default :
throw new ParserException("Unexpected element:" + reader.getLocalName());
}
Modified: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ds/XADataSourceImpl.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ds/XADataSourceImpl.java 2010-08-11 14:28:09 UTC (rev 107537)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ds/XADataSourceImpl.java 2010-08-11 15:40:26 UTC (rev 107538)
@@ -53,7 +53,7 @@
private final String xaDataSourceClass;
- private final boolean isSameRmOverrideValue;
+ private final boolean isSameRmOverride;
private final boolean interleaving;
@@ -61,6 +61,12 @@
private final String newConnectionSql;
+ private final boolean padXid;
+
+ private final boolean wrapXaDataSource;
+
+ private final boolean noTxSeparatePool;
+
/**
* Create a new XADataSourceImpl.
*
@@ -72,7 +78,7 @@
* @param xaDataSourceProperty xaDataSoourceProperty
* @param xaDataSourceClass xaDataSourceClass
* @param transactionIsolation transactionIsolation
- * @param isSameRmOverrideValue isSameRmOverrideValue
+ * @param isSameRmOverride isSameRmOverride
* @param interleaving interleaving
* @param recoverySettings recoverySettings
* @param timeOutSettings timeOutSettings
@@ -86,14 +92,17 @@
* @param poolName poolName
* @param enabled enabled
* @param jndiName jndiName
+ * @param padXid
+ * @param wrapXaDataSource
+ * @param noTxSeparatePool
*/
public XADataSourceImpl(Integer minPoolSize, Integer maxPoolSize, boolean prefill, String userName, String password,
Map<String, String> xaDataSourceProperty, String xaDataSourceClass,
- TransactionIsolation transactionIsolation, boolean isSameRmOverrideValue, boolean interleaving,
+ TransactionIsolation transactionIsolation, boolean isSameRmOverride, boolean interleaving,
RecoverySettings recoverySettings, TimeOutSettings timeOutSettings, SecuritySettings securitySettings,
StatementSettings statementSettings, ValidationSettings validationSettings, String urlDelimiter,
String urlSelectorStrategyClassName, String newConnectionSql, boolean useJavaContext, String poolName,
- boolean enabled, String jndiName)
+ boolean enabled, String jndiName, boolean padXid, boolean wrapXaDataSource, boolean noTxSeparatePool)
{
super(minPoolSize, maxPoolSize, prefill, transactionIsolation, timeOutSettings, securitySettings,
statementSettings, validationSettings, urlDelimiter, urlSelectorStrategyClassName, useJavaContext,
@@ -110,10 +119,13 @@
this.xaDataSourceProperty = new HashMap<String, String>(0);
}
this.xaDataSourceClass = xaDataSourceClass;
- this.isSameRmOverrideValue = isSameRmOverrideValue;
+ this.isSameRmOverride = isSameRmOverride;
this.interleaving = interleaving;
this.recoverySettings = recoverySettings;
this.newConnectionSql = newConnectionSql;
+ this.padXid = padXid;
+ this.wrapXaDataSource = wrapXaDataSource;
+ this.noTxSeparatePool = noTxSeparatePool;
}
/**
@@ -161,14 +173,14 @@
}
/**
- * Get the isSameRmOverrideValue.
+ * Get the isSameRmOverride.
*
- * @return the isSameRmOverrideValue.
+ * @return the isSameRmOverride.
*/
@Override
- public final boolean isSameRmOverrideValue()
+ public final boolean isSameRmOverride()
{
- return isSameRmOverrideValue;
+ return isSameRmOverride;
}
/**
@@ -244,7 +256,7 @@
int result = 1;
result = prime * result + (enabled ? 1231 : 1237);
result = prime * result + (interleaving ? 1231 : 1237);
- result = prime * result + (isSameRmOverrideValue ? 1231 : 1237);
+ result = prime * result + (isSameRmOverride ? 1231 : 1237);
result = prime * result + ((jndiName == null) ? 0 : jndiName.hashCode());
result = prime * result + ((maxPoolSize == null) ? 0 : maxPoolSize.hashCode());
result = prime * result + ((minPoolSize == null) ? 0 : minPoolSize.hashCode());
@@ -281,7 +293,7 @@
return false;
if (interleaving != other.interleaving)
return false;
- if (isSameRmOverrideValue != other.isSameRmOverrideValue)
+ if (isSameRmOverride != other.isSameRmOverride)
return false;
if (jndiName == null)
{
@@ -410,11 +422,55 @@
return "XADataSourceImpl [minPoolSize=" + minPoolSize + ", maxPoolSize=" + maxPoolSize + ", prefill=" + prefill
+ ", userName=" + userName + ", password=" + password + ", xaDataSoourceProperty=" + xaDataSourceProperty
+ ", xaDataSourceClass=" + xaDataSourceClass + ", transactionIsolation=" + transactionIsolation
- + ", isSameRmOverrideValue=" + isSameRmOverrideValue + ", interleaving=" + interleaving
+ + ", isSameRmOverride=" + isSameRmOverride + ", interleaving=" + interleaving
+ ", recoverySettings=" + recoverySettings + ", timeOutSettings=" + timeOutSettings + ", securitySettings="
+ securitySettings + ", statementSettings=" + statementSettings + ", validationSettings="
+ validationSettings + ", urlDelimiter=" + urlDelimiter + ", urlSelectorStrategyClassName="
+ urlSelectorStrategyClassName + ", newConnectionSql=" + newConnectionSql + ", useJavaContext="
+ useJavaContext + ", poolName=" + poolName + ", enabled=" + enabled + ", jndiName=" + jndiName + "]";
}
+
+ /**
+ * Get the xaDataSourceProperty.
+ *
+ * @return the xaDataSourceProperty.
+ */
+ @Override
+ public final Map<String, String> getXaDataSourceProperty()
+ {
+ return Collections.unmodifiableMap(xaDataSourceProperty);
+ }
+
+ /**
+ * Get the padXid.
+ *
+ * @return the padXid.
+ */
+ @Override
+ public final boolean isPadXid()
+ {
+ return padXid;
+ }
+
+ /**
+ * Get the wrapXaDataSource.
+ *
+ * @return the wrapXaDataSource.
+ */
+ @Override
+ public final boolean isWrapXaDataSource()
+ {
+ return wrapXaDataSource;
+ }
+
+ /**
+ * Get the noTxSeparatePool.
+ *
+ * @return the noTxSeparatePool.
+ */
+ @Override
+ public final boolean isNoTxSeparatePool()
+ {
+ return noTxSeparatePool;
+ }
}
Deleted: projects/jboss-jca/trunk/common/src/main/resources/dtd/connector_1_5.dtd
===================================================================
--- projects/jboss-jca/trunk/common/src/main/resources/dtd/connector_1_5.dtd 2010-08-11 14:28:09 UTC (rev 107537)
+++ projects/jboss-jca/trunk/common/src/main/resources/dtd/connector_1_5.dtd 2010-08-11 15:40:26 UTC (rev 107538)
@@ -1,676 +0,0 @@
-<!--
- DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
- Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
-
- The contents of this file are subject to the terms of either the GNU
- General Public License Version 2 only ("GPL") or the Common Development
- and Distribution License("CDDL") (collectively, the "License"). You
- may not use this file except in compliance with the License. You can obtain
- a copy of the License at https://glassfish.dev.java.net/public/CDDL+GPL.html
- or glassfish/bootstrap/legal/LICENSE.txt. See the License for the specific
- language governing permissions and limitations under the License.
-
- When distributing the software, include this License Header Notice in each
- file and include the License file at glassfish/bootstrap/legal/LICENSE.txt.
- Sun designates this particular file as subject to the "Classpath" exception
- as provided by Sun in the GPL Version 2 section of the License file that
- accompanied this code. If applicable, add the following below the License
- Header, with the fields enclosed by brackets [] replaced by your own
- identifying information: "Portions Copyrighted [year]
- [name of copyright owner]"
-
- Contributor(s):
-
- If you wish your version of this file to be governed by only the CDDL or
- only the GPL Version 2, indicate your decision by adding "[Contributor]
- elects to include this software in this distribution under the [CDDL or GPL
- Version 2] license." If you don't indicate a single choice of license, a
- recipient has the option to distribute your version of this file under
- either the CDDL, the GPL Version 2 or to extend the choice of license to
- its licensees as provided above. However, if you add GPL Version 2 code
- and therefore, elected the GPL Version 2 license, then the option applies
- only if the new code is made subject to such option by the copyright
- holder.
--->
-
-<!--
-This is the XML DTD for the Connector 1.5 deployment descriptor.
-All Connector 1.5 deployment descriptors must include a DOCTYPE
-of the following form:
-
- <!DOCTYPE connector PUBLIC
- "-//Sun Microsystems, Inc.//DTD Connector 1.5//EN"
- "http://java.sun.com/dtd/connector_1_5.dtd">
-
--->
-
-<!--
-The following conventions apply to all J2EE deployment descriptor
-elements unless indicated otherwise.
-
-- In elements that contain PCDATA, leading and trailing whitespace
- in the data may be ignored.
-
-- In elements whose value is an "enumerated type", the value is
- case sensitive.
-
-- In elements that specify a pathname to a file within the same
- JAR file, relative filenames (i.e., those not starting with "/")
- are considered relative to the root of the JAR file's namespace.
- Absolute filenames (i.e., those starting with "/") also specify
- names in the root of the JAR file's namespace. In general, relative
- names are preferred. The exception is .war files where absolute
- names are preferred for consistency with the servlet API.
--->
-
-
-<!--
-The connector element is the root element of the deployment descriptor
-for the resource adapter. This element includes general information - vendor
-name, version, specification version supported, icon - about the
-resource adapter module. It also includes information specific to the
-implementation of the resource adapter library as specified through
-the element resourceadapter.
--->
-<!ELEMENT connector (description*, display-name*, icon*, vendor-name,
-eis-type, resourceadapter-version, license?, resourceadapter)>
-
-<!--
-The attribute version specifies the version of the connector
-architecture specification that is supported by this resource
-adapter. This information enables deployer to configure the resource
-adapter to support deployment and runtime requirements of the
-corresponding connector architecture specification.
-
-Used in: connector
--->
-<!ATTLIST connector version NMTOKEN #REQUIRED >
-
-<!--
-The element activationspec specifies an activation specification.
-The information includes fully qualified Java class name of an activation
-specification and a set of required configuration property names.
-
-Used in: messagelistener
--->
-<!ELEMENT activationspec (activationspec-class, required-config-property*)>
-
-<!--
-The element activationspec-class specifies the fully qualified Java class
-name of the activation specification class. This class must implement the
-javax.resource.spi.ActivationSpec interface. The implementation
-of this class is required to be a JavaBean.
-
-Used in: activationspec
-
-Example: <activationspec-class>com.wombat.ActivationSpecImpl
- </activationspec-class>
--->
-<!ELEMENT activationspec-class (#PCDATA)>
-
-<!--
-The element adminobject specifies information about an administered object.
-Administered objects are specific to a messaging style or message provider.
-This contains information on the Java type of the interface implemented by
-an administered object, its Java class name, and configuration properties.
-
-Used in: resourceadapter
--->
-<!ELEMENT adminobject (adminobject-interface, adminobject-class,
-config-property*)>
-
-<!--
-The element adminobject-class specifies the fully qualified
-Java class name of an administered object.
-
-Used in: adminobject
-
-Example: <adminobject-class>com.wombat.DestinationImpl
- </adminobject-class>
--->
-<!ELEMENT adminobject-class (#PCDATA)>
-
-<!--
-The element adminobject-interface specifies the fully qualified name of the
-Java type of the interface implemented by an administered object.
-
-Used in: adminobject
-
-Example: <adminobject-interface>javax.jms.Destination
- </adminobject-interface>
--->
-<!ELEMENT adminobject-interface (#PCDATA)>
-
-<!--
-The element authentication-mechanism specifies an authentication mechanism
-supported by the resource adapter. Note that this support is for
-the resource adapter and not for the underlying EIS instance. The
-optional description specifies any resource adapter specific requirement
-for the support of security contract and authentication mechanism.
-
-Note that BasicPassword mechanism type should support the
-javax.resource.spi.security.PasswordCredential interface.
-The Kerbv5 mechanism type should support the
-org.ietf.jgss.GSSCredential interface or the deprecated
-javax.resource.spi.security.GenericCredential interface.
-
-Used in: outbound-resourceadapter
--->
-<!ELEMENT authentication-mechanism (
-description*, authentication-mechanism-type, credential-interface)>
-
-<!--
-The element authentication-mechanism-type specifies type of an authentication
-mechanism.
-
-The example values are:
- <authentication-mechanism-type>BasicPassword
- </authentication-mechanism-type>
- <authentication-mechanism-type>Kerbv5
- </authentication-mechanism-type>
-
-Any additional security mechanisms are outside the scope of the
-Connector architecture specification.
-
-Used in: authentication-mechanism
--->
-<!ELEMENT authentication-mechanism-type (#PCDATA)>
-
-<!--
-The element config-property contains a declaration of a single
-configuration property that may be used for providing configuration
-information.
-
-The declaration consists of an optional description, name, type
-and an optional value of the configuration property. If the resource
-adapter provider does not specify a value than the deployer is
-responsible for providing a valid value for a configuration property.
-
-Any bounds or well-defined values of properties should be described
-in the description element.
-
-Used in: adminobject, connection-definition, resourceadapter
--->
-<!ELEMENT config-property (description*, config-property-name,
-config-property-type, config-property-value?)>
-
-<!--
-The element config-property-name contains the name of a configuration
-property.
-
-The connector architecture defines a set of well-defined properties
-all of type java.lang.String. These are as follows:
- <config-property-name>ServerName</config-property-name>
- <config-property-name>PortNumber</config-property-name>
- <config-property-name>UserName</config-property-name>
- <config-property-name>Password</config-property-name>
- <config-property-name>ConnectionURL</config-property-name>
-
-A resource adapter provider can extend this property set to include
-properties specific to the resource adapter and its underlying EIS.
-
-Used in: config-property, required-config-property
-
-Example: <config-property-name>ServerName</config-property-name>
--->
-<!ELEMENT config-property-name (#PCDATA)>
-
-<!--
-The element config-property-type contains the fully qualified Java
-type of a configuration property.
-
-The following are the legal values of config-property-type:
- java.lang.Boolean, java.lang.String, java.lang.Integer,
- java.lang.Double, java.lang.Byte, java.lang.Short,
- java.lang.Long, java.lang.Float, java.lang.Character
-
-Used in: config-property
-
-Example: <config-property-type>java.lang.String</config-property-type>
--->
-<!ELEMENT config-property-type (#PCDATA)>
-
-<!--
-The element config-property-value contains the value of a configuration
-entry. Note, it is possible for a resource adapter deployer to
-override this configuration information during deployment.
-
-Used in: config-property
-
-Example: <config-property-value>WombatServer</config-property-value>
--->
-<!ELEMENT config-property-value (#PCDATA)>
-
-<!--
-The element connection-definition defines a set of connection interfaces and
-classes pertaining to a particular connection type. This also includes
-configurable properties for ManagedConnectionFactory instances that may be
-produced out of this set.
-
-Used in: outbound-resourceadapter
--->
-<!ELEMENT connection-definition (
-managedconnectionfactory-class, config-property*,
-connectionfactory-interface, connectionfactory-impl-class,
-connection-interface, connection-impl-class)>
-
-<!--
-The element connection-impl-class specifies the fully qualified
-name of the Connection class that implements resource adapter
-specific Connection interface.
-
-Used in: connection-definition
-
-Example: <connection-impl-class>com.wombat.ConnectionImpl
- </connection-impl-class>
--->
-<!ELEMENT connection-impl-class (#PCDATA)>
-
-<!--
-The element connection-interface specifies the fully qualified
-name of the Connection interface supported by the resource
-adapter.
-
-Used in: connection-definition
-
-Example: <connection-interface>javax.resource.cci.Connection
- </connection-interface>
--->
-<!ELEMENT connection-interface (#PCDATA)>
-
-<!--
-The element connectionfactory-impl-class specifies the fully qualified
-name of the ConnectionFactory class that implements resource adapter
-specific ConnectionFactory interface.
-
-Used in: connection-definition
-
-Example: <connectionfactory-impl-class>com.wombat.ConnectionFactoryImpl
- </connectionfactory-impl-class>
--->
-<!ELEMENT connectionfactory-impl-class (#PCDATA)>
-
-<!--
-The element connectionfactory-interface specifies the fully qualified
-name of the ConnectionFactory interface supported by the resource
-adapter.
-
-Used in: connection-definition
-
-Example: <connectionfactory-interface>com.wombat.ConnectionFactory
- </connectionfactory-interface>
-OR
-<connectionfactory-interface>javax.resource.cci.ConnectionFactory
- </connectionfactory-interface>
--->
-<!ELEMENT connectionfactory-interface (#PCDATA)>
-
-<!--
-The element credential-interface specifies the interface that the
-resource adapter implementation supports for the representation
-of the credentials. This element should be used by application server
-to find out the Credential interface it should use as part of the
-security contract.
-
-The possible values are:
- <credential-interface>javax.resource.spi.security.PasswordCredential
- </credential-interface>
- <credential-interface>org.ietf.jgss.GSSCredential
- </credential-interface>
- <credential-interface>javax.resource.spi.security.GenericCredential
- </credential-interface>
-
-Used in: authentication-mechanism
--->
-<!ELEMENT credential-interface (#PCDATA)>
-
-<!--
-The description element is used to provide text describing the parent
-element. The description element should include any information that
-the resource adapter rar file producer wants to provide to the consumer of
-the resource adapter rar file (i.e., to the Deployer). Typically, the tools
-used by the resource adapter rar file consumer will display the description
-when processing the parent element that contains the description.
-
-Used in: authentication-mechanism, config-property, connector, license,
-required-config-property, security-permission
--->
-<!ELEMENT description (#PCDATA)>
-<!ATTLIST description xml:lang NMTOKEN #IMPLIED >
-
-<!--
-The display-name element contains a short name that is intended to be
-displayed by tools. The display name need not be unique.
-
-Used in: connector
-
-Example:
-
-<display-name>Employee Self Service</display-name>
--->
-<!ELEMENT display-name (#PCDATA)>
-<!ATTLIST display-name xml:lang NMTOKEN #IMPLIED >
-
-<!--
-The element eis-type contains information about the type of the
-EIS. For example, the type of an EIS can be product name of EIS
-independent of any version info.
-
-This helps in identifying EIS instances that can be used with
-this resource adapter.
-
-Used in: connector
--->
-<!ELEMENT eis-type (#PCDATA)>
-
-<!--
-The icon element contains small-icon and large-icon elements that
-specify the file names for small and a large GIF or JPEG icon images
-used to represent the parent element in a GUI tool.
-
-Used in: connector
--->
-<!ELEMENT icon (small-icon?, large-icon?)>
-<!ATTLIST icon xml:lang NMTOKEN #IMPLIED >
-
-<!--
-The element inbound-resourceadapter specifies information about an inbound
-resource adapter. This contains information specific to the implementation
-of the resource adapter library as specified through the messageadapter
-element.
-
-Used in: resourceadapter
--->
-<!ELEMENT inbound-resourceadapter (messageadapter?)>
-
-<!--
-The large-icon element contains the name of a file
-containing a large (32 x 32) icon image. The file
-name is a relative path within the resource adapter's
-rar file.
-
-The image may be either in the JPEG or GIF format.
-The icon can be used by tools.
-
-Used in: icon
-
-Example:
-
-<large-icon>employee-service-icon32x32.jpg</large-icon>
--->
-<!ELEMENT large-icon (#PCDATA)>
-
-<!--
-The element license specifies licensing requirements for the resource
-adapter module. This element specifies whether a license is required
-to deploy and use this resource adapter, and an optional description
-of the licensing terms (examples: duration of license, number of
-connection restrictions).
-
-Used in: connector
--->
-<!ELEMENT license (description*, license-required)>
-
-<!--
-The element license-required specifies whether a license is required
-to deploy and use the resource adapter. This element must be one of
-the following:
-
- <license-required>true</license-required>
- <license-required>false</license-required>
-
-Used in: license
--->
-<!ELEMENT license-required (#PCDATA)>
-
-<!--
-The element managedconnectionfactory-class specifies the fully qualified
-name of the Java class that implements the javax.resource.spi.Managed-
-ConnectionFactory interface. This Java class is provided as part of
-resource adapter's implementation of connector architecture specified
-contracts. The implementation of this class is required to be a JavaBean.
-
-Used in: connection-definition
-
-Example:
- <managedconnectionfactory-class>com.wombat.ManagedConnectionFactoryImpl
- </managedconnectionfactory-class>
--->
-<!ELEMENT managedconnectionfactory-class (#PCDATA)>
-
-<!--
-The element messageadapter specifies information about the messaging
-capabilities of the resource adapter. This contains information specific
-to the implementation of the resource adapter library as specified through
-the messagelistener element.
-
-Used in: inbound-resourceadapter
--->
-<!ELEMENT messageadapter (messagelistener+)>
-
-<!--
-The element messagelistener specifies information about a specific message
-listener type supported by the messaging resource adapter. This contains
-information on the Java type of the message listener interface and an
-activation specification.
-
-Used in: messageadapter
--->
-<!ELEMENT messagelistener (messagelistener-type, activationspec)>
-
-<!--
-The element messagelistener-type specifies the fully qualified
-name of the Java type of a message listener interface.
-
-Used in: messagelistener
-
-Example:
- <messagelistener-type>javax.jms.MessageListener
- </messagelistener-type>
--->
-<!ELEMENT messagelistener-type (#PCDATA)>
-
-<!--
-The element outbound-resourceadapter specifies information about an outbound
-resource adapter. The information includes fully qualified names of
-classes/interfaces required as part of the connector architecture specified
-contracts for connection management, level of transaction support provided,
-one or more authentication mechanisms supported and additional
-required security permissions.
-
-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.
-
-Used in: resourceadapter
--->
-<!ELEMENT outbound-resourceadapter (
-connection-definition+, transaction-support,
-authentication-mechanism*, reauthentication-support)>
-
-<!--
-The element reauthentication-support specifies whether the resource
-adapter implementation supports re-authentication of existing Managed-
-Connection instance. Note that this information is for the resource
-adapter implementation and not for the underlying EIS instance.
-
-This element must be one of the following:
- <reauthentication-support>true</reauthentication-support>
- <reauthentication-support>false</reauthentication-support>
-Used in: outbound-resourceadapter
--->
-<!ELEMENT reauthentication-support (#PCDATA)>
-
-<!--
-The element required-config-property contains a declaration of a single
-configuration property used for specifying a required configuration
-property name.
-
-Used in: activationspec
-
-Example: <required-config-property>Destination
- </required-config-property>
--->
-<!ELEMENT required-config-property (description*, config-property-name)>
-
-<!--
-The element resourceadapter specifies information about the resource
-adapter. The information includes fully qualified resource adapter Java
-class name, configuration properties, information specific
-to the implementation of the resource adapter library as specified
-through the outbound-resourceadapter and inbound-resourceadapter elements,
-and an optional set of administered objects.
-
-Used in: connector
--->
-<!ELEMENT resourceadapter (resourceadapter-class?, config-property*,
-outbound-resourceadapter?, inbound-resourceadapter?, adminobject*, security-permission*)>
-
-<!--
-The element resourceadapter-class specifies the fully qualified
-name of a Java class that implements the javax.resource.spi.ResourceAdapter
-interface. This Java class is provided as part of
-resource adapter's implementation of connector architecture specified
-contracts. The implementation of this class is required to be a JavaBean.
-
-Used in: resourceadapter
-
-Example:
- <resourceadapter-class>com.wombat.ResourceAdapterImpl
- </resourceadapter-class>
--->
-<!ELEMENT resourceadapter-class (#PCDATA)>
-
-<!--
-The element security permission specifies a security permission that
-is required by the resource adapter code.
-
-The security permission listed in the deployment descriptor are ones
-that are different from those required by the default permission set
-as specified in the connector specification. The optional description
-can mention specific reason that resource adapter requires a given
-security permission.
-
-Used in: outbound-resourceadapter
--->
-<!ELEMENT security-permission (description*, security-permission-spec)>
-
-<!--
-The element permission-spec specifies a security permission based
-on the Security policy file syntax. Refer to the following URL for
-Sun's implementation of the security permission specification:
-
-http://java.sun.com/products/jdk/1.4/docs/guide/security/PolicyFiles.html#FileSyntax
-
-Used in: security-permission
--->
-<!ELEMENT security-permission-spec (#PCDATA)>
-
-<!--
-The small-icon element contains the name of a file
-containing a small (16 x 16) icon image. The file
-name is a relative path within the resource adapter's
-rar file.
-
-The image may be either in the JPEG or GIF format.
-The icon can be used by tools.
-
-Used in: icon
-
-Example:
-
-<small-icon>employee-service-icon16x16.jpg</small-icon>
--->
-<!ELEMENT small-icon (#PCDATA)>
-
-<!--
-The transaction-support element specifies the level of transaction
-support provided by the resource adapter.
-The value of transaction-support must be one of the following:
- <transaction-support>NoTransaction</transaction-support>
- <transaction-support>LocalTransaction</transaction-support>
- <transaction-support>XATransaction</transaction-support>
-
-Used in: outbound-resourceadapter
--->
-<!ELEMENT transaction-support (#PCDATA)>
-
-<!--
-The element vendor-name specifies the name of resource adapter provider
-vendor.
-
-Used in: connector
-
-Example:
- <vendor-name>Wombat Corp.</vendor-name>
--->
-<!ELEMENT vendor-name (#PCDATA)>
-
-<!--
-The element resourceadapter-version specifies a string-based version of the
-resource adapter from the resource adapter provider.
-
-Used in: connector
-
-Example:
- <resourceadapter-version>1.5</resourceadapter-version>
--->
-<!ELEMENT resourceadapter-version (#PCDATA)>
-
-<!--
-The ID mechanism is to allow tools that produce additional deployment
-information (i.e., information beyond the standard deployment
-descriptor information) to store the non-standard information in a
-separate file, and easily refer from these tool-specific files to the
-information in the standard deployment descriptor.
-
-Tools are not allowed to add the non-standard information into the
-standard deployment descriptor.
--->
-
-<!ATTLIST activationspec id ID #IMPLIED>
-<!ATTLIST activationspec-class id ID #IMPLIED>
-<!ATTLIST adminobject id ID #IMPLIED>
-<!ATTLIST adminobject-class id ID #IMPLIED>
-<!ATTLIST adminobject-interface id ID #IMPLIED>
-<!ATTLIST authentication-mechanism id ID #IMPLIED>
-<!ATTLIST authentication-mechanism-type id ID #IMPLIED>
-<!ATTLIST config-property id ID #IMPLIED>
-<!ATTLIST config-property-name id ID #IMPLIED>
-<!ATTLIST config-property-type id ID #IMPLIED>
-<!ATTLIST config-property-value id ID #IMPLIED>
-<!ATTLIST connection-definition id ID #IMPLIED>
-<!ATTLIST connection-impl-class id ID #IMPLIED>
-<!ATTLIST connection-interface id ID #IMPLIED>
-<!ATTLIST connectionfactory-impl-class id ID #IMPLIED>
-<!ATTLIST connectionfactory-interface id ID #IMPLIED>
-<!ATTLIST connector id ID #IMPLIED>
-<!ATTLIST credential-interface id ID #IMPLIED>
-<!ATTLIST description id ID #IMPLIED>
-<!ATTLIST display-name id ID #IMPLIED>
-<!ATTLIST eis-type id ID #IMPLIED>
-<!ATTLIST icon id ID #IMPLIED>
-<!ATTLIST inbound-resourceadapter id ID #IMPLIED>
-<!ATTLIST large-icon id ID #IMPLIED>
-<!ATTLIST license id ID #IMPLIED>
-<!ATTLIST license-required id ID #IMPLIED>
-<!ATTLIST managedconnectionfactory-class id ID #IMPLIED>
-<!ATTLIST messageadapter id ID #IMPLIED>
-<!ATTLIST messagelistener id ID #IMPLIED>
-<!ATTLIST messagelistener-type id ID #IMPLIED>
-<!ATTLIST outbound-resourceadapter id ID #IMPLIED>
-<!ATTLIST reauthentication-support id ID #IMPLIED>
-<!ATTLIST required-config-property id ID #IMPLIED>
-<!ATTLIST resourceadapter id ID #IMPLIED>
-<!ATTLIST resourceadapter-class id ID #IMPLIED>
-<!ATTLIST security-permission id ID #IMPLIED>
-<!ATTLIST security-permission-spec id ID #IMPLIED>
-<!ATTLIST small-icon id ID #IMPLIED>
-<!ATTLIST spec-version id ID #IMPLIED>
-<!ATTLIST transaction-support id ID #IMPLIED>
-<!ATTLIST vendor-name id ID #IMPLIED>
-
-
Deleted: projects/jboss-jca/trunk/common/src/main/resources/dtd/connector_1_6.dtd
===================================================================
--- projects/jboss-jca/trunk/common/src/main/resources/dtd/connector_1_6.dtd 2010-08-11 14:28:09 UTC (rev 107537)
+++ projects/jboss-jca/trunk/common/src/main/resources/dtd/connector_1_6.dtd 2010-08-11 15:40:26 UTC (rev 107538)
@@ -1,732 +0,0 @@
-<!--
- DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
- Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
-
- The contents of this file are subject to the terms of either the GNU
- General Public License Version 2 only ("GPL") or the Common Development
- and Distribution License("CDDL") (collectively, the "License"). You
- may not use this file except in compliance with the License. You can obtain
- a copy of the License at https://glassfish.dev.java.net/public/CDDL+GPL.html
- or glassfish/bootstrap/legal/LICENSE.txt. See the License for the specific
- language governing permissions and limitations under the License.
-
- When distributing the software, include this License Header Notice in each
- file and include the License file at glassfish/bootstrap/legal/LICENSE.txt.
- Sun designates this particular file as subject to the "Classpath" exception
- as provided by Sun in the GPL Version 2 section of the License file that
- accompanied this code. If applicable, add the following below the License
- Header, with the fields enclosed by brackets [] replaced by your own
- identifying information: "Portions Copyrighted [year]
- [name of copyright owner]"
-
- Contributor(s):
-
- If you wish your version of this file to be governed by only the CDDL or
- only the GPL Version 2, indicate your decision by adding "[Contributor]
- elects to include this software in this distribution under the [CDDL or GPL
- Version 2] license." If you don't indicate a single choice of license, a
- recipient has the option to distribute your version of this file under
- either the CDDL, the GPL Version 2 or to extend the choice of license to
- its licensees as provided above. However, if you add GPL Version 2 code
- and therefore, elected the GPL Version 2 license, then the option applies
- only if the new code is made subject to such option by the copyright
- holder.
--->
-
-<!--
-This is the XML DTD for the Connector 1.6 deployment descriptor.
-All Connector 1.6 deployment descriptors must include a DOCTYPE
-of the following form:
-
- <!DOCTYPE connector PUBLIC
- "-//Sun Microsystems, Inc.//DTD Connector 1.6//EN"
- "http://java.sun.com/dtd/connector_1_6.dtd">
-
--->
-
-<!--
-The following conventions apply to all Java EE deployment descriptor
-elements unless indicated otherwise.
-
-- In elements that contain PCDATA, leading and trailing whitespace
- in the data may be ignored.
-
-- In elements whose value is an "enumerated type", the value is
- case sensitive.
-
-- In elements that specify a pathname to a file within the same
- JAR file, relative filenames (i.e., those not starting with "/")
- are considered relative to the root of the JAR file's namespace.
- Absolute filenames (i.e., those starting with "/") also specify
- names in the root of the JAR file's namespace. In general, relative
- names are preferred. The exception is .war files where absolute
- names are preferred for consistency with the servlet API.
--->
-
-
-<!--
-The connector element is the root element of the deployment descriptor
-for the resource adapter. This element includes general information - vendor
-name, version, specification version supported, icon - about the
-resource adapter module. It also includes information specific to the
-implementation of the resource adapter library as specified through
-the element resourceadapter.
--->
-<!ELEMENT connector (description*, display-name*, icon*, vendor-name,
-eis-type, resourceadapter-version, license?,
-resourceadapter, required-work-context*)>
-
-<!--
-The attribute version specifies the version of the connector
-architecture specification that is supported by this resource
-adapter. This information enables deployer to configure the resource
-adapter to support deployment and runtime requirements of the
-corresponding connector architecture specification.
-
-Used in: connector
--->
-<!ATTLIST connector version NMTOKEN #REQUIRED >
-<!ATTLIST connector metadata-complete CDATA #IMPLIED >
-<!--
-The element activationspec specifies an activation specification.
-The information includes fully qualified Java class name of an activation
-specification and a set of required configuration property names.
-
-Used in: messagelistener
--->
-<!ELEMENT activationspec (activationspec-class, required-config-property*,
-config-property*)>
-
-<!--
-The element activationspec-class specifies the fully qualified Java class
-name of the activation specification class. This class must implement the
-javax.resource.spi.ActivationSpec interface. The implementation
-of this class is required to be a JavaBean.
-
-Used in: activationspec
-
-Example: <activationspec-class>com.wombat.ActivationSpecImpl
- </activationspec-class>
--->
-<!ELEMENT activationspec-class (#PCDATA)>
-
-<!--
-The element adminobject specifies information about an administered object.
-Administered objects are specific to a messaging style or message provider.
-This contains information on the Java type of the interface implemented by
-an administered object, its Java class name, and configuration properties.
-
-Used in: resourceadapter
--->
-<!ELEMENT adminobject (adminobject-interface, adminobject-class,
-config-property*)>
-
-<!--
-The element adminobject-class specifies the fully qualified
-Java class name of an administered object.
-
-Used in: adminobject
-
-Example: <adminobject-class>com.wombat.DestinationImpl
- </adminobject-class>
--->
-<!ELEMENT adminobject-class (#PCDATA)>
-
-<!--
-The element adminobject-interface specifies the fully qualified name of the
-Java type of the interface implemented by an administered object.
-
-Used in: adminobject
-
-Example: <adminobject-interface>javax.jms.Destination
- </adminobject-interface>
--->
-<!ELEMENT adminobject-interface (#PCDATA)>
-
-<!--
-The element authentication-mechanism specifies an authentication mechanism
-supported by the resource adapter. Note that this support is for
-the resource adapter and not for the underlying EIS instance. The
-optional description specifies any resource adapter specific requirement
-for the support of security contract and authentication mechanism.
-
-Note that BasicPassword mechanism type should support the
-javax.resource.spi.security.PasswordCredential interface.
-The Kerbv5 mechanism type should support the
-org.ietf.jgss.GSSCredential interface or the deprecated
-javax.resource.spi.security.GenericCredential interface.
-
-Used in: outbound-resourceadapter
--->
-<!ELEMENT authentication-mechanism (
-description*, authentication-mechanism-type, credential-interface)>
-
-<!--
-The element authentication-mechanism-type specifies type of an authentication
-mechanism.
-
-The example values are:
- <authentication-mechanism-type>BasicPassword
- </authentication-mechanism-type>
- <authentication-mechanism-type>Kerbv5
- </authentication-mechanism-type>
-
-Any additional security mechanisms are outside the scope of the
-Connector architecture specification.
-
-Used in: authentication-mechanism
--->
-<!ELEMENT authentication-mechanism-type (#PCDATA)>
-
-<!--
-The element config-property contains a declaration of a single
-configuration property that may be used for providing configuration
-information.
-
-The declaration consists of an optional description, name, type
-and an optional value of the configuration property. If the resource
-adapter provider does not specify a value than the deployer is
-responsible for providing a valid value for a configuration property.
-
-Any bounds or well-defined values of properties should be described
-in the description element.
-
-Used in: activationspec, adminobject, connection-definition, resourceadapter
--->
-<!ELEMENT config-property (description*, config-property-name,
-config-property-type, config-property-value?, config-property-ignore?)>
-
-<!--
-The element config-property-name contains the name of a configuration
-property.
-
-The connector architecture defines a set of well-defined properties
-all of type java.lang.String. These are as follows:
- <config-property-name>ServerName</config-property-name>
- <config-property-name>PortNumber</config-property-name>
- <config-property-name>UserName</config-property-name>
- <config-property-name>Password</config-property-name>
- <config-property-name>ConnectionURL</config-property-name>
-
-A resource adapter provider can extend this property set to include
-properties specific to the resource adapter and its underlying EIS.
-
-Used in: config-property, required-config-property
-
-Example: <config-property-name>ServerName</config-property-name>
--->
-<!ELEMENT config-property-name (#PCDATA)>
-
-<!--
-The element config-property-type contains the fully qualified Java
-type of a configuration property.
-
-The following are the legal values of config-property-type:
- java.lang.Boolean, java.lang.String, java.lang.Integer,
- java.lang.Double, java.lang.Byte, java.lang.Short,
- java.lang.Long, java.lang.Float, java.lang.Character
-
-Used in: config-property
-
-Example: <config-property-type>java.lang.String</config-property-type>
--->
-<!ELEMENT config-property-type (#PCDATA)>
-
-<!--
-The element config-property-value contains the value of a configuration
-entry. Note, it is possible for a resource adapter deployer to
-override this configuration information during deployment.
-
-Used in: config-property
-
-Example: <config-property-value>WombatServer</config-property-value>
--->
-<!ELEMENT config-property-value (#PCDATA)>
-
-<!--
-The element ignore is used to specify whether the configuration tools must
-ignore considering the configuration property during auto-discovery of
-Configuration properties.
-
-This element, if specified, must be one of the following:
- <config-property-ignore>true</config-property-ignore>
- <config-property-ignore>false</config-property-ignore>
-
-Used in: config-property
-
--->
-<!ELEMENT config-property-ignore (#PCDATA)>
-
-<!--
-The element connection-definition defines a set of connection interfaces and
-classes pertaining to a particular connection type. This also includes
-configurable properties for ManagedConnectionFactory instances that may be
-produced out of this set.
-
-Used in: outbound-resourceadapter
--->
-<!ELEMENT connection-definition (
-managedconnectionfactory-class, config-property*,
-connectionfactory-interface, connectionfactory-impl-class,
-connection-interface, connection-impl-class)>
-
-<!--
-The element connection-impl-class specifies the fully qualified
-name of the Connection class that implements resource adapter
-specific Connection interface.
-
-Used in: connection-definition
-
-Example: <connection-impl-class>com.wombat.ConnectionImpl
- </connection-impl-class>
--->
-<!ELEMENT connection-impl-class (#PCDATA)>
-
-<!--
-The element connection-interface specifies the fully qualified
-name of the Connection interface supported by the resource
-adapter.
-
-Used in: connection-definition
-
-Example: <connection-interface>javax.resource.cci.Connection
- </connection-interface>
--->
-<!ELEMENT connection-interface (#PCDATA)>
-
-<!--
-The element connectionfactory-impl-class specifies the fully qualified
-name of the ConnectionFactory class that implements resource adapter
-specific ConnectionFactory interface.
-
-Used in: connection-definition
-
-Example: <connectionfactory-impl-class>com.wombat.ConnectionFactoryImpl
- </connectionfactory-impl-class>
--->
-<!ELEMENT connectionfactory-impl-class (#PCDATA)>
-
-<!--
-The element connectionfactory-interface specifies the fully qualified
-name of the ConnectionFactory interface supported by the resource
-adapter.
-
-Used in: connection-definition
-
-Example: <connectionfactory-interface>com.wombat.ConnectionFactory
- </connectionfactory-interface>
-OR
-<connectionfactory-interface>javax.resource.cci.ConnectionFactory
- </connectionfactory-interface>
--->
-<!ELEMENT connectionfactory-interface (#PCDATA)>
-
-<!--
-The element credential-interface specifies the interface that the
-resource adapter implementation supports for the representation
-of the credentials. This element should be used by application server
-to find out the Credential interface it should use as part of the
-security contract.
-
-The possible values are:
- <credential-interface>javax.resource.spi.security.PasswordCredential
- </credential-interface>
- <credential-interface>org.ietf.jgss.GSSCredential
- </credential-interface>
- <credential-interface>javax.resource.spi.security.GenericCredential
- </credential-interface>
-
-Used in: authentication-mechanism
--->
-<!ELEMENT credential-interface (#PCDATA)>
-
-<!--
-The description element is used to provide text describing the parent
-element. The description element should include any information that
-the resource adapter rar file producer wants to provide to the consumer of
-the resource adapter rar file (i.e., to the Deployer). Typically, the tools
-used by the resource adapter rar file consumer will display the description
-when processing the parent element that contains the description.
-
-Used in: authentication-mechanism, config-property, connector, license,
-required-config-property, security-permission
--->
-<!ELEMENT description (#PCDATA)>
-<!ATTLIST description xml:lang NMTOKEN #IMPLIED >
-
-<!--
-The display-name element contains a short name that is intended to be
-displayed by tools. The display name need not be unique.
-
-Used in: connector
-
-Example:
-
-<display-name>Employee Self Service</display-name>
--->
-<!ELEMENT display-name (#PCDATA)>
-<!ATTLIST display-name xml:lang NMTOKEN #IMPLIED >
-
-<!--
-The element eis-type contains information about the type of the
-EIS. For example, the type of an EIS can be product name of EIS
-independent of any version info.
-
-This helps in identifying EIS instances that can be used with
-this resource adapter.
-
-Used in: connector
--->
-<!ELEMENT eis-type (#PCDATA)>
-
-<!--
-The icon element contains small-icon and large-icon elements that
-specify the file names for small and a large GIF or JPEG icon images
-used to represent the parent element in a GUI tool.
-
-Used in: connector
--->
-<!ELEMENT icon (small-icon?, large-icon?)>
-<!ATTLIST icon xml:lang NMTOKEN #IMPLIED >
-
-<!--
-The element inbound-resourceadapter specifies information about an inbound
-resource adapter. This contains information specific to the implementation
-of the resource adapter library as specified through the messageadapter
-element.
-
-Used in: resourceadapter
--->
-<!ELEMENT inbound-resourceadapter (messageadapter?)>
-
-<!--
-The large-icon element contains the name of a file
-containing a large (32 x 32) icon image. The file
-name is a relative path within the resource adapter's
-rar file.
-
-The image may be either in the JPEG or GIF format.
-The icon can be used by tools.
-
-Used in: icon
-
-Example:
-
-<large-icon>employee-service-icon32x32.jpg</large-icon>
--->
-<!ELEMENT large-icon (#PCDATA)>
-
-<!--
-The element license specifies licensing requirements for the resource
-adapter module. This element specifies whether a license is required
-to deploy and use this resource adapter, and an optional description
-of the licensing terms (examples: duration of license, number of
-connection restrictions).
-
-Used in: connector
--->
-<!ELEMENT license (description*, license-required)>
-
-<!--
-The element license-required specifies whether a license is required
-to deploy and use the resource adapter. This element must be one of
-the following:
-
- <license-required>true</license-required>
- <license-required>false</license-required>
-
-Used in: license
--->
-<!ELEMENT license-required (#PCDATA)>
-
-<!--
-The element managedconnectionfactory-class specifies the fully qualified
-name of the Java class that implements the javax.resource.spi.Managed-
-ConnectionFactory interface. This Java class is provided as part of
-resource adapter's implementation of connector architecture specified
-contracts. The implementation of this class is required to be a JavaBean.
-
-Used in: connection-definition
-
-Example:
- <managedconnectionfactory-class>com.wombat.ManagedConnectionFactoryImpl
- </managedconnectionfactory-class>
--->
-<!ELEMENT managedconnectionfactory-class (#PCDATA)>
-
-<!--
-The element messageadapter specifies information about the messaging
-capabilities of the resource adapter. This contains information specific
-to the implementation of the resource adapter library as specified through
-the messagelistener element.
-
-Used in: inbound-resourceadapter
--->
-<!ELEMENT messageadapter (messagelistener+)>
-
-<!--
-The element messagelistener specifies information about a specific message
-listener type supported by the messaging resource adapter. This contains
-information on the Java type of the message listener interface and an
-activation specification.
-
-Used in: messageadapter
--->
-<!ELEMENT messagelistener (messagelistener-type, activationspec)>
-
-<!--
-The element messagelistener-type specifies the fully qualified
-name of the Java type of a message listener interface.
-
-Used in: messagelistener
-
-Example:
- <messagelistener-type>javax.jms.MessageListener
- </messagelistener-type>
--->
-<!ELEMENT messagelistener-type (#PCDATA)>
-
-<!--
- The metadata-complete element defines whether the deployment
- descriptor for the resource adapter module is complete, or whether
- the class files available to the module and packaged with the resource
- adapter should be examined for annotations that specify deployment
- information.
-
- If metadata-complete is set to "true", the deployment tool of the
- application server must ignore any annotations that specify deployment
- information, which might be present in the class files of the
- application.If metadata-complete is not specified or is set to "false",
- the deployment tool must examine the class files of the application for
- annotations, as specified by this specification. If the
- deployment descriptor is not included or is included but not marked
- metadata-complete, the deployment tool will process annotations.
-
- Application servers must assume that metadata-complete is true for
- resource adapter modules with deployment descriptor version
- lower than 1.6.This element must be one of the following:
- <metadata-complete>true</metadata-complete>
- <metadata-complete>false</metadata-complete>
-
-Used in: connector
--->
-<!ELEMENT metadata-complete (#PCDATA)>
-
-<!--
-The element outbound-resourceadapter specifies information about an outbound
-resource adapter. The information includes fully qualified names of
-classes/interfaces required as part of the connector architecture specified
-contracts for connection management, level of transaction support provided,
-one or more authentication mechanisms supported and additional
-required security permissions.
-
-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.
-
-Used in: resourceadapter
--->
-<!ELEMENT outbound-resourceadapter (
-connection-definition+, transaction-support,
-authentication-mechanism*, reauthentication-support)>
-
-<!--
-The element reauthentication-support specifies whether the resource
-adapter implementation supports re-authentication of existing Managed-
-Connection instance. Note that this information is for the resource
-adapter implementation and not for the underlying EIS instance.
-
-This element must be one of the following:
- <reauthentication-support>true</reauthentication-support>
- <reauthentication-support>false</reauthentication-support>
-Used in: outbound-resourceadapter
--->
-<!ELEMENT reauthentication-support (#PCDATA)>
-
-<!--
-The element required-config-property contains a declaration of a single
-configuration property used for specifying a required configuration
-property name.
-
-Usage of required-config-property is deprecated since the Connectors 1.6
-specification. The resource adapter implementation is recommended to use
-the @NotNull Bean Validation annotation or its XML validation descriptor
-equivalent to indicate that a configuration property is required to be
-specified by the deployer. See the Connectors specification for more
-information.
-
-Used in: activationspec
-
-Example: <required-config-property>Destination
- </required-config-property>
--->
-<!ELEMENT required-config-property (description*, config-property-name)>
-
-<!--
-The element resourceadapter specifies information about the resource
-adapter. The information includes fully qualified resource adapter Java
-class name, configuration properties, information specific
-to the implementation of the resource adapter library as specified
-through the outbound-resourceadapter and inbound-resourceadapter elements,
-and an optional set of administered objects.
-
-Used in: connector
--->
-<!ELEMENT resourceadapter (resourceadapter-class?, config-property*,
-outbound-resourceadapter?, inbound-resourceadapter?, adminobject*, security-permission*)>
-
-<!--
-The element resourceadapter-class specifies the fully qualified
-name of a Java class that implements the javax.resource.spi.ResourceAdapter
-interface. This Java class is provided as part of
-resource adapter's implementation of connector architecture specified
-contracts. The implementation of this class is required to be a JavaBean.
-
-Used in: resourceadapter
-
-Example:
- <resourceadapter-class>com.wombat.ResourceAdapterImpl
- </resourceadapter-class>
--->
-<!ELEMENT resourceadapter-class (#PCDATA)>
-
-<!--
-The element security permission specifies a security permission that
-is required by the resource adapter code.
-
-The security permission listed in the deployment descriptor are ones
-that are different from those required by the default permission set
-as specified in the connector specification. The optional description
-can mention specific reason that resource adapter requires a given
-security permission.
-
-Used in: outbound-resourceadapter
--->
-<!ELEMENT security-permission (description*, security-permission-spec)>
-
-<!--
-The element permission-spec specifies a security permission based
-on the Security policy file syntax. Refer to the following URL for
-Sun's implementation of the security permission specification:
-
-http://java.sun.com/products/jdk/1.4/docs/guide/security/PolicyFiles.html#FileSyntax
-
-Used in: security-permission
--->
-<!ELEMENT security-permission-spec (#PCDATA)>
-
-<!--
-The small-icon element contains the name of a file
-containing a small (16 x 16) icon image. The file
-name is a relative path within the resource adapter's
-rar file.
-
-The image may be either in the JPEG or GIF format.
-The icon can be used by tools.
-
-Used in: icon
-
-Example:
-
-<small-icon>employee-service-icon16x16.jpg</small-icon>
--->
-<!ELEMENT small-icon (#PCDATA)>
-
-<!--
-The transaction-support element specifies the level of transaction
-support provided by the resource adapter.
-The value of transaction-support must be one of the following:
- <transaction-support>NoTransaction</transaction-support>
- <transaction-support>LocalTransaction</transaction-support>
- <transaction-support>XATransaction</transaction-support>
-
-Used in: outbound-resourceadapter
--->
-<!ELEMENT transaction-support (#PCDATA)>
-
-<!--
-The element vendor-name specifies the name of resource adapter provider
-vendor.
-
-Used in: connector
-
-Example:
- <vendor-name>Wombat Corp.</vendor-name>
--->
-<!ELEMENT vendor-name (#PCDATA)>
-
-<!--
-The element resourceadapter-version specifies a string-based version of the
-resource adapter from the resource adapter provider.
-
-Used in: connector
-
-Example:
- <resourceadapter-version>1.5</resourceadapter-version>
--->
-<!ELEMENT resourceadapter-version (#PCDATA)>
-
-<!--
-The element required-work-context specifies a comma-separated
-list of fully qualified class names that implements the WorkContext
-interface that a resource adapter requires the application server to support.
-
-Used in: connector
--->
-<!ELEMENT required-work-context (#PCDATA)>
-
-<!--
-The ID mechanism is to allow tools that produce additional deployment
-information (i.e., information beyond the standard deployment
-descriptor information) to store the non-standard information in a
-separate file, and easily refer from these tool-specific files to the
-information in the standard deployment descriptor.
-
-Tools are not allowed to add the non-standard information into the
-standard deployment descriptor.
--->
-
-<!ATTLIST activationspec id ID #IMPLIED>
-<!ATTLIST activationspec-class id ID #IMPLIED>
-<!ATTLIST adminobject id ID #IMPLIED>
-<!ATTLIST adminobject-class id ID #IMPLIED>
-<!ATTLIST adminobject-interface id ID #IMPLIED>
-<!ATTLIST authentication-mechanism id ID #IMPLIED>
-<!ATTLIST authentication-mechanism-type id ID #IMPLIED>
-<!ATTLIST config-property id ID #IMPLIED>
-<!ATTLIST config-property-name id ID #IMPLIED>
-<!ATTLIST config-property-type id ID #IMPLIED>
-<!ATTLIST config-property-value id ID #IMPLIED>
-<!ATTLIST connection-definition id ID #IMPLIED>
-<!ATTLIST connection-impl-class id ID #IMPLIED>
-<!ATTLIST connection-interface id ID #IMPLIED>
-<!ATTLIST connectionfactory-impl-class id ID #IMPLIED>
-<!ATTLIST connectionfactory-interface id ID #IMPLIED>
-<!ATTLIST connector id ID #IMPLIED>
-<!ATTLIST credential-interface id ID #IMPLIED>
-<!ATTLIST description id ID #IMPLIED>
-<!ATTLIST display-name id ID #IMPLIED>
-<!ATTLIST eis-type id ID #IMPLIED>
-<!ATTLIST icon id ID #IMPLIED>
-<!ATTLIST inbound-resourceadapter id ID #IMPLIED>
-<!ATTLIST large-icon id ID #IMPLIED>
-<!ATTLIST license id ID #IMPLIED>
-<!ATTLIST license-required id ID #IMPLIED>
-<!ATTLIST managedconnectionfactory-class id ID #IMPLIED>
-<!ATTLIST messageadapter id ID #IMPLIED>
-<!ATTLIST messagelistener id ID #IMPLIED>
-<!ATTLIST messagelistener-type id ID #IMPLIED>
-<!ATTLIST outbound-resourceadapter id ID #IMPLIED>
-<!ATTLIST reauthentication-support id ID #IMPLIED>
-<!ATTLIST required-config-property id ID #IMPLIED>
-<!ATTLIST resourceadapter id ID #IMPLIED>
-<!ATTLIST resourceadapter-class id ID #IMPLIED>
-<!ATTLIST security-permission id ID #IMPLIED>
-<!ATTLIST security-permission-spec id ID #IMPLIED>
-<!ATTLIST small-icon id ID #IMPLIED>
-<!ATTLIST spec-version id ID #IMPLIED>
-<!ATTLIST transaction-support id ID #IMPLIED>
-<!ATTLIST vendor-name id ID #IMPLIED>
Deleted: projects/jboss-jca/trunk/common/src/main/resources/dtd/jboss-ds_5_0.dtd
===================================================================
--- projects/jboss-jca/trunk/common/src/main/resources/dtd/jboss-ds_5_0.dtd 2010-08-11 14:28:09 UTC (rev 107537)
+++ projects/jboss-jca/trunk/common/src/main/resources/dtd/jboss-ds_5_0.dtd 2010-08-11 15:40:26 UTC (rev 107538)
@@ -1,511 +0,0 @@
-<?xml version='1.0' encoding='UTF-8' ?>
-
-<!-- DTD for the JCA 1.5 datasources and connection factory configurations (*-ds.xml) in JBoss-5.0.x,
- transformed by ConnectionFactoryTemplate.xsl
-
-DOCTYPE datasources
- PUBLIC "-//JBoss//DTD JBOSS JCA Config 5.0//EN"
- "http://www.jboss.org/j2ee/dtd/jboss-ds_5_0.dtd"
-
-DOCTYPE connection-factories
- PUBLIC "-//JBoss//DTD JBOSS JCA Config 5.0//EN"
- "http://www.jboss.org/j2ee/dtd/jboss-ds_5_0.dtd"
-
-$Id: jboss-ds_5_0.dtd 76316 2008-07-28 17:24:52Z adrian at jboss.org $
--->
-
-<!--
-The datasources element is the root of the jdbc datasource configuration
--->
-<!ELEMENT datasources (loader-repository? , (mbean | local-tx-datasource | xa-datasource | no-tx-datasource |
- ha-local-tx-datasource | ha-xa-datasource)*)>
-
-<!-- Specify a jca-jdbc non-XADatasource (local) wrapper, using no transactions
--->
-<!ELEMENT no-tx-datasource (jndi-name , use-java-context?, connection-url ,
-url-delimiter?, url-selector-strategy-class-name?,
-driver-class , connection-property* , user-name? , password? ,
-(application-managed-security | security-domain | security-domain-and-application)? ,
-min-pool-size? , max-pool-size? , blocking-timeout-millis? , background-validation?, background-validation-millis? , idle-timeout-minutes?,
-allocation-retry?, allocation-retry-wait-millis?, validate-on-match?, new-connection-sql?, check-valid-connection-sql?, valid-connection-checker-class-name?,
-exception-sorter-class-name?, stale-connection-checker-class-name?, track-statements?,
-prefill?, use-fast-fail?,
-prepared-statement-cache-size?, share-prepared-statements? , set-tx-query-timeout?, query-timeout?, use-try-lock?,
-metadata?, type-mapping?, depends*)>
-
-<!-- Specify a jca-jdbc non-XADatasource (local) wrapper, using local
-transactions
--->
-<!ELEMENT local-tx-datasource (jndi-name , use-java-context?, connection-url ,
-url-delimiter?, url-selector-strategy-class-name?,
-driver-class, transaction-isolation? , connection-property* , user-name? , password? ,
-(application-managed-security | security-domain | security-domain-and-application)? ,
-min-pool-size? , max-pool-size? , blocking-timeout-millis? , background-validation?, background-validation-millis?,
-validate-on-match?, idle-timeout-minutes? , allocation-retry?, allocation-retry-wait-millis?,
-no-tx-separate-pools? , new-connection-sql? , check-valid-connection-sql? ,
-valid-connection-checker-class-name? , exception-sorter-class-name? , stale-connection-checker-class-name?, track-statements? ,
-prefill?, use-fast-fail?,
-prepared-statement-cache-size?, share-prepared-statements? , set-tx-query-timeout?, query-timeout?, use-try-lock?,
-metadata?, type-mapping?, depends*)>
-
-<!-- Specify a jca-jdbc XADatasource wrapper
--->
-<!ELEMENT xa-datasource (jndi-name , use-java-context?, track-connection-by-tx?, interleaving?, xa-datasource-class,
-xa-datasource-property* , url-property?, url-delimiter?, url-selector-strategy-class-name?,
-isSameRM-override-value? , transaction-isolation? , user-name? , password? ,
-(application-managed-security | security-domain | security-domain-and-application)? ,
-min-pool-size? , max-pool-size? , blocking-timeout-millis? , background-validation?, background-validation-millis? , idle-timeout-minutes? ,
-allocation-retry?, allocation-retry-wait-millis?, validate-on-match?, no-tx-separate-pools? , xa-resource-timeout?, new-connection-sql? , check-valid-connection-sql? ,
-valid-connection-checker-class-name? , exception-sorter-class-name? , stale-connection-checker-class-name?, track-statements? ,
-prefill?, use-fast-fail?,
-prepared-statement-cache-size?, share-prepared-statements? , set-tx-query-timeout?, query-timeout?, use-try-lock?,
-metadata?, type-mapping?, depends*)>
-
-<!-- The JNDI name under which the DataSource wrapper will be bound. Note that
-this name is relative to the "java:/" prefix unless use-java-context is false.
-Ex:
-<jndi-name>DefaultDS</jndi-name>
--->
-<!ELEMENT jndi-name (#PCDATA)>
-
-<!-- Setting this to false will bind the DataSource into global jndi
-Ex:
-<use-java-context>false</use-java-context>
--->
-<!ELEMENT use-java-context (#PCDATA)>
-
-<!-- The JDBC driver connection URL string
-Ex:
-<connection-url>jdbc:hsqldb:hsql://localhost:1701</connection-url>
--->
-<!ELEMENT connection-url (#PCDATA)>
-
-<!-- The fully qualifed name of the JDBC driver class
- Ex:
- <driver-class>org.hsqldb.jdbcDriver</driver-class>
--->
-<!ELEMENT driver-class (#PCDATA)>
-
-<!-- Set java.sql.Connection transaction isolation level to use.
-The constants defined in the interface Connection are the possible transaction
-isolation levels and include:
- TRANSACTION_READ_UNCOMMITTED
- TRANSACTION_READ_COMMITTED
- TRANSACTION_REPEATABLE_READ
- TRANSACTION_SERIALIZABLE
- TRANSACTION_NONE
-
- Ex:
- <transaction-isolation>TRANSACTION_SERIALIZABLE</transaction-isoation>
--->
-<!ELEMENT transaction-isolation (#PCDATA)>
-
-<!-- Specify the default username used when creating a new connection.
- Ex:
- <user-name>sa</user-name>
--->
-<!ELEMENT user-name (#PCDATA)>
-
-<!-- Specify the default password used when creating a new connection.
- Ex:
- <password>sa-pass</password>
--->
-<!ELEMENT password (#PCDATA)>
-
-<!-- Indicates that app supplied parameters (such as from getConnection(user, pw))
-are used to distinguish connections in the pool.
- Ex:
- <application-managed-security/>
--->
-<!ELEMENT application-managed-security EMPTY>
-
-<!-- Indicates Subject (from security domain) are used to distinguish connections in the pool.
-The content of the security-domain is the name of the JAAS security manager that will handle
-authentication. This name correlates to the JAAS login-config.xml descriptor
-application-policy/name attribute.
-
- Ex:
- <security-domain>HsqlDbRealm</security-domain>
--->
-<!ELEMENT security-domain (#PCDATA)>
-
-<!-- Indicates that either app supplied parameters (such as from
-getConnection(user, pw)) or Subject (from security domain) are used to
-distinguish connections in the pool. The content of the
-security-domain is the name of the JAAS security manager that will handle
-authentication. This name correlates to the JAAS login-config.xml descriptor
-application-policy/name attribute.
-
- Ex:
- <security-domain-and-application>HsqlDbRealm</security-domain-and-application>
--->
-<!ELEMENT security-domain-and-application (#PCDATA)>
-
-<!-- Whether to use separete pools for connection retrieved in a transaction
- and those retieved outside a transaction
-e.g.
- <no-tx-separate-pools/>
--->
-<!ELEMENT no-tx-separate-pools EMPTY>
-
-<!-- The min-pool-size element indicates the minimum number of connections a
-pool should hold. These are not created until a Subject is known from a
-request for a connection. This default to 0.
-
- Ex:
- <min-pool-size>1</min-pool-size>
--->
-<!ELEMENT min-pool-size (#PCDATA)>
-
-<!-- The max-pool-size element indicates the maximum number of connections for a
-pool. No more than MaxSize connections will be created in each sub-pool. This
-defaults to 20.
--->
-<!ELEMENT max-pool-size (#PCDATA)>
-
-<!-- The blocking-timeout-millis element indicates the maximum time in
-milliseconds to block while waiting for a connection before throwing an
-exception. Note that this blocks only while waiting for a permit for a
-connection, and will never throw an exception if creating a new connection
-takes an inordinately long time. The default is 30000 (30 seconds).
--->
-<!ELEMENT blocking-timeout-millis (#PCDATA)>
-
-<!-- The idle-timeout-minutes element indicates the maximum time in
-minutes a connection may be idle before being closed. The actual maximum time
-depends also on the IdleRemover scan time, which is 1/2 the smallest
-idle-timeout-minutes of any pool.
--->
-<!ELEMENT idle-timeout-minutes (#PCDATA)>
-
-<!-- The allocation retry element indicates the number of times that allocating
-a connection should be tried before throwing an exception. The default is 0.
--->
-<!ELEMENT allocation-retry (#PCDATA)>
-
-<!-- The allocation retry wait millis element indicates the time in
-milliseconds to wait between retrying to allocate a connection.
-The default is 5000 (5 seconds).
--->
-<!ELEMENT allocation-retry-wait-millis (#PCDATA)>
-
-<!-- The validate-on-match element indicates whether or not connection level validation should be done when a connection factory attempts to
-match a managed connection for a given set. This is typically exclusive to the use of background validation -->
-
-<!ELEMENT validate-on-match (#PCDATA)>
-
-<!-- An element to specify that connections should be validated on a background thread versus being validated
- prior to use-->
-<!ELEMENT background-validation (#PCDATA)>
-
-<!-- The background-validation-millis element specifies the amount of time, in milliseconds, that background validation
- will run. -->
-<!ELEMENT background-validation-millis (#PCDATA)>
-
-<!-- An element to specify that all intermediate end(suspend) and
-start(resume) calls. Also, all work on one tx will go through one
-connection.
-A side effect of this (currently at least) is that a connection will only
-be usable by one tx until the tx commits.
- Ex:
- <track-connection-by-tx/>
-DEPRECATED: this element is now deprecated (it is assumed to present by default, also see <interleaving/>)
--->
-<!ELEMENT track-connection-by-tx EMPTY>
-
-<!-- An element to enable interleaving for XA connection factories
- Ex:
- <interleaving/>
--->
-<!ELEMENT interleaving EMPTY>
-
-<!-- The fully qualifed name of the javax.sql.XADataSource implementation class.
- Ex:
- <xa-datasource-class>com.informix.jdbcx.IfxXADataSource</xa-datasource-class>
--->
-<!ELEMENT xa-datasource-class (#PCDATA)>
-
-<!-- Specify a property to assign to the XADataSource implementation class.
-Each property is identified by the name attribute and the property value is
-given by the xa-datasource-property element content. The property is mapped
-onto the XADataSource implementation by looking for a JavaBeans style
-getter method for the property name. If found, the value of the property is
-set using the JavaBeans setter with the element text translated to the true
-property type using the java.beans.PropertyEditor for the type.
-
- Ex:
- <xa-datasource-property name="IfxWAITTIME">10</xa-datasource-property>
- <xa-datasource-property name="IfxIFXHOST">myhost.mydomain.com</xa-datasource-property>
- <xa-datasource-property name="PortNumber">1557</xa-datasource-property>
- <xa-datasource-property name="DatabaseName">mydb</xa-datasource-property>
- <xa-datasource-property name="ServerName">myserver</xa-datasource-property>
--->
-<!ELEMENT xa-datasource-property (#PCDATA)>
-
-<!-- The xa-datasource-property name attribute specifies the name of the
-XADataSource attribute the xa-datasource-property element content provides
-the value of.
--->
-<!ATTLIST xa-datasource-property name CDATA #REQUIRED>
-
-<!-- The isSameRM-override-value element allows one to unconditionally set
-whether the javax.transaction.xa.XAResource.isSameRM(XAResource) returns
-true or false.
-
-Ex:
-<isSameRM-override-value>true</isSameRM-override-value>
--->
-<!ELEMENT isSameRM-override-value (#PCDATA)>
-
-<!-- The connection-property element allows you to pass in arbitrary connection
-properties to the Driver.connect(url, props) method. Each connection-property
-specifies a string name/value pair with the property name coming from the
-name attribute and the value coming from the element content.
-
- Ex:
- <connection-property name="char.encoding">UTF-8</connection-property>
--->
-<!ELEMENT connection-property (#PCDATA)>
-
-<!-- The connection-property name attribute gives the name of the connection
-property.
--->
-<!ATTLIST connection-property name CDATA #REQUIRED>
-
-<!-- Specify an SQL statement to execute whenever a connection is added to
-the connection pool.
--->
-<!ELEMENT new-connection-sql (#PCDATA)>
-
-<!-- Specify an SQL statement to check validity of a pool connection. This
-may be called when managed connection is taken from pool for use.
--->
-<!ELEMENT check-valid-connection-sql (#PCDATA)>
-
-<!-- An org.jboss.resource.adapter.jdbc.ValidConnectionChecker that provides
-a SQLException isValidConnection(Connection e) method to validate is a connection
-is valid. An exception means the connection is destroyed.
-This overrides the check-valid-connection-sql when present.
-
-Ex:
-<exception-sorter-class-name>
- org.jboss.resource.adapter.jdbc.vendor.OracleValidConnectionChecker
-</exception-sorter-class-name>
--->
-<!ELEMENT valid-connection-checker-class-name (#PCDATA)>
-
-<!-- An org.jboss.resource.adapter.jdbc.ExceptionSorter that provides
-a boolean isExceptionFatal(SQLException e) method to validate is an exception
-should be broadcast to all javax.resource.spi.ConnectionEventListener as
-a connectionErrorOccurred message.
-
-Ex:
-<exception-sorter-class-name>
- org.jboss.resource.adapter.jdbc.vendor.OracleExceptionSorter
-</exception-sorter-class-name>
-<exception-sorter-class-name>
- org.jboss.resource.adapter.jdbc.vendor.SybaseExceptionSorter
-</exception-sorter-class-name>
--->
-<!ELEMENT exception-sorter-class-name (#PCDATA)>
-
-<!-- An org.jboss.resource.adapter.jdbc.StaleConnectionChecker that provides
-a boolean isStaleConnection(SQLException e) method which if it it returns
-true will wrap the exception in an
-org.jboss.resource.adapter.jdbc.StaleConnectionException
-which is a subclass of SQLException.
-
-Ex:
-<stale-connection-checker-class-name>
- org.jboss.resource.adapter.jdbc.vendor.OracleStaleConnectionChecker
-</stale-connection-checker-class-name>
--->
-<!ELEMENT stale-connection-checker-class-name (#PCDATA)>
-
-<!-- Whether to check for unclosed statements when a
- connection is returned to the pool and result sets are
- closed when a statement is closed/return to the prepared
- statement cache.
- valid values are:
- false - do not track statements and results
- true - track statements and result sets and warn when they are not closed
- nowarn - track statements but do no warn about them being unclosed (the default)
- e.g.
- <track-statements>nowarn</track-statements>
--->
-<!ELEMENT track-statements EMPTY>
-
-<!-- Whether to attempt to prefill the connection pool. Empty element denotes a false value.
- e.g.
- <prefill>true</prefill>
- -->
-<!ELEMENT prefill (#PCDATA) >
-
-<!-- Whether fail a connection allocation on the first connection if it is invalid (true)
- or keep trying until the pool is exhausted of all potential connections (false)
-
- default false.
- e.g.
- <use-fast-fail>true</use-fast-fail>
- -->
-<!ELEMENT use-fast-fail (#PCDATA) >
-
-<!-- The number of prepared statements per connection in an LRU cache
--->
-<!ELEMENT prepared-statement-cache-size (#PCDATA)>
-
-<!-- whether to share prepare statements, i.e. whether asking for same
- statement twice without closing uses the same underlying prepared statement.
-
- The default is false.
- e.g.
- <share-prepared-statements/>
--->
-<!ELEMENT share-prepared-statements EMPTY>
-
-<!-- whether to set the query timeout based on the time remaining until transaction timeout,
- any configured query timeout will be used if there is no transaction.
-
- The default is false.
- e.g.
- <set-tx-query-timeout/>
--->
-<!ELEMENT set-tx-query-timeout EMPTY>
-
-<!-- Any configured query timeout in seconds
-
- The default is no timeout
- e.g. 5 minutes
- <query-timeout>300</query-timeout>
--->
-<!ELEMENT query-timeout (#PCDATA)>
-
-<!-- Any configured timeout for internal locks on the resource adapter objects in milli-seconds
-
- The default is a 60 second timeout
- e.g. 5 minutes
- <use-try-lock>300000</use-try-lock>
--->
-<!ELEMENT use-try-lock (#PCDATA)>
-
-<!-- The depends element specifies the JMX ObjectName string of a service
-that the connection manager services depend on.
-
- Ex:
- <depends>jboss:service=Hypersonic</depends>
--->
-<!ELEMENT depends (#PCDATA)>
-
-<!-- The connection-factories element is the root of the generic jca adaptor section
--->
-<!ELEMENT connection-factories (loader-repository? , (mbean | tx-connection-factory | no-tx-connection-factory)*)>
-
-<!-- The loader repository -->
-<!ELEMENT loader-repository ANY>
-
-<!-- Any embedded mbean -->
-<!ELEMENT mbean ANY>
-
-<!-- The tx-connection-factory element is used to configure generic resource
-adapters supporting transactions
--->
-<!ELEMENT tx-connection-factory (jndi-name , (local-transaction | xa-transaction) ,
-track-connection-by-tx? , rar-name?, connection-definition?, config-property* ,
-(application-managed-security | security-domain | security-domain-and-application)? ,
-min-pool-size? , max-pool-size? , blocking-timeout-millis? , background-validation?, background-validation-millis? , idle-timeout-minutes? ,
-allocation-retry?, allocation-retry-wait-millis?, no-tx-separate-pools?, prefill?, use-fast-fail?, xa-resource-timeout?,
-metadata?, type-mapping?, depends*)>
-
-<!-- The no-tx-connection-factory element is used to configure generic resource
-adapters that do not support transactions
--->
-<!ELEMENT no-tx-connection-factory (jndi-name , rar-name?, connection-definition? , config-property* ,
-(application-managed-security | security-domain | security-domain-and-application)? ,
-min-pool-size? , max-pool-size? , blocking-timeout-millis? , background-validation?, background-validation-millis? , idle-timeout-minutes? ,
-allocation-retry?, allocation-retry-wait-millis?, prefill?, use-fast-fail?, metadata?, type-mapping?, depends*)>
-
-<!-- The rar deployment to associate with the connection manager mbean.
-e.g. jms-ra.rar or myapplication.ear#my.rar for nested rars
--->
-<!ELEMENT rar-name (#PCDATA)>
-
-<!-- The connection definition inside the rar deployment uniquely identified by the
-connection factory interface, e.g. javax.sql.DataSource
--->
-<!ELEMENT connection-definition (#PCDATA)>
-
-<!-- Passed to XAResource.setTransactionTimeout()
-
- Default is zero which does not invoke the setter
- e.g. 5 minutes
- <xa-resource-timeout>300</xa-resource-timeout>
--->
-<!ELEMENT xa-resource-timeout (#PCDATA)>
-
-<!-- The xa-transaction element is used to mark that the tx-connection-factory
-supports XA transactions.
--->
-<!ELEMENT xa-transaction EMPTY>
-
-<!-- The local-transaction element is used to mark that the tx-connection-factory
-supports local transactions.
--->
-<!ELEMENT local-transaction EMPTY>
-
-<!-- The config-property specifies a mannaged connection factory property.
--->
-<!ELEMENT config-property (#PCDATA)>
-
-<!-- The config-property name attribute gives the name of the connection
-factory property.
--->
-<!ATTLIST config-property name CDATA #REQUIRED>
-
-<!-- The config-property type attribute gives the name of the connection
-factory property.
--->
-<!ATTLIST config-property type CDATA #REQUIRED>
-
-<!-- The type mapping from conf/standardjboss.xml -->
-<!ELEMENT type-mapping (#PCDATA)>
-
-<!-- For backwards compatibility use type-mapping -->
-<!ELEMENT metadata (type-mapping)>
-
-<!--
-Use local-tx-datasource
--->
-<!ELEMENT ha-local-tx-datasource (jndi-name, use-java-context?, connection-url, url-delimiter,
-driver-class, transaction-isolation? , connection-property* , user-name? , password?,
-(application-managed-security | security-domain | security-domain-and-application)? ,
-min-pool-size? , max-pool-size? , blocking-timeout-millis? , idle-timeout-minutes? ,
-allocation-retry?, allocation-retry-wait-millis?, no-tx-separate-pools? , new-connection-sql? , check-valid-connection-sql? ,
-valid-connection-checker-class-name? , exception-sorter-class-name? , track-statements? ,
-prepared-statement-cache-size?, share-prepared-statements? , set-tx-query-timeout?, query-timeout?, use-try-lock?,
-metadata?, type-mapping?, depends*)>
-
-<!--
-Use xa-datasource
--->
-<!ELEMENT ha-xa-datasource (jndi-name , use-java-context?, track-connection-by-tx , xa-datasource-class ,
-xa-datasource-property* , url-property, url-delimiter, isSameRM-override-value? , transaction-isolation? ,
-user-name? , password? ,
-(application-managed-security | security-domain | security-domain-and-application)? ,
-min-pool-size? , max-pool-size? , blocking-timeout-millis? , idle-timeout-minutes? ,
-allocation-retry?, allocation-retry-wait-millis?, no-tx-separate-pools? , xa-resource-timeout? ,
-new-connection-sql? , check-valid-connection-sql? ,
-valid-connection-checker-class-name? , exception-sorter-class-name? , track-statements? ,
-prepared-statement-cache-size?, share-prepared-statements? , set-tx-query-timeout?, query-timeout?, use-try-lock?,
-type-mapping?, depends*)>
-
-<!-- Specifies the delimiter for URLs in connection-url for HA datasources
--->
-<!ELEMENT url-delimiter (#PCDATA)>
-
-<!-- A class that implements org.jboss.resource.adapter.jdbc.URLSelectorStrategy
--->
-<!ELEMENT url-selector-strategy-class-name (#PCDATA)>
-
-<!-- For HA XA datasources, specifies the name of an xa-datasource-property that contains a list of URLs
--->
-<!ELEMENT url-property (#PCDATA)>
Modified: projects/jboss-jca/trunk/common/src/main/resources/schema/datasources_1_0.xsd
===================================================================
--- projects/jboss-jca/trunk/common/src/main/resources/schema/datasources_1_0.xsd 2010-08-11 14:28:09 UTC (rev 107537)
+++ projects/jboss-jca/trunk/common/src/main/resources/schema/datasources_1_0.xsd 2010-08-11 15:40:26 UTC (rev 107538)
@@ -1,7 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
-
<xs:element name="datasources" type="datasourcesComplexType">
<xs:annotation>
<xs:documentation>
@@ -11,37 +9,30 @@
</xs:documentation>
</xs:annotation>
</xs:element>
-
-
-
<xs:complexType name="datasourcesComplexType">
- <xs:choice minOccurs="0" maxOccurs="unbounded">
- <xs:element name="datasource" type="datasourceComplexType">
- <xs:annotation>
- <xs:documentation>
+ <xs:choice minOccurs="0" maxOccurs="unbounded">
+ <xs:element name="datasource" type="datasourceComplexType">
+ <xs:annotation>
+ <xs:documentation>
<![CDATA[[
Specify a jca-jdbc non-XADatasource (local) wrapper, using local
transactions
]]>
- </xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="xa-datasource" type="xa-datasourceComplexType">
- <xs:annotation>
- <xs:documentation>
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="xa-datasource" type="xa-datasourceComplexType">
+ <xs:annotation>
+ <xs:documentation>
<![CDATA[[
Specify a jca-jdbc XADatasource wrapper
]]>
- </xs:documentation>
- </xs:annotation>
- </xs:element>
- </xs:choice>
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:choice>
</xs:complexType>
-
-
-
<xs:complexType name="datasourceComplexType" mixed="false">
-
<xs:sequence>
<xs:element name="min-pool-size" type="xs:nonNegativeInteger" minOccurs="0">
<xs:annotation>
@@ -65,7 +56,7 @@
</xs:documentation>
</xs:annotation>
</xs:element>
- <xs:element minOccurs="0" name="prefill" type="xs:boolean">
+ <xs:element name="prefill" type="xs:boolean" minOccurs="0">
<xs:annotation>
<xs:documentation>
<![CDATA[[
@@ -76,7 +67,7 @@
</xs:documentation>
</xs:annotation>
</xs:element>
- <xs:element minOccurs="0" name="user-name" type="xs:token">
+ <xs:element name="user-name" type="xs:token" minOccurs="0">
<xs:annotation>
<xs:documentation>
<![CDATA[[
@@ -86,7 +77,7 @@
</xs:documentation>
</xs:annotation>
</xs:element>
- <xs:element minOccurs="0" name="password" type="xs:token">
+ <xs:element name="password" type="xs:token" minOccurs="0">
<xs:annotation>
<xs:documentation>
<![CDATA[[
@@ -101,7 +92,7 @@
<![CDATA[[
The JDBC driver connection URL string Ex: <connection-url>jdbc:hsqldb:hsql://localhost:1701</connection-url>
]]>
- </xs:documentation>
+ </xs:documentation>
</xs:annotation>
</xs:element>
<xs:element name="driver-class" type="xs:token">
@@ -110,7 +101,7 @@
<![CDATA[[
The fully qualifed name of the JDBC driver class Ex: <driver-class>org.hsqldb.jdbcDriver</driver-class>
]]>
- </xs:documentation>
+ </xs:documentation>
</xs:annotation>
</xs:element>
<xs:element name="transaction-isolation" type="transaction-isolation-values" minOccurs="0">
@@ -122,11 +113,10 @@
levels and include: TRANSACTION_READ_UNCOMMITTED TRANSACTION_READ_COMMITTED
TRANSACTION_REPEATABLE_READ TRANSACTION_SERIALIZABLE TRANSACTION_NONE
]]>
- </xs:documentation>
+ </xs:documentation>
</xs:annotation>
</xs:element>
- <xs:element minOccurs="0" name="connection-property" type="connection-propertyComplexType"
- maxOccurs="unbounded">
+ <xs:element name="connection-property" type="connection-propertyComplexType" minOccurs="0" maxOccurs="unbounded">
<xs:annotation>
<xs:documentation>
<![CDATA[[
@@ -136,17 +126,16 @@
name attribute and the value coming from the element content. Ex: <connection-property
name="char.encoding">UTF-8</connection-property>
]]>
- </xs:documentation>
+ </xs:documentation>
</xs:annotation>
</xs:element>
- <xs:element name="time-out-settings" type="time-out-settings_type" minOccurs="0"/>
- <xs:element minOccurs="0" name="security-settings" type="security-settings_type"> </xs:element>
-
- <xs:element name="statement-settings" minOccurs="0" type="statement-settings_type">
+ <xs:element name="time-out-settings" type="time-out-settings_type" minOccurs="0" />
+ <xs:element name="security-settings" type="security-settings_type" minOccurs="0">
</xs:element>
-
- <xs:element name="validation-settings" type="validation-settings_type" minOccurs="0"/>
- <xs:element minOccurs="0" name="url-delimiter" type="xs:token">
+ <xs:element name="statement-settings" type="statement-settings_type" minOccurs="0">
+ </xs:element>
+ <xs:element name="validation-settings" type="validation-settings_type" minOccurs="0" />
+ <xs:element name="url-delimiter" type="xs:token" minOccurs="0">
<xs:annotation>
<xs:documentation>
<![CDATA[[
@@ -164,7 +153,7 @@
</xs:documentation>
</xs:annotation>
</xs:element>
- <xs:element minOccurs="0" name="new-connection-sql" type="xs:string">
+ <xs:element name="new-connection-sql" type="xs:string" minOccurs="0">
<xs:annotation>
<xs:documentation>
<![CDATA[[
@@ -175,10 +164,8 @@
</xs:annotation>
</xs:element>
</xs:sequence>
- <xs:attributeGroup ref="common-datasourceAttributes"/>
+ <xs:attributeGroup ref="common-datasourceAttributes" />
</xs:complexType>
-
-
<xs:complexType name="xa-datasourceComplexType">
<xs:sequence>
<xs:element name="min-pool-size" type="xs:nonNegativeInteger" minOccurs="0">
@@ -203,7 +190,7 @@
</xs:documentation>
</xs:annotation>
</xs:element>
- <xs:element minOccurs="0" name="prefill" type="xs:boolean">
+ <xs:element name="prefill" type="xs:boolean" minOccurs="0">
<xs:annotation>
<xs:documentation>
<![CDATA[[
@@ -213,7 +200,7 @@
</xs:documentation>
</xs:annotation>
</xs:element>
- <xs:element minOccurs="0" name="user-name" type="xs:token">
+ <xs:element name="user-name " type="xs:token" minOccurs="0">
<xs:annotation>
<xs:documentation>
<![CDATA[[
@@ -223,7 +210,7 @@
</xs:documentation>
</xs:annotation>
</xs:element>
- <xs:element minOccurs="0" name="password" type="xs:token">
+ <xs:element name="password" type="xs:token" minOccurs="0">
<xs:annotation>
<xs:documentation>
<![CDATA[[
@@ -232,8 +219,8 @@
</xs:documentation>
</xs:annotation>
</xs:element>
- <xs:element minOccurs="1" maxOccurs="unbounded" name="xa-datasource-property"
- type="xa-datasource-propertyComplexType">
+ <xs:element name="xa-datasource-property" type="xa-datasource-propertyComplexType" minOccurs="1"
+ maxOccurs="unbounded">
<xs:annotation>
<xs:documentation>
<![CDATA[[
@@ -249,7 +236,7 @@
name="DatabaseName">mydb</xa-datasource-property> <xa-datasource-property
name="ServerName">myserver</xa-datasource-property>
]]>
- </xs:documentation>
+ </xs:documentation>
</xs:annotation>
</xs:element>
<xs:element name="xa-datasource-class" type="xs:token">
@@ -259,7 +246,7 @@
The fully qualifed name of the javax.sql.XADataSource implementation
class. Ex: <xa-datasource-class>com.informix.jdbcx.IfxXADataSource</xa-datasource-class>
]]>
- </xs:documentation>
+ </xs:documentation>
</xs:annotation>
</xs:element>
<xs:element name="transaction-isolation" type="transaction-isolation-values" minOccurs="0">
@@ -271,10 +258,10 @@
levels and include: TRANSACTION_READ_UNCOMMITTED TRANSACTION_READ_COMMITTED
TRANSACTION_REPEATABLE_READ TRANSACTION_SERIALIZABLE TRANSACTION_NONE
]]>
- </xs:documentation>
+ </xs:documentation>
</xs:annotation>
</xs:element>
- <xs:element minOccurs="0" name="is-same-rm-override-value" type="xs:boolean">
+ <xs:element name="is-same-rm-override" type="xs:boolean" minOccurs="0">
<xs:annotation>
<xs:documentation>
<![CDATA[[
@@ -282,27 +269,27 @@
set whether the javax.transaction.xa.XAResource.isSameRM(XAResource) returns
true or false. Ex: <isSameRM-override-value>true</isSameRM-override-value>
]]>
- </xs:documentation>
+ </xs:documentation>
</xs:annotation>
</xs:element>
- <xs:element minOccurs="0" name="interleaving" type="boolean-presence-ComplexType">
+ <xs:element name="interleaving" type="boolean-presence-ComplexType" minOccurs="0">
<xs:annotation>
<xs:documentation>
<![CDATA[[
An element to enable interleaving for XA connection factories Ex:
<interleaving/>
]]>
- </xs:documentation>
+ </xs:documentation>
</xs:annotation>
</xs:element>
- <xs:element minOccurs="0" name="recovery-settings" type="recovery-settings_type"/>
- <xs:element name="time-out-settings" type="time-out-settings_type" minOccurs="0"/>
- <xs:element minOccurs="0" name="security-settings" type="security-settings_type"> </xs:element>
-
+ <xs:element name="recovery-settings" type="recovery-settings_type" minOccurs="0" />
+ <xs:element name="time-out-settings" type="time-out-settings_type" minOccurs="0" />
+ <xs:element name="security-settings" type="security-settings_type" minOccurs="0">
+ </xs:element>
<xs:element name="statement-settings" minOccurs="0">
<xs:complexType>
<xs:sequence>
- <xs:element minOccurs="0" name="track-statements" type="track-statements-type">
+ <xs:element name="track-statements" type="track-statements-type" minOccurs="0">
<xs:annotation>
<xs:documentation>
<![CDATA[[
@@ -316,8 +303,7 @@
</xs:documentation>
</xs:annotation>
</xs:element>
- <xs:element minOccurs="0" name="prepared-statement-cache-size"
- type="xs:nonNegativeInteger">
+ <xs:element name="prepared-statement-cache-size" type="xs:nonNegativeInteger" minOccurs="0">
<xs:annotation>
<xs:documentation>
<![CDATA[[
@@ -326,8 +312,7 @@
</xs:documentation>
</xs:annotation>
</xs:element>
- <xs:element minOccurs="0" name="share-prepared-statements"
- type="boolean-presence-ComplexType">
+ <xs:element name="share-prepared-statements" type="boolean-presence-ComplexType" minOccurs="0">
<xs:annotation>
<xs:documentation>
<![CDATA[[
@@ -341,9 +326,8 @@
</xs:sequence>
</xs:complexType>
</xs:element>
-
- <xs:element name="validation-settings" type="validation-settings_type" minOccurs="0"/>
- <xs:element minOccurs="0" name="url-delimiter" type="xs:token">
+ <xs:element name="validation-settings" type="validation-settings_type" minOccurs="0" />
+ <xs:element name="url-delimiter" type="xs:token" minOccurs="0">
<xs:annotation>
<xs:documentation>
<![CDATA[[
@@ -361,7 +345,7 @@
</xs:documentation>
</xs:annotation>
</xs:element>
- <xs:element minOccurs="0" name="new-connection-sql" type="xs:string">
+ <xs:element name="new-connection-sql" type="xs:string" minOccurs="0">
<xs:annotation>
<xs:documentation>
<![CDATA[[
@@ -371,23 +355,17 @@
</xs:documentation>
</xs:annotation>
</xs:element>
+ <xs:element name="pad-xid" type="xs:boolean" default="false" minOccurs="0" />
+ <xs:element name="wrap-xa-resource" type="xs:boolean" default="false" minOccurs="0" />
+ <xs:element name="no-tx-separate-pools" type="boolean-presence-ComplexType" minOccurs="0"/>
</xs:sequence>
- <xs:attributeGroup ref="common-datasourceAttributes"/>
-
+ <xs:attributeGroup ref="common-datasourceAttributes" />
</xs:complexType>
-
-
- <xs:complexType name="boolean-presence-ComplexType"/>
-
-
-
-
-
-
+ <xs:complexType name="boolean-presence-ComplexType" />
<xs:attributeGroup name="common-datasourceAttributes">
- <xs:attribute name="jndi-name" type="xs:token" use="required"/>
- <xs:attribute name="pool-name" type="xs:token" use="required"/>
- <xs:attribute name="enabled" type="xs:boolean" default="true" form="unqualified" use="optional"/>
+ <xs:attribute name="jndi-name" type="xs:token" use="required" />
+ <xs:attribute name="pool-name" type="xs:token" use="required" />
+ <xs:attribute name="enabled" type="xs:boolean" default="true" form="unqualified" use="optional" />
<xs:attribute default="false" name="use-java-context" type="xs:boolean">
<xs:annotation>
<xs:documentation>
@@ -398,55 +376,37 @@
]]>
</xs:documentation>
</xs:annotation>
-
</xs:attribute>
</xs:attributeGroup>
-
<xs:simpleType name="transaction-isolation-values">
<xs:annotation>
- <xs:documentation>
- Define constants used as the possible
- transaction isolation levels
- in transaction-isolation type.
- Include: TRANSACTION_READ_UNCOMMITTED
- TRANSACTION_READ_COMMITTED
- TRANSACTION_REPEATABLE_READ TRANSACTION_SERIALIZABLE
- TRANSACTION_NONE
- </xs:documentation>
+ <xs:documentation> Define constants used as the possible transaction isolation levels in transaction-isolation
+ type. Include: TRANSACTION_READ_UNCOMMITTED TRANSACTION_READ_COMMITTED TRANSACTION_REPEATABLE_READ
+ TRANSACTION_SERIALIZABLE TRANSACTION_NONE</xs:documentation>
</xs:annotation>
<xs:restriction base="xs:token">
- <xs:enumeration value="TRANSACTION_READ_UNCOMMITTED"/>
- <xs:enumeration value="TRANSACTION_READ_COMMITTED"/>
- <xs:enumeration value="TRANSACTION_REPEATABLE_READ"/>
- <xs:enumeration value="TRANSACTION_SERIALIZABLE"/>
- <xs:enumeration value="TRANSACTION_NONE"/>
+ <xs:enumeration value="TRANSACTION_READ_UNCOMMITTED" />
+ <xs:enumeration value="TRANSACTION_READ_COMMITTED" />
+ <xs:enumeration value="TRANSACTION_REPEATABLE_READ" />
+ <xs:enumeration value="TRANSACTION_SERIALIZABLE" />
+ <xs:enumeration value="TRANSACTION_NONE" />
</xs:restriction>
</xs:simpleType>
-
- <xs:simpleType name="security-manager-values">
+ <xs:simpleType name="security-manager-values">
<xs:annotation>
- <xs:documentation>
- Define constants used as the possible
- security manager
- in security-settings_type. See there for complete documentation
- Include: APPLICATION
- DOMAIN
- APPLICATION-AND-DOMAIN
- NONE
- </xs:documentation>
+ <xs:documentation> Define constants used as the possible security manager in security-settings_type. See there for
+ complete documentation Include: APPLICATION DOMAIN APPLICATION-AND-DOMAIN NONE</xs:documentation>
</xs:annotation>
<xs:restriction base="xs:token">
- <xs:enumeration value="APPLICATION"/>
- <xs:enumeration value="DOMAIN"/>
- <xs:enumeration value="APPLICATION-AND-DOMAIN"/>
- <xs:enumeration value="NONE"/>
+ <xs:enumeration value="APPLICATION" />
+ <xs:enumeration value="DOMAIN" />
+ <xs:enumeration value="APPLICATION-AND-DOMAIN" />
+ <xs:enumeration value="NONE" />
</xs:restriction>
</xs:simpleType>
-
<xs:complexType name="security-settings_type">
<xs:sequence>
- <xs:element name="security-manager" type="security-manager-values"
- minOccurs="0">
+ <xs:element name="security-manager" type="security-manager-values" minOccurs="0">
<xs:annotation>
<xs:documentation>
<![CDATA[[
@@ -465,9 +425,7 @@
</xs:documentation>
</xs:annotation>
</xs:element>
-
- <xs:element name="security-domain" type="xs:token"
- minOccurs="0">
+ <xs:element name="security-domain" type="xs:token" minOccurs="0">
<xs:annotation>
<xs:documentation>
<![CDATA[[
@@ -480,26 +438,17 @@
</xs:documentation>
</xs:annotation>
</xs:element>
-
</xs:sequence>
-
</xs:complexType>
-
-
-
<xs:complexType name="xa-datasource-propertyComplexType" mixed="true">
- <xs:attribute use="required" name="name" type="xs:token"/>
+ <xs:attribute use="required" name="name" type="xs:token" />
</xs:complexType>
-
-
<xs:complexType name="connection-propertyComplexType" mixed="true">
- <xs:attribute use="required" name="name" type="xs:token"/>
+ <xs:attribute use="required" name="name" type="xs:token" />
</xs:complexType>
-
-
<xs:complexType name="validation-settings_type">
<xs:sequence>
- <xs:element minOccurs="0" name="valid-connection-checker-class-name" type="xs:token">
+ <xs:element name="valid-connection-checker-class-name" type="xs:token" minOccurs="0">
<xs:annotation>
<xs:documentation>
<![CDATA[[
@@ -512,7 +461,7 @@
</xs:documentation>
</xs:annotation>
</xs:element>
- <xs:element minOccurs="0" name="check-valid-connection-sql" type="xs:string">
+ <xs:element name="check-valid-connection-sql " type="xs:string" minOccurs="0">
<xs:annotation>
<xs:documentation>
<![CDATA[[
@@ -522,7 +471,7 @@
</xs:documentation>
</xs:annotation>
</xs:element>
- <xs:element minOccurs="0" name="validate-on-match" type="xs:boolean">
+ <xs:element name="validate-on-match " type="xs:boolean" minOccurs="0">
<xs:annotation>
<xs:documentation>
<![CDATA[[
@@ -534,7 +483,7 @@
</xs:documentation>
</xs:annotation>
</xs:element>
- <xs:element minOccurs="0" name="background-validation" type="xs:boolean">
+ <xs:element name="background-validation" type="xs:boolean" minOccurs="0">
<xs:annotation>
<xs:documentation>
<![CDATA[[
@@ -544,7 +493,7 @@
</xs:documentation>
</xs:annotation>
</xs:element>
- <xs:element minOccurs="0" name="background-validation-minutes" type="xs:nonNegativeInteger">
+ <xs:element name="background-validation-minutes" type="xs:nonNegativeInteger" minOccurs="0">
<xs:annotation>
<xs:documentation>
<![CDATA[[
@@ -554,7 +503,7 @@
</xs:documentation>
</xs:annotation>
</xs:element>
- <xs:element minOccurs="0" name="use-fast-fail" type="xs:boolean">
+ <xs:element name="use-fast-fail" type="xs:boolean" minOccurs="0">
<xs:annotation>
<xs:documentation>
<![CDATA[[
@@ -578,7 +527,7 @@
</xs:documentation>
</xs:annotation>
</xs:element>
- <xs:element minOccurs="0" name="exception-sorter-class-name" type="xs:token">
+ <xs:element name="exception-sorter-class-name" type="xs:token" minOccurs="0">
<xs:annotation>
<xs:documentation>
<![CDATA[[
@@ -621,7 +570,7 @@
</xs:documentation>
</xs:annotation>
</xs:element>
- <xs:element minOccurs="0" name="set-tx-query-timeout" type="boolean-presence-ComplexType">
+ <xs:element name="set-tx-query-timeout" type="boolean-presence-ComplexType" minOccurs="0">
<xs:annotation>
<xs:documentation>
<![CDATA[[
@@ -632,7 +581,7 @@
</xs:documentation>
</xs:annotation>
</xs:element>
- <xs:element minOccurs="0" name="query-timeout" type="xs:nonNegativeInteger">
+ <xs:element name="query-timeout" type="xs:nonNegativeInteger" minOccurs="0">
<xs:annotation>
<xs:documentation>
<![CDATA[[
@@ -642,7 +591,7 @@
</xs:documentation>
</xs:annotation>
</xs:element>
- <xs:element minOccurs="0" name="use-try-lock" type="xs:nonNegativeInteger">
+ <xs:element name="use-try-lock" type="xs:nonNegativeInteger" minOccurs="0">
<xs:annotation>
<xs:documentation>
<![CDATA[[
@@ -674,52 +623,52 @@
</xs:documentation>
</xs:annotation>
</xs:element>
- <xs:element minOccurs="0" name="xa-resource-timeout" type="xs:token">
+ <xs:element name="xa-resource-timeout" type="xs:token" minOccurs="0">
<xs:annotation>
<xs:documentation>
<![CDATA[[
Passed to XAResource.setTransactionTimeout() Default is zero which
does not invoke the setter e.g. 5 minutes <xa-resource-timeout>300</xa-resource-timeout>
]]>
- </xs:documentation>
+ </xs:documentation>
</xs:annotation>
</xs:element>
</xs:sequence>
</xs:complexType>
<xs:complexType name="recovery-settings_type">
<xs:choice>
- <xs:element minOccurs="0" name="no-recover" type="xs:boolean">
+ <xs:element name="no-recover" type="xs:boolean" minOccurs="0">
<xs:annotation>
<xs:documentation>
<![CDATA[[
Specify if the xa-datasource should be excluded from recovery. Default:
false Ex: <no-recover>true</no-recover>
]]>
- </xs:documentation>
+ </xs:documentation>
</xs:annotation>
</xs:element>
<xs:sequence minOccurs="0">
- <xs:element minOccurs="0" name="recover-user-name" type="xs:token">
+ <xs:element name="recover-user-name" type="xs:token" minOccurs="0">
<xs:annotation>
<xs:documentation>
<![CDATA[[
Specify the username used when creating a connection during recovery.
Ex: <recover-user-name>sa</recover-user-name>
]]>
- </xs:documentation>
+ </xs:documentation>
</xs:annotation>
</xs:element>
- <xs:element minOccurs="0" name="recover-password" type="xs:token">
+ <xs:element name="recover-password " type="xs:token" minOccurs="0">
<xs:annotation>
<xs:documentation>
<![CDATA[[
Specify the password used when creating a connection during recovery.
Ex: <recover-password>sa-pass</recover-password>
]]>
- </xs:documentation>
+ </xs:documentation>
</xs:annotation>
</xs:element>
- <xs:element minOccurs="0" name="recover-security-domain" type="xs:token">
+ <xs:element name="recover-security-domain" type="xs:token" minOccurs="0">
<xs:annotation>
<xs:documentation>
<![CDATA[[
@@ -729,7 +678,7 @@
This name correlates to the JAAS login-config.xml descriptor application-policy/name
attribute. Ex: <recover-security-domain>OracleDbRealm</recover-security-domain>
]]>
- </xs:documentation>
+ </xs:documentation>
</xs:annotation>
</xs:element>
</xs:sequence>
@@ -737,25 +686,22 @@
</xs:complexType>
<xs:simpleType name="track-statements-type">
<xs:restriction base="xs:token">
- <xs:enumeration value="true"/>
- <xs:enumeration value="false"/>
- <xs:enumeration value="nowarn"/>
+ <xs:enumeration value="true" />
+ <xs:enumeration value="false" />
+ <xs:enumeration value="nowarn" />
</xs:restriction>
</xs:simpleType>
<xs:complexType name="statement-settings_type">
<xs:sequence>
- <xs:element minOccurs="0" name="track-statements"
- type="track-statements-type">
+ <xs:element name="track-statements" type="track-statements-type" minOccurs="0">
<xs:annotation></xs:annotation>
</xs:element>
- <xs:element minOccurs="0" name="prepared-statement-cache-size"
- type="xs:nonNegativeInteger">
+ <xs:element name="prepared-statement-cache-size" type="xs:nonNegativeInteger" minOccurs="0">
<xs:annotation></xs:annotation>
</xs:element>
- <xs:element minOccurs="0" name="share-prepared-statements"
- type="boolean-presence-ComplexType">
+ <xs:element name="share-prepared-statements" type="boolean-presence-ComplexType" minOccurs="0">
<xs:annotation></xs:annotation>
</xs:element>
</xs:sequence>
</xs:complexType>
-</xs:schema>
+</xs:schema>
\ No newline at end of file
Modified: projects/jboss-jca/trunk/common/src/test/resources/ds/db2-jcc-xa-ds.xml
===================================================================
--- projects/jboss-jca/trunk/common/src/test/resources/ds/db2-jcc-xa-ds.xml 2010-08-11 14:28:09 UTC (rev 107537)
+++ projects/jboss-jca/trunk/common/src/test/resources/ds/db2-jcc-xa-ds.xml 2010-08-11 15:40:26 UTC (rev 107538)
@@ -14,7 +14,7 @@
<xa-datasource-property name="PortNumber">your_port_number</xa-datasource-property>
<xa-datasource-class>com.ibm.db2.jcc.DB2XADataSource</xa-datasource-class>
<!-- Must be set if using multiple DB2 XA resources in same transaction -->
- <is-same-rm-override-value>false</is-same-rm-override-value>
+ <is-same-rm-override>false</is-same-rm-override>
<interleaving/>
</xa-datasource>
Modified: projects/jboss-jca/trunk/common/src/test/resources/ds/db2-xa-ds
===================================================================
--- projects/jboss-jca/trunk/common/src/test/resources/ds/db2-xa-ds 2010-08-11 14:28:09 UTC (rev 107537)
+++ projects/jboss-jca/trunk/common/src/test/resources/ds/db2-xa-ds 2010-08-11 15:40:26 UTC (rev 107538)
@@ -8,7 +8,7 @@
<xa-datasource-property name="Password">your_password</xa-datasource-property>
<xa-datasource-class>COM.ibm.db2.jdbc.DB2XADataSource</xa-datasource-class>
<!-- uncomment to enable interleaving <interleaving/> -->
- <is-same-rm-override-value>false</is-same-rm-override-value>
+ <is-same-rm-override>false</is-same-rm-override>
<!-- <interleaving/> -->
</xa-datasource>
More information about the jboss-cvs-commits
mailing list