[jboss-cvs] JBossAS SVN: r110917 - in projects/jboss-jca/trunk: common/src/main/java/org/jboss/jca/common/api/metadata/common and 9 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Mar 15 08:30:13 EDT 2011
Author: maeste
Date: 2011-03-15 08:30:13 -0400 (Tue, 15 Mar 2011)
New Revision: 110917
Modified:
projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/annotations/Annotations.java
projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/common/Recovery.java
projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/AbstractParser.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/ds/DsParserForRecoveryTestCase.java
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/resourceadapter/ResourceAdapterParserTestCase.java
projects/jboss-jca/trunk/common/src/test/resources/ds/unit/xa-resource-with-recovery-ds.xml
projects/jboss-jca/trunk/common/src/test/resources/ironjacamar/xa-pool-recovery-ironjacamar.xml
projects/jboss-jca/trunk/common/src/test/resources/resource-adapter/recovery-ra.xml
projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/AbstractDsDeployer.java
projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/AbstractResourceAdapterDeployer.java
Log:
JBJCA-509 using recover-plugin instead of plugin in xsds
Modified: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/annotations/Annotations.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/annotations/Annotations.java 2011-03-15 11:58:26 UTC (rev 110916)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/annotations/Annotations.java 2011-03-15 12:30:13 UTC (rev 110917)
@@ -284,7 +284,6 @@
// Vendor name
XsdString vendorName = new XsdString(conAnnotation.vendorName(), null);
-
// Description
ArrayList<LocalizedXsdString> descriptions = null;
if (conAnnotation.description() != null && conAnnotation.description().length != 0)
@@ -350,8 +349,8 @@
(conAnnotation.largeIcon() != null && conAnnotation.largeIcon().length != 0))
{
icons = new ArrayList<Icon>(
- (conAnnotation.smallIcon() == null ? 0 : conAnnotation.smallIcon().length) +
- (conAnnotation.largeIcon() == null ? 0 : conAnnotation.largeIcon().length));
+ (conAnnotation.smallIcon() == null ? 0 : conAnnotation.smallIcon().length) +
+ (conAnnotation.largeIcon() == null ? 0 : conAnnotation.largeIcon().length));
for (String smallIconAnnotation : conAnnotation.smallIcon())
{
icons.add(new Icon(Path.valueOf(smallIconAnnotation), null, null));
@@ -374,22 +373,25 @@
.authMechanisms());
OutboundResourceAdapter outboundResourceadapter = new OutboundResourceAdapterImpl(connectionDefinitions,
- transactionSupport, authenticationMechanisms, reauthenticationSupport, null);
+ transactionSupport,
+ authenticationMechanisms,
+ reauthenticationSupport, null);
// Security permission
ArrayList<SecurityPermission> securityPermissions = processSecurityPermissions(conAnnotation
.securityPermissions());
ResourceAdapter1516Impl resourceAdapter = new ResourceAdapter1516Impl(raClass, configProperties,
- outboundResourceadapter, inboundResourceadapter, adminObjs, securityPermissions, null);
+ outboundResourceadapter,
+ inboundResourceadapter, adminObjs,
+ securityPermissions, null);
XsdString resourceadapterVersion = new XsdString("1.6", null);
return new Connector16Impl("", vendorName, eisType, resourceadapterVersion, license, resourceAdapter,
- requiredWorkContexts, false, descriptions, displayNames, icons, null);
+ requiredWorkContexts, false, descriptions, displayNames, icons, null);
}
-
private ArrayList<SecurityPermission> processSecurityPermissions(
javax.resource.spi.SecurityPermission[] securityPermissionAnotations)
{
@@ -401,8 +403,11 @@
securityPermissions = new ArrayList<SecurityPermission>(securityPermissionAnotations.length);
for (javax.resource.spi.SecurityPermission securityPermission : securityPermissionAnotations)
{
- SecurityPermission spmd = new SecurityPermissionImpl(null, new XsdString(
- securityPermission.permissionSpec(), null), null);
+ SecurityPermission spmd = new SecurityPermissionImpl(
+ null,
+ new XsdString(
+ securityPermission.permissionSpec(),
+ null), null);
securityPermissions.add(spmd);
}
securityPermissions.trimToSize();
@@ -433,8 +438,10 @@
.authMechanism(), null);
authenticationMechanisms.add(new AuthenticationMechanismImpl(descriptions, authenticationMechanismType,
- CredentialInterfaceEnum.valueOf(authMechanismAnnotation.credentialInterface()
- .name()), null));
+ CredentialInterfaceEnum
+ .valueOf(authMechanismAnnotation
+ .credentialInterface()
+ .name()), null));
}
}
return authenticationMechanisms;
@@ -457,7 +464,8 @@
if (values.size() == 1)
{
Annotation annotation = values.iterator().next();
- ConnectionDefinitions connectionDefinitionsAnnotation = (ConnectionDefinitions) annotation.getAnnotation();
+ ConnectionDefinitions connectionDefinitionsAnnotation = (ConnectionDefinitions) annotation
+ .getAnnotation();
if (trace)
log.trace("Processing: " + connectionDefinitionsAnnotation);
@@ -513,7 +521,8 @@
{
ArrayList<ConnectionDefinition> connectionDefinitions = null;
- Collection<Annotation> values = annotationRepository.getAnnotation(javax.resource.spi.ConnectionDefinition.class);
+ Collection<Annotation> values = annotationRepository
+ .getAnnotation(javax.resource.spi.ConnectionDefinition.class);
if (values != null)
{
connectionDefinitions =
@@ -539,7 +548,8 @@
ArrayList<? extends ConfigProperty> configProperty)
throws Exception
{
- javax.resource.spi.ConnectionDefinition cd = (javax.resource.spi.ConnectionDefinition) annotation.getAnnotation();
+ javax.resource.spi.ConnectionDefinition cd = (javax.resource.spi.ConnectionDefinition) annotation
+ .getAnnotation();
if (trace)
log.trace("Processing: " + annotation);
@@ -580,8 +590,9 @@
XsdString connectionImplClass = new XsdString(cd.connectionImpl().getName(), null);
XsdString connectionfactoryImplClass = new XsdString(cd.connectionFactoryImpl().getName(), null);
XsdString connectionInterface = new XsdString(cd.connection().getName(), null);
- return new ConnectionDefinitionImpl(managedconnectionfactoryClass, configProperties, connectionfactoryInterface,
- connectionfactoryImplClass, connectionInterface, connectionImplClass, null);
+ return new ConnectionDefinitionImpl(managedconnectionfactoryClass, configProperties,
+ connectionfactoryInterface,
+ connectionfactoryImplClass, connectionInterface, connectionImplClass, null);
}
/**
@@ -591,7 +602,8 @@
* @return The updated metadata
* @exception Exception Thrown if an error occurs
*/
- private Map<Metadatas, ArrayList<ConfigProperty16>> processConfigProperty(AnnotationRepository annotationRepository,
+ private Map<Metadatas, ArrayList<ConfigProperty16>> processConfigProperty(
+ AnnotationRepository annotationRepository,
ClassLoader classLoader)
throws Exception
{
@@ -610,7 +622,8 @@
XsdString configPropertyValue = XsdString.NULL_XSDSTRING;
XsdString configPropertyName = new XsdString(getConfigPropertyName(annotation), null);
- if (configPropertyAnnotation.defaultValue() != null && !configPropertyAnnotation.defaultValue().equals(""))
+ if (configPropertyAnnotation.defaultValue() != null &&
+ !configPropertyAnnotation.defaultValue().equals(""))
configPropertyValue = new XsdString(configPropertyAnnotation.defaultValue(), null);
XsdString configPropertyType;
if (!Object.class.equals(configPropertyAnnotation.type()))
@@ -643,9 +656,10 @@
if (hasInterface(attachedClass, "javax.resource.spi.ResourceAdapter"))
{
ConfigProperty16 cfgMeta = new ConfigProperty16Impl(descriptions, configPropertyName,
- configPropertyType,
- configPropertyValue, configPropertyIgnore, configPropertySupportsDynamicUpdates,
- configPropertyConfidential, null);
+ configPropertyType,
+ configPropertyValue, configPropertyIgnore,
+ configPropertySupportsDynamicUpdates,
+ configPropertyConfidential, null);
if (valueMap.get(Metadatas.RA) == null)
{
valueMap.put(Metadatas.RA, new ArrayList<ConfigProperty16>());
@@ -655,9 +669,11 @@
else
{
ConfigProperty16 cfgMeta = new ConfigProperty16Impl(descriptions, configPropertyName,
- configPropertyType,
- configPropertyValue, configPropertyIgnore, configPropertySupportsDynamicUpdates,
- configPropertyConfidential, null, attachedClassName);
+ configPropertyType,
+ configPropertyValue, configPropertyIgnore,
+ configPropertySupportsDynamicUpdates,
+ configPropertyConfidential, null,
+ attachedClassName);
if (hasInterface(attachedClass, "javax.resource.spi.ManagedConnectionFactory"))
{
if (valueMap.get(Metadatas.MANAGED_CONN_FACTORY) == null)
@@ -752,16 +768,19 @@
String aoClassName = annotation.getClassName();
Class<?> aClass = Class.forName(aoClassName, true, classLoader);
List<Class<?>> declaredInterfaces = null;
- if (aClass.getInterfaces() != null && aClass.getInterfaces().length != 0) {
+ if (aClass.getInterfaces() != null && aClass.getInterfaces().length != 0)
+ {
declaredInterfaces = Arrays.asList(aClass.getInterfaces());
- } else {
+ }
+ else
+ {
declaredInterfaces = Collections.emptyList();
}
if (a.adminObjectInterfaces() != null && a.adminObjectInterfaces().length > 0)
{
for (Class<?> annotatedInterface : a.adminObjectInterfaces())
- {
+ {
if (declaredInterfaces.contains(annotatedInterface) &&
!annotatedInterface.equals(Serializable.class) &&
!annotatedInterface.equals(Externalizable.class))
@@ -841,8 +860,8 @@
for (Class asClass : activation.messageListeners())
{
Activationspec16 asMeta = new Activationspec16Impl(new XsdString(annotation.getClassName(), null), null,
- validProperties,
- null);
+ validProperties,
+ null);
MessageListener mlMeta = new MessageListenerImpl(new XsdString(asClass.getName(), null), asMeta, null);
messageListeners.add(mlMeta);
Modified: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/common/Recovery.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/common/Recovery.java 2011-03-15 11:58:26 UTC (rev 110916)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/common/Recovery.java 2011-03-15 12:30:13 UTC (rev 110917)
@@ -42,7 +42,7 @@
private final Credential credential;
- private final Extension plugin;
+ private final Extension recoverPlugin;
private final Boolean noRecovery;
@@ -50,15 +50,15 @@
* Create a new Recovery.
*
* @param credential credential
- * @param plugin plugin
+ * @param recoverPlugin plugin
* @param noRecovery niRecovery
* @throws ValidateException in case of not valid metadata creation
*/
- public Recovery(Credential credential, Extension plugin, Boolean noRecovery) throws ValidateException
+ public Recovery(Credential credential, Extension recoverPlugin, Boolean noRecovery) throws ValidateException
{
super();
this.credential = credential;
- this.plugin = plugin;
+ this.recoverPlugin = recoverPlugin;
this.noRecovery = noRecovery;
this.validate();
}
@@ -78,9 +78,9 @@
*
* @return the plugin.
*/
- public final Extension getPlugin()
+ public final Extension getRecoverPlugin()
{
- return plugin;
+ return recoverPlugin;
}
/**
@@ -105,7 +105,7 @@
final int prime = 31;
int result = 1;
result = prime * result + ((noRecovery == null) ? 0 : noRecovery.hashCode());
- result = prime * result + ((plugin == null) ? 0 : plugin.hashCode());
+ result = prime * result + ((recoverPlugin == null) ? 0 : recoverPlugin.hashCode());
result = prime * result + ((credential == null) ? 0 : credential.hashCode());
return result;
}
@@ -127,12 +127,12 @@
}
else if (!noRecovery.equals(other.noRecovery))
return false;
- if (plugin == null)
+ if (recoverPlugin == null)
{
- if (other.plugin != null)
+ if (other.recoverPlugin != null)
return false;
}
- else if (!plugin.equals(other.plugin))
+ else if (!recoverPlugin.equals(other.recoverPlugin))
return false;
if (credential == null)
{
@@ -147,7 +147,7 @@
@Override
public String toString()
{
- return "Recovery [credential=" + credential + ", plugin=" + plugin + ", noRecovery=" + noRecovery + "]";
+ return "Recovery [credential=" + credential + ", plugin=" + recoverPlugin + ", noRecovery=" + noRecovery + "]";
}
/**
@@ -173,7 +173,7 @@
RECOVER_CREDENTIAL("recover-credential"),
/** plugin tag */
- PLUGIN("plugin");
+ RECOVER_PLUGIN("recover-plugin");
private final String name;
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-03-15 11:58:26 UTC (rev 110916)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/AbstractParser.java 2011-03-15 12:30:13 UTC (rev 110917)
@@ -652,7 +652,7 @@
security = parseCredential(reader);
break;
}
- case PLUGIN : {
+ case RECOVER_PLUGIN : {
plugin = parseExtension(reader, tag.getLocalName());
break;
}
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-03-15 11:58:26 UTC (rev 110916)
+++ projects/jboss-jca/trunk/common/src/main/resources/schema/datasources_1_0.xsd 2011-03-15 12:30:13 UTC (rev 110917)
@@ -126,7 +126,7 @@
</xs:documentation>
</xs:annotation>
</xs:element>
- <xs:element name="security" type="credentialType" minOccurs="0">
+ <xs:element name="security" type="dsSecurityType" minOccurs="0">
<xs:annotation>
<xs:documentation>
<![CDATA[[
@@ -781,7 +781,7 @@
</xs:complexType>
<xs:complexType name="recoverType">
<xs:sequence>
- <xs:element name="recover-credential" type="credentialType">
+ <xs:element name="recover-credential" type="dsSecurityType" minOccurs="0" maxOccurs="1">
<xs:annotation>
<xs:documentation>
<![CDATA[[
@@ -791,7 +791,7 @@
</xs:documentation>
</xs:annotation>
</xs:element>
- <xs:element name="plugin" type="extensionType">
+ <xs:element name="recover-plugin" type="extensionType" minOccurs="0" maxOccurs="1">
<xs:annotation>
<xs:documentation>
<![CDATA[[
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-03-15 11:58:26 UTC (rev 110916)
+++ projects/jboss-jca/trunk/common/src/main/resources/schema/ironjacamar_1_0.xsd 2011-03-15 12:30:13 UTC (rev 110917)
@@ -535,7 +535,7 @@
</xs:complexType>
<xs:complexType name="recoverType">
<xs:sequence>
- <xs:element name="recover-credential" type="credentialType">
+ <xs:element name="recover-credential" type="credentialType" minOccurs="0" maxOccurs="1">
<xs:annotation>
<xs:documentation>
<![CDATA[[
@@ -545,7 +545,7 @@
</xs:documentation>
</xs:annotation>
</xs:element>
- <xs:element name="plugin" type="extensionType">
+ <xs:element name="recover-plugin" type="extensionType" minOccurs="0" maxOccurs="1">
<xs:annotation>
<xs:documentation>
<![CDATA[[
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-03-15 11:58:26 UTC (rev 110916)
+++ projects/jboss-jca/trunk/common/src/main/resources/schema/resource-adapters_1_0.xsd 2011-03-15 12:30:13 UTC (rev 110917)
@@ -566,7 +566,7 @@
</xs:complexType>
<xs:complexType name="recoverType">
<xs:sequence>
- <xs:element name="recover-credential" type="credentialType">
+ <xs:element name="recover-credential" type="credentialType" minOccurs="0" maxOccurs="1">
<xs:annotation>
<xs:documentation>
<![CDATA[[
@@ -576,7 +576,7 @@
</xs:documentation>
</xs:annotation>
</xs:element>
- <xs:element name="plugin" type="extensionType">
+ <xs:element name="recover-plugin" type="extensionType" minOccurs="0" maxOccurs="1">
<xs:annotation>
<xs:documentation>
<![CDATA[[
Modified: projects/jboss-jca/trunk/common/src/test/java/org/jboss/jca/common/metadata/ds/DsParserForRecoveryTestCase.java
===================================================================
--- projects/jboss-jca/trunk/common/src/test/java/org/jboss/jca/common/metadata/ds/DsParserForRecoveryTestCase.java 2011-03-15 11:58:26 UTC (rev 110916)
+++ projects/jboss-jca/trunk/common/src/test/java/org/jboss/jca/common/metadata/ds/DsParserForRecoveryTestCase.java 2011-03-15 12:30:13 UTC (rev 110917)
@@ -90,7 +90,7 @@
assertThat(recovery, not(isNull()));
assertThat(recovery.getNoRecovery(), is(false));
Credential security = recovery.getCredential();
- Extension plugin = recovery.getPlugin();
+ Extension plugin = recovery.getRecoverPlugin();
assertThat(security.getUserName(), is("myUserName"));
assertThat(security.getPassword(), is("myPassword"));
assertThat(security.getSecurityDomain(), is("mySecurityDomain"));
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-03-15 11:58:26 UTC (rev 110916)
+++ projects/jboss-jca/trunk/common/src/test/java/org/jboss/jca/common/metadata/ironjacamar/IronJacamarParserTestCase.java 2011-03-15 12:30:13 UTC (rev 110917)
@@ -610,7 +610,7 @@
assertThat(recovery, not(isNull()));
assertThat(recovery.getNoRecovery(), is(false));
Credential security = recovery.getCredential();
- Extension plugin = recovery.getPlugin();
+ Extension plugin = recovery.getRecoverPlugin();
assertThat(security.getUserName(), is("myUserName"));
assertThat(security.getPassword(), is("myPassword"));
assertThat(security.getSecurityDomain(), is("mySecurityDomain"));
Modified: projects/jboss-jca/trunk/common/src/test/java/org/jboss/jca/common/metadata/resourceadapter/ResourceAdapterParserTestCase.java
===================================================================
--- projects/jboss-jca/trunk/common/src/test/java/org/jboss/jca/common/metadata/resourceadapter/ResourceAdapterParserTestCase.java 2011-03-15 11:58:26 UTC (rev 110916)
+++ projects/jboss-jca/trunk/common/src/test/java/org/jboss/jca/common/metadata/resourceadapter/ResourceAdapterParserTestCase.java 2011-03-15 12:30:13 UTC (rev 110917)
@@ -157,7 +157,7 @@
assertThat(recovery, not(isNull()));
assertThat(recovery.getNoRecovery(), is(false));
Credential security = recovery.getCredential();
- Extension plugin = recovery.getPlugin();
+ Extension plugin = recovery.getRecoverPlugin();
assertThat(security.getUserName(), is("myUserName"));
assertThat(security.getPassword(), is("myPassword"));
assertThat(security.getSecurityDomain(), is("mySecurityDomain"));
Modified: projects/jboss-jca/trunk/common/src/test/resources/ds/unit/xa-resource-with-recovery-ds.xml
===================================================================
--- projects/jboss-jca/trunk/common/src/test/resources/ds/unit/xa-resource-with-recovery-ds.xml 2011-03-15 11:58:26 UTC (rev 110916)
+++ projects/jboss-jca/trunk/common/src/test/resources/ds/unit/xa-resource-with-recovery-ds.xml 2011-03-15 12:30:13 UTC (rev 110917)
@@ -21,9 +21,9 @@
<password>myPassword</password>
<security-domain>mySecurityDomain</security-domain>
</recover-credential>
- <plugin class-name="myClassName">
+ <recover-plugin class-name="myClassName">
<config-property name="MyProperty">MyPropertyValue</config-property>
- </plugin>
+ </recover-plugin>
</recovery>
</xa-datasource>
</datasources>
Modified: projects/jboss-jca/trunk/common/src/test/resources/ironjacamar/xa-pool-recovery-ironjacamar.xml
===================================================================
--- projects/jboss-jca/trunk/common/src/test/resources/ironjacamar/xa-pool-recovery-ironjacamar.xml 2011-03-15 11:58:26 UTC (rev 110916)
+++ projects/jboss-jca/trunk/common/src/test/resources/ironjacamar/xa-pool-recovery-ironjacamar.xml 2011-03-15 12:30:13 UTC (rev 110917)
@@ -15,9 +15,9 @@
<password>myPassword</password>
<security-domain>mySecurityDomain</security-domain>
</recover-credential>
- <plugin class-name="myClassName">
+ <recover-plugin class-name="myClassName">
<config-property name="MyProperty">MyPropertyValue</config-property>
- </plugin>
+ </recover-plugin>
</recovery>
</xa-pool>
</connection-definition>
Modified: projects/jboss-jca/trunk/common/src/test/resources/resource-adapter/recovery-ra.xml
===================================================================
--- projects/jboss-jca/trunk/common/src/test/resources/resource-adapter/recovery-ra.xml 2011-03-15 11:58:26 UTC (rev 110916)
+++ projects/jboss-jca/trunk/common/src/test/resources/resource-adapter/recovery-ra.xml 2011-03-15 12:30:13 UTC (rev 110917)
@@ -38,9 +38,9 @@
<password>myPassword</password>
<security-domain>mySecurityDomain</security-domain>
</recover-credential>
- <plugin class-name="myClassName">
+ <recover-plugin class-name="myClassName">
<config-property name="MyProperty">MyPropertyValue</config-property>
- </plugin>
+ </recover-plugin>
</recovery>
</xa-pool>
<security>
Modified: projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/AbstractDsDeployer.java
===================================================================
--- projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/AbstractDsDeployer.java 2011-03-15 11:58:26 UTC (rev 110916)
+++ projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/AbstractDsDeployer.java 2011-03-15 12:30:13 UTC (rev 110917)
@@ -547,13 +547,15 @@
}
RecoveryPlugin plugin = null;
- if (recoveryMD != null && recoveryMD.getPlugin() != null)
+ if (recoveryMD != null && recoveryMD.getRecoverPlugin() != null)
{
List<ConfigProperty> configProperties = null;
- if (recoveryMD.getPlugin().getConfigPropertiesMap() != null)
+ if (recoveryMD.getRecoverPlugin().getConfigPropertiesMap() != null)
{
- configProperties = new ArrayList<ConfigProperty>(recoveryMD.getPlugin().getConfigPropertiesMap().size());
- for (Entry<String, String> property : recoveryMD.getPlugin().getConfigPropertiesMap().entrySet())
+ configProperties = new ArrayList<ConfigProperty>(recoveryMD.getRecoverPlugin()
+ .getConfigPropertiesMap().size());
+ for (Entry<String, String> property : recoveryMD.getRecoverPlugin().getConfigPropertiesMap()
+ .entrySet())
{
ConfigProperty c = new ConfigPropertyImpl(null,
new XsdString(property.getKey(), null),
@@ -563,7 +565,8 @@
configProperties.add(c);
}
- plugin = (RecoveryPlugin) initAndInject(recoveryMD.getPlugin().getClassName(), configProperties, cl);
+ plugin = (RecoveryPlugin) initAndInject(recoveryMD.getRecoverPlugin().getClassName(),
+ configProperties, cl);
}
}
else
Modified: projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/AbstractResourceAdapterDeployer.java
===================================================================
--- projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/AbstractResourceAdapterDeployer.java 2011-03-15 11:58:26 UTC (rev 110916)
+++ projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/AbstractResourceAdapterDeployer.java 2011-03-15 12:30:13 UTC (rev 110917)
@@ -1446,16 +1446,17 @@
}
RecoveryPlugin plugin = null;
- if (recoveryMD != null && recoveryMD.getPlugin() != null)
+ if (recoveryMD != null && recoveryMD.getRecoverPlugin() != null)
{
List<ConfigProperty> configProperties = null;
if (recoveryMD
- .getPlugin()
+ .getRecoverPlugin()
.getConfigPropertiesMap() != null)
{
- configProperties = new ArrayList<ConfigProperty>(recoveryMD.getPlugin()
+ configProperties = new ArrayList<ConfigProperty>(recoveryMD
+ .getRecoverPlugin()
.getConfigPropertiesMap().size());
- for (Entry<String, String> property : recoveryMD.getPlugin()
+ for (Entry<String, String> property : recoveryMD.getRecoverPlugin()
.getConfigPropertiesMap().entrySet())
{
ConfigProperty c = new ConfigPropertyImpl(
@@ -1473,7 +1474,7 @@
}
plugin = (RecoveryPlugin) initAndInject(recoveryMD
- .getPlugin().getClassName(), configProperties, cl);
+ .getRecoverPlugin().getClassName(), configProperties, cl);
}
}
else
More information about the jboss-cvs-commits
mailing list