[jboss-cvs] JBossAS SVN: r107993 - in projects/jboss-jca/trunk: common/src/main/java/org/jboss/jca/common/api/metadata/ds and 4 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Sep 6 06:02:59 EDT 2010
Author: maeste
Date: 2010-09-06 06:02:58 -0400 (Mon, 06 Sep 2010)
New Revision: 107993
Removed:
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/metadata/ds/RecoveryImpl.java
Modified:
projects/jboss-jca/trunk/adapters/src/test/resources/h2-ds.xml
projects/jboss-jca/trunk/adapters/src/test/resources/h2-xa-ds.xml
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/Security.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/MetadataFactory.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/SecurityImpl.java
projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ds/XADataSourceImpl.java
projects/jboss-jca/trunk/common/src/main/resources/schema/datasources_1_0.xsd
projects/jboss-jca/trunk/common/src/test/resources/ds/db2-400-ds.xml
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/jdatastore-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/msaccess-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/oracle-ds.xml
projects/jboss-jca/trunk/common/src/test/resources/ds/pointbase-ds.xml
projects/jboss-jca/trunk/common/src/test/resources/ds/pointbase-xa-ds.xml
projects/jboss-jca/trunk/common/src/test/resources/ds/postgres-ds.xml
projects/jboss-jca/trunk/common/src/test/resources/ds/progress-ds.xml
projects/jboss-jca/trunk/common/src/test/resources/ds/sapdb-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: cleaning up the xsd
Modified: projects/jboss-jca/trunk/adapters/src/test/resources/h2-ds.xml
===================================================================
--- projects/jboss-jca/trunk/adapters/src/test/resources/h2-ds.xml 2010-09-06 09:36:37 UTC (rev 107992)
+++ projects/jboss-jca/trunk/adapters/src/test/resources/h2-ds.xml 2010-09-06 10:02:58 UTC (rev 107993)
@@ -3,8 +3,10 @@
<datasources xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://www.jboss.org/jee/schema/ironjacamar/datasources_1_0.xsd">
<datasource jndi-name="java:/H2DS" pool-name="H2DS">
- <user-name>sa</user-name>
- <password>sa</password>
+ <security>
+ <user-name>sa</user-name>
+ <password>sa</password>
+ </security>
<connection-url>jdbc:h2:mem:test;DB_CLOSE_DELAY=-1</connection-url>
<driver-class>org.h2.Driver</driver-class>
</datasource>
Modified: projects/jboss-jca/trunk/adapters/src/test/resources/h2-xa-ds.xml
===================================================================
--- projects/jboss-jca/trunk/adapters/src/test/resources/h2-xa-ds.xml 2010-09-06 09:36:37 UTC (rev 107992)
+++ projects/jboss-jca/trunk/adapters/src/test/resources/h2-xa-ds.xml 2010-09-06 10:02:58 UTC (rev 107993)
@@ -3,10 +3,12 @@
<datasources xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://www.jboss.org/jee/schema/ironjacamar/datasources_1_0.xsd">
<xa-datasource jndi-name="java:/H2XADS" pool-name="H2XADS">
- <!-- Have to defined as a primary property - otherwise it won't work -->
- <user-name>sa</user-name>
- <!-- Have to defined as a primary property - otherwise it won't work -->
- <password>sa</password>
+ <security>
+ <!-- Have to defined as a primary property - otherwise it won't work -->
+ <user-name>sa</user-name>
+ <!-- Have to defined as a primary property - otherwise it won't work -->
+ <password>sa</password>
+ </security>
<xa-datasource-class>org.h2.jdbcx.JdbcDataSource</xa-datasource-class>
<xa-datasource-property name="URL">jdbc:h2:mem:test</xa-datasource-property>
</xa-datasource>
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-09-06 09:36:37 UTC (rev 107992)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/ds/DataSource.java 2010-09-06 10:02:58 UTC (rev 107993)
@@ -36,20 +36,6 @@
/**
- * Get the userName.
- *
- * @return the userName.
- */
- public String getUserName();
-
- /**
- * Get the password.
- *
- * @return the password.
- */
- public String getPassword();
-
- /**
* Get the connectionUrl.
*
* @return the connectionUrl.
@@ -129,17 +115,10 @@
* prefill tag
*/
PREFILL("prefill"),
+
/**
- * userName tag
- */
- USERNAME("user-name"),
- /**
- * password tag
- */
- PASSWORD("password"),
- /**
- * connectionUrl tag
- */
+ * connection-url tag
+ */
CONNECTIONURL("connection-url"),
/**
* driverClass tag
Deleted: 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/Recovery.java 2010-09-06 09:36:37 UTC (rev 107992)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/ds/Recovery.java 2010-09-06 10:02:58 UTC (rev 107993)
@@ -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 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;
- }
-
- }
-
-}
Modified: 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/Security.java 2010-09-06 09:36:37 UTC (rev 107992)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/ds/Security.java 2010-09-06 10:02:58 UTC (rev 107993)
@@ -22,7 +22,6 @@
package org.jboss.jca.common.api.metadata.ds;
import org.jboss.jca.common.api.metadata.JCAMetadata;
-import org.jboss.jca.common.api.metadata.common.SecurityManager;
import java.util.HashMap;
import java.util.Map;
@@ -37,18 +36,18 @@
public interface Security extends JCAMetadata
{
/**
- * Get the securityManager.
+ * Get the userName.
*
- * @return the securityManager.
+ * @return the userName.
*/
- public SecurityManager getSecurityManager();
+ public String getUserName();
/**
- * Get the securityDomain.
+ * Get the password.
*
- * @return the securityDomain.
+ * @return the password.
*/
- public String getSecurityDomain();
+ public String getPassword();
/**
*
@@ -65,13 +64,13 @@
UNKNOWN(null),
/**
- * securityManager tag
- */
- SECURITYMANAGER("security-manager"),
+ * userName tag
+ */
+ USERNAME("user-name"),
/**
- * securityDomain tag
+ * password tag
*/
- SECURITYDOMAIN("security-domain");
+ PASSWORD("password");
private final String name;
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-09-06 09:36:37 UTC (rev 107992)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/ds/XaDataSource.java 2010-09-06 10:02:58 UTC (rev 107993)
@@ -35,21 +35,6 @@
{
/**
- * Get the userName.
- *
- * @return the userName.
- */
- public String getUserName();
-
- /**
- * Get the password.
- *
- * @return the password.
- */
- public String getPassword();
-
-
- /**
* Get the xaDataSourceClass.
*
* @return the xaDataSourceClass.
@@ -72,14 +57,6 @@
public boolean isInterleaving();
/**
- * Get the recoverySettings.
- *
- * @return the recoverySettings.
- */
- public Recovery getRecovery();
-
-
- /**
* Get the statement.
*
* @return the statement.
@@ -163,14 +140,6 @@
*/
PREFILL("prefill"),
/**
- * userName tag
- */
- USERNAME("user-name"),
- /**
- * password tag
- */
- PASSWORD("password"),
- /**
* xaDatasourceProperty tag
*/
XADATASOURCEPROPERTY("xa-datasource-property"),
@@ -191,10 +160,6 @@
*/
INTERLEAVING("interleaving"),
/**
- * recoverySettings tag
- */
- RECOVERY("recovery"),
- /**
* timeOut tag
*/
TIMEOUT("time-out"),
Modified: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/MetadataFactory.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/MetadataFactory.java 2010-09-06 09:36:37 UTC (rev 107992)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/MetadataFactory.java 2010-09-06 10:02:58 UTC (rev 107993)
@@ -25,6 +25,7 @@
import org.jboss.jca.common.api.metadata.common.TransactionSupportEnum;
import org.jboss.jca.common.api.metadata.ds.CommonDataSource;
import org.jboss.jca.common.api.metadata.ds.DataSource;
+import org.jboss.jca.common.api.metadata.ds.Security;
import org.jboss.jca.common.api.metadata.ds.XaDataSource;
import org.jboss.jca.common.api.metadata.jbossra.JbossRa;
import org.jboss.jca.common.api.metadata.ra.AdminObject;
@@ -219,15 +220,20 @@
{
List<ConfigProperty> configProperties = createConfigProperties(cds, connector.getResourceadapter()
- .getConfigProperties());
+ .getConfigProperties());
ResourceAdapter resourceadapter = new ResourceAdapter10Impl(managedconnectionfactoryClass,
- connectionfactoryInterface, connectionfactoryImplClass, connectionInterface,
- connectionImplClass, transactionSupport, authenticationMechanism, configProperties,
- reauthenticationSupport, securityPermissions, id);
+ connectionfactoryInterface,
+ connectionfactoryImplClass,
+ connectionInterface, connectionImplClass,
+ transactionSupport,
+ authenticationMechanism, configProperties,
+ reauthenticationSupport,
+ securityPermissions, id);
Connector newConnector = new Connector10Impl(moduleName, vendorName, eisType, resourceadapterVersion,
- license, resourceadapter, description, displayNames, icons, id);
+ license, resourceadapter, description, displayNames,
+ icons, id);
return newConnector.merge(connector);
}
@@ -235,14 +241,14 @@
{
List<? extends ConfigProperty> originalProperties = null;
if (connector.getResourceadapter() != null &&
- connector.getResourceadapter() instanceof ResourceAdapter1516)
+ connector.getResourceadapter() instanceof ResourceAdapter1516)
{
ResourceAdapter1516 ra1516 = ((ResourceAdapter1516) connector.getResourceadapter());
if (ra1516.getOutboundResourceadapter() != null &&
- ra1516.getOutboundResourceadapter().getConnectionDefinitions() != null)
+ ra1516.getOutboundResourceadapter().getConnectionDefinitions() != null)
{
originalProperties = ra1516.getOutboundResourceadapter().getConnectionDefinitions().get(0)
- .getConfigProperties();
+ .getConfigProperties();
}
}
@@ -250,17 +256,28 @@
List<ConnectionDefinition> connectionDefinitions = new ArrayList<ConnectionDefinition>(1);
ConnectionDefinition connectionDefinition = new ConnectionDefinitionImpl(
- managedconnectionfactoryClass, configProperties, connectionfactoryInterface,
- connectionfactoryImplClass, connectionInterface, connectionImplClass, id);
+ managedconnectionfactoryClass,
+ configProperties,
+ connectionfactoryInterface,
+ connectionfactoryImplClass,
+ connectionInterface,
+ connectionImplClass, id);
connectionDefinitions.add(connectionDefinition);
OutboundResourceAdapter outboundResourceadapter = new OutboundResourceAdapterImpl(
- connectionDefinitions, transactionSupport, authenticationMechanism, reauthenticationSupport, id);
+ connectionDefinitions,
+ transactionSupport,
+ authenticationMechanism,
+ reauthenticationSupport,
+ id);
String resourceadapterClass = null;
List<? extends ConfigProperty> raConfigProperties = null;
InboundResourceAdapter inboundResourceadapter = null;
ResourceAdapter1516 resourceadapter = new ResourceAdapter1516Impl(resourceadapterClass,
- raConfigProperties, outboundResourceadapter, inboundResourceadapter, adminobjects,
- securityPermissions, id);
+ raConfigProperties,
+ outboundResourceadapter,
+ inboundResourceadapter,
+ adminobjects, securityPermissions,
+ id);
if (connector.getVersion() == Version.V_16)
{
@@ -268,15 +285,16 @@
boolean metadataComplete = false;
Connector newConnector = new Connector16Impl(moduleName, vendorName, eisType,
- resourceadapterVersion, license, resourceadapter, requiredWorkContexts, metadataComplete,
- description, displayNames, icons, id);
+ resourceadapterVersion, license, resourceadapter,
+ requiredWorkContexts, metadataComplete, description,
+ displayNames, icons, id);
return newConnector.merge(connector);
}
else if (connector.getVersion() == Version.V_15)
{
Connector newConnector = new Connector15Impl(vendorName, eisType, resourceadapterVersion, license,
- resourceadapter, description, displayNames, icons, id);
+ resourceadapter, description, displayNames, icons, id);
return newConnector.merge(connector);
}
@@ -289,7 +307,7 @@
}
private static List<ConfigProperty> createConfigProperties(CommonDataSource cds,
- List<? extends ConfigProperty> originalProperties)
+ List<? extends ConfigProperty> originalProperties)
{
DataSource ds = null;
XaDataSource xads = null;
@@ -308,22 +326,33 @@
{
ConfigPropertyFactory.Prototype prototype = ConfigPropertyFactory.Prototype.forName(property
- .getConfigPropertyName().getValue());
+ .getConfigPropertyName().getValue());
switch (prototype)
{
case USERNAME : {
- if (ds != null && ds.getUserName() != null && !ds.getUserName().trim().equals(""))
+ if (ds != null)
{
- configProperties.add(ConfigPropertyFactory.createConfigProperty(prototype, ds.getUserName()));
+ Security security = ds.getSecurity();
+ if (security != null && security.getUserName() != null &&
+ !security.getUserName().trim().equals(""))
+ {
+ configProperties.add(ConfigPropertyFactory.createConfigProperty(prototype,
+ security.getUserName()));
+ }
}
-
break;
}
case PASSWORD : {
- if (ds != null && ds.getPassword() != null && !ds.getPassword().trim().equals(""))
+ if (ds != null)
{
- configProperties.add(ConfigPropertyFactory.createConfigProperty(prototype, ds.getPassword()));
+ Security security = ds.getSecurity();
+ if (security != null && security.getPassword() != null &&
+ !security.getPassword().trim().equals(""))
+ {
+ configProperties.add(ConfigPropertyFactory.createConfigProperty(prototype,
+ security.getPassword()));
+ }
}
break;
@@ -341,7 +370,7 @@
valueBuf.append(";");
}
configProperties.add(ConfigPropertyFactory.createConfigProperty(prototype,
- valueBuf.toString()));
+ valueBuf.toString()));
}
@@ -352,7 +381,7 @@
if (ds != null && ds.getUrlDelimiter() != null && !ds.getUrlDelimiter().trim().equals(""))
{
configProperties.add(ConfigPropertyFactory.createConfigProperty(prototype,
- ds.getUrlDelimiter()));
+ ds.getUrlDelimiter()));
}
break;
@@ -360,10 +389,10 @@
case URLSELECTORSTRATEGYCLASSNAME : {
if (ds != null && ds.getUrlSelectorStrategyClassName() != null &&
- !ds.getUrlSelectorStrategyClassName().trim().equals(""))
+ !ds.getUrlSelectorStrategyClassName().trim().equals(""))
{
configProperties.add(ConfigPropertyFactory.createConfigProperty(prototype,
- ds.getUrlSelectorStrategyClassName()));
+ ds.getUrlSelectorStrategyClassName()));
}
break;
@@ -373,7 +402,7 @@
if (xads != null && xads.getXaDataSourceClass() != null)
{
configProperties.add(ConfigPropertyFactory.createConfigProperty(prototype,
- xads.getXaDataSourceClass()));
+ xads.getXaDataSourceClass()));
}
break;
@@ -383,7 +412,7 @@
if (ds != null && ds.getTransactionIsolation() != null)
{
configProperties.add(ConfigPropertyFactory.createConfigProperty(prototype, ds
- .getTransactionIsolation().name()));
+ .getTransactionIsolation().name()));
}
break;
@@ -391,10 +420,10 @@
case PREPAREDSTATEMENTCACHESIZE : {
if (ds != null && ds.getStatement() != null &&
- ds.getStatement().getPreparedStatementsCacheSize() != null)
+ ds.getStatement().getPreparedStatementsCacheSize() != null)
{
configProperties.add(ConfigPropertyFactory.createConfigProperty(prototype, ds.getStatement()
- .getPreparedStatementsCacheSize()));
+ .getPreparedStatementsCacheSize()));
}
break;
@@ -404,7 +433,7 @@
if (ds != null && ds.getStatement() != null)
{
configProperties.add(ConfigPropertyFactory.createConfigProperty(prototype,
- ds.getStatement() != null && ds.getStatement().isSharePreparedStatements()));
+ ds.getStatement() != null && ds.getStatement().isSharePreparedStatements()));
}
break;
@@ -414,7 +443,7 @@
if (ds != null && ds.getNewConnectionSql() != null)
{
configProperties.add(ConfigPropertyFactory.createConfigProperty(prototype,
- ds.getNewConnectionSql()));
+ ds.getNewConnectionSql()));
}
break;
@@ -422,11 +451,11 @@
case CHECKVALIDCONNECTIONSQL : {
if (ds != null && ds.getValidation() != null &&
- ds.getValidation().getCheckValidConnectionSql() != null &&
- !ds.getValidation().getCheckValidConnectionSql().trim().equals(""))
+ ds.getValidation().getCheckValidConnectionSql() != null &&
+ !ds.getValidation().getCheckValidConnectionSql().trim().equals(""))
{
configProperties.add(ConfigPropertyFactory.createConfigProperty(prototype, ds.getValidation()
- .getCheckValidConnectionSql()));
+ .getCheckValidConnectionSql()));
}
break;
@@ -434,10 +463,10 @@
case VALIDCONNECTIONCHECKERCLASSNAME : {
if (ds != null && ds.getValidation() != null &&
- ds.getValidation().getCheckValidConnectionSql() != null)
+ ds.getValidation().getCheckValidConnectionSql() != null)
{
configProperties.add(ConfigPropertyFactory.createConfigProperty(prototype, ds.getValidation()
- .getCheckValidConnectionSql()));
+ .getCheckValidConnectionSql()));
}
break;
@@ -445,10 +474,10 @@
case EXCEPTIONSORTERCLASSNAME : {
if (ds != null && ds.getValidation() != null &&
- ds.getValidation().getExceptionSorterClassName() != null)
+ ds.getValidation().getExceptionSorterClassName() != null)
{
configProperties.add(ConfigPropertyFactory.createConfigProperty(prototype, ds.getValidation()
- .getExceptionSorterClassName()));
+ .getExceptionSorterClassName()));
}
break;
@@ -456,10 +485,10 @@
case STALECONNECTIONCHECKERCLASSNAME : {
if (ds != null && ds.getValidation() != null &&
- ds.getValidation().getStaleConnectionCheckerClassName() != null)
+ ds.getValidation().getStaleConnectionCheckerClassName() != null)
{
configProperties.add(ConfigPropertyFactory.createConfigProperty(prototype, ds.getValidation()
- .getStaleConnectionCheckerClassName()));
+ .getStaleConnectionCheckerClassName()));
}
break;
@@ -469,7 +498,7 @@
if (ds != null && ds.getStatement() != null && ds.getStatement().getTrackStatements() != null)
{
configProperties.add(ConfigPropertyFactory.createConfigProperty(prototype, ds.getStatement()
- .getTrackStatements().name()));
+ .getTrackStatements().name()));
}
break;
@@ -479,7 +508,7 @@
if (ds != null && ds.getValidation() != null)
{
configProperties.add(ConfigPropertyFactory.createConfigProperty(prototype, ds.getValidation()
- .isValidateOnMatch()));
+ .isValidateOnMatch()));
}
break;
@@ -489,7 +518,7 @@
if (ds != null && ds.getTimeOut() != null)
{
configProperties.add(ConfigPropertyFactory.createConfigProperty(prototype, ds.getTimeOut()
- .isSetTxQueryTimeout()));
+ .isSetTxQueryTimeout()));
}
break;
@@ -499,7 +528,7 @@
if (ds != null && ds.getTimeOut() != null && ds.getTimeOut().getQueryTimeout() != null)
{
configProperties.add(ConfigPropertyFactory.createConfigProperty(prototype, ds.getTimeOut()
- .getQueryTimeout()));
+ .getQueryTimeout()));
}
break;
@@ -509,7 +538,7 @@
if (ds != null && ds.getTimeOut() != null && ds.getTimeOut().getUseTryLock() != null)
{
configProperties.add(ConfigPropertyFactory.createConfigProperty(prototype, ds.getTimeOut()
- .getUseTryLock()));
+ .getUseTryLock()));
}
break;
@@ -518,7 +547,7 @@
if (ds != null && ds.getDriverClass() != null)
{
configProperties.add(ConfigPropertyFactory.createConfigProperty(prototype,
- ds.getDriverClass()));
+ ds.getDriverClass()));
}
break;
}
@@ -535,7 +564,7 @@
valueBuf.append(";");
}
configProperties.add(ConfigPropertyFactory.createConfigProperty(prototype,
- valueBuf.toString()));
+ valueBuf.toString()));
}
break;
@@ -544,7 +573,7 @@
if (ds != null && ds.getConnectionUrl() != null)
{
configProperties.add(ConfigPropertyFactory.createConfigProperty(prototype,
- ds.getConnectionUrl()));
+ ds.getConnectionUrl()));
}
break;
}
@@ -557,11 +586,11 @@
for (Entry<String, String> connectionProperty : ds.getConnectionProperties().entrySet())
{
ConfigPropertyFactory.Prototype prototype = ConfigPropertyFactory.Prototype
- .forName(connectionProperty.getKey());
+ .forName(connectionProperty.getKey());
if (prototype != ConfigPropertyFactory.Prototype.UNKNOWN)
{
configProperties.add(ConfigPropertyFactory.createConfigProperty(prototype,
- connectionProperty.getValue()));
+ connectionProperty.getValue()));
}
}
}
@@ -594,7 +623,7 @@
{
return new ConfigPropertyImpl(prototype.getDescription(), prototype.getLocalName(),
- prototype.getLocalType(), new XsdString(value, null), null);
+ prototype.getLocalType(), new XsdString(value, null), null);
}
/**
@@ -609,7 +638,7 @@
{
return new ConfigPropertyImpl(prototype.getDescription(), prototype.getLocalName(),
- prototype.getLocalType(), new XsdString(String.valueOf(value), null), null);
+ prototype.getLocalType(), new XsdString(String.valueOf(value), null), null);
}
/**
@@ -624,7 +653,7 @@
{
return new ConfigPropertyImpl(prototype.getDescription(), prototype.getLocalName(),
- prototype.getLocalType(), new XsdString(String.valueOf(value), null), null);
+ prototype.getLocalType(), new XsdString(String.valueOf(value), null), null);
}
/**
@@ -644,7 +673,7 @@
CONNECTIONURL("ConnectionURL", "java.lang.String", "The jdbc connection url class."),
/** CONNECTIONPROPERTIES **/
CONNECTIONPROPERTIES("ConnectionProperties", "java.lang.String",
- "Connection properties for the database."),
+ "Connection properties for the database."),
/** USERNAME **/
USERNAME("UserName", "java.lang.String", "The default user name used to create JDBC connections."),
@@ -652,59 +681,57 @@
PASSWORD("Password", "java.lang.String", "The default password used to create JDBC connections."),
/** XADATASOURCEPROPERTIES **/
XADATASOURCEPROPERTIES("XADataSourceProperties", "java.lang.String",
- "The properties to set up the XA driver. These properties must be in the form "
- + "name1=value1;name2=value2;...namen=valuen"),
+ "The properties to set up the XA driver. These properties must be in the form "
+ + "name1=value1;name2=value2;...namen=valuen"),
/** URLDELIMITER **/
URLDELIMITER("URLDelimiter", "java.lang.String", "The jdbc connection url delimeter."),
/** URLPROPERTY **/
URLPROPERTY("URLProperty", "java.lang.String", "The property that contains the list of URLs."),
/** URLSELECTORSTRATEGYCLASSNAME **/
URLSELECTORSTRATEGYCLASSNAME("UrlSelectorStrategyClassName", "java.lang.String",
- "The configurable URLSelectorStrategy class name."),
+ "The configurable URLSelectorStrategy class name."),
/** XADATASOURCECLASS **/
XADATASOURCECLASS("XADataSourceClass", "java.lang.String",
- "The class name of the JDBC XA driver that handlesthis JDBC URL."),
+ "The class name of the JDBC XA driver that handlesthis JDBC URL."),
/** TRANSACTIONISOLATION **/
TRANSACTIONISOLATION("TransactionIsolation", "java.lang.String",
- "The transaction isolation for new connections. Not necessary: the driver default will be used "
- + "if ommitted."),
+ "The transaction isolation for new connections. Not necessary: the driver default will be used "
+ + "if ommitted."),
/** PREPAREDSTATEMENTCACHESIZE **/
PREPAREDSTATEMENTCACHESIZE("PreparedStatementCacheSize", "java.lang.Integer",
- "The number of cached prepared statements per connection."),
+ "The number of cached prepared statements per connection."),
/** SHAREPREPAREDSTATEMENTS **/
SHAREPREPAREDSTATEMENTS("SharePreparedStatements", "java.lang.Boolean",
- "Whether to share prepared statements."),
+ "Whether to share prepared statements."),
/** NEWCONNECTIONSQL **/
NEWCONNECTIONSQL("NewConnectionSQL", "java.lang.String",
- "An SQL statement to be executed when a new connection is created as auxillary setup."),
+ "An SQL statement to be executed when a new connection is created as auxillary setup."),
/** CHECKVALIDCONNECTIONSQL **/
CHECKVALIDCONNECTIONSQL("CheckValidConnectionSQL", "java.lang.String",
- "An SQL statement that may be executed when a managed connection is taken out of the pool and is "
- + "about to be given to a client: the purpose is to verify that the connection still works."),
+ "An SQL statement that may be executed when a managed connection is taken out of the pool and is "
+ + "about to be given to a client: the purpose is to verify that the connection still works."),
/** VALIDCONNECTIONCHECKERCLASSNAME **/
VALIDCONNECTIONCHECKERCLASSNAME("ValidConnectionCheckerClassName", "java.lang.String",
- "The fully qualified name of a class implementing org.jboss.jca.adapters.jdbc.ValidConnectionChecker"
- + " that can determine for a particular vender db when a connection is valid."),
+ "The fully qualified name of a class implementing org.jboss.jca.adapters.jdbc.ValidConnectionChecker"
+ + " that can determine for a particular vender db when a connection is valid."),
/** EXCEPTIONSORTERCLASSNAME **/
- EXCEPTIONSORTERCLASSNAME(
- "ExceptionSorterClassName",
- "java.lang.String",
- "The fully qualified name of a class implementing org.jboss.jca.adapters.jdbc.ExceptionSorter that"
- + " can determine for a particular vender db which exceptions are "
- + "fatal and mean a connection should be discarded."),
+ EXCEPTIONSORTERCLASSNAME("ExceptionSorterClassName", "java.lang.String",
+ "The fully qualified name of a class implementing org.jboss.jca.adapters.jdbc.ExceptionSorter that"
+ + " can determine for a particular vender db which exceptions are "
+ + "fatal and mean a connection should be discarded."),
/** STALECONNECTIONCHECKERCLASSNAME **/
STALECONNECTIONCHECKERCLASSNAME("StaleConnectionCheckerClassName", "java.lang.String",
- "The fully qualified name of a class implementing org.jboss.jca.adapters.jdbc.StaleConnectionChecker"
- + " that can determine for a particular vender db when a connection is stale."),
+ "The fully qualified name of a class implementing org.jboss.jca.adapters.jdbc.StaleConnectionChecker"
+ + " that can determine for a particular vender db when a connection is stale."),
/** TRACKSTATEMENTS **/
TRACKSTATEMENTS("TrackStatements", "java.lang.String",
- "Whether to track unclosed statements - false/true/nowarn"),
+ "Whether to track unclosed statements - false/true/nowarn"),
/** VALIDATEONMATCH **/
VALIDATEONMATCH("ValidateOnMatch", "java.lang.Boolean",
- "Whether to validate the connection on the ManagedConnectionFactory.matchManagedConnection method"),
+ "Whether to validate the connection on the ManagedConnectionFactory.matchManagedConnection method"),
/** TRANSACTIONQUERYTIMEOUT **/
TRANSACTIONQUERYTIMEOUT("TransactionQueryTimeout", "java.lang.Boolean",
- "Whether to set the query timeout based on the transaction timeout"),
+ "Whether to set the query timeout based on the transaction timeout"),
/** QUERYTIMEOUT **/
QUERYTIMEOUT("QueryTimeout", "java.lang.Integer", "A configured query timeout"),
/** USETRYLOCK **/
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-09-06 09:36:37 UTC (rev 107992)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ds/DataSourceImpl.java 2010-09-06 10:02:58 UTC (rev 107993)
@@ -44,10 +44,6 @@
/** The serialVersionUID */
private static final long serialVersionUID = -5214100851560229431L;
- private final String userName;
-
- private final String password;
-
private final String connectionUrl;
private final String driverClass;
@@ -62,8 +58,6 @@
* @param minPoolSize minPoolSize
* @param maxPoolSize maxPoolSize
* @param prefill prefill
- * @param userName userName
- * @param password password
* @param connectionUrl connectionUrl
* @param driverClass driverClass
* @param transactionIsolation transactionIsolation
@@ -80,18 +74,14 @@
* @param enabled enabled
* @param jndiName jndiName
*/
- public DataSourceImpl(Integer minPoolSize, Integer maxPoolSize, boolean prefill, String userName, String password,
- String connectionUrl, String driverClass, TransactionIsolation transactionIsolation,
- 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)
+ public DataSourceImpl(Integer minPoolSize, Integer maxPoolSize, boolean prefill, String connectionUrl,
+ String driverClass, TransactionIsolation transactionIsolation, 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, timeOut, security,
- statement, validation, urlDelimiter, urlSelectorStrategyClassName, useJavaContext,
- poolName, enabled, jndiName);
- this.userName = userName;
- this.password = password;
+ super(minPoolSize, maxPoolSize, prefill, transactionIsolation, timeOut, security, statement, validation,
+ urlDelimiter, urlSelectorStrategyClassName, useJavaContext, poolName, enabled, jndiName);
this.connectionUrl = connectionUrl;
this.driverClass = driverClass;
if (connectionProperties != null)
@@ -108,28 +98,6 @@
}
/**
- * Get the userName.
- *
- * @return the userName.
- */
- @Override
- public final String getUserName()
- {
- return userName;
- }
-
- /**
- * Get the password.
- *
- * @return the password.
- */
- @Override
- public final String getPassword()
- {
- return password;
- }
-
- /**
* Get the connectionUrl.
*
* @return the connectionUrl.
@@ -219,7 +187,6 @@
result = prime * result + ((maxPoolSize == null) ? 0 : maxPoolSize.hashCode());
result = prime * result + ((minPoolSize == null) ? 0 : minPoolSize.hashCode());
result = prime * result + ((newConnectionSql == null) ? 0 : newConnectionSql.hashCode());
- 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 + ((security == null) ? 0 : security.hashCode());
@@ -227,9 +194,9 @@
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 +
+ ((urlSelectorStrategyClassName == null) ? 0 : urlSelectorStrategyClassName.hashCode());
result = prime * result + (useJavaContext ? 1231 : 1237);
- result = prime * result + ((userName == null) ? 0 : userName.hashCode());
result = prime * result + ((validation == null) ? 0 : validation.hashCode());
return result;
}
@@ -295,13 +262,6 @@
}
else if (!newConnectionSql.equals(other.newConnectionSql))
return false;
- if (password == null)
- {
- if (other.password != null)
- return false;
- }
- else if (!password.equals(other.password))
- return false;
if (poolName == null)
{
if (other.poolName != null)
@@ -350,13 +310,6 @@
return false;
if (useJavaContext != other.useJavaContext)
return false;
- if (userName == null)
- {
- if (other.userName != null)
- return false;
- }
- else if (!userName.equals(other.userName))
- return false;
if (validation == null)
{
if (other.validation != null)
@@ -370,16 +323,13 @@
@Override
public String toString()
{
- return "DataSourceImpl [minPoolSize=" + minPoolSize + ", maxPoolSize=" + maxPoolSize + ", prefill=" + prefill
- + ", userName=" + userName + ", password=" + password + ", connectionUrl=" + connectionUrl
- + ", driverClass=" + driverClass + ", transactionIsolation=" + transactionIsolation
- + ", connectionProperties=" + connectionProperties + ", timeOut=" + timeOut
- + ", security=" + security + ", statement=" + statement
- + ", validation=" + validation + ", urlDelimiter=" + urlDelimiter
- + ", urlSelectorStrategyClassName=" + urlSelectorStrategyClassName + ", newConnectionSql="
- + newConnectionSql + ", useJavaContext=" + useJavaContext + ", poolName=" + poolName + ", enabled="
- + enabled + ", jndiName=" + jndiName + "]";
+ return "DataSourceImpl [minPoolSize=" + minPoolSize + ", maxPoolSize=" + maxPoolSize + ", prefill=" +
+ prefill + ", connectionUrl=" + connectionUrl + ", driverClass=" + driverClass +
+ ", transactionIsolation=" + transactionIsolation + ", 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-09-06 09:36:37 UTC (rev 107992)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ds/DsParser.java 2010-09-06 10:02:58 UTC (rev 107993)
@@ -21,10 +21,8 @@
*/
package org.jboss.jca.common.metadata.ds;
-import org.jboss.jca.common.api.metadata.common.SecurityManager;
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.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.Statement.TrackStatementsEnum;
@@ -165,8 +163,6 @@
Integer minPoolSize = null;
Integer maxPoolSize = null;
boolean prefill = false;
- String userName = null;
- String password = null;
TransactionIsolation transactionIsolation = null;
Map<String, String> xaDataSourceProperty = new HashMap<String, String>();
TimeOut timeOutSettings = null;
@@ -180,7 +176,6 @@
boolean interleaving = false;
boolean isSameRmOverrideValue = false;
String xaDataSourceClass = null;
- Recovery recoverySettings = null;
boolean padXid = false;
boolean noTxSeparatePool = false;
boolean wrapXaDataSource = false;
@@ -226,12 +221,13 @@
if (DataSources.Tag.forName(reader.getLocalName()) == DataSources.Tag.XA_DATASOURCE)
{
-
- return new XADataSourceImpl(minPoolSize, maxPoolSize, prefill, userName, password,
- xaDataSourceProperty, xaDataSourceClass, transactionIsolation, isSameRmOverrideValue,
- interleaving, recoverySettings, timeOutSettings, securitySettings, statementSettings,
- validationSettings, urlDelimiter, urlSelectorStrategyClassName, newConnectionSql,
- useJavaContext, poolName, enabled, jndiName, padXid, wrapXaDataSource, noTxSeparatePool);
+ return new XADataSourceImpl(minPoolSize, maxPoolSize, prefill, xaDataSourceProperty,
+ xaDataSourceClass, transactionIsolation, isSameRmOverrideValue,
+ interleaving, timeOutSettings, securitySettings,
+ statementSettings, validationSettings, urlDelimiter,
+ urlSelectorStrategyClassName, newConnectionSql, useJavaContext,
+ poolName, enabled, jndiName, padXid, wrapXaDataSource,
+ noTxSeparatePool);
}
else
{
@@ -265,14 +261,6 @@
newConnectionSql = elementAsString(reader);
break;
}
- case PASSWORD : {
- password = elementAsString(reader);
- break;
- }
- case USERNAME : {
- userName = elementAsString(reader);
- break;
- }
case PREFILL : {
prefill = elementAsBoolean(reader);
break;
@@ -313,10 +301,6 @@
isSameRmOverrideValue = elementAsBoolean(reader);
break;
}
- case RECOVERY : {
- recoverySettings = parseRecoverySettings(reader);
- break;
- }
case NO_TX_SEPARATE_POOLS : {
noTxSeparatePool = elementAsBoolean(reader);
break;
@@ -339,69 +323,12 @@
throw new ParserException("Reached end of xml document unexpectedly");
}
- private Recovery parseRecoverySettings(XMLStreamReader reader) throws XMLStreamException, ParserException
- {
- String recoverUserName = null;
- String recoverPassword = null;
- String recoverSecurityDomain = null;
- boolean noRecover = false;
- while (reader.hasNext())
- {
- switch (reader.nextTag())
- {
- case END_ELEMENT : {
- if (XaDataSource.Tag.forName(reader.getLocalName()) == XaDataSource.Tag.RECOVERY)
- {
-
-
- return new RecoveryImpl(noRecover, recoverUserName, recoverPassword, recoverSecurityDomain);
- }
- else
- {
- if (Recovery.Tag.forName(reader.getLocalName()) == Recovery.Tag.UNKNOWN)
- {
- throw new ParserException("unexpected end tag" + reader.getLocalName());
- }
- }
- break;
- }
- case START_ELEMENT : {
- switch (Recovery.Tag.forName(reader.getLocalName()))
- {
- case NORECOVER : {
- noRecover = elementAsBoolean(reader);
- break;
- }
- case RECOVERPASSWORD : {
- recoverPassword = elementAsString(reader);
- break;
- }
- case RECOVERUSERNAME : {
- recoverUserName = elementAsString(reader);
- break;
- }
- case RECOVERSECURITYDOMAIN : {
- recoverSecurityDomain = elementAsString(reader);
- break;
- }
- default :
- throw new ParserException("Unexpected element:" + reader.getLocalName());
- }
- break;
- }
- }
- }
- throw new ParserException("Reached end of xml document unexpectedly");
- }
-
private DataSource parseDataSource(XMLStreamReader reader) throws XMLStreamException, ParserException
{
Integer minPoolSize = null;
Integer maxPoolSize = null;
boolean prefill = false;
- String userName = null;
- String password = null;
String connectionUrl = null;
String driverClass = null;
TransactionIsolation transactionIsolation = null;
@@ -454,10 +381,11 @@
if (DataSources.Tag.forName(reader.getLocalName()) == DataSources.Tag.DATASOURCE)
{
- return new DataSourceImpl(minPoolSize, maxPoolSize, prefill, userName, password, connectionUrl,
- driverClass, transactionIsolation, connectionProperties, timeOutSettings, securitySettings,
- statementSettings, validationSettings, urlDelimiter, urlSelectorStrategyClassName,
- newConnectionSql, useJavaContext, poolName, enabled, jndiName);
+ return new DataSourceImpl(minPoolSize, maxPoolSize, prefill, connectionUrl,
+ driverClass, transactionIsolation, connectionProperties,
+ timeOutSettings, securitySettings, statementSettings,
+ validationSettings, urlDelimiter, urlSelectorStrategyClassName,
+ newConnectionSql, useJavaContext, poolName, enabled, jndiName);
}
else
{
@@ -495,14 +423,6 @@
newConnectionSql = elementAsString(reader);
break;
}
- case PASSWORD : {
- password = elementAsString(reader);
- break;
- }
- case USERNAME : {
- userName = elementAsString(reader);
- break;
- }
case PREFILL : {
prefill = elementAsBoolean(reader);
break;
@@ -565,8 +485,8 @@
{
return new ValidationImpl(validConnectionCheckerClassName, checkValidConnectionSql,
- validateOnMatch, backgroundValidation, backgroundValidationMinutes, useFastFail,
- staleConnectionCheckerClassName, exceptionSorterClassName);
+ validateOnMatch, backgroundValidation, backgroundValidationMinutes,
+ useFastFail, staleConnectionCheckerClassName, exceptionSorterClassName);
}
else
@@ -644,7 +564,8 @@
{
return new TimeOutImpl(blockingTimeoutMillis, idleTimeoutMinutes, setTxQuertTimeout,
- queryTimeout, useTryLock, allocationRetry, allocationRetryWaitMillis, xaResourceTimeout);
+ queryTimeout, useTryLock, allocationRetry, allocationRetryWaitMillis,
+ xaResourceTimeout);
}
else
{
@@ -715,8 +636,7 @@
if (DataSource.Tag.forName(reader.getLocalName()) == DataSource.Tag.STATEMENT)
{
- return new StatementImpl(sharePreparedStatements, preparedStatementsCacheSize,
- trackStatements);
+ return new StatementImpl(sharePreparedStatements, preparedStatementsCacheSize, trackStatements);
}
else
{
@@ -737,7 +657,7 @@
case TRACKSTATEMENTS : {
String elementString = elementAsString(reader);
trackStatements = TrackStatementsEnum.valueOf(elementString == null ? "FALSE" : elementString
- .toUpperCase(Locale.US));
+ .toUpperCase(Locale.US));
break;
}
case SHAREPREPAREDSTATEMENTS : {
@@ -757,8 +677,8 @@
private Security parseSecuritySettings(XMLStreamReader reader) throws XMLStreamException, ParserException
{
- SecurityManager securityManager = null;
- String securityDomain = null;
+ String userName = null;
+ String password = null;
while (reader.hasNext())
{
@@ -768,7 +688,7 @@
if (DataSource.Tag.forName(reader.getLocalName()) == DataSource.Tag.SECURITY)
{
- return new SecurityImpl(securityManager, securityDomain);
+ return new SecurityImpl(userName, password);
}
else
{
@@ -782,12 +702,12 @@
case START_ELEMENT : {
switch (Security.Tag.forName(reader.getLocalName()))
{
- case SECURITYDOMAIN : {
- securityDomain = elementAsString(reader);
+ case PASSWORD : {
+ password = elementAsString(reader);
break;
}
- case SECURITYMANAGER : {
- securityManager = SecurityManager.valueOf(elementAsString(reader));
+ case USERNAME : {
+ userName = elementAsString(reader);
break;
}
default :
Deleted: 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/RecoveryImpl.java 2010-09-06 09:36:37 UTC (rev 107992)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ds/RecoveryImpl.java 2010-09-06 10:02:58 UTC (rev 107993)
@@ -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.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 + "]";
- }
-
-}
Modified: 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/SecurityImpl.java 2010-09-06 09:36:37 UTC (rev 107992)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ds/SecurityImpl.java 2010-09-06 10:02:58 UTC (rev 107993)
@@ -21,7 +21,6 @@
*/
package org.jboss.jca.common.metadata.ds;
-import org.jboss.jca.common.api.metadata.common.SecurityManager;
import org.jboss.jca.common.api.metadata.ds.Security;
@@ -38,43 +37,43 @@
/** The serialVersionUID */
private static final long serialVersionUID = -5842402120520191086L;
- private final SecurityManager securityManager;
+ private final String userName;
- private final String securityDomain;
+ private final String password;
/**
* Create a new SecurityImpl.
*
- * @param securityManager securityManager
- * @param securityDomain securityDomain
+ * @param userName userName
+ * @param password password
*/
- public SecurityImpl(SecurityManager securityManager, String securityDomain)
+ public SecurityImpl(String userName, String password)
{
super();
- this.securityManager = securityManager;
- this.securityDomain = securityDomain;
+ this.userName = userName;
+ this.password = password;
}
/**
- * Get the securityManager.
+ * Get the userName.
*
- * @return the securityManager.
+ * @return the userName.
*/
@Override
- public final SecurityManager getSecurityManager()
+ public final String getUserName()
{
- return securityManager;
+ return userName;
}
/**
- * Get the securityDomain.
+ * Get the password.
*
- * @return the securityDomain.
+ * @return the password.
*/
@Override
- public final String getSecurityDomain()
+ public final String getPassword()
{
- return securityDomain;
+ return password;
}
@Override
@@ -82,8 +81,8 @@
{
final int prime = 31;
int result = 1;
- result = prime * result + ((securityDomain == null) ? 0 : securityDomain.hashCode());
- result = prime * result + ((securityManager == null) ? 0 : securityManager.hashCode());
+ result = prime * result + ((password == null) ? 0 : password.hashCode());
+ result = prime * result + ((userName == null) ? 0 : userName.hashCode());
return result;
}
@@ -97,14 +96,19 @@
if (!(obj instanceof SecurityImpl))
return false;
SecurityImpl other = (SecurityImpl) obj;
- if (securityDomain == null)
+ if (password == null)
{
- if (other.securityDomain != null)
+ if (other.password != null)
return false;
}
- else if (!securityDomain.equals(other.securityDomain))
+ else if (!password.equals(other.password))
return false;
- if (securityManager != other.securityManager)
+ if (userName == null)
+ {
+ if (other.userName != null)
+ return false;
+ }
+ else if (!userName.equals(other.userName))
return false;
return true;
}
@@ -112,7 +116,8 @@
@Override
public String toString()
{
- return "SecurityImpl [securityManager=" + securityManager + ", securityDomain=" + securityDomain + "]";
+ return "SecurityImpl [userName=" + userName + ", password=" + password + "]";
}
+
}
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-09-06 09:36:37 UTC (rev 107992)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ds/XADataSourceImpl.java 2010-09-06 10:02:58 UTC (rev 107993)
@@ -21,7 +21,6 @@
*/
package org.jboss.jca.common.metadata.ds;
-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;
@@ -45,10 +44,6 @@
/** The serialVersionUID */
private static final long serialVersionUID = -1401087499308709724L;
- private final String userName;
-
- private final String password;
-
private final HashMap<String, String> xaDataSourceProperty;
private final String xaDataSourceClass;
@@ -57,8 +52,6 @@
private final boolean interleaving;
- private final Recovery recovery;
-
private final String newConnectionSql;
private final boolean padXid;
@@ -73,14 +66,11 @@
* @param minPoolSize minPoolSize
* @param maxPoolSize maxPoolSize
* @param prefill prefill
- * @param userName userName
- * @param password password
* @param xaDataSourceProperty xaDataSoourceProperty
* @param xaDataSourceClass xaDataSourceClass
* @param transactionIsolation transactionIsolation
* @param isSameRmOverride isSameRmOverride
* @param interleaving interleaving
- * @param recovery recovery
* @param timeOut timeOut
* @param security security
* @param statement statement
@@ -96,19 +86,15 @@
* @param wrapXaDataSource wrapXaDataSource
* @param noTxSeparatePool noTxSeparatePool
*/
- public XADataSourceImpl(Integer minPoolSize, Integer maxPoolSize, boolean prefill, String userName, String password,
- Map<String, String> xaDataSourceProperty, String xaDataSourceClass,
- TransactionIsolation transactionIsolation, boolean isSameRmOverride, boolean interleaving,
- 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)
+ public XADataSourceImpl(Integer minPoolSize, Integer maxPoolSize, boolean prefill,
+ Map<String, String> xaDataSourceProperty, String xaDataSourceClass,
+ TransactionIsolation transactionIsolation, boolean isSameRmOverride, boolean interleaving, 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)
{
- super(minPoolSize, maxPoolSize, prefill, transactionIsolation, timeOut, security,
- statement, validation, urlDelimiter, urlSelectorStrategyClassName, useJavaContext,
- poolName, enabled, jndiName);
- this.userName = userName;
- this.password = password;
+ super(minPoolSize, maxPoolSize, prefill, transactionIsolation, timeOut, security, statement, validation,
+ urlDelimiter, urlSelectorStrategyClassName, useJavaContext, poolName, enabled, jndiName);
if (xaDataSourceProperty != null)
{
this.xaDataSourceProperty = new HashMap<String, String>(xaDataSourceProperty.size());
@@ -121,7 +107,6 @@
this.xaDataSourceClass = xaDataSourceClass;
this.isSameRmOverride = isSameRmOverride;
this.interleaving = interleaving;
- this.recovery = recovery;
this.newConnectionSql = newConnectionSql;
this.padXid = padXid;
this.wrapXaDataSource = wrapXaDataSource;
@@ -129,35 +114,11 @@
}
/**
- * Get the userName.
- *
- * @return the userName.
- */
+ * Get the xaDataSourceClass.
+ *
+ * @return the xaDataSourceClass.
+ */
@Override
- public final String getUserName()
- {
- return userName;
- }
-
- /**
- * Get the password.
- *
- * @return the password.
- */
- @Override
- public final String getPassword()
- {
- return password;
- }
-
-
-
- /**
- * Get the xaDataSourceClass.
- *
- * @return the xaDataSourceClass.
- */
- @Override
public final String getXaDataSourceClass()
{
return xaDataSourceClass;
@@ -186,17 +147,6 @@
}
/**
- * Get the recovery.
- *
- * @return the recovery.
- */
- @Override
- public final Recovery getRecovery()
- {
- return recovery;
- }
-
- /**
* Get the statement.
*
* @return the statement.
@@ -250,9 +200,6 @@
result = prime * result + ((newConnectionSql == null) ? 0 : newConnectionSql.hashCode());
result = prime * result + (noTxSeparatePool ? 1231 : 1237);
result = prime * result + (padXid ? 1231 : 1237);
- result = prime * result + ((password == null) ? 0 : password.hashCode());
- result = prime * result + ((recovery == null) ? 0 : recovery.hashCode());
- result = prime * result + ((userName == null) ? 0 : userName.hashCode());
result = prime * result + (wrapXaDataSource ? 1231 : 1237);
result = prime * result + ((xaDataSourceClass == null) ? 0 : xaDataSourceClass.hashCode());
result = prime * result + ((xaDataSourceProperty == null) ? 0 : xaDataSourceProperty.hashCode());
@@ -284,27 +231,6 @@
return false;
if (padXid != other.padXid)
return false;
- if (password == null)
- {
- if (other.password != null)
- return false;
- }
- else if (!password.equals(other.password))
- return false;
- if (recovery == null)
- {
- if (other.recovery != null)
- return false;
- }
- else if (!recovery.equals(other.recovery))
- return false;
- if (userName == null)
- {
- if (other.userName != null)
- return false;
- }
- else if (!userName.equals(other.userName))
- return false;
if (wrapXaDataSource != other.wrapXaDataSource)
return false;
if (xaDataSourceClass == null)
@@ -327,11 +253,10 @@
@Override
public String toString()
{
- return "XADataSourceImpl [userName=" + userName + ", password=" + password + ", xaDataSourceProperty="
- + xaDataSourceProperty + ", xaDataSourceClass=" + xaDataSourceClass + ", isSameRmOverride="
- + isSameRmOverride + ", interleaving=" + interleaving + ", recovery=" + recovery
- + ", newConnectionSql=" + newConnectionSql + ", padXid=" + padXid + ", wrapXaDataSource="
- + wrapXaDataSource + ", noTxSeparatePool=" + noTxSeparatePool + "]";
+ return "XADataSourceImpl [xaDataSourceProperty=" + xaDataSourceProperty + ", xaDataSourceClass=" +
+ xaDataSourceClass + ", isSameRmOverride=" + isSameRmOverride + ", interleaving=" + interleaving +
+ ", newConnectionSql=" + newConnectionSql + ", padXid=" + padXid + ", wrapXaDataSource=" +
+ wrapXaDataSource + ", noTxSeparatePool=" + noTxSeparatePool + "]";
}
/**
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-09-06 09:36:37 UTC (rev 107992)
+++ projects/jboss-jca/trunk/common/src/main/resources/schema/datasources_1_0.xsd 2010-09-06 10:02:58 UTC (rev 107993)
@@ -56,7 +56,9 @@
</xs:documentation>
</xs:annotation>
</xs:element>
- <xs:element name="prefill" type="xs:boolean" minOccurs="0">
+ <xs:element name="security" type="securityType" minOccurs="0">
+ </xs:element>
+ <xs:element name="prefill" type="xs:boolean" minOccurs="0">
<xs:annotation>
<xs:documentation>
<![CDATA[[
@@ -67,25 +69,6 @@
</xs:documentation>
</xs:annotation>
</xs:element>
- <xs:element name="user-name" type="xs:token" minOccurs="0">
- <xs:annotation>
- <xs:documentation>
- <![CDATA[[
- Specify the default username used when creating a new connection.
- Ex: <user-name>sa</user-name>
- ]]>
- </xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="password" type="xs:token" minOccurs="0">
- <xs:annotation>
- <xs:documentation>
- <![CDATA[[
- Specify the default password used when creating a new connection.
- Ex: <password>sa-pass</password>]]>
- </xs:documentation>
- </xs:annotation>
- </xs:element>
<xs:element name="connection-url" type="xs:token">
<xs:annotation>
<xs:documentation>
@@ -130,8 +113,6 @@
</xs:annotation>
</xs:element>
<xs:element name="time-out" type="time-outType" minOccurs="0" />
- <xs:element name="security" type="securityType" minOccurs="0">
- </xs:element>
<xs:element name="statement" type="statementType" minOccurs="0">
</xs:element>
<xs:element name="validation" type="validationType" minOccurs="0" />
@@ -190,7 +171,8 @@
</xs:documentation>
</xs:annotation>
</xs:element>
- <xs:element name="prefill" type="xs:boolean" minOccurs="0">
+ <xs:element name="security" type="securityType" minOccurs="0"></xs:element>
+ <xs:element name="prefill" type="xs:boolean" minOccurs="0">
<xs:annotation>
<xs:documentation>
<![CDATA[[
@@ -200,25 +182,6 @@
</xs:documentation>
</xs:annotation>
</xs:element>
- <xs:element name="user-name " type="xs:token" minOccurs="0">
- <xs:annotation>
- <xs:documentation>
- <![CDATA[[
- Specify the default username used when creating a new connection.
- Ex: <user-name>sa</user-name>
- ]]>
- </xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="password" type="xs:token" minOccurs="0">
- <xs:annotation>
- <xs:documentation>
- <![CDATA[[
- Specify the default password used when creating a new connection.
- Ex: <password>sa-pass</password>]]>
- </xs:documentation>
- </xs:annotation>
- </xs:element>
<xs:element name="xa-datasource-property" type="xa-datasource-propertyType" minOccurs="1"
maxOccurs="unbounded">
<xs:annotation>
@@ -282,9 +245,7 @@
</xs:documentation>
</xs:annotation>
</xs:element>
- <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>
@@ -405,35 +366,22 @@
</xs:simpleType>
<xs:complexType name="securityType">
<xs:sequence>
- <xs:element name="security-manager" type="security-managerType" minOccurs="0">
+ <xs:element name="user-name" type="xs:token" minOccurs="0">
<xs:annotation>
<xs:documentation>
<![CDATA[[
- Possible value are:
- * APPLICATION: Indicates that app supplied parameters (such as from getConnection(user,
- pw)) are used to distinguish connections in the pool.
- * DOMAIN: Indicates Subject (from security domain) are used to distinguish connections
- in the pool. The content is the security-domain is the name of the JAAS security
- manager that will handle authentication.
- * APPLICATION-AND-DOMAIN: Indicates that either app supplied parameters (such as from getConnection(user,
- pw)) or Subject (from security domain) are used to distinguish connections
- in the pool. The content is the security-domain is the name of the JAAS security
- manager that will handle authentication.
- * NONE: user/password provided in datasource definition are used.
+ Specify the default username used when creating a new connection.
+ Ex: <user-name>sa</user-name>
]]>
</xs:documentation>
</xs:annotation>
</xs:element>
- <xs:element name="security-domain" type="xs:token" minOccurs="0">
+ <xs:element name="password" type="xs:token" minOccurs="0">
<xs:annotation>
<xs:documentation>
<![CDATA[[
- The content of the security-domain is the name of the JAAS security
- manager that will handle authentication. This name correlates to the JAAS
- login-config.xml descriptor application-policy/name attribute.
- Ex: <security-domain>HsqlDbRealm</security-domain>
- used for DOMAIN and APPLICATION-AND-DOMAIN security manager
- ]]>
+ Specify the default password used when creating a new connection.
+ Ex: <password>sa-pass</password>]]>
</xs:documentation>
</xs:annotation>
</xs:element>
@@ -634,55 +582,6 @@
</xs:element>
</xs:sequence>
</xs:complexType>
- <xs:complexType name="recoveryType">
- <xs:choice>
- <xs:element name="no-recover" type="xs:boolean" minOccurs="0">
- <xs:annotation>
- <xs:documentation>
- <![CDATA[[
- Specify if the xa-datasource should be excluded from recovery. Default:
- false Ex: <no-recover>true</no-recover>
- ]]>
- </xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:sequence minOccurs="0">
- <xs:element name="recover-user-name" type="xs:token" minOccurs="0">
- <xs:annotation>
- <xs:documentation>
- <![CDATA[[
- Specify the username used when creating a connection during recovery.
- Ex: <recover-user-name>sa</recover-user-name>
- ]]>
- </xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="recover-password " type="xs:token" minOccurs="0">
- <xs:annotation>
- <xs:documentation>
- <![CDATA[[
- Specify the password used when creating a connection during recovery.
- Ex: <recover-password>sa-pass</recover-password>
- ]]>
- </xs:documentation>
- </xs:annotation>
- </xs:element>
- <xs:element name="recover-security-domain" type="xs:token" minOccurs="0">
- <xs:annotation>
- <xs:documentation>
- <![CDATA[[
- Indicates the Subject (from security domain) that are used to distinguish
- connection used for recovery. The content of the recover-security-domain
- is the name of the JAAS security manager that will handle authentication.
- This name correlates to the JAAS login-config.xml descriptor application-policy/name
- attribute. Ex: <recover-security-domain>OracleDbRealm</recover-security-domain>
- ]]>
- </xs:documentation>
- </xs:annotation>
- </xs:element>
- </xs:sequence>
- </xs:choice>
- </xs:complexType>
<xs:simpleType name="track-statementsType">
<xs:restriction base="xs:token">
<xs:enumeration value="true" />
Modified: projects/jboss-jca/trunk/common/src/test/resources/ds/db2-400-ds.xml
===================================================================
--- projects/jboss-jca/trunk/common/src/test/resources/ds/db2-400-ds.xml 2010-09-06 09:36:37 UTC (rev 107992)
+++ projects/jboss-jca/trunk/common/src/test/resources/ds/db2-400-ds.xml 2010-09-06 10:02:58 UTC (rev 107993)
@@ -3,8 +3,10 @@
xsi:noNamespaceSchemaLocation="http://www.jboss.org/jee/schema/ironjacamar/datasources_1_0.xsd">
<datasource jndi-name="DB2-400" pool-name="DB2-400">
<min-pool-size>0</min-pool-size>
- <user-name>[username]</user-name>
- <password>[password]</password>
+ <security>
+ <user-name>[username]</user-name>
+ <password>[password]</password>
+ </security>
<connection-url>jdbc:as400://[systemname]/[schema];extended dynamic=true;package=jbpkg;package cache=true;package library=jboss;errors=full</connection-url>
<driver-class>com.ibm.as400.access.AS400JDBCDriver</driver-class>
</datasource>
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-09-06 09:36:37 UTC (rev 107992)
+++ projects/jboss-jca/trunk/common/src/test/resources/ds/db2-ds.xml 2010-09-06 10:02:58 UTC (rev 107993)
@@ -4,8 +4,10 @@
<datasource jndi-name="DB2DS" pool-name="DB2DS">
<min-pool-size>0</min-pool-size>
<max-pool-size>50</max-pool-size>
- <user-name>x</user-name>
- <password>y</password>
+ <security>
+ <user-name>x</user-name>
+ <password>y</password>
+ </security>
<connection-url>jdbc:db2:yourdatabase</connection-url>
<driver-class>COM.ibm.db2.jdbc.app.DB2Driver</driver-class>
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-09-06 09:36:37 UTC (rev 107992)
+++ projects/jboss-jca/trunk/common/src/test/resources/ds/derby-ds.xml 2010-09-06 10:02:58 UTC (rev 107993)
@@ -10,8 +10,10 @@
<!-- The maximum connections in a pool/sub-pool -->
<max-pool-size>20</max-pool-size>
<!-- The login and password -->
- <user-name>sa</user-name>
- <password></password>
+ <security>
+ <user-name>sa</user-name>
+ <password></password>
+ </security>
<!-- for in-process persistent db, saved when jboss stops. The org.jboss.jdbc.DerbyDatabase mbean is necessary for properly
db shutdown -->
<connection-url>jdbc:derby:${jboss.server.data.dir}${/}derby${/}localDB;create=true</connection-url>
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-09-06 09:36:37 UTC (rev 107992)
+++ projects/jboss-jca/trunk/common/src/test/resources/ds/hsqldb-ds.xml 2010-09-06 10:02:58 UTC (rev 107993)
@@ -10,8 +10,10 @@
<!-- The maximum connections in a pool/sub-pool -->
<max-pool-size>20</max-pool-size>
<!-- The login and password -->
- <user-name>sa</user-name>
- <password></password>
+ <security>
+ <user-name>sa</user-name>
+ <password></password>
+ </security>
<!-- For server mode db, allowing other processes to use hsqldb over tcp. This requires the org.jboss.jdbc.HypersonicDatabase
mbean. <connection-url>jdbc:hsqldb:hsql://${jboss.bind.address}:1701</connection-url> -->
<!-- For totally in-memory db, not saved when jboss stops. The org.jboss.jdbc.HypersonicDatabase mbean is required for
@@ -27,10 +29,6 @@
<!-- 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>
- <security>
- <security-manager>APPLICATION_AND_DOMAIN</security-manager>
- <security-domain>HsqlDbRealm</security-domain>
- </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 -->
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-09-06 09:36:37 UTC (rev 107992)
+++ projects/jboss-jca/trunk/common/src/test/resources/ds/informix-ds.xml 2010-09-06 10:02:58 UTC (rev 107993)
@@ -3,8 +3,10 @@
<datasources xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://www.jboss.org/jee/schema/ironjacamar/datasources_1_0.xsd">
<datasource jndi-name="InformixDS" pool-name="InformixDS">
- <user-name>x</user-name>
- <password>y</password>
+ <security>
+ <user-name>x</user-name>
+ <password>y</password>
+ </security>
<connection-url>jdbc:informix-sqli://myhost.mydomain.com:1557/mydb:INFORMIXSERVER=myserver</connection-url>
<driver-class>com.informix.jdbc.IfxDriver</driver-class>
<validation>
Modified: projects/jboss-jca/trunk/common/src/test/resources/ds/jdatastore-ds.xml
===================================================================
--- projects/jboss-jca/trunk/common/src/test/resources/ds/jdatastore-ds.xml 2010-09-06 09:36:37 UTC (rev 107992)
+++ projects/jboss-jca/trunk/common/src/test/resources/ds/jdatastore-ds.xml 2010-09-06 10:02:58 UTC (rev 107993)
@@ -9,8 +9,10 @@
<datasources xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://www.jboss.org/jee/schema/ironjacamar/datasources_1_0.xsd">
<datasource jndi-name="JDataStoreDS" pool-name="JDataStoreDS">
- <user-name>x</user-name>
- <password>y</password>
+ <security>
+ <user-name>x</user-name>
+ <password>y</password>
+ </security>
<connection-url>jdbc:borland:dslocal:/home/brent/JBuilder6/samples/JDataStore/datastores/employee.jds</connection-url>
<driver-class>com.borland.datastore.jdbc.DataStoreDriver</driver-class>
</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-09-06 09:36:37 UTC (rev 107992)
+++ projects/jboss-jca/trunk/common/src/test/resources/ds/jsql-ds.xml 2010-09-06 10:02:58 UTC (rev 107993)
@@ -5,8 +5,10 @@
<datasources xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://www.jboss.org/jee/schema/ironjacamar/datasources_1_0.xsd">
<datasource jndi-name="JSQLDS" pool-name="JSQLDS">
- <user-name>x</user-name>
- <password>y</password>
+ <security>
+ <user-name>x</user-name>
+ <password>y</password>
+ </security>
<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
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-09-06 09:36:37 UTC (rev 107992)
+++ projects/jboss-jca/trunk/common/src/test/resources/ds/mimer-ds.xml 2010-09-06 10:02:58 UTC (rev 107993)
@@ -7,8 +7,10 @@
<datasource jndi-name="MimerDS" pool-name="MimerDS">
<min-pool-size>5</min-pool-size>
<max-pool-size>100</max-pool-size>
- <user-name>changeme</user-name>
- <password>changeme</password>
+ <security>
+ <user-name>changeme</user-name>
+ <password>changeme</password>
+ </security>
<connection-url>jdbc:mimer:multi1</connection-url>
<driver-class>com.mimer.jdbc.Driver</driver-class>
<time-out>
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-09-06 09:36:37 UTC (rev 107992)
+++ projects/jboss-jca/trunk/common/src/test/resources/ds/mimer-xa-ds.xml 2010-09-06 10:02:58 UTC (rev 107993)
@@ -4,8 +4,10 @@
<xa-datasource jndi-name="XAMimerDS" pool-name="XAMimerDS">
<min-pool-size>5</min-pool-size>
<max-pool-size>100</max-pool-size>
- <user-name>changeme</user-name>
- <password>changeme</password>
+ <security>
+ <user-name>changeme</user-name>
+ <password>changeme</password>
+ </security>
<xa-datasource-property name="DatabaseName">multi1</xa-datasource-property>
<xa-datasource-property name="ServerName">localhost</xa-datasource-property>
<xa-datasource-property name="PortNumber">1360</xa-datasource-property>
Modified: projects/jboss-jca/trunk/common/src/test/resources/ds/msaccess-ds.xml
===================================================================
--- projects/jboss-jca/trunk/common/src/test/resources/ds/msaccess-ds.xml 2010-09-06 09:36:37 UTC (rev 107992)
+++ projects/jboss-jca/trunk/common/src/test/resources/ds/msaccess-ds.xml 2010-09-06 10:02:58 UTC (rev 107993)
@@ -5,8 +5,10 @@
<datasources xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://www.jboss.org/jee/schema/ironjacamar/datasources_1_0.xsd">
<datasource jndi-name="MSAccessDS" pool-name="MSAccessDS">
- <user-name>x</user-name>
- <password>y</password>
+ <security>
+ <user-name>x</user-name>
+ <password>y</password>
+ </security>
<!-- format of URL is "jdbc:odbc:DSNNAME" -->
<connection-url>jdbc:odbc:INsightDSN</connection-url>
<driver-class>sun.jdbc.odbc.JdbcOdbcDriver</driver-class>
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-09-06 09:36:37 UTC (rev 107992)
+++ projects/jboss-jca/trunk/common/src/test/resources/ds/mssql-ds.xml 2010-09-06 10:02:58 UTC (rev 107993)
@@ -5,8 +5,10 @@
<datasources xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://www.jboss.org/jee/schema/ironjacamar/datasources_1_0.xsd">
<datasource jndi-name="MSSQLDS" pool-name="MSSQLDS">
- <user-name>x</user-name>
- <password>y</password>
+ <security>
+ <user-name>x</user-name>
+ <password>y</password>
+ </security>
<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
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-09-06 09:36:37 UTC (rev 107992)
+++ projects/jboss-jca/trunk/common/src/test/resources/ds/mysql-ds.xml 2010-09-06 10:02:58 UTC (rev 107993)
@@ -4,8 +4,10 @@
<datasources xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://www.jboss.org/jee/schema/ironjacamar/datasources_1_0.xsd">
<datasource jndi-name="MySqlDS" pool-name="MySqlDS">
- <user-name>x</user-name>
- <password>y</password>
+ <security>
+ <user-name>x</user-name>
+ <password>y</password>
+ </security>
<connection-url>jdbc:mysql://mysql-hostname:3306/jbossdb</connection-url>
<driver-class>com.mysql.jdbc.Driver</driver-class>
<validation>
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-09-06 09:36:37 UTC (rev 107992)
+++ projects/jboss-jca/trunk/common/src/test/resources/ds/oracle-ds.xml 2010-09-06 10:02:58 UTC (rev 107993)
@@ -5,8 +5,10 @@
<datasources xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://www.jboss.org/jee/schema/ironjacamar/datasources_1_0.xsd">
<datasource jndi-name="OracleDS" pool-name="OracleDS">
- <user-name>x</user-name>
- <password>y</password>
+ <security>
+ <user-name>x</user-name>
+ <password>y</password>
+ </security>
<connection-url>jdbc:oracle:thin:@youroraclehost:1521:yoursid</connection-url>
<!-- Here are a couple of the possible OCI configurations. For more information, see http://otn.oracle.com/docs/products/oracle9i/doc_library/release2/java.920/a96654/toc.htm
<connection-url>jdbc:oracle:oci:@youroracle-tns-name</connection-url> or <connection-url>jdbc:oracle:oci:@(description=(address=(host=youroraclehost)(protocol=tcp)(port=1521))(connect_data=(SERVICE_NAME=yourservicename)))</connection-url>
Modified: projects/jboss-jca/trunk/common/src/test/resources/ds/pointbase-ds.xml
===================================================================
--- projects/jboss-jca/trunk/common/src/test/resources/ds/pointbase-ds.xml 2010-09-06 09:36:37 UTC (rev 107992)
+++ projects/jboss-jca/trunk/common/src/test/resources/ds/pointbase-ds.xml 2010-09-06 10:02:58 UTC (rev 107993)
@@ -3,8 +3,10 @@
<datasources xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://www.jboss.org/jee/schema/ironjacamar/datasources_1_0.xsd">
<datasource jndi-name="DefaultDS" pool-name="DefaultDS">
- <user-name>@pointbase.user@</user-name>
- <password>@pointbase.passwd@</password>
+ <security>
+ <user-name>@pointbase.user@</user-name>
+ <password>@pointbase.passwd@</password>
+ </security>
<connection-url>jdbc:pointbase:server://@pointbase.server@:@pointbase.port/pointbase.dbName@,new</connection-url>
<driver-class>com.pointbase.jdbc.jdbcUniversalDriver</driver-class>
<!-- sql to call when connection is created <new-connection-sql>some arbitrary sql</new-connection-sql> -->
Modified: projects/jboss-jca/trunk/common/src/test/resources/ds/pointbase-xa-ds.xml
===================================================================
--- projects/jboss-jca/trunk/common/src/test/resources/ds/pointbase-xa-ds.xml 2010-09-06 09:36:37 UTC (rev 107992)
+++ projects/jboss-jca/trunk/common/src/test/resources/ds/pointbase-xa-ds.xml 2010-09-06 10:02:58 UTC (rev 107993)
@@ -2,8 +2,10 @@
<datasources xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://www.jboss.org/jee/schema/ironjacamar/datasources_1_0.xsd">
<xa-datasource jndi-name="PointbaseXA" pool-name="PointbaseXA">
- <user-name>@pointbase.user@</user-name>
- <password>@pointbase.passwd@</password>
+ <security>
+ <user-name>@pointbase.user@</user-name>
+ <password>@pointbase.passwd@</password>
+ </security>
<xa-datasource-property name="ServerName">@pointbase.server@</xa-datasource-property>
<xa-datasource-property name="DatabaseName">9092</xa-datasource-property>
<xa-datasource-class>com.pointbase.xa.xaDataSource</xa-datasource-class>
Modified: projects/jboss-jca/trunk/common/src/test/resources/ds/postgres-ds.xml
===================================================================
--- projects/jboss-jca/trunk/common/src/test/resources/ds/postgres-ds.xml 2010-09-06 09:36:37 UTC (rev 107992)
+++ projects/jboss-jca/trunk/common/src/test/resources/ds/postgres-ds.xml 2010-09-06 10:02:58 UTC (rev 107993)
@@ -7,8 +7,10 @@
<datasources xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://www.jboss.org/jee/schema/ironjacamar/datasources_1_0.xsd">
<datasource jndi-name="PostgresDS" pool-name="PostgresDS">
- <user-name>x</user-name>
- <password>y</password>
+ <security>
+ <user-name>x</user-name>
+ <password>y</password>
+ </security>
<connection-url>jdbc:postgresql://[servername]:[port]/[database name]</connection-url>
<driver-class>org.postgresql.Driver</driver-class>
</datasource>
Modified: projects/jboss-jca/trunk/common/src/test/resources/ds/progress-ds.xml
===================================================================
--- projects/jboss-jca/trunk/common/src/test/resources/ds/progress-ds.xml 2010-09-06 09:36:37 UTC (rev 107992)
+++ projects/jboss-jca/trunk/common/src/test/resources/ds/progress-ds.xml 2010-09-06 10:02:58 UTC (rev 107993)
@@ -5,8 +5,10 @@
<datasources xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://www.jboss.org/jee/schema/ironjacamar/datasources_1_0.xsd">
<datasource jndi-name="ProgressDS" pool-name="ProgressDS">
- <user-name>user</user-name>
- <password>password</password>
+ <security>
+ <user-name>user</user-name>
+ <password>password</password>
+ </security>
<connection-url>jdbc:JdbcProgress:T:dbserver:3305:liveappl</connection-url>
<driver-class>com.progress.sql.jdbc.JdbcProgressDriver</driver-class>
</datasource>
Modified: projects/jboss-jca/trunk/common/src/test/resources/ds/sapdb-ds.xml
===================================================================
--- projects/jboss-jca/trunk/common/src/test/resources/ds/sapdb-ds.xml 2010-09-06 09:36:37 UTC (rev 107992)
+++ projects/jboss-jca/trunk/common/src/test/resources/ds/sapdb-ds.xml 2010-09-06 10:02:58 UTC (rev 107993)
@@ -5,8 +5,10 @@
<datasources xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://www.jboss.org/jee/schema/ironjacamar/datasources_1_0.xsd">
<datasource jndi-name="SapdbDS" pool-name="SapdbDS">
- <user-name>x</user-name>
- <password>y</password>
+ <security>
+ <user-name>x</user-name>
+ <password>y</password>
+ </security>
<connection-url>jdbc:sapdb://127.0.0.1/DB_NAME</connection-url>
<driver-class>com.sap.dbtech.jdbc.DriverSapDB</driver-class>
</datasource>
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-09-06 09:36:37 UTC (rev 107992)
+++ projects/jboss-jca/trunk/common/src/test/resources/ds/sybase-ds.xml 2010-09-06 10:02:58 UTC (rev 107993)
@@ -5,8 +5,10 @@
<datasources xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://www.jboss.org/jee/schema/ironjacamar/datasources_1_0.xsd">
<datasource jndi-name="jdbc/SybaseDB" pool-name="jdbc/SybaseDB">
- <user-name>x</user-name>
- <password>y</password>
+ <security>
+ <user-name>x</user-name>
+ <password>y</password>
+ </security>
<!-- Sybase jConnect URL for the database. NOTE: The hostname and port are made up values. The optional database name
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>
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-09-06 09:36:37 UTC (rev 107992)
+++ projects/jboss-jca/trunk/common/src/test/resources/ds/sybase-xa-ds.xml 2010-09-06 10:02:58 UTC (rev 107993)
@@ -22,11 +22,6 @@
<time-out>
<idle-timeout-minutes>15</idle-timeout-minutes>
</time-out>
- <security>
- <!-- Use the security domain defined in conf/login-config.xml -->
- <security-manager>APPLICATION</security-manager>
- <security-domain>SybaseXADSRealm</security-domain>
- </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>
More information about the jboss-cvs-commits
mailing list