[jboss-cvs] JBossAS SVN: r108041 - in projects/jboss-jca/trunk: common/src/main/java/org/jboss/jca/common/metadata and 15 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Sep 8 11:37:13 EDT 2010
Author: maeste
Date: 2010-09-08 11:37:11 -0400 (Wed, 08 Sep 2010)
New Revision: 108041
Added:
projects/jboss-jca/trunk/deployers/src/test/resources/ra15inoutjbossra.rar/META-INF/ironjacamar.xml
projects/jboss-jca/trunk/deployers/src/test/resources/ra15outjbossra.rar/META-INF/ironjacamar.xml
projects/jboss-jca/trunk/deployers/src/test/resources/ra15outjbossradefaultns.rar/META-INF/ironjacamar.xml
projects/jboss-jca/trunk/deployers/src/test/resources/ra16inoutjbossra.rar/META-INF/ironjacamar.xml
projects/jboss-jca/trunk/deployers/src/test/resources/ra16outjbossra.rar/META-INF/ironjacamar.xml
projects/jboss-jca/trunk/deployers/src/test/resources/ra16outjbossradefaultns.rar/META-INF/ironjacamar.xml
projects/jboss-jca/trunk/deployers/src/test/resources/ra16standard303jbossra.rar/META-INF/ironjacamar.xml
projects/jboss-jca/trunk/deployers/src/test/resources/ra16user303jbossra.rar/META-INF/ironjacamar.xml
Removed:
projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/jbossra/
projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/jbossra/
projects/jboss-jca/trunk/common/src/test/java/org/jboss/jca/common/metadata/jbossra/
projects/jboss-jca/trunk/deployers/src/test/resources/ra15inoutjbossra.rar/META-INF/jboss-ra.xml
projects/jboss-jca/trunk/deployers/src/test/resources/ra15outjbossra.rar/META-INF/jboss-ra.xml
projects/jboss-jca/trunk/deployers/src/test/resources/ra15outjbossradefaultns.rar/META-INF/jboss-ra.xml
projects/jboss-jca/trunk/deployers/src/test/resources/ra16inoutjbossra.rar/META-INF/jboss-ra.xml
projects/jboss-jca/trunk/deployers/src/test/resources/ra16outjbossra.rar/META-INF/jboss-ra.xml
projects/jboss-jca/trunk/deployers/src/test/resources/ra16outjbossradefaultns.rar/META-INF/jboss-ra.xml
projects/jboss-jca/trunk/deployers/src/test/resources/ra16standard303jbossra.rar/META-INF/jboss-ra.xml
projects/jboss-jca/trunk/deployers/src/test/resources/ra16user303jbossra.rar/META-INF/jboss-ra.xml
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/ra/common/ConnectorAbstractmpl.java
projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/ra10/Connector10Impl.java
projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/ra15/Connector15Impl.java
projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/ra16/Connector16Impl.java
projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/RADeployer.java
projects/jboss-jca/trunk/tools/findbugs/filter.xml
Log:
JBJCA-414 adding merging capabilities, integration into RADeplloyer and its test suite
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-08 15:10:53 UTC (rev 108040)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/MetadataFactory.java 2010-09-08 15:37:11 UTC (rev 108041)
@@ -27,7 +27,7 @@
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.XaDataSource;
-import org.jboss.jca.common.api.metadata.jbossra.JbossRa;
+import org.jboss.jca.common.api.metadata.ironjacamar.IronJacamar;
import org.jboss.jca.common.api.metadata.ra.AdminObject;
import org.jboss.jca.common.api.metadata.ra.AuthenticationMechanism;
import org.jboss.jca.common.api.metadata.ra.ConfigProperty;
@@ -43,7 +43,8 @@
import org.jboss.jca.common.api.metadata.ra.ResourceAdapter1516;
import org.jboss.jca.common.api.metadata.ra.SecurityPermission;
import org.jboss.jca.common.api.metadata.ra.XsdString;
-import org.jboss.jca.common.metadata.jbossra.JbossRaParser;
+import org.jboss.jca.common.api.metadata.ra.ra16.ConfigProperty16;
+import org.jboss.jca.common.metadata.ironjacamar.IronJacamarParser;
import org.jboss.jca.common.metadata.ra.RaParser;
import org.jboss.jca.common.metadata.ra.common.ConfigPropertyImpl;
import org.jboss.jca.common.metadata.ra.common.ConnectionDefinitionImpl;
@@ -52,6 +53,7 @@
import org.jboss.jca.common.metadata.ra.ra10.Connector10Impl;
import org.jboss.jca.common.metadata.ra.ra10.ResourceAdapter10Impl;
import org.jboss.jca.common.metadata.ra.ra15.Connector15Impl;
+import org.jboss.jca.common.metadata.ra.ra16.ConfigProperty16Impl;
import org.jboss.jca.common.metadata.ra.ra16.Connector16Impl;
import java.io.File;
@@ -136,11 +138,11 @@
* @return The metadata
* @exception Exception Thrown if an error occurs
*/
- public JbossRa getJBossMetaData(File root) throws Exception
+ public IronJacamar getIronJacamarMetaData(File root) throws Exception
{
- JbossRa result = null;
+ IronJacamar result = null;
- File metadataFile = new File(root, "/META-INF/jboss-ra.xml");
+ File metadataFile = new File(root, "/META-INF/ironjacamar.xml");
if (metadataFile.exists())
{
@@ -151,7 +153,7 @@
long start = System.currentTimeMillis();
input = new FileInputStream(metadataFile);
- result = (new JbossRaParser()).parse(input);
+ result = (new IronJacamarParser()).parse(input);
log.debugf("Total parse for %s took %d ms", url, (System.currentTimeMillis() - start));
@@ -174,15 +176,62 @@
/**
*
- * Create a connector from a DataSource metadata
+ * Merge ironJacamar's properties with connector's one returning a List of COnnector's properties
*
- * @param cds the datasource it is one of interface extending {@link CommonDataSource}.
- * IOW it can be both {@link DataSource} or {@link XaDataSource}
- * @param connector the connector to merge
- * @return the connector with mapped properties taken forn ds
- * @throws IllegalArgumentException if version is't 1.0, 1.5 or 1.6
- * @throws Exception in case of error
+ * @param ijProperties ironjacamar's extension style properties
+ * @param original standard connector's properties
+ * @return merged standard connector's properties (ironjacamar's setting overwrite the standard's one.
+ * No new property is added)
*/
+ public List<ConfigProperty> mergeConfigProperties(Map<String, String> ijProperties,
+ List<? extends ConfigProperty> original)
+ {
+ List<ConfigProperty> mergedProperties = new ArrayList<ConfigProperty>(original.size());
+ for (ConfigProperty c : original)
+ {
+ if (ijProperties.containsKey(c.getConfigPropertyName().getValue()))
+ {
+ if (original instanceof ConfigProperty16)
+ {
+ ConfigProperty16 c16 = (ConfigProperty16) c;
+ XsdString newValue = new XsdString(ijProperties.get(c.getConfigPropertyName().getValue()), c
+ .getConfigPropertyName().getId());
+ ConfigProperty16 newProp = new ConfigProperty16Impl(c.getDescriptions(), c.getConfigPropertyName(),
+ c.getConfigPropertyName(), newValue,
+ c16.getConfigPropertyIgnore(),
+ c16.getConfigPropertySupportsDynamicUpdates(),
+ c16.getConfigPropertyConfidential(), c.getId());
+ mergedProperties.add(newProp);
+ }
+ else
+ {
+ XsdString newValue = new XsdString(ijProperties.get(c.getConfigPropertyName().getValue()), c
+ .getConfigPropertyName().getId());
+ ConfigProperty newProp = new ConfigPropertyImpl(c.getDescriptions(), c.getConfigPropertyName(),
+ c.getConfigPropertyName(), newValue, c.getId());
+ mergedProperties.add(newProp);
+ }
+
+ }
+ else
+ {
+ mergedProperties.add(c);
+ }
+ }
+ return mergedProperties;
+ }
+
+ /**
+ *
+ * Merge a connector with a DataSource metadata
+ *
+ * @param cds the datasource it is one of interface extending {@link CommonDataSource}.
+ * IOW it can be both {@link DataSource} or {@link XaDataSource}
+ * @param connector the connector to merge
+ * @return the connector with mapped properties taken forn ds
+ * @throws IllegalArgumentException if version is't 1.0, 1.5 or 1.6
+ * @throws Exception in case of error
+ */
public Connector mergeConnectorAndDs(CommonDataSource cds, Connector connector)
throws IllegalArgumentException, Exception
{
@@ -192,118 +241,138 @@
}
else
{
+ return mergeConnectorWithProperties(connector, createConfigProperties(cds, extractProperties(connector)),
+ null);
+ }
+ }
- XsdString managedconnectionfactoryClass = null;
+ private Connector mergeConnectorWithProperties(Connector connector,
+ List<ConfigProperty> connectioDefProperties, List<ConfigProperty> raConfigProperties)
+ throws IllegalArgumentException, Exception
+ {
- String id = null;
+ XsdString managedconnectionfactoryClass = null;
- XsdString connectionfactoryImplClass = null;
- XsdString connectionfactoryInterface = null;
- XsdString connectionImplClass = null;
- XsdString connectionInterface = null;
- List<AuthenticationMechanism> authenticationMechanism = null;
- boolean reauthenticationSupport = false;
- List<SecurityPermission> securityPermissions = null;
+ String id = null;
- XsdString vendorName = null;
- List<LocalizedXsdString> description = null;
- XsdString resourceadapterVersion = null;
- String moduleName = null;
- XsdString eisType = null;
- LicenseType license = null;
- List<LocalizedXsdString> displayNames = null;
- List<Icon> icons = null;
- List<AdminObject> adminobjects = null;
- TransactionSupportEnum transactionSupport = null;
+ XsdString connectionfactoryImplClass = null;
+ XsdString connectionfactoryInterface = null;
+ XsdString connectionImplClass = null;
+ XsdString connectionInterface = null;
+ List<AuthenticationMechanism> authenticationMechanism = null;
+ boolean reauthenticationSupport = false;
+ List<SecurityPermission> securityPermissions = null;
- if (connector.getVersion() == Version.V_10)
+ XsdString vendorName = null;
+ List<LocalizedXsdString> description = null;
+ XsdString resourceadapterVersion = null;
+ String moduleName = null;
+ XsdString eisType = null;
+ LicenseType license = null;
+ List<LocalizedXsdString> displayNames = null;
+ List<Icon> icons = null;
+ List<AdminObject> adminobjects = null;
+ TransactionSupportEnum transactionSupport = null;
+
+ if (connector.getVersion() == Version.V_10)
+ {
+ if (raConfigProperties != null)
{
+ if (connectioDefProperties == null)
+ {
+ connectioDefProperties = raConfigProperties;
+ }
+ else
+ {
+ connectioDefProperties.addAll(raConfigProperties);
+ }
+ }
+ ResourceAdapter resourceadapter = new ResourceAdapter10Impl(managedconnectionfactoryClass,
+ connectionfactoryInterface,
+ connectionfactoryImplClass,
+ connectionInterface, connectionImplClass,
+ transactionSupport, authenticationMechanism,
+ connectioDefProperties,
+ reauthenticationSupport, securityPermissions,
+ id);
- List<ConfigProperty> configProperties = createConfigProperties(cds, connector.getResourceadapter()
- .getConfigProperties());
+ Connector newConnector = new Connector10Impl(moduleName, vendorName, eisType, resourceadapterVersion,
+ license, resourceadapter, description, displayNames, icons,
+ id);
- ResourceAdapter resourceadapter = new ResourceAdapter10Impl(managedconnectionfactoryClass,
- connectionfactoryInterface,
- connectionfactoryImplClass,
- connectionInterface, connectionImplClass,
- transactionSupport,
- authenticationMechanism, configProperties,
- reauthenticationSupport,
- securityPermissions, id);
+ return newConnector.merge(connector);
+ }
+ else
+ {
+ List<ConnectionDefinition> connectionDefinitions = new ArrayList<ConnectionDefinition>(1);
+ ConnectionDefinition connectionDefinition = new ConnectionDefinitionImpl(managedconnectionfactoryClass,
+ connectioDefProperties,
+ connectionfactoryInterface,
+ connectionfactoryImplClass,
+ connectionInterface,
+ connectionImplClass, id);
+ connectionDefinitions.add(connectionDefinition);
+ OutboundResourceAdapter outboundResourceadapter = new OutboundResourceAdapterImpl(
+ connectionDefinitions,
+ transactionSupport,
+ authenticationMechanism,
+ reauthenticationSupport,
+ id);
+ String resourceadapterClass = null;
+ InboundResourceAdapter inboundResourceadapter = null;
+ ResourceAdapter1516 resourceadapter = new ResourceAdapter1516Impl(resourceadapterClass,
+ raConfigProperties,
+ outboundResourceadapter,
+ inboundResourceadapter, adminobjects,
+ securityPermissions, id);
- Connector newConnector = new Connector10Impl(moduleName, vendorName, eisType, resourceadapterVersion,
- license, resourceadapter, description, displayNames,
- icons, id);
+ if (connector.getVersion() == Version.V_16)
+ {
+ List<String> requiredWorkContexts = null;
+ boolean metadataComplete = false;
+ Connector newConnector = new Connector16Impl(moduleName, vendorName, eisType, resourceadapterVersion,
+ license, resourceadapter, requiredWorkContexts,
+ metadataComplete, description, displayNames, icons, id);
+
return newConnector.merge(connector);
}
- else
+ else if (connector.getVersion() == Version.V_15)
{
- List<? extends ConfigProperty> originalProperties = null;
- if (connector.getResourceadapter() != null &&
- connector.getResourceadapter() instanceof ResourceAdapter1516)
- {
- ResourceAdapter1516 ra1516 = ((ResourceAdapter1516) connector.getResourceadapter());
- if (ra1516.getOutboundResourceadapter() != null &&
- ra1516.getOutboundResourceadapter().getConnectionDefinitions() != null)
- {
- originalProperties = ra1516.getOutboundResourceadapter().getConnectionDefinitions().get(0)
- .getConfigProperties();
- }
- }
+ Connector newConnector = new Connector15Impl(vendorName, eisType, resourceadapterVersion, license,
+ resourceadapter, description, displayNames, icons, id);
- List<ConfigProperty> configProperties = createConfigProperties(cds, originalProperties);
+ return newConnector.merge(connector);
+ }
+ else
+ throw new IllegalArgumentException("version= " + connector.getVersion().name());
+ }
- List<ConnectionDefinition> connectionDefinitions = new ArrayList<ConnectionDefinition>(1);
- ConnectionDefinition connectionDefinition = new ConnectionDefinitionImpl(
- managedconnectionfactoryClass,
- configProperties,
- connectionfactoryInterface,
- connectionfactoryImplClass,
- connectionInterface,
- connectionImplClass, id);
- connectionDefinitions.add(connectionDefinition);
- OutboundResourceAdapter outboundResourceadapter = new OutboundResourceAdapterImpl(
- 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);
+ }
- if (connector.getVersion() == Version.V_16)
- {
- List<String> requiredWorkContexts = null;
- boolean metadataComplete = false;
+ private List<? extends ConfigProperty> extractProperties(Connector connector)
+ {
+ List<? extends ConfigProperty> originalProperties = null;
+ if (connector.getVersion() == Version.V_10)
+ {
+ originalProperties = connector.getResourceadapter().getConfigProperties();
+ }
+ else
+ {
- Connector newConnector = new Connector16Impl(moduleName, vendorName, eisType,
- resourceadapterVersion, license, resourceadapter,
- requiredWorkContexts, metadataComplete, description,
- displayNames, icons, id);
-
- return newConnector.merge(connector);
- }
- else if (connector.getVersion() == Version.V_15)
+ if (connector.getResourceadapter() != null &&
+ connector.getResourceadapter() instanceof ResourceAdapter1516)
+ {
+ ResourceAdapter1516 ra1516 = ((ResourceAdapter1516) connector.getResourceadapter());
+ if (ra1516.getOutboundResourceadapter() != null &&
+ ra1516.getOutboundResourceadapter().getConnectionDefinitions() != null)
{
- Connector newConnector = new Connector15Impl(vendorName, eisType, resourceadapterVersion, license,
- resourceadapter, description, displayNames, icons, id);
-
- return newConnector.merge(connector);
+ originalProperties = ra1516.getOutboundResourceadapter().getConnectionDefinitions().get(0)
+ .getConfigProperties();
}
- else
- throw new IllegalArgumentException("version= " + connector.getVersion().name());
}
-
}
-
+ return originalProperties;
}
private static List<ConfigProperty> createConfigProperties(CommonDataSource cds,
Modified: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/common/ConnectorAbstractmpl.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/common/ConnectorAbstractmpl.java 2010-09-08 15:10:53 UTC (rev 108040)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/common/ConnectorAbstractmpl.java 2010-09-08 15:37:11 UTC (rev 108041)
@@ -22,26 +22,17 @@
package org.jboss.jca.common.metadata.ra.common;
import org.jboss.jca.common.api.metadata.CopyableMetaData;
-import org.jboss.jca.common.api.metadata.jbossra.JbossRa;
-import org.jboss.jca.common.api.metadata.ra.ConfigProperty;
import org.jboss.jca.common.api.metadata.ra.Connector;
import org.jboss.jca.common.api.metadata.ra.Icon;
import org.jboss.jca.common.api.metadata.ra.LicenseType;
import org.jboss.jca.common.api.metadata.ra.LocalizedXsdString;
import org.jboss.jca.common.api.metadata.ra.MergeableMetadata;
-import org.jboss.jca.common.api.metadata.ra.OverrideElementAttribute;
-import org.jboss.jca.common.api.metadata.ra.RaConfigProperty;
import org.jboss.jca.common.api.metadata.ra.ResourceAdapter;
-import org.jboss.jca.common.api.metadata.ra.ResourceAdapter1516;
import org.jboss.jca.common.api.metadata.ra.XsdString;
-import org.jboss.jca.common.api.metadata.ra.ra10.Connector10;
-import org.jboss.jca.common.api.metadata.ra.ra16.Activationspec16;
-import org.jboss.jca.common.api.metadata.ra.ra16.Connector16;
import org.jboss.jca.common.api.validator.ValidateException;
import java.util.ArrayList;
import java.util.Collections;
-import java.util.Iterator;
import java.util.List;
/**
@@ -326,144 +317,12 @@
public Connector merge(MergeableMetadata<?> inputMd) throws Exception
{
{
- if (inputMd instanceof JbossRa)
- {
- mergeJbossMetaData((JbossRa) inputMd);
- }
-
return this;
}
}
- /**
- * Merge specification metadata with vendor metadata
- *
- * @param jmd the vendor metadata
- */
- @SuppressWarnings("unchecked")
- protected void mergeJbossMetaData(JbossRa jmd)
- {
- if (jmd != null)
- {
- /*
- <xs:restriction base="javaee:string">
- <xs:enumeration value="connection-definition"/>
- <xs:enumeration value="resourceadapter"/>
- <xs:enumeration value="activationspec"/>
- <xs:enumeration value="adminobject"/>
- </xs:restriction>
- */
- List<RaConfigProperty<?>> props = jmd.getRaConfigProperties();
-
- List<ConfigProperty> append = null;
-
- if (props != null)
- {
- for (RaConfigProperty<?> rcmd : props)
- {
- List<? extends ConfigProperty> listConfigProp = null;
- OverrideElementAttribute override = rcmd.getOverrideElementAttribute();
- if (override == OverrideElementAttribute.UNKNOWN
- || override == OverrideElementAttribute.RESOURCE_ADAPTER)
- {
- if (this.getResourceadapter() != null)
- {
- listConfigProp = this.getResourceadapter().getConfigProperties();
- }
- }
- else if (override == OverrideElementAttribute.CONNECTION_DEFINITION)
- {
- if (this.getResourceadapter() != null
- && !(this instanceof Connector10)
- && ((ResourceAdapter1516) this.getResourceadapter()).getOutboundResourceadapter() != null
- && ((ResourceAdapter1516) this.getResourceadapter()).getOutboundResourceadapter()
- .getConnectionDefinitions() != null
- && ((ResourceAdapter1516) this.getResourceadapter()).getOutboundResourceadapter()
- .getConnectionDefinitions().size() > 0
- && ((ResourceAdapter1516) this.getResourceadapter()).getOutboundResourceadapter()
- .getConnectionDefinitions().get(0) != null)
- {
- listConfigProp = ((ResourceAdapter1516) this.getResourceadapter()).getOutboundResourceadapter()
- .getConnectionDefinitions().get(0).getConfigProperties();
- }
- }
- else if (override == OverrideElementAttribute.ACTIVATIONSPEC)
- {
- if (this.getResourceadapter() != null
- && (this instanceof Connector16)
- && ((ResourceAdapter1516) this.getResourceadapter()).getInboundResourceadapter() != null
- && ((ResourceAdapter1516) this.getResourceadapter()).getInboundResourceadapter()
- .getMessageadapter() != null
- && ((ResourceAdapter1516) this.getResourceadapter()).getInboundResourceadapter()
- .getMessageadapter().getMessagelisteners() != null
- && ((ResourceAdapter1516) this.getResourceadapter()).getInboundResourceadapter()
- .getMessageadapter().getMessagelisteners().size() > 0
- && ((ResourceAdapter1516) this.getResourceadapter()).getInboundResourceadapter()
- .getMessageadapter().getMessagelisteners().get(0) != null
- && ((ResourceAdapter1516) this.getResourceadapter()).getInboundResourceadapter()
- .getMessageadapter().getMessagelisteners().get(0).getActivationspec() != null)
- {
- listConfigProp = ((Activationspec16) ((ResourceAdapter1516) this.getResourceadapter())
- .getInboundResourceadapter()
- .getMessageadapter().getMessagelisteners().get(0).getActivationspec()).getConfigProperties();
- }
- }
- else if (override == OverrideElementAttribute.ADMINOBJECT)
- {
- if (this.getResourceadapter() != null
- && !(this instanceof Connector10)
- && ((ResourceAdapter1516) this.getResourceadapter()).getAdminObjects() != null
- && ((ResourceAdapter1516) this.getResourceadapter()).getAdminObjects().size() > 0
- && ((ResourceAdapter1516) this.getResourceadapter()).getAdminObjects().get(0) != null)
- {
- listConfigProp = ((ResourceAdapter1516) this.getResourceadapter()).getAdminObjects().get(0)
- .getConfigProperties();
- }
- }
-
- boolean found = false;
-
- if (listConfigProp != null)
- {
- Iterator<? extends ConfigProperty> it = listConfigProp.iterator();
-
- while (!found && it.hasNext())
- {
- ConfigProperty cpmd = it.next();
- if (cpmd.getConfigPropertyName().getValue().equals(rcmd.getName())
- && cpmd.getConfigPropertyType().getValue().equals(rcmd.getTypeName()))
- {
- found = true;
- }
- }
- }
-
- if (!found)
- {
- if (append == null)
- append = new ArrayList<ConfigProperty>();
-
- ConfigProperty cpmd = new ConfigPropertyImpl(null, new XsdString(rcmd.getName(), null),
- new XsdString(
- rcmd.getTypeName(), null), new XsdString(rcmd.getValue().toString(), null), null);
-
- append.add(cpmd);
- }
- }
-
- if (append != null)
- {
- for (ConfigProperty cpmd : append)
- {
- ((List<ConfigProperty>) this.getResourceadapter().getConfigProperties()).add(cpmd);
- }
- }
- }
- }
- }
-
@Override
public abstract CopyableMetaData copy();
Modified: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/ra10/Connector10Impl.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/ra10/Connector10Impl.java 2010-09-08 15:10:53 UTC (rev 108040)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/ra10/Connector10Impl.java 2010-09-08 15:37:11 UTC (rev 108041)
@@ -24,7 +24,6 @@
import org.jboss.jca.common.api.metadata.CopyUtil;
import org.jboss.jca.common.api.metadata.CopyableMetaData;
import org.jboss.jca.common.api.metadata.MergeUtil;
-import org.jboss.jca.common.api.metadata.jbossra.JbossRa;
import org.jboss.jca.common.api.metadata.ra.Connector;
import org.jboss.jca.common.api.metadata.ra.Icon;
import org.jboss.jca.common.api.metadata.ra.LicenseType;
@@ -157,11 +156,6 @@
@Override
public Connector merge(MergeableMetadata<?> inputMd) throws Exception
{
- if (inputMd instanceof JbossRa)
- {
- mergeJbossMetaData((JbossRa) inputMd);
- return this;
- }
if (inputMd instanceof Connector10Impl)
{
Modified: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/ra15/Connector15Impl.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/ra15/Connector15Impl.java 2010-09-08 15:10:53 UTC (rev 108040)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/ra15/Connector15Impl.java 2010-09-08 15:37:11 UTC (rev 108041)
@@ -24,7 +24,6 @@
import org.jboss.jca.common.api.metadata.CopyUtil;
import org.jboss.jca.common.api.metadata.CopyableMetaData;
import org.jboss.jca.common.api.metadata.MergeUtil;
-import org.jboss.jca.common.api.metadata.jbossra.JbossRa;
import org.jboss.jca.common.api.metadata.ra.Connector;
import org.jboss.jca.common.api.metadata.ra.Icon;
import org.jboss.jca.common.api.metadata.ra.LicenseType;
@@ -144,11 +143,6 @@
@Override
public Connector merge(MergeableMetadata<?> inputMd) throws Exception
{
- if (inputMd instanceof JbossRa)
- {
- mergeJbossMetaData((JbossRa) inputMd);
- return this;
- }
if (inputMd instanceof Connector15Impl)
{
Modified: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/ra16/Connector16Impl.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/ra16/Connector16Impl.java 2010-09-08 15:10:53 UTC (rev 108040)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/ra16/Connector16Impl.java 2010-09-08 15:37:11 UTC (rev 108041)
@@ -24,7 +24,6 @@
import org.jboss.jca.common.api.metadata.CopyUtil;
import org.jboss.jca.common.api.metadata.CopyableMetaData;
import org.jboss.jca.common.api.metadata.MergeUtil;
-import org.jboss.jca.common.api.metadata.jbossra.JbossRa;
import org.jboss.jca.common.api.metadata.ra.Connector;
import org.jboss.jca.common.api.metadata.ra.Icon;
import org.jboss.jca.common.api.metadata.ra.LicenseType;
@@ -193,11 +192,6 @@
@Override
public Connector merge(MergeableMetadata<?> inputMd) throws Exception
{
- if (inputMd instanceof JbossRa)
- {
- mergeJbossMetaData((JbossRa) inputMd);
- return this;
- }
if (inputMd instanceof Connector16Impl)
{
Modified: projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/RADeployer.java
===================================================================
--- projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/RADeployer.java 2010-09-08 15:10:53 UTC (rev 108040)
+++ projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/RADeployer.java 2010-09-08 15:37:11 UTC (rev 108041)
@@ -25,9 +25,7 @@
import org.jboss.jca.common.annotations.Annotations;
import org.jboss.jca.common.annotations.repository.papaki.AnnotationScannerFactory;
import org.jboss.jca.common.api.metadata.common.TransactionSupportEnum;
-import org.jboss.jca.common.api.metadata.jbossra.JbossRa;
-import org.jboss.jca.common.api.metadata.jbossra.jbossra20.BeanValidationGroup;
-import org.jboss.jca.common.api.metadata.jbossra.jbossra20.JbossRa20;
+import org.jboss.jca.common.api.metadata.ironjacamar.IronJacamar;
import org.jboss.jca.common.api.metadata.ra.AdminObject;
import org.jboss.jca.common.api.metadata.ra.ConfigProperty;
import org.jboss.jca.common.api.metadata.ra.ConnectionDefinition;
@@ -107,6 +105,7 @@
* Deployer order
* @return The deployment
*/
+ @Override
public int getOrder()
{
return Integer.MIN_VALUE;
@@ -119,6 +118,7 @@
* @return The deployment
* @exception DeployException Thrown if an error occurs during deployment
*/
+ @SuppressWarnings("rawtypes")
@Override
public synchronized Deployment deploy(URL url, ClassLoader parent) throws DeployException
{
@@ -167,7 +167,7 @@
// Parse metadata
MetadataFactory metadataFactory = new MetadataFactory();
Connector cmd = metadataFactory.getStandardMetaData(root);
- JbossRa jrmd = metadataFactory.getJBossMetaData(root);
+ IronJacamar ijmd = metadataFactory.getIronJacamarMetaData(root);
// Annotation scanning
Annotations annotator = new Annotations();
@@ -179,7 +179,8 @@
cmd.validate();
// Merge metadata
- cmd.merge(jrmd);
+ //TODO: merge ironjacamar with connector properties. Select the right list of properties
+ // and use MetadataFavtory.mergeConfigProperties(Map<String, String>, List<? extends ConfigProperty> )
// Notify regarding license terms
if (cmd != null && cmd.getLicense() != null && cmd.getLicense().isLicenseRequired())
@@ -584,20 +585,14 @@
// Bean validation
if (getConfiguration().getBeanValidation())
{
- JbossRa20 jrmd20 = null;
+
List<Class> groupsClasses = null;
- if (jrmd instanceof JbossRa20)
+ if (ijmd != null && ijmd.getBeanValidationGroups() != null &&
+ ijmd.getBeanValidationGroups().size() > 0)
{
- jrmd20 = (JbossRa20) jrmd;
- }
-
- if (jrmd20 != null && jrmd20.getBeanValidationGroups() != null &&
- jrmd20.getBeanValidationGroups().size() > 0)
- {
- BeanValidationGroup bvGroups = jrmd20.getBeanValidationGroups().get(0);
groupsClasses = new ArrayList<Class>();
- for (String group : bvGroups.getBeanValidationGroup())
+ for (String group : ijmd.getBeanValidationGroups())
{
groupsClasses.add(Class.forName(group, true, cl));
}
@@ -618,10 +613,9 @@
{
String bootstrapIdentifier = null;
- if (jrmd != null && jrmd instanceof JbossRa20)
+ if (ijmd != null)
{
- JbossRa20 jrmd20 = (JbossRa20) jrmd;
- bootstrapIdentifier = jrmd20.getBootstrapContext();
+ bootstrapIdentifier = ijmd.getBootstrapContext();
}
startContext(resourceAdapter, bootstrapIdentifier);
Added: projects/jboss-jca/trunk/deployers/src/test/resources/ra15inoutjbossra.rar/META-INF/ironjacamar.xml
===================================================================
--- projects/jboss-jca/trunk/deployers/src/test/resources/ra15inoutjbossra.rar/META-INF/ironjacamar.xml (rev 0)
+++ projects/jboss-jca/trunk/deployers/src/test/resources/ra15inoutjbossra.rar/META-INF/ironjacamar.xml 2010-09-08 15:37:11 UTC (rev 108041)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- $Id $ -->
+<ironjacamar xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:noNamespaceSchemaLocation="../../../../../../common/src/main/resources/schema/ironjacamar_1_0.xsd">
+ <config-property name="StringRAR">XMLOVERRIDE</config-property>
+</ironjacamar>
\ No newline at end of file
Deleted: projects/jboss-jca/trunk/deployers/src/test/resources/ra15inoutjbossra.rar/META-INF/jboss-ra.xml
===================================================================
--- projects/jboss-jca/trunk/deployers/src/test/resources/ra15inoutjbossra.rar/META-INF/jboss-ra.xml 2010-09-08 15:10:53 UTC (rev 108040)
+++ projects/jboss-jca/trunk/deployers/src/test/resources/ra15inoutjbossra.rar/META-INF/jboss-ra.xml 2010-09-08 15:37:11 UTC (rev 108041)
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- $Id $ -->
-
-<jboss-ra xmlns="http://www.jboss.org/schema/ra"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.jboss.org/schema/ra
- http://www.jboss.org/schema/jboss-ra_1_0.xsd">
- <ra-config-property>
- <ra-config-property-name>StringRAR</ra-config-property-name>
- <ra-config-property-type>java.lang.String</ra-config-property-type>
- <ra-config-property-value>XMLOVERRIDE</ra-config-property-value>
- </ra-config-property>
-</jboss-ra>
\ No newline at end of file
Added: projects/jboss-jca/trunk/deployers/src/test/resources/ra15outjbossra.rar/META-INF/ironjacamar.xml
===================================================================
--- projects/jboss-jca/trunk/deployers/src/test/resources/ra15outjbossra.rar/META-INF/ironjacamar.xml (rev 0)
+++ projects/jboss-jca/trunk/deployers/src/test/resources/ra15outjbossra.rar/META-INF/ironjacamar.xml 2010-09-08 15:37:11 UTC (rev 108041)
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- $Id $ -->
+
+<ironjacamar xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:noNamespaceSchemaLocation="../../../../../../common/src/main/resources/schema/ironjacamar_1_0.xsd">
+
+ <config-property name="StringRAR">XMLOVERRIDE</config-property>
+
+</ironjacamar>
\ No newline at end of file
Deleted: projects/jboss-jca/trunk/deployers/src/test/resources/ra15outjbossra.rar/META-INF/jboss-ra.xml
===================================================================
--- projects/jboss-jca/trunk/deployers/src/test/resources/ra15outjbossra.rar/META-INF/jboss-ra.xml 2010-09-08 15:10:53 UTC (rev 108040)
+++ projects/jboss-jca/trunk/deployers/src/test/resources/ra15outjbossra.rar/META-INF/jboss-ra.xml 2010-09-08 15:37:11 UTC (rev 108041)
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- $Id $ -->
-
-<jboss-ra xmlns="http://www.jboss.org/schema/ra"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.jboss.org/schema/ra
- http://www.jboss.org/schema/jboss-ra_1_0.xsd">
- <ra-config-property>
- <ra-config-property-name>StringRAR</ra-config-property-name>
- <ra-config-property-type>java.lang.String</ra-config-property-type>
- <ra-config-property-value>XMLOVERRIDE</ra-config-property-value>
- </ra-config-property>
-</jboss-ra>
\ No newline at end of file
Added: projects/jboss-jca/trunk/deployers/src/test/resources/ra15outjbossradefaultns.rar/META-INF/ironjacamar.xml
===================================================================
--- projects/jboss-jca/trunk/deployers/src/test/resources/ra15outjbossradefaultns.rar/META-INF/ironjacamar.xml (rev 0)
+++ projects/jboss-jca/trunk/deployers/src/test/resources/ra15outjbossradefaultns.rar/META-INF/ironjacamar.xml 2010-09-08 15:37:11 UTC (rev 108041)
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- $Id $ -->
+
+<ironjacamar xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:noNamespaceSchemaLocation="../../../../../../common/src/main/resources/schema/ironjacamar_1_0.xsd">
+
+ <config-property name="StringRAR">XMLOVERRIDE</config-property>
+
+</ironjacamar>
\ No newline at end of file
Deleted: projects/jboss-jca/trunk/deployers/src/test/resources/ra15outjbossradefaultns.rar/META-INF/jboss-ra.xml
===================================================================
--- projects/jboss-jca/trunk/deployers/src/test/resources/ra15outjbossradefaultns.rar/META-INF/jboss-ra.xml 2010-09-08 15:10:53 UTC (rev 108040)
+++ projects/jboss-jca/trunk/deployers/src/test/resources/ra15outjbossradefaultns.rar/META-INF/jboss-ra.xml 2010-09-08 15:37:11 UTC (rev 108041)
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- $Id $ -->
-
-<jboss-ra>
- <ra-config-property>
- <ra-config-property-name>StringRAR</ra-config-property-name>
- <ra-config-property-type>java.lang.String</ra-config-property-type>
- <ra-config-property-value>XMLOVERRIDE</ra-config-property-value>
- </ra-config-property>
-</jboss-ra>
\ No newline at end of file
Added: projects/jboss-jca/trunk/deployers/src/test/resources/ra16inoutjbossra.rar/META-INF/ironjacamar.xml
===================================================================
--- projects/jboss-jca/trunk/deployers/src/test/resources/ra16inoutjbossra.rar/META-INF/ironjacamar.xml (rev 0)
+++ projects/jboss-jca/trunk/deployers/src/test/resources/ra16inoutjbossra.rar/META-INF/ironjacamar.xml 2010-09-08 15:37:11 UTC (rev 108041)
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- $Id $ -->
+
+<ironjacamar xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:noNamespaceSchemaLocation="../../../../../../common/src/main/resources/schema/ironjacamar_1_0.xsd">
+
+ <config-property name="StringRAR">XMLOVERRIDE</config-property>
+
+</ironjacamar>
\ No newline at end of file
Deleted: projects/jboss-jca/trunk/deployers/src/test/resources/ra16inoutjbossra.rar/META-INF/jboss-ra.xml
===================================================================
--- projects/jboss-jca/trunk/deployers/src/test/resources/ra16inoutjbossra.rar/META-INF/jboss-ra.xml 2010-09-08 15:10:53 UTC (rev 108040)
+++ projects/jboss-jca/trunk/deployers/src/test/resources/ra16inoutjbossra.rar/META-INF/jboss-ra.xml 2010-09-08 15:37:11 UTC (rev 108041)
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- $Id $ -->
-
-<jboss-ra xmlns="http://www.jboss.org/schema/ra"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.jboss.org/schema/ra
- http://www.jboss.org/schema/jboss-ra_1_0.xsd">
- <ra-config-property>
- <ra-config-property-name>StringRAR</ra-config-property-name>
- <ra-config-property-type>java.lang.String</ra-config-property-type>
- <ra-config-property-value>XMLOVERRIDE</ra-config-property-value>
- </ra-config-property>
-</jboss-ra>
\ No newline at end of file
Added: projects/jboss-jca/trunk/deployers/src/test/resources/ra16outjbossra.rar/META-INF/ironjacamar.xml
===================================================================
--- projects/jboss-jca/trunk/deployers/src/test/resources/ra16outjbossra.rar/META-INF/ironjacamar.xml (rev 0)
+++ projects/jboss-jca/trunk/deployers/src/test/resources/ra16outjbossra.rar/META-INF/ironjacamar.xml 2010-09-08 15:37:11 UTC (rev 108041)
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- $Id $ -->
+
+<ironjacamar xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:noNamespaceSchemaLocation="../../../../../../common/src/main/resources/schema/ironjacamar_1_0.xsd">
+
+ <config-property name="StringRAR">XMLOVERRIDE</config-property>
+
+</ironjacamar>
\ No newline at end of file
Deleted: projects/jboss-jca/trunk/deployers/src/test/resources/ra16outjbossra.rar/META-INF/jboss-ra.xml
===================================================================
--- projects/jboss-jca/trunk/deployers/src/test/resources/ra16outjbossra.rar/META-INF/jboss-ra.xml 2010-09-08 15:10:53 UTC (rev 108040)
+++ projects/jboss-jca/trunk/deployers/src/test/resources/ra16outjbossra.rar/META-INF/jboss-ra.xml 2010-09-08 15:37:11 UTC (rev 108041)
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- $Id $ -->
-
-<jboss-ra xmlns="http://www.jboss.org/schema/ra"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.jboss.org/schema/ra
- http://www.jboss.org/schema/jboss-ra_1_0.xsd">
- <ra-config-property>
- <ra-config-property-name>StringRAR</ra-config-property-name>
- <ra-config-property-type>java.lang.String</ra-config-property-type>
- <ra-config-property-value>XMLOVERRIDE</ra-config-property-value>
- </ra-config-property>
-</jboss-ra>
\ No newline at end of file
Added: projects/jboss-jca/trunk/deployers/src/test/resources/ra16outjbossradefaultns.rar/META-INF/ironjacamar.xml
===================================================================
--- projects/jboss-jca/trunk/deployers/src/test/resources/ra16outjbossradefaultns.rar/META-INF/ironjacamar.xml (rev 0)
+++ projects/jboss-jca/trunk/deployers/src/test/resources/ra16outjbossradefaultns.rar/META-INF/ironjacamar.xml 2010-09-08 15:37:11 UTC (rev 108041)
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- $Id $ -->
+
+<ironjacamar xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:noNamespaceSchemaLocation="../../../../../../common/src/main/resources/schema/ironjacamar_1_0.xsd">
+
+ <config-property name="StringRAR">XMLOVERRIDE</config-property>
+
+</ironjacamar>
\ No newline at end of file
Deleted: projects/jboss-jca/trunk/deployers/src/test/resources/ra16outjbossradefaultns.rar/META-INF/jboss-ra.xml
===================================================================
--- projects/jboss-jca/trunk/deployers/src/test/resources/ra16outjbossradefaultns.rar/META-INF/jboss-ra.xml 2010-09-08 15:10:53 UTC (rev 108040)
+++ projects/jboss-jca/trunk/deployers/src/test/resources/ra16outjbossradefaultns.rar/META-INF/jboss-ra.xml 2010-09-08 15:37:11 UTC (rev 108041)
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- $Id $ -->
-
-<jboss-ra>
- <ra-config-property>
- <ra-config-property-name>StringRAR</ra-config-property-name>
- <ra-config-property-type>java.lang.String</ra-config-property-type>
- <ra-config-property-value>XMLOVERRIDE</ra-config-property-value>
- </ra-config-property>
-</jboss-ra>
\ No newline at end of file
Added: projects/jboss-jca/trunk/deployers/src/test/resources/ra16standard303jbossra.rar/META-INF/ironjacamar.xml
===================================================================
--- projects/jboss-jca/trunk/deployers/src/test/resources/ra16standard303jbossra.rar/META-INF/ironjacamar.xml (rev 0)
+++ projects/jboss-jca/trunk/deployers/src/test/resources/ra16standard303jbossra.rar/META-INF/ironjacamar.xml 2010-09-08 15:37:11 UTC (rev 108041)
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ironjacamar xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../common/src/main/resources/schema/ironjacamar_1_0.xsd">
+ <config-property name="myIntProperty">8</config-property>
+ <bean-validation-groups>
+ <bean-validation-group>org.jboss.jca.test.deployers.spec.rars.ra16standard303jbossra.FirstStep</bean-validation-group>
+ <bean-validation-group>org.jboss.jca.test.deployers.spec.rars.ra16standard303jbossra.SecondStep</bean-validation-group>
+ </bean-validation-groups>
+ <connection-definitions>
+ <connection-definition class-name="a">
+ <config-property name="myStringProperty">newJCA</config-property>
+ </connection-definition>
+ </connection-definitions>
+</ironjacamar>
\ No newline at end of file
Deleted: projects/jboss-jca/trunk/deployers/src/test/resources/ra16standard303jbossra.rar/META-INF/jboss-ra.xml
===================================================================
--- projects/jboss-jca/trunk/deployers/src/test/resources/ra16standard303jbossra.rar/META-INF/jboss-ra.xml 2010-09-08 15:10:53 UTC (rev 108040)
+++ projects/jboss-jca/trunk/deployers/src/test/resources/ra16standard303jbossra.rar/META-INF/jboss-ra.xml 2010-09-08 15:37:11 UTC (rev 108041)
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- $Id $ -->
-
-
-<jboss-ra xmlns="http://www.jboss.org/schema/ra/2.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.jboss.org/schema/ra/2.0 http://www.jboss.org/jee/schema/ironjacamar/2.0/jboss-ra_2_0.xsd">
- <ra-config-property>
- <ra-config-property-name>myIntProperty</ra-config-property-name>
- <ra-config-property-type>java.lang.Integer</ra-config-property-type>
- <ra-config-property-value>8</ra-config-property-value>
- </ra-config-property>
-
- <ra-config-property override-element="connection-definition">
- <ra-config-property-name>myStringProperty</ra-config-property-name>
- <ra-config-property-type>java.lang.String</ra-config-property-type>
- <ra-config-property-value>newJCA</ra-config-property-value>
- </ra-config-property>
-
- <ra-config-property override-element="activationspec">
- <ra-config-property-name>myBooleanProperty</ra-config-property-name>
- <ra-config-property-type>java.lang.Boolean</ra-config-property-type>
- <ra-config-property-value>false</ra-config-property-value>
- </ra-config-property>
-
- <bean-validation-groups>
- <bean-validation-group>org.jboss.jca.test.deployers.spec.rars.ra16standard303jbossra.FirstStep</bean-validation-group>
- <bean-validation-group>org.jboss.jca.test.deployers.spec.rars.ra16standard303jbossra.SecondStep</bean-validation-group>
- </bean-validation-groups>
-</jboss-ra>
\ No newline at end of file
Added: projects/jboss-jca/trunk/deployers/src/test/resources/ra16user303jbossra.rar/META-INF/ironjacamar.xml
===================================================================
--- projects/jboss-jca/trunk/deployers/src/test/resources/ra16user303jbossra.rar/META-INF/ironjacamar.xml (rev 0)
+++ projects/jboss-jca/trunk/deployers/src/test/resources/ra16user303jbossra.rar/META-INF/ironjacamar.xml 2010-09-08 15:37:11 UTC (rev 108041)
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- $Id $ -->
+
+<ironjacamar xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:noNamespaceSchemaLocation="../../../../../../common/src/main/resources/schema/ironjacamar_1_0.xsd">
+
+ <config-property name="StringRAR">XMLOVERRIDE</config-property>
+
+</ironjacamar>
\ No newline at end of file
Deleted: projects/jboss-jca/trunk/deployers/src/test/resources/ra16user303jbossra.rar/META-INF/jboss-ra.xml
===================================================================
--- projects/jboss-jca/trunk/deployers/src/test/resources/ra16user303jbossra.rar/META-INF/jboss-ra.xml 2010-09-08 15:10:53 UTC (rev 108040)
+++ projects/jboss-jca/trunk/deployers/src/test/resources/ra16user303jbossra.rar/META-INF/jboss-ra.xml 2010-09-08 15:37:11 UTC (rev 108041)
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- $Id $ -->
-
-<jboss-ra xmlns="http://www.jboss.org/schema/ra"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.jboss.org/schema/ra
- http://www.jboss.org/schema/jboss-ra_1_0.xsd">
- <ra-config-property>
- <ra-config-property-name>myStringProperty</ra-config-property-name>
- <ra-config-property-type>java.lang.String</ra-config-property-type>
- <ra-config-property-value>Jeff</ra-config-property-value>
- </ra-config-property>
-</jboss-ra>
\ No newline at end of file
Modified: projects/jboss-jca/trunk/tools/findbugs/filter.xml
===================================================================
--- projects/jboss-jca/trunk/tools/findbugs/filter.xml 2010-09-08 15:10:53 UTC (rev 108040)
+++ projects/jboss-jca/trunk/tools/findbugs/filter.xml 2010-09-08 15:37:11 UTC (rev 108041)
@@ -32,6 +32,11 @@
<Method name="mergeConnectorAndDs" />
<Bug code="NP"/>
</Match>
+<Match>
+ <Class name="org.jboss.jca.common.metadata.MetadataFactory"/>
+ <Method name="mergeConnectorWithProperties" />
+ <Bug code="NP"/>
+ </Match>
<!-- org.jboss.jca.core filter -->
<Match>
More information about the jboss-cvs-commits
mailing list