[jboss-cvs] JBossAS SVN: r110665 - in projects/jboss-jca/trunk/common/src: main/java/org/jboss/jca/common/api/metadata/ds and 13 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Feb 14 10:53:10 EST 2011
Author: maeste
Date: 2011-02-14 10:53:09 -0500 (Mon, 14 Feb 2011)
New Revision: 110665
Added:
projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/ds/DsSecurity.java
projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ds/DsSecurityImpl.java
Modified:
projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/common/CommonSecurity.java
projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/ds/CommonDataSource.java
projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/AbstractParser.java
projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/common/CommonSecurityImpl.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/ValidationImpl.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/merge/Merger.java
projects/jboss-jca/trunk/common/src/main/resources/schema/datasources_1_0.xsd
projects/jboss-jca/trunk/common/src/main/resources/schema/ironjacamar_1_0.xsd
projects/jboss-jca/trunk/common/src/main/resources/schema/resource-adapters_1_0.xsd
projects/jboss-jca/trunk/common/src/test/java/org/jboss/jca/common/metadata/ironjacamar/IronJacamarParserTestCase.java
projects/jboss-jca/trunk/common/src/test/java/org/jboss/jca/common/metadata/merge/MergerTestCase.java
projects/jboss-jca/trunk/common/src/test/resources/ds/example/db2-400-ds.xml
projects/jboss-jca/trunk/common/src/test/resources/ds/example/db2-ds.xml
projects/jboss-jca/trunk/common/src/test/resources/ds/example/derby-ds.xml
projects/jboss-jca/trunk/common/src/test/resources/ds/example/h2-ds.xml
projects/jboss-jca/trunk/common/src/test/resources/ds/example/h2-xa-ds.xml
projects/jboss-jca/trunk/common/src/test/resources/ds/example/hsqldb-ds.xml
projects/jboss-jca/trunk/common/src/test/resources/ds/example/informix-ds.xml
projects/jboss-jca/trunk/common/src/test/resources/ds/example/jdatastore-ds.xml
projects/jboss-jca/trunk/common/src/test/resources/ds/example/jsql-ds.xml
projects/jboss-jca/trunk/common/src/test/resources/ds/example/mimer-ds.xml
projects/jboss-jca/trunk/common/src/test/resources/ds/example/mimer-xa-ds.xml
projects/jboss-jca/trunk/common/src/test/resources/ds/example/msaccess-ds.xml
projects/jboss-jca/trunk/common/src/test/resources/ds/example/mssql-ds.xml
projects/jboss-jca/trunk/common/src/test/resources/ds/example/mysql-ds.xml
projects/jboss-jca/trunk/common/src/test/resources/ds/example/oracle-ds.xml
projects/jboss-jca/trunk/common/src/test/resources/ds/example/pointbase-ds.xml
projects/jboss-jca/trunk/common/src/test/resources/ds/example/pointbase-xa-ds.xml
projects/jboss-jca/trunk/common/src/test/resources/ds/example/postgres-ds.xml
projects/jboss-jca/trunk/common/src/test/resources/ds/example/progress-ds.xml
projects/jboss-jca/trunk/common/src/test/resources/ds/example/sapdb-ds.xml
projects/jboss-jca/trunk/common/src/test/resources/ds/example/sybase-ds.xml
projects/jboss-jca/trunk/common/src/test/resources/ds/unit/jeremy-ds.xml
projects/jboss-jca/trunk/common/src/test/resources/ds/unit/replace-jndi-name-ds.xml
projects/jboss-jca/trunk/common/src/test/resources/ds/unit/replace-jndi-name-partial-ds.xml
projects/jboss-jca/trunk/common/src/test/resources/ds/unit/replace-jndi-name-twoparts-ds.xml
projects/jboss-jca/trunk/common/src/test/resources/ds/unit/replace-jndi-name-twoparts-onewrong-ds.xml
projects/jboss-jca/trunk/common/src/test/resources/ds/unit/replace-jndi-name-wrong-property-ds.xml
projects/jboss-jca/trunk/common/src/test/resources/ds/unit/replace-max-pool-ds.xml
projects/jboss-jca/trunk/common/src/test/resources/ds/unit/replace-max-pool-wrong-ds.xml
projects/jboss-jca/trunk/common/src/test/resources/ds/unit/spy-ds.xml
projects/jboss-jca/trunk/common/src/test/resources/ironjacamar/ironjacamar-connection-definition-empty.xml
projects/jboss-jca/trunk/common/src/test/resources/ironjacamar/ironjacamar-connection-definition-xa-empty.xml
projects/jboss-jca/trunk/common/src/test/resources/ironjacamar/ironjacamar-security-defaults.xml
projects/jboss-jca/trunk/common/src/test/resources/ironjacamar/ironjacamar-test1.xml
projects/jboss-jca/trunk/common/src/test/resources/ironjacamar/missing-attribute-ironjacamar.xml
projects/jboss-jca/trunk/common/src/test/resources/ironjacamar/missing-attribute2-ironjacamar.xml
projects/jboss-jca/trunk/common/src/test/resources/ironjacamar/right-element-for-xa-pool-ironjacamar.xml
projects/jboss-jca/trunk/common/src/test/resources/ironjacamar/unexpected-attribute-ironjacamar.xml
projects/jboss-jca/trunk/common/src/test/resources/ironjacamar/unexpected-attribute2-ironjacamar.xml
projects/jboss-jca/trunk/common/src/test/resources/ironjacamar/unexpected-element-ironjacamar.xml
projects/jboss-jca/trunk/common/src/test/resources/ironjacamar/wrong-element-for-simple-pool-ironjacamar.xml
projects/jboss-jca/trunk/common/src/test/resources/merger/ds/postgres-ds.xml
projects/jboss-jca/trunk/common/src/test/resources/merger/ironjacamar-ignoring-not-enabled-connectiondefinition.xml
projects/jboss-jca/trunk/common/src/test/resources/merger/ironjacamar-ignoring-not-matching-connectiondefinition.xml
projects/jboss-jca/trunk/common/src/test/resources/merger/ironjacamar-merging-admi-obj-multiple.xml
projects/jboss-jca/trunk/common/src/test/resources/merger/ironjacamar-merging-admi-obj-notenabled.xml
projects/jboss-jca/trunk/common/src/test/resources/merger/ironjacamar-merging-admi-obj-notmatching.xml
projects/jboss-jca/trunk/common/src/test/resources/merger/ironjacamar-merging-admi-obj.xml
projects/jboss-jca/trunk/common/src/test/resources/merger/ironjacamar-merging-connectiondefinition.xml
projects/jboss-jca/trunk/common/src/test/resources/merger/ironjacamar-merging-multiple-connectiondefinition.xml
projects/jboss-jca/trunk/common/src/test/resources/resource-adapter/asapxcess-jb3.2-ra.xml
projects/jboss-jca/trunk/common/src/test/resources/resource-adapter/ra-unexpected-attribute.xml
Log:
JBJCA-498 xsds, parsers and test suite done. Merger to be evaluated and its test suite too
Modified: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/common/CommonSecurity.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/common/CommonSecurity.java 2011-02-14 15:49:46 UTC (rev 110664)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/common/CommonSecurity.java 2011-02-14 15:53:09 UTC (rev 110665)
@@ -37,20 +37,32 @@
public interface CommonSecurity extends JCAMetadata, ValidatableMetadata
{
/**
- * Get the userName.
*
- * @return the userName.
+ * get the security domain for pure security-domain security management
+ *
+ * @return the security-domain to use
*/
- public String getUserName();
+ public String getSecurityDomain();
/**
- * Get the password.
*
- * @return the password.
+ * get the security domain for security-domain/application hybrid security management
+ *
+ * @return the security-domain to use
*/
- public String getPassword();
+ public String getSecurityDomainAndApplication();
+
/**
+ *
+ * Indicates that app supplied parameters (such as from getConnection(user, pw))
+ * are used to distinguish connections in the pool.
+ *
+ * @return the boolean indicating the appl supplier is considered or not. Default false.
+ */
+ public boolean isApplication();
+
+ /**
*
* A Tag.
*
@@ -65,14 +77,20 @@
UNKNOWN(null),
/**
- * userName tag
+ * security-domain tag
*/
- USERNAME("user-name"),
+ SECURITY_DOMAIN("security-domain"),
+
/**
- * password tag
- */
- PASSWORD("password");
+ * security-domain-and-application TAG
+ */
+ SECURITY_DOMAIN_AND_APPLICATION("security-domain-and-application"),
+ /**
+ * application
+ */
+ APPLICATION("application");
+
private final String name;
/**
Modified: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/ds/CommonDataSource.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/ds/CommonDataSource.java 2011-02-14 15:49:46 UTC (rev 110664)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/ds/CommonDataSource.java 2011-02-14 15:53:09 UTC (rev 110665)
@@ -23,7 +23,6 @@
import org.jboss.jca.common.api.metadata.JCAMetadata;
import org.jboss.jca.common.api.metadata.ValidatableMetadata;
-import org.jboss.jca.common.api.metadata.common.CommonSecurity;
/**
*
@@ -57,7 +56,7 @@
* @return the security.
*/
- public CommonSecurity getSecurity();
+ public DsSecurity getSecurity();
/**
* Get the validation.
Copied: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/ds/DsSecurity.java (from rev 110624, projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/common/CommonSecurity.java)
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/ds/DsSecurity.java (rev 0)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/ds/DsSecurity.java 2011-02-14 15:53:09 UTC (rev 110665)
@@ -0,0 +1,141 @@
+/*
+ * 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 org.jboss.jca.common.api.metadata.ValidatableMetadata;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ *
+ * A Security.
+ *
+ * @author <a href="stefano.maestri at jboss.com">Stefano Maestri</a>
+ *
+ */
+public interface DsSecurity extends JCAMetadata, ValidatableMetadata
+{
+ /**
+ * Get the userName.
+ *
+ * @return the userName.
+ */
+ public String getUserName();
+
+ /**
+ * Get the password.
+ *
+ * @return the password.
+ */
+ public String getPassword();
+
+ /**
+ *
+ * get the security domain for pure security-domain security management
+ *
+ * @return the security-domain to use
+ */
+ public String getSecurityDomain();
+
+ /**
+ *
+ * A Tag.
+ *
+ * @author <a href="stefano.maestri at jboss.com">Stefano Maestri</a>
+ *
+ */
+ public enum Tag
+ {
+ /** always first
+ *
+ */
+ UNKNOWN(null),
+
+ /**
+ * userName tag
+ */
+ USERNAME("user-name"),
+ /**
+ * password tag
+ */
+ PASSWORD("password"),
+
+ /**
+ * security-domain tag
+ */
+ SECURITY_DOMAIN("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/metadata/AbstractParser.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/AbstractParser.java 2011-02-14 15:49:46 UTC (rev 110664)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/AbstractParser.java 2011-02-14 15:53:09 UTC (rev 110665)
@@ -132,7 +132,7 @@
* FIXME Comment this
*
* @param reader
- * @return
+ * @return the string representing the raw eleemnt text
* @throws XMLStreamException
*/
private String rawElementText(XMLStreamReader reader) throws XMLStreamException
@@ -161,7 +161,7 @@
*
* @param reader
* @param attributeName
- * @return
+ * @return the string representing raw attribute textx
*/
private String rawAttributeText(XMLStreamReader reader, String attributeName)
{
@@ -303,8 +303,9 @@
ValidateException
{
- String userName = null;
- String password = null;
+ String securityDomain = null;
+ String securityDomainAndApplication = null;
+ boolean application = false;
while (reader.hasNext())
{
@@ -314,7 +315,8 @@
if (DataSource.Tag.forName(reader.getLocalName()) == DataSource.Tag.SECURITY)
{
- return new CommonSecurityImpl(userName, password);
+ return new CommonSecurityImpl(securityDomain, securityDomainAndApplication,
+ application);
}
else
{
@@ -328,14 +330,19 @@
case START_ELEMENT : {
switch (CommonSecurity.Tag.forName(reader.getLocalName()))
{
- case PASSWORD : {
- password = elementAsString(reader);
+
+ case SECURITY_DOMAIN : {
+ securityDomain = elementAsString(reader);
break;
}
- case USERNAME : {
- userName = elementAsString(reader);
+ case SECURITY_DOMAIN_AND_APPLICATION : {
+ securityDomainAndApplication = elementAsString(reader);
break;
}
+ case APPLICATION : {
+ application = elementAsBoolean(reader);
+ break;
+ }
default :
throw new ParserException("Unexpected element:" + reader.getLocalName());
}
Modified: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/common/CommonSecurityImpl.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/common/CommonSecurityImpl.java 2011-02-14 15:49:46 UTC (rev 110664)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/common/CommonSecurityImpl.java 2011-02-14 15:53:09 UTC (rev 110665)
@@ -38,54 +38,40 @@
/** The serialVersionUID */
private static final long serialVersionUID = -5842402120520191086L;
- private final String userName;
+ private final String securityDomainManaged;
- private final String password;
+ private final String securityDomainAndApplicationManaged;
+ private final boolean applicationManaged;
+
/**
* Create a new SecurityImpl.
*
- * @param userName userName
- * @param password password
+ * @param securityDomainManaged securityDomainManaged
+ * @param securityDomainAndApplicationManaged securityDomainAndApplicationManaged
+ * @param applicationManaged applicationManagedS
* @throws ValidateException ValidateException
*/
- public CommonSecurityImpl(String userName, String password) throws ValidateException
+ public CommonSecurityImpl(String securityDomainManaged,
+ String securityDomainAndApplicationManaged, boolean applicationManaged) throws ValidateException
{
super();
- this.userName = userName;
- this.password = password;
+ this.securityDomainManaged = securityDomainManaged;
+ this.securityDomainAndApplicationManaged = securityDomainAndApplicationManaged;
+ this.applicationManaged = applicationManaged;
this.validate();
}
- /**
- * 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;
- }
-
- @Override
public int hashCode()
{
final int prime = 31;
int result = 1;
- result = prime * result + ((password == null) ? 0 : password.hashCode());
- result = prime * result + ((userName == null) ? 0 : userName.hashCode());
+ result = prime * result + (applicationManaged ? 1231 : 1237);
+ result = prime * result +
+ ((securityDomainAndApplicationManaged == null) ? 0 : securityDomainAndApplicationManaged.hashCode());
+ result = prime * result + ((securityDomainManaged == null) ? 0 : securityDomainManaged.hashCode());
return result;
}
@@ -99,19 +85,21 @@
if (!(obj instanceof CommonSecurityImpl))
return false;
CommonSecurityImpl other = (CommonSecurityImpl) obj;
- if (password == null)
+ if (applicationManaged != other.applicationManaged)
+ return false;
+ if (securityDomainAndApplicationManaged == null)
{
- if (other.password != null)
+ if (other.securityDomainAndApplicationManaged != null)
return false;
}
- else if (!password.equals(other.password))
+ else if (!securityDomainAndApplicationManaged.equals(other.securityDomainAndApplicationManaged))
return false;
- if (userName == null)
+ if (securityDomainManaged == null)
{
- if (other.userName != null)
+ if (other.securityDomainManaged != null)
return false;
}
- else if (!userName.equals(other.userName))
+ else if (!securityDomainManaged.equals(other.securityDomainManaged))
return false;
return true;
}
@@ -119,13 +107,84 @@
@Override
public String toString()
{
- return "SecurityImpl [userName=" + userName + ", password=" + password + "]";
+ return "CommonSecurityImpl [securityDomainManaged=" + securityDomainManaged +
+ ", securityDomainAndApplicationManaged=" + securityDomainAndApplicationManaged +
+ ", applicationManaged=" + applicationManaged + "]";
}
+ /**
+ * Get the securityDomainManaged.
+ *
+ * @return the securityDomainManaged.
+ */
@Override
+ public final String getSecurityDomain()
+ {
+ return securityDomainManaged;
+ }
+
+ /**
+ * Get the securityDomainAndApplicationManaged.
+ *
+ * @return the securityDomainAndApplicationManaged.
+ */
+ @Override
+ public final String getSecurityDomainAndApplication()
+ {
+ return securityDomainAndApplicationManaged;
+ }
+
+ /**
+ * Get the applicationManaged.
+ *
+ * @return the applicationManaged.
+ */
+ @Override
+ public final boolean isApplication()
+ {
+ return applicationManaged;
+ }
+
+ @Override
public void validate() throws ValidateException
{
- //always validate, nothing is mandatory
+ if (securityDomainManaged != null && !securityDomainManaged.trim().equals(""))
+ {
+ if (securityDomainAndApplicationManaged != null && !securityDomainAndApplicationManaged.trim().equals(""))
+ {
+ throw new ValidateException(
+ "cannot construct a CommonSecurity having set both security-domain-managed "
+ + "and security-domain-and-application-managed ");
+ }
+ if (applicationManaged)
+ {
+ throw new ValidateException(
+ "cannot construct a CommonSecurity having set both security-domain-managed "
+ + "and appliction-managed ");
+ }
+ }
+ else
+ {
+ if (securityDomainAndApplicationManaged != null && !securityDomainAndApplicationManaged.trim().equals(""))
+ {
+ if (applicationManaged)
+ {
+ throw new ValidateException(
+ "cannot construct a CommonSecurity having set "
+ + "both security-domain-and-application-managed "
+ + "and appliction-managed ");
+ }
+ }
+ else
+ {
+ if (!applicationManaged)
+ {
+ throw new ValidateException(
+ "cannot construct a CommonSecurity object with security-domain-managed "
+ + "and security-domain-and-application-managed not set and "
+ + "appliction-managed not set or false");
+ }
+ }
+ }
}
-
}
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 2011-02-14 15:49:46 UTC (rev 110664)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ds/DataSourceAbstractImpl.java 2011-02-14 15:53:09 UTC (rev 110665)
@@ -21,9 +21,9 @@
*/
package org.jboss.jca.common.metadata.ds;
-import org.jboss.jca.common.api.metadata.common.CommonSecurity;
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.DsSecurity;
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;
@@ -56,7 +56,7 @@
/**
* security
*/
- protected final CommonSecurity security;
+ protected final DsSecurity security;
/**
* statement
@@ -121,7 +121,7 @@
* @throws ValidateException ValidateException
*/
protected DataSourceAbstractImpl(TransactionIsolation transactionIsolation, TimeOut timeOut,
- CommonSecurity security, Statement statement, Validation validation, String urlDelimiter,
+ DsSecurity security, Statement statement, Validation validation, String urlDelimiter,
String urlSelectorStrategyClassName, Boolean useJavaContext, String poolName, Boolean enabled, String jndiName,
boolean spy)
throws ValidateException
@@ -173,7 +173,7 @@
*/
@Override
- public final CommonSecurity getSecurity()
+ public final DsSecurity getSecurity()
{
return security;
}
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 2011-02-14 15:49:46 UTC (rev 110664)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ds/DataSourceImpl.java 2011-02-14 15:53:09 UTC (rev 110665)
@@ -22,8 +22,8 @@
package org.jboss.jca.common.metadata.ds;
import org.jboss.jca.common.api.metadata.common.CommonPool;
-import org.jboss.jca.common.api.metadata.common.CommonSecurity;
import org.jboss.jca.common.api.metadata.ds.DataSource;
+import org.jboss.jca.common.api.metadata.ds.DsSecurity;
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;
@@ -83,7 +83,7 @@
*/
public DataSourceImpl(String connectionUrl, String driverClass, String module,
TransactionIsolation transactionIsolation, Map<String, String> connectionProperties, TimeOut timeOut,
- CommonSecurity security, Statement statement, Validation validation, String urlDelimiter,
+ DsSecurity security, Statement statement, Validation validation, String urlDelimiter,
String urlSelectorStrategyClassName, String newConnectionSql, boolean useJavaContext, String poolName,
boolean enabled, String jndiName, boolean spy, CommonPool pool) throws ValidateException
{
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 2011-02-14 15:49:46 UTC (rev 110664)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ds/DsParser.java 2011-02-14 15:53:09 UTC (rev 110665)
@@ -22,10 +22,10 @@
package org.jboss.jca.common.metadata.ds;
import org.jboss.jca.common.api.metadata.common.CommonPool;
-import org.jboss.jca.common.api.metadata.common.CommonSecurity;
import org.jboss.jca.common.api.metadata.common.CommonXaPool;
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.DsSecurity;
import org.jboss.jca.common.api.metadata.ds.JdbcAdapterExtension;
import org.jboss.jca.common.api.metadata.ds.Statement;
import org.jboss.jca.common.api.metadata.ds.Statement.TrackStatementsEnum;
@@ -177,7 +177,7 @@
TransactionIsolation transactionIsolation = null;
Map<String, String> xaDataSourceProperty = new HashMap<String, String>();
TimeOut timeOutSettings = null;
- CommonSecurity securitySettings = null;
+ DsSecurity securitySettings = null;
Statement statementSettings = null;
Validation validationSettings = null;
String urlDelimiter = null;
@@ -285,7 +285,7 @@
break;
}
case SECURITY : {
- securitySettings = parseSecuritySettings(reader);
+ securitySettings = parseDsSecuritySettings(reader);
break;
}
case STATEMENT : {
@@ -319,7 +319,7 @@
TransactionIsolation transactionIsolation = null;
Map<String, String> connectionProperties = new HashMap<String, String>();
TimeOut timeOutSettings = null;
- CommonSecurity securitySettings = null;
+ DsSecurity securitySettings = null;
Statement statementSettings = null;
Validation validationSettings = null;
String urlDelimiter = null;
@@ -427,7 +427,7 @@
break;
}
case SECURITY : {
- securitySettings = parseSecuritySettings(reader);
+ securitySettings = parseDsSecuritySettings(reader);
break;
}
case STATEMENT : {
@@ -452,6 +452,58 @@
throw new ParserException("Reached end of xml document unexpectedly");
}
+ private DsSecurity parseDsSecuritySettings(XMLStreamReader reader) throws XMLStreamException, ParserException,
+ ValidateException
+ {
+
+ String userName = null;
+ String password = null;
+ String securityDomain = null;
+
+ while (reader.hasNext())
+ {
+ switch (reader.nextTag())
+ {
+ case END_ELEMENT : {
+ if (DataSource.Tag.forName(reader.getLocalName()) == DataSource.Tag.SECURITY)
+ {
+
+ return new DsSecurityImpl(userName, password, securityDomain);
+ }
+ else
+ {
+ if (DsSecurity.Tag.forName(reader.getLocalName()) == DsSecurity.Tag.UNKNOWN)
+ {
+ throw new ParserException("unexpected end tag" + reader.getLocalName());
+ }
+ }
+ break;
+ }
+ case START_ELEMENT : {
+ switch (DsSecurity.Tag.forName(reader.getLocalName()))
+ {
+ case PASSWORD : {
+ password = elementAsString(reader);
+ break;
+ }
+ case USERNAME : {
+ userName = elementAsString(reader);
+ break;
+ }
+ case SECURITY_DOMAIN : {
+ securityDomain = elementAsString(reader);
+ break;
+ }
+ default :
+ throw new ParserException("Unexpected element:" + reader.getLocalName());
+ }
+ break;
+ }
+ }
+ }
+ throw new ParserException("Reached end of xml document unexpectedly");
+ }
+
private Validation parseValidationSetting(XMLStreamReader reader) throws XMLStreamException, ParserException,
ValidateException
{
Copied: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ds/DsSecurityImpl.java (from rev 110624, projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/common/CommonSecurityImpl.java)
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ds/DsSecurityImpl.java (rev 0)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ds/DsSecurityImpl.java 2011-02-14 15:53:09 UTC (rev 110665)
@@ -0,0 +1,156 @@
+/*
+ * 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.DsSecurity;
+import org.jboss.jca.common.api.validator.ValidateException;
+
+
+/**
+ *
+ * A SecurityImpl.
+ *
+ * @author <a href="stefano.maestri at jboss.com">Stefano Maestri</a>
+ *
+ */
+public class DsSecurityImpl implements DsSecurity
+{
+
+ /** The serialVersionUID */
+ private static final long serialVersionUID = -5842402120520191086L;
+
+ private final String userName;
+
+ private final String password;
+
+ private final String securityDomain;
+
+ /**
+ * Create a new SecurityImpl.
+ *
+ * @param userName userName
+ * @param password password
+ * @param securityDomain securityDomain
+ * @throws ValidateException ValidateException
+ */
+ public DsSecurityImpl(String userName, String password, String securityDomain) throws ValidateException
+ {
+ super();
+ this.userName = userName;
+ this.password = password;
+ this.securityDomain = securityDomain;
+ this.validate();
+ }
+
+ /**
+ * 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;
+ }
+
+ @Override
+ public int hashCode()
+ {
+ final int prime = 31;
+ int result = 1;
+ result = prime * result + ((password == null) ? 0 : password.hashCode());
+ result = prime * result + ((securityDomain == null) ? 0 : securityDomain.hashCode());
+ result = prime * result + ((userName == null) ? 0 : userName.hashCode());
+ return result;
+ }
+
+ @Override
+ public boolean equals(Object obj)
+ {
+ if (this == obj)
+ return true;
+ if (obj == null)
+ return false;
+ if (!(obj instanceof DsSecurityImpl))
+ return false;
+ DsSecurityImpl other = (DsSecurityImpl) obj;
+ if (password == null)
+ {
+ if (other.password != null)
+ return false;
+ }
+ else if (!password.equals(other.password))
+ return false;
+ if (securityDomain == null)
+ {
+ if (other.securityDomain != null)
+ return false;
+ }
+ else if (!securityDomain.equals(other.securityDomain))
+ return false;
+ if (userName == null)
+ {
+ if (other.userName != null)
+ return false;
+ }
+ else if (!userName.equals(other.userName))
+ return false;
+ return true;
+ }
+
+ @Override
+ public String toString()
+ {
+ return "DsSecurityImpl [userName=" + userName + ", password=" + password + ", securityDomain=" +
+ securityDomain + "]";
+ }
+
+ /**
+ * Get the securityDomainManaged.
+ *
+ * @return the securityDomainManaged.
+ */
+ @Override
+ public final String getSecurityDomain()
+ {
+ return securityDomain;
+ }
+
+
+
+ @Override
+ public void validate() throws ValidateException
+ {
+ //always valid, no data ara mandatory
+ }
+}
Modified: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ds/ValidationImpl.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ds/ValidationImpl.java 2011-02-14 15:49:46 UTC (rev 110664)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ds/ValidationImpl.java 2011-02-14 15:53:09 UTC (rev 110665)
@@ -25,7 +25,6 @@
import org.jboss.jca.common.api.metadata.ds.Validation;
import org.jboss.jca.common.api.validator.ValidateException;
-
/**
*
* A ValidationImpl.
@@ -75,8 +74,6 @@
this.validate();
}
-
-
/**
* Get the checkValidConnectionSql.
*
@@ -99,8 +96,6 @@
return validateOnMatch;
}
-
-
/**
* Get the validConnectionChecker.
*
@@ -148,9 +143,12 @@
throw new ValidateException("backgroundValidationMinutes (xml attribure " +
Validation.Tag.BACKGROUNDVALIDATIONMINUTES + ") cannot be < 0");
if (this.validConnectionChecker != null)
- try {
+ try
+ {
this.validConnectionChecker.validate();
- } catch (ValidateException ve) {
+ }
+ catch (ValidateException ve)
+ {
throw new ValidateException("validCoonnectionChecker (xml tag" + Validation.Tag.VALIDCONNECTIONCHECKER +
") not valid. See the cause exception for more details", ve);
}
@@ -246,4 +244,3 @@
}
}
-
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 2011-02-14 15:49:46 UTC (rev 110664)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ds/XADataSourceImpl.java 2011-02-14 15:53:09 UTC (rev 110665)
@@ -21,8 +21,8 @@
*/
package org.jboss.jca.common.metadata.ds;
-import org.jboss.jca.common.api.metadata.common.CommonSecurity;
import org.jboss.jca.common.api.metadata.common.CommonXaPool;
+import org.jboss.jca.common.api.metadata.ds.DsSecurity;
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;
@@ -78,7 +78,7 @@
* @param xaPool xaPool
* @throws ValidateException ValidateException
*/
- public XADataSourceImpl(TransactionIsolation transactionIsolation, TimeOut timeOut, CommonSecurity security,
+ public XADataSourceImpl(TransactionIsolation transactionIsolation, TimeOut timeOut, DsSecurity security,
Statement statement, Validation validation, String urlDelimiter, String urlSelectorStrategyClassName,
boolean useJavaContext, String poolName, boolean enabled, String jndiName, boolean spy,
Map<String, String> xaDataSourceProperty, String xaDataSourceClass, String module, String newConnectionSql,
Modified: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/merge/Merger.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/merge/Merger.java 2011-02-14 15:49:46 UTC (rev 110664)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/merge/Merger.java 2011-02-14 15:53:09 UTC (rev 110665)
@@ -24,10 +24,10 @@
import org.jboss.jca.common.api.metadata.common.CommonAdminObject;
import org.jboss.jca.common.api.metadata.common.CommonConnDef;
import org.jboss.jca.common.api.metadata.common.CommonIronJacamar;
-import org.jboss.jca.common.api.metadata.common.CommonSecurity;
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.DsSecurity;
import org.jboss.jca.common.api.metadata.ds.XaDataSource;
import org.jboss.jca.common.api.metadata.ra.AdminObject;
import org.jboss.jca.common.api.metadata.ra.AuthenticationMechanism;
@@ -45,7 +45,6 @@
import org.jboss.jca.common.api.metadata.ra.SecurityPermission;
import org.jboss.jca.common.api.metadata.ra.XsdString;
import org.jboss.jca.common.api.metadata.ra.ra16.ConfigProperty16;
-import org.jboss.jca.common.metadata.merge.Merger.ConfigPropertyFactory.Prototype;
import org.jboss.jca.common.metadata.ra.common.AbstractResourceAdapetrImpl;
import org.jboss.jca.common.metadata.ra.common.AdminObjectImpl;
import org.jboss.jca.common.metadata.ra.common.ConfigPropertyImpl;
@@ -234,17 +233,7 @@
List<? extends ConfigProperty> original = conDef.getConfigProperties();
List<ConfigProperty> newProperties = this.mergeConfigProperties(commonConDef.getConfigProperties(), original);
- CommonSecurity security = commonConDef.getSecurity();
- if (security != null && security.getUserName() != null && !security.getUserName().trim().equals(""))
- {
- newProperties.add(ConfigPropertyFactory.createConfigProperty(Prototype.USERNAME, security.getUserName()));
- }
- if (security != null && security.getPassword() != null && !security.getPassword().trim().equals(""))
- {
- newProperties.add(ConfigPropertyFactory.createConfigProperty(Prototype.PASSWORD, security.getPassword()));
- }
-
((ConnectionDefinitionImpl) conDef).forceNewConfigPropertiesContent(newProperties);
return conDef;
@@ -459,7 +448,7 @@
case USERNAME : {
if (ds != null)
{
- CommonSecurity security = ds.getSecurity();
+ DsSecurity security = ds.getSecurity();
if (security != null && security.getUserName() != null &&
!security.getUserName().trim().equals(""))
{
@@ -473,7 +462,7 @@
case PASSWORD : {
if (ds != null)
{
- CommonSecurity security = ds.getSecurity();
+ DsSecurity security = ds.getSecurity();
if (security != null && security.getPassword() != null &&
!security.getPassword().trim().equals(""))
{
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 2011-02-14 15:49:46 UTC (rev 110664)
+++ projects/jboss-jca/trunk/common/src/main/resources/schema/datasources_1_0.xsd 2011-02-14 15:53:09 UTC (rev 110665)
@@ -717,27 +717,42 @@
</xs:complexType>
<xs:complexType name="securityType">
<xs:sequence>
- <xs:element name="user-name" type="xs:token" minOccurs="0">
+ <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>
- ]]>
+ <![CDATA[[
+ Specify the 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: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>]]>
+ <![CDATA[[
+ Specify the password used when creating a new connection.
+ Ex: <password>sa-pass</password>
+ ]]>
</xs:documentation>
</xs:annotation>
</xs:element>
- </xs:sequence>
- </xs:complexType>
+ <xs:element name="security-domain" type="xs:token" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ <![CDATA[[
+ Indicates Subject (from security domain) are used to distinguish connections in the pool.
+ The content of the security-domain is the name of the JAAS security manager that will handle
+ authentication. This name correlates to the JAAS login-config.xml descriptor
+ application-policy/name attribute.
+ Ex:
+ <security-domain>HsqlDbRealm</security-domain>
+ ]]>
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
<xs:complexType name="jdbc-adapter-extensionType">
<xs:sequence>
Modified: projects/jboss-jca/trunk/common/src/main/resources/schema/ironjacamar_1_0.xsd
===================================================================
--- projects/jboss-jca/trunk/common/src/main/resources/schema/ironjacamar_1_0.xsd 2011-02-14 15:49:46 UTC (rev 110664)
+++ projects/jboss-jca/trunk/common/src/main/resources/schema/ironjacamar_1_0.xsd 2011-02-14 15:53:09 UTC (rev 110665)
@@ -453,31 +453,57 @@
</xs:complexContent>
</xs:complexType>
- <xs:complexType name="securityType">
+ <xs:complexType name="securityType">
<xs:sequence>
- <xs:element name="user-name" type="xs:token" minOccurs="0">
- <xs:annotation>
- <xs:documentation>
- <![CDATA[[
- Specifies the 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[[
- Specifies the password used when creating a new connection.
- Ex: <password>sa-pass</password>
- ]]>
- </xs:documentation>
- </xs:annotation>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
+ <xs:choice>
+ <xs:element name="application" type="boolean-presenceType" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ <![CDATA[[
+ Indicates that app supplied parameters (such as from getConnection(user, pw))
+ are used to distinguish connections in the pool.
+ Ex:
+ <application-managed-security/>
+ ]]>
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="security-domain" type="xs:token" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ <![CDATA[[
+ Indicates Subject (from security domain) are used to distinguish connections in the pool.
+ The content of the security-domain is the name of the JAAS security manager that will handle
+ authentication. This name correlates to the JAAS login-config.xml descriptor
+ application-policy/name attribute.
+ Ex:
+ <security-domain>HsqlDbRealm</security-domain>
+ ]]>
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="security-domain-and-application" type="xs:token" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ <![CDATA[[
+ Indicates that either app supplied parameters (such as from
+ getConnection(user, pw)) or Subject (from security domain) are used to
+ distinguish connections in the pool. The content of the
+ security-domain is the name of the JAAS security manager that will handle
+ authentication. This name correlates to the JAAS login-config.xml descriptor
+ application-policy/name attribute.
+
+ Ex:
+ <security-domain-and-application>HsqlDbRealm</security-domain-and-application>
+ ]]>
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:choice>
+ </xs:sequence>
+ </xs:complexType>
+
<xs:complexType name="admin-objectsType">
<xs:sequence>
<xs:element name="admin-object" type="admin-objectType" minOccurs="1" maxOccurs="unbounded">
Modified: projects/jboss-jca/trunk/common/src/main/resources/schema/resource-adapters_1_0.xsd
===================================================================
--- projects/jboss-jca/trunk/common/src/main/resources/schema/resource-adapters_1_0.xsd 2011-02-14 15:49:46 UTC (rev 110664)
+++ projects/jboss-jca/trunk/common/src/main/resources/schema/resource-adapters_1_0.xsd 2011-02-14 15:53:09 UTC (rev 110665)
@@ -1,11 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
- elementFormDefault="qualified"
- targetNamespace="http://www.jboss.org/ironjacamar/schema"
- xmlns="http://www.jboss.org/ironjacamar/schema">
-
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified"
+ targetNamespace="http://www.jboss.org/ironjacamar/schema" xmlns="http://www.jboss.org/ironjacamar/schema">
<xs:complexType name="boolean-presenceType"></xs:complexType>
-
<xs:complexType name="config-propertyType" mixed="true">
<xs:annotation>
<xs:documentation>
@@ -28,7 +24,6 @@
</xs:extension>
</xs:simpleContent>
</xs:complexType>
-
<xs:complexType name="resource-adapterType">
<xs:sequence>
<xs:element name="archive" type="xs:token" minOccurs="1" maxOccurs="1">
@@ -97,7 +92,6 @@
</xs:element>
</xs:sequence>
</xs:complexType>
-
<xs:simpleType name="transaction-supportType">
<xs:annotation>
<xs:documentation>
@@ -113,7 +107,6 @@
<xs:enumeration value="XATransaction" />
</xs:restriction>
</xs:simpleType>
-
<xs:attributeGroup name="common-attribute">
<xs:attribute name="class-name" type="xs:token" use="optional">
<xs:annotation>
@@ -162,7 +155,6 @@
</xs:annotation>
</xs:attribute>
</xs:attributeGroup>
-
<xs:complexType name="admin-objectType">
<xs:sequence>
<xs:element name="config-property" type="config-propertyType" minOccurs="0" maxOccurs="unbounded">
@@ -177,7 +169,6 @@
</xs:sequence>
<xs:attributeGroup ref="common-attribute"></xs:attributeGroup>
</xs:complexType>
-
<xs:complexType name="time-outType">
<xs:sequence>
<xs:element name="blocking-timeout-millis" type="xs:nonNegativeInteger" minOccurs="0">
@@ -240,7 +231,6 @@
</xs:element>
</xs:sequence>
</xs:complexType>
-
<xs:complexType name="validationType">
<xs:sequence>
<xs:element name="background-validation" type="xs:boolean" minOccurs="0">
@@ -276,7 +266,6 @@
</xs:element>
</xs:sequence>
</xs:complexType>
-
<xs:element name="resource-adapters" type="resource-adaptersType">
<xs:annotation>
<xs:documentation>
@@ -286,7 +275,6 @@
</xs:documentation>
</xs:annotation>
</xs:element>
-
<xs:complexType name="resource-adaptersType">
<xs:sequence>
<xs:element name="resource-adapter" type="resource-adapterType" minOccurs="1" maxOccurs="unbounded">
@@ -300,7 +288,6 @@
</xs:element>
</xs:sequence>
</xs:complexType>
-
<xs:complexType name="connection-definitionsType">
<xs:sequence>
<xs:element name="connection-definition" type="connection-defintionType" minOccurs="1" maxOccurs="unbounded">
@@ -314,7 +301,6 @@
</xs:element>
</xs:sequence>
</xs:complexType>
-
<xs:complexType name="connection-defintionType">
<xs:sequence>
<xs:element name="config-property" type="config-propertyType" minOccurs="0" maxOccurs="unbounded">
@@ -376,7 +362,6 @@
</xs:sequence>
<xs:attributeGroup ref="common-attribute"></xs:attributeGroup>
</xs:complexType>
-
<xs:complexType name="poolType">
<xs:sequence>
<xs:element name="min-pool-size" type="xs:nonNegativeInteger" minOccurs="0">
@@ -419,10 +404,10 @@
Default false
]]>
</xs:documentation>
- </xs:annotation></xs:element>
+ </xs:annotation>
+ </xs:element>
</xs:sequence>
</xs:complexType>
-
<xs:complexType name="xa-poolType">
<xs:complexContent>
<xs:extension base="poolType">
@@ -485,31 +470,55 @@
</xs:extension>
</xs:complexContent>
</xs:complexType>
-
<xs:complexType name="securityType">
<xs:sequence>
- <xs:element name="user-name" type="xs:token" minOccurs="0">
- <xs:annotation>
- <xs:documentation>
- <![CDATA[[
- Specify the 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 password used when creating a new connection.
- Ex: <password>sa-pass</password>
- ]]>
- </xs:documentation>
- </xs:annotation>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
+ <xs:choice>
+ <xs:element name="application" type="boolean-presenceType" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ <![CDATA[[
+ Indicates that app supplied parameters (such as from getConnection(user, pw))
+ are used to distinguish connections in the pool.
+ Ex:
+ <application-managed-security/>
+ ]]>
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="security-domain" type="xs:token" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ <![CDATA[[
+ Indicates Subject (from security domain) are used to distinguish connections in the pool.
+ The content of the security-domain is the name of the JAAS security manager that will handle
+ authentication. This name correlates to the JAAS login-config.xml descriptor
+ application-policy/name attribute.
+ Ex:
+ <security-domain>HsqlDbRealm</security-domain>
+ ]]>
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="security-domain-and-application" type="xs:token" minOccurs="0" maxOccurs="1">
+ <xs:annotation>
+ <xs:documentation>
+ <![CDATA[[
+ Indicates that either app supplied parameters (such as from
+ getConnection(user, pw)) or Subject (from security domain) are used to
+ distinguish connections in the pool. The content of the
+ security-domain is the name of the JAAS security manager that will handle
+ authentication. This name correlates to the JAAS login-config.xml descriptor
+ application-policy/name attribute.
+
+ Ex:
+ <security-domain-and-application>HsqlDbRealm</security-domain-and-application>
+ ]]>
+ </xs:documentation>
+ </xs:annotation>
+ </xs:element>
+ </xs:choice>
+ </xs:sequence>
+ </xs:complexType>
<xs:complexType name="admin-objectsType">
<xs:sequence>
Modified: projects/jboss-jca/trunk/common/src/test/java/org/jboss/jca/common/metadata/ironjacamar/IronJacamarParserTestCase.java
===================================================================
--- projects/jboss-jca/trunk/common/src/test/java/org/jboss/jca/common/metadata/ironjacamar/IronJacamarParserTestCase.java 2011-02-14 15:49:46 UTC (rev 110664)
+++ projects/jboss-jca/trunk/common/src/test/java/org/jboss/jca/common/metadata/ironjacamar/IronJacamarParserTestCase.java 2011-02-14 15:53:09 UTC (rev 110665)
@@ -335,8 +335,10 @@
IronJacamar ij = parser.parse(is);
//then
CommonSecurity sec = ij.getConnectionDefinitions().get(0).getSecurity();
- assertThat(sec.getPassword(), new IsNull<String>());
- assertThat(sec.getUserName(), new IsNull<String>());
+ assertThat(sec.getSecurityDomainAndApplication(), new IsNull<String>());
+ assertThat(sec.getSecurityDomain(), new IsNull<String>());
+ assertThat(sec.isApplication(), is(true));
+
}
finally
{
@@ -415,8 +417,9 @@
//security defaults
CommonSecurity sec = connDef.getSecurity();
- assertThat(sec.getPassword(), new IsNull<String>());
- assertThat(sec.getUserName(), new IsNull<String>());
+ assertThat(sec.getSecurityDomainAndApplication(), new IsNull<String>());
+ assertThat(sec.getSecurityDomain(), new IsNull<String>());
+ assertThat(sec.isApplication(), is(true));
//timeout defaults
CommonTimeOut t = connDef.getTimeOut();
@@ -477,8 +480,9 @@
//security defaults
CommonSecurity sec = connDef.getSecurity();
- assertThat(sec.getPassword(), new IsNull<String>());
- assertThat(sec.getUserName(), new IsNull<String>());
+ assertThat(sec.getSecurityDomainAndApplication(), new IsNull<String>());
+ assertThat(sec.getSecurityDomain(), new IsNull<String>());
+ assertThat(sec.isApplication(), is(true));
//timeout defaults
CommonTimeOut t = connDef.getTimeOut();
Modified: projects/jboss-jca/trunk/common/src/test/java/org/jboss/jca/common/metadata/merge/MergerTestCase.java
===================================================================
--- projects/jboss-jca/trunk/common/src/test/java/org/jboss/jca/common/metadata/merge/MergerTestCase.java 2011-02-14 15:49:46 UTC (rev 110664)
+++ projects/jboss-jca/trunk/common/src/test/java/org/jboss/jca/common/metadata/merge/MergerTestCase.java 2011-02-14 15:53:09 UTC (rev 110665)
@@ -629,12 +629,12 @@
ConfigProperty exConf3 = new ConfigPropertyImpl(null, new XsdString("LogLevel", null),
new XsdString("java.lang.String", null),
new XsdString("WARN", null), null);
- ConfigProperty exConf4 = new ConfigPropertyImpl(null, new XsdString("UserName", null),
- new XsdString("java.lang.String", null),
- new XsdString("aaa", null), null);
- ConfigProperty exConf5 = new ConfigPropertyImpl(null, new XsdString("Password", null),
- new XsdString("java.lang.String", null),
- new XsdString("bbb", null), null);
+ // ConfigProperty exConf4 = new ConfigPropertyImpl(null, new XsdString("UserName", null),
+ // new XsdString("java.lang.String", null),
+ // new XsdString("aaa", null), null);
+ // ConfigProperty exConf5 = new ConfigPropertyImpl(null, new XsdString("Password", null),
+ // new XsdString("java.lang.String", null),
+ // new XsdString("bbb", null), null);
assertThat(merged, notNullValue());
assertThat(connector.getResourceadapter().getConfigProperties().size(), is(1));
@@ -648,8 +648,8 @@
.getConnectionDefinitions().size(), is(1));
List<ConfigProperty> conDefProps = (List<ConfigProperty>) ((ResourceAdapter1516) merged.getResourceadapter())
.getOutboundResourceadapter().getConnectionDefinitions().get(0).getConfigProperties();
- assertThat(conDefProps.size(), is(5));
- assertThat(conDefProps, hasItems(exConf1, exConf2, exConf3, exConf4, exConf5));
+ assertThat(conDefProps.size(), is(3));
+ assertThat(conDefProps, hasItems(exConf1, exConf2, exConf3)); //, exConf4, exConf5));
assertThat(((ResourceAdapter1516) merged.getResourceadapter()).getInboundResourceadapter(),
equalTo(((ResourceAdapter1516) connector.getResourceadapter()).getInboundResourceadapter()));
}
@@ -703,12 +703,12 @@
ConfigProperty exConf3 = new ConfigPropertyImpl(null, new XsdString("LogLevel", null),
new XsdString("java.lang.String", null),
new XsdString("WARN", null), null);
- ConfigProperty exConf4 = new ConfigPropertyImpl(null, new XsdString("UserName", null),
- new XsdString("java.lang.String", null),
- new XsdString("aaa", null), null);
- ConfigProperty exConf5 = new ConfigPropertyImpl(null, new XsdString("Password", null),
- new XsdString("java.lang.String", null),
- new XsdString("bbb", null), null);
+ // ConfigProperty exConf4 = new ConfigPropertyImpl(null, new XsdString("UserName", null),
+ // new XsdString("java.lang.String", null),
+ // new XsdString("aaa", null), null);
+ // ConfigProperty exConf5 = new ConfigPropertyImpl(null, new XsdString("Password", null),
+ // new XsdString("java.lang.String", null),
+ // new XsdString("bbb", null), null);
assertThat(merged, notNullValue());
assertThat(connector.getResourceadapter().getConfigProperties().size(), is(1));
@@ -722,8 +722,8 @@
.getConnectionDefinitions().size(), is(1));
List<ConfigProperty> conDefProps = (List<ConfigProperty>) ((ResourceAdapter1516) merged.getResourceadapter())
.getOutboundResourceadapter().getConnectionDefinitions().get(0).getConfigProperties();
- assertThat(conDefProps.size(), is(5));
- assertThat(conDefProps, hasItems(exConf1, exConf2, exConf3, exConf4, exConf5));
+ assertThat(conDefProps.size(), is(3));
+ assertThat(conDefProps, hasItems(exConf1, exConf2, exConf3));//, exConf4, exConf5));
assertThat(((ResourceAdapter1516) merged.getResourceadapter()).getInboundResourceadapter(),
equalTo(((ResourceAdapter1516) connector.getResourceadapter()).getInboundResourceadapter()));
}
Modified: projects/jboss-jca/trunk/common/src/test/resources/ds/example/db2-400-ds.xml
===================================================================
--- projects/jboss-jca/trunk/common/src/test/resources/ds/example/db2-400-ds.xml 2011-02-14 15:49:46 UTC (rev 110664)
+++ projects/jboss-jca/trunk/common/src/test/resources/ds/example/db2-400-ds.xml 2011-02-14 15:53:09 UTC (rev 110665)
@@ -10,7 +10,8 @@
<security>
<user-name>[username]</user-name>
<password>[password]</password>
- </security>
+</security>
+
</datasource>
</datasources>
Modified: projects/jboss-jca/trunk/common/src/test/resources/ds/example/db2-ds.xml
===================================================================
--- projects/jboss-jca/trunk/common/src/test/resources/ds/example/db2-ds.xml 2011-02-14 15:49:46 UTC (rev 110664)
+++ projects/jboss-jca/trunk/common/src/test/resources/ds/example/db2-ds.xml 2011-02-14 15:53:09 UTC (rev 110665)
@@ -11,7 +11,8 @@
<security>
<user-name>x</user-name>
<password>y</password>
- </security>
+
+</security>
<!-- DB2 Universal Driver Note connection URL is in form of
jdbc:db2://host:port:dbname
Modified: projects/jboss-jca/trunk/common/src/test/resources/ds/example/derby-ds.xml
===================================================================
--- projects/jboss-jca/trunk/common/src/test/resources/ds/example/derby-ds.xml 2011-02-14 15:49:46 UTC (rev 110664)
+++ projects/jboss-jca/trunk/common/src/test/resources/ds/example/derby-ds.xml 2011-02-14 15:53:09 UTC (rev 110665)
@@ -20,7 +20,8 @@
<!-- The login and password -->
<user-name>sa</user-name>
<password></password>
- </security>
+
+</security>
<time-out>
<!-- The time before an unused connection is destroyed -->
<idle-timeout-minutes>5</idle-timeout-minutes>
Modified: projects/jboss-jca/trunk/common/src/test/resources/ds/example/h2-ds.xml
===================================================================
--- projects/jboss-jca/trunk/common/src/test/resources/ds/example/h2-ds.xml 2011-02-14 15:49:46 UTC (rev 110664)
+++ projects/jboss-jca/trunk/common/src/test/resources/ds/example/h2-ds.xml 2011-02-14 15:53:09 UTC (rev 110665)
@@ -8,7 +8,8 @@
<security>
<user-name>sa</user-name>
<password>sa</password>
- </security>
+
+</security>
</datasource>
</datasources>
Modified: projects/jboss-jca/trunk/common/src/test/resources/ds/example/h2-xa-ds.xml
===================================================================
--- projects/jboss-jca/trunk/common/src/test/resources/ds/example/h2-xa-ds.xml 2011-02-14 15:49:46 UTC (rev 110664)
+++ projects/jboss-jca/trunk/common/src/test/resources/ds/example/h2-xa-ds.xml 2011-02-14 15:53:09 UTC (rev 110665)
@@ -10,7 +10,8 @@
<user-name>sa</user-name>
<!-- Have to defined as a primary property - otherwise it won't work -->
<password>sa</password>
- </security>
+
+</security>
</xa-datasource>
</datasources>
Modified: projects/jboss-jca/trunk/common/src/test/resources/ds/example/hsqldb-ds.xml
===================================================================
--- projects/jboss-jca/trunk/common/src/test/resources/ds/example/hsqldb-ds.xml 2011-02-14 15:49:46 UTC (rev 110664)
+++ projects/jboss-jca/trunk/common/src/test/resources/ds/example/hsqldb-ds.xml 2011-02-14 15:53:09 UTC (rev 110665)
@@ -18,7 +18,8 @@
<security>
<user-name>sa</user-name>
<password></password>
- </security>
+
+</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
Modified: projects/jboss-jca/trunk/common/src/test/resources/ds/example/informix-ds.xml
===================================================================
--- projects/jboss-jca/trunk/common/src/test/resources/ds/example/informix-ds.xml 2011-02-14 15:49:46 UTC (rev 110664)
+++ projects/jboss-jca/trunk/common/src/test/resources/ds/example/informix-ds.xml 2011-02-14 15:53:09 UTC (rev 110665)
@@ -10,7 +10,8 @@
<security>
<user-name>x</user-name>
<password>y</password>
- </security>
+
+</security>
<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>
Modified: projects/jboss-jca/trunk/common/src/test/resources/ds/example/jdatastore-ds.xml
===================================================================
--- projects/jboss-jca/trunk/common/src/test/resources/ds/example/jdatastore-ds.xml 2011-02-14 15:49:46 UTC (rev 110664)
+++ projects/jboss-jca/trunk/common/src/test/resources/ds/example/jdatastore-ds.xml 2011-02-14 15:53:09 UTC (rev 110665)
@@ -14,6 +14,7 @@
<security>
<user-name>x</user-name>
<password>y</password>
- </security>
+
+</security>
</datasource>
</datasources>
Modified: projects/jboss-jca/trunk/common/src/test/resources/ds/example/jsql-ds.xml
===================================================================
--- projects/jboss-jca/trunk/common/src/test/resources/ds/example/jsql-ds.xml 2011-02-14 15:49:46 UTC (rev 110664)
+++ projects/jboss-jca/trunk/common/src/test/resources/ds/example/jsql-ds.xml 2011-02-14 15:53:09 UTC (rev 110665)
@@ -10,7 +10,8 @@
<security>
<user-name>x</user-name>
<password>y</password>
- </security>
+
+</security>
<!-- sql to call on an existing pooled connection when it is obtained from pool
<validation>
<check-valid-connection-sql>some arbitrary sql</check-valid-connection-sql>
Modified: projects/jboss-jca/trunk/common/src/test/resources/ds/example/mimer-ds.xml
===================================================================
--- projects/jboss-jca/trunk/common/src/test/resources/ds/example/mimer-ds.xml 2011-02-14 15:49:46 UTC (rev 110664)
+++ projects/jboss-jca/trunk/common/src/test/resources/ds/example/mimer-ds.xml 2011-02-14 15:53:09 UTC (rev 110665)
@@ -14,7 +14,8 @@
<security>
<user-name>changeme</user-name>
<password>changeme</password>
- </security>
+
+</security>
<time-out>
<blocking-timeout-millis>5000</blocking-timeout-millis>
<idle-timeout-minutes>15</idle-timeout-minutes>
Modified: projects/jboss-jca/trunk/common/src/test/resources/ds/example/mimer-xa-ds.xml
===================================================================
--- projects/jboss-jca/trunk/common/src/test/resources/ds/example/mimer-xa-ds.xml 2011-02-14 15:49:46 UTC (rev 110664)
+++ projects/jboss-jca/trunk/common/src/test/resources/ds/example/mimer-xa-ds.xml 2011-02-14 15:53:09 UTC (rev 110665)
@@ -13,7 +13,8 @@
<security>
<user-name>changeme</user-name>
<password>changeme</password>
- </security>
+
+</security>
<time-out>
<blocking-timeout-millis>5000</blocking-timeout-millis>
<idle-timeout-minutes>15</idle-timeout-minutes>
Modified: projects/jboss-jca/trunk/common/src/test/resources/ds/example/msaccess-ds.xml
===================================================================
--- projects/jboss-jca/trunk/common/src/test/resources/ds/example/msaccess-ds.xml 2011-02-14 15:49:46 UTC (rev 110664)
+++ projects/jboss-jca/trunk/common/src/test/resources/ds/example/msaccess-ds.xml 2011-02-14 15:53:09 UTC (rev 110665)
@@ -11,6 +11,7 @@
<security>
<user-name>x</user-name>
<password>y</password>
- </security>
+
+</security>
</datasource>
</datasources>
Modified: projects/jboss-jca/trunk/common/src/test/resources/ds/example/mssql-ds.xml
===================================================================
--- projects/jboss-jca/trunk/common/src/test/resources/ds/example/mssql-ds.xml 2011-02-14 15:49:46 UTC (rev 110664)
+++ projects/jboss-jca/trunk/common/src/test/resources/ds/example/mssql-ds.xml 2011-02-14 15:53:09 UTC (rev 110665)
@@ -10,7 +10,8 @@
<security>
<user-name>x</user-name>
<password>y</password>
- </security>
+
+</security>
<!-- sql to call on an existing pooled connection when it is obtained from pool
<validation>
<check-valid-connection-sql>some arbitrary sql</check-valid-connection-sql>
Modified: projects/jboss-jca/trunk/common/src/test/resources/ds/example/mysql-ds.xml
===================================================================
--- projects/jboss-jca/trunk/common/src/test/resources/ds/example/mysql-ds.xml 2011-02-14 15:49:46 UTC (rev 110664)
+++ projects/jboss-jca/trunk/common/src/test/resources/ds/example/mysql-ds.xml 2011-02-14 15:53:09 UTC (rev 110665)
@@ -9,7 +9,8 @@
<security>
<user-name>x</user-name>
<password>y</password>
- </security>
+
+</security>
<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.jca.adapters.jdbc.vendor.DummyValidConnectionChecker"></valid-connection-checker>
Modified: projects/jboss-jca/trunk/common/src/test/resources/ds/example/oracle-ds.xml
===================================================================
--- projects/jboss-jca/trunk/common/src/test/resources/ds/example/oracle-ds.xml 2011-02-14 15:49:46 UTC (rev 110664)
+++ projects/jboss-jca/trunk/common/src/test/resources/ds/example/oracle-ds.xml 2011-02-14 15:53:09 UTC (rev 110665)
@@ -13,7 +13,8 @@
<security>
<user-name>x</user-name>
<password>y</password>
- </security>
+
+</security>
<!-- Uses the pingDatabase method to check a connection is still valid before handing it out from the pool -->
<validation>
<!--valid-connection-checker-class-name>org.jboss.jca.adapters.jdbc.vendor.OracleValidConnectionChecker</valid-connection-checker-class-name -->
Modified: projects/jboss-jca/trunk/common/src/test/resources/ds/example/pointbase-ds.xml
===================================================================
--- projects/jboss-jca/trunk/common/src/test/resources/ds/example/pointbase-ds.xml 2011-02-14 15:49:46 UTC (rev 110664)
+++ projects/jboss-jca/trunk/common/src/test/resources/ds/example/pointbase-ds.xml 2011-02-14 15:53:09 UTC (rev 110665)
@@ -8,6 +8,7 @@
<security>
<user-name>@pointbase.user@</user-name>
<password>@pointbase.passwd@</password>
- </security>
+
+</security>
</datasource>
</datasources>
\ No newline at end of file
Modified: projects/jboss-jca/trunk/common/src/test/resources/ds/example/pointbase-xa-ds.xml
===================================================================
--- projects/jboss-jca/trunk/common/src/test/resources/ds/example/pointbase-xa-ds.xml 2011-02-14 15:49:46 UTC (rev 110664)
+++ projects/jboss-jca/trunk/common/src/test/resources/ds/example/pointbase-xa-ds.xml 2011-02-14 15:53:09 UTC (rev 110665)
@@ -7,6 +7,7 @@
<security>
<user-name>@pointbase.user@</user-name>
<password>@pointbase.passwd@</password>
- </security>
+
+</security>
</xa-datasource>
</datasources>
\ No newline at end of file
Modified: projects/jboss-jca/trunk/common/src/test/resources/ds/example/postgres-ds.xml
===================================================================
--- projects/jboss-jca/trunk/common/src/test/resources/ds/example/postgres-ds.xml 2011-02-14 15:49:46 UTC (rev 110664)
+++ projects/jboss-jca/trunk/common/src/test/resources/ds/example/postgres-ds.xml 2011-02-14 15:53:09 UTC (rev 110665)
@@ -9,6 +9,7 @@
<security>
<user-name>x</user-name>
<password>y</password>
- </security>
+
+</security>
</datasource>
</datasources>
\ No newline at end of file
Modified: projects/jboss-jca/trunk/common/src/test/resources/ds/example/progress-ds.xml
===================================================================
--- projects/jboss-jca/trunk/common/src/test/resources/ds/example/progress-ds.xml 2011-02-14 15:49:46 UTC (rev 110664)
+++ projects/jboss-jca/trunk/common/src/test/resources/ds/example/progress-ds.xml 2011-02-14 15:53:09 UTC (rev 110665)
@@ -9,6 +9,7 @@
<security>
<user-name>user</user-name>
<password>password</password>
- </security>
+
+</security>
</datasource>
</datasources>
\ No newline at end of file
Modified: projects/jboss-jca/trunk/common/src/test/resources/ds/example/sapdb-ds.xml
===================================================================
--- projects/jboss-jca/trunk/common/src/test/resources/ds/example/sapdb-ds.xml 2011-02-14 15:49:46 UTC (rev 110664)
+++ projects/jboss-jca/trunk/common/src/test/resources/ds/example/sapdb-ds.xml 2011-02-14 15:53:09 UTC (rev 110665)
@@ -9,6 +9,7 @@
<security>
<user-name>x</user-name>
<password>y</password>
- </security>
+
+</security>
</datasource>
</datasources>
\ No newline at end of file
Modified: projects/jboss-jca/trunk/common/src/test/resources/ds/example/sybase-ds.xml
===================================================================
--- projects/jboss-jca/trunk/common/src/test/resources/ds/example/sybase-ds.xml 2011-02-14 15:49:46 UTC (rev 110664)
+++ projects/jboss-jca/trunk/common/src/test/resources/ds/example/sybase-ds.xml 2011-02-14 15:53:09 UTC (rev 110665)
@@ -10,7 +10,8 @@
<security>
<user-name>x</user-name>
<password>y</password>
- </security>
+
+</security>
<validation>
<exception-sorter class-name="org.jboss.jca.adapters.jdbc.vendor.SybaseExceptionSorter"></exception-sorter>
</validation>
Modified: projects/jboss-jca/trunk/common/src/test/resources/ds/unit/jeremy-ds.xml
===================================================================
--- projects/jboss-jca/trunk/common/src/test/resources/ds/unit/jeremy-ds.xml 2011-02-14 15:49:46 UTC (rev 110664)
+++ projects/jboss-jca/trunk/common/src/test/resources/ds/unit/jeremy-ds.xml 2011-02-14 15:53:09 UTC (rev 110665)
@@ -36,7 +36,8 @@
<security>
<user-name>sa</user-name>
<password></password>
- </security>
+
+</security>
<validation>
<!--valid-connection-checker-class-name>org.jboss.jca.adapters.jdbc.ValidConnectionChecker</valid-connection-checker-class-name-->
</validation>
Modified: projects/jboss-jca/trunk/common/src/test/resources/ds/unit/replace-jndi-name-ds.xml
===================================================================
--- projects/jboss-jca/trunk/common/src/test/resources/ds/unit/replace-jndi-name-ds.xml 2011-02-14 15:49:46 UTC (rev 110664)
+++ projects/jboss-jca/trunk/common/src/test/resources/ds/unit/replace-jndi-name-ds.xml 2011-02-14 15:53:09 UTC (rev 110665)
@@ -14,7 +14,8 @@
<security>
<user-name>sa</user-name>
<password>sa</password>
- </security>
+
+</security>
</datasource>
</datasources>
Modified: projects/jboss-jca/trunk/common/src/test/resources/ds/unit/replace-jndi-name-partial-ds.xml
===================================================================
--- projects/jboss-jca/trunk/common/src/test/resources/ds/unit/replace-jndi-name-partial-ds.xml 2011-02-14 15:49:46 UTC (rev 110664)
+++ projects/jboss-jca/trunk/common/src/test/resources/ds/unit/replace-jndi-name-partial-ds.xml 2011-02-14 15:53:09 UTC (rev 110665)
@@ -14,7 +14,8 @@
<security>
<user-name>sa</user-name>
<password>sa</password>
- </security>
+
+</security>
</datasource>
</datasources>
Modified: projects/jboss-jca/trunk/common/src/test/resources/ds/unit/replace-jndi-name-twoparts-ds.xml
===================================================================
--- projects/jboss-jca/trunk/common/src/test/resources/ds/unit/replace-jndi-name-twoparts-ds.xml 2011-02-14 15:49:46 UTC (rev 110664)
+++ projects/jboss-jca/trunk/common/src/test/resources/ds/unit/replace-jndi-name-twoparts-ds.xml 2011-02-14 15:53:09 UTC (rev 110665)
@@ -14,7 +14,8 @@
<security>
<user-name>sa</user-name>
<password>sa</password>
- </security>
+
+</security>
</datasource>
</datasources>
Modified: projects/jboss-jca/trunk/common/src/test/resources/ds/unit/replace-jndi-name-twoparts-onewrong-ds.xml
===================================================================
--- projects/jboss-jca/trunk/common/src/test/resources/ds/unit/replace-jndi-name-twoparts-onewrong-ds.xml 2011-02-14 15:49:46 UTC (rev 110664)
+++ projects/jboss-jca/trunk/common/src/test/resources/ds/unit/replace-jndi-name-twoparts-onewrong-ds.xml 2011-02-14 15:53:09 UTC (rev 110665)
@@ -14,7 +14,8 @@
<security>
<user-name>sa</user-name>
<password>sa</password>
- </security>
+
+</security>
</datasource>
</datasources>
Modified: projects/jboss-jca/trunk/common/src/test/resources/ds/unit/replace-jndi-name-wrong-property-ds.xml
===================================================================
--- projects/jboss-jca/trunk/common/src/test/resources/ds/unit/replace-jndi-name-wrong-property-ds.xml 2011-02-14 15:49:46 UTC (rev 110664)
+++ projects/jboss-jca/trunk/common/src/test/resources/ds/unit/replace-jndi-name-wrong-property-ds.xml 2011-02-14 15:53:09 UTC (rev 110665)
@@ -14,7 +14,8 @@
<security>
<user-name>sa</user-name>
<password>sa</password>
- </security>
+
+</security>
</datasource>
</datasources>
Modified: projects/jboss-jca/trunk/common/src/test/resources/ds/unit/replace-max-pool-ds.xml
===================================================================
--- projects/jboss-jca/trunk/common/src/test/resources/ds/unit/replace-max-pool-ds.xml 2011-02-14 15:49:46 UTC (rev 110664)
+++ projects/jboss-jca/trunk/common/src/test/resources/ds/unit/replace-max-pool-ds.xml 2011-02-14 15:53:09 UTC (rev 110665)
@@ -14,7 +14,8 @@
<security>
<user-name>sa</user-name>
<password>sa</password>
- </security>
+
+</security>
</datasource>
</datasources>
Modified: projects/jboss-jca/trunk/common/src/test/resources/ds/unit/replace-max-pool-wrong-ds.xml
===================================================================
--- projects/jboss-jca/trunk/common/src/test/resources/ds/unit/replace-max-pool-wrong-ds.xml 2011-02-14 15:49:46 UTC (rev 110664)
+++ projects/jboss-jca/trunk/common/src/test/resources/ds/unit/replace-max-pool-wrong-ds.xml 2011-02-14 15:53:09 UTC (rev 110665)
@@ -14,7 +14,8 @@
<security>
<user-name>sa</user-name>
<password>sa</password>
- </security>
+
+</security>
</datasource>
</datasources>
Modified: projects/jboss-jca/trunk/common/src/test/resources/ds/unit/spy-ds.xml
===================================================================
--- projects/jboss-jca/trunk/common/src/test/resources/ds/unit/spy-ds.xml 2011-02-14 15:49:46 UTC (rev 110664)
+++ projects/jboss-jca/trunk/common/src/test/resources/ds/unit/spy-ds.xml 2011-02-14 15:53:09 UTC (rev 110665)
@@ -14,7 +14,8 @@
<security>
<user-name>sa</user-name>
<password>sa</password>
- </security>
+
+</security>
</datasource>
</datasources>
Modified: projects/jboss-jca/trunk/common/src/test/resources/ironjacamar/ironjacamar-connection-definition-empty.xml
===================================================================
--- projects/jboss-jca/trunk/common/src/test/resources/ironjacamar/ironjacamar-connection-definition-empty.xml 2011-02-14 15:49:46 UTC (rev 110664)
+++ projects/jboss-jca/trunk/common/src/test/resources/ironjacamar/ironjacamar-connection-definition-empty.xml 2011-02-14 15:53:09 UTC (rev 110665)
@@ -8,7 +8,8 @@
<pool>
</pool>
<security>
- </security>
+ <application />
+</security>
<timeout>
</timeout>
<validation>
Modified: projects/jboss-jca/trunk/common/src/test/resources/ironjacamar/ironjacamar-connection-definition-xa-empty.xml
===================================================================
--- projects/jboss-jca/trunk/common/src/test/resources/ironjacamar/ironjacamar-connection-definition-xa-empty.xml 2011-02-14 15:49:46 UTC (rev 110664)
+++ projects/jboss-jca/trunk/common/src/test/resources/ironjacamar/ironjacamar-connection-definition-xa-empty.xml 2011-02-14 15:53:09 UTC (rev 110665)
@@ -8,7 +8,8 @@
<xa-pool>
</xa-pool>
<security>
- </security>
+ <application />
+</security>
<timeout>
</timeout>
<validation>
Modified: projects/jboss-jca/trunk/common/src/test/resources/ironjacamar/ironjacamar-security-defaults.xml
===================================================================
--- projects/jboss-jca/trunk/common/src/test/resources/ironjacamar/ironjacamar-security-defaults.xml 2011-02-14 15:49:46 UTC (rev 110664)
+++ projects/jboss-jca/trunk/common/src/test/resources/ironjacamar/ironjacamar-security-defaults.xml 2011-02-14 15:53:09 UTC (rev 110665)
@@ -27,6 +27,7 @@
<max-pool-size>64</max-pool-size>
</pool>
<security>
+ <application />
</security>
<timeout>
<blocking-timeout-millis>5000</blocking-timeout-millis>
Modified: projects/jboss-jca/trunk/common/src/test/resources/ironjacamar/ironjacamar-test1.xml
===================================================================
--- projects/jboss-jca/trunk/common/src/test/resources/ironjacamar/ironjacamar-test1.xml 2011-02-14 15:49:46 UTC (rev 110664)
+++ projects/jboss-jca/trunk/common/src/test/resources/ironjacamar/ironjacamar-test1.xml 2011-02-14 15:53:09 UTC (rev 110665)
@@ -27,8 +27,7 @@
<max-pool-size>64</max-pool-size>
</pool>
<security>
- <user-name>aaa</user-name>
- <password>bbb</password>
+ <application />
</security>
<timeout>
<blocking-timeout-millis>5000</blocking-timeout-millis>
Modified: projects/jboss-jca/trunk/common/src/test/resources/ironjacamar/missing-attribute-ironjacamar.xml
===================================================================
--- projects/jboss-jca/trunk/common/src/test/resources/ironjacamar/missing-attribute-ironjacamar.xml 2011-02-14 15:49:46 UTC (rev 110664)
+++ projects/jboss-jca/trunk/common/src/test/resources/ironjacamar/missing-attribute-ironjacamar.xml 2011-02-14 15:53:09 UTC (rev 110665)
@@ -27,8 +27,7 @@
<max-pool-size>64</max-pool-size>
</pool>
<security>
- <user-name>aaa</user-name>
- <password>bbb</password>
+ <application />
</security>
<timeout>
<blocking-timeout-millis>5000</blocking-timeout-millis>
Modified: projects/jboss-jca/trunk/common/src/test/resources/ironjacamar/missing-attribute2-ironjacamar.xml
===================================================================
--- projects/jboss-jca/trunk/common/src/test/resources/ironjacamar/missing-attribute2-ironjacamar.xml 2011-02-14 15:49:46 UTC (rev 110664)
+++ projects/jboss-jca/trunk/common/src/test/resources/ironjacamar/missing-attribute2-ironjacamar.xml 2011-02-14 15:53:09 UTC (rev 110665)
@@ -27,8 +27,7 @@
<max-pool-size>64</max-pool-size>
</pool>
<security>
- <user-name>aaa</user-name>
- <password>bbb</password>
+ <application />
</security>
<timeout>
<blocking-timeout-millis>5000</blocking-timeout-millis>
Modified: projects/jboss-jca/trunk/common/src/test/resources/ironjacamar/right-element-for-xa-pool-ironjacamar.xml
===================================================================
--- projects/jboss-jca/trunk/common/src/test/resources/ironjacamar/right-element-for-xa-pool-ironjacamar.xml 2011-02-14 15:49:46 UTC (rev 110664)
+++ projects/jboss-jca/trunk/common/src/test/resources/ironjacamar/right-element-for-xa-pool-ironjacamar.xml 2011-02-14 15:53:09 UTC (rev 110665)
@@ -9,7 +9,8 @@
<xa-pool>
</xa-pool>
<security>
- </security>
+ <application />
+</security>
<timeout>
<xa-resource-timeout>100</xa-resource-timeout>
</timeout>
Modified: projects/jboss-jca/trunk/common/src/test/resources/ironjacamar/unexpected-attribute-ironjacamar.xml
===================================================================
--- projects/jboss-jca/trunk/common/src/test/resources/ironjacamar/unexpected-attribute-ironjacamar.xml 2011-02-14 15:49:46 UTC (rev 110664)
+++ projects/jboss-jca/trunk/common/src/test/resources/ironjacamar/unexpected-attribute-ironjacamar.xml 2011-02-14 15:53:09 UTC (rev 110665)
@@ -27,8 +27,7 @@
<max-pool-size>64</max-pool-size>
</pool>
<security>
- <user-name>aaa</user-name>
- <password>bbb</password>
+ <application />
</security>
<timeout>
<blocking-timeout-millis>5000</blocking-timeout-millis>
Modified: projects/jboss-jca/trunk/common/src/test/resources/ironjacamar/unexpected-attribute2-ironjacamar.xml
===================================================================
--- projects/jboss-jca/trunk/common/src/test/resources/ironjacamar/unexpected-attribute2-ironjacamar.xml 2011-02-14 15:49:46 UTC (rev 110664)
+++ projects/jboss-jca/trunk/common/src/test/resources/ironjacamar/unexpected-attribute2-ironjacamar.xml 2011-02-14 15:53:09 UTC (rev 110665)
@@ -27,8 +27,7 @@
<max-pool-size>64</max-pool-size>
</pool>
<security>
- <user-name>aaa</user-name>
- <password>bbb</password>
+ <application />
</security>
<timeout>
<blocking-timeout-millis>5000</blocking-timeout-millis>
Modified: projects/jboss-jca/trunk/common/src/test/resources/ironjacamar/unexpected-element-ironjacamar.xml
===================================================================
--- projects/jboss-jca/trunk/common/src/test/resources/ironjacamar/unexpected-element-ironjacamar.xml 2011-02-14 15:49:46 UTC (rev 110664)
+++ projects/jboss-jca/trunk/common/src/test/resources/ironjacamar/unexpected-element-ironjacamar.xml 2011-02-14 15:53:09 UTC (rev 110665)
@@ -27,8 +27,7 @@
<max-pool-size>64</max-pool-size>
</no-xa-pool>
<security>
- <user-name>aaa</user-name>
- <password>bbb</password>
+ <application />
</security>
<timeout>
<blocking-timeout-millis>5000</blocking-timeout-millis>
Modified: projects/jboss-jca/trunk/common/src/test/resources/ironjacamar/wrong-element-for-simple-pool-ironjacamar.xml
===================================================================
--- projects/jboss-jca/trunk/common/src/test/resources/ironjacamar/wrong-element-for-simple-pool-ironjacamar.xml 2011-02-14 15:49:46 UTC (rev 110664)
+++ projects/jboss-jca/trunk/common/src/test/resources/ironjacamar/wrong-element-for-simple-pool-ironjacamar.xml 2011-02-14 15:53:09 UTC (rev 110665)
@@ -9,7 +9,8 @@
<pool>
</pool>
<security>
- </security>
+ <application />
+</security>
<timeout>
<xa-resource-timeout>100</xa-resource-timeout>
</timeout>
Modified: projects/jboss-jca/trunk/common/src/test/resources/merger/ds/postgres-ds.xml
===================================================================
--- projects/jboss-jca/trunk/common/src/test/resources/merger/ds/postgres-ds.xml 2011-02-14 15:49:46 UTC (rev 110664)
+++ projects/jboss-jca/trunk/common/src/test/resources/merger/ds/postgres-ds.xml 2011-02-14 15:53:09 UTC (rev 110665)
@@ -9,6 +9,7 @@
<security>
<user-name>x</user-name>
<password>y</password>
- </security>
+
+</security>
</datasource>
</datasources>
\ No newline at end of file
Modified: projects/jboss-jca/trunk/common/src/test/resources/merger/ironjacamar-ignoring-not-enabled-connectiondefinition.xml
===================================================================
--- projects/jboss-jca/trunk/common/src/test/resources/merger/ironjacamar-ignoring-not-enabled-connectiondefinition.xml 2011-02-14 15:49:46 UTC (rev 110664)
+++ projects/jboss-jca/trunk/common/src/test/resources/merger/ironjacamar-ignoring-not-enabled-connectiondefinition.xml 2011-02-14 15:53:09 UTC (rev 110665)
@@ -26,8 +26,7 @@
<max-pool-size>64</max-pool-size>
</pool>
<security>
- <user-name>aaa</user-name>
- <password>bbb</password>
+ <application />
</security>
<timeout>
<blocking-timeout-millis>5000</blocking-timeout-millis>
Modified: projects/jboss-jca/trunk/common/src/test/resources/merger/ironjacamar-ignoring-not-matching-connectiondefinition.xml
===================================================================
--- projects/jboss-jca/trunk/common/src/test/resources/merger/ironjacamar-ignoring-not-matching-connectiondefinition.xml 2011-02-14 15:49:46 UTC (rev 110664)
+++ projects/jboss-jca/trunk/common/src/test/resources/merger/ironjacamar-ignoring-not-matching-connectiondefinition.xml 2011-02-14 15:53:09 UTC (rev 110665)
@@ -26,8 +26,7 @@
<max-pool-size>64</max-pool-size>
</pool>
<security>
- <user-name>aaa</user-name>
- <password>bbb</password>
+ <application />
</security>
<timeout>
<blocking-timeout-millis>5000</blocking-timeout-millis>
Modified: projects/jboss-jca/trunk/common/src/test/resources/merger/ironjacamar-merging-admi-obj-multiple.xml
===================================================================
--- projects/jboss-jca/trunk/common/src/test/resources/merger/ironjacamar-merging-admi-obj-multiple.xml 2011-02-14 15:49:46 UTC (rev 110664)
+++ projects/jboss-jca/trunk/common/src/test/resources/merger/ironjacamar-merging-admi-obj-multiple.xml 2011-02-14 15:53:09 UTC (rev 110665)
@@ -27,8 +27,7 @@
<max-pool-size>64</max-pool-size>
</pool>
<security>
- <user-name>aaa</user-name>
- <password>bbb</password>
+ <application />
</security>
<timeout>
<blocking-timeout-millis>5000</blocking-timeout-millis>
Modified: projects/jboss-jca/trunk/common/src/test/resources/merger/ironjacamar-merging-admi-obj-notenabled.xml
===================================================================
--- projects/jboss-jca/trunk/common/src/test/resources/merger/ironjacamar-merging-admi-obj-notenabled.xml 2011-02-14 15:49:46 UTC (rev 110664)
+++ projects/jboss-jca/trunk/common/src/test/resources/merger/ironjacamar-merging-admi-obj-notenabled.xml 2011-02-14 15:53:09 UTC (rev 110665)
@@ -27,8 +27,7 @@
<max-pool-size>64</max-pool-size>
</pool>
<security>
- <user-name>aaa</user-name>
- <password>bbb</password>
+ <application />
</security>
<timeout>
<blocking-timeout-millis>5000</blocking-timeout-millis>
Modified: projects/jboss-jca/trunk/common/src/test/resources/merger/ironjacamar-merging-admi-obj-notmatching.xml
===================================================================
--- projects/jboss-jca/trunk/common/src/test/resources/merger/ironjacamar-merging-admi-obj-notmatching.xml 2011-02-14 15:49:46 UTC (rev 110664)
+++ projects/jboss-jca/trunk/common/src/test/resources/merger/ironjacamar-merging-admi-obj-notmatching.xml 2011-02-14 15:53:09 UTC (rev 110665)
@@ -27,8 +27,7 @@
<max-pool-size>64</max-pool-size>
</pool>
<security>
- <user-name>aaa</user-name>
- <password>bbb</password>
+ <application />
</security>
<timeout>
<blocking-timeout-millis>5000</blocking-timeout-millis>
Modified: projects/jboss-jca/trunk/common/src/test/resources/merger/ironjacamar-merging-admi-obj.xml
===================================================================
--- projects/jboss-jca/trunk/common/src/test/resources/merger/ironjacamar-merging-admi-obj.xml 2011-02-14 15:49:46 UTC (rev 110664)
+++ projects/jboss-jca/trunk/common/src/test/resources/merger/ironjacamar-merging-admi-obj.xml 2011-02-14 15:53:09 UTC (rev 110665)
@@ -27,8 +27,7 @@
<max-pool-size>64</max-pool-size>
</pool>
<security>
- <user-name>aaa</user-name>
- <password>bbb</password>
+ <application />
</security>
<timeout>
<blocking-timeout-millis>5000</blocking-timeout-millis>
Modified: projects/jboss-jca/trunk/common/src/test/resources/merger/ironjacamar-merging-connectiondefinition.xml
===================================================================
--- projects/jboss-jca/trunk/common/src/test/resources/merger/ironjacamar-merging-connectiondefinition.xml 2011-02-14 15:49:46 UTC (rev 110664)
+++ projects/jboss-jca/trunk/common/src/test/resources/merger/ironjacamar-merging-connectiondefinition.xml 2011-02-14 15:53:09 UTC (rev 110665)
@@ -26,8 +26,7 @@
<max-pool-size>64</max-pool-size>
</pool>
<security>
- <user-name>aaa</user-name>
- <password>bbb</password>
+ <application />
</security>
<timeout>
<blocking-timeout-millis>5000</blocking-timeout-millis>
Modified: projects/jboss-jca/trunk/common/src/test/resources/merger/ironjacamar-merging-multiple-connectiondefinition.xml
===================================================================
--- projects/jboss-jca/trunk/common/src/test/resources/merger/ironjacamar-merging-multiple-connectiondefinition.xml 2011-02-14 15:49:46 UTC (rev 110664)
+++ projects/jboss-jca/trunk/common/src/test/resources/merger/ironjacamar-merging-multiple-connectiondefinition.xml 2011-02-14 15:53:09 UTC (rev 110665)
@@ -24,7 +24,7 @@
<max-pool-size>64</max-pool-size>
</pool>
<security>
- <password>bbb</password>
+ <application />
</security>
<timeout>
<blocking-timeout-millis>5000</blocking-timeout-millis>
@@ -36,8 +36,8 @@
<config-property name="LogConfigFile">ASAP_SAP_1_0.xml</config-property>
<config-property name="RootLogContext">ASAP_SAP_1_0</config-property>
<security>
- <user-name>aaa</user-name>
- </security>
+ <application />
+ </security>
<timeout>
<blocking-timeout-millis>5000</blocking-timeout-millis>
<idle-timeout-minutes>15</idle-timeout-minutes>
Modified: projects/jboss-jca/trunk/common/src/test/resources/resource-adapter/asapxcess-jb3.2-ra.xml
===================================================================
--- projects/jboss-jca/trunk/common/src/test/resources/resource-adapter/asapxcess-jb3.2-ra.xml 2011-02-14 15:49:46 UTC (rev 110664)
+++ projects/jboss-jca/trunk/common/src/test/resources/resource-adapter/asapxcess-jb3.2-ra.xml 2011-02-14 15:53:09 UTC (rev 110665)
@@ -34,8 +34,7 @@
<max-pool-size>64</max-pool-size>
</pool>
<security>
- <user-name>aaa</user-name>
- <password>bbb</password>
+ <application />
</security>
<timeout>
<blocking-timeout-millis>5000</blocking-timeout-millis>
Modified: projects/jboss-jca/trunk/common/src/test/resources/resource-adapter/ra-unexpected-attribute.xml
===================================================================
--- projects/jboss-jca/trunk/common/src/test/resources/resource-adapter/ra-unexpected-attribute.xml 2011-02-14 15:49:46 UTC (rev 110664)
+++ projects/jboss-jca/trunk/common/src/test/resources/resource-adapter/ra-unexpected-attribute.xml 2011-02-14 15:53:09 UTC (rev 110665)
@@ -34,8 +34,7 @@
<max-pool-size>64</max-pool-size>
</pool>
<security>
- <user-name>aaa</user-name>
- <password>bbb</password>
+ <application />
</security>
<timeout>
<blocking-timeout-millis>5000</blocking-timeout-millis>
More information about the jboss-cvs-commits
mailing list