[jboss-cvs] JBossAS SVN: r107629 - 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
Mon Aug 16 05:09:36 EDT 2010
Author: maeste
Date: 2010-08-16 05:09:33 -0400 (Mon, 16 Aug 2010)
New Revision: 107629
Added:
projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/ds/Recovery.java
projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/ds/Security.java
projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/ds/Statement.java
projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/ds/TimeOut.java
projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/ds/Validation.java
projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ds/RecoveryImpl.java
projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ds/SecurityImpl.java
projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ds/StatementImpl.java
projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ds/TimeOutImpl.java
projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ds/ValidationImpl.java
Removed:
projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/ds/RecoverySettings.java
projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/ds/SecuritySettings.java
projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/ds/StatementSettings.java
projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/ds/TimeOutSettings.java
projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/ds/ValidationSettings.java
projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ds/RecoverySettingsImpl.java
projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ds/SecuritySettingsImpl.java
projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ds/StatementSettingsImpl.java
projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ds/TimeOutSettingsImpl.java
projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ds/ValidationSettingsImpl.java
Modified:
projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/ds/DataSource.java
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/DataSourceAbstractImpl.java
projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ds/DataSourceImpl.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/java/org/jboss/jca/common/metadata/ra/common/ConfigPropertyImpl.java
projects/jboss-jca/trunk/common/src/main/resources/schema/datasources_1_0.xsd
projects/jboss-jca/trunk/common/src/test/resources/ds/db2-ds.xml
projects/jboss-jca/trunk/common/src/test/resources/ds/derby-ds.xml
projects/jboss-jca/trunk/common/src/test/resources/ds/hsqldb-ds.xml
projects/jboss-jca/trunk/common/src/test/resources/ds/informix-ds.xml
projects/jboss-jca/trunk/common/src/test/resources/ds/informix-xa-ds.xml
projects/jboss-jca/trunk/common/src/test/resources/ds/jsql-ds.xml
projects/jboss-jca/trunk/common/src/test/resources/ds/mimer-ds.xml
projects/jboss-jca/trunk/common/src/test/resources/ds/mimer-xa-ds.xml
projects/jboss-jca/trunk/common/src/test/resources/ds/mssql-ds.xml
projects/jboss-jca/trunk/common/src/test/resources/ds/mysql-ds.xml
projects/jboss-jca/trunk/common/src/test/resources/ds/mysql-xa-ds.xml
projects/jboss-jca/trunk/common/src/test/resources/ds/oracle-ds.xml
projects/jboss-jca/trunk/common/src/test/resources/ds/oracle-xa-ds.xml
projects/jboss-jca/trunk/common/src/test/resources/ds/sybase-ds.xml
projects/jboss-jca/trunk/common/src/test/resources/ds/sybase-xa-ds.xml
Log:
JBJCA-400: fixing xsd and impl for some jesper's feedback (removing -settings from all *-settings tags). some changes to xsd also to adhere to type name convention *Type instead of *ComplexType
Modified: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/ds/DataSource.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/ds/DataSource.java 2010-08-15 18:45:14 UTC (rev 107628)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/ds/DataSource.java 2010-08-16 09:09:33 UTC (rev 107629)
@@ -100,32 +100,32 @@
public Map<String, String> getConnectionProperties();
/**
- * Get the timeOutSettings.
+ * Get the timeOut.
*
- * @return the timeOutSettings.
+ * @return the timeOut.
*/
- public TimeOutSettings getTimeOutSettings();
+ public TimeOut getTimeOut();
/**
- * Get the securitySettings.
+ * Get the security.
*
- * @return the securitySettings.
+ * @return the security.
*/
- public SecuritySettings getSecuritySettings();
+ public Security getSecurity();
/**
- * Get the statementSettings.
+ * Get the statement.
*
- * @return the statementSettings.
+ * @return the statement.
*/
- public StatementSettings getStatementSettings();
+ public Statement getStatement();
/**
- * Get the validationSettings.
+ * Get the validation.
*
- * @return the validationSettings.
+ * @return the validation.
*/
- public ValidationSettings getValidationSettings();
+ public Validation getValidation();
/**
* Get the urlDelimiter.
@@ -228,21 +228,21 @@
*/
CONNECTIONPROPERTY("connection-property"),
/**
- * timeOutSettings tag
+ * timeOut tag
*/
- TIMEOUTSETTINGS("time-out-settings"),
+ TIMEOUT("time-out"),
/**
- * securitySettings tag
+ * security tag
*/
- SECURITYSETTINGS("security-settings"),
+ SECURITY("security"),
/**
- * statementSettings tag
+ * statement tag
*/
- STATEMENTSETTINGS("statement-settings"),
+ STATEMENT("statement"),
/**
- * validationSettings tag
+ * validation tag
*/
- VALIDATIONSETTINGS("validation-settings"),
+ VALIDATION("validation"),
/**
* urlDelimiter tag
*/
Copied: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/ds/Recovery.java (from rev 107581, projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/ds/RecoverySettings.java)
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/ds/Recovery.java (rev 0)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/ds/Recovery.java 2010-08-16 09:09:33 UTC (rev 107629)
@@ -0,0 +1,150 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.jca.common.api.metadata.ds;
+
+import org.jboss.jca.common.api.metadata.JCAMetadata;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ *
+ * A Recovery.
+ *
+ * @author <a href="stefano.maestri at jboss.com">Stefano Maestri</a>
+ *
+ */
+public interface Recovery extends JCAMetadata
+{
+
+ /**
+ * Get the noRecover.
+ *
+ * @return the noRecover.
+ */
+ public boolean isNoRecover();
+
+ /**
+ * Get the recoverUserName.
+ *
+ * @return the recoverUserName.
+ */
+ public String getRecoverUserName();
+
+ /**
+ * Get the recoverPassword.
+ *
+ * @return the recoverPassword.
+ */
+ public String getRecoverPassword();
+
+ /**
+ * Get the recoverSecurityDomain.
+ *
+ * @return the recoverSecurityDomain.
+ */
+ public String getRecoverSecurityDomain();
+
+ /**
+ *
+ * A Tag.
+ *
+ * @author <a href="stefano.maestri at jboss.com">Stefano Maestri</a>
+ *
+ */
+ public enum Tag
+ {
+ /** always first
+ *
+ */
+ UNKNOWN(null),
+
+ /**
+ * noRecover tag
+ */
+ NORECOVER("no-recover"),
+ /**
+ * recoverUserName tag
+ */
+ RECOVERUSERNAME("recover-user-name"),
+ /**
+ * recoverPassword tag
+ */
+ RECOVERPASSWORD("recover-password"),
+ /**
+ * recoverSecurityDomain tag
+ */
+ RECOVERSECURITYDOMAIN("recover-security-domain");
+
+ private final String name;
+
+ /**
+ *
+ * Create a new Tag.
+ *
+ * @param name a name
+ */
+ Tag(final String name)
+ {
+ this.name = name;
+ }
+
+ /**
+ * Get the local name of this element.
+ *
+ * @return the local name
+ */
+ public String getLocalName()
+ {
+ return name;
+ }
+
+ private static final Map<String, Tag> MAP;
+
+ static
+ {
+ final Map<String, Tag> map = new HashMap<String, Tag>();
+ for (Tag element : values())
+ {
+ final String name = element.getLocalName();
+ if (name != null)
+ map.put(name, element);
+ }
+ MAP = map;
+ }
+
+ /**
+ *
+ * Static method to get enum instance given localName XsdString
+ *
+ * @param localName a XsdString used as localname (typically tag name as defined in xsd)
+ * @return the enum instance
+ */
+ public static Tag forName(String localName)
+ {
+ final Tag element = MAP.get(localName);
+ return element == null ? UNKNOWN : element;
+ }
+
+ }
+
+}
Deleted: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/ds/RecoverySettings.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/ds/RecoverySettings.java 2010-08-15 18:45:14 UTC (rev 107628)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/ds/RecoverySettings.java 2010-08-16 09:09:33 UTC (rev 107629)
@@ -1,150 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.jca.common.api.metadata.ds;
-
-import org.jboss.jca.common.api.metadata.JCAMetadata;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- *
- * A RecoverySettings.
- *
- * @author <a href="stefano.maestri at jboss.com">Stefano Maestri</a>
- *
- */
-public interface RecoverySettings extends JCAMetadata
-{
-
- /**
- * Get the noRecover.
- *
- * @return the noRecover.
- */
- public boolean isNoRecover();
-
- /**
- * Get the recoverUserName.
- *
- * @return the recoverUserName.
- */
- public String getRecoverUserName();
-
- /**
- * Get the recoverPassword.
- *
- * @return the recoverPassword.
- */
- public String getRecoverPassword();
-
- /**
- * Get the recoverSecurityDomain.
- *
- * @return the recoverSecurityDomain.
- */
- public String getRecoverSecurityDomain();
-
- /**
- *
- * A Tag.
- *
- * @author <a href="stefano.maestri at jboss.com">Stefano Maestri</a>
- *
- */
- public enum Tag
- {
- /** always first
- *
- */
- UNKNOWN(null),
-
- /**
- * noRecover tag
- */
- NORECOVER("no-recover"),
- /**
- * recoverUserName tag
- */
- RECOVERUSERNAME("recover-user-name"),
- /**
- * recoverPassword tag
- */
- RECOVERPASSWORD("recover-password"),
- /**
- * recoverSecurityDomain tag
- */
- RECOVERSECURITYDOMAIN("recover-security-domain");
-
- private final String name;
-
- /**
- *
- * Create a new Tag.
- *
- * @param name a name
- */
- Tag(final String name)
- {
- this.name = name;
- }
-
- /**
- * Get the local name of this element.
- *
- * @return the local name
- */
- public String getLocalName()
- {
- return name;
- }
-
- private static final Map<String, Tag> MAP;
-
- static
- {
- final Map<String, Tag> map = new HashMap<String, Tag>();
- for (Tag element : values())
- {
- final String name = element.getLocalName();
- if (name != null)
- map.put(name, element);
- }
- MAP = map;
- }
-
- /**
- *
- * Static method to get enum instance given localName XsdString
- *
- * @param localName a XsdString used as localname (typically tag name as defined in xsd)
- * @return the enum instance
- */
- public static Tag forName(String localName)
- {
- final Tag element = MAP.get(localName);
- return element == null ? UNKNOWN : element;
- }
-
- }
-
-}
Copied: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/ds/Security.java (from rev 107581, projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/ds/SecuritySettings.java)
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/ds/Security.java (rev 0)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/ds/Security.java 2010-08-16 09:09:33 UTC (rev 107629)
@@ -0,0 +1,154 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.jca.common.api.metadata.ds;
+
+import org.jboss.jca.common.api.metadata.JCAMetadata;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ *
+ * A Security.
+ *
+ * @author <a href="stefano.maestri at jboss.com">Stefano Maestri</a>
+ *
+ */
+public interface Security extends JCAMetadata
+{
+ /**
+ *
+ * A SecurityManager.
+ *
+ * @author <a href="stefano.maestri at jboss.com">Stefano Maestri</a>
+ *
+ */
+ public enum SecurityManager
+ {
+ /**
+ * APPLICATION
+ */
+ APPLICATION,
+ /**
+ * DOMAIN
+ */
+ DOMAIN,
+ /**
+ * APPLICATION_AND_DOMAIN
+ */
+ APPLICATION_AND_DOMAIN,
+ /**
+ * NONE
+ */
+ NONE;
+ }
+
+ /**
+ * Get the securityManager.
+ *
+ * @return the securityManager.
+ */
+ public SecurityManager getSecurityManager();
+
+ /**
+ * Get the securityDomain.
+ *
+ * @return the securityDomain.
+ */
+ public String getSecurityDomain();
+
+ /**
+ *
+ * A Tag.
+ *
+ * @author <a href="stefano.maestri at jboss.com">Stefano Maestri</a>
+ *
+ */
+ public enum Tag
+ {
+ /** always first
+ *
+ */
+ UNKNOWN(null),
+
+ /**
+ * securityManager tag
+ */
+ SECURITYMANAGER("security-manager"),
+ /**
+ * securityDomain tag
+ */
+ SECURITYDOMAIN("security-domain");
+
+ private final String name;
+
+ /**
+ *
+ * Create a new Tag.
+ *
+ * @param name a name
+ */
+ Tag(final String name)
+ {
+ this.name = name;
+ }
+
+ /**
+ * Get the local name of this element.
+ *
+ * @return the local name
+ */
+ public String getLocalName()
+ {
+ return name;
+ }
+
+ private static final Map<String, Tag> MAP;
+
+ static
+ {
+ final Map<String, Tag> map = new HashMap<String, Tag>();
+ for (Tag element : values())
+ {
+ final String name = element.getLocalName();
+ if (name != null)
+ map.put(name, element);
+ }
+ MAP = map;
+ }
+
+ /**
+ *
+ * Static method to get enum instance given localName XsdString
+ *
+ * @param localName a XsdString used as localname (typically tag name as defined in xsd)
+ * @return the enum instance
+ */
+ public static Tag forName(String localName)
+ {
+ final Tag element = MAP.get(localName);
+ return element == null ? UNKNOWN : element;
+ }
+
+ }
+
+}
Deleted: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/ds/SecuritySettings.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/ds/SecuritySettings.java 2010-08-15 18:45:14 UTC (rev 107628)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/ds/SecuritySettings.java 2010-08-16 09:09:33 UTC (rev 107629)
@@ -1,154 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.jca.common.api.metadata.ds;
-
-import org.jboss.jca.common.api.metadata.JCAMetadata;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- *
- * A SecuritySettings.
- *
- * @author <a href="stefano.maestri at jboss.com">Stefano Maestri</a>
- *
- */
-public interface SecuritySettings extends JCAMetadata
-{
- /**
- *
- * A SecurityManager.
- *
- * @author <a href="stefano.maestri at jboss.com">Stefano Maestri</a>
- *
- */
- public enum SecurityManager
- {
- /**
- * APPLICATION
- */
- APPLICATION,
- /**
- * DOMAIN
- */
- DOMAIN,
- /**
- * APPLICATION_AND_DOMAIN
- */
- APPLICATION_AND_DOMAIN,
- /**
- * NONE
- */
- NONE;
- }
-
- /**
- * Get the securityManager.
- *
- * @return the securityManager.
- */
- public SecurityManager getSecurityManager();
-
- /**
- * Get the securityDomain.
- *
- * @return the securityDomain.
- */
- public String getSecurityDomain();
-
- /**
- *
- * A Tag.
- *
- * @author <a href="stefano.maestri at jboss.com">Stefano Maestri</a>
- *
- */
- public enum Tag
- {
- /** always first
- *
- */
- UNKNOWN(null),
-
- /**
- * securityManager tag
- */
- SECURITYMANAGER("security-manager"),
- /**
- * securityDomain tag
- */
- SECURITYDOMAIN("security-domain");
-
- private final String name;
-
- /**
- *
- * Create a new Tag.
- *
- * @param name a name
- */
- Tag(final String name)
- {
- this.name = name;
- }
-
- /**
- * Get the local name of this element.
- *
- * @return the local name
- */
- public String getLocalName()
- {
- return name;
- }
-
- private static final Map<String, Tag> MAP;
-
- static
- {
- final Map<String, Tag> map = new HashMap<String, Tag>();
- for (Tag element : values())
- {
- final String name = element.getLocalName();
- if (name != null)
- map.put(name, element);
- }
- MAP = map;
- }
-
- /**
- *
- * Static method to get enum instance given localName XsdString
- *
- * @param localName a XsdString used as localname (typically tag name as defined in xsd)
- * @return the enum instance
- */
- public static Tag forName(String localName)
- {
- final Tag element = MAP.get(localName);
- return element == null ? UNKNOWN : element;
- }
-
- }
-
-}
Copied: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/ds/Statement.java (from rev 107581, projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/ds/StatementSettings.java)
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/ds/Statement.java (rev 0)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/ds/Statement.java 2010-08-16 09:09:33 UTC (rev 107629)
@@ -0,0 +1,164 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.jca.common.api.metadata.ds;
+
+import org.jboss.jca.common.api.metadata.JCAMetadata;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ *
+ * A Statement.
+ *
+ * @author <a href="stefano.maestri at jboss.com">Stefano Maestri</a>
+ *
+ */
+public interface Statement extends JCAMetadata
+{
+
+ /**
+ *
+ * A TrackStatementsEnum.
+ *
+ * @author <a href="stefano.maestri at jboss.com">Stefano Maestri</a>
+ *
+ */
+ public enum TrackStatementsEnum
+ {
+
+ /**
+ * true
+ */
+ TRUE,
+ /**
+ * false
+ */
+ FALSE,
+ /**
+ * NOWARN
+ */
+ NOWARN;
+
+ }
+
+ /**
+ * Get the sharePreparedStatements.
+ *
+ * @return the sharePreparedStatements.
+ */
+ public boolean isSharePreparedStatements();
+
+ /**
+ * Get the preparedStatementsCacheSize.
+ *
+ * @return the preparedStatementsCacheSize.
+ */
+ public Long getPreparedStatementsCacheSize();
+
+ /**
+ * Get the trackStatements.
+ *
+ * @return the trackStatements.
+ */
+ public TrackStatementsEnum getTrackStatements();
+
+ /**
+ *
+ * A Tag.
+ *
+ * @author <a href="stefano.maestri at jboss.com">Stefano Maestri</a>
+ *
+ */
+ public enum Tag
+ {
+ /** always first
+ *
+ */
+ UNKNOWN(null),
+
+ /**
+ * trackStatements tag
+ */
+ TRACKSTATEMENTS("track-statements"),
+ /**
+ * preparedStatementCacheSize tag
+ */
+ PREPAREDSTATEMENTCACHESIZE("prepared-statement-cache-size"),
+ /**
+ * sharePreparedStatements tag
+ */
+ SHAREPREPAREDSTATEMENTS("share-prepared-statements");
+
+ private final String name;
+
+ /**
+ *
+ * Create a new Tag.
+ *
+ * @param name a name
+ */
+ Tag(final String name)
+ {
+ this.name = name;
+ }
+
+ /**
+ * Get the local name of this element.
+ *
+ * @return the local name
+ */
+ public String getLocalName()
+ {
+ return name;
+ }
+
+ private static final Map<String, Tag> MAP;
+
+ static
+ {
+ final Map<String, Tag> map = new HashMap<String, Tag>();
+ for (Tag element : values())
+ {
+ final String name = element.getLocalName();
+ if (name != null)
+ map.put(name, element);
+ }
+ MAP = map;
+ }
+
+ /**
+ *
+ * Static method to get enum instance given localName XsdString
+ *
+ * @param localName a XsdString used as localname (typically tag name as defined in xsd)
+ * @return the enum instance
+ */
+ public static Tag forName(String localName)
+ {
+ final Tag element = MAP.get(localName);
+ return element == null ? UNKNOWN : element;
+ }
+
+ }
+
+}
Deleted: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/ds/StatementSettings.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/ds/StatementSettings.java 2010-08-15 18:45:14 UTC (rev 107628)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/ds/StatementSettings.java 2010-08-16 09:09:33 UTC (rev 107629)
@@ -1,164 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.jca.common.api.metadata.ds;
-
-import org.jboss.jca.common.api.metadata.JCAMetadata;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- *
- * A StatementSettings.
- *
- * @author <a href="stefano.maestri at jboss.com">Stefano Maestri</a>
- *
- */
-public interface StatementSettings extends JCAMetadata
-{
-
- /**
- *
- * A TrackStatementsEnum.
- *
- * @author <a href="stefano.maestri at jboss.com">Stefano Maestri</a>
- *
- */
- public enum TrackStatementsEnum
- {
-
- /**
- * true
- */
- TRUE,
- /**
- * false
- */
- FALSE,
- /**
- * NOWARN
- */
- NOWARN;
-
- }
-
- /**
- * Get the sharePreparedStatements.
- *
- * @return the sharePreparedStatements.
- */
- public boolean isSharePreparedStatements();
-
- /**
- * Get the preparedStatementsCacheSize.
- *
- * @return the preparedStatementsCacheSize.
- */
- public Long getPreparedStatementsCacheSize();
-
- /**
- * Get the trackStatements.
- *
- * @return the trackStatements.
- */
- public TrackStatementsEnum getTrackStatements();
-
- /**
- *
- * A Tag.
- *
- * @author <a href="stefano.maestri at jboss.com">Stefano Maestri</a>
- *
- */
- public enum Tag
- {
- /** always first
- *
- */
- UNKNOWN(null),
-
- /**
- * trackStatements tag
- */
- TRACKSTATEMENTS("track-statements"),
- /**
- * preparedStatementCacheSize tag
- */
- PREPAREDSTATEMENTCACHESIZE("prepared-statement-cache-size"),
- /**
- * sharePreparedStatements tag
- */
- SHAREPREPAREDSTATEMENTS("share-prepared-statements");
-
- private final String name;
-
- /**
- *
- * Create a new Tag.
- *
- * @param name a name
- */
- Tag(final String name)
- {
- this.name = name;
- }
-
- /**
- * Get the local name of this element.
- *
- * @return the local name
- */
- public String getLocalName()
- {
- return name;
- }
-
- private static final Map<String, Tag> MAP;
-
- static
- {
- final Map<String, Tag> map = new HashMap<String, Tag>();
- for (Tag element : values())
- {
- final String name = element.getLocalName();
- if (name != null)
- map.put(name, element);
- }
- MAP = map;
- }
-
- /**
- *
- * Static method to get enum instance given localName XsdString
- *
- * @param localName a XsdString used as localname (typically tag name as defined in xsd)
- * @return the enum instance
- */
- public static Tag forName(String localName)
- {
- final Tag element = MAP.get(localName);
- return element == null ? UNKNOWN : element;
- }
-
- }
-
-}
Copied: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/ds/TimeOut.java (from rev 107581, projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/ds/TimeOutSettings.java)
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/ds/TimeOut.java (rev 0)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/ds/TimeOut.java 2010-08-16 09:09:33 UTC (rev 107629)
@@ -0,0 +1,194 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.jca.common.api.metadata.ds;
+
+import org.jboss.jca.common.api.metadata.JCAMetadata;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ *
+ * A TimeOut.
+ *
+ * @author <a href="stefano.maestri at jboss.com">Stefano Maestri</a>
+ *
+ */
+public interface TimeOut extends JCAMetadata
+{
+
+ /**
+ * Get the blockingTimeoutMillis.
+ *
+ * @return the blockingTimeoutMillis.
+ */
+ public Long getBlockingTimeoutMillis();
+
+ /**
+ * Get the idleTimeoutMinutes.
+ *
+ * @return the idleTimeoutMinutes.
+ */
+ public Long getIdleTimeoutMinutes();
+
+ /**
+ * Get the setTxQuertTimeout.
+ *
+ * @return the setTxQuertTimeout.
+ */
+ public boolean isSetTxQuertTimeout();
+
+ /**
+ * Get the queryTimeout.
+ *
+ * @return the queryTimeout.
+ */
+ public Long getQueryTimeout();
+
+ /**
+ * Get the useTryLock.
+ *
+ * @return the useTryLock.
+ */
+ public Long getUseTryLock();
+
+ /**
+ * Get the allocationRetry.
+ *
+ * @return the allocationRetry.
+ */
+ public Long getAllocationRetry();
+
+ /**
+ * Get the allocationRetryWaitMillis.
+ *
+ * @return the allocationRetryWaitMillis.
+ */
+ public Long getAllocationRetryWaitMillis();
+
+ /**
+ * Get the xaResourceTimeout.
+ *
+ * @return the xaResourceTimeout.
+ */
+ public Long getXaResourceTimeout();
+
+ /**
+ *
+ * A Tag.
+ *
+ * @author <a href="stefano.maestri at jboss.com">Stefano Maestri</a>
+ *
+ */
+ public enum Tag
+ {
+ /** always first
+ *
+ */
+ UNKNOWN(null),
+
+ /**
+ * blockingTimeoutMillis tag
+ */
+ BLOCKINGTIMEOUTMILLIS("blocking-timeout-millis"),
+ /**
+ * idleTimeoutMinutes tag
+ */
+ IDLETIMEOUTMINUTES("idle-timeout-minutes"),
+ /**
+ * setTxQueryTimeout tag
+ */
+ SETTXQUERYTIMEOUT("set-tx-query-timeout"),
+ /**
+ * queryTimeout tag
+ */
+ QUERYTIMEOUT("query-timeout"),
+ /**
+ * useTryLock tag
+ */
+ USETRYLOCK("use-try-lock"),
+ /**
+ * allocationRetry tag
+ */
+ ALLOCATIONRETRY("allocation-retry"),
+ /**
+ * xaResourceTimeout tag
+ */
+ XARESOURCETIMEOUT("xa-resource-timeout"),
+ /**
+ * allocationRetryWaitMillis tag
+ */
+ ALLOCATIONRETRYWAITMILLIS("allocation-retry-wait-millis");
+
+ private final String name;
+
+ /**
+ *
+ * Create a new Tag.
+ *
+ * @param name a name
+ */
+ Tag(final String name)
+ {
+ this.name = name;
+ }
+
+ /**
+ * Get the local name of this element.
+ *
+ * @return the local name
+ */
+ public String getLocalName()
+ {
+ return name;
+ }
+
+ private static final Map<String, Tag> MAP;
+
+ static
+ {
+ final Map<String, Tag> map = new HashMap<String, Tag>();
+ for (Tag element : values())
+ {
+ final String name = element.getLocalName();
+ if (name != null)
+ map.put(name, element);
+ }
+ MAP = map;
+ }
+
+ /**
+ *
+ * Static method to get enum instance given localName XsdString
+ *
+ * @param localName a XsdString used as localname (typically tag name as defined in xsd)
+ * @return the enum instance
+ */
+ public static Tag forName(String localName)
+ {
+ final Tag element = MAP.get(localName);
+ return element == null ? UNKNOWN : element;
+ }
+
+ }
+
+}
Deleted: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/ds/TimeOutSettings.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/ds/TimeOutSettings.java 2010-08-15 18:45:14 UTC (rev 107628)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/ds/TimeOutSettings.java 2010-08-16 09:09:33 UTC (rev 107629)
@@ -1,194 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.jca.common.api.metadata.ds;
-
-import org.jboss.jca.common.api.metadata.JCAMetadata;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- *
- * A TimeOutSettings.
- *
- * @author <a href="stefano.maestri at jboss.com">Stefano Maestri</a>
- *
- */
-public interface TimeOutSettings extends JCAMetadata
-{
-
- /**
- * Get the blockingTimeoutMillis.
- *
- * @return the blockingTimeoutMillis.
- */
- public Long getBlockingTimeoutMillis();
-
- /**
- * Get the idleTimeoutMinutes.
- *
- * @return the idleTimeoutMinutes.
- */
- public Long getIdleTimeoutMinutes();
-
- /**
- * Get the setTxQuertTimeout.
- *
- * @return the setTxQuertTimeout.
- */
- public boolean isSetTxQuertTimeout();
-
- /**
- * Get the queryTimeout.
- *
- * @return the queryTimeout.
- */
- public Long getQueryTimeout();
-
- /**
- * Get the useTryLock.
- *
- * @return the useTryLock.
- */
- public Long getUseTryLock();
-
- /**
- * Get the allocationRetry.
- *
- * @return the allocationRetry.
- */
- public Long getAllocationRetry();
-
- /**
- * Get the allocationRetryWaitMillis.
- *
- * @return the allocationRetryWaitMillis.
- */
- public Long getAllocationRetryWaitMillis();
-
- /**
- * Get the xaResourceTimeout.
- *
- * @return the xaResourceTimeout.
- */
- public Long getXaResourceTimeout();
-
- /**
- *
- * A Tag.
- *
- * @author <a href="stefano.maestri at jboss.com">Stefano Maestri</a>
- *
- */
- public enum Tag
- {
- /** always first
- *
- */
- UNKNOWN(null),
-
- /**
- * blockingTimeoutMillis tag
- */
- BLOCKINGTIMEOUTMILLIS("blocking-timeout-millis"),
- /**
- * idleTimeoutMinutes tag
- */
- IDLETIMEOUTMINUTES("idle-timeout-minutes"),
- /**
- * setTxQueryTimeout tag
- */
- SETTXQUERYTIMEOUT("set-tx-query-timeout"),
- /**
- * queryTimeout tag
- */
- QUERYTIMEOUT("query-timeout"),
- /**
- * useTryLock tag
- */
- USETRYLOCK("use-try-lock"),
- /**
- * allocationRetry tag
- */
- ALLOCATIONRETRY("allocation-retry"),
- /**
- * xaResourceTimeout tag
- */
- XARESOURCETIMEOUT("xa-resource-timeout"),
- /**
- * allocationRetryWaitMillis tag
- */
- ALLOCATIONRETRYWAITMILLIS("allocation-retry-wait-millis");
-
- private final String name;
-
- /**
- *
- * Create a new Tag.
- *
- * @param name a name
- */
- Tag(final String name)
- {
- this.name = name;
- }
-
- /**
- * Get the local name of this element.
- *
- * @return the local name
- */
- public String getLocalName()
- {
- return name;
- }
-
- private static final Map<String, Tag> MAP;
-
- static
- {
- final Map<String, Tag> map = new HashMap<String, Tag>();
- for (Tag element : values())
- {
- final String name = element.getLocalName();
- if (name != null)
- map.put(name, element);
- }
- MAP = map;
- }
-
- /**
- *
- * Static method to get enum instance given localName XsdString
- *
- * @param localName a XsdString used as localname (typically tag name as defined in xsd)
- * @return the enum instance
- */
- public static Tag forName(String localName)
- {
- final Tag element = MAP.get(localName);
- return element == null ? UNKNOWN : element;
- }
-
- }
-
-}
Copied: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/ds/Validation.java (from rev 107581, projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/ds/ValidationSettings.java)
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/ds/Validation.java (rev 0)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/ds/Validation.java 2010-08-16 09:09:33 UTC (rev 107629)
@@ -0,0 +1,194 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.jca.common.api.metadata.ds;
+
+import org.jboss.jca.common.api.metadata.JCAMetadata;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ *
+ * A Validation.
+ *
+ * @author <a href="stefano.maestri at jboss.com">Stefano Maestri</a>
+ *
+ */
+public interface Validation extends JCAMetadata
+{
+
+ /**
+ * Get the validConnectionCheckerClassName.
+ *
+ * @return the validConnectionCheckerClassName.
+ */
+ public String getValidConnectionCheckerClassName();
+
+ /**
+ * Get the checkValidConnectionSql.
+ *
+ * @return the checkValidConnectionSql.
+ */
+ public String getCheckValidConnectionSql();
+
+ /**
+ * Get the validateOnMatch.
+ *
+ * @return the validateOnMatch.
+ */
+ public boolean isValidateOnMatch();
+
+ /**
+ * Get the backgroundValidation.
+ *
+ * @return the backgroundValidation.
+ */
+ public boolean isBackgroundValidation();
+
+ /**
+ * Get the backgroundValidationMinutes.
+ *
+ * @return the backgroundValidationMinutes.
+ */
+ public Long getBackgroundValidationMinutes();
+
+ /**
+ * Get the useFastFail.
+ *
+ * @return the useFastFail.
+ */
+ public boolean isUseFastFail();
+
+ /**
+ * Get the staleConnectionCheckerClassName.
+ *
+ * @return the staleConnectionCheckerClassName.
+ */
+ public String getStaleConnectionCheckerClassName();
+
+ /**
+ * Get the exceptionSorterClassName.
+ *
+ * @return the exceptionSorterClassName.
+ */
+ public String getExceptionSorterClassName();
+
+ /**
+ *
+ * A Tag.
+ *
+ * @author <a href="stefano.maestri at jboss.com">Stefano Maestri</a>
+ *
+ */
+ public enum Tag
+ {
+ /** always first
+ *
+ */
+ UNKNOWN(null),
+
+ /**
+ * validConnectionCheckerClassName tag
+ */
+ VALIDCONNECTIONCHECKERCLASSNAME("valid-connection-checker-class-name"),
+ /**
+ * checkValidConnectionSql tag
+ */
+ CHECKVALIDCONNECTIONSQL("check-valid-connection-sql"),
+ /**
+ * validateOnMatch tag
+ */
+ VALIDATEONMATCH("validate-on-match"),
+ /**
+ * backgroundValidation tag
+ */
+ BACKGROUNDVALIDATION("background-validation"),
+ /**
+ * backgroundValidationMinutes tag
+ */
+ BACKGROUNDVALIDATIONMINUTES("background-validation-minutes"),
+ /**
+ * useFastFail tag
+ */
+ USEFASTFAIL("useFastFail"),
+ /**
+ * staleConnectionCheckerClassName tag
+ */
+ STALECONNECTIONCHECKERCLASSNAME("stale-connection-checker-class-name"),
+ /**
+ * exceptionSorterClassName tag
+ */
+ EXCEPTIONSORTERCLASSNAME("exception-sorter-class-name");
+
+ private final String name;
+
+ /**
+ *
+ * Create a new Tag.
+ *
+ * @param name a name
+ */
+ Tag(final String name)
+ {
+ this.name = name;
+ }
+
+ /**
+ * Get the local name of this element.
+ *
+ * @return the local name
+ */
+ public String getLocalName()
+ {
+ return name;
+ }
+
+ private static final Map<String, Tag> MAP;
+
+ static
+ {
+ final Map<String, Tag> map = new HashMap<String, Tag>();
+ for (Tag element : values())
+ {
+ final String name = element.getLocalName();
+ if (name != null)
+ map.put(name, element);
+ }
+ MAP = map;
+ }
+
+ /**
+ *
+ * Static method to get enum instance given localName XsdString
+ *
+ * @param localName a XsdString used as localname (typically tag name as defined in xsd)
+ * @return the enum instance
+ */
+ public static Tag forName(String localName)
+ {
+ final Tag element = MAP.get(localName);
+ return element == null ? UNKNOWN : element;
+ }
+
+ }
+
+}
Deleted: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/ds/ValidationSettings.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/ds/ValidationSettings.java 2010-08-15 18:45:14 UTC (rev 107628)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/ds/ValidationSettings.java 2010-08-16 09:09:33 UTC (rev 107629)
@@ -1,194 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.jca.common.api.metadata.ds;
-
-import org.jboss.jca.common.api.metadata.JCAMetadata;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- *
- * A ValidationSettings.
- *
- * @author <a href="stefano.maestri at jboss.com">Stefano Maestri</a>
- *
- */
-public interface ValidationSettings extends JCAMetadata
-{
-
- /**
- * Get the validConnectionCheckerClassName.
- *
- * @return the validConnectionCheckerClassName.
- */
- public String getValidConnectionCheckerClassName();
-
- /**
- * Get the checkValidConnectionSql.
- *
- * @return the checkValidConnectionSql.
- */
- public String getCheckValidConnectionSql();
-
- /**
- * Get the validateOnMatch.
- *
- * @return the validateOnMatch.
- */
- public boolean isValidateOnMatch();
-
- /**
- * Get the backgroundValidation.
- *
- * @return the backgroundValidation.
- */
- public boolean isBackgroundValidation();
-
- /**
- * Get the backgroundValidationMinutes.
- *
- * @return the backgroundValidationMinutes.
- */
- public Long getBackgroundValidationMinutes();
-
- /**
- * Get the useFastFail.
- *
- * @return the useFastFail.
- */
- public boolean isUseFastFail();
-
- /**
- * Get the staleConnectionCheckerClassName.
- *
- * @return the staleConnectionCheckerClassName.
- */
- public String getStaleConnectionCheckerClassName();
-
- /**
- * Get the exceptionSorterClassName.
- *
- * @return the exceptionSorterClassName.
- */
- public String getExceptionSorterClassName();
-
- /**
- *
- * A Tag.
- *
- * @author <a href="stefano.maestri at jboss.com">Stefano Maestri</a>
- *
- */
- public enum Tag
- {
- /** always first
- *
- */
- UNKNOWN(null),
-
- /**
- * validConnectionCheckerClassName tag
- */
- VALIDCONNECTIONCHECKERCLASSNAME("valid-connection-checker-class-name"),
- /**
- * checkValidConnectionSql tag
- */
- CHECKVALIDCONNECTIONSQL("check-valid-connection-sql"),
- /**
- * validateOnMatch tag
- */
- VALIDATEONMATCH("validate-on-match"),
- /**
- * backgroundValidation tag
- */
- BACKGROUNDVALIDATION("background-validation"),
- /**
- * backgroundValidationMinutes tag
- */
- BACKGROUNDVALIDATIONMINUTES("background-validation-minutes"),
- /**
- * useFastFail tag
- */
- USEFASTFAIL("useFastFail"),
- /**
- * staleConnectionCheckerClassName tag
- */
- STALECONNECTIONCHECKERCLASSNAME("stale-connection-checker-class-name"),
- /**
- * exceptionSorterClassName tag
- */
- EXCEPTIONSORTERCLASSNAME("exception-sorter-class-name");
-
- private final String name;
-
- /**
- *
- * Create a new Tag.
- *
- * @param name a name
- */
- Tag(final String name)
- {
- this.name = name;
- }
-
- /**
- * Get the local name of this element.
- *
- * @return the local name
- */
- public String getLocalName()
- {
- return name;
- }
-
- private static final Map<String, Tag> MAP;
-
- static
- {
- final Map<String, Tag> map = new HashMap<String, Tag>();
- for (Tag element : values())
- {
- final String name = element.getLocalName();
- if (name != null)
- map.put(name, element);
- }
- MAP = map;
- }
-
- /**
- *
- * Static method to get enum instance given localName XsdString
- *
- * @param localName a XsdString used as localname (typically tag name as defined in xsd)
- * @return the enum instance
- */
- public static Tag forName(String localName)
- {
- final Tag element = MAP.get(localName);
- return element == null ? UNKNOWN : element;
- }
-
- }
-
-}
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-15 18:45:14 UTC (rev 107628)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/ds/XaDataSource.java 2010-08-16 09:09:33 UTC (rev 107629)
@@ -111,35 +111,35 @@
*
* @return the recoverySettings.
*/
- public RecoverySettings getRecoverySettings();
+ public Recovery getRecovery();
/**
- * Get the timeOutSettings.
+ * Get the timeOut.
*
- * @return the timeOutSettings.
+ * @return the timeOut.
*/
- public TimeOutSettings getTimeOutSettings();
+ public TimeOut getTimeOut();
/**
- * Get the securitySettings.
+ * Get the security.
*
- * @return the securitySettings.
+ * @return the security.
*/
- public SecuritySettings getSecuritySettings();
+ public Security getSecurity();
/**
- * Get the statementSettings.
+ * Get the statement.
*
- * @return the statementSettings.
+ * @return the statement.
*/
- public StatementSettings getStatementSettings();
+ public Statement getStatement();
/**
- * Get the validationSettings.
+ * Get the validation.
*
- * @return the validationSettings.
+ * @return the validation.
*/
- public ValidationSettings getValidationSettings();
+ public Validation getValidation();
/**
* Get the urlDelimiter.
@@ -282,23 +282,23 @@
/**
* recoverySettings tag
*/
- RECOVERYSETTINGS("recovery-settings"),
+ RECOVERY("recovery"),
/**
- * timeOutSettings tag
+ * timeOut tag
*/
- TIMEOUTSETTINGS("time-out-settings"),
+ TIMEOUT("time-out"),
/**
- * securitySettings tag
+ * security tag
*/
- SECURITYSETTINGS("security-settings"),
+ SECURITY("security"),
/**
- * statementSettings tag
+ * statement tag
*/
- STATEMENTSETTINGS("statement-settings"),
+ STATEMENT("statement"),
/**
- * validationSettings tag
+ * validation tag
*/
- VALIDATIONSETTINGS("validation-settings"),
+ VALIDATION("validation"),
/**
* urlDelimiter tag
*/
Modified: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ds/DataSourceAbstractImpl.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ds/DataSourceAbstractImpl.java 2010-08-15 18:45:14 UTC (rev 107628)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ds/DataSourceAbstractImpl.java 2010-08-16 09:09:33 UTC (rev 107629)
@@ -21,11 +21,11 @@
*/
package org.jboss.jca.common.metadata.ds;
-import org.jboss.jca.common.api.metadata.ds.SecuritySettings;
-import org.jboss.jca.common.api.metadata.ds.StatementSettings;
-import org.jboss.jca.common.api.metadata.ds.TimeOutSettings;
+import org.jboss.jca.common.api.metadata.ds.Security;
+import org.jboss.jca.common.api.metadata.ds.Statement;
+import org.jboss.jca.common.api.metadata.ds.TimeOut;
import org.jboss.jca.common.api.metadata.ds.TransactionIsolation;
-import org.jboss.jca.common.api.metadata.ds.ValidationSettings;
+import org.jboss.jca.common.api.metadata.ds.Validation;
import java.io.Serializable;
@@ -63,24 +63,24 @@
protected final TransactionIsolation transactionIsolation;
/**
- * timeOutSettings
+ * timeOut
*/
- protected final TimeOutSettings timeOutSettings;
+ protected final TimeOut timeOut;
/**
- * securitySettings
+ * security
*/
- protected final SecuritySettings securitySettings;
+ protected final Security security;
/**
- * statementSettings
+ * statement
*/
- protected final StatementSettings statementSettings;
+ protected final Statement statement;
/**
- * validationSettings
+ * validation
*/
- protected final ValidationSettings validationSettings;
+ protected final Validation validation;
/**
* urlDelimiter
@@ -119,10 +119,10 @@
* @param maxPoolSize maxPoolSize
* @param prefill prefill
* @param transactionIsolation transactionIsolation
- * @param timeOutSettings timeOutSettings
- * @param securitySettings securitySettings
- * @param statementSettings statementSettings
- * @param validationSettings validationSettings
+ * @param timeOut timeOut
+ * @param security security
+ * @param statement statement
+ * @param validation validation
* @param urlDelimiter urlDelimiter
* @param urlSelectorStrategyClassName urlSelectorStrategyClassName
* @param useJavaContext useJavaContext
@@ -132,8 +132,8 @@
*/
protected DataSourceAbstractImpl(Integer minPoolSize, Integer maxPoolSize, boolean prefill,
TransactionIsolation transactionIsolation,
- TimeOutSettings timeOutSettings,
- SecuritySettings securitySettings, StatementSettings statementSettings, ValidationSettings validationSettings,
+ TimeOut timeOut,
+ Security security, Statement statement, Validation validation,
String urlDelimiter, String urlSelectorStrategyClassName, boolean useJavaContext,
String poolName, boolean enabled, String jndiName)
{
@@ -142,10 +142,10 @@
this.maxPoolSize = maxPoolSize;
this.prefill = prefill;
this.transactionIsolation = transactionIsolation;
- this.timeOutSettings = timeOutSettings;
- this.securitySettings = securitySettings;
- this.statementSettings = statementSettings;
- this.validationSettings = validationSettings;
+ this.timeOut = timeOut;
+ this.security = security;
+ this.statement = statement;
+ this.validation = validation;
this.urlDelimiter = urlDelimiter;
this.urlSelectorStrategyClassName = urlSelectorStrategyClassName;
this.useJavaContext = useJavaContext;
@@ -199,36 +199,36 @@
}
/**
- * Get the timeOutSettings.
+ * Get the timeOut
*
- * @return the timeOutSettings.
+ * @return the timeOut.
*/
- public final TimeOutSettings getTimeOutSettings()
+ public final TimeOut getTimeOut()
{
- return timeOutSettings;
+ return timeOut;
}
/**
- * Get the securitySettings.
+ * Get the security.
*
- * @return the securitySettings.
+ * @return the security.
*/
- public final SecuritySettings getSecuritySettings()
+ public final Security getSecurity()
{
- return securitySettings;
+ return security;
}
/**
- * Get the validationSettings.
+ * Get the validation.
*
- * @return the validationSettings.
+ * @return the validation.
*/
- public final ValidationSettings getValidationSettings()
+ public final Validation getValidation()
{
- return validationSettings;
+ return validation;
}
/**
Modified: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ds/DataSourceImpl.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ds/DataSourceImpl.java 2010-08-15 18:45:14 UTC (rev 107628)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ds/DataSourceImpl.java 2010-08-16 09:09:33 UTC (rev 107629)
@@ -22,11 +22,11 @@
package org.jboss.jca.common.metadata.ds;
import org.jboss.jca.common.api.metadata.ds.DataSource;
-import org.jboss.jca.common.api.metadata.ds.SecuritySettings;
-import org.jboss.jca.common.api.metadata.ds.StatementSettings;
-import org.jboss.jca.common.api.metadata.ds.TimeOutSettings;
+import org.jboss.jca.common.api.metadata.ds.Security;
+import org.jboss.jca.common.api.metadata.ds.Statement;
+import org.jboss.jca.common.api.metadata.ds.TimeOut;
import org.jboss.jca.common.api.metadata.ds.TransactionIsolation;
-import org.jboss.jca.common.api.metadata.ds.ValidationSettings;
+import org.jboss.jca.common.api.metadata.ds.Validation;
import java.util.Collections;
import java.util.HashMap;
@@ -68,10 +68,10 @@
* @param driverClass driverClass
* @param transactionIsolation transactionIsolation
* @param connectionProperties connectionProperties
- * @param timeOutSettings timeOutSettings
- * @param securitySettings securitySettings
- * @param statementSettings statementSettings
- * @param validationSettings validationSettings
+ * @param timeOut timeOut
+ * @param security security
+ * @param statement statement
+ * @param validation validation
* @param urlDelimiter urlDelimiter
* @param urlSelectorStrategyClassName urlSelectorStrategyClassName
* @param newConnectionSql newConnectionSql
@@ -82,13 +82,13 @@
*/
public DataSourceImpl(Integer minPoolSize, Integer maxPoolSize, boolean prefill, String userName, String password,
String connectionUrl, String driverClass, TransactionIsolation transactionIsolation,
- Map<String, String> connectionProperties, TimeOutSettings timeOutSettings,
- SecuritySettings securitySettings, StatementSettings statementSettings, ValidationSettings validationSettings,
+ Map<String, String> connectionProperties, TimeOut timeOut,
+ Security security, Statement statement, Validation validation,
String urlDelimiter, String urlSelectorStrategyClassName, String newConnectionSql, boolean useJavaContext,
String poolName, boolean enabled, String jndiName)
{
- super(minPoolSize, maxPoolSize, prefill, transactionIsolation, timeOutSettings, securitySettings,
- statementSettings, validationSettings, urlDelimiter, urlSelectorStrategyClassName, useJavaContext,
+ super(minPoolSize, maxPoolSize, prefill, transactionIsolation, timeOut, security,
+ statement, validation, urlDelimiter, urlSelectorStrategyClassName, useJavaContext,
poolName, enabled, jndiName);
this.userName = userName;
this.password = password;
@@ -163,14 +163,14 @@
}
/**
- * Get the statementSettings.
+ * Get the statement.
*
- * @return the statementSettings.
+ * @return the statement.
*/
@Override
- public final StatementSettings getStatementSettings()
+ public final Statement getStatement()
{
- return statementSettings;
+ return statement;
}
/**
@@ -222,15 +222,15 @@
result = prime * result + ((password == null) ? 0 : password.hashCode());
result = prime * result + ((poolName == null) ? 0 : poolName.hashCode());
result = prime * result + (prefill ? 1231 : 1237);
- result = prime * result + ((securitySettings == null) ? 0 : securitySettings.hashCode());
- result = prime * result + ((statementSettings == null) ? 0 : statementSettings.hashCode());
- result = prime * result + ((timeOutSettings == null) ? 0 : timeOutSettings.hashCode());
+ result = prime * result + ((security == null) ? 0 : security.hashCode());
+ result = prime * result + ((statement == null) ? 0 : statement.hashCode());
+ result = prime * result + ((timeOut == null) ? 0 : timeOut.hashCode());
result = prime * result + ((transactionIsolation == null) ? 0 : transactionIsolation.hashCode());
result = prime * result + ((urlDelimiter == null) ? 0 : urlDelimiter.hashCode());
result = prime * result + ((urlSelectorStrategyClassName == null) ? 0 : urlSelectorStrategyClassName.hashCode());
result = prime * result + (useJavaContext ? 1231 : 1237);
result = prime * result + ((userName == null) ? 0 : userName.hashCode());
- result = prime * result + ((validationSettings == null) ? 0 : validationSettings.hashCode());
+ result = prime * result + ((validation == null) ? 0 : validation.hashCode());
return result;
}
@@ -311,26 +311,26 @@
return false;
if (prefill != other.prefill)
return false;
- if (securitySettings == null)
+ if (security == null)
{
- if (other.securitySettings != null)
+ if (other.security != null)
return false;
}
- else if (!securitySettings.equals(other.securitySettings))
+ else if (!security.equals(other.security))
return false;
- if (statementSettings == null)
+ if (statement == null)
{
- if (other.statementSettings != null)
+ if (other.statement != null)
return false;
}
- else if (!statementSettings.equals(other.statementSettings))
+ else if (!statement.equals(other.statement))
return false;
- if (timeOutSettings == null)
+ if (timeOut == null)
{
- if (other.timeOutSettings != null)
+ if (other.timeOut != null)
return false;
}
- else if (!timeOutSettings.equals(other.timeOutSettings))
+ else if (!timeOut.equals(other.timeOut))
return false;
if (transactionIsolation != other.transactionIsolation)
return false;
@@ -357,12 +357,12 @@
}
else if (!userName.equals(other.userName))
return false;
- if (validationSettings == null)
+ if (validation == null)
{
- if (other.validationSettings != null)
+ if (other.validation != null)
return false;
}
- else if (!validationSettings.equals(other.validationSettings))
+ else if (!validation.equals(other.validation))
return false;
return true;
}
@@ -373,9 +373,9 @@
return "DataSourceImpl [minPoolSize=" + minPoolSize + ", maxPoolSize=" + maxPoolSize + ", prefill=" + prefill
+ ", userName=" + userName + ", password=" + password + ", connectionUrl=" + connectionUrl
+ ", driverClass=" + driverClass + ", transactionIsolation=" + transactionIsolation
- + ", connectionProperties=" + connectionProperties + ", timeOutSettings=" + timeOutSettings
- + ", securitySettings=" + securitySettings + ", statementSettings=" + statementSettings
- + ", validationSettings=" + validationSettings + ", urlDelimiter=" + urlDelimiter
+ + ", connectionProperties=" + connectionProperties + ", timeOut=" + timeOut
+ + ", security=" + security + ", statement=" + statement
+ + ", validation=" + validation + ", urlDelimiter=" + urlDelimiter
+ ", urlSelectorStrategyClassName=" + urlSelectorStrategyClassName + ", newConnectionSql="
+ newConnectionSql + ", useJavaContext=" + useJavaContext + ", poolName=" + poolName + ", enabled="
+ enabled + ", jndiName=" + jndiName + "]";
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-15 18:45:14 UTC (rev 107628)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ds/DsParser.java 2010-08-16 09:09:33 UTC (rev 107629)
@@ -23,14 +23,14 @@
import org.jboss.jca.common.api.metadata.ds.DataSource;
import org.jboss.jca.common.api.metadata.ds.DataSources;
-import org.jboss.jca.common.api.metadata.ds.RecoverySettings;
-import org.jboss.jca.common.api.metadata.ds.SecuritySettings;
-import org.jboss.jca.common.api.metadata.ds.SecuritySettings.SecurityManager;
-import org.jboss.jca.common.api.metadata.ds.StatementSettings;
-import org.jboss.jca.common.api.metadata.ds.StatementSettings.TrackStatementsEnum;
-import org.jboss.jca.common.api.metadata.ds.TimeOutSettings;
+import org.jboss.jca.common.api.metadata.ds.Recovery;
+import org.jboss.jca.common.api.metadata.ds.Security;
+import org.jboss.jca.common.api.metadata.ds.Security.SecurityManager;
+import org.jboss.jca.common.api.metadata.ds.Statement;
+import org.jboss.jca.common.api.metadata.ds.Statement.TrackStatementsEnum;
+import org.jboss.jca.common.api.metadata.ds.TimeOut;
import org.jboss.jca.common.api.metadata.ds.TransactionIsolation;
-import org.jboss.jca.common.api.metadata.ds.ValidationSettings;
+import org.jboss.jca.common.api.metadata.ds.Validation;
import org.jboss.jca.common.api.metadata.ds.XaDataSource;
import org.jboss.jca.common.api.metadata.ds.XaDataSource.Attribute;
import org.jboss.jca.common.metadata.AbstractParser;
@@ -40,6 +40,7 @@
import java.io.InputStream;
import java.util.ArrayList;
import java.util.HashMap;
+import java.util.Locale;
import java.util.Map;
import javax.xml.stream.XMLInputFactory;
@@ -168,10 +169,10 @@
String password = null;
TransactionIsolation transactionIsolation = null;
Map<String, String> xaDataSourceProperty = new HashMap<String, String>();
- TimeOutSettings timeOutSettings = null;
- SecuritySettings securitySettings = null;
- StatementSettings statementSettings = null;
- ValidationSettings validationSettings = null;
+ TimeOut timeOutSettings = null;
+ Security securitySettings = null;
+ Statement statementSettings = null;
+ Validation validationSettings = null;
String urlDelimiter = null;
String urlSelectorStrategyClassName = null;
String newConnectionSql = null;
@@ -179,7 +180,7 @@
boolean interleaving = false;
boolean isSameRmOverrideValue = false;
String xaDataSourceClass = null;
- RecoverySettings recoverySettings = null;
+ Recovery recoverySettings = null;
boolean padXid = false;
boolean noTxSeparatePool = false;
boolean wrapXaDataSource = false;
@@ -290,19 +291,19 @@
transactionIsolation = TransactionIsolation.valueOf(elementAsString(reader));
break;
}
- case SECURITYSETTINGS : {
+ case SECURITY : {
securitySettings = parseSecuritySettings(reader);
break;
}
- case STATEMENTSETTINGS : {
+ case STATEMENT : {
statementSettings = parseStatementSettings(reader);
break;
}
- case TIMEOUTSETTINGS : {
+ case TIMEOUT : {
timeOutSettings = parseTimeOutSettings(reader);
break;
}
- case VALIDATIONSETTINGS : {
+ case VALIDATION : {
validationSettings = parseValidationSetting(reader);
break;
}
@@ -314,7 +315,7 @@
isSameRmOverrideValue = elementAsBoolean(reader);
break;
}
- case RECOVERYSETTINGS : {
+ case RECOVERY : {
recoverySettings = parseRecoverySettings(reader);
break;
}
@@ -344,7 +345,7 @@
throw new ParserException("Reached end of xml document unexpectedly");
}
- private RecoverySettings parseRecoverySettings(XMLStreamReader reader) throws XMLStreamException, ParserException
+ private Recovery parseRecoverySettings(XMLStreamReader reader) throws XMLStreamException, ParserException
{
String recoverUserName = null;
String recoverPassword = null;
@@ -356,15 +357,15 @@
switch (reader.nextTag())
{
case END_ELEMENT : {
- if (XaDataSource.Tag.forName(reader.getLocalName()) == XaDataSource.Tag.RECOVERYSETTINGS)
+ if (XaDataSource.Tag.forName(reader.getLocalName()) == XaDataSource.Tag.RECOVERY)
{
- return new RecoverySettingsImpl(noRecover, recoverUserName, recoverPassword, recoverSecurityDomain);
+ return new RecoveryImpl(noRecover, recoverUserName, recoverPassword, recoverSecurityDomain);
}
else
{
- if (RecoverySettings.Tag.forName(reader.getLocalName()) == RecoverySettings.Tag.UNKNOWN)
+ if (Recovery.Tag.forName(reader.getLocalName()) == Recovery.Tag.UNKNOWN)
{
throw new ParserException("unexpected end tag" + reader.getLocalName());
}
@@ -372,7 +373,7 @@
break;
}
case START_ELEMENT : {
- switch (RecoverySettings.Tag.forName(reader.getLocalName()))
+ switch (Recovery.Tag.forName(reader.getLocalName()))
{
case NORECOVER : {
noRecover = elementAsBoolean(reader);
@@ -411,10 +412,10 @@
String driverClass = null;
TransactionIsolation transactionIsolation = null;
Map<String, String> connectionProperties = new HashMap<String, String>();
- TimeOutSettings timeOutSettings = null;
- SecuritySettings securitySettings = null;
- StatementSettings statementSettings = null;
- ValidationSettings validationSettings = null;
+ TimeOut timeOutSettings = null;
+ Security securitySettings = null;
+ Statement statementSettings = null;
+ Validation validationSettings = null;
String urlDelimiter = null;
String urlSelectorStrategyClassName = null;
String newConnectionSql = null;
@@ -524,19 +525,19 @@
transactionIsolation = TransactionIsolation.valueOf(elementAsString(reader));
break;
}
- case SECURITYSETTINGS : {
+ case SECURITY : {
securitySettings = parseSecuritySettings(reader);
break;
}
- case STATEMENTSETTINGS : {
+ case STATEMENT : {
statementSettings = parseStatementSettings(reader);
break;
}
- case TIMEOUTSETTINGS : {
+ case TIMEOUT : {
timeOutSettings = parseTimeOutSettings(reader);
break;
}
- case VALIDATIONSETTINGS : {
+ case VALIDATION : {
validationSettings = parseValidationSetting(reader);
break;
}
@@ -550,7 +551,7 @@
throw new ParserException("Reached end of xml document unexpectedly");
}
- private ValidationSettings parseValidationSetting(XMLStreamReader reader) throws XMLStreamException, ParserException
+ private Validation parseValidationSetting(XMLStreamReader reader) throws XMLStreamException, ParserException
{
boolean validateOnMatch = false;
boolean useFastFail = false;
@@ -566,17 +567,17 @@
switch (reader.nextTag())
{
case END_ELEMENT : {
- if (DataSource.Tag.forName(reader.getLocalName()) == DataSource.Tag.VALIDATIONSETTINGS)
+ if (DataSource.Tag.forName(reader.getLocalName()) == DataSource.Tag.VALIDATION)
{
- return new ValidationSettingsImpl(validConnectionCheckerClassName, checkValidConnectionSql,
+ return new ValidationImpl(validConnectionCheckerClassName, checkValidConnectionSql,
validateOnMatch, backgroundValidation, backgroundValidationMinutes, useFastFail,
staleConnectionCheckerClassName, exceptionSorterClassName);
}
else
{
- if (ValidationSettings.Tag.forName(reader.getLocalName()) == ValidationSettings.Tag.UNKNOWN)
+ if (Validation.Tag.forName(reader.getLocalName()) == Validation.Tag.UNKNOWN)
{
throw new ParserException("unexpected end tag" + reader.getLocalName());
}
@@ -584,7 +585,7 @@
break;
}
case START_ELEMENT : {
- switch (ValidationSettings.Tag.forName(reader.getLocalName()))
+ switch (Validation.Tag.forName(reader.getLocalName()))
{
case BACKGROUNDVALIDATION : {
backgroundValidation = elementAsBoolean(reader);
@@ -628,7 +629,7 @@
throw new ParserException("Reached end of xml document unexpectedly");
}
- private TimeOutSettings parseTimeOutSettings(XMLStreamReader reader) throws XMLStreamException, ParserException
+ private TimeOut parseTimeOutSettings(XMLStreamReader reader) throws XMLStreamException, ParserException
{
Long blockingTimeoutMillis = null;
@@ -645,15 +646,15 @@
switch (reader.nextTag())
{
case END_ELEMENT : {
- if (DataSource.Tag.forName(reader.getLocalName()) == DataSource.Tag.TIMEOUTSETTINGS)
+ if (DataSource.Tag.forName(reader.getLocalName()) == DataSource.Tag.TIMEOUT)
{
- return new TimeOutSettingsImpl(blockingTimeoutMillis, idleTimeoutMinutes, setTxQuertTimeout,
+ return new TimeOutImpl(blockingTimeoutMillis, idleTimeoutMinutes, setTxQuertTimeout,
queryTimeout, useTryLock, allocationRetry, allocationRetryWaitMillis, xaResourceTimeout);
}
else
{
- if (TimeOutSettings.Tag.forName(reader.getLocalName()) == TimeOutSettings.Tag.UNKNOWN)
+ if (TimeOut.Tag.forName(reader.getLocalName()) == TimeOut.Tag.UNKNOWN)
{
throw new ParserException("unexpected end tag" + reader.getLocalName());
}
@@ -661,7 +662,7 @@
break;
}
case START_ELEMENT : {
- switch (TimeOutSettings.Tag.forName(reader.getLocalName()))
+ switch (TimeOut.Tag.forName(reader.getLocalName()))
{
case ALLOCATIONRETRY : {
allocationRetry = elementAsLong(reader);
@@ -705,7 +706,7 @@
throw new ParserException("Reached end of xml document unexpectedly");
}
- private StatementSettings parseStatementSettings(XMLStreamReader reader) throws XMLStreamException, ParserException
+ private Statement parseStatementSettings(XMLStreamReader reader) throws XMLStreamException, ParserException
{
Long preparedStatementsCacheSize = null;
@@ -717,15 +718,15 @@
switch (reader.nextTag())
{
case END_ELEMENT : {
- if (DataSource.Tag.forName(reader.getLocalName()) == DataSource.Tag.STATEMENTSETTINGS)
+ if (DataSource.Tag.forName(reader.getLocalName()) == DataSource.Tag.STATEMENT)
{
- return new StatementSettingsImpl(sharePreparedStatements, preparedStatementsCacheSize,
+ return new StatementImpl(sharePreparedStatements, preparedStatementsCacheSize,
trackStatements);
}
else
{
- if (StatementSettings.Tag.forName(reader.getLocalName()) == StatementSettings.Tag.UNKNOWN)
+ if (Statement.Tag.forName(reader.getLocalName()) == Statement.Tag.UNKNOWN)
{
throw new ParserException("unexpected end tag" + reader.getLocalName());
}
@@ -733,7 +734,7 @@
break;
}
case START_ELEMENT : {
- switch (StatementSettings.Tag.forName(reader.getLocalName()))
+ switch (Statement.Tag.forName(reader.getLocalName()))
{
case PREPAREDSTATEMENTCACHESIZE : {
preparedStatementsCacheSize = elementAsLong(reader);
@@ -742,7 +743,7 @@
case TRACKSTATEMENTS : {
String elementString = elementAsString(reader);
trackStatements = TrackStatementsEnum.valueOf(elementString == null ? "FALSE" : elementString
- .toUpperCase());
+ .toUpperCase(Locale.US));
break;
}
case SHAREPREPAREDSTATEMENTS : {
@@ -759,7 +760,7 @@
throw new ParserException("Reached end of xml document unexpectedly");
}
- private SecuritySettings parseSecuritySettings(XMLStreamReader reader) throws XMLStreamException, ParserException
+ private Security parseSecuritySettings(XMLStreamReader reader) throws XMLStreamException, ParserException
{
SecurityManager securityManager = null;
@@ -770,14 +771,14 @@
switch (reader.nextTag())
{
case END_ELEMENT : {
- if (DataSource.Tag.forName(reader.getLocalName()) == DataSource.Tag.SECURITYSETTINGS)
+ if (DataSource.Tag.forName(reader.getLocalName()) == DataSource.Tag.SECURITY)
{
- return new SecuritySettingsImpl(securityManager, securityDomain);
+ return new SecurityImpl(securityManager, securityDomain);
}
else
{
- if (SecuritySettings.Tag.forName(reader.getLocalName()) == SecuritySettings.Tag.UNKNOWN)
+ if (Security.Tag.forName(reader.getLocalName()) == Security.Tag.UNKNOWN)
{
throw new ParserException("unexpected end tag" + reader.getLocalName());
}
@@ -785,7 +786,7 @@
break;
}
case START_ELEMENT : {
- switch (SecuritySettings.Tag.forName(reader.getLocalName()))
+ switch (Security.Tag.forName(reader.getLocalName()))
{
case SECURITYDOMAIN : {
securityDomain = elementAsString(reader);
Copied: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ds/RecoveryImpl.java (from rev 107581, projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ds/RecoverySettingsImpl.java)
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ds/RecoveryImpl.java (rev 0)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ds/RecoveryImpl.java 2010-08-16 09:09:33 UTC (rev 107629)
@@ -0,0 +1,164 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.jca.common.metadata.ds;
+
+import org.jboss.jca.common.api.metadata.ds.Recovery;
+
+/**
+ *
+ * A RecoveryImpl.
+ *
+ * @author <a href="stefano.maestri at jboss.com">Stefano Maestri</a>
+ *
+ */
+public class RecoveryImpl implements Recovery
+{
+
+ /** The serialVersionUID */
+ private static final long serialVersionUID = 1704161236644120141L;
+
+ private final boolean noRecover;
+
+ private final String recoverUserName;
+
+ private final String recoverPassword;
+
+ private final String recoverSecurityDomain;
+
+ /**
+ * Create a new RecoveryImpl.
+ *
+ * @param noRecover boolean value from xml tab
+ * @param recoverUserName user name for recover
+ * @param recoverPassword password
+ * @param recoverSecurityDomain security domain used during recover
+ */
+ public RecoveryImpl(boolean noRecover, String recoverUserName, String recoverPassword,
+ String recoverSecurityDomain)
+ {
+ super();
+ this.noRecover = noRecover;
+ this.recoverUserName = recoverUserName;
+ this.recoverPassword = recoverPassword;
+ this.recoverSecurityDomain = recoverSecurityDomain;
+ }
+
+ /**
+ * Get the noRecover.
+ *
+ * @return the noRecover.
+ */
+ @Override
+ public final boolean isNoRecover()
+ {
+ return noRecover;
+ }
+
+ /**
+ * Get the recoverUserName.
+ *
+ * @return the recoverUserName.
+ */
+ @Override
+ public final String getRecoverUserName()
+ {
+ return recoverUserName;
+ }
+
+ /**
+ * Get the recoverPassword.
+ *
+ * @return the recoverPassword.
+ */
+ @Override
+ public final String getRecoverPassword()
+ {
+ return recoverPassword;
+ }
+
+ /**
+ * Get the recoverSecurityDomain.
+ *
+ * @return the recoverSecurityDomain.
+ */
+ @Override
+ public final String getRecoverSecurityDomain()
+ {
+ return recoverSecurityDomain;
+ }
+
+ @Override
+ public int hashCode()
+ {
+ final int prime = 31;
+ int result = 1;
+ result = prime * result + (noRecover ? 1231 : 1237);
+ result = prime * result + ((recoverPassword == null) ? 0 : recoverPassword.hashCode());
+ result = prime * result + ((recoverSecurityDomain == null) ? 0 : recoverSecurityDomain.hashCode());
+ result = prime * result + ((recoverUserName == null) ? 0 : recoverUserName.hashCode());
+ return result;
+ }
+
+ @Override
+ public boolean equals(Object obj)
+ {
+ if (this == obj)
+ return true;
+ if (obj == null)
+ return false;
+ if (!(obj instanceof RecoveryImpl))
+ return false;
+ RecoveryImpl other = (RecoveryImpl) obj;
+ if (noRecover != other.noRecover)
+ return false;
+ if (recoverPassword == null)
+ {
+ if (other.recoverPassword != null)
+ return false;
+ }
+ else if (!recoverPassword.equals(other.recoverPassword))
+ return false;
+ if (recoverSecurityDomain == null)
+ {
+ if (other.recoverSecurityDomain != null)
+ return false;
+ }
+ else if (!recoverSecurityDomain.equals(other.recoverSecurityDomain))
+ return false;
+ if (recoverUserName == null)
+ {
+ if (other.recoverUserName != null)
+ return false;
+ }
+ else if (!recoverUserName.equals(other.recoverUserName))
+ return false;
+ return true;
+ }
+
+ @Override
+ public String toString()
+ {
+ return "RecoveryImpl [noRecover=" + noRecover + ", recoverUserName=" + recoverUserName
+ + ", recoverPassword=" + recoverPassword + ", recoverSecurityDomain=" + recoverSecurityDomain + "]";
+ }
+
+}
Deleted: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ds/RecoverySettingsImpl.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ds/RecoverySettingsImpl.java 2010-08-15 18:45:14 UTC (rev 107628)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ds/RecoverySettingsImpl.java 2010-08-16 09:09:33 UTC (rev 107629)
@@ -1,164 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.jca.common.metadata.ds;
-
-import org.jboss.jca.common.api.metadata.ds.RecoverySettings;
-
-/**
- *
- * A RecoverySettingsImpl.
- *
- * @author <a href="stefano.maestri at jboss.com">Stefano Maestri</a>
- *
- */
-public class RecoverySettingsImpl implements RecoverySettings
-{
-
- /** The serialVersionUID */
- private static final long serialVersionUID = 1704161236644120141L;
-
- private final boolean noRecover;
-
- private final String recoverUserName;
-
- private final String recoverPassword;
-
- private final String recoverSecurityDomain;
-
- /**
- * Create a new RecoverySettingsImpl.
- *
- * @param noRecover boolean value from xml tab
- * @param recoverUserName user name for recover
- * @param recoverPassword password
- * @param recoverSecurityDomain security domain used during recover
- */
- public RecoverySettingsImpl(boolean noRecover, String recoverUserName, String recoverPassword,
- String recoverSecurityDomain)
- {
- super();
- this.noRecover = noRecover;
- this.recoverUserName = recoverUserName;
- this.recoverPassword = recoverPassword;
- this.recoverSecurityDomain = recoverSecurityDomain;
- }
-
- /**
- * Get the noRecover.
- *
- * @return the noRecover.
- */
- @Override
- public final boolean isNoRecover()
- {
- return noRecover;
- }
-
- /**
- * Get the recoverUserName.
- *
- * @return the recoverUserName.
- */
- @Override
- public final String getRecoverUserName()
- {
- return recoverUserName;
- }
-
- /**
- * Get the recoverPassword.
- *
- * @return the recoverPassword.
- */
- @Override
- public final String getRecoverPassword()
- {
- return recoverPassword;
- }
-
- /**
- * Get the recoverSecurityDomain.
- *
- * @return the recoverSecurityDomain.
- */
- @Override
- public final String getRecoverSecurityDomain()
- {
- return recoverSecurityDomain;
- }
-
- @Override
- public int hashCode()
- {
- final int prime = 31;
- int result = 1;
- result = prime * result + (noRecover ? 1231 : 1237);
- result = prime * result + ((recoverPassword == null) ? 0 : recoverPassword.hashCode());
- result = prime * result + ((recoverSecurityDomain == null) ? 0 : recoverSecurityDomain.hashCode());
- result = prime * result + ((recoverUserName == null) ? 0 : recoverUserName.hashCode());
- return result;
- }
-
- @Override
- public boolean equals(Object obj)
- {
- if (this == obj)
- return true;
- if (obj == null)
- return false;
- if (!(obj instanceof RecoverySettingsImpl))
- return false;
- RecoverySettingsImpl other = (RecoverySettingsImpl) obj;
- if (noRecover != other.noRecover)
- return false;
- if (recoverPassword == null)
- {
- if (other.recoverPassword != null)
- return false;
- }
- else if (!recoverPassword.equals(other.recoverPassword))
- return false;
- if (recoverSecurityDomain == null)
- {
- if (other.recoverSecurityDomain != null)
- return false;
- }
- else if (!recoverSecurityDomain.equals(other.recoverSecurityDomain))
- return false;
- if (recoverUserName == null)
- {
- if (other.recoverUserName != null)
- return false;
- }
- else if (!recoverUserName.equals(other.recoverUserName))
- return false;
- return true;
- }
-
- @Override
- public String toString()
- {
- return "RecoverySettingsImpl [noRecover=" + noRecover + ", recoverUserName=" + recoverUserName
- + ", recoverPassword=" + recoverPassword + ", recoverSecurityDomain=" + recoverSecurityDomain + "]";
- }
-
-}
Copied: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ds/SecurityImpl.java (from rev 107581, projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ds/SecuritySettingsImpl.java)
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ds/SecurityImpl.java (rev 0)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ds/SecurityImpl.java 2010-08-16 09:09:33 UTC (rev 107629)
@@ -0,0 +1,117 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.jca.common.metadata.ds;
+
+import org.jboss.jca.common.api.metadata.ds.Security;
+
+
+/**
+ *
+ * A SecurityImpl.
+ *
+ * @author <a href="stefano.maestri at jboss.com">Stefano Maestri</a>
+ *
+ */
+public class SecurityImpl implements Security
+{
+
+ /** The serialVersionUID */
+ private static final long serialVersionUID = -5842402120520191086L;
+
+ private final SecurityManager securityManager;
+
+ private final String securityDomain;
+
+ /**
+ * Create a new SecurityImpl.
+ *
+ * @param securityManager securityManager
+ * @param securityDomain securityDomain
+ */
+ public SecurityImpl(SecurityManager securityManager, String securityDomain)
+ {
+ super();
+ this.securityManager = securityManager;
+ this.securityDomain = securityDomain;
+ }
+
+ /**
+ * Get the securityManager.
+ *
+ * @return the securityManager.
+ */
+ @Override
+ public final SecurityManager getSecurityManager()
+ {
+ return securityManager;
+ }
+
+ /**
+ * Get the securityDomain.
+ *
+ * @return the securityDomain.
+ */
+ @Override
+ public final String getSecurityDomain()
+ {
+ return securityDomain;
+ }
+
+ @Override
+ public int hashCode()
+ {
+ final int prime = 31;
+ int result = 1;
+ result = prime * result + ((securityDomain == null) ? 0 : securityDomain.hashCode());
+ result = prime * result + ((securityManager == null) ? 0 : securityManager.hashCode());
+ return result;
+ }
+
+ @Override
+ public boolean equals(Object obj)
+ {
+ if (this == obj)
+ return true;
+ if (obj == null)
+ return false;
+ if (!(obj instanceof SecurityImpl))
+ return false;
+ SecurityImpl other = (SecurityImpl) obj;
+ if (securityDomain == null)
+ {
+ if (other.securityDomain != null)
+ return false;
+ }
+ else if (!securityDomain.equals(other.securityDomain))
+ return false;
+ if (securityManager != other.securityManager)
+ return false;
+ return true;
+ }
+
+ @Override
+ public String toString()
+ {
+ return "SecurityImpl [securityManager=" + securityManager + ", securityDomain=" + securityDomain + "]";
+ }
+
+}
Deleted: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ds/SecuritySettingsImpl.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ds/SecuritySettingsImpl.java 2010-08-15 18:45:14 UTC (rev 107628)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ds/SecuritySettingsImpl.java 2010-08-16 09:09:33 UTC (rev 107629)
@@ -1,117 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.jca.common.metadata.ds;
-
-import org.jboss.jca.common.api.metadata.ds.SecuritySettings;
-
-
-/**
- *
- * A SecuritySettingsImpl.
- *
- * @author <a href="stefano.maestri at jboss.com">Stefano Maestri</a>
- *
- */
-public class SecuritySettingsImpl implements SecuritySettings
-{
-
- /** The serialVersionUID */
- private static final long serialVersionUID = -5842402120520191086L;
-
- private final SecurityManager securityManager;
-
- private final String securityDomain;
-
- /**
- * Create a new SecuritySettingsImpl.
- *
- * @param securityManager securityManager
- * @param securityDomain securityDomain
- */
- public SecuritySettingsImpl(SecurityManager securityManager, String securityDomain)
- {
- super();
- this.securityManager = securityManager;
- this.securityDomain = securityDomain;
- }
-
- /**
- * Get the securityManager.
- *
- * @return the securityManager.
- */
- @Override
- public final SecurityManager getSecurityManager()
- {
- return securityManager;
- }
-
- /**
- * Get the securityDomain.
- *
- * @return the securityDomain.
- */
- @Override
- public final String getSecurityDomain()
- {
- return securityDomain;
- }
-
- @Override
- public int hashCode()
- {
- final int prime = 31;
- int result = 1;
- result = prime * result + ((securityDomain == null) ? 0 : securityDomain.hashCode());
- result = prime * result + ((securityManager == null) ? 0 : securityManager.hashCode());
- return result;
- }
-
- @Override
- public boolean equals(Object obj)
- {
- if (this == obj)
- return true;
- if (obj == null)
- return false;
- if (!(obj instanceof SecuritySettingsImpl))
- return false;
- SecuritySettingsImpl other = (SecuritySettingsImpl) obj;
- if (securityDomain == null)
- {
- if (other.securityDomain != null)
- return false;
- }
- else if (!securityDomain.equals(other.securityDomain))
- return false;
- if (securityManager != other.securityManager)
- return false;
- return true;
- }
-
- @Override
- public String toString()
- {
- return "SecuritySettingsImpl [securityManager=" + securityManager + ", securityDomain=" + securityDomain + "]";
- }
-
-}
Copied: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ds/StatementImpl.java (from rev 107581, projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ds/StatementSettingsImpl.java)
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ds/StatementImpl.java (rev 0)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ds/StatementImpl.java 2010-08-16 09:09:33 UTC (rev 107629)
@@ -0,0 +1,137 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.jca.common.metadata.ds;
+
+import org.jboss.jca.common.api.metadata.ds.Statement;
+
+/**
+ *
+ * A StatementImpl.
+ *
+ * @author <a href="stefano.maestri at jboss.com">Stefano Maestri</a>
+ *
+ */
+public class StatementImpl implements Statement
+{
+
+ /** The serialVersionUID */
+ private static final long serialVersionUID = 3361665706947342366L;
+
+ private final boolean sharePreparedStatements;
+
+ private final Long preparedStatementsCacheSize;
+
+ private final TrackStatementsEnum trackStatements;
+
+ /**
+ * Create a new StatementImpl.
+ *
+ * @param sharePreparedStatements sharePreparedStatements
+ * @param preparedStatementsCacheSize preparedStatementsCacheSize
+ * @param trackStatements trackStatements
+ */
+ public StatementImpl(boolean sharePreparedStatements, Long preparedStatementsCacheSize,
+ TrackStatementsEnum trackStatements)
+ {
+ super();
+ this.sharePreparedStatements = sharePreparedStatements;
+ this.preparedStatementsCacheSize = preparedStatementsCacheSize;
+ this.trackStatements = trackStatements;
+ }
+
+ /**
+ * Get the sharePreparedStatements.
+ *
+ * @return the sharePreparedStatements.
+ */
+ @Override
+ public final boolean isSharePreparedStatements()
+ {
+ return sharePreparedStatements;
+ }
+
+ /**
+ * Get the preparedStatementsCacheSize.
+ *
+ * @return the preparedStatementsCacheSize.
+ */
+ @Override
+ public final Long getPreparedStatementsCacheSize()
+ {
+ return preparedStatementsCacheSize;
+ }
+
+ /**
+ * Get the trackStatements.
+ *
+ * @return the trackStatements.
+ */
+ @Override
+ public final TrackStatementsEnum getTrackStatements()
+ {
+ return trackStatements;
+ }
+
+ @Override
+ public int hashCode()
+ {
+ final int prime = 31;
+ int result = 1;
+ result = prime * result + ((preparedStatementsCacheSize == null) ? 0 : preparedStatementsCacheSize.hashCode());
+ result = prime * result + (sharePreparedStatements ? 1231 : 1237);
+ result = prime * result + ((trackStatements == null) ? 0 : trackStatements.hashCode());
+ return result;
+ }
+
+ @Override
+ public boolean equals(Object obj)
+ {
+ if (this == obj)
+ return true;
+ if (obj == null)
+ return false;
+ if (!(obj instanceof StatementImpl))
+ return false;
+ StatementImpl other = (StatementImpl) obj;
+ if (preparedStatementsCacheSize == null)
+ {
+ if (other.preparedStatementsCacheSize != null)
+ return false;
+ }
+ else if (!preparedStatementsCacheSize.equals(other.preparedStatementsCacheSize))
+ return false;
+ if (sharePreparedStatements != other.sharePreparedStatements)
+ return false;
+ if (trackStatements != other.trackStatements)
+ return false;
+ return true;
+ }
+
+ @Override
+ public String toString()
+ {
+ return "StatementImpl [sharePreparedStatements=" + sharePreparedStatements +
+ ", preparedStatementsCacheSize=" + preparedStatementsCacheSize +
+ ", trackStatements=" + trackStatements + "]";
+ }
+}
+
Deleted: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ds/StatementSettingsImpl.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ds/StatementSettingsImpl.java 2010-08-15 18:45:14 UTC (rev 107628)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ds/StatementSettingsImpl.java 2010-08-16 09:09:33 UTC (rev 107629)
@@ -1,137 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.jca.common.metadata.ds;
-
-import org.jboss.jca.common.api.metadata.ds.StatementSettings;
-
-/**
- *
- * A StatementSettingsImpl.
- *
- * @author <a href="stefano.maestri at jboss.com">Stefano Maestri</a>
- *
- */
-public class StatementSettingsImpl implements StatementSettings
-{
-
- /** The serialVersionUID */
- private static final long serialVersionUID = 3361665706947342366L;
-
- private final boolean sharePreparedStatements;
-
- private final Long preparedStatementsCacheSize;
-
- private final TrackStatementsEnum trackStatements;
-
- /**
- * Create a new StatementSettingsImpl.
- *
- * @param sharePreparedStatements sharePreparedStatements
- * @param preparedStatementsCacheSize preparedStatementsCacheSize
- * @param trackStatements trackStatements
- */
- public StatementSettingsImpl(boolean sharePreparedStatements, Long preparedStatementsCacheSize,
- TrackStatementsEnum trackStatements)
- {
- super();
- this.sharePreparedStatements = sharePreparedStatements;
- this.preparedStatementsCacheSize = preparedStatementsCacheSize;
- this.trackStatements = trackStatements;
- }
-
- /**
- * Get the sharePreparedStatements.
- *
- * @return the sharePreparedStatements.
- */
- @Override
- public final boolean isSharePreparedStatements()
- {
- return sharePreparedStatements;
- }
-
- /**
- * Get the preparedStatementsCacheSize.
- *
- * @return the preparedStatementsCacheSize.
- */
- @Override
- public final Long getPreparedStatementsCacheSize()
- {
- return preparedStatementsCacheSize;
- }
-
- /**
- * Get the trackStatements.
- *
- * @return the trackStatements.
- */
- @Override
- public final TrackStatementsEnum getTrackStatements()
- {
- return trackStatements;
- }
-
- @Override
- public int hashCode()
- {
- final int prime = 31;
- int result = 1;
- result = prime * result + ((preparedStatementsCacheSize == null) ? 0 : preparedStatementsCacheSize.hashCode());
- result = prime * result + (sharePreparedStatements ? 1231 : 1237);
- result = prime * result + ((trackStatements == null) ? 0 : trackStatements.hashCode());
- return result;
- }
-
- @Override
- public boolean equals(Object obj)
- {
- if (this == obj)
- return true;
- if (obj == null)
- return false;
- if (!(obj instanceof StatementSettingsImpl))
- return false;
- StatementSettingsImpl other = (StatementSettingsImpl) obj;
- if (preparedStatementsCacheSize == null)
- {
- if (other.preparedStatementsCacheSize != null)
- return false;
- }
- else if (!preparedStatementsCacheSize.equals(other.preparedStatementsCacheSize))
- return false;
- if (sharePreparedStatements != other.sharePreparedStatements)
- return false;
- if (trackStatements != other.trackStatements)
- return false;
- return true;
- }
-
- @Override
- public String toString()
- {
- return "StatementSettingsImpl [sharePreparedStatements=" + sharePreparedStatements +
- ", preparedStatementsCacheSize=" + preparedStatementsCacheSize +
- ", trackStatements=" + trackStatements + "]";
- }
-}
-
Copied: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ds/TimeOutImpl.java (from rev 107581, projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ds/TimeOutSettingsImpl.java)
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ds/TimeOutImpl.java (rev 0)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ds/TimeOutImpl.java 2010-08-16 09:09:33 UTC (rev 107629)
@@ -0,0 +1,259 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.jca.common.metadata.ds;
+
+import org.jboss.jca.common.api.metadata.ds.TimeOut;
+
+/**
+ *
+ * A TimeOutImpl.
+ *
+ * @author <a href="stefano.maestri at jboss.com">Stefano Maestri</a>
+ *
+ */
+public class TimeOutImpl implements TimeOut
+{
+ /** The serialVersionUID */
+ private static final long serialVersionUID = -8797718258493768716L;
+
+ private final Long blockingTimeoutMillis;
+
+ private final Long idleTimeoutMinutes;
+
+ private final boolean setTxQuertTimeout;
+
+ private final Long queryTimeout;
+
+ private final Long useTryLock;
+
+ private final Long allocationRetry;
+
+ private final Long allocationRetryWaitMillis;
+
+ private final Long xaResourceTimeout;
+
+ /**
+ * Create a new TimeOutImpl.
+ *
+ * @param blockingTimeoutMillis blockingTimeoutMillis
+ * @param idleTimeoutMinutes idleTimeoutMinutes
+ * @param setTxQuertTimeout setTxQuertTimeout
+ * @param queryTimeout queryTimeout
+ * @param useTryLock useTryLock
+ * @param allocationRetry allocationRetry
+ * @param allocationRetryWaitMillis allocationRetryWaitMillis
+ * @param xaResourceTimeout xaResourceTimeout
+ */
+ public TimeOutImpl(Long blockingTimeoutMillis, Long idleTimeoutMinutes, boolean setTxQuertTimeout,
+ Long queryTimeout, Long useTryLock, Long allocationRetry, Long allocationRetryWaitMillis,
+ Long xaResourceTimeout)
+ {
+ super();
+ this.blockingTimeoutMillis = blockingTimeoutMillis;
+ this.idleTimeoutMinutes = idleTimeoutMinutes;
+ this.setTxQuertTimeout = setTxQuertTimeout;
+ this.queryTimeout = queryTimeout;
+ this.useTryLock = useTryLock;
+ this.allocationRetry = allocationRetry;
+ this.allocationRetryWaitMillis = allocationRetryWaitMillis;
+ this.xaResourceTimeout = xaResourceTimeout;
+ }
+
+ /**
+ * Get the blockingTimeoutMillis.
+ *
+ * @return the blockingTimeoutMillis.
+ */
+ @Override
+ public final Long getBlockingTimeoutMillis()
+ {
+ return blockingTimeoutMillis;
+ }
+
+ /**
+ * Get the idleTimeoutMinutes.
+ *
+ * @return the idleTimeoutMinutes.
+ */
+ @Override
+ public final Long getIdleTimeoutMinutes()
+ {
+ return idleTimeoutMinutes;
+ }
+
+ /**
+ * Get the setTxQuertTimeout.
+ *
+ * @return the setTxQuertTimeout.
+ */
+ @Override
+ public final boolean isSetTxQuertTimeout()
+ {
+ return setTxQuertTimeout;
+ }
+
+ /**
+ * Get the queryTimeout.
+ *
+ * @return the queryTimeout.
+ */
+ @Override
+ public final Long getQueryTimeout()
+ {
+ return queryTimeout;
+ }
+
+ /**
+ * Get the useTryLock.
+ *
+ * @return the useTryLock.
+ */
+ @Override
+ public final Long getUseTryLock()
+ {
+ return useTryLock;
+ }
+
+ /**
+ * Get the allocationRetry.
+ *
+ * @return the allocationRetry.
+ */
+ @Override
+ public final Long getAllocationRetry()
+ {
+ return allocationRetry;
+ }
+
+ /**
+ * Get the allocationRetryWaitMillis.
+ *
+ * @return the allocationRetryWaitMillis.
+ */
+ @Override
+ public final Long getAllocationRetryWaitMillis()
+ {
+ return allocationRetryWaitMillis;
+ }
+
+ @Override
+ public int hashCode()
+ {
+ final int prime = 31;
+ int result = 1;
+ result = prime * result + ((allocationRetry == null) ? 0 : allocationRetry.hashCode());
+ result = prime * result + ((allocationRetryWaitMillis == null) ? 0 : allocationRetryWaitMillis.hashCode());
+ result = prime * result + ((blockingTimeoutMillis == null) ? 0 : blockingTimeoutMillis.hashCode());
+ result = prime * result + ((idleTimeoutMinutes == null) ? 0 : idleTimeoutMinutes.hashCode());
+ result = prime * result + ((queryTimeout == null) ? 0 : queryTimeout.hashCode());
+ result = prime * result + (setTxQuertTimeout ? 1231 : 1237);
+ result = prime * result + ((useTryLock == null) ? 0 : useTryLock.hashCode());
+ result = prime * result + ((xaResourceTimeout == null) ? 0 : xaResourceTimeout.hashCode());
+ return result;
+ }
+
+ @Override
+ public boolean equals(Object obj)
+ {
+ if (this == obj)
+ return true;
+ if (obj == null)
+ return false;
+ if (!(obj instanceof TimeOutImpl))
+ return false;
+ TimeOutImpl other = (TimeOutImpl) obj;
+ if (allocationRetry == null)
+ {
+ if (other.allocationRetry != null)
+ return false;
+ }
+ else if (!allocationRetry.equals(other.allocationRetry))
+ return false;
+ if (allocationRetryWaitMillis == null)
+ {
+ if (other.allocationRetryWaitMillis != null)
+ return false;
+ }
+ else if (!allocationRetryWaitMillis.equals(other.allocationRetryWaitMillis))
+ return false;
+ if (blockingTimeoutMillis == null)
+ {
+ if (other.blockingTimeoutMillis != null)
+ return false;
+ }
+ else if (!blockingTimeoutMillis.equals(other.blockingTimeoutMillis))
+ return false;
+ if (idleTimeoutMinutes == null)
+ {
+ if (other.idleTimeoutMinutes != null)
+ return false;
+ }
+ else if (!idleTimeoutMinutes.equals(other.idleTimeoutMinutes))
+ return false;
+ if (queryTimeout == null)
+ {
+ if (other.queryTimeout != null)
+ return false;
+ }
+ else if (!queryTimeout.equals(other.queryTimeout))
+ return false;
+ if (setTxQuertTimeout != other.setTxQuertTimeout)
+ return false;
+ if (useTryLock == null)
+ {
+ if (other.useTryLock != null)
+ return false;
+ }
+ else if (!useTryLock.equals(other.useTryLock))
+ return false;
+ if (xaResourceTimeout == null)
+ {
+ if (other.xaResourceTimeout != null)
+ return false;
+ }
+ else if (!xaResourceTimeout.equals(other.xaResourceTimeout))
+ return false;
+ return true;
+ }
+
+ @Override
+ public String toString()
+ {
+ return "TimeOutImpl [blockingTimeoutMillis=" + blockingTimeoutMillis + ", idleTimeoutMinutes="
+ + idleTimeoutMinutes + ", setTxQuertTimeout=" + setTxQuertTimeout + ", queryTimeout=" + queryTimeout
+ + ", useTryLock=" + useTryLock + ", allocationRetry=" + allocationRetry + ", allocationRetryWaitMillis="
+ + allocationRetryWaitMillis + ", xaResourceTimeout=" + xaResourceTimeout + "]";
+ }
+
+ /**
+ * Get the xaResourceTimeout.
+ *
+ * @return the xaResourceTimeout.
+ */
+ @Override
+ public Long getXaResourceTimeout()
+ {
+ return xaResourceTimeout;
+ }
+
+}
+
Deleted: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ds/TimeOutSettingsImpl.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ds/TimeOutSettingsImpl.java 2010-08-15 18:45:14 UTC (rev 107628)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ds/TimeOutSettingsImpl.java 2010-08-16 09:09:33 UTC (rev 107629)
@@ -1,259 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.jca.common.metadata.ds;
-
-import org.jboss.jca.common.api.metadata.ds.TimeOutSettings;
-
-/**
- *
- * A TimeOutSettingsImpl.
- *
- * @author <a href="stefano.maestri at jboss.com">Stefano Maestri</a>
- *
- */
-public class TimeOutSettingsImpl implements TimeOutSettings
-{
- /** The serialVersionUID */
- private static final long serialVersionUID = -8797718258493768716L;
-
- private final Long blockingTimeoutMillis;
-
- private final Long idleTimeoutMinutes;
-
- private final boolean setTxQuertTimeout;
-
- private final Long queryTimeout;
-
- private final Long useTryLock;
-
- private final Long allocationRetry;
-
- private final Long allocationRetryWaitMillis;
-
- private final Long xaResourceTimeout;
-
- /**
- * Create a new TimeOutSettingsImpl.
- *
- * @param blockingTimeoutMillis blockingTimeoutMillis
- * @param idleTimeoutMinutes idleTimeoutMinutes
- * @param setTxQuertTimeout setTxQuertTimeout
- * @param queryTimeout queryTimeout
- * @param useTryLock useTryLock
- * @param allocationRetry allocationRetry
- * @param allocationRetryWaitMillis allocationRetryWaitMillis
- * @param xaResourceTimeout xaResourceTimeout
- */
- public TimeOutSettingsImpl(Long blockingTimeoutMillis, Long idleTimeoutMinutes, boolean setTxQuertTimeout,
- Long queryTimeout, Long useTryLock, Long allocationRetry, Long allocationRetryWaitMillis,
- Long xaResourceTimeout)
- {
- super();
- this.blockingTimeoutMillis = blockingTimeoutMillis;
- this.idleTimeoutMinutes = idleTimeoutMinutes;
- this.setTxQuertTimeout = setTxQuertTimeout;
- this.queryTimeout = queryTimeout;
- this.useTryLock = useTryLock;
- this.allocationRetry = allocationRetry;
- this.allocationRetryWaitMillis = allocationRetryWaitMillis;
- this.xaResourceTimeout = xaResourceTimeout;
- }
-
- /**
- * Get the blockingTimeoutMillis.
- *
- * @return the blockingTimeoutMillis.
- */
- @Override
- public final Long getBlockingTimeoutMillis()
- {
- return blockingTimeoutMillis;
- }
-
- /**
- * Get the idleTimeoutMinutes.
- *
- * @return the idleTimeoutMinutes.
- */
- @Override
- public final Long getIdleTimeoutMinutes()
- {
- return idleTimeoutMinutes;
- }
-
- /**
- * Get the setTxQuertTimeout.
- *
- * @return the setTxQuertTimeout.
- */
- @Override
- public final boolean isSetTxQuertTimeout()
- {
- return setTxQuertTimeout;
- }
-
- /**
- * Get the queryTimeout.
- *
- * @return the queryTimeout.
- */
- @Override
- public final Long getQueryTimeout()
- {
- return queryTimeout;
- }
-
- /**
- * Get the useTryLock.
- *
- * @return the useTryLock.
- */
- @Override
- public final Long getUseTryLock()
- {
- return useTryLock;
- }
-
- /**
- * Get the allocationRetry.
- *
- * @return the allocationRetry.
- */
- @Override
- public final Long getAllocationRetry()
- {
- return allocationRetry;
- }
-
- /**
- * Get the allocationRetryWaitMillis.
- *
- * @return the allocationRetryWaitMillis.
- */
- @Override
- public final Long getAllocationRetryWaitMillis()
- {
- return allocationRetryWaitMillis;
- }
-
- @Override
- public int hashCode()
- {
- final int prime = 31;
- int result = 1;
- result = prime * result + ((allocationRetry == null) ? 0 : allocationRetry.hashCode());
- result = prime * result + ((allocationRetryWaitMillis == null) ? 0 : allocationRetryWaitMillis.hashCode());
- result = prime * result + ((blockingTimeoutMillis == null) ? 0 : blockingTimeoutMillis.hashCode());
- result = prime * result + ((idleTimeoutMinutes == null) ? 0 : idleTimeoutMinutes.hashCode());
- result = prime * result + ((queryTimeout == null) ? 0 : queryTimeout.hashCode());
- result = prime * result + (setTxQuertTimeout ? 1231 : 1237);
- result = prime * result + ((useTryLock == null) ? 0 : useTryLock.hashCode());
- result = prime * result + ((xaResourceTimeout == null) ? 0 : xaResourceTimeout.hashCode());
- return result;
- }
-
- @Override
- public boolean equals(Object obj)
- {
- if (this == obj)
- return true;
- if (obj == null)
- return false;
- if (!(obj instanceof TimeOutSettingsImpl))
- return false;
- TimeOutSettingsImpl other = (TimeOutSettingsImpl) obj;
- if (allocationRetry == null)
- {
- if (other.allocationRetry != null)
- return false;
- }
- else if (!allocationRetry.equals(other.allocationRetry))
- return false;
- if (allocationRetryWaitMillis == null)
- {
- if (other.allocationRetryWaitMillis != null)
- return false;
- }
- else if (!allocationRetryWaitMillis.equals(other.allocationRetryWaitMillis))
- return false;
- if (blockingTimeoutMillis == null)
- {
- if (other.blockingTimeoutMillis != null)
- return false;
- }
- else if (!blockingTimeoutMillis.equals(other.blockingTimeoutMillis))
- return false;
- if (idleTimeoutMinutes == null)
- {
- if (other.idleTimeoutMinutes != null)
- return false;
- }
- else if (!idleTimeoutMinutes.equals(other.idleTimeoutMinutes))
- return false;
- if (queryTimeout == null)
- {
- if (other.queryTimeout != null)
- return false;
- }
- else if (!queryTimeout.equals(other.queryTimeout))
- return false;
- if (setTxQuertTimeout != other.setTxQuertTimeout)
- return false;
- if (useTryLock == null)
- {
- if (other.useTryLock != null)
- return false;
- }
- else if (!useTryLock.equals(other.useTryLock))
- return false;
- if (xaResourceTimeout == null)
- {
- if (other.xaResourceTimeout != null)
- return false;
- }
- else if (!xaResourceTimeout.equals(other.xaResourceTimeout))
- return false;
- return true;
- }
-
- @Override
- public String toString()
- {
- return "TimeOutSettingsImpl [blockingTimeoutMillis=" + blockingTimeoutMillis + ", idleTimeoutMinutes="
- + idleTimeoutMinutes + ", setTxQuertTimeout=" + setTxQuertTimeout + ", queryTimeout=" + queryTimeout
- + ", useTryLock=" + useTryLock + ", allocationRetry=" + allocationRetry + ", allocationRetryWaitMillis="
- + allocationRetryWaitMillis + ", xaResourceTimeout=" + xaResourceTimeout + "]";
- }
-
- /**
- * Get the xaResourceTimeout.
- *
- * @return the xaResourceTimeout.
- */
- @Override
- public Long getXaResourceTimeout()
- {
- return xaResourceTimeout;
- }
-
-}
-
Copied: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ds/ValidationImpl.java (from rev 107581, projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ds/ValidationSettingsImpl.java)
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ds/ValidationImpl.java (rev 0)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ds/ValidationImpl.java 2010-08-16 09:09:33 UTC (rev 107629)
@@ -0,0 +1,251 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.jca.common.metadata.ds;
+
+import org.jboss.jca.common.api.metadata.ds.Validation;
+
+/**
+ *
+ * A ValidationImpl.
+ *
+ * @author <a href="stefano.maestri at jboss.com">Stefano Maestri</a>
+ *
+ */
+public class ValidationImpl implements Validation
+{
+ /** The serialVersionUID */
+ private static final long serialVersionUID = 7816717816552118419L;
+
+ private final String validConnectionCheckerClassName;
+
+ private final String checkValidConnectionSql;
+
+ private final boolean validateOnMatch;
+
+ private final boolean backgroundValidation;
+
+ private final Long backgroundValidationMinutes;
+
+ private final boolean useFastFail;
+
+ private final String staleConnectionCheckerClassName;
+
+ private final String exceptionSorterClassName;
+
+ /**
+ * Create a new ValidationImpl.
+ *
+ * @param validConnectionCheckerClassName validConnectionCheckerClassName
+ * @param checkValidConnectionSql checkValidConnectionSql
+ * @param validateOnMatch validateOnMatch
+ * @param backgroundValidation backgroundValidation
+ * @param backgroundValidationMinutes backgroundValidationMinutes
+ * @param useFastFail useFastFail
+ * @param staleConnectionCheckerClassName staleConnectionCheckerClassName
+ * @param exceptionSorterClassName exceptionSorterClassName
+ */
+ public ValidationImpl(String validConnectionCheckerClassName, String checkValidConnectionSql,
+ boolean validateOnMatch, boolean backgroundValidation, Long backgroundValidationMinutes, boolean useFastFail,
+ String staleConnectionCheckerClassName, String exceptionSorterClassName)
+ {
+ super();
+ this.validConnectionCheckerClassName = validConnectionCheckerClassName;
+ this.checkValidConnectionSql = checkValidConnectionSql;
+ this.validateOnMatch = validateOnMatch;
+ this.backgroundValidation = backgroundValidation;
+ this.backgroundValidationMinutes = backgroundValidationMinutes;
+ this.useFastFail = useFastFail;
+ this.staleConnectionCheckerClassName = staleConnectionCheckerClassName;
+ this.exceptionSorterClassName = exceptionSorterClassName;
+ }
+
+ /**
+ * Get the validConnectionCheckerClassName.
+ *
+ * @return the validConnectionCheckerClassName.
+ */
+ @Override
+ public final String getValidConnectionCheckerClassName()
+ {
+ return validConnectionCheckerClassName;
+ }
+
+ /**
+ * Get the checkValidConnectionSql.
+ *
+ * @return the checkValidConnectionSql.
+ */
+ @Override
+ public final String getCheckValidConnectionSql()
+ {
+ return checkValidConnectionSql;
+ }
+
+ /**
+ * Get the validateOnMatch.
+ *
+ * @return the validateOnMatch.
+ */
+ @Override
+ public final boolean isValidateOnMatch()
+ {
+ return validateOnMatch;
+ }
+
+ /**
+ * Get the backgroundValidation.
+ *
+ * @return the backgroundValidation.
+ */
+ @Override
+ public final boolean isBackgroundValidation()
+ {
+ return backgroundValidation;
+ }
+
+ /**
+ * Get the backgroundValidationMinutes.
+ *
+ * @return the backgroundValidationMinutes.
+ */
+ @Override
+ public final Long getBackgroundValidationMinutes()
+ {
+ return backgroundValidationMinutes;
+ }
+
+ /**
+ * Get the useFastFail.
+ *
+ * @return the useFastFail.
+ */
+ @Override
+ public final boolean isUseFastFail()
+ {
+ return useFastFail;
+ }
+
+ /**
+ * Get the staleConnectionCheckerClassName.
+ *
+ * @return the staleConnectionCheckerClassName.
+ */
+ @Override
+ public final String getStaleConnectionCheckerClassName()
+ {
+ return staleConnectionCheckerClassName;
+ }
+
+ /**
+ * Get the exceptionSorterClassName.
+ *
+ * @return the exceptionSorterClassName.
+ */
+ @Override
+ public final String getExceptionSorterClassName()
+ {
+ return exceptionSorterClassName;
+ }
+
+ @Override
+ public int hashCode()
+ {
+ final int prime = 31;
+ int result = 1;
+ result = prime * result + (backgroundValidation ? 1231 : 1237);
+ result = prime * result + ((backgroundValidationMinutes == null) ? 0 : backgroundValidationMinutes.hashCode());
+ result = prime * result + ((checkValidConnectionSql == null) ? 0 : checkValidConnectionSql.hashCode());
+ result = prime * result + ((exceptionSorterClassName == null) ? 0 : exceptionSorterClassName.hashCode());
+ result = prime * result
+ + ((staleConnectionCheckerClassName == null) ? 0 : staleConnectionCheckerClassName.hashCode());
+ result = prime * result + (useFastFail ? 1231 : 1237);
+ result = prime * result
+ + ((validConnectionCheckerClassName == null) ? 0 : validConnectionCheckerClassName.hashCode());
+ result = prime * result + (validateOnMatch ? 1231 : 1237);
+ return result;
+ }
+
+ @Override
+ public boolean equals(Object obj)
+ {
+ if (this == obj)
+ return true;
+ if (obj == null)
+ return false;
+ if (!(obj instanceof ValidationImpl))
+ return false;
+ ValidationImpl other = (ValidationImpl) obj;
+ if (backgroundValidation != other.backgroundValidation)
+ return false;
+ if (backgroundValidationMinutes == null)
+ {
+ if (other.backgroundValidationMinutes != null)
+ return false;
+ }
+ else if (!backgroundValidationMinutes.equals(other.backgroundValidationMinutes))
+ return false;
+ if (checkValidConnectionSql == null)
+ {
+ if (other.checkValidConnectionSql != null)
+ return false;
+ }
+ else if (!checkValidConnectionSql.equals(other.checkValidConnectionSql))
+ return false;
+ if (exceptionSorterClassName == null)
+ {
+ if (other.exceptionSorterClassName != null)
+ return false;
+ }
+ else if (!exceptionSorterClassName.equals(other.exceptionSorterClassName))
+ return false;
+ if (staleConnectionCheckerClassName == null)
+ {
+ if (other.staleConnectionCheckerClassName != null)
+ return false;
+ }
+ else if (!staleConnectionCheckerClassName.equals(other.staleConnectionCheckerClassName))
+ return false;
+ if (useFastFail != other.useFastFail)
+ return false;
+ if (validConnectionCheckerClassName == null)
+ {
+ if (other.validConnectionCheckerClassName != null)
+ return false;
+ }
+ else if (!validConnectionCheckerClassName.equals(other.validConnectionCheckerClassName))
+ return false;
+ if (validateOnMatch != other.validateOnMatch)
+ return false;
+ return true;
+ }
+
+ @Override
+ public String toString()
+ {
+ return "ValidationImpl [validConnectionCheckerClassName=" + validConnectionCheckerClassName
+ + ", checkValidConnectionSql=" + checkValidConnectionSql + ", validateOnMatch=" + validateOnMatch
+ + ", backgroundValidation=" + backgroundValidation + ", backgroundValidationMinutes="
+ + backgroundValidationMinutes + ", useFastFail=" + useFastFail + ", staleConnectionCheckerClassName="
+ + staleConnectionCheckerClassName + ", exceptionSorterClassName=" + exceptionSorterClassName + "]";
+ }
+}
+
Deleted: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ds/ValidationSettingsImpl.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ds/ValidationSettingsImpl.java 2010-08-15 18:45:14 UTC (rev 107628)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ds/ValidationSettingsImpl.java 2010-08-16 09:09:33 UTC (rev 107629)
@@ -1,251 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.jca.common.metadata.ds;
-
-import org.jboss.jca.common.api.metadata.ds.ValidationSettings;
-
-/**
- *
- * A ValidationSettingsImpl.
- *
- * @author <a href="stefano.maestri at jboss.com">Stefano Maestri</a>
- *
- */
-public class ValidationSettingsImpl implements ValidationSettings
-{
- /** The serialVersionUID */
- private static final long serialVersionUID = 7816717816552118419L;
-
- private final String validConnectionCheckerClassName;
-
- private final String checkValidConnectionSql;
-
- private final boolean validateOnMatch;
-
- private final boolean backgroundValidation;
-
- private final Long backgroundValidationMinutes;
-
- private final boolean useFastFail;
-
- private final String staleConnectionCheckerClassName;
-
- private final String exceptionSorterClassName;
-
- /**
- * Create a new ValidationSettingsImpl.
- *
- * @param validConnectionCheckerClassName validConnectionCheckerClassName
- * @param checkValidConnectionSql checkValidConnectionSql
- * @param validateOnMatch validateOnMatch
- * @param backgroundValidation backgroundValidation
- * @param backgroundValidationMinutes backgroundValidationMinutes
- * @param useFastFail useFastFail
- * @param staleConnectionCheckerClassName staleConnectionCheckerClassName
- * @param exceptionSorterClassName exceptionSorterClassName
- */
- public ValidationSettingsImpl(String validConnectionCheckerClassName, String checkValidConnectionSql,
- boolean validateOnMatch, boolean backgroundValidation, Long backgroundValidationMinutes, boolean useFastFail,
- String staleConnectionCheckerClassName, String exceptionSorterClassName)
- {
- super();
- this.validConnectionCheckerClassName = validConnectionCheckerClassName;
- this.checkValidConnectionSql = checkValidConnectionSql;
- this.validateOnMatch = validateOnMatch;
- this.backgroundValidation = backgroundValidation;
- this.backgroundValidationMinutes = backgroundValidationMinutes;
- this.useFastFail = useFastFail;
- this.staleConnectionCheckerClassName = staleConnectionCheckerClassName;
- this.exceptionSorterClassName = exceptionSorterClassName;
- }
-
- /**
- * Get the validConnectionCheckerClassName.
- *
- * @return the validConnectionCheckerClassName.
- */
- @Override
- public final String getValidConnectionCheckerClassName()
- {
- return validConnectionCheckerClassName;
- }
-
- /**
- * Get the checkValidConnectionSql.
- *
- * @return the checkValidConnectionSql.
- */
- @Override
- public final String getCheckValidConnectionSql()
- {
- return checkValidConnectionSql;
- }
-
- /**
- * Get the validateOnMatch.
- *
- * @return the validateOnMatch.
- */
- @Override
- public final boolean isValidateOnMatch()
- {
- return validateOnMatch;
- }
-
- /**
- * Get the backgroundValidation.
- *
- * @return the backgroundValidation.
- */
- @Override
- public final boolean isBackgroundValidation()
- {
- return backgroundValidation;
- }
-
- /**
- * Get the backgroundValidationMinutes.
- *
- * @return the backgroundValidationMinutes.
- */
- @Override
- public final Long getBackgroundValidationMinutes()
- {
- return backgroundValidationMinutes;
- }
-
- /**
- * Get the useFastFail.
- *
- * @return the useFastFail.
- */
- @Override
- public final boolean isUseFastFail()
- {
- return useFastFail;
- }
-
- /**
- * Get the staleConnectionCheckerClassName.
- *
- * @return the staleConnectionCheckerClassName.
- */
- @Override
- public final String getStaleConnectionCheckerClassName()
- {
- return staleConnectionCheckerClassName;
- }
-
- /**
- * Get the exceptionSorterClassName.
- *
- * @return the exceptionSorterClassName.
- */
- @Override
- public final String getExceptionSorterClassName()
- {
- return exceptionSorterClassName;
- }
-
- @Override
- public int hashCode()
- {
- final int prime = 31;
- int result = 1;
- result = prime * result + (backgroundValidation ? 1231 : 1237);
- result = prime * result + ((backgroundValidationMinutes == null) ? 0 : backgroundValidationMinutes.hashCode());
- result = prime * result + ((checkValidConnectionSql == null) ? 0 : checkValidConnectionSql.hashCode());
- result = prime * result + ((exceptionSorterClassName == null) ? 0 : exceptionSorterClassName.hashCode());
- result = prime * result
- + ((staleConnectionCheckerClassName == null) ? 0 : staleConnectionCheckerClassName.hashCode());
- result = prime * result + (useFastFail ? 1231 : 1237);
- result = prime * result
- + ((validConnectionCheckerClassName == null) ? 0 : validConnectionCheckerClassName.hashCode());
- result = prime * result + (validateOnMatch ? 1231 : 1237);
- return result;
- }
-
- @Override
- public boolean equals(Object obj)
- {
- if (this == obj)
- return true;
- if (obj == null)
- return false;
- if (!(obj instanceof ValidationSettingsImpl))
- return false;
- ValidationSettingsImpl other = (ValidationSettingsImpl) obj;
- if (backgroundValidation != other.backgroundValidation)
- return false;
- if (backgroundValidationMinutes == null)
- {
- if (other.backgroundValidationMinutes != null)
- return false;
- }
- else if (!backgroundValidationMinutes.equals(other.backgroundValidationMinutes))
- return false;
- if (checkValidConnectionSql == null)
- {
- if (other.checkValidConnectionSql != null)
- return false;
- }
- else if (!checkValidConnectionSql.equals(other.checkValidConnectionSql))
- return false;
- if (exceptionSorterClassName == null)
- {
- if (other.exceptionSorterClassName != null)
- return false;
- }
- else if (!exceptionSorterClassName.equals(other.exceptionSorterClassName))
- return false;
- if (staleConnectionCheckerClassName == null)
- {
- if (other.staleConnectionCheckerClassName != null)
- return false;
- }
- else if (!staleConnectionCheckerClassName.equals(other.staleConnectionCheckerClassName))
- return false;
- if (useFastFail != other.useFastFail)
- return false;
- if (validConnectionCheckerClassName == null)
- {
- if (other.validConnectionCheckerClassName != null)
- return false;
- }
- else if (!validConnectionCheckerClassName.equals(other.validConnectionCheckerClassName))
- return false;
- if (validateOnMatch != other.validateOnMatch)
- return false;
- return true;
- }
-
- @Override
- public String toString()
- {
- return "ValidationSettingsImpl [validConnectionCheckerClassName=" + validConnectionCheckerClassName
- + ", checkValidConnectionSql=" + checkValidConnectionSql + ", validateOnMatch=" + validateOnMatch
- + ", backgroundValidation=" + backgroundValidation + ", backgroundValidationMinutes="
- + backgroundValidationMinutes + ", useFastFail=" + useFastFail + ", staleConnectionCheckerClassName="
- + staleConnectionCheckerClassName + ", exceptionSorterClassName=" + exceptionSorterClassName + "]";
- }
-}
-
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-15 18:45:14 UTC (rev 107628)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ds/XADataSourceImpl.java 2010-08-16 09:09:33 UTC (rev 107629)
@@ -21,12 +21,12 @@
*/
package org.jboss.jca.common.metadata.ds;
-import org.jboss.jca.common.api.metadata.ds.RecoverySettings;
-import org.jboss.jca.common.api.metadata.ds.SecuritySettings;
-import org.jboss.jca.common.api.metadata.ds.StatementSettings;
-import org.jboss.jca.common.api.metadata.ds.TimeOutSettings;
+import org.jboss.jca.common.api.metadata.ds.Recovery;
+import org.jboss.jca.common.api.metadata.ds.Security;
+import org.jboss.jca.common.api.metadata.ds.Statement;
+import org.jboss.jca.common.api.metadata.ds.TimeOut;
import org.jboss.jca.common.api.metadata.ds.TransactionIsolation;
-import org.jboss.jca.common.api.metadata.ds.ValidationSettings;
+import org.jboss.jca.common.api.metadata.ds.Validation;
import org.jboss.jca.common.api.metadata.ds.XaDataSource;
import java.util.Collections;
@@ -57,7 +57,7 @@
private final boolean interleaving;
- private final RecoverySettings recoverySettings;
+ private final Recovery recovery;
private final String newConnectionSql;
@@ -82,11 +82,11 @@
* @param transactionIsolation transactionIsolation
* @param isSameRmOverride isSameRmOverride
* @param interleaving interleaving
- * @param recoverySettings recoverySettings
- * @param timeOutSettings timeOutSettings
- * @param securitySettings securitySettings
- * @param statementSettings statementSettings
- * @param validationSettings validationSettings
+ * @param recovery recovery
+ * @param timeOut timeOut
+ * @param security security
+ * @param statement statement
+ * @param validation validation
* @param urlDelimiter urlDelimiter
* @param urlSelectorStrategyClassName urlSelectorStrategyClassName
* @param newConnectionSql newConnectionSql
@@ -94,22 +94,22 @@
* @param poolName poolName
* @param enabled enabled
* @param jndiName jndiName
- * @param padXid
- * @param wrapXaDataSource
- * @param noTxSeparatePool
- * @param trackConnectionByTx
+ * @param padXid padXid
+ * @param wrapXaDataSource wrapXaDataSource
+ * @param noTxSeparatePool noTxSeparatePool
+ * @param trackConnectionByTx trackConnectionByTx
*/
public XADataSourceImpl(Integer minPoolSize, Integer maxPoolSize, boolean prefill, String userName, String password,
Map<String, String> xaDataSourceProperty, String xaDataSourceClass,
TransactionIsolation transactionIsolation, boolean isSameRmOverride, boolean interleaving,
- RecoverySettings recoverySettings, TimeOutSettings timeOutSettings, SecuritySettings securitySettings,
- StatementSettings statementSettings, ValidationSettings validationSettings, String urlDelimiter,
+ Recovery recovery, TimeOut timeOut, Security security,
+ Statement statement, Validation validation, String urlDelimiter,
String urlSelectorStrategyClassName, String newConnectionSql, boolean useJavaContext, String poolName,
boolean enabled, String jndiName, boolean padXid, boolean wrapXaDataSource, boolean noTxSeparatePool,
boolean trackConnectionByTx)
{
- super(minPoolSize, maxPoolSize, prefill, transactionIsolation, timeOutSettings, securitySettings,
- statementSettings, validationSettings, urlDelimiter, urlSelectorStrategyClassName, useJavaContext,
+ super(minPoolSize, maxPoolSize, prefill, transactionIsolation, timeOut, security,
+ statement, validation, urlDelimiter, urlSelectorStrategyClassName, useJavaContext,
poolName, enabled, jndiName);
this.userName = userName;
this.password = password;
@@ -125,7 +125,7 @@
this.xaDataSourceClass = xaDataSourceClass;
this.isSameRmOverride = isSameRmOverride;
this.interleaving = interleaving;
- this.recoverySettings = recoverySettings;
+ this.recovery = recovery;
this.newConnectionSql = newConnectionSql;
this.padXid = padXid;
this.wrapXaDataSource = wrapXaDataSource;
@@ -200,25 +200,25 @@
}
/**
- * Get the recoverySettings.
+ * Get the recovery.
*
- * @return the recoverySettings.
+ * @return the recovery.
*/
@Override
- public final RecoverySettings getRecoverySettings()
+ public final Recovery getRecovery()
{
- return recoverySettings;
+ return recovery;
}
/**
- * Get the statementSettings.
+ * Get the statement.
*
- * @return the statementSettings.
+ * @return the statement.
*/
@Override
- public final StatementSettings getStatementSettings()
+ public final Statement getStatement()
{
- return statementSettings;
+ return statement;
}
/**
@@ -265,7 +265,7 @@
result = prime * result + (noTxSeparatePool ? 1231 : 1237);
result = prime * result + (padXid ? 1231 : 1237);
result = prime * result + ((password == null) ? 0 : password.hashCode());
- result = prime * result + ((recoverySettings == null) ? 0 : recoverySettings.hashCode());
+ result = prime * result + ((recovery == null) ? 0 : recovery.hashCode());
result = prime * result + (trackConnectionByTx ? 1231 : 1237);
result = prime * result + ((userName == null) ? 0 : userName.hashCode());
result = prime * result + (wrapXaDataSource ? 1231 : 1237);
@@ -306,12 +306,12 @@
}
else if (!password.equals(other.password))
return false;
- if (recoverySettings == null)
+ if (recovery == null)
{
- if (other.recoverySettings != null)
+ if (other.recovery != null)
return false;
}
- else if (!recoverySettings.equals(other.recoverySettings))
+ else if (!recovery.equals(other.recovery))
return false;
if (trackConnectionByTx != other.trackConnectionByTx)
return false;
@@ -346,7 +346,7 @@
{
return "XADataSourceImpl [userName=" + userName + ", password=" + password + ", xaDataSourceProperty="
+ xaDataSourceProperty + ", xaDataSourceClass=" + xaDataSourceClass + ", isSameRmOverride="
- + isSameRmOverride + ", interleaving=" + interleaving + ", recoverySettings=" + recoverySettings
+ + isSameRmOverride + ", interleaving=" + interleaving + ", recovery=" + recovery
+ ", newConnectionSql=" + newConnectionSql + ", padXid=" + padXid + ", wrapXaDataSource="
+ wrapXaDataSource + ", noTxSeparatePool=" + noTxSeparatePool + ", trackConnectionByTx="
+ trackConnectionByTx + "]";
Modified: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/common/ConfigPropertyImpl.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/common/ConfigPropertyImpl.java 2010-08-15 18:45:14 UTC (rev 107628)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/common/ConfigPropertyImpl.java 2010-08-16 09:09:33 UTC (rev 107629)
@@ -25,7 +25,6 @@
import org.jboss.jca.common.api.metadata.CopyUtil;
import org.jboss.jca.common.api.metadata.CopyableMetaData;
import org.jboss.jca.common.api.metadata.ra.ConfigProperty;
-import org.jboss.jca.common.api.metadata.ra.IdDecoratedMetadata;
import org.jboss.jca.common.api.metadata.ra.LocalizedXsdString;
import org.jboss.jca.common.api.metadata.ra.XsdString;
@@ -135,11 +134,7 @@
return configPropertyValue;
}
- /**
- * {@inheritDoc}
- *
- * @see IdDecoratedMetadata#getId()
- */
+
@Override
public String getId()
{
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-15 18:45:14 UTC (rev 107628)
+++ projects/jboss-jca/trunk/common/src/main/resources/schema/datasources_1_0.xsd 2010-08-16 09:09:33 UTC (rev 107629)
@@ -1,6 +1,6 @@
<?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:element name="datasources" type="datasourcesType">
<xs:annotation>
<xs:documentation>
<![CDATA[[
@@ -9,9 +9,9 @@
</xs:documentation>
</xs:annotation>
</xs:element>
- <xs:complexType name="datasourcesComplexType">
+ <xs:complexType name="datasourcesType">
<xs:choice minOccurs="0" maxOccurs="unbounded">
- <xs:element name="datasource" type="datasourceComplexType">
+ <xs:element name="datasource" type="datasourceType">
<xs:annotation>
<xs:documentation>
<![CDATA[[
@@ -21,7 +21,7 @@
</xs:documentation>
</xs:annotation>
</xs:element>
- <xs:element name="xa-datasource" type="xa-datasourceComplexType">
+ <xs:element name="xa-datasource" type="xa-datasourceType">
<xs:annotation>
<xs:documentation>
<![CDATA[[
@@ -32,7 +32,7 @@
</xs:element>
</xs:choice>
</xs:complexType>
- <xs:complexType name="datasourceComplexType" mixed="false">
+ <xs:complexType name="datasourceType" mixed="false">
<xs:sequence>
<xs:element name="min-pool-size" type="xs:nonNegativeInteger" minOccurs="0">
<xs:annotation>
@@ -104,7 +104,7 @@
</xs:documentation>
</xs:annotation>
</xs:element>
- <xs:element name="transaction-isolation" type="transaction-isolation-values" minOccurs="0">
+ <xs:element name="transaction-isolation" type="transaction-isolationType" minOccurs="0">
<xs:annotation>
<xs:documentation>
<![CDATA[[
@@ -116,7 +116,7 @@
</xs:documentation>
</xs:annotation>
</xs:element>
- <xs:element name="connection-property" type="connection-propertyComplexType" minOccurs="0" maxOccurs="unbounded">
+ <xs:element name="connection-property" type="connection-propertyType" minOccurs="0" maxOccurs="unbounded">
<xs:annotation>
<xs:documentation>
<![CDATA[[
@@ -129,12 +129,12 @@
</xs:documentation>
</xs:annotation>
</xs:element>
- <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 name="time-out" type="time-outType" minOccurs="0" />
+ <xs:element name="security" type="securityType" minOccurs="0">
</xs:element>
- <xs:element name="statement-settings" type="statement-settings_type" minOccurs="0">
+ <xs:element name="statement" type="statementType" minOccurs="0">
</xs:element>
- <xs:element name="validation-settings" type="validation-settings_type" minOccurs="0" />
+ <xs:element name="validation" type="validationType" minOccurs="0" />
<xs:element name="url-delimiter" type="xs:token" minOccurs="0">
<xs:annotation>
<xs:documentation>
@@ -166,7 +166,7 @@
</xs:sequence>
<xs:attributeGroup ref="common-datasourceAttributes" />
</xs:complexType>
- <xs:complexType name="xa-datasourceComplexType">
+ <xs:complexType name="xa-datasourceType">
<xs:sequence>
<xs:element name="min-pool-size" type="xs:nonNegativeInteger" minOccurs="0">
<xs:annotation>
@@ -219,7 +219,7 @@
</xs:documentation>
</xs:annotation>
</xs:element>
- <xs:element name="xa-datasource-property" type="xa-datasource-propertyComplexType" minOccurs="1"
+ <xs:element name="xa-datasource-property" type="xa-datasource-propertyType" minOccurs="1"
maxOccurs="unbounded">
<xs:annotation>
<xs:documentation>
@@ -249,7 +249,7 @@
</xs:documentation>
</xs:annotation>
</xs:element>
- <xs:element name="transaction-isolation" type="transaction-isolation-values" minOccurs="0">
+ <xs:element name="transaction-isolation" type="transaction-isolationType" minOccurs="0">
<xs:annotation>
<xs:documentation>
<![CDATA[[
@@ -272,7 +272,7 @@
</xs:documentation>
</xs:annotation>
</xs:element>
- <xs:element name="interleaving" type="boolean-presence-ComplexType" minOccurs="0">
+ <xs:element name="interleaving" type="boolean-presenceType" minOccurs="0">
<xs:annotation>
<xs:documentation>
<![CDATA[[
@@ -282,13 +282,13 @@
</xs:documentation>
</xs:annotation>
</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:element name="recovery" type="recoveryType" minOccurs="0" />
+ <xs:element name="time-out" type="time-outType" minOccurs="0" />
+ <xs:element name="security" type="securityType" minOccurs="0"></xs:element>
+ <xs:element name="statement" minOccurs="0">
<xs:complexType>
<xs:sequence>
- <xs:element name="track-statements" type="track-statements-type" minOccurs="0">
+ <xs:element name="track-statements" type="track-statementsType" minOccurs="0">
<xs:annotation>
<xs:documentation>
<![CDATA[[
@@ -311,7 +311,7 @@
</xs:documentation>
</xs:annotation>
</xs:element>
- <xs:element name="share-prepared-statements" type="boolean-presence-ComplexType" minOccurs="0">
+ <xs:element name="share-prepared-statements" type="boolean-presenceType" minOccurs="0">
<xs:annotation>
<xs:documentation>
<![CDATA[[
@@ -325,7 +325,7 @@
</xs:sequence>
</xs:complexType>
</xs:element>
- <xs:element name="validation-settings" type="validation-settings_type" minOccurs="0" />
+ <xs:element name="validation" type="validationType" minOccurs="0" />
<xs:element name="url-delimiter" type="xs:token" minOccurs="0">
<xs:annotation>
<xs:documentation>
@@ -356,12 +356,12 @@
</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:element name="no-tx-separate-pools" type="boolean-presenceType" minOccurs="0" />
<xs:element name="track-connection-by-tx" type="xs:boolean" minOccurs="0"></xs:element>
</xs:sequence>
<xs:attributeGroup ref="common-datasourceAttributes" />
</xs:complexType>
- <xs:complexType name="boolean-presence-ComplexType" />
+ <xs:complexType name="boolean-presenceType" />
<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" />
@@ -378,7 +378,7 @@
</xs:annotation>
</xs:attribute>
</xs:attributeGroup>
- <xs:simpleType name="transaction-isolation-values">
+ <xs:simpleType name="transaction-isolationType">
<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
@@ -392,7 +392,7 @@
<xs:enumeration value="TRANSACTION_NONE" />
</xs:restriction>
</xs:simpleType>
- <xs:simpleType name="security-manager-values">
+ <xs:simpleType name="security-managerType">
<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>
@@ -404,9 +404,9 @@
<xs:enumeration value="NONE" />
</xs:restriction>
</xs:simpleType>
- <xs:complexType name="security-settings_type">
+ <xs:complexType name="securityType">
<xs:sequence>
- <xs:element name="security-manager" type="security-manager-values" minOccurs="0">
+ <xs:element name="security-manager" type="security-managerType" minOccurs="0">
<xs:annotation>
<xs:documentation>
<![CDATA[[
@@ -440,13 +440,13 @@
</xs:element>
</xs:sequence>
</xs:complexType>
- <xs:complexType name="xa-datasource-propertyComplexType" mixed="true">
+ <xs:complexType name="xa-datasource-propertyType" mixed="true">
<xs:attribute use="required" name="name" type="xs:token" />
</xs:complexType>
- <xs:complexType name="connection-propertyComplexType" mixed="true">
+ <xs:complexType name="connection-propertyType" mixed="true">
<xs:attribute use="required" name="name" type="xs:token" />
</xs:complexType>
- <xs:complexType name="validation-settings_type">
+ <xs:complexType name="validationType">
<xs:sequence>
<xs:element name="valid-connection-checker-class-name" type="xs:token" minOccurs="0">
<xs:annotation>
@@ -543,7 +543,7 @@
</xs:element>
</xs:sequence>
</xs:complexType>
- <xs:complexType name="time-out-settings_type">
+ <xs:complexType name="time-outType">
<xs:sequence>
<xs:element name="blocking-timeout-millis" type="xs:nonNegativeInteger" minOccurs="0">
<xs:annotation>
@@ -570,7 +570,7 @@
</xs:documentation>
</xs:annotation>
</xs:element>
- <xs:element name="set-tx-query-timeout" type="boolean-presence-ComplexType" minOccurs="0">
+ <xs:element name="set-tx-query-timeout" type="boolean-presenceType" minOccurs="0">
<xs:annotation>
<xs:documentation>
<![CDATA[[
@@ -635,7 +635,7 @@
</xs:element>
</xs:sequence>
</xs:complexType>
- <xs:complexType name="recovery-settings_type">
+ <xs:complexType name="recoveryType">
<xs:choice>
<xs:element name="no-recover" type="xs:boolean" minOccurs="0">
<xs:annotation>
@@ -684,22 +684,22 @@
</xs:sequence>
</xs:choice>
</xs:complexType>
- <xs:simpleType name="track-statements-type">
+ <xs:simpleType name="track-statementsType">
<xs:restriction base="xs:token">
<xs:enumeration value="true" />
<xs:enumeration value="false" />
<xs:enumeration value="nowarn" />
</xs:restriction>
</xs:simpleType>
- <xs:complexType name="statement-settings_type">
+ <xs:complexType name="statementType">
<xs:sequence>
- <xs:element name="track-statements" type="track-statements-type" minOccurs="0">
+ <xs:element name="track-statements" type="track-statementsType" minOccurs="0">
<xs:annotation></xs:annotation>
</xs:element>
<xs:element name="prepared-statement-cache-size" type="xs:nonNegativeInteger" minOccurs="0">
<xs:annotation></xs:annotation>
</xs:element>
- <xs:element name="share-prepared-statements" type="boolean-presence-ComplexType" minOccurs="0">
+ <xs:element name="share-prepared-statements" type="boolean-presenceType" minOccurs="0">
<xs:annotation></xs:annotation>
</xs:element>
</xs:sequence>
Modified: projects/jboss-jca/trunk/common/src/test/resources/ds/db2-ds.xml
===================================================================
--- projects/jboss-jca/trunk/common/src/test/resources/ds/db2-ds.xml 2010-08-15 18:45:14 UTC (rev 107628)
+++ projects/jboss-jca/trunk/common/src/test/resources/ds/db2-ds.xml 2010-08-16 09:09:33 UTC (rev 107629)
@@ -24,10 +24,10 @@
or the DB2 JDBC application developers manual.
-->
<!-- New org.jboss.resource.adapter.jdbc.vendor.DB2ExceptionSorter
- <validation-settings>
+ <validation>
<exception-sorter-class-name>org.jboss.resource.adapter.jdbc.vendor.DB2ExceptionSorter</exception-sorter-class-name>
<check-valid-connection-sql>some arbitrary sql</check-valid-connection-sql>
- </validation-settings>
+ </validation>
-->
<!-- sql to call when connection is created
Modified: projects/jboss-jca/trunk/common/src/test/resources/ds/derby-ds.xml
===================================================================
--- projects/jboss-jca/trunk/common/src/test/resources/ds/derby-ds.xml 2010-08-15 18:45:14 UTC (rev 107628)
+++ projects/jboss-jca/trunk/common/src/test/resources/ds/derby-ds.xml 2010-08-16 09:09:33 UTC (rev 107629)
@@ -17,15 +17,15 @@
<connection-url>jdbc:derby:${jboss.server.data.dir}${/}derby${/}localDB;create=true</connection-url>
<!-- The driver class -->
<driver-class>org.apache.derby.jdbc.EmbeddedDriver</driver-class>
- <time-out-settings>
+ <time-out>
<!-- The time before an unused connection is destroyed -->
<idle-timeout-minutes>5</idle-timeout-minutes>
- </time-out-settings>
+ </time-out>
<!-- Whether to check all statements are closed when the connection is returned to the pool, this is a debugging feature
that should be turned off in production -->
- <statement-settings>
+ <statement>
<track-statements>true</track-statements>
<!-- This mbean can be used when using in process persistent derby -->
- </statement-settings>
+ </statement>
</datasource>
</datasources>
\ No newline at end of file
Modified: projects/jboss-jca/trunk/common/src/test/resources/ds/hsqldb-ds.xml
===================================================================
--- projects/jboss-jca/trunk/common/src/test/resources/ds/hsqldb-ds.xml 2010-08-15 18:45:14 UTC (rev 107628)
+++ projects/jboss-jca/trunk/common/src/test/resources/ds/hsqldb-ds.xml 2010-08-16 09:09:33 UTC (rev 107629)
@@ -21,30 +21,30 @@
<connection-url>jdbc:hsqldb:${jboss.server.data.dir}${/}hypersonic${/}localDB</connection-url>
<!-- The driver class -->
<driver-class>org.hsqldb.jdbcDriver</driver-class>
- <time-out-settings>
+ <time-out>
<!-- The time before an unused connection is destroyed -->
<!-- NOTE: This is the check period. It will be destroyed somewhere between 1x and 2x this timeout after last use -->
<!-- TEMPORARY FIX! - Disable idle connection removal, HSQLDB has a problem with not reaping threads on closed connections -->
<idle-timeout-minutes>0</idle-timeout-minutes>
- </time-out-settings>
- <security-settings>
+ </time-out>
+ <security>
<security-manager>APPLICATION_AND_DOMAIN</security-manager>
<security-domain>HsqlDbRealm</security-domain>
- </security-settings>
- <statement-settings>
+ </security>
+ <statement>
<!-- Whether to check all statements are closed when the connection is returned to the pool, this is a debugging feature
that should be turned off in production -->
<track-statements>true</track-statements>
<!-- HSQL DB benefits from prepared statement caching -->
<prepared-statement-cache-size>32</prepared-statement-cache-size>
- </statement-settings>
- <validation-settings>
+ </statement>
+ <validation>
<!-- example of how to specify a class that determines a connection is valid before it is handed out from the pool -->
<valid-connection-checker-class-name>org.jboss.resource.adapter.jdbc.vendor.DummyValidConnectionChecker</valid-connection-checker-class-name>
<!-- this will be run before a managed connection is removed from the pool for use by a client -->
<check-valid-connection-sql>select * from something</check-valid-connection-sql>
<!--example of how to specify class that determines if exception means connection should be destroyed -->
<exception-sorter-class-name>org.jboss.resource.adapter.jdbc.vendor.DummyExceptionSorter</exception-sorter-class-name>
- </validation-settings>
+ </validation>
</datasource>
</datasources>
\ No newline at end of file
Modified: projects/jboss-jca/trunk/common/src/test/resources/ds/informix-ds.xml
===================================================================
--- projects/jboss-jca/trunk/common/src/test/resources/ds/informix-ds.xml 2010-08-15 18:45:14 UTC (rev 107628)
+++ projects/jboss-jca/trunk/common/src/test/resources/ds/informix-ds.xml 2010-08-16 09:09:33 UTC (rev 107629)
@@ -13,11 +13,11 @@
<password>y</password>
<connection-url>jdbc:informix-sqli://myhost.mydomain.com:1557/mydb:INFORMIXSERVER=myserver</connection-url>
<driver-class>com.informix.jdbc.IfxDriver</driver-class>
- <validation-settings>
+ <validation>
<!-- sql to call on an existing pooled connection when it is obtained from pool -->
<check-valid-connection-sql>some arbitrary sql</check-valid-connection-sql>
<exception-sorter-class-name>org.jboss.resource.adapter.jdbc.vendor.InformixExceptionSorter</exception-sorter-class-name>
- </validation-settings>
+ </validation>
<!-- sql to call when connection is created -->
<new-connection-sql>some arbitrary sql</new-connection-sql>
</datasource>
Modified: projects/jboss-jca/trunk/common/src/test/resources/ds/informix-xa-ds.xml
===================================================================
--- projects/jboss-jca/trunk/common/src/test/resources/ds/informix-xa-ds.xml 2010-08-15 18:45:14 UTC (rev 107628)
+++ projects/jboss-jca/trunk/common/src/test/resources/ds/informix-xa-ds.xml 2010-08-16 09:09:33 UTC (rev 107629)
@@ -15,11 +15,11 @@
<xa-datasource-property name="DatabaseName">mydb</xa-datasource-property>
<xa-datasource-property name="ServerName">myserver</xa-datasource-property>
<xa-datasource-class>com.informix.jdbcx.IfxXADataSource</xa-datasource-class>
- <validation-settings>
+ <validation>
<!-- sql to call on an existing pooled connection when it is obtained from pool -->
<check-valid-connection-sql>some arbitrary sql</check-valid-connection-sql>
<exception-sorter-class-name>org.jboss.resource.adapter.jdbc.vendor.InformixExceptionSorter</exception-sorter-class-name>
- </validation-settings>
+ </validation>
<!-- sql to call when connection is created -->
<new-connection-sql>some arbitrary sql</new-connection-sql>
</xa-datasource>
Modified: projects/jboss-jca/trunk/common/src/test/resources/ds/jsql-ds.xml
===================================================================
--- projects/jboss-jca/trunk/common/src/test/resources/ds/jsql-ds.xml 2010-08-15 18:45:14 UTC (rev 107628)
+++ projects/jboss-jca/trunk/common/src/test/resources/ds/jsql-ds.xml 2010-08-16 09:09:33 UTC (rev 107629)
@@ -17,9 +17,9 @@
<connection-url>jdbc:JSQLConnect://localhost:1433/databaseName=testdb</connection-url>
<driver-class>com.jnetdirect.jsql.JSQLDriver</driver-class>
<!-- sql to call on an existing pooled connection when it is obtained from pool
- <validation-settings>
+ <validation>
<check-valid-connection-sql>some arbitrary sql</check-valid-connection-sql>
- </validation-settings> -->
+ </validation> -->
<!-- sql to call when connection is created <new-connection-sql>some arbitrary sql</new-connection-sql> -->
</datasource>
</datasources>
\ No newline at end of file
Modified: projects/jboss-jca/trunk/common/src/test/resources/ds/mimer-ds.xml
===================================================================
--- projects/jboss-jca/trunk/common/src/test/resources/ds/mimer-ds.xml 2010-08-15 18:45:14 UTC (rev 107628)
+++ projects/jboss-jca/trunk/common/src/test/resources/ds/mimer-ds.xml 2010-08-16 09:09:33 UTC (rev 107629)
@@ -15,9 +15,9 @@
<password>changeme</password>
<connection-url>jdbc:mimer:multi1</connection-url>
<driver-class>com.mimer.jdbc.Driver</driver-class>
- <time-out-settings>
+ <time-out>
<blocking-timeout-millis>5000</blocking-timeout-millis>
<idle-timeout-minutes>15</idle-timeout-minutes>
- </time-out-settings>
+ </time-out>
</datasource>
</datasources>
\ No newline at end of file
Modified: projects/jboss-jca/trunk/common/src/test/resources/ds/mimer-xa-ds.xml
===================================================================
--- projects/jboss-jca/trunk/common/src/test/resources/ds/mimer-xa-ds.xml 2010-08-15 18:45:14 UTC (rev 107628)
+++ projects/jboss-jca/trunk/common/src/test/resources/ds/mimer-xa-ds.xml 2010-08-16 09:09:33 UTC (rev 107629)
@@ -18,9 +18,9 @@
<xa-datasource-property name="ServerName">localhost</xa-datasource-property>
<xa-datasource-property name="PortNumber">1360</xa-datasource-property>
<xa-datasource-class>com.mimer.jdbc.MimerXADataSource</xa-datasource-class>
- <time-out-settings>
+ <time-out>
<blocking-timeout-millis>5000</blocking-timeout-millis>
<idle-timeout-minutes>15</idle-timeout-minutes>
- </time-out-settings>
+ </time-out>
</xa-datasource>
</datasources>
\ No newline at end of file
Modified: projects/jboss-jca/trunk/common/src/test/resources/ds/mssql-ds.xml
===================================================================
--- projects/jboss-jca/trunk/common/src/test/resources/ds/mssql-ds.xml 2010-08-15 18:45:14 UTC (rev 107628)
+++ projects/jboss-jca/trunk/common/src/test/resources/ds/mssql-ds.xml 2010-08-16 09:09:33 UTC (rev 107629)
@@ -20,9 +20,9 @@
<connection-url>jdbc:microsoft:sqlserver://localhost:1433;DatabaseName=MyDatabase</connection-url>
<driver-class>com.microsoft.sqlserver.jdbc.SQLServerDriver</driver-class>
<!-- sql to call on an existing pooled connection when it is obtained from pool
- <validation-settings>
+ <validation>
<check-valid-connection-sql>some arbitrary sql</check-valid-connection-sql>
- </validation-settings> -->
+ </validation> -->
<!-- sql to call when connection is created <new-connection-sql>some arbitrary sql</new-connection-sql> -->
</datasource>
</datasources>
\ No newline at end of file
Modified: projects/jboss-jca/trunk/common/src/test/resources/ds/mysql-ds.xml
===================================================================
--- projects/jboss-jca/trunk/common/src/test/resources/ds/mysql-ds.xml 2010-08-15 18:45:14 UTC (rev 107628)
+++ projects/jboss-jca/trunk/common/src/test/resources/ds/mysql-ds.xml 2010-08-16 09:09:33 UTC (rev 107629)
@@ -9,14 +9,14 @@
<password>y</password>
<connection-url>jdbc:mysql://mysql-hostname:3306/jbossdb</connection-url>
<driver-class>com.mysql.jdbc.Driver</driver-class>
- <validation-settings>
+ <validation>
<!-- example of how to specify a class that determines a connection is valid before it is handed out from the pool -->
<valid-connection-checker-class-name>org.jboss.resource.adapter.jdbc.vendor.DummyValidConnectionChecker</valid-connection-checker-class-name>
<!-- this will be run before a managed connection is removed from the pool for use by a client -->
<check-valid-connection-sql>select * from something</check-valid-connection-sql>
<!--example of how to specify class that determines if exception means connection should be destroyed -->
<exception-sorter-class-name>org.jboss.resource.adapter.jdbc.vendor.MySQLExceptionSorter</exception-sorter-class-name>
- </validation-settings>
+ </validation>
<!-- sql to call when connection is created <new-connection-sql>some arbitrary sql</new-connection-sql> -->
</datasource>
</datasources>
\ No newline at end of file
Modified: projects/jboss-jca/trunk/common/src/test/resources/ds/mysql-xa-ds.xml
===================================================================
--- projects/jboss-jca/trunk/common/src/test/resources/ds/mysql-xa-ds.xml 2010-08-15 18:45:14 UTC (rev 107628)
+++ projects/jboss-jca/trunk/common/src/test/resources/ds/mysql-xa-ds.xml 2010-08-16 09:09:33 UTC (rev 107629)
@@ -9,11 +9,11 @@
<xa-datasource-property name="User">user</xa-datasource-property>
<xa-datasource-property name="Password">password</xa-datasource-property>
<xa-datasource-class>com.mysql.jdbc.jdbc2.optional.MysqlXADataSource</xa-datasource-class>
- <validation-settings>
+ <validation>
<!-- should only be used on drivers after 3.22.1 with "ping" support <valid-connection-checker-class-name>org.jboss.resource.adapter.jdbc.vendor.MySQLValidConnectionChecker</valid-connection-checker-class-name> -->
<!-- sql to call on an existing pooled connection when it is obtained from pool - MySQLValidConnectionChecker is preferred
for newer drivers <check-valid-connection-sql>some arbitrary sql</check-valid-connection-sql> -->
- </validation-settings>
+ </validation>
<!-- sql to call when connection is created <new-connection-sql>some arbitrary sql</new-connection-sql> -->
<track-connection-by-tx>true</track-connection-by-tx>
</xa-datasource>
Modified: projects/jboss-jca/trunk/common/src/test/resources/ds/oracle-ds.xml
===================================================================
--- projects/jboss-jca/trunk/common/src/test/resources/ds/oracle-ds.xml 2010-08-15 18:45:14 UTC (rev 107628)
+++ projects/jboss-jca/trunk/common/src/test/resources/ds/oracle-ds.xml 2010-08-16 09:09:33 UTC (rev 107629)
@@ -20,13 +20,13 @@
Clearly, its better to have TNS set up properly. -->
<driver-class>oracle.jdbc.driver.OracleDriver</driver-class>
<!-- Uses the pingDatabase method to check a connection is still valid before handing it out from the pool -->
- <validation-settings>
+ <validation>
<!--valid-connection-checker-class-name>org.jboss.resource.adapter.jdbc.vendor.OracleValidConnectionChecker</valid-connection-checker-class-name -->
<!-- sql to call on an existing pooled connection when it is obtained from pool - the OracleValidConnectionChecker
is prefered <check-valid-connection-sql>some arbitrary sql</check-valid-connection-sql> -->
<!-- Checks the Oracle error codes and messages for fatal errors -->
<exception-sorter-class-name>org.jboss.resource.adapter.jdbc.vendor.OracleExceptionSorter</exception-sorter-class-name>
- </validation-settings>
+ </validation>
<!-- sql to call when connection is created <new-connection-sql>some arbitrary sql</new-connection-sql> -->
</datasource>
</datasources>
\ No newline at end of file
Modified: projects/jboss-jca/trunk/common/src/test/resources/ds/oracle-xa-ds.xml
===================================================================
--- projects/jboss-jca/trunk/common/src/test/resources/ds/oracle-xa-ds.xml 2010-08-15 18:45:14 UTC (rev 107628)
+++ projects/jboss-jca/trunk/common/src/test/resources/ds/oracle-xa-ds.xml 2010-08-16 09:09:33 UTC (rev 107629)
@@ -17,14 +17,14 @@
<xa-datasource-class>oracle.jdbc.xa.client.OracleXADataSource</xa-datasource-class>
<!-- uncomment to enable interleaving <interleaving/> -->
<is-same-rm-override>false</is-same-rm-override>
- <validation-settings>
+ <validation>
<!-- Uses the pingDatabase method to check a connection is still valid before handing it out from the pool -->
<!--valid-connection-checker-class-name>org.jboss.resource.adapter.jdbc.vendor.OracleValidConnectionChecker</valid-connection-checker-class-name -->
<!-- sql to call on an existing pooled connection when it is obtained from pool - the OracleValidConnectionChecker
is prefered <check-valid-connection-sql>some arbitrary sql</check-valid-connection-sql> -->
<!-- Checks the Oracle error codes and messages for fatal errors -->
<exception-sorter-class-name>org.jboss.resource.adapter.jdbc.vendor.OracleExceptionSorter</exception-sorter-class-name>
- </validation-settings>
+ </validation>
<no-tx-separate-pools />
</xa-datasource>
</datasources>
\ No newline at end of file
Modified: projects/jboss-jca/trunk/common/src/test/resources/ds/sybase-ds.xml
===================================================================
--- projects/jboss-jca/trunk/common/src/test/resources/ds/sybase-ds.xml 2010-08-15 18:45:14 UTC (rev 107628)
+++ projects/jboss-jca/trunk/common/src/test/resources/ds/sybase-ds.xml 2010-08-16 09:09:33 UTC (rev 107629)
@@ -18,11 +18,11 @@
is provided, as well as some additinal Driver parameters. -->
<connection-url>jdbc:sybase:Tds:host.at.some.domain:5000/db_name?JCONNECT_VERSION=6</connection-url>
<driver-class>com.sybase.jdbc2.jdbc.SybDataSource</driver-class>
- <validation-settings>
+ <validation>
<!-- sql to call on an existing pooled connection when it is obtained from pool <check-valid-connection-sql>some arbitrary
sql</check-valid-connection-sql> -->
<exception-sorter-class-name>org.jboss.resource.adapter.jdbc.vendor.SybaseExceptionSorter</exception-sorter-class-name>
- </validation-settings>
+ </validation>
<!-- sql to call when connection is created <new-connection-sql>some arbitrary sql</new-connection-sql> -->
</datasource>
</datasources>
\ No newline at end of file
Modified: projects/jboss-jca/trunk/common/src/test/resources/ds/sybase-xa-ds.xml
===================================================================
--- projects/jboss-jca/trunk/common/src/test/resources/ds/sybase-xa-ds.xml 2010-08-15 18:45:14 UTC (rev 107628)
+++ projects/jboss-jca/trunk/common/src/test/resources/ds/sybase-xa-ds.xml 2010-08-16 09:09:33 UTC (rev 107629)
@@ -25,17 +25,17 @@
<xa-datasource-property name="User">user</xa-datasource-property>
<xa-datasource-property name="Password">password</xa-datasource-property>
<xa-datasource-class>com.sybase.jdbc3.jdbc.SybXADataSource</xa-datasource-class>
- <time-out-settings>
+ <time-out>
<idle-timeout-minutes>15</idle-timeout-minutes>
- </time-out-settings>
- <security-settings>
+ </time-out>
+ <security>
<!-- Use the security domain defined in conf/login-config.xml -->
<security-manager>APPLICATION</security-manager>
<security-domain>SybaseXADSRealm</security-domain>
- </security-settings>
- <validation-settings>
+ </security>
+ <validation>
<check-valid-connection-sql>select 1 from mytable</check-valid-connection-sql>
<exception-sorter-class-name>org.jboss.resource.adapter.jdbc.vendor.SybaseExceptionSorter</exception-sorter-class-name>
- </validation-settings>
+ </validation>
</xa-datasource>
</datasources>
\ No newline at end of file
More information about the jboss-cvs-commits
mailing list