[jboss-cvs] JBossAS SVN: r112087 - in projects/jboss-jca/branches/Branch_1_0: common/src/main/java/org/jboss/jca/common/api/metadata/ds and 29 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Aug 17 14:22:09 EDT 2011
Author: jesper.pedersen
Date: 2011-08-17 14:22:08 -0400 (Wed, 17 Aug 2011)
New Revision: 112087
Added:
projects/jboss-jca/branches/Branch_1_0/common/src/test/java/org/jboss/jca/common/metadata/ds/DsParserXMLTestCase.java
projects/jboss-jca/branches/Branch_1_0/common/src/test/resources/ds/unit/all-ds.xml
projects/jboss-jca/branches/Branch_1_0/common/src/test/resources/ironjacamar/ironjacamar-all.xml
projects/jboss-jca/branches/Branch_1_0/common/src/test/resources/logging.properties
projects/jboss-jca/branches/Branch_1_0/common/src/test/resources/resource-adapter/all-ra.xml
Removed:
projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/api/metadata/ra/RaConfigProperty.java
projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/metadata/ra/common/RaConfigPropertyImpl.java
Modified:
projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/api/metadata/common/CommonAdminObject.java
projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/api/metadata/common/CommonConnDef.java
projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/api/metadata/common/CommonPool.java
projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/api/metadata/common/CommonSecurity.java
projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/api/metadata/common/CommonTimeOut.java
projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/api/metadata/common/CommonValidation.java
projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/api/metadata/common/CommonXaPool.java
projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/api/metadata/common/Credential.java
projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/api/metadata/common/Extension.java
projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/api/metadata/common/FlushStrategy.java
projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/api/metadata/common/Recovery.java
projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/api/metadata/common/TransactionSupportEnum.java
projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/api/metadata/ds/DataSource.java
projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/api/metadata/ds/DataSources.java
projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/api/metadata/ds/Driver.java
projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/api/metadata/ds/DsSecurity.java
projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/api/metadata/ds/Statement.java
projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/api/metadata/ds/TimeOut.java
projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/api/metadata/ds/TransactionIsolation.java
projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/api/metadata/ds/Validation.java
projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/api/metadata/ds/XaDataSource.java
projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/api/metadata/ironjacamar/IronJacamar.java
projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/api/metadata/ra/AdminObject.java
projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/api/metadata/ra/AuthenticationMechanism.java
projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/api/metadata/ra/ConfigProperty.java
projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/api/metadata/ra/ConnectionDefinition.java
projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/api/metadata/ra/CredentialInterfaceEnum.java
projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/api/metadata/ra/Icon.java
projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/api/metadata/ra/InboundResourceAdapter.java
projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/api/metadata/ra/LicenseType.java
projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/api/metadata/ra/LocalizedXsdString.java
projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/api/metadata/ra/MessageListener.java
projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/api/metadata/ra/Messageadapter.java
projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/api/metadata/ra/OutboundResourceAdapter.java
projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/api/metadata/ra/OverrideElementAttribute.java
projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/api/metadata/ra/RequiredConfigProperty.java
projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/api/metadata/ra/ResourceAdapter1516.java
projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/api/metadata/ra/SecurityPermission.java
projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/api/metadata/ra/XsdString.java
projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/api/metadata/ra/ra10/Connector10.java
projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/api/metadata/ra/ra10/ResourceAdapter10.java
projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/api/metadata/ra/ra15/Activationspec15.java
projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/api/metadata/ra/ra15/Connector15.java
projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/api/metadata/ra/ra16/Activationspec16.java
projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/api/metadata/ra/ra16/ConfigProperty16.java
projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/api/metadata/ra/ra16/Connector16.java
projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/api/metadata/resourceadapter/ResourceAdapter.java
projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/api/metadata/resourceadapter/ResourceAdapters.java
projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/metadata/AbstractParser.java
projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/metadata/common/CommonAdminObjectImpl.java
projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/metadata/common/CommonConnDefImpl.java
projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/metadata/common/CommonIronJacamarImpl.java
projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/metadata/common/CommonPoolImpl.java
projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/metadata/common/CommonSecurityImpl.java
projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/metadata/common/CommonTimeOutImpl.java
projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/metadata/common/CommonValidationImpl.java
projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/metadata/common/CommonXaPoolImpl.java
projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/metadata/common/CredentialImpl.java
projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/metadata/ds/DataSourceAbstractImpl.java
projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/metadata/ds/DataSourceImpl.java
projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/metadata/ds/DatasourcesImpl.java
projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/metadata/ds/DriverImpl.java
projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/metadata/ds/DsSecurityImpl.java
projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/metadata/ds/StatementImpl.java
projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/metadata/ds/TimeOutImpl.java
projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/metadata/ds/ValidationImpl.java
projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/metadata/ds/XADataSourceImpl.java
projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/metadata/ironjacamar/IronJacamarImpl.java
projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/metadata/merge/Merger.java
projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/metadata/ra/RaParser.java
projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/metadata/ra/common/AdminObjectImpl.java
projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/metadata/ra/common/AuthenticationMechanismImpl.java
projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/metadata/ra/common/ConfigPropertyImpl.java
projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/metadata/ra/common/ConnectionDefinitionImpl.java
projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/metadata/ra/common/ConnectorAbstractmpl.java
projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/metadata/ra/common/InboundResourceAdapterImpl.java
projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/metadata/ra/common/MessageAdapterImpl.java
projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/metadata/ra/common/MessageListenerImpl.java
projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/metadata/ra/common/OutboundResourceAdapterImpl.java
projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/metadata/ra/common/ResourceAdapter1516Impl.java
projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/metadata/ra/common/SecurityPermissionImpl.java
projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/metadata/ra/ra10/Connector10Impl.java
projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/metadata/ra/ra10/ResourceAdapter10Impl.java
projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/metadata/ra/ra15/Activationspec15Impl.java
projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/metadata/ra/ra15/Connector15Impl.java
projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/metadata/ra/ra16/Activationspec16Impl.java
projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/metadata/ra/ra16/ConfigProperty16Impl.java
projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/metadata/ra/ra16/Connector16Impl.java
projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/metadata/resourceadapter/ResourceAdapterImpl.java
projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/metadata/resourceadapter/ResourceAdaptersImpl.java
projects/jboss-jca/branches/Branch_1_0/common/src/main/resources/schema/connector_1_5.xsd
projects/jboss-jca/branches/Branch_1_0/common/src/test/java/org/jboss/jca/common/metadata/ironjacamar/IronJacamarParserTestCase.java
projects/jboss-jca/branches/Branch_1_0/common/src/test/java/org/jboss/jca/common/metadata/ra/RaParserTestCase.java
projects/jboss-jca/branches/Branch_1_0/common/src/test/java/org/jboss/jca/common/metadata/resourceadapter/ResourceAdapterParserTestCase.java
projects/jboss-jca/branches/Branch_1_0/core/src/main/java/org/jboss/jca/core/rar/SimpleResourceAdapterRepository.java
projects/jboss-jca/branches/Branch_1_0/deployers/src/main/java/org/jboss/jca/deployers/common/AbstractDsDeployer.java
projects/jboss-jca/branches/Branch_1_0/deployers/src/main/java/org/jboss/jca/deployers/common/AbstractResourceAdapterDeployer.java
projects/jboss-jca/branches/Branch_1_0/validator/src/main/java/org/jboss/jca/validator/Validation.java
Log:
[JBJCA-651] Output model during deployment
Modified: projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/api/metadata/common/CommonAdminObject.java
===================================================================
--- projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/api/metadata/common/CommonAdminObject.java 2011-08-17 17:47:30 UTC (rev 112086)
+++ projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/api/metadata/common/CommonAdminObject.java 2011-08-17 18:22:08 UTC (rev 112087)
@@ -120,6 +120,14 @@
return name;
}
+ /**
+ * {@inheritDoc}
+ */
+ public String toString()
+ {
+ return name;
+ }
+
private static final Map<String, Tag> MAP;
static
@@ -210,6 +218,14 @@
return name;
}
+ /**
+ * {@inheritDoc}
+ */
+ public String toString()
+ {
+ return name;
+ }
+
private static final Map<String, Attribute> MAP;
static
Modified: projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/api/metadata/common/CommonConnDef.java
===================================================================
--- projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/api/metadata/common/CommonConnDef.java 2011-08-17 17:47:30 UTC (rev 112086)
+++ projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/api/metadata/common/CommonConnDef.java 2011-08-17 18:22:08 UTC (rev 112087)
@@ -193,6 +193,14 @@
return name;
}
+ /**
+ * {@inheritDoc}
+ */
+ public String toString()
+ {
+ return name;
+ }
+
private static final Map<String, Tag> MAP;
static
@@ -287,6 +295,14 @@
return name;
}
+ /**
+ * {@inheritDoc}
+ */
+ public String toString()
+ {
+ return name;
+ }
+
private static final Map<String, Attribute> MAP;
static
Modified: projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/api/metadata/common/CommonPool.java
===================================================================
--- projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/api/metadata/common/CommonPool.java 2011-08-17 17:47:30 UTC (rev 112086)
+++ projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/api/metadata/common/CommonPool.java 2011-08-17 18:22:08 UTC (rev 112087)
@@ -94,7 +94,7 @@
/**
* maxPoolSize tag
*/
- MAXPOOLSIZE("max-pool-size"),
+ MAX_POOL_SIZE("max-pool-size"),
/**
* prefill tag
@@ -133,6 +133,14 @@
return name;
}
+ /**
+ * {@inheritDoc}
+ */
+ public String toString()
+ {
+ return name;
+ }
+
private static final Map<String, Tag> MAP;
static
Modified: projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/api/metadata/common/CommonSecurity.java
===================================================================
--- projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/api/metadata/common/CommonSecurity.java 2011-08-17 17:47:30 UTC (rev 112086)
+++ projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/api/metadata/common/CommonSecurity.java 2011-08-17 18:22:08 UTC (rev 112087)
@@ -114,6 +114,14 @@
return name;
}
+ /**
+ * {@inheritDoc}
+ */
+ public String toString()
+ {
+ return name;
+ }
+
private static final Map<String, Tag> MAP;
static
Modified: projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/api/metadata/common/CommonTimeOut.java
===================================================================
--- projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/api/metadata/common/CommonTimeOut.java 2011-08-17 17:47:30 UTC (rev 112086)
+++ projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/api/metadata/common/CommonTimeOut.java 2011-08-17 18:22:08 UTC (rev 112087)
@@ -129,6 +129,14 @@
return name;
}
+ /**
+ * {@inheritDoc}
+ */
+ public String toString()
+ {
+ return name;
+ }
+
private static final Map<String, Tag> MAP;
static
Modified: projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/api/metadata/common/CommonValidation.java
===================================================================
--- projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/api/metadata/common/CommonValidation.java 2011-08-17 17:47:30 UTC (rev 112086)
+++ projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/api/metadata/common/CommonValidation.java 2011-08-17 18:22:08 UTC (rev 112087)
@@ -106,6 +106,14 @@
return name;
}
+ /**
+ * {@inheritDoc}
+ */
+ public String toString()
+ {
+ return name;
+ }
+
private static final Map<String, Tag> MAP;
static
Modified: projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/api/metadata/common/CommonXaPool.java
===================================================================
--- projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/api/metadata/common/CommonXaPool.java 2011-08-17 17:47:30 UTC (rev 112086)
+++ projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/api/metadata/common/CommonXaPool.java 2011-08-17 18:22:08 UTC (rev 112087)
@@ -58,11 +58,11 @@
public Boolean isPadXid();
/**
- * Get the wrapXaDataSource.
+ * Get the wrapXaResource.
*
- * @return the wrapXaDataSource.
+ * @return the wrapXaResource.
*/
- public Boolean isWrapXaDataSource();
+ public Boolean isWrapXaResource();
/**
* Get the noTxSeparatePool.
@@ -94,7 +94,7 @@
/**
* maxPoolSize tag
*/
- MAXPOOLSIZE("max-pool-size"),
+ MAX_POOL_SIZE("max-pool-size"),
/**
* prefill tag
*/
@@ -156,6 +156,14 @@
return name;
}
+ /**
+ * {@inheritDoc}
+ */
+ public String toString()
+ {
+ return name;
+ }
+
private static final Map<String, Tag> MAP;
static
Modified: projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/api/metadata/common/Credential.java
===================================================================
--- projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/api/metadata/common/Credential.java 2011-08-17 17:47:30 UTC (rev 112086)
+++ projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/api/metadata/common/Credential.java 2011-08-17 18:22:08 UTC (rev 112087)
@@ -109,6 +109,14 @@
return name;
}
+ /**
+ * {@inheritDoc}
+ */
+ public String toString()
+ {
+ return name;
+ }
+
private static final Map<String, Tag> MAP;
static
Modified: projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/api/metadata/common/Extension.java
===================================================================
--- projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/api/metadata/common/Extension.java 2011-08-17 17:47:30 UTC (rev 112086)
+++ projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/api/metadata/common/Extension.java 2011-08-17 18:22:08 UTC (rev 112087)
@@ -90,12 +90,6 @@
}
@Override
- public String toString()
- {
- return "JdbcAdapterExtension [className=" + className + ", configPropertiesMap=" + configPropertiesMap + "]";
- }
-
- @Override
public int hashCode()
{
final int prime = 31;
@@ -177,6 +171,14 @@
return name;
}
+ /**
+ * {@inheritDoc}
+ */
+ public String toString()
+ {
+ return name;
+ }
+
private static final Map<String, Tag> MAP;
static
@@ -244,6 +246,13 @@
return name;
}
+ /**
+ * {@inheritDoc}
+ */
+ public String toString()
+ {
+ return name;
+ }
}
@Override
Modified: projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/api/metadata/common/FlushStrategy.java
===================================================================
--- projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/api/metadata/common/FlushStrategy.java 2011-08-17 17:47:30 UTC (rev 112086)
+++ projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/api/metadata/common/FlushStrategy.java 2011-08-17 18:22:08 UTC (rev 112087)
@@ -70,6 +70,14 @@
return name;
}
+ /**
+ * {@inheritDoc}
+ */
+ public String toString()
+ {
+ return name;
+ }
+
private static final Map<String, FlushStrategy> MAP;
static
Modified: projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/api/metadata/common/Recovery.java
===================================================================
--- projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/api/metadata/common/Recovery.java 2011-08-17 17:47:30 UTC (rev 112086)
+++ projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/api/metadata/common/Recovery.java 2011-08-17 18:22:08 UTC (rev 112087)
@@ -26,6 +26,7 @@
import org.jboss.jca.common.api.validator.ValidateException;
import java.util.HashMap;
+import java.util.Iterator;
import java.util.Map;
/**
@@ -147,7 +148,63 @@
@Override
public String toString()
{
- return "Recovery [credential=" + credential + ", plugin=" + recoverPlugin + ", noRecovery=" + noRecovery + "]";
+ StringBuilder sb = new StringBuilder(1024);
+
+ sb.append("<recovery");
+ if (noRecovery != null)
+ sb.append(" ").append(Attribute.NO_RECOVERY).append("=\"").append(noRecovery).append("\"");
+ sb.append(">");
+
+ if (credential != null)
+ {
+ sb.append("<").append(Tag.RECOVER_CREDENTIAL).append(">");
+ if (credential.getUserName() != null)
+ {
+ sb.append("<").append(Credential.Tag.USERNAME).append(">");
+ sb.append(credential.getUserName());
+ sb.append("</").append(Credential.Tag.USERNAME).append(">");
+
+ sb.append("<").append(Credential.Tag.PASSWORD).append(">");
+ sb.append(credential.getPassword());
+ sb.append("</").append(Credential.Tag.PASSWORD).append(">");
+ }
+ else
+ {
+ sb.append("<").append(Credential.Tag.SECURITY_DOMAIN).append(">");
+ sb.append(credential.getSecurityDomain());
+ sb.append("</").append(Credential.Tag.SECURITY_DOMAIN).append(">");
+ }
+ sb.append("</").append(Tag.RECOVER_CREDENTIAL).append(">");
+ }
+
+ if (recoverPlugin != null)
+ {
+ sb.append("<").append(Tag.RECOVER_PLUGIN);
+ sb.append(" ").append(Extension.Attribute.CLASS_NAME).append("=\"");
+ sb.append(recoverPlugin.getClassName()).append("\"");
+ sb.append(">");
+
+ if (recoverPlugin.getConfigPropertiesMap() != null && recoverPlugin.getConfigPropertiesMap().size() > 0)
+ {
+ Iterator<Map.Entry<String, String>> it = recoverPlugin.getConfigPropertiesMap().entrySet().iterator();
+
+ while (it.hasNext())
+ {
+ Map.Entry<String, String> entry = it.next();
+
+ sb.append("<").append(Extension.Tag.CONFIG_PROPERTY);
+ sb.append(" name=\"").append(entry.getKey()).append("\">");
+ sb.append(entry.getValue());
+ sb.append("</").append(Extension.Tag.CONFIG_PROPERTY).append(">");
+ }
+ }
+
+ sb.append("</").append(Tag.RECOVER_PLUGIN).append(">");
+ }
+
+ sb.append("</recovery>");
+
+ return sb.toString();
}
/**
@@ -165,9 +222,6 @@
UNKNOWN(null),
/**
- * pool tag
-
- /**
* config-property tag
*/
RECOVER_CREDENTIAL("recover-credential"),
@@ -198,6 +252,14 @@
return name;
}
+ /**
+ * {@inheritDoc}
+ */
+ public String toString()
+ {
+ return name;
+ }
+
private static final Map<String, Tag> MAP;
static
@@ -265,7 +327,13 @@
return name;
}
+ /**
+ * {@inheritDoc}
+ */
+ public String toString()
+ {
+ return name;
+ }
}
-
}
Modified: projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/api/metadata/common/TransactionSupportEnum.java
===================================================================
--- projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/api/metadata/common/TransactionSupportEnum.java 2011-08-17 17:47:30 UTC (rev 112086)
+++ projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/api/metadata/common/TransactionSupportEnum.java 2011-08-17 18:22:08 UTC (rev 112087)
@@ -31,14 +31,32 @@
/**
* NoTransaction
*/
- NoTransaction,
+ NoTransaction("NoTransaction"),
/**
* LocalTransaction
*/
- LocalTransaction,
+ LocalTransaction("LocalTransaction"),
/**
* XATransaction
*/
- XATransaction;
+ XATransaction("XATransaction");
+ private String value;
+
+ /**
+ * Constructor
+ * @param value The value
+ */
+ TransactionSupportEnum(String value)
+ {
+ this.value = value;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public String toString()
+ {
+ return value;
+ }
}
Modified: projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/api/metadata/ds/DataSource.java
===================================================================
--- projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/api/metadata/ds/DataSource.java 2011-08-17 17:47:30 UTC (rev 112086)
+++ projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/api/metadata/ds/DataSource.java 2011-08-17 18:22:08 UTC (rev 112087)
@@ -201,6 +201,14 @@
return name;
}
+ /**
+ * {@inheritDoc}
+ */
+ public String toString()
+ {
+ return name;
+ }
+
private static final Map<String, Tag> MAP;
static
@@ -297,6 +305,12 @@
return name;
}
+ /**
+ * {@inheritDoc}
+ */
+ public String toString()
+ {
+ return name;
+ }
}
-
}
Modified: projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/api/metadata/ds/DataSources.java
===================================================================
--- projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/api/metadata/ds/DataSources.java 2011-08-17 17:47:30 UTC (rev 112086)
+++ projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/api/metadata/ds/DataSources.java 2011-08-17 18:22:08 UTC (rev 112087)
@@ -127,6 +127,14 @@
return name;
}
+ /**
+ * {@inheritDoc}
+ */
+ public String toString()
+ {
+ return name;
+ }
+
private static final Map<String, Tag> MAP;
static
Modified: projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/api/metadata/ds/Driver.java
===================================================================
--- projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/api/metadata/ds/Driver.java 2011-08-17 17:47:30 UTC (rev 112086)
+++ projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/api/metadata/ds/Driver.java 2011-08-17 18:22:08 UTC (rev 112087)
@@ -139,6 +139,14 @@
return name;
}
+ /**
+ * {@inheritDoc}
+ */
+ public String toString()
+ {
+ return name;
+ }
+
private static final Map<String, Tag> MAP;
static
@@ -218,6 +226,12 @@
return name;
}
+ /**
+ * {@inheritDoc}
+ */
+ public String toString()
+ {
+ return name;
+ }
}
-
}
Modified: projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/api/metadata/ds/DsSecurity.java
===================================================================
--- projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/api/metadata/ds/DsSecurity.java 2011-08-17 17:47:30 UTC (rev 112086)
+++ projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/api/metadata/ds/DsSecurity.java 2011-08-17 18:22:08 UTC (rev 112087)
@@ -100,6 +100,14 @@
return name;
}
+ /**
+ * {@inheritDoc}
+ */
+ public String toString()
+ {
+ return name;
+ }
+
private static final Map<String, Tag> MAP;
static
Modified: projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/api/metadata/ds/Statement.java
===================================================================
--- projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/api/metadata/ds/Statement.java 2011-08-17 17:47:30 UTC (rev 112086)
+++ projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/api/metadata/ds/Statement.java 2011-08-17 18:22:08 UTC (rev 112087)
@@ -46,20 +46,39 @@
*/
public enum TrackStatementsEnum
{
+ /**
+ * true
+ */
+ TRUE("true"),
/**
- * true
- */
- TRUE,
- /**
* false
*/
- FALSE,
+ FALSE("false"),
+
/**
* NOWARN
*/
- NOWARN;
+ NOWARN("nowarn");
+ private String value;
+
+ /**
+ * Constructor
+ * @param v The value
+ */
+ TrackStatementsEnum(String v)
+ {
+ this.value = v;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public String toString()
+ {
+ return value;
+ }
}
/**
@@ -133,6 +152,14 @@
return name;
}
+ /**
+ * {@inheritDoc}
+ */
+ public String toString()
+ {
+ return name;
+ }
+
private static final Map<String, Tag> MAP;
static
Modified: projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/api/metadata/ds/TimeOut.java
===================================================================
--- projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/api/metadata/ds/TimeOut.java 2011-08-17 17:47:30 UTC (rev 112086)
+++ projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/api/metadata/ds/TimeOut.java 2011-08-17 18:22:08 UTC (rev 112087)
@@ -129,6 +129,14 @@
return name;
}
+ /**
+ * {@inheritDoc}
+ */
+ public String toString()
+ {
+ return name;
+ }
+
private static final Map<String, Tag> MAP;
static
Modified: projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/api/metadata/ds/TransactionIsolation.java
===================================================================
--- projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/api/metadata/ds/TransactionIsolation.java 2011-08-17 17:47:30 UTC (rev 112086)
+++ projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/api/metadata/ds/TransactionIsolation.java 2011-08-17 18:22:08 UTC (rev 112087)
@@ -41,26 +41,44 @@
* TRANSACTION_READ_UNCOMMITTED,
*/
- TRANSACTION_READ_UNCOMMITTED,
+ TRANSACTION_READ_UNCOMMITTED("TRANSACTION_READ_UNCOMMITTED"),
/**
* TRANSACTION_READ_COMMITTED,
*/
- TRANSACTION_READ_COMMITTED,
+ TRANSACTION_READ_COMMITTED("TRANSACTION_READ_COMMITTED"),
/**
* TRANSACTION_REPEATABLE_READ,
*/
- TRANSACTION_REPEATABLE_READ,
+ TRANSACTION_REPEATABLE_READ("TRANSACTION_REPEATABLE_READ"),
/**
* TRANSACTION_SERIALIZABLE,
*/
- TRANSACTION_SERIALIZABLE,
+ TRANSACTION_SERIALIZABLE("TRANSACTION_SERIALIZABLE"),
/**
* TRANSACTION_NONE;
*/
- TRANSACTION_NONE;
+ TRANSACTION_NONE("TRANSACTION_NONE");
+ private String value;
+
+ /**
+ * Constructor
+ * @param v The value
+ */
+ TransactionIsolation(String v)
+ {
+ this.value = v;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public String toString()
+ {
+ return value;
+ }
}
Modified: projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/api/metadata/ds/Validation.java
===================================================================
--- projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/api/metadata/ds/Validation.java 2011-08-17 17:47:30 UTC (rev 112086)
+++ projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/api/metadata/ds/Validation.java 2011-08-17 18:22:08 UTC (rev 112087)
@@ -145,6 +145,14 @@
return name;
}
+ /**
+ * {@inheritDoc}
+ */
+ public String toString()
+ {
+ return name;
+ }
+
private static final Map<String, Tag> MAP;
static
Modified: projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/api/metadata/ds/XaDataSource.java
===================================================================
--- projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/api/metadata/ds/XaDataSource.java 2011-08-17 17:47:30 UTC (rev 112086)
+++ projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/api/metadata/ds/XaDataSource.java 2011-08-17 18:22:08 UTC (rev 112087)
@@ -184,6 +184,14 @@
return name;
}
+ /**
+ * {@inheritDoc}
+ */
+ public String toString()
+ {
+ return name;
+ }
+
private static final Map<String, Tag> MAP;
static
@@ -275,5 +283,12 @@
return name;
}
+ /**
+ * {@inheritDoc}
+ */
+ public String toString()
+ {
+ return name;
+ }
}
}
Modified: projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/api/metadata/ironjacamar/IronJacamar.java
===================================================================
--- projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/api/metadata/ironjacamar/IronJacamar.java 2011-08-17 17:47:30 UTC (rev 112086)
+++ projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/api/metadata/ironjacamar/IronJacamar.java 2011-08-17 18:22:08 UTC (rev 112087)
@@ -115,6 +115,14 @@
return name;
}
+ /**
+ * {@inheritDoc}
+ */
+ public String toString()
+ {
+ return name;
+ }
+
private static final Map<String, Tag> MAP;
static
Modified: projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/api/metadata/ra/AdminObject.java
===================================================================
--- projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/api/metadata/ra/AdminObject.java 2011-08-17 17:47:30 UTC (rev 112086)
+++ projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/api/metadata/ra/AdminObject.java 2011-08-17 18:22:08 UTC (rev 112087)
@@ -137,6 +137,14 @@
return name;
}
+ /**
+ * {@inheritDoc}
+ */
+ public String toString()
+ {
+ return name;
+ }
+
private static final Map<String, Tag> MAP;
static
@@ -204,6 +212,12 @@
return name;
}
+ /**
+ * {@inheritDoc}
+ */
+ public String toString()
+ {
+ return name;
+ }
}
-
}
Modified: projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/api/metadata/ra/AuthenticationMechanism.java
===================================================================
--- projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/api/metadata/ra/AuthenticationMechanism.java 2011-08-17 17:47:30 UTC (rev 112086)
+++ projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/api/metadata/ra/AuthenticationMechanism.java 2011-08-17 18:22:08 UTC (rev 112087)
@@ -137,6 +137,14 @@
return name;
}
+ /**
+ * {@inheritDoc}
+ */
+ public String toString()
+ {
+ return name;
+ }
+
private static final Map<String, Tag> MAP;
static
@@ -204,6 +212,12 @@
return name;
}
+ /**
+ * {@inheritDoc}
+ */
+ public String toString()
+ {
+ return name;
+ }
}
-
}
Modified: projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/api/metadata/ra/ConfigProperty.java
===================================================================
--- projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/api/metadata/ra/ConfigProperty.java 2011-08-17 17:47:30 UTC (rev 112086)
+++ projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/api/metadata/ra/ConfigProperty.java 2011-08-17 18:22:08 UTC (rev 112087)
@@ -24,7 +24,9 @@
import org.jboss.jca.common.api.metadata.CopyableMetaData;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
/**
*
@@ -72,4 +74,144 @@
*/
public abstract boolean isValueSet();
+ /**
+ *
+ * A Tag.
+ *
+ * @author <a href="stefano.maestri at jboss.com">Stefano Maestri</a>
+ *
+ */
+ public enum Tag
+ {
+ /** always first
+ *
+ */
+ UNKNOWN(null),
+
+ /**
+ * description-class tag
+ */
+ DESCRIPTION("description"),
+
+ /**
+ * config-property-name TAG
+ */
+ CONFIG_PROPERTY_NAME("config-property-name"),
+
+ /**
+ * config-property-type TAG
+ */
+ CONFIG_PROPERTY_TYPE("config-property-type"),
+
+ /**
+ * config-property-value TAG
+ */
+ CONFIG_PROPERTY_VALUE("config-property-value");
+
+ 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;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public String toString()
+ {
+ 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 string
+ *
+ * @param localName a string 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;
+ }
+
+ }
+
+ /**
+ *
+ * A Attribute.
+ *
+ * @author <a href="stefano.maestri at jboss.com">Stefano Maestri</a>
+ *
+ */
+ public enum Attribute
+ {
+
+ /** id attribute
+ *
+ */
+ ID("id");
+
+ private final String name;
+
+ /**
+ *
+ * Create a new Tag.
+ *
+ * @param name a name
+ */
+ Attribute(final String name)
+ {
+ this.name = name;
+ }
+
+ /**
+ * Get the local name of this element.
+ *
+ * @return the local name
+ */
+ public String getLocalName()
+ {
+ return name;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public String toString()
+ {
+ return name;
+ }
+ }
}
Modified: projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/api/metadata/ra/ConnectionDefinition.java
===================================================================
--- projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/api/metadata/ra/ConnectionDefinition.java 2011-08-17 17:47:30 UTC (rev 112086)
+++ projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/api/metadata/ra/ConnectionDefinition.java 2011-08-17 18:22:08 UTC (rev 112087)
@@ -171,6 +171,14 @@
return name;
}
+ /**
+ * {@inheritDoc}
+ */
+ public String toString()
+ {
+ return name;
+ }
+
private static final Map<String, Tag> MAP;
static
@@ -238,6 +246,12 @@
return name;
}
+ /**
+ * {@inheritDoc}
+ */
+ public String toString()
+ {
+ return name;
+ }
}
-
}
Modified: projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/api/metadata/ra/CredentialInterfaceEnum.java
===================================================================
--- projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/api/metadata/ra/CredentialInterfaceEnum.java 2011-08-17 17:47:30 UTC (rev 112086)
+++ projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/api/metadata/ra/CredentialInterfaceEnum.java 2011-08-17 18:22:08 UTC (rev 112087)
@@ -99,4 +99,12 @@
{
return fullQualifiedName;
}
+
+ /**
+ * {@inheritDoc}
+ */
+ public String toString()
+ {
+ return fullQualifiedName;
+ }
}
Modified: projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/api/metadata/ra/Icon.java
===================================================================
--- projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/api/metadata/ra/Icon.java 2011-08-17 17:47:30 UTC (rev 112086)
+++ projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/api/metadata/ra/Icon.java 2011-08-17 18:22:08 UTC (rev 112087)
@@ -255,6 +255,14 @@
return name;
}
+ /**
+ * {@inheritDoc}
+ */
+ public String toString()
+ {
+ return name;
+ }
+
private static final Map<String, Tag> MAP;
static
@@ -327,6 +335,13 @@
return name;
}
+ /**
+ * {@inheritDoc}
+ */
+ public String toString()
+ {
+ return name;
+ }
}
@Override
Modified: projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/api/metadata/ra/InboundResourceAdapter.java
===================================================================
--- projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/api/metadata/ra/InboundResourceAdapter.java 2011-08-17 17:47:30 UTC (rev 112086)
+++ projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/api/metadata/ra/InboundResourceAdapter.java 2011-08-17 18:22:08 UTC (rev 112087)
@@ -127,6 +127,14 @@
return name;
}
+ /**
+ * {@inheritDoc}
+ */
+ public String toString()
+ {
+ return name;
+ }
+
private static final Map<String, Tag> MAP;
static
@@ -194,6 +202,12 @@
return name;
}
+ /**
+ * {@inheritDoc}
+ */
+ public String toString()
+ {
+ return name;
+ }
}
-
}
Modified: projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/api/metadata/ra/LicenseType.java
===================================================================
--- projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/api/metadata/ra/LicenseType.java 2011-08-17 17:47:30 UTC (rev 112086)
+++ projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/api/metadata/ra/LicenseType.java 2011-08-17 18:22:08 UTC (rev 112087)
@@ -172,15 +172,39 @@
@Override
public String toString()
{
- return "LicenseType [description=" + description + ", licenseRequired=" + licenseRequired + ", id=" + id + "]";
+ StringBuilder sb = new StringBuilder();
+
+ sb.append("<license");
+ if (id != null)
+ sb.append(" ").append(Attribute.ID).append("=\"").append(id).append("\"");
+ sb.append(">");
+
+ if (description != null)
+ {
+ for (LocalizedXsdString s : description)
+ {
+ sb.append("<").append(Tag.DESCRIPTION).append(">");
+ sb.append(s);
+ sb.append("</").append(Tag.DESCRIPTION).append(">");
+ }
+ }
+
+ sb.append("<").append(Tag.LICENSE_REQUIRED).append(">");
+ sb.append(licenseRequired);
+ sb.append("</").append(Tag.LICENSE_REQUIRED).append(">");
+
+ sb.append("</license>");
+
+ return sb.toString();
}
+
/**
- *
- * A Tag.
- *
- * @author <a href="stefano.maestri at jboss.com">Stefano Maestri</a>
- *
- */
+ *
+ * A Tag.
+ *
+ * @author <a href="stefano.maestri at jboss.com">Stefano Maestri</a>
+ *
+ */
public enum Tag
{
/** always first
@@ -221,6 +245,14 @@
return name;
}
+ /**
+ * {@inheritDoc}
+ */
+ public String toString()
+ {
+ return name;
+ }
+
private static final Map<String, Tag> MAP;
static
@@ -288,6 +320,13 @@
return name;
}
+ /**
+ * {@inheritDoc}
+ */
+ public String toString()
+ {
+ return name;
+ }
}
@Override
Modified: projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/api/metadata/ra/LocalizedXsdString.java
===================================================================
--- projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/api/metadata/ra/LocalizedXsdString.java 2011-08-17 17:47:30 UTC (rev 112086)
+++ projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/api/metadata/ra/LocalizedXsdString.java 2011-08-17 18:22:08 UTC (rev 112087)
@@ -126,7 +126,7 @@
@Override
public String toString()
{
- return "LocalizedXsdString [lang=" + lang + ", value=" + value + ", id=" + id + "]";
+ return value;
}
@Override
Modified: projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/api/metadata/ra/MessageListener.java
===================================================================
--- projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/api/metadata/ra/MessageListener.java 2011-08-17 17:47:30 UTC (rev 112086)
+++ projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/api/metadata/ra/MessageListener.java 2011-08-17 18:22:08 UTC (rev 112087)
@@ -126,6 +126,14 @@
return name;
}
+ /**
+ * {@inheritDoc}
+ */
+ public String toString()
+ {
+ return name;
+ }
+
private static final Map<String, Tag> MAP;
static
@@ -193,6 +201,12 @@
return name;
}
+ /**
+ * {@inheritDoc}
+ */
+ public String toString()
+ {
+ return name;
+ }
}
-
}
Modified: projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/api/metadata/ra/Messageadapter.java
===================================================================
--- projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/api/metadata/ra/Messageadapter.java 2011-08-17 17:47:30 UTC (rev 112086)
+++ projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/api/metadata/ra/Messageadapter.java 2011-08-17 18:22:08 UTC (rev 112087)
@@ -117,6 +117,14 @@
return name;
}
+ /**
+ * {@inheritDoc}
+ */
+ public String toString()
+ {
+ return name;
+ }
+
private static final Map<String, Tag> MAP;
static
@@ -184,6 +192,12 @@
return name;
}
+ /**
+ * {@inheritDoc}
+ */
+ public String toString()
+ {
+ return name;
+ }
}
-
}
Modified: projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/api/metadata/ra/OutboundResourceAdapter.java
===================================================================
--- projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/api/metadata/ra/OutboundResourceAdapter.java 2011-08-17 17:47:30 UTC (rev 112086)
+++ projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/api/metadata/ra/OutboundResourceAdapter.java 2011-08-17 18:22:08 UTC (rev 112087)
@@ -160,6 +160,14 @@
return name;
}
+ /**
+ * {@inheritDoc}
+ */
+ public String toString()
+ {
+ return name;
+ }
+
private static final Map<String, Tag> MAP;
static
@@ -227,5 +235,12 @@
return name;
}
+ /**
+ * {@inheritDoc}
+ */
+ public String toString()
+ {
+ return name;
+ }
}
}
Modified: projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/api/metadata/ra/OverrideElementAttribute.java
===================================================================
--- projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/api/metadata/ra/OverrideElementAttribute.java 2011-08-17 17:47:30 UTC (rev 112086)
+++ projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/api/metadata/ra/OverrideElementAttribute.java 2011-08-17 18:22:08 UTC (rev 112087)
@@ -86,6 +86,14 @@
return name;
}
+ /**
+ * {@inheritDoc}
+ */
+ public String toString()
+ {
+ return name;
+ }
+
private static final Map<String, OverrideElementAttribute> MAP;
static
Deleted: projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/api/metadata/ra/RaConfigProperty.java
===================================================================
--- projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/api/metadata/ra/RaConfigProperty.java 2011-08-17 17:47:30 UTC (rev 112086)
+++ projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/api/metadata/ra/RaConfigProperty.java 2011-08-17 18:22:08 UTC (rev 112087)
@@ -1,169 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.jca.common.api.metadata.ra;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- *
- * A RaConfigProperty.
- *
- * @author <a href="stefano.maestri at jboss.com">Stefano Maestri</a>
- * @param <T> the type of config
- *
- */
-public interface RaConfigProperty<T>
-{
-
- /**
- * @return name
- */
- public abstract String getName();
-
- /**
- * @return value
- */
- public abstract T getValue();
-
- /**
- * {@inheritDoc}
- *
- * @see java.lang.Object#hashCode()
- */
- @Override
- public abstract int hashCode();
-
- /**
- * {@inheritDoc}
- *
- * @see java.lang.Object#equals(java.lang.Object)
- */
- @Override
- public abstract boolean equals(Object obj);
-
- /**
- * {@inheritDoc}
- *
- * @see java.lang.Object#toString()
- */
- @Override
- public abstract String toString();
-
- /**
- *
- * typeName getter
- *
- * @return the typeName
- */
- public abstract String getTypeName();
-
- /**
- *
- * override-element-attribute metadata getter
- *
- * @return the enum instance {@link OverrideElementAttribute}
- */
- public abstract OverrideElementAttribute getOverrideElementAttribute();
-
- /**
- *
- * A Tag.
- *
- * @author <a href="stefano.maestri at jboss.com">Stefano Maestri</a>
- *
- */
- public enum Tag
- {
- /** always first
- *
- */
- UNKNOWN(null),
-
- /** jboss-ra-property-name tag name
- *
- */
- RA_CONFIG_PROPERTY_NAME("ra-config-property-name"),
-
- /** jboss-ra-property-value tag name
- *
- */
- RA_CONFIG_PROPERTY_VALUE("ra-config-property-value"),
-
- /** jboss-ra-property-type tag name
- *
- */
- RA_CONFIG_PROPERTY_TYPE("ra-config-property-type");
-
- 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 string
- *
- * @param localName a string 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/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/api/metadata/ra/RequiredConfigProperty.java
===================================================================
--- projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/api/metadata/ra/RequiredConfigProperty.java 2011-08-17 17:47:30 UTC (rev 112086)
+++ projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/api/metadata/ra/RequiredConfigProperty.java 2011-08-17 18:22:08 UTC (rev 112087)
@@ -176,8 +176,25 @@
@Override
public String toString()
{
- return "RequiredConfigProperty [description=" + description + ", configPropertyName=" + configPropertyName
- + ", id=" + id + "]";
+ StringBuilder sb = new StringBuilder();
+
+ sb.append("<required-config-property");
+ if (id != null)
+ sb.append(" ").append(Attribute.ID).append("=\"").append(id).append("\"");
+ sb.append(">");
+
+ // description
+
+ if (!XsdString.isNull(configPropertyName))
+ {
+ sb.append("<").append(Tag.CONFIG_PROPERTY_NAME).append(">");
+ sb.append(configPropertyName);
+ sb.append("</").append(Tag.CONFIG_PROPERTY_NAME).append(">");
+ }
+
+ sb.append("</required-config-property>");
+
+ return sb.toString();
}
/**
@@ -227,6 +244,14 @@
return name;
}
+ /**
+ * {@inheritDoc}
+ */
+ public String toString()
+ {
+ return name;
+ }
+
private static final Map<String, Tag> MAP;
static
@@ -294,6 +319,13 @@
return name;
}
+ /**
+ * {@inheritDoc}
+ */
+ public String toString()
+ {
+ return name;
+ }
}
@Override
Modified: projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/api/metadata/ra/ResourceAdapter1516.java
===================================================================
--- projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/api/metadata/ra/ResourceAdapter1516.java 2011-08-17 17:47:30 UTC (rev 112086)
+++ projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/api/metadata/ra/ResourceAdapter1516.java 2011-08-17 18:22:08 UTC (rev 112087)
@@ -170,6 +170,14 @@
return name;
}
+ /**
+ * {@inheritDoc}
+ */
+ public String toString()
+ {
+ return name;
+ }
+
private static final Map<String, Tag> MAP;
static
@@ -237,6 +245,12 @@
return name;
}
+ /**
+ * {@inheritDoc}
+ */
+ public String toString()
+ {
+ return name;
+ }
}
-
}
Modified: projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/api/metadata/ra/SecurityPermission.java
===================================================================
--- projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/api/metadata/ra/SecurityPermission.java 2011-08-17 17:47:30 UTC (rev 112086)
+++ projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/api/metadata/ra/SecurityPermission.java 2011-08-17 18:22:08 UTC (rev 112087)
@@ -127,6 +127,14 @@
return name;
}
+ /**
+ * {@inheritDoc}
+ */
+ public String toString()
+ {
+ return name;
+ }
+
private static final Map<String, Tag> MAP;
static
@@ -194,6 +202,12 @@
return name;
}
+ /**
+ * {@inheritDoc}
+ */
+ public String toString()
+ {
+ return name;
+ }
}
-
}
Modified: projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/api/metadata/ra/XsdString.java
===================================================================
--- projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/api/metadata/ra/XsdString.java 2011-08-17 17:47:30 UTC (rev 112086)
+++ projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/api/metadata/ra/XsdString.java 2011-08-17 18:22:08 UTC (rev 112087)
@@ -151,7 +151,7 @@
@Override
public String toString()
{
- return "XsdString [value=" + value + ", id=" + id + "]";
+ return value;
}
/**
Modified: projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/api/metadata/ra/ra10/Connector10.java
===================================================================
--- projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/api/metadata/ra/ra10/Connector10.java 2011-08-17 17:47:30 UTC (rev 112086)
+++ projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/api/metadata/ra/ra10/Connector10.java 2011-08-17 18:22:08 UTC (rev 112087)
@@ -35,20 +35,13 @@
*/
public interface Connector10 extends Connector
{
-
/**
- * @return moduleName
+ *
+ * A Tag.
+ *
+ * @author <a href="stefano.maestri at jboss.com">Stefano Maestri</a>
+ *
*/
- public abstract String getModuleName();
-
-
- /**
- *
- * A Tag.
- *
- * @author <a href="stefano.maestri at jboss.com">Stefano Maestri</a>
- *
- */
public enum Tag
{
/** always first
@@ -57,11 +50,6 @@
UNKNOWN(null),
/**
- * module-name tag
- */
- MODULENAME("module-name"),
-
- /**
* vendor-name tag
*/
VENDORNAME("vendor-name"),
@@ -72,11 +60,6 @@
EIS_TYPE("eis-type"),
/**
- * resourceadapter-version tag
- */
- RESOURCEADPTER_VERSION("resourceadapter-version"),
-
- /**
* license tag
*/
LICENSE("license"),
@@ -86,7 +69,6 @@
*/
RESOURCEADAPTER("resourceadapter"),
-
/**
* spec-version TAG
*/
@@ -135,6 +117,14 @@
return name;
}
+ /**
+ * {@inheritDoc}
+ */
+ public String toString()
+ {
+ return name;
+ }
+
private static final Map<String, Tag> MAP;
static
@@ -207,5 +197,12 @@
return name;
}
+ /**
+ * {@inheritDoc}
+ */
+ public String toString()
+ {
+ return name;
+ }
}
}
Modified: projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/api/metadata/ra/ra10/ResourceAdapter10.java
===================================================================
--- projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/api/metadata/ra/ra10/ResourceAdapter10.java 2011-08-17 17:47:30 UTC (rev 112086)
+++ projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/api/metadata/ra/ra10/ResourceAdapter10.java 2011-08-17 18:22:08 UTC (rev 112087)
@@ -212,6 +212,14 @@
return name;
}
+ /**
+ * {@inheritDoc}
+ */
+ public String toString()
+ {
+ return name;
+ }
+
private static final Map<String, Tag> MAP;
static
@@ -279,6 +287,12 @@
return name;
}
+ /**
+ * {@inheritDoc}
+ */
+ public String toString()
+ {
+ return name;
+ }
}
-
}
Modified: projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/api/metadata/ra/ra15/Activationspec15.java
===================================================================
--- projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/api/metadata/ra/ra15/Activationspec15.java 2011-08-17 17:47:30 UTC (rev 112086)
+++ projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/api/metadata/ra/ra15/Activationspec15.java 2011-08-17 18:22:08 UTC (rev 112087)
@@ -22,12 +22,13 @@
package org.jboss.jca.common.api.metadata.ra.ra15;
import org.jboss.jca.common.api.metadata.CopyableMetaData;
-import org.jboss.jca.common.api.metadata.ra.ConfigProperty;
import org.jboss.jca.common.api.metadata.ra.IdDecoratedMetadata;
import org.jboss.jca.common.api.metadata.ra.RequiredConfigProperty;
import org.jboss.jca.common.api.metadata.ra.XsdString;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
/**
*
@@ -39,11 +40,6 @@
public interface Activationspec15 extends IdDecoratedMetadata, CopyableMetaData
{
/**
- * @return configProperty
- */
- public abstract List<? extends ConfigProperty> getConfigProperties();
-
- /**
* @return activationspecClass
*/
public abstract XsdString getActivationspecClass();
@@ -75,4 +71,134 @@
@Override
public abstract String toString();
+ /**
+ *
+ * A Tag.
+ *
+ * @author <a href="stefano.maestri at jboss.com">Stefano Maestri</a>
+ *
+ */
+ public enum Tag
+ {
+ /** always first
+ *
+ */
+ UNKNOWN(null),
+
+ /**
+ * activationspec-class TAG
+ */
+ ACTIVATIONSPEC_CLASS("activationspec-class"),
+
+ /**
+ * required-config-property TAG
+ */
+ REQUIRED_CONFIG_PROPERTY("required-config-property");
+
+ 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;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public String toString()
+ {
+ 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 string
+ *
+ * @param localName a string 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;
+ }
+
+ }
+
+ /**
+ *
+ * A Attribute.
+ *
+ * @author <a href="stefano.maestri at jboss.com">Stefano Maestri</a>
+ *
+ */
+ public enum Attribute
+ {
+
+ /** id attribute
+ *
+ */
+ ID("id");
+
+ private final String name;
+
+ /**
+ *
+ * Create a new Tag.
+ *
+ * @param name a name
+ */
+ Attribute(final String name)
+ {
+ this.name = name;
+ }
+
+ /**
+ * Get the local name of this element.
+ *
+ * @return the local name
+ */
+ public String getLocalName()
+ {
+ return name;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public String toString()
+ {
+ return name;
+ }
+ }
}
Modified: projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/api/metadata/ra/ra15/Connector15.java
===================================================================
--- projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/api/metadata/ra/ra15/Connector15.java 2011-08-17 17:47:30 UTC (rev 112086)
+++ projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/api/metadata/ra/ra15/Connector15.java 2011-08-17 18:22:08 UTC (rev 112087)
@@ -123,6 +123,14 @@
return name;
}
+ /**
+ * {@inheritDoc}
+ */
+ public String toString()
+ {
+ return name;
+ }
+
private static final Map<String, Tag> MAP;
static
@@ -195,5 +203,12 @@
return name;
}
+ /**
+ * {@inheritDoc}
+ */
+ public String toString()
+ {
+ return name;
+ }
}
}
Modified: projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/api/metadata/ra/ra16/Activationspec16.java
===================================================================
--- projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/api/metadata/ra/ra16/Activationspec16.java 2011-08-17 17:47:30 UTC (rev 112086)
+++ projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/api/metadata/ra/ra16/Activationspec16.java 2011-08-17 18:22:08 UTC (rev 112087)
@@ -41,7 +41,6 @@
/**
* @return configProperty
*/
- @Override
public abstract List<? extends ConfigProperty> getConfigProperties();
@Override
@@ -54,12 +53,12 @@
public abstract String toString();
/**
- *
- * A Tag.
- *
- * @author <a href="stefano.maestri at jboss.com">Stefano Maestri</a>
- *
- */
+ *
+ * A Tag.
+ *
+ * @author <a href="stefano.maestri at jboss.com">Stefano Maestri</a>
+ *
+ */
public enum Tag
{
/** always first
@@ -105,6 +104,14 @@
return name;
}
+ /**
+ * {@inheritDoc}
+ */
+ public String toString()
+ {
+ return name;
+ }
+
private static final Map<String, Tag> MAP;
static
@@ -172,6 +179,12 @@
return name;
}
+ /**
+ * {@inheritDoc}
+ */
+ public String toString()
+ {
+ return name;
+ }
}
-
}
Modified: projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/api/metadata/ra/ra16/ConfigProperty16.java
===================================================================
--- projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/api/metadata/ra/ra16/ConfigProperty16.java 2011-08-17 17:47:30 UTC (rev 112086)
+++ projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/api/metadata/ra/ra16/ConfigProperty16.java 2011-08-17 18:22:08 UTC (rev 112087)
@@ -147,6 +147,14 @@
return name;
}
+ /**
+ * {@inheritDoc}
+ */
+ public String toString()
+ {
+ return name;
+ }
+
private static final Map<String, Tag> MAP;
static
@@ -214,5 +222,12 @@
return name;
}
+ /**
+ * {@inheritDoc}
+ */
+ public String toString()
+ {
+ return name;
+ }
}
}
Modified: projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/api/metadata/ra/ra16/Connector16.java
===================================================================
--- projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/api/metadata/ra/ra16/Connector16.java 2011-08-17 17:47:30 UTC (rev 112086)
+++ projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/api/metadata/ra/ra16/Connector16.java 2011-08-17 18:22:08 UTC (rev 112087)
@@ -161,6 +161,14 @@
return name;
}
+ /**
+ * {@inheritDoc}
+ */
+ public String toString()
+ {
+ return name;
+ }
+
private static final Map<String, Tag> MAP;
static
@@ -238,5 +246,12 @@
return name;
}
+ /**
+ * {@inheritDoc}
+ */
+ public String toString()
+ {
+ return name;
+ }
}
}
Modified: projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/api/metadata/resourceadapter/ResourceAdapter.java
===================================================================
--- projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/api/metadata/resourceadapter/ResourceAdapter.java 2011-08-17 17:47:30 UTC (rev 112086)
+++ projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/api/metadata/resourceadapter/ResourceAdapter.java 2011-08-17 18:22:08 UTC (rev 112087)
@@ -101,10 +101,10 @@
*/
ADMIN_OBJECTS("admin-objects"),
- /**
- * admin-objects tag
- */
- ADMIN_OBJECT("admin-object");
+ /**
+ * admin-objects tag
+ */
+ ADMIN_OBJECT("admin-object");
private final String name;
@@ -129,6 +129,14 @@
return name;
}
+ /**
+ * {@inheritDoc}
+ */
+ public String toString()
+ {
+ return name;
+ }
+
private static final Map<String, Tag> MAP;
static
Modified: projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/api/metadata/resourceadapter/ResourceAdapters.java
===================================================================
--- projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/api/metadata/resourceadapter/ResourceAdapters.java 2011-08-17 17:47:30 UTC (rev 112086)
+++ projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/api/metadata/resourceadapter/ResourceAdapters.java 2011-08-17 18:22:08 UTC (rev 112087)
@@ -87,6 +87,14 @@
return name;
}
+ /**
+ * {@inheritDoc}
+ */
+ public String toString()
+ {
+ return name;
+ }
+
private static final Map<String, Tag> MAP;
static
Modified: projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/metadata/AbstractParser.java
===================================================================
--- projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/metadata/AbstractParser.java 2011-08-17 17:47:30 UTC (rev 112086)
+++ projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/metadata/AbstractParser.java 2011-08-17 18:22:08 UTC (rev 112087)
@@ -303,7 +303,7 @@
case START_ELEMENT : {
switch (CommonPool.Tag.forName(reader.getLocalName()))
{
- case MAXPOOLSIZE : {
+ case MAX_POOL_SIZE : {
maxPoolSize = elementAsInteger(reader);
break;
}
@@ -447,7 +447,7 @@
case START_ELEMENT : {
switch (CommonXaPool.Tag.forName(reader.getLocalName()))
{
- case MAXPOOLSIZE : {
+ case MAX_POOL_SIZE : {
maxPoolSize = elementAsInteger(reader);
break;
}
Modified: projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/metadata/common/CommonAdminObjectImpl.java
===================================================================
--- projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/metadata/common/CommonAdminObjectImpl.java 2011-08-17 17:47:30 UTC (rev 112086)
+++ projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/metadata/common/CommonAdminObjectImpl.java 2011-08-17 18:22:08 UTC (rev 112087)
@@ -25,6 +25,7 @@
import java.util.Collections;
import java.util.HashMap;
+import java.util.Iterator;
import java.util.Map;
/**
@@ -208,9 +209,47 @@
@Override
public String toString()
{
- return "AdminObjectImpl [configProperties=" + configProperties + ", className=" + className + ", jndiName=" +
- jndiName + ", poolName=" + poolName + ", enabled=" + enabled + ", useJavaContext=" + useJavaContext +
- "]";
+ StringBuilder sb = new StringBuilder(1024);
+
+ sb.append("<admin-object");
+
+ if (className != null)
+ sb.append(" ").append(CommonAdminObject.Attribute.CLASS_NAME).append("=\"").append(className).append("\"");
+
+ if (jndiName != null)
+ sb.append(" ").append(CommonAdminObject.Attribute.JNDINAME).append("=\"").append(jndiName).append("\"");
+
+ if (enabled != null)
+ sb.append(" ").append(CommonAdminObject.Attribute.ENABLED).append("=\"").append(enabled).append("\"");
+
+ if (useJavaContext != null)
+ {
+ sb.append(" ").append(CommonAdminObject.Attribute.USEJAVACONTEXT);
+ sb.append("=\"").append(useJavaContext).append("\"");
+ }
+
+ if (poolName != null)
+ sb.append(" ").append(CommonAdminObject.Attribute.POOL_NAME).append("=\"").append(poolName).append("\"");
+
+ sb.append(">");
+
+ if (configProperties != null && configProperties.size() > 0)
+ {
+ Iterator<Map.Entry<String, String>> it = configProperties.entrySet().iterator();
+ while (it.hasNext())
+ {
+ Map.Entry<String, String> entry = it.next();
+
+ sb.append("<").append(CommonAdminObject.Tag.CONFIG_PROPERTY);
+ sb.append(" name=\"").append(entry.getKey()).append("\">");
+ sb.append(entry.getValue());
+ sb.append("</").append(CommonAdminObject.Tag.CONFIG_PROPERTY).append(">");
+ }
+ }
+
+ sb.append("</admin-object>");
+
+ return sb.toString();
}
/**
Modified: projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/metadata/common/CommonConnDefImpl.java
===================================================================
--- projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/metadata/common/CommonConnDefImpl.java 2011-08-17 17:47:30 UTC (rev 112086)
+++ projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/metadata/common/CommonConnDefImpl.java 2011-08-17 18:22:08 UTC (rev 112087)
@@ -31,6 +31,7 @@
import java.util.Collections;
import java.util.HashMap;
+import java.util.Iterator;
import java.util.Map;
/**
@@ -360,10 +361,66 @@
@Override
public String toString()
{
- return "CommonConnDefImpl [configProperties=" + configProperties + ", className=" + className + ", jndiName=" +
- jndiName + ", poolName=" + poolName + ", enabled=" + enabled + ", useJavaContext=" + useJavaContext +
- ", useCcm=" + useCcm + ", pool=" + pool + ", timeOut=" + timeOut + ", validation=" + validation +
- ", security=" + security + ", recovery=" + recovery + "]";
+ StringBuilder sb = new StringBuilder(1024);
+
+ sb.append("<connection-definition");
+
+ if (className != null)
+ sb.append(" ").append(CommonConnDef.Attribute.CLASS_NAME).append("=\"").append(className).append("\"");
+
+ if (jndiName != null)
+ sb.append(" ").append(CommonConnDef.Attribute.JNDINAME).append("=\"").append(jndiName).append("\"");
+
+ if (enabled != null)
+ sb.append(" ").append(CommonConnDef.Attribute.ENABLED).append("=\"").append(enabled).append("\"");
+
+ if (useJavaContext != null)
+ {
+ sb.append(" ").append(CommonConnDef.Attribute.USEJAVACONTEXT);
+ sb.append("=\"").append(useJavaContext).append("\"");
+ }
+
+ if (poolName != null)
+ sb.append(" ").append(CommonConnDef.Attribute.POOL_NAME).append("=\"").append(poolName).append("\"");
+
+ if (useCcm != null)
+ sb.append(" ").append(CommonConnDef.Attribute.USECCM).append("=\"").append(useCcm).append("\"");
+
+ sb.append(">");
+
+ if (configProperties != null && configProperties.size() > 0)
+ {
+ Iterator<Map.Entry<String, String>> it = configProperties.entrySet().iterator();
+ while (it.hasNext())
+ {
+ Map.Entry<String, String> entry = it.next();
+
+ sb.append("<").append(CommonConnDef.Tag.CONFIG_PROPERTY);
+ sb.append(" name=\"").append(entry.getKey()).append("\">");
+ sb.append(entry.getValue());
+ sb.append("</").append(CommonConnDef.Tag.CONFIG_PROPERTY).append(">");
+ }
+ }
+
+ if (pool != null)
+ sb.append(pool);
+
+
+ if (security != null)
+ sb.append(security);
+
+ if (timeOut != null)
+ sb.append(timeOut);
+
+ if (validation != null)
+ sb.append(validation);
+
+ if (recovery != null)
+ sb.append(recovery);
+
+ sb.append("</connection-definition>");
+
+ return sb.toString();
}
/**
@@ -376,5 +433,4 @@
{
return recovery;
}
-
}
Modified: projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/metadata/common/CommonIronJacamarImpl.java
===================================================================
--- projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/metadata/common/CommonIronJacamarImpl.java 2011-08-17 17:47:30 UTC (rev 112086)
+++ projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/metadata/common/CommonIronJacamarImpl.java 2011-08-17 18:22:08 UTC (rev 112087)
@@ -259,13 +259,8 @@
return true;
}
- @Override
- public String toString()
- {
- return "CommonIronJacamarImpl [transactionSupport=" + transactionSupport + ", configProperties=" +
- configProperties + ", adminObjects=" + adminObjects + ", connectionDefinitions=" +
- connectionDefinitions + ", beanValidationGroups=" + beanValidationGroups + ", bootstrapContext=" +
- bootstrapContext + "]";
- }
-
+ /**
+ * {@inheritDoc}
+ */
+ public abstract String toString();
}
Modified: projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/metadata/common/CommonPoolImpl.java
===================================================================
--- projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/metadata/common/CommonPoolImpl.java 2011-08-17 17:47:30 UTC (rev 112086)
+++ projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/metadata/common/CommonPoolImpl.java 2011-08-17 18:22:08 UTC (rev 112087)
@@ -151,7 +151,7 @@
public void validate() throws ValidateException
{
if (this.maxPoolSize != null && this.maxPoolSize < 0)
- throw new ValidateException(bundle.invalidNegative(Tag.MAXPOOLSIZE.getLocalName()));
+ throw new ValidateException(bundle.invalidNegative(Tag.MAX_POOL_SIZE.getLocalName()));
if (this.minPoolSize != null && this.minPoolSize < 0)
throw new ValidateException(bundle.invalidNegative(Tag.MIN_POOL_SIZE.getLocalName()));
@@ -159,4 +159,53 @@
if (this.flushStrategy == null)
throw new ValidateException(bundle.nullValue(Tag.FLUSH_STRATEGY.getLocalName()));
}
+
+ /**
+ * {@inheritDoc}
+ */
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder(1024);
+
+ sb.append("<pool>");
+
+ if (minPoolSize != null)
+ {
+ sb.append("<").append(CommonPool.Tag.MIN_POOL_SIZE).append(">");
+ sb.append(minPoolSize);
+ sb.append("</").append(CommonPool.Tag.MIN_POOL_SIZE).append(">");
+ }
+
+ if (maxPoolSize != null)
+ {
+ sb.append("<").append(CommonPool.Tag.MAX_POOL_SIZE).append(">");
+ sb.append(maxPoolSize);
+ sb.append("</").append(CommonPool.Tag.MAX_POOL_SIZE).append(">");
+ }
+
+ if (prefill != null)
+ {
+ sb.append("<").append(CommonPool.Tag.PREFILL).append(">");
+ sb.append(prefill);
+ sb.append("</").append(CommonPool.Tag.PREFILL).append(">");
+ }
+
+ if (useStrictMin != null)
+ {
+ sb.append("<").append(CommonPool.Tag.USE_STRICT_MIN).append(">");
+ sb.append(useStrictMin);
+ sb.append("</").append(CommonPool.Tag.USE_STRICT_MIN).append(">");
+ }
+
+ if (flushStrategy != null)
+ {
+ sb.append("<").append(CommonPool.Tag.FLUSH_STRATEGY).append(">");
+ sb.append(flushStrategy);
+ sb.append("</").append(CommonPool.Tag.FLUSH_STRATEGY).append(">");
+ }
+
+ sb.append("</pool>");
+
+ return sb.toString();
+ }
}
Modified: projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/metadata/common/CommonSecurityImpl.java
===================================================================
--- projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/metadata/common/CommonSecurityImpl.java 2011-08-17 17:47:30 UTC (rev 112086)
+++ projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/metadata/common/CommonSecurityImpl.java 2011-08-17 18:22:08 UTC (rev 112087)
@@ -111,9 +111,30 @@
@Override
public String toString()
{
- return "CommonSecurityImpl [securityDomainManaged=" + securityDomainManaged +
- ", securityDomainAndApplicationManaged=" + securityDomainAndApplicationManaged +
- ", applicationManaged=" + applicationManaged + "]";
+ StringBuilder sb = new StringBuilder(1024);
+
+ sb.append("<security>");
+
+ if (applicationManaged)
+ {
+ sb.append("<").append(CommonSecurity.Tag.APPLICATION).append("/>");
+ }
+ else if (securityDomainManaged != null)
+ {
+ sb.append("<").append(CommonSecurity.Tag.SECURITY_DOMAIN).append(">");
+ sb.append(securityDomainManaged);
+ sb.append("</").append(CommonSecurity.Tag.SECURITY_DOMAIN).append(">");
+ }
+ else if (securityDomainAndApplicationManaged != null)
+ {
+ sb.append("<").append(CommonSecurity.Tag.SECURITY_DOMAIN_AND_APPLICATION).append(">");
+ sb.append(securityDomainAndApplicationManaged);
+ sb.append("</").append(CommonSecurity.Tag.SECURITY_DOMAIN_AND_APPLICATION).append(">");
+ }
+
+ sb.append("</security>");
+
+ return sb.toString();
}
/**
Modified: projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/metadata/common/CommonTimeOutImpl.java
===================================================================
--- projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/metadata/common/CommonTimeOutImpl.java 2011-08-17 17:47:30 UTC (rev 112086)
+++ projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/metadata/common/CommonTimeOutImpl.java 2011-08-17 18:22:08 UTC (rev 112087)
@@ -198,12 +198,50 @@
@Override
public String toString()
{
- return "CommonTimeOutImpl [blockingTimeoutMillis=" + blockingTimeoutMillis + ", idleTimeoutMinutes=" +
- idleTimeoutMinutes + ", allocationRetry=" + allocationRetry + ", allocationRetryWaitMillis=" +
- allocationRetryWaitMillis + ", xaResourceTimeout=" + xaResourceTimeout + "]";
+ StringBuilder sb = new StringBuilder(1024);
+
+ sb.append("<timeout>");
+
+ if (blockingTimeoutMillis != null)
+ {
+ sb.append("<").append(CommonTimeOut.Tag.BLOCKINGTIMEOUTMILLIS).append(">");
+ sb.append(blockingTimeoutMillis);
+ sb.append("</").append(CommonTimeOut.Tag.BLOCKINGTIMEOUTMILLIS).append(">");
+ }
+
+ if (idleTimeoutMinutes != null)
+ {
+ sb.append("<").append(CommonTimeOut.Tag.IDLETIMEOUTMINUTES).append(">");
+ sb.append(idleTimeoutMinutes);
+ sb.append("</").append(CommonTimeOut.Tag.IDLETIMEOUTMINUTES).append(">");
+ }
+
+ if (allocationRetry != null)
+ {
+ sb.append("<").append(CommonTimeOut.Tag.ALLOCATIONRETRY).append(">");
+ sb.append(allocationRetry);
+ sb.append("</").append(CommonTimeOut.Tag.ALLOCATIONRETRY).append(">");
+ }
+
+ if (allocationRetryWaitMillis != null)
+ {
+ sb.append("<").append(CommonTimeOut.Tag.ALLOCATIONRETRYWAITMILLIS).append(">");
+ sb.append(allocationRetryWaitMillis);
+ sb.append("</").append(CommonTimeOut.Tag.ALLOCATIONRETRYWAITMILLIS).append(">");
+ }
+
+ if (xaResourceTimeout != null)
+ {
+ sb.append("<").append(CommonTimeOut.Tag.XARESOURCETIMEOUT).append(">");
+ sb.append(xaResourceTimeout);
+ sb.append("</").append(CommonTimeOut.Tag.XARESOURCETIMEOUT).append(">");
+ }
+
+ sb.append("</timeout>");
+
+ return sb.toString();
}
-
private void partialCommonValidate() throws ValidateException
{
if (this.allocationRetry != null && this.allocationRetry < 0)
Modified: projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/metadata/common/CommonValidationImpl.java
===================================================================
--- projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/metadata/common/CommonValidationImpl.java 2011-08-17 17:47:30 UTC (rev 112086)
+++ projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/metadata/common/CommonValidationImpl.java 2011-08-17 18:22:08 UTC (rev 112087)
@@ -141,8 +141,33 @@
@Override
public String toString()
{
- return "SValidationImpl [backgroundValidation=" + backgroundValidation + ", backgroundValidationMillis=" +
- backgroundValidationMillis + ", useFastFail=" + useFastFail + "]";
+ StringBuilder sb = new StringBuilder(1024);
+
+ sb.append("<validation>");
+
+ if (backgroundValidation != null)
+ {
+ sb.append("<").append(CommonValidation.Tag.BACKGROUNDVALIDATION).append(">");
+ sb.append(backgroundValidation);
+ sb.append("</").append(CommonValidation.Tag.BACKGROUNDVALIDATION).append(">");
+ }
+
+ if (backgroundValidationMillis != null)
+ {
+ sb.append("<").append(CommonValidation.Tag.BACKGROUNDVALIDATIONMILLIS).append(">");
+ sb.append(backgroundValidationMillis);
+ sb.append("</").append(CommonValidation.Tag.BACKGROUNDVALIDATIONMILLIS).append(">");
+ }
+
+ if (useFastFail != null)
+ {
+ sb.append("<").append(CommonValidation.Tag.USEFASTFAIL).append(">");
+ sb.append(useFastFail);
+ sb.append("</").append(CommonValidation.Tag.USEFASTFAIL).append(">");
+ }
+
+ sb.append("</validation>");
+
+ return sb.toString();
}
-
}
Modified: projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/metadata/common/CommonXaPoolImpl.java
===================================================================
--- projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/metadata/common/CommonXaPoolImpl.java 2011-08-17 17:47:30 UTC (rev 112086)
+++ projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/metadata/common/CommonXaPoolImpl.java 2011-08-17 18:22:08 UTC (rev 112087)
@@ -43,7 +43,7 @@
private final Boolean padXid;
- private final Boolean wrapXaDataSource;
+ private final Boolean wrapXaResource;
private final Boolean noTxSeparatePool;
@@ -59,7 +59,7 @@
* @param isSameRmOverride isSameRmOverride
* @param interleaving interleaving
* @param padXid padXid
- * @param wrapXaDataSource wrapXaDataSource
+ * @param wrapXaResource wrapXaResource
* @param noTxSeparatePool noTxSeparatePool
* @throws ValidateException ValidateException
*/
@@ -67,14 +67,14 @@
Boolean prefill, Boolean useStrictMin,
FlushStrategy flushStrategy,
Boolean isSameRmOverride, Boolean interleaving,
- Boolean padXid, Boolean wrapXaDataSource,
+ Boolean padXid, Boolean wrapXaResource,
Boolean noTxSeparatePool) throws ValidateException
{
super(minPoolSize, maxPoolSize, prefill, useStrictMin, flushStrategy);
this.isSameRmOverride = isSameRmOverride;
this.interleaving = interleaving;
this.padXid = padXid;
- this.wrapXaDataSource = wrapXaDataSource;
+ this.wrapXaResource = wrapXaResource;
this.noTxSeparatePool = noTxSeparatePool;
}
@@ -112,14 +112,14 @@
}
/**
- * Get the wrapXaDataSource.
+ * Get the wrapXaResource.
*
- * @return the wrapXaDataSource.
+ * @return the wrapXaResource.
*/
@Override
- public final Boolean isWrapXaDataSource()
+ public final Boolean isWrapXaResource()
{
- return wrapXaDataSource;
+ return wrapXaResource;
}
/**
@@ -142,7 +142,7 @@
result = prime * result + ((isSameRmOverride == null) ? 0 : isSameRmOverride.hashCode());
result = prime * result + ((noTxSeparatePool == null) ? 0 : noTxSeparatePool.hashCode());
result = prime * result + ((padXid == null) ? 0 : padXid.hashCode());
- result = prime * result + ((wrapXaDataSource == null) ? 0 : wrapXaDataSource.hashCode());
+ result = prime * result + ((wrapXaResource == null) ? 0 : wrapXaResource.hashCode());
return result;
}
@@ -184,22 +184,99 @@
}
else if (!padXid.equals(other.padXid))
return false;
- if (wrapXaDataSource == null)
+ if (wrapXaResource == null)
{
- if (other.wrapXaDataSource != null)
+ if (other.wrapXaResource != null)
return false;
}
- else if (!wrapXaDataSource.equals(other.wrapXaDataSource))
+ else if (!wrapXaResource.equals(other.wrapXaResource))
return false;
return true;
}
+ /**
+ * {@inheritDoc}
+ */
@Override
public String toString()
{
- return "CommonXaPoolImpl [isSameRmOverride=" + isSameRmOverride + ", interleaving=" + interleaving +
- ", padXid=" + padXid + ", wrapXaDataSource=" + wrapXaDataSource + ", noTxSeparatePool=" +
- noTxSeparatePool + "]";
+ StringBuilder sb = new StringBuilder(1024);
+
+ sb.append("<xa-pool>");
+
+ if (minPoolSize != null)
+ {
+ sb.append("<").append(CommonXaPool.Tag.MIN_POOL_SIZE).append(">");
+ sb.append(minPoolSize);
+ sb.append("</").append(CommonXaPool.Tag.MIN_POOL_SIZE).append(">");
+ }
+
+ if (maxPoolSize != null)
+ {
+ sb.append("<").append(CommonXaPool.Tag.MAX_POOL_SIZE).append(">");
+ sb.append(maxPoolSize);
+ sb.append("</").append(CommonXaPool.Tag.MAX_POOL_SIZE).append(">");
+ }
+
+ if (prefill != null)
+ {
+ sb.append("<").append(CommonXaPool.Tag.PREFILL).append(">");
+ sb.append(prefill);
+ sb.append("</").append(CommonXaPool.Tag.PREFILL).append(">");
+ }
+
+ if (useStrictMin != null)
+ {
+ sb.append("<").append(CommonXaPool.Tag.USE_STRICT_MIN).append(">");
+ sb.append(useStrictMin);
+ sb.append("</").append(CommonXaPool.Tag.USE_STRICT_MIN).append(">");
+ }
+
+ if (flushStrategy != null)
+ {
+ sb.append("<").append(CommonXaPool.Tag.FLUSH_STRATEGY).append(">");
+ sb.append(flushStrategy);
+ sb.append("</").append(CommonXaPool.Tag.FLUSH_STRATEGY).append(">");
+ }
+
+ if (isSameRmOverride != null)
+ {
+ sb.append("<").append(CommonXaPool.Tag.ISSAMERMOVERRIDEVALUE).append(">");
+ sb.append(isSameRmOverride);
+ sb.append("</").append(CommonXaPool.Tag.ISSAMERMOVERRIDEVALUE).append(">");
+ }
+
+ if (interleaving != null)
+ {
+ sb.append("<").append(CommonXaPool.Tag.INTERLEAVING).append(">");
+ sb.append(interleaving);
+ sb.append("</").append(CommonXaPool.Tag.INTERLEAVING).append(">");
+ }
+
+ if (noTxSeparatePool != null)
+ {
+ sb.append("<").append(CommonXaPool.Tag.NO_TX_SEPARATE_POOLS).append(">");
+ sb.append(noTxSeparatePool);
+ sb.append("</").append(CommonXaPool.Tag.NO_TX_SEPARATE_POOLS).append(">");
+ }
+
+ if (padXid != null)
+ {
+ sb.append("<").append(CommonXaPool.Tag.PAD_XID).append(">");
+ sb.append(padXid);
+ sb.append("</").append(CommonXaPool.Tag.PAD_XID).append(">");
+ }
+
+ if (wrapXaResource != null)
+ {
+ sb.append("<").append(CommonXaPool.Tag.WRAP_XA_RESOURCE).append(">");
+ sb.append(wrapXaResource);
+ sb.append("</").append(CommonXaPool.Tag.WRAP_XA_RESOURCE).append(">");
+ }
+
+ sb.append("</xa-pool>");
+
+ return sb.toString();
}
}
Modified: projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/metadata/common/CredentialImpl.java
===================================================================
--- projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/metadata/common/CredentialImpl.java 2011-08-17 17:47:30 UTC (rev 112086)
+++ projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/metadata/common/CredentialImpl.java 2011-08-17 18:22:08 UTC (rev 112087)
@@ -128,13 +128,6 @@
return true;
}
- @Override
- public String toString()
- {
- return "DsSecurityImpl [userName=" + userName + ", password=" + password + ", securityDomain=" +
- securityDomain + "]";
- }
-
/**
* Get the securityDomainManaged.
*
@@ -146,8 +139,6 @@
return securityDomain;
}
-
-
@Override
public void validate() throws ValidateException
{
Modified: projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/metadata/ds/DataSourceAbstractImpl.java
===================================================================
--- projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/metadata/ds/DataSourceAbstractImpl.java 2011-08-17 17:47:30 UTC (rev 112086)
+++ projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/metadata/ds/DataSourceAbstractImpl.java 2011-08-17 18:22:08 UTC (rev 112087)
@@ -411,4 +411,8 @@
this.enabled = enabled;
}
+ /**
+ * {@inheritDoc}
+ */
+ public abstract String toString();
}
Modified: projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/metadata/ds/DataSourceImpl.java
===================================================================
--- projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/metadata/ds/DataSourceImpl.java 2011-08-17 17:47:30 UTC (rev 112086)
+++ projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/metadata/ds/DataSourceImpl.java 2011-08-17 18:22:08 UTC (rev 112087)
@@ -33,6 +33,7 @@
import java.util.Collections;
import java.util.HashMap;
+import java.util.Iterator;
import java.util.Map;
import org.jboss.logging.Messages;
@@ -321,10 +322,120 @@
@Override
public String toString()
{
- return "DataSourceImpl [connectionUrl=" + connectionUrl + ", driverClass=" + driverClass +
- ", dataSourceClass=" + dataSourceClass + ", driver=" + driver +
- ", connectionProperties=" + connectionProperties + ", newConnectionSql=" + newConnectionSql +
- ", pool=" + pool + "]";
+ StringBuilder sb = new StringBuilder();
+
+ sb.append("<datasource");
+
+ if (jndiName != null)
+ sb.append(" ").append(DataSource.Attribute.JNDINAME).append("=\"").append(jndiName).append("\"");
+
+ if (poolName != null)
+ sb.append(" ").append(DataSource.Attribute.POOL_NAME).append("=\"").append(poolName).append("\"");
+
+ if (enabled != null)
+ sb.append(" ").append(DataSource.Attribute.ENABLED).append("=\"").append(enabled).append("\"");
+
+ if (useJavaContext != null)
+ sb.append(" ").append(DataSource.Attribute.USEJAVACONTEXT).append("=\"").append(useJavaContext).append("\"");
+
+ if (spy)
+ sb.append(" ").append(DataSource.Attribute.SPY).append("=\"").append(spy).append("\"");
+
+ if (useCcm)
+ sb.append(" ").append(DataSource.Attribute.USE_CCM).append("=\"").append(useCcm).append("\"");
+
+ if (jta)
+ sb.append(" ").append(DataSource.Attribute.JTA).append("=\"").append(jta).append("\"");
+
+ sb.append(">");
+
+ if (connectionUrl != null)
+ {
+ sb.append("<").append(DataSource.Tag.CONNECTIONURL).append(">");
+ sb.append(connectionUrl);
+ sb.append("</").append(DataSource.Tag.CONNECTIONURL).append(">");
+ }
+
+ if (driverClass != null)
+ {
+ sb.append("<").append(DataSource.Tag.DRIVERCLASS).append(">");
+ sb.append(driverClass);
+ sb.append("</").append(DataSource.Tag.DRIVERCLASS).append(">");
+ }
+
+ if (dataSourceClass != null)
+ {
+ sb.append("<").append(DataSource.Tag.DATASOURCECLASS).append(">");
+ sb.append(dataSourceClass);
+ sb.append("</").append(DataSource.Tag.DATASOURCECLASS).append(">");
+ }
+
+ if (driver != null)
+ {
+ sb.append("<").append(DataSource.Tag.DRIVER).append(">");
+ sb.append(driver);
+ sb.append("</").append(DataSource.Tag.DRIVER).append(">");
+ }
+
+ if (connectionProperties != null && connectionProperties.size() > 0)
+ {
+ Iterator<Map.Entry<String, String>> it = connectionProperties.entrySet().iterator();
+ while (it.hasNext())
+ {
+ Map.Entry<String, String> entry = it.next();
+ sb.append("<").append(DataSource.Tag.CONNECTIONPROPERTY);
+ sb.append(" name=\"").append(entry.getKey()).append("\">");
+ sb.append(entry.getValue());
+ sb.append("</").append(DataSource.Tag.CONNECTIONPROPERTY).append(">");
+ }
+ }
+
+ if (newConnectionSql != null)
+ {
+ sb.append("<").append(DataSource.Tag.NEWCONNECTIONSQL).append(">");
+ sb.append(newConnectionSql);
+ sb.append("</").append(DataSource.Tag.NEWCONNECTIONSQL).append(">");
+ }
+
+ if (transactionIsolation != null)
+ {
+ sb.append("<").append(DataSource.Tag.TRANSACTIONISOLATION).append(">");
+ sb.append(transactionIsolation);
+ sb.append("</").append(DataSource.Tag.TRANSACTIONISOLATION).append(">");
+ }
+
+ if (urlDelimiter != null)
+ {
+ sb.append("<").append(DataSource.Tag.URLDELIMITER).append(">");
+ sb.append(urlDelimiter);
+ sb.append("</").append(DataSource.Tag.URLDELIMITER).append(">");
+ }
+
+ if (urlSelectorStrategyClassName != null)
+ {
+ sb.append("<").append(DataSource.Tag.URLSELECTORSTRATEGYCLASSNAME).append(">");
+ sb.append(urlSelectorStrategyClassName);
+ sb.append("</").append(DataSource.Tag.URLSELECTORSTRATEGYCLASSNAME).append(">");
+ }
+
+ if (pool != null)
+ sb.append(pool);
+
+ if (security != null)
+ sb.append(security);
+
+ if (validation != null)
+ sb.append(validation);
+
+ if (timeOut != null)
+ sb.append(timeOut);
+
+ if (statement != null)
+ sb.append(statement);
+
+ sb.append("</datasource>");
+
+ return sb.toString();
}
@Override
Modified: projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/metadata/ds/DatasourcesImpl.java
===================================================================
--- projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/metadata/ds/DatasourcesImpl.java 2011-08-17 17:47:30 UTC (rev 112086)
+++ projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/metadata/ds/DatasourcesImpl.java 2011-08-17 18:22:08 UTC (rev 112087)
@@ -32,7 +32,6 @@
import java.util.HashMap;
import java.util.List;
-
/**
*
* A DatasourcesImpl.
@@ -123,6 +122,7 @@
int result = 1;
result = prime * result + ((datasource == null) ? 0 : datasource.hashCode());
result = prime * result + ((xaDataSource == null) ? 0 : xaDataSource.hashCode());
+ result = prime * result + ((drivers == null) ? 0 : drivers.hashCode());
return result;
}
@@ -150,19 +150,61 @@
}
else if (!xaDataSource.equals(other.xaDataSource))
return false;
+ if (drivers == null)
+ {
+ if (other.drivers != null)
+ return false;
+ }
+ else if (!drivers.equals(other.drivers))
+ return false;
return true;
}
@Override
public String toString()
{
- return "DatasourcesImpl [datasource=" + datasource + ", xaDataSource=" + xaDataSource + "]";
+ StringBuilder sb = new StringBuilder();
+
+ sb.append("<?xml version=\"1.0\" encoding=\"UTF-8\"?>");
+ sb.append("<datasources>");
+
+ if (datasource != null && datasource.size() > 0)
+ {
+ for (DataSource ds : datasource)
+ {
+ sb.append(ds);
+ }
+ }
+
+ if (xaDataSource != null && xaDataSource.size() > 0)
+ {
+ for (XaDataSource xads : xaDataSource)
+ {
+ sb.append(xads);
+ }
+ }
+
+ if (drivers != null && drivers.size() > 0)
+ {
+ sb.append("<").append(DataSources.Tag.DRIVERS).append(">");
+
+ for (Driver d : drivers.values())
+ {
+ sb.append(d);
+ }
+
+ sb.append("</").append(DataSources.Tag.DRIVERS).append(">");
+ }
+
+ sb.append("</datasources>");
+
+ return sb.toString();
}
@Override
public void validate() throws ValidateException
{
- //always validate if all contetents are validating
+ //always validate if all content is validating
for (DataSource ds : this.datasource)
{
ds.validate();
@@ -184,5 +226,4 @@
{
return Collections.unmodifiableList(new ArrayList<Driver>(drivers.values()));
}
-
}
Modified: projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/metadata/ds/DriverImpl.java
===================================================================
--- projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/metadata/ds/DriverImpl.java 2011-08-17 17:47:30 UTC (rev 112086)
+++ projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/metadata/ds/DriverImpl.java 2011-08-17 18:22:08 UTC (rev 112087)
@@ -169,9 +169,48 @@
@Override
public String toString()
{
- return "DriverImpl [name=" + name + ", minorVersion=" + minorVersion + ", majorVersion=" + majorVersion +
- ", module=" + module + ", driverClass=" + driverClass + ", dataSourceClass=" + dataSourceClass +
- ", xaDataSourceClass=" + xaDataSourceClass + "]";
+ StringBuilder sb = new StringBuilder();
+
+ sb.append("<driver");
+
+ if (name != null)
+ sb.append(" ").append(Driver.Attribute.NAME).append("=\"").append(name).append("\"");
+
+ if (module != null)
+ sb.append(" ").append(Driver.Attribute.MODULE).append("=\"").append(module).append("\"");
+
+ if (majorVersion != null)
+ sb.append(" ").append(Driver.Attribute.MAJOR_VERSION).append("=\"").append(majorVersion).append("\"");
+
+ if (minorVersion != null)
+ sb.append(" ").append(Driver.Attribute.MINOR_VERSION).append("=\"").append(minorVersion).append("\"");
+
+ sb.append(">");
+
+ if (driverClass != null)
+ {
+ sb.append("<").append(Driver.Tag.DRIVERCLASS).append(">");
+ sb.append(driverClass);
+ sb.append("</").append(Driver.Tag.DRIVERCLASS).append(">");
+ }
+
+ if (dataSourceClass != null)
+ {
+ sb.append("<").append(Driver.Tag.DATASOURCECLASS).append(">");
+ sb.append(dataSourceClass);
+ sb.append("</").append(Driver.Tag.DATASOURCECLASS).append(">");
+ }
+
+ if (xaDataSourceClass != null)
+ {
+ sb.append("<").append(Driver.Tag.XADATASOURCECLASS).append(">");
+ sb.append(xaDataSourceClass);
+ sb.append("</").append(Driver.Tag.XADATASOURCECLASS).append(">");
+ }
+
+ sb.append("</driver>");
+
+ return sb.toString();
}
@Override
Modified: projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/metadata/ds/DsSecurityImpl.java
===================================================================
--- projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/metadata/ds/DsSecurityImpl.java 2011-08-17 17:47:30 UTC (rev 112086)
+++ projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/metadata/ds/DsSecurityImpl.java 2011-08-17 18:22:08 UTC (rev 112087)
@@ -26,6 +26,9 @@
import org.jboss.jca.common.api.validator.ValidateException;
import org.jboss.jca.common.metadata.common.CredentialImpl;
+import java.util.Iterator;
+import java.util.Map;
+
/**
*
* A DsSecurityImpl.
@@ -101,9 +104,56 @@
@Override
public String toString()
{
- return "DsSecurityImpl [reauthPlugin=" + reauthPlugin + ", getUserName()=" + getUserName() +
- ", getPassword()=" + getPassword() + ", getSecurityDomain()=" + getSecurityDomain() + "]";
+ StringBuilder sb = new StringBuilder();
+
+ sb.append("<security>");
+
+ if (getUserName() != null)
+ {
+ sb.append("<").append(DsSecurity.Tag.USERNAME).append(">");
+ sb.append(getUserName());
+ sb.append("</").append(DsSecurity.Tag.USERNAME).append(">");
+
+ sb.append("<").append(DsSecurity.Tag.PASSWORD).append(">");
+ sb.append(getPassword());
+ sb.append("</").append(DsSecurity.Tag.PASSWORD).append(">");
+ }
+ else if (getSecurityDomain() != null)
+ {
+ sb.append("<").append(DsSecurity.Tag.SECURITY_DOMAIN).append(">");
+ sb.append(getSecurityDomain());
+ sb.append("</").append(DsSecurity.Tag.SECURITY_DOMAIN).append(">");
+ }
+
+ if (getReauthPlugin() != null)
+ {
+ sb.append("<").append(DsSecurity.Tag.REAUTH_PLUGIN);
+ sb.append(" ").append(Extension.Attribute.CLASS_NAME).append("=\"");
+ sb.append(getReauthPlugin().getClassName()).append("\"");
+ sb.append(">");
+
+ if (getReauthPlugin().getConfigPropertiesMap() != null &&
+ getReauthPlugin().getConfigPropertiesMap().size() > 0)
+ {
+ Iterator<Map.Entry<String, String>> it = getReauthPlugin().getConfigPropertiesMap().entrySet().iterator();
+
+ while (it.hasNext())
+ {
+ Map.Entry<String, String> entry = it.next();
+
+ sb.append("<").append(Extension.Tag.CONFIG_PROPERTY);
+ sb.append(" name=\"").append(entry.getKey()).append("\">");
+ sb.append(entry.getValue());
+ sb.append("</").append(Extension.Tag.CONFIG_PROPERTY).append(">");
+ }
+ }
+
+ sb.append("</").append(DsSecurity.Tag.REAUTH_PLUGIN).append(">");
+ }
+
+ sb.append("</security>");
+
+ return sb.toString();
}
-
}
Modified: projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/metadata/ds/StatementImpl.java
===================================================================
--- projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/metadata/ds/StatementImpl.java 2011-08-17 17:47:30 UTC (rev 112086)
+++ projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/metadata/ds/StatementImpl.java 2011-08-17 18:22:08 UTC (rev 112087)
@@ -142,9 +142,32 @@
@Override
public String toString()
{
- return "StatementImpl [sharePreparedStatements=" + sharePreparedStatements +
- ", preparedStatementsCacheSize=" + preparedStatementsCacheSize +
- ", trackStatements=" + trackStatements + "]";
+ StringBuilder sb = new StringBuilder();
+
+ sb.append("<statement>");
+
+ if (trackStatements != null)
+ {
+ sb.append("<").append(Statement.Tag.TRACKSTATEMENTS).append(">");
+ sb.append(trackStatements);
+ sb.append("</").append(Statement.Tag.TRACKSTATEMENTS).append(">");
+ }
+
+ if (preparedStatementsCacheSize != null)
+ {
+ sb.append("<").append(Statement.Tag.PREPAREDSTATEMENTCACHESIZE).append(">");
+ sb.append(preparedStatementsCacheSize);
+ sb.append("</").append(Statement.Tag.PREPAREDSTATEMENTCACHESIZE).append(">");
+ }
+
+ if (sharePreparedStatements != null && Boolean.TRUE.equals(sharePreparedStatements))
+ {
+ sb.append("<").append(Statement.Tag.SHAREPREPAREDSTATEMENTS).append("/>");
+ }
+
+ sb.append("</statement>");
+
+ return sb.toString();
}
@Override
Modified: projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/metadata/ds/TimeOutImpl.java
===================================================================
--- projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/metadata/ds/TimeOutImpl.java 2011-08-17 17:47:30 UTC (rev 112086)
+++ projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/metadata/ds/TimeOutImpl.java 2011-08-17 18:22:08 UTC (rev 112087)
@@ -42,7 +42,7 @@
/** The bundle */
private static CommonBundle bundle = Messages.getBundle(CommonBundle.class);
- private final Boolean setTxQuertTimeout;
+ private final Boolean setTxQueryTimeout;
private final Long queryTimeout;
@@ -56,18 +56,18 @@
* @param allocationRetry allocationRetry
* @param allocationRetryWaitMillis allocationRetryWaitMillis
* @param xaResourceTimeout xaResourceTimeout
- * @param setTxQuertTimeout setTxQuertTimeout
+ * @param setTxQueryTimeout setTxQueryTimeout
* @param queryTimeout queryTimeout
* @param useTryLock useTryLock
* @throws ValidateException ValidateException
*/
public TimeOutImpl(Long blockingTimeoutMillis, Long idleTimeoutMinutes, Integer allocationRetry,
- Long allocationRetryWaitMillis, Integer xaResourceTimeout, Boolean setTxQuertTimeout, Long queryTimeout,
+ Long allocationRetryWaitMillis, Integer xaResourceTimeout, Boolean setTxQueryTimeout, Long queryTimeout,
Long useTryLock) throws ValidateException
{
super(blockingTimeoutMillis, idleTimeoutMinutes, allocationRetry, allocationRetryWaitMillis,
xaResourceTimeout);
- this.setTxQuertTimeout = setTxQuertTimeout;
+ this.setTxQueryTimeout = setTxQueryTimeout;
this.queryTimeout = queryTimeout;
this.useTryLock = useTryLock;
this.validate();
@@ -81,7 +81,7 @@
@Override
public final Boolean isSetTxQueryTimeout()
{
- return setTxQuertTimeout;
+ return setTxQueryTimeout;
}
/**
@@ -112,7 +112,7 @@
final int prime = 31;
int result = super.hashCode();
result = prime * result + ((queryTimeout == null) ? 0 : queryTimeout.hashCode());
- result = prime * result + ((setTxQuertTimeout == null) ? 0 : setTxQuertTimeout.hashCode());
+ result = prime * result + ((setTxQueryTimeout == null) ? 0 : setTxQueryTimeout.hashCode());
result = prime * result + ((useTryLock == null) ? 0 : useTryLock.hashCode());
return result;
}
@@ -134,12 +134,12 @@
}
else if (!queryTimeout.equals(other.queryTimeout))
return false;
- if (setTxQuertTimeout == null)
+ if (setTxQueryTimeout == null)
{
- if (other.setTxQuertTimeout != null)
+ if (other.setTxQueryTimeout != null)
return false;
}
- else if (!setTxQuertTimeout.equals(other.setTxQuertTimeout))
+ else if (!setTxQueryTimeout.equals(other.setTxQueryTimeout))
return false;
if (useTryLock == null)
{
@@ -154,8 +154,67 @@
@Override
public String toString()
{
- return "TimeOutImpl [setTxQuertTimeout=" + setTxQuertTimeout + ", queryTimeout=" + queryTimeout +
- ", useTryLock=" + useTryLock + "]";
+ StringBuilder sb = new StringBuilder();
+
+ sb.append("<timeout>");
+
+ if (blockingTimeoutMillis != null)
+ {
+ sb.append("<").append(TimeOut.Tag.BLOCKINGTIMEOUTMILLIS).append(">");
+ sb.append(blockingTimeoutMillis);
+ sb.append("</").append(TimeOut.Tag.BLOCKINGTIMEOUTMILLIS).append(">");
+ }
+
+ if (idleTimeoutMinutes != null)
+ {
+ sb.append("<").append(TimeOut.Tag.IDLETIMEOUTMINUTES).append(">");
+ sb.append(idleTimeoutMinutes);
+ sb.append("</").append(TimeOut.Tag.IDLETIMEOUTMINUTES).append(">");
+ }
+
+ if (setTxQueryTimeout != null && Boolean.TRUE.equals(setTxQueryTimeout))
+ {
+ sb.append("<").append(TimeOut.Tag.SETTXQUERYTIMEOUT).append("/>");
+ }
+
+ if (queryTimeout != null)
+ {
+ sb.append("<").append(TimeOut.Tag.QUERYTIMEOUT).append(">");
+ sb.append(queryTimeout);
+ sb.append("</").append(TimeOut.Tag.QUERYTIMEOUT).append(">");
+ }
+
+ if (useTryLock != null)
+ {
+ sb.append("<").append(TimeOut.Tag.USETRYLOCK).append(">");
+ sb.append(useTryLock);
+ sb.append("</").append(TimeOut.Tag.USETRYLOCK).append(">");
+ }
+
+ if (allocationRetry != null)
+ {
+ sb.append("<").append(TimeOut.Tag.ALLOCATIONRETRY).append(">");
+ sb.append(allocationRetry);
+ sb.append("</").append(TimeOut.Tag.ALLOCATIONRETRY).append(">");
+ }
+
+ if (allocationRetryWaitMillis != null)
+ {
+ sb.append("<").append(TimeOut.Tag.ALLOCATIONRETRYWAITMILLIS).append(">");
+ sb.append(allocationRetryWaitMillis);
+ sb.append("</").append(TimeOut.Tag.ALLOCATIONRETRYWAITMILLIS).append(">");
+ }
+
+ if (xaResourceTimeout != null)
+ {
+ sb.append("<").append(TimeOut.Tag.XARESOURCETIMEOUT).append(">");
+ sb.append(xaResourceTimeout);
+ sb.append("</").append(TimeOut.Tag.XARESOURCETIMEOUT).append(">");
+ }
+
+ sb.append("</timeout>");
+
+ return sb.toString();
}
@Override
Modified: projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/metadata/ds/ValidationImpl.java
===================================================================
--- projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/metadata/ds/ValidationImpl.java 2011-08-17 17:47:30 UTC (rev 112086)
+++ projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/metadata/ds/ValidationImpl.java 2011-08-17 18:22:08 UTC (rev 112087)
@@ -26,6 +26,9 @@
import org.jboss.jca.common.api.metadata.ds.Validation;
import org.jboss.jca.common.api.validator.ValidateException;
+import java.util.Iterator;
+import java.util.Map;
+
import org.jboss.logging.Messages;
/**
@@ -180,9 +183,129 @@
@Override
public String toString()
{
- return "ValidationImpl [validConnectionChecker=" + validConnectionChecker + ", checkValidConnectionSql=" +
- checkValidConnectionSql + ", validateOnMatch=" + validateOnMatch + ", staleConnectionChecker=" +
- staleConnectionChecker + ", exceptionSorter=" + exceptionSorter + "]";
+ StringBuilder sb = new StringBuilder();
+
+ sb.append("<validation>");
+
+ if (validConnectionChecker != null)
+ {
+ sb.append("<").append(Validation.Tag.VALIDCONNECTIONCHECKER);
+ sb.append(" ").append(Extension.Attribute.CLASS_NAME).append("=\"");
+ sb.append(validConnectionChecker.getClassName()).append("\"");
+ sb.append(">");
+
+ if (validConnectionChecker.getConfigPropertiesMap() != null &&
+ validConnectionChecker.getConfigPropertiesMap().size() > 0)
+ {
+ Iterator<Map.Entry<String, String>> it =
+ validConnectionChecker.getConfigPropertiesMap().entrySet().iterator();
+
+ while (it.hasNext())
+ {
+ Map.Entry<String, String> entry = it.next();
+
+ sb.append("<").append(Extension.Tag.CONFIG_PROPERTY);
+ sb.append(" name=\"").append(entry.getKey()).append("\">");
+ sb.append(entry.getValue());
+ sb.append("</").append(Extension.Tag.CONFIG_PROPERTY).append(">");
+ }
+ }
+
+ sb.append("</").append(Validation.Tag.VALIDCONNECTIONCHECKER).append(">");
+ }
+
+ if (checkValidConnectionSql != null)
+ {
+ sb.append("<").append(Validation.Tag.CHECKVALIDCONNECTIONSQL).append(">");
+ sb.append(checkValidConnectionSql);
+ sb.append("</").append(Validation.Tag.CHECKVALIDCONNECTIONSQL).append(">");
+ }
+
+ if (validateOnMatch != null)
+ {
+ sb.append("<").append(Validation.Tag.VALIDATEONMATCH).append(">");
+ sb.append(validateOnMatch);
+ sb.append("</").append(Validation.Tag.VALIDATEONMATCH).append(">");
+ }
+
+ if (backgroundValidation != null)
+ {
+ sb.append("<").append(Validation.Tag.BACKGROUNDVALIDATION).append(">");
+ sb.append(backgroundValidation);
+ sb.append("</").append(Validation.Tag.BACKGROUNDVALIDATION).append(">");
+ }
+
+ if (backgroundValidationMillis != null)
+ {
+ sb.append("<").append(Validation.Tag.BACKGROUNDVALIDATIONMILLIS).append(">");
+ sb.append(backgroundValidationMillis);
+ sb.append("</").append(Validation.Tag.BACKGROUNDVALIDATIONMILLIS).append(">");
+ }
+
+ if (useFastFail != null)
+ {
+ sb.append("<").append(Validation.Tag.USEFASTFAIL).append(">");
+ sb.append(useFastFail);
+ sb.append("</").append(Validation.Tag.USEFASTFAIL).append(">");
+ }
+
+ if (staleConnectionChecker != null)
+ {
+ sb.append("<").append(Validation.Tag.STALECONNECTIONCHECKER);
+ sb.append(" ").append(Extension.Attribute.CLASS_NAME).append("=\"");
+ sb.append(staleConnectionChecker.getClassName()).append("\"");
+ sb.append(">");
+
+ if (staleConnectionChecker.getConfigPropertiesMap() != null &&
+ staleConnectionChecker.getConfigPropertiesMap().size() > 0)
+ {
+ Iterator<Map.Entry<String, String>> it =
+ staleConnectionChecker.getConfigPropertiesMap().entrySet().iterator();
+
+ while (it.hasNext())
+ {
+ Map.Entry<String, String> entry = it.next();
+
+ sb.append("<").append(Extension.Tag.CONFIG_PROPERTY);
+ sb.append(" name=\"").append(entry.getKey()).append("\">");
+ sb.append(entry.getValue());
+ sb.append("</").append(Extension.Tag.CONFIG_PROPERTY).append(">");
+ }
+ }
+
+ sb.append("</").append(Validation.Tag.STALECONNECTIONCHECKER).append(">");
+ }
+
+ if (exceptionSorter != null)
+ {
+ sb.append("<").append(Validation.Tag.EXCEPTIONSORTER);
+ sb.append(" ").append(Extension.Attribute.CLASS_NAME).append("=\"");
+ sb.append(exceptionSorter.getClassName()).append("\"");
+ sb.append(">");
+
+ if (exceptionSorter.getConfigPropertiesMap() != null &&
+ exceptionSorter.getConfigPropertiesMap().size() > 0)
+ {
+ Iterator<Map.Entry<String, String>> it =
+ exceptionSorter.getConfigPropertiesMap().entrySet().iterator();
+
+ while (it.hasNext())
+ {
+ Map.Entry<String, String> entry = it.next();
+
+ sb.append("<").append(Extension.Tag.CONFIG_PROPERTY);
+ sb.append(" name=\"").append(entry.getKey()).append("\">");
+ sb.append(entry.getValue());
+ sb.append("</").append(Extension.Tag.CONFIG_PROPERTY).append(">");
+ }
+ }
+
+ sb.append("</").append(Validation.Tag.EXCEPTIONSORTER).append(">");
+ }
+
+ sb.append("</validation>");
+
+ return sb.toString();
}
@Override
Modified: projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/metadata/ds/XADataSourceImpl.java
===================================================================
--- projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/metadata/ds/XADataSourceImpl.java 2011-08-17 17:47:30 UTC (rev 112086)
+++ projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/metadata/ds/XADataSourceImpl.java 2011-08-17 18:22:08 UTC (rev 112087)
@@ -34,6 +34,7 @@
import java.util.Collections;
import java.util.HashMap;
+import java.util.Iterator;
import java.util.Map;
import org.jboss.logging.Messages;
@@ -244,12 +245,106 @@
@Override
public String toString()
{
- return "XADataSourceImpl [xaDataSourceProperty=" + xaDataSourceProperty + ", xaDataSourceClass=" +
- xaDataSourceClass + ", driver=" + driver + ", newConnectionSql=" + newConnectionSql + ", xaPool=" +
- xaPool + ", transactionIsolation=" + transactionIsolation + ", timeOut=" + timeOut + ", security=" +
- security + ", statement=" + statement + ", validation=" + validation + ", urlDelimiter=" + urlDelimiter +
- ", urlSelectorStrategyClassName=" + urlSelectorStrategyClassName + ", useJavaContext=" + useJavaContext +
- ", poolName=" + poolName + ", enabled=" + enabled + ", jndiName=" + jndiName + "]";
+ StringBuilder sb = new StringBuilder();
+
+ sb.append("<xa-datasource");
+
+ if (jndiName != null)
+ sb.append(" ").append(XaDataSource.Attribute.JNDINAME).append("=\"").append(jndiName).append("\"");
+
+ if (poolName != null)
+ sb.append(" ").append(XaDataSource.Attribute.POOL_NAME).append("=\"").append(poolName).append("\"");
+
+ if (enabled != null)
+ sb.append(" ").append(XaDataSource.Attribute.ENABLED).append("=\"").append(enabled).append("\"");
+
+ if (useJavaContext != null)
+ sb.append(" ").append(XaDataSource.Attribute.USEJAVACONTEXT).append("=\"").append(useJavaContext).append("\"");
+
+ if (spy)
+ sb.append(" ").append(XaDataSource.Attribute.SPY).append("=\"").append(spy).append("\"");
+
+ if (useCcm)
+ sb.append(" ").append(XaDataSource.Attribute.USE_CCM).append("=\"").append(useCcm).append("\"");
+
+ sb.append(">");
+
+ if (xaDataSourceProperty != null && xaDataSourceProperty.size() > 0)
+ {
+ Iterator<Map.Entry<String, String>> it = xaDataSourceProperty.entrySet().iterator();
+ while (it.hasNext())
+ {
+ Map.Entry<String, String> entry = it.next();
+ sb.append("<").append(XaDataSource.Tag.XADATASOURCEPROPERTY);
+ sb.append(" name=\"").append(entry.getKey()).append("\">");
+ sb.append(entry.getValue());
+ sb.append("</").append(XaDataSource.Tag.XADATASOURCEPROPERTY).append(">");
+ }
+ }
+
+ if (xaDataSourceClass != null)
+ {
+ sb.append("<").append(XaDataSource.Tag.XADATASOURCECLASS).append(">");
+ sb.append(xaDataSourceClass);
+ sb.append("</").append(XaDataSource.Tag.XADATASOURCECLASS).append(">");
+ }
+
+ if (driver != null)
+ {
+ sb.append("<").append(XaDataSource.Tag.DRIVER).append(">");
+ sb.append(driver);
+ sb.append("</").append(XaDataSource.Tag.DRIVER).append(">");
+ }
+
+ if (urlDelimiter != null)
+ {
+ sb.append("<").append(XaDataSource.Tag.URLDELIMITER).append(">");
+ sb.append(urlDelimiter);
+ sb.append("</").append(XaDataSource.Tag.URLDELIMITER).append(">");
+ }
+
+ if (urlSelectorStrategyClassName != null)
+ {
+ sb.append("<").append(XaDataSource.Tag.URLSELECTORSTRATEGYCLASSNAME).append(">");
+ sb.append(urlSelectorStrategyClassName);
+ sb.append("</").append(XaDataSource.Tag.URLSELECTORSTRATEGYCLASSNAME).append(">");
+ }
+
+ if (newConnectionSql != null)
+ {
+ sb.append("<").append(XaDataSource.Tag.NEWCONNECTIONSQL).append(">");
+ sb.append(newConnectionSql);
+ sb.append("</").append(XaDataSource.Tag.NEWCONNECTIONSQL).append(">");
+ }
+
+ if (transactionIsolation != null)
+ {
+ sb.append("<").append(XaDataSource.Tag.TRANSACTIONISOLATION).append(">");
+ sb.append(transactionIsolation);
+ sb.append("</").append(XaDataSource.Tag.TRANSACTIONISOLATION).append(">");
+ }
+
+ if (xaPool != null)
+ sb.append(xaPool);
+
+ if (security != null)
+ sb.append(security);
+
+ if (validation != null)
+ sb.append(validation);
+
+ if (timeOut != null)
+ sb.append(timeOut);
+
+ if (statement != null)
+ sb.append(statement);
+
+ if (recovery != null)
+ sb.append(recovery);
+
+ sb.append("</xa-datasource>");
+
+ return sb.toString();
}
/**
Modified: projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/metadata/ironjacamar/IronJacamarImpl.java
===================================================================
--- projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/metadata/ironjacamar/IronJacamarImpl.java 2011-08-17 17:47:30 UTC (rev 112086)
+++ projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/metadata/ironjacamar/IronJacamarImpl.java 2011-08-17 18:22:08 UTC (rev 112087)
@@ -27,6 +27,7 @@
import org.jboss.jca.common.api.metadata.ironjacamar.IronJacamar;
import org.jboss.jca.common.metadata.common.CommonIronJacamarImpl;
+import java.util.Iterator;
import java.util.List;
import java.util.Map;
@@ -62,5 +63,79 @@
bootstrapContext);
}
+ /**
+ * {@inheritDoc}
+ */
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder(1024);
+
+ sb.append("<?xml version=\"1.0\" encoding=\"UTF-8\"?>");
+ sb.append("<ironjacamar>");
+
+ if (beanValidationGroups != null && beanValidationGroups.size() > 0)
+ {
+ sb.append("<").append(IronJacamar.Tag.BEAN_VALIDATION_GROUPS).append(">");
+ for (String bvg : beanValidationGroups)
+ {
+ sb.append("<").append(IronJacamar.Tag.BEAN_VALIDATION_GROUP).append(">");
+ sb.append(bvg);
+ sb.append("</").append(IronJacamar.Tag.BEAN_VALIDATION_GROUP).append(">");
+ }
+ sb.append("</").append(IronJacamar.Tag.BEAN_VALIDATION_GROUPS).append(">");
+ }
+
+ if (bootstrapContext != null)
+ {
+ sb.append("<").append(IronJacamar.Tag.BOOTSTRAP_CONTEXT).append(">");
+ sb.append(bootstrapContext);
+ sb.append("</").append(IronJacamar.Tag.BOOTSTRAP_CONTEXT).append(">");
+ }
+
+ if (configProperties != null && configProperties.size() > 0)
+ {
+ Iterator<Map.Entry<String, String>> it = configProperties.entrySet().iterator();
+ while (it.hasNext())
+ {
+ Map.Entry<String, String> entry = it.next();
+
+ sb.append("<").append(IronJacamar.Tag.CONFIG_PROPERTY);
+ sb.append(" name=\"").append(entry.getKey()).append("\">");
+ sb.append(entry.getValue());
+ sb.append("</").append(IronJacamar.Tag.CONFIG_PROPERTY).append(">");
+ }
+ }
+
+ if (transactionSupport != null)
+ {
+ sb.append("<").append(IronJacamar.Tag.TRANSACTION_SUPPORT).append(">");
+ sb.append(transactionSupport);
+ sb.append("</").append(IronJacamar.Tag.TRANSACTION_SUPPORT).append(">");
+ }
+
+ if (connectionDefinitions != null && connectionDefinitions.size() > 0)
+ {
+ sb.append("<").append(IronJacamar.Tag.CONNECTION_DEFINITIONS).append(">");
+ for (CommonConnDef cd : connectionDefinitions)
+ {
+ sb.append(cd);
+ }
+ sb.append("</").append(IronJacamar.Tag.CONNECTION_DEFINITIONS).append(">");
+ }
+
+ if (adminObjects != null && adminObjects.size() > 0)
+ {
+ sb.append("<").append(IronJacamar.Tag.ADMIN_OBJECTS).append(">");
+ for (CommonAdminObject ao : adminObjects)
+ {
+ sb.append(ao);
+ }
+ sb.append("</").append(IronJacamar.Tag.ADMIN_OBJECTS).append(">");
+ }
+
+ sb.append("</ironjacamar>");
+
+ return sb.toString();
+ }
}
Modified: projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/metadata/merge/Merger.java
===================================================================
--- projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/metadata/merge/Merger.java 2011-08-17 17:47:30 UTC (rev 112086)
+++ projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/metadata/merge/Merger.java 2011-08-17 18:22:08 UTC (rev 112087)
@@ -353,7 +353,7 @@
authenticationMechanism, connectioDefProperties,
reauthenticationSupport, securityPermissions, id);
- Connector newConnector = new Connector10Impl(moduleName, vendorName, eisType, resourceadapterVersion,
+ Connector newConnector = new Connector10Impl(vendorName, eisType, resourceadapterVersion,
license, resourceadapter, description, displayNames, icons, id);
return newConnector.merge(connector);
Modified: projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/metadata/ra/RaParser.java
===================================================================
--- projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/metadata/ra/RaParser.java 2011-08-17 17:47:30 UTC (rev 112086)
+++ projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/metadata/ra/RaParser.java 2011-08-17 18:22:08 UTC (rev 112087)
@@ -189,13 +189,12 @@
private Connector parseConnector10(XMLStreamReader reader) throws XMLStreamException, ParserException
{
LicenseType license = null;
- String id = reader.getAttributeValue(null, Connector16.Attribute.ID.getLocalName());;
+ String id = reader.getAttributeValue(null, Connector10.Attribute.ID.getLocalName());;
ArrayList<Icon> icon = new ArrayList<Icon>();
ArrayList<LocalizedXsdString> description = new ArrayList<LocalizedXsdString>();
XsdString eisType = NULL_XSDSTRING;
ResourceAdapter10 resourceadapter = null;
XsdString vendorName = NULL_XSDSTRING;
- String moduleName = null;
ArrayList<LocalizedXsdString> displayName = new ArrayList<LocalizedXsdString>();
XsdString resourceadapterVersion = NULL_XSDSTRING;
while (reader.hasNext())
@@ -211,7 +210,7 @@
description.trimToSize();
//building and returning object
- return new Connector10Impl(moduleName, vendorName, eisType, resourceadapterVersion, license,
+ return new Connector10Impl(vendorName, eisType, resourceadapterVersion, license,
resourceadapter, description, displayName, icon, id);
}
@@ -227,10 +226,6 @@
case START_ELEMENT : {
switch (Connector10.Tag.forName(reader.getLocalName()))
{
- case MODULENAME : {
- moduleName = reader.getElementText().trim();
- break;
- }
case VENDORNAME : {
vendorName = elementAsXsdString(reader);
break;
@@ -243,7 +238,7 @@
license = parseLicense(reader);
break;
}
- case RESOURCEADPTER_VERSION : {
+ case VERSION : {
resourceadapterVersion = elementAsXsdString(reader);
}
break;
@@ -263,8 +258,7 @@
icon.add(parseIcon(reader));
break;
}
- case SPEC_VERSION :
- case VERSION : {
+ case SPEC_VERSION : {
//ignore
elementAsLocalizedXsdString(reader);
break;
Modified: projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/metadata/ra/common/AdminObjectImpl.java
===================================================================
--- projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/metadata/ra/common/AdminObjectImpl.java 2011-08-17 17:47:30 UTC (rev 112086)
+++ projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/metadata/ra/common/AdminObjectImpl.java 2011-08-17 18:22:08 UTC (rev 112087)
@@ -187,8 +187,32 @@
@Override
public String toString()
{
- return "Adminobject [adminobjectInterface=" + adminobjectInterface + ", adminobjectClass=" +
- adminobjectClass + ", configProperty=" + configProperties + ", id=" + id + "]";
+ StringBuilder sb = new StringBuilder(1024);
+
+ sb.append("<adminobject");
+ if (id != null)
+ sb.append(" ").append(AdminObject.Attribute.ID).append("=\"").append(id).append("\"");
+ sb.append(">");
+
+ sb.append("<").append(AdminObject.Tag.ADMINOBJECT_INTERFACE).append(">");
+ sb.append(adminobjectInterface);
+ sb.append("</").append(AdminObject.Tag.ADMINOBJECT_INTERFACE).append(">");
+
+ sb.append("<").append(AdminObject.Tag.ADMINOBJECT_CLASS).append(">");
+ sb.append(adminobjectClass);
+ sb.append("</").append(AdminObject.Tag.ADMINOBJECT_CLASS).append(">");
+
+ if (configProperties != null)
+ {
+ for (ConfigProperty cp : configProperties)
+ {
+ sb.append(cp);
+ }
+ }
+
+ sb.append("</adminobject>");
+
+ return sb.toString();
}
@Override
Modified: projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/metadata/ra/common/AuthenticationMechanismImpl.java
===================================================================
--- projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/metadata/ra/common/AuthenticationMechanismImpl.java 2011-08-17 17:47:30 UTC (rev 112086)
+++ projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/metadata/ra/common/AuthenticationMechanismImpl.java 2011-08-17 18:22:08 UTC (rev 112087)
@@ -203,8 +203,26 @@
@Override
public String toString()
{
- return "AuthenticationMechanism [description=" + description + ", authenticationMechanismType="
- + authenticationMechanismType + ", credentialInterface=" + credentialInterface + ", id=" + id + "]";
+ StringBuilder sb = new StringBuilder(1024);
+
+ sb.append("<authentication-mechanism");
+ if (id != null)
+ sb.append(" ").append(AuthenticationMechanism.Attribute.ID).append("=\"").append(id).append("\"");
+ sb.append(">");
+
+ // description
+
+ sb.append("<").append(AuthenticationMechanism.Tag.AUTHENTICATION_MECHANISM_TYPE).append(">");
+ sb.append(authenticationMechanismType);
+ sb.append("</").append(AuthenticationMechanism.Tag.AUTHENTICATION_MECHANISM_TYPE).append(">");
+
+ sb.append("<").append(AuthenticationMechanism.Tag.CREDENTIAL_INTERFACE).append(">");
+ sb.append(credentialInterface);
+ sb.append("</").append(AuthenticationMechanism.Tag.CREDENTIAL_INTERFACE).append(">");
+
+ sb.append("</authentication-mechanism>");
+
+ return sb.toString();
}
@Override
Modified: projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/metadata/ra/common/ConfigPropertyImpl.java
===================================================================
--- projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/metadata/ra/common/ConfigPropertyImpl.java 2011-08-17 17:47:30 UTC (rev 112086)
+++ projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/metadata/ra/common/ConfigPropertyImpl.java 2011-08-17 18:22:08 UTC (rev 112087)
@@ -212,8 +212,32 @@
@Override
public String toString()
{
- return "ConfigPropertyImpl [description=" + description + ", configPropertyName=" + configPropertyName
- + ", configPropertyType=" + configPropertyType + ", configPropertyValue=" + configPropertyValue + ", id="
- + id + "]";
+ StringBuilder sb = new StringBuilder();
+
+ sb.append("<config-property");
+ if (id != null)
+ sb.append(" ").append(ConfigProperty.Attribute.ID).append("=\"").append(id).append("\"");
+ sb.append(">");
+
+ // description
+
+ sb.append("<").append(ConfigProperty.Tag.CONFIG_PROPERTY_NAME).append(">");
+ sb.append(configPropertyName);
+ sb.append("</").append(ConfigProperty.Tag.CONFIG_PROPERTY_NAME).append(">");
+
+ sb.append("<").append(ConfigProperty.Tag.CONFIG_PROPERTY_TYPE).append(">");
+ sb.append(configPropertyType);
+ sb.append("</").append(ConfigProperty.Tag.CONFIG_PROPERTY_TYPE).append(">");
+
+ if (!XsdString.isNull(configPropertyValue))
+ {
+ sb.append("<").append(ConfigProperty.Tag.CONFIG_PROPERTY_VALUE).append(">");
+ sb.append(configPropertyValue);
+ sb.append("</").append(ConfigProperty.Tag.CONFIG_PROPERTY_VALUE).append(">");
+ }
+
+ sb.append("</config-property>");
+
+ return sb.toString();
}
}
Modified: projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/metadata/ra/common/ConnectionDefinitionImpl.java
===================================================================
--- projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/metadata/ra/common/ConnectionDefinitionImpl.java 2011-08-17 17:47:30 UTC (rev 112086)
+++ projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/metadata/ra/common/ConnectionDefinitionImpl.java 2011-08-17 18:22:08 UTC (rev 112087)
@@ -299,11 +299,43 @@
@Override
public String toString()
{
- return "ConnectionDefinition [managedconnectionfactoryClass=" + managedconnectionfactoryClass +
- ", configProperty=" + configProperties + ", connectionfactoryInterface=" +
- connectionfactoryInterface + ", connectionfactoryImplClass=" + connectionfactoryImplClass +
- ", connectionInterface=" + connectionInterface + ", connectionImplClass=" + connectionImplClass +
- ", id=" + id + "]";
+ StringBuilder sb = new StringBuilder(1024);
+ sb.append("<connection-definition");
+ if (id != null)
+ sb.append(" ").append(ConnectionDefinition.Attribute.ID).append("=\"").append(id).append("\"");
+ sb.append(">");
+
+ sb.append("<" + ConnectionDefinition.Tag.MANAGED_CONNECTIONFACTORY_CLASS + ">");
+ sb.append(managedconnectionfactoryClass);
+ sb.append("</" + ConnectionDefinition.Tag.MANAGED_CONNECTIONFACTORY_CLASS + ">");
+
+ if (configProperties != null)
+ {
+ for (ConfigProperty cp : configProperties)
+ {
+ sb.append(cp);
+ }
+ }
+
+ sb.append("<" + ConnectionDefinition.Tag.CONNECTIONFACTORY_INTERFACE + ">");
+ sb.append(connectionfactoryInterface);
+ sb.append("</" + ConnectionDefinition.Tag.CONNECTIONFACTORY_INTERFACE + ">");
+
+ sb.append("<" + ConnectionDefinition.Tag.CONNECTIONFACTORY_IMPL_CLASS + ">");
+ sb.append(connectionfactoryImplClass);
+ sb.append("</" + ConnectionDefinition.Tag.CONNECTIONFACTORY_IMPL_CLASS + ">");
+
+ sb.append("<" + ConnectionDefinition.Tag.CONNECTION_INTERFACE + ">");
+ sb.append(connectionInterface);
+ sb.append("</" + ConnectionDefinition.Tag.CONNECTION_INTERFACE + ">");
+
+ sb.append("<" + ConnectionDefinition.Tag.CONNECTION_IMPL_CLASS + ">");
+ sb.append(connectionImplClass);
+ sb.append("</" + ConnectionDefinition.Tag.CONNECTION_IMPL_CLASS + ">");
+
+ sb.append("</connection-definition>");
+
+ return sb.toString();
}
@Override
Modified: projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/metadata/ra/common/ConnectorAbstractmpl.java
===================================================================
--- projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/metadata/ra/common/ConnectorAbstractmpl.java 2011-08-17 17:47:30 UTC (rev 112086)
+++ projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/metadata/ra/common/ConnectorAbstractmpl.java 2011-08-17 18:22:08 UTC (rev 112087)
@@ -288,13 +288,6 @@
return true;
}
- @Override
- public String toString()
- {
- return "Connector [vendorName=" + vendorName + ", eisType=" + eisType + ", license=" + license
- + ", resourceadapter=" + resourceadapter + ", id=" + id + "]";
- }
-
/**
* Validate specification metadata
* @exception ValidateException Thrown if an error occurs
@@ -310,7 +303,6 @@
//make sure ra metadata contains inbound or outbound at least
ra.validate();
-
}
/**
@@ -322,14 +314,14 @@
@Override
public Connector merge(MergeableMetadata<?> inputMd) throws Exception
{
- {
- return this;
-
- }
+ return this;
}
-
@Override
public abstract CopyableMetaData copy();
+ /**
+ * {@inheritDoc}
+ */
+ public abstract String toString();
}
Modified: projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/metadata/ra/common/InboundResourceAdapterImpl.java
===================================================================
--- projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/metadata/ra/common/InboundResourceAdapterImpl.java 2011-08-17 17:47:30 UTC (rev 112086)
+++ projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/metadata/ra/common/InboundResourceAdapterImpl.java 2011-08-17 18:22:08 UTC (rev 112087)
@@ -142,7 +142,21 @@
@Override
public String toString()
{
- return "InboundResourceAdapter [messageadapter=" + messageadapter + ", id=" + id + "]";
+ StringBuilder sb = new StringBuilder(1024);
+
+ sb.append("<").append("inbound-resourceadapter");
+ if (id != null)
+ sb.append(" ").append(InboundResourceAdapter.Attribute.ID).append("=\"").append(id).append("\"");
+ sb.append(">");
+
+ if (messageadapter != null)
+ {
+ sb.append(messageadapter);
+ }
+
+ sb.append("</inbound-resourceadapter>");
+
+ return sb.toString();
}
/**
Modified: projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/metadata/ra/common/MessageAdapterImpl.java
===================================================================
--- projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/metadata/ra/common/MessageAdapterImpl.java 2011-08-17 17:47:30 UTC (rev 112086)
+++ projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/metadata/ra/common/MessageAdapterImpl.java 2011-08-17 18:22:08 UTC (rev 112087)
@@ -156,7 +156,24 @@
@Override
public String toString()
{
- return "MessageAdapter [messagelisteners=" + messagelisteners + ", id=" + id + "]";
+ StringBuilder sb = new StringBuilder(1024);
+
+ sb.append("<messageadapter");
+ if (id != null)
+ sb.append(" ").append(Messageadapter.Attribute.ID).append("=\"").append(id).append("\"");
+ sb.append(">");
+
+ if (messagelisteners != null)
+ {
+ for (MessageListener ml : messagelisteners)
+ {
+ sb.append(ml);
+ }
+ }
+
+ sb.append("</messageadapter>");
+
+ return sb.toString();
}
@Override
Modified: projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/metadata/ra/common/MessageListenerImpl.java
===================================================================
--- projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/metadata/ra/common/MessageListenerImpl.java 2011-08-17 17:47:30 UTC (rev 112086)
+++ projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/metadata/ra/common/MessageListenerImpl.java 2011-08-17 18:22:08 UTC (rev 112087)
@@ -165,8 +165,22 @@
@Override
public String toString()
{
- return "MessageListener [messagelistenerType=" + messagelistenerType + ", activationspec=" + activationspec
- + ", id=" + id + "]";
+ StringBuilder sb = new StringBuilder(1024);
+
+ sb.append("<messagelistener");
+ if (id != null)
+ sb.append(" ").append(MessageListener.Attribute.ID).append("=\"").append(id).append("\"");
+ sb.append(">");
+
+ sb.append("<").append(MessageListener.Tag.MESSAGELISTENER_TYPE).append(">");
+ sb.append(messagelistenerType);
+ sb.append("</").append(MessageListener.Tag.MESSAGELISTENER_TYPE).append(">");
+
+ sb.append(activationspec);
+
+ sb.append("</messagelistener>");
+
+ return sb.toString();
}
@Override
Modified: projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/metadata/ra/common/OutboundResourceAdapterImpl.java
===================================================================
--- projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/metadata/ra/common/OutboundResourceAdapterImpl.java 2011-08-17 17:47:30 UTC (rev 112086)
+++ projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/metadata/ra/common/OutboundResourceAdapterImpl.java 2011-08-17 18:22:08 UTC (rev 112087)
@@ -50,7 +50,7 @@
private final ArrayList<AuthenticationMechanism> authenticationMechanism;
- private final boolean reauthenticationSupport;
+ private final Boolean reauthenticationSupport;
private final String id;
@@ -63,7 +63,7 @@
*/
public OutboundResourceAdapterImpl(List<ConnectionDefinition> connectionDefinition,
TransactionSupportEnum transactionSupport, List<AuthenticationMechanism> authenticationMechanism,
- boolean reauthenticationSupport, String id)
+ Boolean reauthenticationSupport, String id)
{
super();
if (connectionDefinition != null)
@@ -253,9 +253,46 @@
@Override
public String toString()
{
- return "OutboundResourceAdapter [connectionDefinition=" + connectionDefinition + ", transactionSupport=" +
- transactionSupport + ", authenticationMechanism=" + authenticationMechanism +
- ", reauthenticationSupport=" + reauthenticationSupport + ", id=" + id + "]";
+ StringBuilder sb = new StringBuilder(1024);
+
+ sb.append("<").append("outbound-resourceadapter");
+ if (id != null)
+ sb.append(" ").append(OutboundResourceAdapter.Attribute.ID).append("=\"").append(id).append("\"");
+ sb.append(">");
+
+ if (connectionDefinition != null)
+ {
+ for (ConnectionDefinition cd : connectionDefinition)
+ {
+ sb.append(cd);
+ }
+ }
+
+ if (transactionSupport != null)
+ {
+ sb.append("<").append(OutboundResourceAdapter.Tag.TRANSACTION_SUPPORT).append(">");
+ sb.append(transactionSupport);
+ sb.append("</").append(OutboundResourceAdapter.Tag.TRANSACTION_SUPPORT).append(">");
+ }
+
+ if (authenticationMechanism != null)
+ {
+ for (AuthenticationMechanism am : authenticationMechanism)
+ {
+ sb.append(am);
+ }
+ }
+
+ if (reauthenticationSupport != null)
+ {
+ sb.append("<").append(OutboundResourceAdapter.Tag.REAUTHENTICATION_SUPPORT).append(">");
+ sb.append(reauthenticationSupport);
+ sb.append("</").append(OutboundResourceAdapter.Tag.REAUTHENTICATION_SUPPORT).append(">");
+ }
+
+ sb.append("</outbound-resourceadapter>");
+
+ return sb.toString();
}
/**
Deleted: projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/metadata/ra/common/RaConfigPropertyImpl.java
===================================================================
--- projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/metadata/ra/common/RaConfigPropertyImpl.java 2011-08-17 17:47:30 UTC (rev 112086)
+++ projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/metadata/ra/common/RaConfigPropertyImpl.java 2011-08-17 18:22:08 UTC (rev 112087)
@@ -1,275 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.jca.common.metadata.ra.common;
-
-import org.jboss.jca.common.api.metadata.JCAMetadata;
-import org.jboss.jca.common.api.metadata.ra.OverrideElementAttribute;
-import org.jboss.jca.common.api.metadata.ra.RaConfigProperty;
-
-/**
- * @author <a href="mailto:stefano.maestri at jboss.org">Stefano Maestri</a>
- * @param <T> generic type of this property.
- * See {@link #buildRaConfigProperty(String, String, String, OverrideElementAttribute))}
- * for build right implementation
- *
- */
-public class RaConfigPropertyImpl<T> implements JCAMetadata, RaConfigProperty<T>
-{
-
- /**
- */
- private static final long serialVersionUID = 7845799671062777306L;
-
- private final String name;
-
- private final T value;
-
- private final String typeName;
-
- private final OverrideElementAttribute overrideElementAttribute;
-
- /**
- * @param name the name of the property
- * @param value the value of the property
- * @param overrideElementAttribute the override-element attribute
- */
- private RaConfigPropertyImpl(String name, T value, OverrideElementAttribute overrideElementAttribute)
- {
- super();
- this.name = name;
- this.value = value;
- this.typeName = value.getClass().getName();
- this.overrideElementAttribute = overrideElementAttribute == null
- ? OverrideElementAttribute.RESOURCE_ADAPTER
- : overrideElementAttribute;
- }
-
- /**
- * @param name the name of the property
- * @param value the value of the property
- * @param typeName full qualified name of value's type
- * @param overrideElementAttribute the override-element attribute
- */
- private RaConfigPropertyImpl(String name, T value, String typeName,
- OverrideElementAttribute overrideElementAttribute)
- {
- super();
- this.name = name;
- this.value = value;
- this.typeName = typeName;
- this.overrideElementAttribute = overrideElementAttribute == null
- ? OverrideElementAttribute.RESOURCE_ADAPTER
- : overrideElementAttribute;
- }
-
- /**
- *
- * Static method to build actualised implementation of this generic class.
- * According to jboss-ra_2_0.xsd value values are:
- * java.lang.Boolean
- * java.lang.String
- * java.lang.Integer
- * java.lang.Double
- * java.lang.Byte
- * java.lang.Short
- * java.lang.Long
- * java.lang.Float
- * java.lang.Character
- *
- * In case passed type is one of above ones a correct actualised {@link RaConfigPropertyImpl} is returned.
- * TypeName field will be set accordly
- *
- * In case the passed type isn't one of above ones (possible for jboss-ra_1_0.xsd) an RaConfigProperty<Object>
- * is returned and typeName will be set as passed parameter type.
- *
- *
- *
- *
- * @param name name of the property
- * @param value value of the property.
- * @param type the full qualified name of the class to be actualised
- * @return the actualised instance
- * @param overrideElementAttribute the override-element attribute. Possible value are defined in the enumeration;
- * if it is null the default RESOURCEADAPTER is used
- * @throws NumberFormatException in case passed value isn't assignable to type class
- */
- public static RaConfigProperty<?> buildRaConfigProperty(String name, String value, String type,
- OverrideElementAttribute overrideElementAttribute) throws NumberFormatException
- {
- if (type == null || type.trim().length() == 0)
- {
- return new RaConfigPropertyImpl<String>(name, value, overrideElementAttribute);
- }
- if ("java.lang.Boolean".equals(type))
- {
- return new RaConfigPropertyImpl<Boolean>(name, Boolean.valueOf(value), overrideElementAttribute);
- }
- else if ("java.lang.String".equals(type))
- {
- return new RaConfigPropertyImpl<String>(name, value, overrideElementAttribute);
- }
- else if ("java.lang.Integer".equals(type))
- {
- return new RaConfigPropertyImpl<Integer>(name, Integer.valueOf(value), overrideElementAttribute);
- }
- else if ("java.lang.Double".equals(type))
- {
- return new RaConfigPropertyImpl<Double>(name, Double.valueOf(value), overrideElementAttribute);
- }
- else if ("java.lang.Byte".equals(type))
- {
- return new RaConfigPropertyImpl<Byte>(name, Byte.valueOf(value), overrideElementAttribute);
- }
- else if ("java.lang.Long".equals(type))
- {
- return new RaConfigPropertyImpl<Long>(name, Long.valueOf(value), overrideElementAttribute);
- }
- else if ("java.lang.Float".equals(type))
- {
- return new RaConfigPropertyImpl<Float>(name, Float.valueOf(value), overrideElementAttribute);
- }
- else if ("java.lang.Character".equals(type))
- {
- return new RaConfigPropertyImpl<Character>(name, Character.valueOf(value.charAt(0)), overrideElementAttribute);
- }
- else
- {
- return new RaConfigPropertyImpl<Object>(name, value, type, overrideElementAttribute);
- }
-
- }
-
- /**
- * @return name
- */
- @Override
- public synchronized String getName()
- {
- return name;
- }
-
- /**
- * @return value
- */
- @Override
- public synchronized T getValue()
- {
- return value;
- }
-
- /**
- * {@inheritDoc}
- *
- * @see java.lang.Object#hashCode()
- */
- @Override
- public int hashCode()
- {
- final int prime = 31;
- int result = 1;
- result = prime * result + ((name == null) ? 0 : name.hashCode());
- result = prime * result + ((value == null) ? 0 : value.hashCode());
- return result;
- }
-
- /**
- * {@inheritDoc}
- *
- * @see java.lang.Object#equals(java.lang.Object)
- */
- @Override
- public boolean equals(Object obj)
- {
- if (this == obj)
- {
- return true;
- }
- if (obj == null)
- {
- return false;
- }
- if (!(obj instanceof RaConfigPropertyImpl))
- {
- return false;
- }
- RaConfigPropertyImpl other = (RaConfigPropertyImpl) obj;
- if (name == null)
- {
- if (other.name != null)
- {
- return false;
- }
- }
- else if (!name.equals(other.name))
- {
- return false;
- }
- if (value == null)
- {
- if (other.value != null)
- {
- return false;
- }
- }
- else if (!value.equals(other.value))
- {
- return false;
- }
- return true;
- }
-
- /**
- * {@inheritDoc}
- *
- * @see java.lang.Object#toString()
- */
- @Override
- public String toString()
- {
- return "RaConfigProperty [name=" + name + ", value=" + value + "]";
- }
-
- /**
- *
- * typeName getter
- *
- * @return the typeName
- */
- @Override
- public String getTypeName()
- {
- return typeName;
- }
-
- /**
- *
- * override-element-attribute metadata getter
- *
- * @return the enum instance {@link OverrideElementAttribute}
- */
- @Override
- public OverrideElementAttribute getOverrideElementAttribute()
- {
- return overrideElementAttribute;
- }
-
-}
Modified: projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/metadata/ra/common/ResourceAdapter1516Impl.java
===================================================================
--- projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/metadata/ra/common/ResourceAdapter1516Impl.java 2011-08-17 17:47:30 UTC (rev 112086)
+++ projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/metadata/ra/common/ResourceAdapter1516Impl.java 2011-08-17 18:22:08 UTC (rev 112087)
@@ -268,10 +268,53 @@
@Override
public String toString()
{
- return "ResourceAdapter [resourceadapterClass=" + resourceadapterClass + ", configProperties=" +
- configProperties + ", outboundResourceadapter=" + outboundResourceadapter +
- ", inboundResourceadapter=" + inboundResourceadapter + ", adminobjects=" + adminobjects +
- ", securityPermission=" + securityPermissions + ", id=" + id + "]";
+ StringBuilder sb = new StringBuilder(1024);
+
+ sb.append("<").append("resourceadapter");
+ if (id != null)
+ sb.append(" ").append(ResourceAdapter1516.Attribute.ID).append("=\"").append(id).append("\"");
+ sb.append(">");
+
+ if (resourceadapterClass != null)
+ {
+ sb.append("<").append(ResourceAdapter1516.Tag.RESOURCEADAPTER_CLASS).append(">");
+ sb.append(resourceadapterClass);
+ sb.append("</").append(ResourceAdapter1516.Tag.RESOURCEADAPTER_CLASS).append(">");
+ }
+
+ if (configProperties != null)
+ {
+ for (ConfigProperty cp : configProperties)
+ {
+ sb.append(cp);
+ }
+ }
+
+ if (outboundResourceadapter != null)
+ sb.append(outboundResourceadapter);
+
+ if (inboundResourceadapter != null)
+ sb.append(inboundResourceadapter);
+
+ if (adminobjects != null)
+ {
+ for (AdminObject ao : adminobjects)
+ {
+ sb.append(ao);
+ }
+ }
+
+ if (securityPermissions != null)
+ {
+ for (SecurityPermission sp : securityPermissions)
+ {
+ sb.append(sp);
+ }
+ }
+
+ sb.append("</resourceadapter>");
+
+ return sb.toString();
}
@Override
Modified: projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/metadata/ra/common/SecurityPermissionImpl.java
===================================================================
--- projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/metadata/ra/common/SecurityPermissionImpl.java 2011-08-17 17:47:30 UTC (rev 112086)
+++ projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/metadata/ra/common/SecurityPermissionImpl.java 2011-08-17 18:22:08 UTC (rev 112087)
@@ -173,8 +173,22 @@
@Override
public String toString()
{
- return "SecurityPermission [description=" + description + ", securityPermissionSpec=" + securityPermissionSpec
- + ", id=" + id + "]";
+ StringBuilder sb = new StringBuilder(1024);
+
+ sb.append("<security-permission");
+ if (id != null)
+ sb.append(" ").append(SecurityPermission.Attribute.ID).append("=\"").append(id).append("\"");
+ sb.append(">");
+
+ // description
+
+ sb.append("<").append(SecurityPermission.Tag.SECURITY_PERMISSION_SPEC).append(">");
+ sb.append(securityPermissionSpec);
+ sb.append("</").append(SecurityPermission.Tag.SECURITY_PERMISSION_SPEC).append(">");
+
+ sb.append("</security-permission>");
+
+ return sb.toString();
}
@Override
Modified: projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/metadata/ra/ra10/Connector10Impl.java
===================================================================
--- projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/metadata/ra/ra10/Connector10Impl.java 2011-08-17 17:47:30 UTC (rev 112086)
+++ projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/metadata/ra/ra10/Connector10Impl.java 2011-08-17 18:22:08 UTC (rev 112087)
@@ -48,12 +48,9 @@
*/
private static final long serialVersionUID = -6095735191032372517L;
- private final String moduleName;
-
private final XsdString resourceadapterVersion;
/**
- * @param moduleName name of the module
* @param description descriptions of this connector
* @param displayName name to display for this connecotro
* @param icon icon representing this connectore
@@ -64,28 +61,16 @@
* @param resourceadapter full qualified name of the resource adapter
* @param id XML ID
*/
- public Connector10Impl(String moduleName, XsdString vendorName, XsdString eisType, XsdString resourceadapterVersion,
+ public Connector10Impl(XsdString vendorName, XsdString eisType, XsdString resourceadapterVersion,
LicenseType license, ResourceAdapter resourceadapter, List<LocalizedXsdString> description,
List<LocalizedXsdString> displayName,
List<Icon> icon, String id)
{
super(vendorName, eisType, license, resourceadapter, description, displayName, icon, id);
- this.moduleName = moduleName;
this.resourceadapterVersion = resourceadapterVersion;
-
-
}
/**
- * @return moduleName
- */
- @Override
- public String getModuleName()
- {
- return moduleName;
- }
-
- /**
* Get the version.
*
* @return the version.
@@ -111,7 +96,6 @@
{
final int prime = 31;
int result = super.hashCode();
- result = prime * result + ((moduleName == null) ? 0 : moduleName.hashCode());
return result;
}
@@ -125,28 +109,55 @@
if (!(obj instanceof Connector10Impl))
return false;
Connector10Impl other = (Connector10Impl) obj;
- if (moduleName == null)
- {
- if (other.moduleName != null)
- return false;
- }
- else if (!moduleName.equals(other.moduleName))
- return false;
return true;
}
@Override
public String toString()
{
- return "Connector10Impl [moduleName=" + moduleName + ", vendorName=" + vendorName + ", eisType=" + eisType
- + ", license=" + license + ", resourceadapter=" + resourceadapter + ", id=" + id + ", description="
- + description + ", displayName=" + displayName + ", icon=" + icon + "]";
+ StringBuilder sb = new StringBuilder(1024);
+
+ sb.append("<?xml version=\"1.0\" encoding=\"UTF-8\"?>");
+ sb.append("<").append("connector").append(">");
+
+ // description, displayName, icon
+
+ if (!XsdString.isNull(vendorName))
+ {
+ sb.append("<" + Connector10.Tag.VENDORNAME + ">");
+ sb.append(vendorName);
+ sb.append("</" + Connector10.Tag.VENDORNAME + ">");
+ }
+
+ sb.append("<" + Connector10.Tag.SPEC_VERSION + ">");
+ sb.append("1.0");
+ sb.append("</" + Connector10.Tag.SPEC_VERSION + ">");
+
+ if (!XsdString.isNull(eisType))
+ {
+ sb.append("<" + Connector10.Tag.EIS_TYPE + ">");
+ sb.append(eisType);
+ sb.append("</" + Connector10.Tag.EIS_TYPE + ">");
+ }
+
+ sb.append("<" + Connector10.Tag.VERSION + ">");
+ sb.append(resourceadapterVersion);
+ sb.append("</" + Connector10.Tag.VERSION + ">");
+
+ if (license != null)
+ sb.append(license);
+
+ sb.append(resourceadapter);
+
+ sb.append("</").append("connector").append(">");
+
+ return sb.toString();
}
@Override
public CopyableMetaData copy()
{
- return new Connector10Impl(CopyUtil.cloneString(moduleName), CopyUtil.clone(vendorName),
+ return new Connector10Impl(CopyUtil.clone(vendorName),
CopyUtil.clone(eisType), CopyUtil.clone(resourceadapterVersion), CopyUtil.clone(license),
CopyUtil.clone(resourceadapter),
CopyUtil.cloneList(description), CopyUtil.cloneList(displayName), CopyUtil.cloneList(icon),
@@ -163,7 +174,6 @@
XsdString newResourceadapterVersion = XsdString.isNull(this.resourceadapterVersion)
? input10.resourceadapterVersion : this.resourceadapterVersion;
XsdString newEisType = XsdString.isNull(this.eisType) ? input10.eisType : this.eisType;
- String newModuleName = this.moduleName == null ? input10.moduleName : this.moduleName;
List<Icon> newIcons = MergeUtil.mergeList(this.icon, input10.icon);
LicenseType newLicense = this.license == null ? input10.license : this.license.merge(input10.license);
List<LocalizedXsdString> newDescriptions = MergeUtil.mergeList(this.description,
@@ -176,12 +186,9 @@
? (ResourceAdapter10) input10.resourceadapter
: ((ResourceAdapter10) this.resourceadapter)
.merge((ResourceAdapter10) input10.resourceadapter);
- return new Connector10Impl(newModuleName, newVendorName, newEisType, newResourceadapterVersion, newLicense,
+ return new Connector10Impl(newVendorName, newEisType, newResourceadapterVersion, newLicense,
newResourceadapter, newDescriptions, newDisplayNames, newIcons, null);
}
return this;
-
}
-
-
}
Modified: projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/metadata/ra/ra10/ResourceAdapter10Impl.java
===================================================================
--- projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/metadata/ra/ra10/ResourceAdapter10Impl.java 2011-08-17 17:47:30 UTC (rev 112086)
+++ projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/metadata/ra/ra10/ResourceAdapter10Impl.java 2011-08-17 18:22:08 UTC (rev 112087)
@@ -364,12 +364,67 @@
@Override
public String toString()
{
- return "ResourceAdapter10 [managedConnectionFactoryClass=" + managedConnectionFactoryClass
- + ", connectionFactoryInterface=" + connectionFactoryInterface + ", connectionFactoryImplClass="
- + connectionFactoryImplClass + ", connectionInterface=" + connectionInterface + ", connectionImplClass="
- + connectionImplClass + ", transactionSupport=" + transactionSupport + ", authenticationMechanism="
- + authenticationMechanism + ", configProperties=" + configProperties + ", reauthenticationSupport="
- + reauthenticationSupport + ", securityPermissions=" + securityPermissions + ", id=" + id + "]";
+ StringBuilder sb = new StringBuilder(1024);
+ sb.append("<").append("resourceadapter").append(">");
+
+ sb.append("<" + ResourceAdapter10.Tag.MANAGED_CONNECTIONFACTORY_CLASS + ">");
+ sb.append(managedConnectionFactoryClass);
+ sb.append("</" + ResourceAdapter10.Tag.MANAGED_CONNECTIONFACTORY_CLASS + ">");
+
+ sb.append("<" + ResourceAdapter10.Tag.CONNECTIONFACTORY_INTERFACE + ">");
+ sb.append(connectionFactoryInterface);
+ sb.append("</" + ResourceAdapter10.Tag.CONNECTIONFACTORY_INTERFACE + ">");
+
+ sb.append("<" + ResourceAdapter10.Tag.CONNECTIONFACTORY_IMPL_CLASS + ">");
+ sb.append(connectionFactoryImplClass);
+ sb.append("</" + ResourceAdapter10.Tag.CONNECTIONFACTORY_IMPL_CLASS + ">");
+
+ sb.append("<" + ResourceAdapter10.Tag.CONNECTION_INTERFACE + ">");
+ sb.append(connectionInterface);
+ sb.append("</" + ResourceAdapter10.Tag.CONNECTION_INTERFACE + ">");
+
+ sb.append("<" + ResourceAdapter10.Tag.CONNECTION_IMPL_CLASS + ">");
+ sb.append(connectionImplClass);
+ sb.append("</" + ResourceAdapter10.Tag.CONNECTION_IMPL_CLASS + ">");
+
+ sb.append("<" + ResourceAdapter10.Tag.TRANSACTION_SUPPORT + ">");
+ sb.append(transactionSupport);
+ sb.append("</" + ResourceAdapter10.Tag.TRANSACTION_SUPPORT + ">");
+
+ if (configProperties != null)
+ {
+ for (ConfigProperty cp : configProperties)
+ {
+ sb.append(cp);
+ }
+ }
+
+ if (authenticationMechanism != null)
+ {
+ for (AuthenticationMechanism am : authenticationMechanism)
+ {
+ sb.append(am);
+ }
+ }
+
+ if (reauthenticationSupport != null)
+ {
+ sb.append("<" + ResourceAdapter10.Tag.REAUTHENTICATION_SUPPORT + ">");
+ sb.append(reauthenticationSupport);
+ sb.append("</" + ResourceAdapter10.Tag.REAUTHENTICATION_SUPPORT + ">");
+ }
+
+ if (securityPermissions != null)
+ {
+ for (SecurityPermission sp : securityPermissions)
+ {
+ sb.append(sp);
+ }
+ }
+
+ sb.append("</").append("resourceadapter").append(">");
+
+ return sb.toString();
}
@Override
Modified: projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/metadata/ra/ra15/Activationspec15Impl.java
===================================================================
--- projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/metadata/ra/ra15/Activationspec15Impl.java 2011-08-17 17:47:30 UTC (rev 112086)
+++ projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/metadata/ra/ra15/Activationspec15Impl.java 2011-08-17 18:22:08 UTC (rev 112087)
@@ -23,7 +23,6 @@
import org.jboss.jca.common.api.metadata.CopyUtil;
import org.jboss.jca.common.api.metadata.CopyableMetaData;
-import org.jboss.jca.common.api.metadata.ra.ConfigProperty;
import org.jboss.jca.common.api.metadata.ra.RequiredConfigProperty;
import org.jboss.jca.common.api.metadata.ra.XsdString;
import org.jboss.jca.common.api.metadata.ra.ra15.Activationspec15;
@@ -163,14 +162,28 @@
@Override
public String toString()
{
- return "Activationspec [activationspecClass=" + activationspecClass + ", requiredConfigProperty="
- + requiredConfigProperty + ", id=" + id + "]";
- }
+ StringBuilder sb = new StringBuilder();
- @Override
- public List<? extends ConfigProperty> getConfigProperties()
- {
- return null;
+ sb.append("<activationspec");
+ if (id != null)
+ sb.append(" ").append(Activationspec15.Attribute.ID).append("=\"").append(id).append("\"");
+ sb.append(">");
+
+ sb.append("<").append(Activationspec15.Tag.ACTIVATIONSPEC_CLASS).append(">");
+ sb.append(activationspecClass);
+ sb.append("</").append(Activationspec15.Tag.ACTIVATIONSPEC_CLASS).append(">");
+
+ if (requiredConfigProperty != null)
+ {
+ for (RequiredConfigProperty rcp : requiredConfigProperty)
+ {
+ sb.append(rcp);
+ }
+ }
+
+ sb.append("</activationspec>");
+
+ return sb.toString();
}
@Override
Modified: projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/metadata/ra/ra15/Connector15Impl.java
===================================================================
--- projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/metadata/ra/ra15/Connector15Impl.java 2011-08-17 17:47:30 UTC (rev 112086)
+++ projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/metadata/ra/ra15/Connector15Impl.java 2011-08-17 18:22:08 UTC (rev 112087)
@@ -125,9 +125,46 @@
@Override
public String toString()
{
- return "Connector15Impl [resourceadapterVersion=" + resourceadapterVersion + ", vendorName=" + vendorName
- + ", eisType=" + eisType + ", license=" + license + ", resourceadapter=" + resourceadapter + ", id=" + id
- + ", description=" + description + ", displayName=" + displayName + ", icon=" + icon + "]";
+ StringBuilder sb = new StringBuilder(1024);
+
+ sb.append("<?xml version=\"1.0\" encoding=\"UTF-8\"?>");
+ sb.append("<").append("connector");
+ sb.append(" " + Connector15.Attribute.VERSION + "=\"1.5\"");
+ if (id != null)
+ sb.append(" " + Connector15.Attribute.ID + "=\"" + id + "\"");
+ sb.append(">");
+
+ // description, displayName, icon
+
+ if (!XsdString.isNull(vendorName))
+ {
+ sb.append("<" + Connector15.Tag.VENDORNAME + ">");
+ sb.append(vendorName);
+ sb.append("</" + Connector15.Tag.VENDORNAME + ">");
+ }
+
+ if (!XsdString.isNull(eisType))
+ {
+ sb.append("<" + Connector15.Tag.EIS_TYPE + ">");
+ sb.append(eisType);
+ sb.append("</" + Connector15.Tag.EIS_TYPE + ">");
+ }
+
+ if (!XsdString.isNull(resourceadapterVersion))
+ {
+ sb.append("<" + Connector15.Tag.RESOURCEADPTER_VERSION + ">");
+ sb.append(resourceadapterVersion);
+ sb.append("</" + Connector15.Tag.RESOURCEADPTER_VERSION + ">");
+ }
+
+ if (license != null)
+ sb.append(license);
+
+ sb.append(resourceadapter);
+
+ sb.append("</").append("connector").append(">");
+
+ return sb.toString();
}
@Override
Modified: projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/metadata/ra/ra16/Activationspec16Impl.java
===================================================================
--- projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/metadata/ra/ra16/Activationspec16Impl.java 2011-08-17 17:47:30 UTC (rev 112086)
+++ projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/metadata/ra/ra16/Activationspec16Impl.java 2011-08-17 18:22:08 UTC (rev 112087)
@@ -107,8 +107,36 @@
@Override
public String toString()
{
- return "Activationspec [configProperty=" + configProperties + ", activationspecClass=" + activationspecClass
- + ", requiredConfigProperty=" + requiredConfigProperty + ", id=" + id + "]";
+ StringBuilder sb = new StringBuilder();
+
+ sb.append("<activationspec");
+ if (id != null)
+ sb.append(" ").append(Activationspec16.Attribute.ID).append("=\"").append(id).append("\"");
+ sb.append(">");
+
+ sb.append("<").append(Activationspec16.Tag.ACTIVATIONSPEC_CLASS).append(">");
+ sb.append(activationspecClass);
+ sb.append("</").append(Activationspec16.Tag.ACTIVATIONSPEC_CLASS).append(">");
+
+ if (requiredConfigProperty != null)
+ {
+ for (RequiredConfigProperty rcp : requiredConfigProperty)
+ {
+ sb.append(rcp);
+ }
+ }
+
+ if (configProperties != null)
+ {
+ for (ConfigProperty cp : configProperties)
+ {
+ sb.append(cp);
+ }
+ }
+
+ sb.append("</activationspec>");
+
+ return sb.toString();
}
@Override
Modified: projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/metadata/ra/ra16/ConfigProperty16Impl.java
===================================================================
--- projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/metadata/ra/ra16/ConfigProperty16Impl.java 2011-08-17 17:47:30 UTC (rev 112086)
+++ projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/metadata/ra/ra16/ConfigProperty16Impl.java 2011-08-17 18:22:08 UTC (rev 112087)
@@ -223,11 +223,54 @@
@Override
public String toString()
{
- return "ConfigProperty [description=" + description + ", configPropertyName=" + configPropertyName
- + ", configPropertyType=" + configPropertyType + ", configPropertyValue=" + configPropertyValue
- + ", configPropertyIgnore=" + configPropertyIgnore + ", configPropertySupportsDynamicUpdates="
- + configPropertySupportsDynamicUpdates + ", configPropertyConfidential=" + configPropertyConfidential
- + ", id=" + id + "]";
+ StringBuilder sb = new StringBuilder();
+
+ sb.append("<config-property");
+ if (id != null)
+ sb.append(" ").append(ConfigProperty16.Attribute.ID).append("=\"").append(id).append("\"");
+ sb.append(">");
+
+ // description
+
+ sb.append("<").append(ConfigProperty16.Tag.CONFIG_PROPERTY_NAME).append(">");
+ sb.append(configPropertyName);
+ sb.append("</").append(ConfigProperty16.Tag.CONFIG_PROPERTY_NAME).append(">");
+
+ sb.append("<").append(ConfigProperty16.Tag.CONFIG_PROPERTY_TYPE).append(">");
+ sb.append(configPropertyType);
+ sb.append("</").append(ConfigProperty16.Tag.CONFIG_PROPERTY_TYPE).append(">");
+
+ if (!XsdString.isNull(configPropertyValue))
+ {
+ sb.append("<").append(ConfigProperty16.Tag.CONFIG_PROPERTY_VALUE).append(">");
+ sb.append(configPropertyValue);
+ sb.append("</").append(ConfigProperty16.Tag.CONFIG_PROPERTY_VALUE).append(">");
+ }
+
+ if (configPropertyIgnore != null)
+ {
+ sb.append("<").append(ConfigProperty16.Tag.CONFIG_PROPERTY_IGNORE).append(">");
+ sb.append(configPropertyIgnore);
+ sb.append("</").append(ConfigProperty16.Tag.CONFIG_PROPERTY_IGNORE).append(">");
+ }
+
+ if (configPropertySupportsDynamicUpdates != null)
+ {
+ sb.append("<").append(ConfigProperty16.Tag.CONFIG_PROPERTY_SUPPORT_DYNAMIC_UPDATE).append(">");
+ sb.append(configPropertySupportsDynamicUpdates);
+ sb.append("</").append(ConfigProperty16.Tag.CONFIG_PROPERTY_SUPPORT_DYNAMIC_UPDATE).append(">");
+ }
+
+ if (configPropertyConfidential != null)
+ {
+ sb.append("<").append(ConfigProperty16.Tag.CONFIG_PROPERTY_CONFIDENTIAL).append(">");
+ sb.append(configPropertyConfidential);
+ sb.append("</").append(ConfigProperty16.Tag.CONFIG_PROPERTY_CONFIDENTIAL).append(">");
+ }
+
+ sb.append("</config-property>");
+
+ return sb.toString();
}
@Override
Modified: projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/metadata/ra/ra16/Connector16Impl.java
===================================================================
--- projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/metadata/ra/ra16/Connector16Impl.java 2011-08-17 17:47:30 UTC (rev 112086)
+++ projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/metadata/ra/ra16/Connector16Impl.java 2011-08-17 18:22:08 UTC (rev 112087)
@@ -182,11 +182,64 @@
@Override
public String toString()
{
- return "Connector16Impl [moduleName=" + moduleName + ", requiredWorkContexts=" + requiredWorkContexts
- + ", metadataComplete=" + metadataComplete + ", resourceadapterVersion=" + resourceadapterVersion
- + ", vendorName=" + vendorName + ", eisType=" + eisType + ", license=" + license + ", resourceadapter="
- + resourceadapter + ", id=" + id + ", description=" + description + ", displayName=" + displayName
- + ", icon=" + icon + "]";
+ StringBuilder sb = new StringBuilder(1024);
+
+ sb.append("<?xml version=\"1.0\" encoding=\"UTF-8\"?>");
+ sb.append("<").append("connector");
+ sb.append(" " + Connector16.Attribute.VERSION + "=\"1.6\"");
+ sb.append(" " + Connector16.Attribute.METADATA_COMPLETE + "=\"" + metadataComplete + "\"");
+ if (id != null)
+ sb.append(" " + Connector16.Attribute.ID + "=\"" + id + "\"");
+ sb.append(">");
+
+ if (moduleName != null)
+ {
+ sb.append("<" + Connector16.Tag.MODULENAME + ">");
+ sb.append(moduleName);
+ sb.append("</" + Connector16.Tag.MODULENAME + ">");
+ }
+
+ // description, displayName, icon
+
+ if (!XsdString.isNull(vendorName))
+ {
+ sb.append("<" + Connector16.Tag.VENDORNAME + ">");
+ sb.append(vendorName);
+ sb.append("</" + Connector16.Tag.VENDORNAME + ">");
+ }
+
+ if (!XsdString.isNull(eisType))
+ {
+ sb.append("<" + Connector16.Tag.EIS_TYPE + ">");
+ sb.append(eisType);
+ sb.append("</" + Connector16.Tag.EIS_TYPE + ">");
+ }
+
+ if (!XsdString.isNull(resourceadapterVersion))
+ {
+ sb.append("<" + Connector16.Tag.RESOURCEADPTER_VERSION + ">");
+ sb.append(resourceadapterVersion);
+ sb.append("</" + Connector16.Tag.RESOURCEADPTER_VERSION + ">");
+ }
+
+ if (license != null)
+ sb.append(license);
+
+ sb.append(resourceadapter);
+
+ if (requiredWorkContexts != null)
+ {
+ for (String rwc : requiredWorkContexts)
+ {
+ sb.append("<" + Connector16.Tag.REQUIRED_WORK_CONTEXT + ">");
+ sb.append(rwc);
+ sb.append("</" + Connector16.Tag.REQUIRED_WORK_CONTEXT + ">");
+ }
+ }
+
+ sb.append("</").append("connector").append(">");
+
+ return sb.toString();
}
@Override
Modified: projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/metadata/resourceadapter/ResourceAdapterImpl.java
===================================================================
--- projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/metadata/resourceadapter/ResourceAdapterImpl.java 2011-08-17 17:47:30 UTC (rev 112086)
+++ projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/metadata/resourceadapter/ResourceAdapterImpl.java 2011-08-17 18:22:08 UTC (rev 112087)
@@ -27,6 +27,7 @@
import org.jboss.jca.common.api.metadata.resourceadapter.ResourceAdapter;
import org.jboss.jca.common.metadata.common.CommonIronJacamarImpl;
+import java.util.Iterator;
import java.util.List;
import java.util.Map;
@@ -106,10 +107,77 @@
@Override
public String toString()
{
- return "ResourceAdapterImpl [archive=" + archive + ", transactionSupport=" + transactionSupport +
- ", configProperties=" + configProperties + ", adminObjects=" + adminObjects +
- ", connectionDefinitions=" + connectionDefinitions + ", beanValidationGroups=" +
- beanValidationGroups + ", bootstrapContext=" + bootstrapContext + "]";
+ StringBuilder sb = new StringBuilder(1024);
+
+ sb.append("<resource-adapter>");
+
+ sb.append("<").append(ResourceAdapter.Tag.ARCHIVE).append(">");
+ sb.append(archive);
+ sb.append("</").append(ResourceAdapter.Tag.ARCHIVE).append(">");
+
+ if (beanValidationGroups != null && beanValidationGroups.size() > 0)
+ {
+ sb.append("<").append(ResourceAdapter.Tag.BEAN_VALIDATION_GROUPS).append(">");
+ for (String bvg : beanValidationGroups)
+ {
+ sb.append("<").append(ResourceAdapter.Tag.BEAN_VALIDATION_GROUP).append(">");
+ sb.append(bvg);
+ sb.append("</").append(ResourceAdapter.Tag.BEAN_VALIDATION_GROUP).append(">");
+ }
+ sb.append("</").append(ResourceAdapter.Tag.BEAN_VALIDATION_GROUPS).append(">");
+ }
+
+ if (bootstrapContext != null)
+ {
+ sb.append("<").append(ResourceAdapter.Tag.BOOTSTRAP_CONTEXT).append(">");
+ sb.append(bootstrapContext);
+ sb.append("</").append(ResourceAdapter.Tag.BOOTSTRAP_CONTEXT).append(">");
+ }
+
+ if (configProperties != null && configProperties.size() > 0)
+ {
+ Iterator<Map.Entry<String, String>> it = configProperties.entrySet().iterator();
+ while (it.hasNext())
+ {
+ Map.Entry<String, String> entry = it.next();
+
+ sb.append("<").append(ResourceAdapter.Tag.CONFIG_PROPERTY);
+ sb.append(" name=\"").append(entry.getKey()).append("\">");
+ sb.append(entry.getValue());
+ sb.append("</").append(ResourceAdapter.Tag.CONFIG_PROPERTY).append(">");
+ }
+ }
+
+ if (transactionSupport != null)
+ {
+ sb.append("<").append(ResourceAdapter.Tag.TRANSACTION_SUPPORT).append(">");
+ sb.append(transactionSupport);
+ sb.append("</").append(ResourceAdapter.Tag.TRANSACTION_SUPPORT).append(">");
+ }
+
+ if (connectionDefinitions != null && connectionDefinitions.size() > 0)
+ {
+ sb.append("<").append(ResourceAdapter.Tag.CONNECTION_DEFINITIONS).append(">");
+ for (CommonConnDef cd : connectionDefinitions)
+ {
+ sb.append(cd);
+ }
+ sb.append("</").append(ResourceAdapter.Tag.CONNECTION_DEFINITIONS).append(">");
+ }
+
+ if (adminObjects != null && adminObjects.size() > 0)
+ {
+ sb.append("<").append(ResourceAdapter.Tag.ADMIN_OBJECTS).append(">");
+ for (CommonAdminObject ao : adminObjects)
+ {
+ sb.append(ao);
+ }
+ sb.append("</").append(ResourceAdapter.Tag.ADMIN_OBJECTS).append(">");
+ }
+
+ sb.append("</resource-adapter>");
+
+ return sb.toString();
}
}
Modified: projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/metadata/resourceadapter/ResourceAdaptersImpl.java
===================================================================
--- projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/metadata/resourceadapter/ResourceAdaptersImpl.java 2011-08-17 17:47:30 UTC (rev 112086)
+++ projects/jboss-jca/branches/Branch_1_0/common/src/main/java/org/jboss/jca/common/metadata/resourceadapter/ResourceAdaptersImpl.java 2011-08-17 18:22:08 UTC (rev 112087)
@@ -72,5 +72,27 @@
return Collections.unmodifiableList(resourceAdapters);
}
+ /**
+ * {@inheritDoc}
+ */
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder(1024);
+
+ sb.append("<?xml version=\"1.0\" encoding=\"UTF-8\"?>");
+ sb.append("<resource-adapters>");
+
+ if (resourceAdapters != null && resourceAdapters.size() > 0)
+ {
+ for (ResourceAdapter ra : resourceAdapters)
+ {
+ sb.append(ra);
+ }
+ }
+
+ sb.append("</resource-adapters>");
+
+ return sb.toString();
+ }
}
Modified: projects/jboss-jca/branches/Branch_1_0/common/src/main/resources/schema/connector_1_5.xsd
===================================================================
--- projects/jboss-jca/branches/Branch_1_0/common/src/main/resources/schema/connector_1_5.xsd 2011-08-17 17:47:30 UTC (rev 112086)
+++ projects/jboss-jca/branches/Branch_1_0/common/src/main/resources/schema/connector_1_5.xsd 2011-08-17 18:22:08 UTC (rev 112087)
@@ -1,1035 +1,1035 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema xmlns="http://www.w3.org/2001/XMLSchema"
- targetNamespace="http://java.sun.com/xml/ns/j2ee"
- xmlns:j2ee="http://java.sun.com/xml/ns/j2ee"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- elementFormDefault="qualified"
- attributeFormDefault="unqualified"
- version="1.5">
- <xsd:annotation>
- <xsd:documentation>
- @(#)connector_1_5.xsds 1.27 06/17/03
- </xsd:documentation>
- </xsd:annotation>
-
- <xsd:annotation>
- <xsd:documentation>
-
- Copyright 2003 Sun Microsystems, Inc., 901 San Antonio
- Road, Palo Alto, California 94303, U.S.A. All rights
- reserved.
-
- Sun Microsystems, Inc. has intellectual property rights
- relating to technology described in this document. In
- particular, and without limitation, these intellectual
- property rights may include one or more of the U.S. patents
- listed at http://www.sun.com/patents and one or more
- additional patents or pending patent applications in the
- U.S. and other countries.
-
- This document and the technology which it describes are
- distributed under licenses restricting their use, copying,
- distribution, and decompilation. No part of this document
- may be reproduced in any form by any means without prior
- written authorization of Sun and its licensors, if any.
-
- Third-party software, including font technology, is
- copyrighted and licensed from Sun suppliers.
-
- Sun, Sun Microsystems, the Sun logo, Solaris, Java, J2EE,
- JavaServer Pages, Enterprise JavaBeans and the Java Coffee
- Cup logo are trademarks or registered trademarks of Sun
- Microsystems, Inc. in the U.S. and other countries.
-
- Federal Acquisitions: Commercial Software - Government Users
- Subject to Standard License Terms and Conditions.
-
- </xsd:documentation>
- </xsd:annotation>
-
- <xsd:annotation>
- <xsd:documentation>
- <![CDATA[
-
- This is the XML Schema for the Connector 1.5 deployment
- descriptor. The deployment descriptor must be named
- "META-INF/ra.xml" in the connector's rar file. All Connector
- deployment descriptors must indicate the connector resource
- adapter schema by using the J2EE namespace:
-
- http://java.sun.com/xml/ns/j2ee
-
- and by indicating the version of the schema by
- using the version element as shown below:
-
- <connector xmlns="http://java.sun.com/xml/ns/j2ee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
- http://java.sun.com/xml/ns/j2ee/connector_1_5.xsd"
- version="1.5">
- ...
- </connector>
-
- The instance documents may indicate the published version of
- the schema using the xsi:schemaLocation attribute for J2EE
- namespace with the following location:
-
- http://java.sun.com/xml/ns/j2ee/connector_1_5.xsd
-
- ]]>
- </xsd:documentation>
- </xsd:annotation>
-
- <xsd:annotation>
- <xsd:documentation>
-
- The following conventions apply to all J2EE
- deployment descriptor elements unless indicated otherwise.
-
- - In elements that specify a pathname to a file within the
- same JAR file, relative filenames (i.e., those not
- starting with "/") are considered relative to the root of
- the JAR file's namespace. Absolute filenames (i.e., those
- starting with "/") also specify names in the root of the
- JAR file's namespace. In general, relative names are
- preferred. The exception is .war files where absolute
- names are preferred for consistency with the Servlet API.
-
- </xsd:documentation>
- </xsd:annotation>
-
- <xsd:include schemaLocation="j2ee_1_4.xsd"/>
-
-
-<!-- **************************************************** -->
-
-
- <xsd:element name="connector" type="j2ee:connectorType">
- <xsd:annotation>
- <xsd:documentation>
-
- The connector element is the root element of the deployment
- descriptor for the resource adapter. This element includes
- general information - vendor name, resource adapter version,
- icon - about the resource adapter module. It also includes
- information specific to the implementation of the resource
- adapter library as specified through the element
- resourceadapter.
-
- </xsd:documentation>
- </xsd:annotation>
-
- </xsd:element>
-
-<!-- **************************************************** -->
-
- <xsd:complexType name="activationspecType">
- <xsd:annotation>
- <xsd:documentation>
-
- The activationspecType specifies an activation
- specification. The information includes fully qualified
- Java class name of an activation specification and a set of
- required configuration property names.
-
- </xsd:documentation>
- </xsd:annotation>
-
- <xsd:sequence>
- <xsd:element name="activationspec-class"
- type="j2ee:fully-qualified-classType">
- <xsd:annotation>
- <xsd:documentation>
- <![CDATA[
-
- The element activationspec-class specifies the fully
- qualified Java class name of the activation
- specification class. This class must implement the
- javax.resource.spi.ActivationSpec interface. The
- implementation of this class is required to be a
- JavaBean.
-
- Example:
- <activationspec-class>com.wombat.ActivationSpecImpl
- </activationspec-class>
-
- ]]>
- </xsd:documentation>
- </xsd:annotation>
- </xsd:element>
- <xsd:element name="required-config-property"
- type="j2ee:required-config-propertyType"
- minOccurs="0"
- maxOccurs="unbounded"/>
- </xsd:sequence>
- <xsd:attribute name="id" type="xsd:ID"/>
- </xsd:complexType>
-
-<!-- **************************************************** -->
-
- <xsd:complexType name="adminobjectType">
- <xsd:annotation>
- <xsd:documentation>
-
- The adminobjectType specifies information about an
- administered object. Administered objects are specific to a
- messaging style or message provider. This contains
- information on the Java type of the interface implemented by
- an administered object, its Java class name and its
- configuration properties.
-
- </xsd:documentation>
- </xsd:annotation>
-
- <xsd:sequence>
- <xsd:element name="adminobject-interface"
- type="j2ee:fully-qualified-classType">
- <xsd:annotation>
- <xsd:documentation>
- <![CDATA[
-
- The element adminobject-interface specifies the
- fully qualified name of the Java type of the
- interface implemented by an administered object.
-
- Example:
- <adminobject-interface>javax.jms.Destination
- </adminobject-interface>
-
- ]]>
- </xsd:documentation>
- </xsd:annotation>
-
- </xsd:element>
- <xsd:element name="adminobject-class"
- type="j2ee:fully-qualified-classType">
- <xsd:annotation>
- <xsd:documentation>
- <![CDATA[
-
- The element adminobject-class specifies the fully
- qualified Java class name of an administered object.
-
- Example:
- <adminobject-class>com.wombat.DestinationImpl
- </adminobject-class>
-
- ]]>
- </xsd:documentation>
- </xsd:annotation>
- </xsd:element>
-
- <xsd:element name="config-property"
- type="j2ee:config-propertyType"
- minOccurs="0"
- maxOccurs="unbounded"/>
- </xsd:sequence>
- <xsd:attribute name="id" type="xsd:ID"/>
- </xsd:complexType>
-
-<!-- **************************************************** -->
-
- <xsd:complexType name="authentication-mechanismType">
- <xsd:annotation>
- <xsd:documentation>
-
- The authentication-mechanismType specifies an authentication
- mechanism supported by the resource adapter. Note that this
- support is for the resource adapter and not for the
- underlying EIS instance. The optional description specifies
- any resource adapter specific requirement for the support of
- security contract and authentication mechanism.
-
- Note that BasicPassword mechanism type should support the
- javax.resource.spi.security.PasswordCredential interface.
- The Kerbv5 mechanism type should support the
- org.ietf.jgss.GSSCredential interface or the deprecated
- javax.resource.spi.security.GenericCredential interface.
-
- </xsd:documentation>
- </xsd:annotation>
-
- <xsd:sequence>
- <xsd:element name="description"
- type="j2ee:descriptionType"
- minOccurs="0"
- maxOccurs="unbounded"/>
- <xsd:element name="authentication-mechanism-type"
- type="j2ee:xsdStringType">
- <xsd:annotation>
- <xsd:documentation>
- <![CDATA[
-
- The element authentication-mechanism-type specifies
- type of an authentication mechanism.
-
- The example values are:
-
- <authentication-mechanism-type>BasicPassword
- </authentication-mechanism-type>
-
- <authentication-mechanism-type>Kerbv5
- </authentication-mechanism-type>
-
- Any additional security mechanisms are outside the
- scope of the Connector architecture specification.
-
- ]]>
- </xsd:documentation>
- </xsd:annotation>
-
- </xsd:element>
- <xsd:element name="credential-interface"
- type="j2ee:credential-interfaceType"/>
- </xsd:sequence>
- <xsd:attribute name="id" type="xsd:ID"/>
- </xsd:complexType>
-
-<!-- **************************************************** -->
-
- <xsd:complexType name="config-property-nameType">
- <xsd:annotation>
- <xsd:documentation>
- <![CDATA[
-
- The config-property-nameType contains the name of a
- configuration property.
-
- The connector architecture defines a set of well-defined
- properties all of type java.lang.String. These are as
- follows.
-
- ServerName
- PortNumber
- UserName
- Password
- ConnectionURL
-
- A resource adapter provider can extend this property set to
- include properties specific to the resource adapter and its
- underlying EIS.
-
- Possible values include
- ServerName
- PortNumber
- UserName
- Password
- ConnectionURL
-
- Example: <config-property-name>ServerName</config-property-name>
-
- ]]>
- </xsd:documentation>
- </xsd:annotation>
- <xsd:simpleContent>
- <xsd:restriction base="j2ee:xsdStringType"/>
- </xsd:simpleContent>
- </xsd:complexType>
-
-<!-- **************************************************** -->
-
- <xsd:complexType name="config-property-typeType">
- <xsd:annotation>
- <xsd:documentation>
- <![CDATA[
-
- The config-property-typeType contains the fully
- qualified Java type of a configuration property.
-
- The following are the legal values:
- java.lang.Boolean, java.lang.String, java.lang.Integer,
- java.lang.Double, java.lang.Byte, java.lang.Short,
- java.lang.Long, java.lang.Float, java.lang.Character
-
- Used in: config-property
-
- Example:
- <config-property-type>java.lang.String</config-property-type>
-
- ]]>
- </xsd:documentation>
- </xsd:annotation>
- <xsd:simpleContent>
- <xsd:restriction base="j2ee:string">
- <xsd:enumeration value="java.lang.Boolean"/>
- <xsd:enumeration value="java.lang.String"/>
- <xsd:enumeration value="java.lang.Integer"/>
- <xsd:enumeration value="java.lang.Double"/>
- <xsd:enumeration value="java.lang.Byte"/>
- <xsd:enumeration value="java.lang.Short"/>
- <xsd:enumeration value="java.lang.Long"/>
- <xsd:enumeration value="java.lang.Float"/>
- <xsd:enumeration value="java.lang.Character"/>
- </xsd:restriction>
- </xsd:simpleContent>
- </xsd:complexType>
-
-<!-- **************************************************** -->
-
- <xsd:complexType name="config-propertyType">
- <xsd:annotation>
- <xsd:documentation>
-
- The config-propertyType contains a declaration of a single
- configuration property that may be used for providing
- configuration information.
-
- The declaration consists of an optional description, name,
- type and an optional value of the configuration property. If
- the resource adapter provider does not specify a value than
- the deployer is responsible for providing a valid value for
- a configuration property.
-
- Any bounds or well-defined values of properties should be
- described in the description element.
-
- </xsd:documentation>
- </xsd:annotation>
- <xsd:sequence>
- <xsd:element name="description"
- type="j2ee:descriptionType"
- minOccurs="0"
- maxOccurs="unbounded"/>
- <xsd:element name="config-property-name"
- type="j2ee:config-property-nameType"/>
- <xsd:element name="config-property-type"
- type="j2ee:config-property-typeType"/>
- <xsd:element name="config-property-value"
- type="j2ee:xsdStringType"
- minOccurs="0">
- <xsd:annotation>
- <xsd:documentation>
- <![CDATA[
-
- The element config-property-value contains the value
- of a configuration entry. Note, it is possible for a
- resource adapter deployer to override this
- configuration information during deployment.
-
- Example:
- <config-property-value>WombatServer</config-property-value>
-
- ]]>
- </xsd:documentation>
- </xsd:annotation>
- </xsd:element>
- </xsd:sequence>
- <xsd:attribute name="id" type="xsd:ID"/>
- </xsd:complexType>
-
-<!-- **************************************************** -->
-
- <xsd:complexType name="connection-definitionType">
- <xsd:annotation>
- <xsd:documentation>
-
- The connection-definitionType defines a set of connection
- interfaces and classes pertaining to a particular connection
- type. This also includes configurable properties for
- ManagedConnectionFactory instances that may be produced out
- of this set.
-
- </xsd:documentation>
- </xsd:annotation>
-
- <xsd:sequence>
- <xsd:element name="managedconnectionfactory-class"
- type="j2ee:fully-qualified-classType">
- <xsd:annotation>
- <xsd:documentation>
- <![CDATA[
-
- The element managedconnectionfactory-class specifies
- the fully qualified name of the Java class that
- implements the
- javax.resource.spi.ManagedConnectionFactory interface.
- This Java class is provided as part of resource
- adapter's implementation of connector architecture
- specified contracts. The implementation of this
- class is required to be a JavaBean.
-
- Example:
- <managedconnectionfactory-class>
- com.wombat.ManagedConnectionFactoryImpl
- </managedconnectionfactory-class>
-
- ]]>
- </xsd:documentation>
- </xsd:annotation>
- </xsd:element>
- <xsd:element name="config-property"
- type="j2ee:config-propertyType"
- minOccurs="0"
- maxOccurs="unbounded"/>
- <xsd:element name="connectionfactory-interface"
- type="j2ee:fully-qualified-classType">
- <xsd:annotation>
- <xsd:documentation>
- <![CDATA[
-
- The element connectionfactory-interface specifies
- the fully qualified name of the ConnectionFactory
- interface supported by the resource adapter.
-
- Example:
- <connectionfactory-interface>com.wombat.ConnectionFactory
- </connectionfactory-interface>
-
- OR
-
- <connectionfactory-interface>javax.resource.cci.ConnectionFactory
- </connectionfactory-interface>
-
- ]]>
- </xsd:documentation>
- </xsd:annotation>
- </xsd:element>
-
- <xsd:element name="connectionfactory-impl-class"
- type="j2ee:fully-qualified-classType">
- <xsd:annotation>
- <xsd:documentation>
- <![CDATA[
-
- The element connectionfactory-impl-class specifies
- the fully qualified name of the ConnectionFactory
- class that implements resource adapter
- specific ConnectionFactory interface.
-
- Example:
-
- <connectionfactory-impl-class>com.wombat.ConnectionFactoryImpl
- </connectionfactory-impl-class>
-
- ]]>
- </xsd:documentation>
- </xsd:annotation>
- </xsd:element>
- <xsd:element name="connection-interface"
- type="j2ee:fully-qualified-classType">
- <xsd:annotation>
- <xsd:documentation>
- <![CDATA[
-
- The connection-interface element specifies the fully
- qualified name of the Connection interface supported
- by the resource adapter.
-
- Example:
-
- <connection-interface>javax.resource.cci.Connection
- </connection-interface>
-
- ]]>
- </xsd:documentation>
- </xsd:annotation>
- </xsd:element>
- <xsd:element name="connection-impl-class"
- type="j2ee:fully-qualified-classType">
- <xsd:annotation>
- <xsd:documentation>
- <![CDATA[
-
- The connection-impl-classType specifies the fully
- qualified name of the Connection class that
- implements resource adapter specific Connection
- interface. It is used by the connection-impl-class
- elements.
-
- Example:
-
- <connection-impl-class>com.wombat.ConnectionImpl
- </connection-impl-class>
-
- ]]>
- </xsd:documentation>
- </xsd:annotation>
- </xsd:element>
- </xsd:sequence>
- <xsd:attribute name="id" type="xsd:ID"/>
- </xsd:complexType>
-
-<!-- **************************************************** -->
-
- <xsd:complexType name="connectorType">
- <xsd:annotation>
- <xsd:documentation>
-
- The connectorType defines a resource adapter.
-
- </xsd:documentation>
- </xsd:annotation>
-
- <xsd:sequence>
- <xsd:group ref="j2ee:descriptionGroup"/>
- <xsd:element name="vendor-name"
- type="j2ee:xsdStringType">
- <xsd:annotation>
- <xsd:documentation>
-
- The element vendor-name specifies the name of
- resource adapter provider vendor.
-
- </xsd:documentation>
- </xsd:annotation>
- </xsd:element>
- <xsd:element name="eis-type"
- type="j2ee:xsdStringType">
- <xsd:annotation>
- <xsd:documentation>
-
- The element eis-type contains information about the
- type of the EIS. For example, the type of an EIS can
- be product name of EIS independent of any version
- info.
-
- This helps in identifying EIS instances that can be
- used with this resource adapter.
-
- </xsd:documentation>
- </xsd:annotation>
- </xsd:element>
- <xsd:element name="resourceadapter-version"
- type="j2ee:xsdStringType">
- <xsd:annotation>
- <xsd:documentation>
-
- The element resourceadapter-version specifies a string-based version
- of the resource adapter from the resource adapter
- provider.
-
- </xsd:documentation>
- </xsd:annotation>
-
- </xsd:element>
- <xsd:element name="license"
- type="j2ee:licenseType"
- minOccurs="0"/>
- <xsd:element name="resourceadapter"
- type="j2ee:resourceadapterType"/>
-
- </xsd:sequence>
- <xsd:attribute name="version"
- type="j2ee:dewey-versionType"
- fixed="1.5"
- use="required">
- <xsd:annotation>
- <xsd:documentation>
-
- The version specifies the version of the
- connector architecture specification that is
- supported by this resource adapter. This information
- enables deployer to configure the resource adapter to
- support deployment and runtime requirements of the
- corresponding connector architecture specification.
-
- </xsd:documentation>
- </xsd:annotation>
- </xsd:attribute>
- <xsd:attribute name="id" type="xsd:ID"/>
- </xsd:complexType>
-
-<!-- **************************************************** -->
-
- <xsd:complexType name="credential-interfaceType">
- <xsd:annotation>
- <xsd:documentation>
-
- The credential-interfaceType specifies the
- interface that the resource adapter implementation
- supports for the representation of the
- credentials. This element(s) that use this type,
- i.e. credential-interface, should be used by
- application server to find out the Credential
- interface it should use as part of the security
- contract.
-
- The possible values are:
-
- javax.resource.spi.security.PasswordCredential
- org.ietf.jgss.GSSCredential
- javax.resource.spi.security.GenericCredential
-
- </xsd:documentation>
- </xsd:annotation>
- <xsd:simpleContent>
- <xsd:restriction base="j2ee:fully-qualified-classType">
- <xsd:enumeration
- value="javax.resource.spi.security.PasswordCredential"/>
- <xsd:enumeration
- value="org.ietf.jgss.GSSCredential"/>
- <xsd:enumeration
- value="javax.resource.spi.security.GenericCredential"/>
- </xsd:restriction>
- </xsd:simpleContent>
- </xsd:complexType>
-
-<!-- **************************************************** -->
-
- <xsd:complexType name="inbound-resourceadapterType">
- <xsd:annotation>
- <xsd:documentation>
-
- The inbound-resourceadapterType specifies information
- about an inbound resource adapter. This contains information
- specific to the implementation of the resource adapter
- library as specified through the messageadapter element.
-
- </xsd:documentation>
- </xsd:annotation>
-
- <xsd:sequence>
- <xsd:element name="messageadapter"
- type="j2ee:messageadapterType"
- minOccurs="0">
- <xsd:unique name="messagelistener-type-uniqueness">
- <xsd:annotation>
- <xsd:documentation>
-
- The messagelistener-type element content must be
- unique in the messageadapter. Several messagelisteners
- can not use the same messagelistener-type.
-
- </xsd:documentation>
- </xsd:annotation>
- <xsd:selector xpath="j2ee:messagelistener"/>
- <xsd:field xpath="j2ee:messagelistener-type"/>
- </xsd:unique>
- </xsd:element>
- </xsd:sequence>
- <xsd:attribute name="id" type="xsd:ID"/>
- </xsd:complexType>
-
-<!-- **************************************************** -->
-
- <xsd:complexType name="licenseType">
- <xsd:annotation>
- <xsd:documentation>
-
- The licenseType specifies licensing requirements for the
- resource adapter module. This type specifies whether a
- license is required to deploy and use this resource adapter,
- and an optional description of the licensing terms
- (examples: duration of license, number of connection
- restrictions). It is used by the license element.
-
- </xsd:documentation>
- </xsd:annotation>
-
- <xsd:sequence>
- <xsd:element name="description"
- type="j2ee:descriptionType"
- minOccurs="0"
- maxOccurs="unbounded"/>
- <xsd:element name="license-required"
- type="j2ee:true-falseType">
- <xsd:annotation>
- <xsd:documentation>
-
- The element license-required specifies whether a
- license is required to deploy and use the
- resource adapter. This element must be one of
- the following, "true" or "false".
-
- </xsd:documentation>
- </xsd:annotation>
- </xsd:element>
- </xsd:sequence>
- <xsd:attribute name="id" type="xsd:ID"/>
- </xsd:complexType>
-
-<!-- **************************************************** -->
-
- <xsd:complexType name="messageadapterType">
- <xsd:annotation>
- <xsd:documentation>
-
- The messageadapterType specifies information about the
- messaging capabilities of the resource adapter. This
- contains information specific to the implementation of the
- resource adapter library as specified through the
- messagelistener element.
-
- </xsd:documentation>
- </xsd:annotation>
-
- <xsd:sequence>
- <xsd:element name="messagelistener"
- type="j2ee:messagelistenerType"
- maxOccurs="unbounded"/>
- </xsd:sequence>
- <xsd:attribute name="id" type="xsd:ID"/>
- </xsd:complexType>
-
-<!-- **************************************************** -->
-
- <xsd:complexType name="messagelistenerType">
- <xsd:annotation>
- <xsd:documentation>
-
- The messagelistenerType specifies information about a
- specific message listener supported by the messaging
- resource adapter. It contains information on the Java type
- of the message listener interface and an activation
- specification.
-
- </xsd:documentation>
- </xsd:annotation>
-
- <xsd:sequence>
- <xsd:element name="messagelistener-type"
- type="j2ee:fully-qualified-classType">
- <xsd:annotation>
- <xsd:documentation>
- <![CDATA[
-
- The element messagelistener-type specifies the fully
- qualified name of the Java type of a message
- listener interface.
-
- Example:
-
- <messagelistener-type>javax.jms.MessageListener
- </messagelistener-type>
-
- ]]>
- </xsd:documentation>
- </xsd:annotation>
-
- </xsd:element>
- <xsd:element name="activationspec"
- type="j2ee:activationspecType"/>
- </xsd:sequence>
- <xsd:attribute name="id" type="xsd:ID"/>
- </xsd:complexType>
-
-<!-- **************************************************** -->
-
- <xsd:complexType name="outbound-resourceadapterType">
- <xsd:annotation>
- <xsd:documentation>
-
- The outbound-resourceadapterType specifies information about
- an outbound resource adapter. The information includes fully
- qualified names of classes/interfaces required as part of
- the connector architecture specified contracts for
- connection management, level of transaction support
- provided, one or more authentication mechanisms supported
- and additional required security permissions.
-
- If there is no authentication-mechanism specified as part of
- resource adapter element then the resource adapter does not
- support any standard security authentication mechanisms as
- part of security contract. The application server ignores
- the security part of the system contracts in this case.
-
- </xsd:documentation>
- </xsd:annotation>
-
- <xsd:sequence>
- <xsd:element name="connection-definition"
- type="j2ee:connection-definitionType"
- maxOccurs="unbounded"/>
- <xsd:element name="transaction-support"
- type="j2ee:transaction-supportType"/>
- <xsd:element name="authentication-mechanism"
- type="j2ee:authentication-mechanismType"
- minOccurs="0"
- maxOccurs="unbounded"/>
- <xsd:element name="reauthentication-support"
- type="j2ee:true-falseType">
- <xsd:annotation>
- <xsd:documentation>
-
- The element reauthentication-support specifies
- whether the resource adapter implementation supports
- re-authentication of existing Managed- Connection
- instance. Note that this information is for the
- resource adapter implementation and not for the
- underlying EIS instance. This element must have
- either a "true" or "false" value.
-
- </xsd:documentation>
- </xsd:annotation>
-
- </xsd:element>
- </xsd:sequence>
- <xsd:attribute name="id" type="xsd:ID"/>
- </xsd:complexType>
-
-<!-- **************************************************** -->
-
- <xsd:complexType name="required-config-propertyType">
- <xsd:annotation>
- <xsd:documentation>
- <![CDATA[
-
- The required-config-propertyType contains a declaration
- of a single configuration property used for specifying a
- required configuration property name. It is used
- by required-config-property elements.
-
- Example:
-
- <required-config-property>Destination</required-config-property>
-
- ]]>
- </xsd:documentation>
- </xsd:annotation>
-
- <xsd:sequence>
- <xsd:element name="description"
- type="j2ee:descriptionType"
- minOccurs="0"
- maxOccurs="unbounded"/>
- <xsd:element name="config-property-name"
- type="j2ee:config-property-nameType"/>
- </xsd:sequence>
- <xsd:attribute name="id" type="xsd:ID"/>
- </xsd:complexType>
-
-<!-- **************************************************** -->
-
- <xsd:complexType name="resourceadapterType">
- <xsd:annotation>
- <xsd:documentation>
-
- The resourceadapterType specifies information about the
- resource adapter. The information includes fully qualified
- resource adapter Java class name, configuration properties,
- information specific to the implementation of the resource
- adapter library as specified through the
- outbound-resourceadapter and inbound-resourceadapter
- elements, and an optional set of administered objects.
-
- </xsd:documentation>
- </xsd:annotation>
-
- <xsd:sequence>
- <xsd:element name="resourceadapter-class"
- type="j2ee:fully-qualified-classType"
- minOccurs="0">
- <xsd:annotation>
- <xsd:documentation>
-
- The element resourceadapter-class specifies the
- fully qualified name of a Java class that implements
- the javax.resource.spi.ResourceAdapter
- interface. This Java class is provided as part of
- resource adapter's implementation of connector
- architecture specified contracts. The implementation
- of this class is required to be a JavaBean.
-
- </xsd:documentation>
- </xsd:annotation>
-
- </xsd:element>
- <xsd:element name="config-property"
- type="j2ee:config-propertyType"
- minOccurs="0"
- maxOccurs="unbounded"/>
- <xsd:element name="outbound-resourceadapter"
- type="j2ee:outbound-resourceadapterType"
- minOccurs="0">
- <xsd:unique name="connectionfactory-interface-uniqueness">
- <xsd:annotation>
- <xsd:documentation>
-
- The connectionfactory-interface element content
- must be unique in the outbound-resourceadapter.
- Multiple connection-definitions can not use the
- same connectionfactory-type.
-
- </xsd:documentation>
- </xsd:annotation>
- <xsd:selector xpath="j2ee:connection-definition"/>
- <xsd:field xpath="j2ee:connectionfactory-interface"/>
- </xsd:unique>
- </xsd:element>
- <xsd:element name="inbound-resourceadapter"
- type="j2ee:inbound-resourceadapterType"
- minOccurs="0"/>
- <xsd:element name="adminobject"
- type="j2ee:adminobjectType"
- minOccurs="0"
- maxOccurs="unbounded"/>
- <xsd:element name="security-permission"
- type="j2ee:security-permissionType"
- minOccurs="0"
- maxOccurs="unbounded"/>
- </xsd:sequence>
- <xsd:attribute name="id" type="xsd:ID"/>
- </xsd:complexType>
-
-<!-- **************************************************** -->
-
- <xsd:complexType name="security-permissionType">
- <xsd:annotation>
- <xsd:documentation>
-
- The security-permissionType specifies a security
- permission that is required by the resource adapter code.
-
- The security permission listed in the deployment descriptor
- are ones that are different from those required by the
- default permission set as specified in the connector
- specification. The optional description can mention specific
- reason that resource adapter requires a given security
- permission.
-
- </xsd:documentation>
- </xsd:annotation>
-
- <xsd:sequence>
- <xsd:element name="description"
- type="j2ee:descriptionType"
- minOccurs="0"
- maxOccurs="unbounded"/>
- <xsd:element name="security-permission-spec"
- type="j2ee:xsdStringType">
- <xsd:annotation>
- <xsd:documentation>
-
- The element security-permission-spec specifies a security
- permission based on the Security policy file
- syntax. Refer to the following URL for Sun's
- implementation of the security permission
- specification:
-
- http://java.sun.com/products/jdk/1.4/docs/guide/security/PolicyFiles.html#FileSyntax
- </xsd:documentation>
- </xsd:annotation>
- </xsd:element>
- </xsd:sequence>
- <xsd:attribute name="id" type="xsd:ID"/>
- </xsd:complexType>
-
-<!-- **************************************************** -->
-
- <xsd:complexType name="transaction-supportType">
- <xsd:annotation>
- <xsd:documentation>
-
- The transaction-supportType specifies the level of
- transaction support provided by the resource adapter. It is
- used by transaction-support elements.
-
- The value must be one of the following:
-
- NoTransaction
- LocalTransaction
- XATransaction
-
- </xsd:documentation>
- </xsd:annotation>
- <xsd:simpleContent>
- <xsd:restriction base="j2ee:string">
- <xsd:enumeration value="NoTransaction"/>
- <xsd:enumeration value="LocalTransaction"/>
- <xsd:enumeration value="XATransaction"/>
- </xsd:restriction>
- </xsd:simpleContent>
- </xsd:complexType>
-
-</xsd:schema>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<xsd:schema xmlns="http://www.w3.org/2001/XMLSchema"
+ targetNamespace="http://java.sun.com/xml/ns/j2ee"
+ xmlns:j2ee="http://java.sun.com/xml/ns/j2ee"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ elementFormDefault="qualified"
+ attributeFormDefault="unqualified"
+ version="1.5">
+ <xsd:annotation>
+ <xsd:documentation>
+ @(#)connector_1_5.xsds 1.27 06/17/03
+ </xsd:documentation>
+ </xsd:annotation>
+
+ <xsd:annotation>
+ <xsd:documentation>
+
+ Copyright 2003 Sun Microsystems, Inc., 901 San Antonio
+ Road, Palo Alto, California 94303, U.S.A. All rights
+ reserved.
+
+ Sun Microsystems, Inc. has intellectual property rights
+ relating to technology described in this document. In
+ particular, and without limitation, these intellectual
+ property rights may include one or more of the U.S. patents
+ listed at http://www.sun.com/patents and one or more
+ additional patents or pending patent applications in the
+ U.S. and other countries.
+
+ This document and the technology which it describes are
+ distributed under licenses restricting their use, copying,
+ distribution, and decompilation. No part of this document
+ may be reproduced in any form by any means without prior
+ written authorization of Sun and its licensors, if any.
+
+ Third-party software, including font technology, is
+ copyrighted and licensed from Sun suppliers.
+
+ Sun, Sun Microsystems, the Sun logo, Solaris, Java, J2EE,
+ JavaServer Pages, Enterprise JavaBeans and the Java Coffee
+ Cup logo are trademarks or registered trademarks of Sun
+ Microsystems, Inc. in the U.S. and other countries.
+
+ Federal Acquisitions: Commercial Software - Government Users
+ Subject to Standard License Terms and Conditions.
+
+ </xsd:documentation>
+ </xsd:annotation>
+
+ <xsd:annotation>
+ <xsd:documentation>
+ <![CDATA[
+
+ This is the XML Schema for the Connector 1.5 deployment
+ descriptor. The deployment descriptor must be named
+ "META-INF/ra.xml" in the connector's rar file. All Connector
+ deployment descriptors must indicate the connector resource
+ adapter schema by using the J2EE namespace:
+
+ http://java.sun.com/xml/ns/j2ee
+
+ and by indicating the version of the schema by
+ using the version element as shown below:
+
+ <connector xmlns="http://java.sun.com/xml/ns/j2ee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
+ http://java.sun.com/xml/ns/j2ee/connector_1_5.xsd"
+ version="1.5">
+ ...
+ </connector>
+
+ The instance documents may indicate the published version of
+ the schema using the xsi:schemaLocation attribute for J2EE
+ namespace with the following location:
+
+ http://java.sun.com/xml/ns/j2ee/connector_1_5.xsd
+
+ ]]>
+ </xsd:documentation>
+ </xsd:annotation>
+
+ <xsd:annotation>
+ <xsd:documentation>
+
+ The following conventions apply to all J2EE
+ deployment descriptor elements unless indicated otherwise.
+
+ - In elements that specify a pathname to a file within the
+ same JAR file, relative filenames (i.e., those not
+ starting with "/") are considered relative to the root of
+ the JAR file's namespace. Absolute filenames (i.e., those
+ starting with "/") also specify names in the root of the
+ JAR file's namespace. In general, relative names are
+ preferred. The exception is .war files where absolute
+ names are preferred for consistency with the Servlet API.
+
+ </xsd:documentation>
+ </xsd:annotation>
+
+ <xsd:include schemaLocation="j2ee_1_4.xsd"/>
+
+
+<!-- **************************************************** -->
+
+
+ <xsd:element name="connector" type="j2ee:connectorType">
+ <xsd:annotation>
+ <xsd:documentation>
+
+ The connector element is the root element of the deployment
+ descriptor for the resource adapter. This element includes
+ general information - vendor name, resource adapter version,
+ icon - about the resource adapter module. It also includes
+ information specific to the implementation of the resource
+ adapter library as specified through the element
+ resourceadapter.
+
+ </xsd:documentation>
+ </xsd:annotation>
+
+ </xsd:element>
+
+<!-- **************************************************** -->
+
+ <xsd:complexType name="activationspecType">
+ <xsd:annotation>
+ <xsd:documentation>
+
+ The activationspecType specifies an activation
+ specification. The information includes fully qualified
+ Java class name of an activation specification and a set of
+ required configuration property names.
+
+ </xsd:documentation>
+ </xsd:annotation>
+
+ <xsd:sequence>
+ <xsd:element name="activationspec-class"
+ type="j2ee:fully-qualified-classType">
+ <xsd:annotation>
+ <xsd:documentation>
+ <![CDATA[
+
+ The element activationspec-class specifies the fully
+ qualified Java class name of the activation
+ specification class. This class must implement the
+ javax.resource.spi.ActivationSpec interface. The
+ implementation of this class is required to be a
+ JavaBean.
+
+ Example:
+ <activationspec-class>com.wombat.ActivationSpecImpl
+ </activationspec-class>
+
+ ]]>
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+ <xsd:element name="required-config-property"
+ type="j2ee:required-config-propertyType"
+ minOccurs="0"
+ maxOccurs="unbounded"/>
+ </xsd:sequence>
+ <xsd:attribute name="id" type="xsd:ID"/>
+ </xsd:complexType>
+
+<!-- **************************************************** -->
+
+ <xsd:complexType name="adminobjectType">
+ <xsd:annotation>
+ <xsd:documentation>
+
+ The adminobjectType specifies information about an
+ administered object. Administered objects are specific to a
+ messaging style or message provider. This contains
+ information on the Java type of the interface implemented by
+ an administered object, its Java class name and its
+ configuration properties.
+
+ </xsd:documentation>
+ </xsd:annotation>
+
+ <xsd:sequence>
+ <xsd:element name="adminobject-interface"
+ type="j2ee:fully-qualified-classType">
+ <xsd:annotation>
+ <xsd:documentation>
+ <![CDATA[
+
+ The element adminobject-interface specifies the
+ fully qualified name of the Java type of the
+ interface implemented by an administered object.
+
+ Example:
+ <adminobject-interface>javax.jms.Destination
+ </adminobject-interface>
+
+ ]]>
+ </xsd:documentation>
+ </xsd:annotation>
+
+ </xsd:element>
+ <xsd:element name="adminobject-class"
+ type="j2ee:fully-qualified-classType">
+ <xsd:annotation>
+ <xsd:documentation>
+ <![CDATA[
+
+ The element adminobject-class specifies the fully
+ qualified Java class name of an administered object.
+
+ Example:
+ <adminobject-class>com.wombat.DestinationImpl
+ </adminobject-class>
+
+ ]]>
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+
+ <xsd:element name="config-property"
+ type="j2ee:config-propertyType"
+ minOccurs="0"
+ maxOccurs="unbounded"/>
+ </xsd:sequence>
+ <xsd:attribute name="id" type="xsd:ID"/>
+ </xsd:complexType>
+
+<!-- **************************************************** -->
+
+ <xsd:complexType name="authentication-mechanismType">
+ <xsd:annotation>
+ <xsd:documentation>
+
+ The authentication-mechanismType specifies an authentication
+ mechanism supported by the resource adapter. Note that this
+ support is for the resource adapter and not for the
+ underlying EIS instance. The optional description specifies
+ any resource adapter specific requirement for the support of
+ security contract and authentication mechanism.
+
+ Note that BasicPassword mechanism type should support the
+ javax.resource.spi.security.PasswordCredential interface.
+ The Kerbv5 mechanism type should support the
+ org.ietf.jgss.GSSCredential interface or the deprecated
+ javax.resource.spi.security.GenericCredential interface.
+
+ </xsd:documentation>
+ </xsd:annotation>
+
+ <xsd:sequence>
+ <xsd:element name="description"
+ type="j2ee:descriptionType"
+ minOccurs="0"
+ maxOccurs="unbounded"/>
+ <xsd:element name="authentication-mechanism-type"
+ type="j2ee:xsdStringType">
+ <xsd:annotation>
+ <xsd:documentation>
+ <![CDATA[
+
+ The element authentication-mechanism-type specifies
+ type of an authentication mechanism.
+
+ The example values are:
+
+ <authentication-mechanism-type>BasicPassword
+ </authentication-mechanism-type>
+
+ <authentication-mechanism-type>Kerbv5
+ </authentication-mechanism-type>
+
+ Any additional security mechanisms are outside the
+ scope of the Connector architecture specification.
+
+ ]]>
+ </xsd:documentation>
+ </xsd:annotation>
+
+ </xsd:element>
+ <xsd:element name="credential-interface"
+ type="j2ee:credential-interfaceType"/>
+ </xsd:sequence>
+ <xsd:attribute name="id" type="xsd:ID"/>
+ </xsd:complexType>
+
+<!-- **************************************************** -->
+
+ <xsd:complexType name="config-property-nameType">
+ <xsd:annotation>
+ <xsd:documentation>
+ <![CDATA[
+
+ The config-property-nameType contains the name of a
+ configuration property.
+
+ The connector architecture defines a set of well-defined
+ properties all of type java.lang.String. These are as
+ follows.
+
+ ServerName
+ PortNumber
+ UserName
+ Password
+ ConnectionURL
+
+ A resource adapter provider can extend this property set to
+ include properties specific to the resource adapter and its
+ underlying EIS.
+
+ Possible values include
+ ServerName
+ PortNumber
+ UserName
+ Password
+ ConnectionURL
+
+ Example: <config-property-name>ServerName</config-property-name>
+
+ ]]>
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:simpleContent>
+ <xsd:restriction base="j2ee:xsdStringType"/>
+ </xsd:simpleContent>
+ </xsd:complexType>
+
+<!-- **************************************************** -->
+
+ <xsd:complexType name="config-property-typeType">
+ <xsd:annotation>
+ <xsd:documentation>
+ <![CDATA[
+
+ The config-property-typeType contains the fully
+ qualified Java type of a configuration property.
+
+ The following are the legal values:
+ java.lang.Boolean, java.lang.String, java.lang.Integer,
+ java.lang.Double, java.lang.Byte, java.lang.Short,
+ java.lang.Long, java.lang.Float, java.lang.Character
+
+ Used in: config-property
+
+ Example:
+ <config-property-type>java.lang.String</config-property-type>
+
+ ]]>
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:simpleContent>
+ <xsd:restriction base="j2ee:string">
+ <xsd:enumeration value="java.lang.Boolean"/>
+ <xsd:enumeration value="java.lang.String"/>
+ <xsd:enumeration value="java.lang.Integer"/>
+ <xsd:enumeration value="java.lang.Double"/>
+ <xsd:enumeration value="java.lang.Byte"/>
+ <xsd:enumeration value="java.lang.Short"/>
+ <xsd:enumeration value="java.lang.Long"/>
+ <xsd:enumeration value="java.lang.Float"/>
+ <xsd:enumeration value="java.lang.Character"/>
+ </xsd:restriction>
+ </xsd:simpleContent>
+ </xsd:complexType>
+
+<!-- **************************************************** -->
+
+ <xsd:complexType name="config-propertyType">
+ <xsd:annotation>
+ <xsd:documentation>
+
+ The config-propertyType contains a declaration of a single
+ configuration property that may be used for providing
+ configuration information.
+
+ The declaration consists of an optional description, name,
+ type and an optional value of the configuration property. If
+ the resource adapter provider does not specify a value than
+ the deployer is responsible for providing a valid value for
+ a configuration property.
+
+ Any bounds or well-defined values of properties should be
+ described in the description element.
+
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:sequence>
+ <xsd:element name="description"
+ type="j2ee:descriptionType"
+ minOccurs="0"
+ maxOccurs="unbounded"/>
+ <xsd:element name="config-property-name"
+ type="j2ee:config-property-nameType"/>
+ <xsd:element name="config-property-type"
+ type="j2ee:config-property-typeType"/>
+ <xsd:element name="config-property-value"
+ type="j2ee:xsdStringType"
+ minOccurs="0">
+ <xsd:annotation>
+ <xsd:documentation>
+ <![CDATA[
+
+ The element config-property-value contains the value
+ of a configuration entry. Note, it is possible for a
+ resource adapter deployer to override this
+ configuration information during deployment.
+
+ Example:
+ <config-property-value>WombatServer</config-property-value>
+
+ ]]>
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+ </xsd:sequence>
+ <xsd:attribute name="id" type="xsd:ID"/>
+ </xsd:complexType>
+
+<!-- **************************************************** -->
+
+ <xsd:complexType name="connection-definitionType">
+ <xsd:annotation>
+ <xsd:documentation>
+
+ The connection-definitionType defines a set of connection
+ interfaces and classes pertaining to a particular connection
+ type. This also includes configurable properties for
+ ManagedConnectionFactory instances that may be produced out
+ of this set.
+
+ </xsd:documentation>
+ </xsd:annotation>
+
+ <xsd:sequence>
+ <xsd:element name="managedconnectionfactory-class"
+ type="j2ee:fully-qualified-classType">
+ <xsd:annotation>
+ <xsd:documentation>
+ <![CDATA[
+
+ The element managedconnectionfactory-class specifies
+ the fully qualified name of the Java class that
+ implements the
+ javax.resource.spi.ManagedConnectionFactory interface.
+ This Java class is provided as part of resource
+ adapter's implementation of connector architecture
+ specified contracts. The implementation of this
+ class is required to be a JavaBean.
+
+ Example:
+ <managedconnectionfactory-class>
+ com.wombat.ManagedConnectionFactoryImpl
+ </managedconnectionfactory-class>
+
+ ]]>
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+ <xsd:element name="config-property"
+ type="j2ee:config-propertyType"
+ minOccurs="0"
+ maxOccurs="unbounded"/>
+ <xsd:element name="connectionfactory-interface"
+ type="j2ee:fully-qualified-classType">
+ <xsd:annotation>
+ <xsd:documentation>
+ <![CDATA[
+
+ The element connectionfactory-interface specifies
+ the fully qualified name of the ConnectionFactory
+ interface supported by the resource adapter.
+
+ Example:
+ <connectionfactory-interface>com.wombat.ConnectionFactory
+ </connectionfactory-interface>
+
+ OR
+
+ <connectionfactory-interface>javax.resource.cci.ConnectionFactory
+ </connectionfactory-interface>
+
+ ]]>
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+
+ <xsd:element name="connectionfactory-impl-class"
+ type="j2ee:fully-qualified-classType">
+ <xsd:annotation>
+ <xsd:documentation>
+ <![CDATA[
+
+ The element connectionfactory-impl-class specifies
+ the fully qualified name of the ConnectionFactory
+ class that implements resource adapter
+ specific ConnectionFactory interface.
+
+ Example:
+
+ <connectionfactory-impl-class>com.wombat.ConnectionFactoryImpl
+ </connectionfactory-impl-class>
+
+ ]]>
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+ <xsd:element name="connection-interface"
+ type="j2ee:fully-qualified-classType">
+ <xsd:annotation>
+ <xsd:documentation>
+ <![CDATA[
+
+ The connection-interface element specifies the fully
+ qualified name of the Connection interface supported
+ by the resource adapter.
+
+ Example:
+
+ <connection-interface>javax.resource.cci.Connection
+ </connection-interface>
+
+ ]]>
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+ <xsd:element name="connection-impl-class"
+ type="j2ee:fully-qualified-classType">
+ <xsd:annotation>
+ <xsd:documentation>
+ <![CDATA[
+
+ The connection-impl-classType specifies the fully
+ qualified name of the Connection class that
+ implements resource adapter specific Connection
+ interface. It is used by the connection-impl-class
+ elements.
+
+ Example:
+
+ <connection-impl-class>com.wombat.ConnectionImpl
+ </connection-impl-class>
+
+ ]]>
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+ </xsd:sequence>
+ <xsd:attribute name="id" type="xsd:ID"/>
+ </xsd:complexType>
+
+<!-- **************************************************** -->
+
+ <xsd:complexType name="connectorType">
+ <xsd:annotation>
+ <xsd:documentation>
+
+ The connectorType defines a resource adapter.
+
+ </xsd:documentation>
+ </xsd:annotation>
+
+ <xsd:sequence>
+ <xsd:group ref="j2ee:descriptionGroup"/>
+ <xsd:element name="vendor-name"
+ type="j2ee:xsdStringType">
+ <xsd:annotation>
+ <xsd:documentation>
+
+ The element vendor-name specifies the name of
+ resource adapter provider vendor.
+
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+ <xsd:element name="eis-type"
+ type="j2ee:xsdStringType">
+ <xsd:annotation>
+ <xsd:documentation>
+
+ The element eis-type contains information about the
+ type of the EIS. For example, the type of an EIS can
+ be product name of EIS independent of any version
+ info.
+
+ This helps in identifying EIS instances that can be
+ used with this resource adapter.
+
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+ <xsd:element name="resourceadapter-version"
+ type="j2ee:xsdStringType">
+ <xsd:annotation>
+ <xsd:documentation>
+
+ The element resourceadapter-version specifies a string-based version
+ of the resource adapter from the resource adapter
+ provider.
+
+ </xsd:documentation>
+ </xsd:annotation>
+
+ </xsd:element>
+ <xsd:element name="license"
+ type="j2ee:licenseType"
+ minOccurs="0"/>
+ <xsd:element name="resourceadapter"
+ type="j2ee:resourceadapterType"/>
+
+ </xsd:sequence>
+ <xsd:attribute name="version"
+ type="j2ee:dewey-versionType"
+ fixed="1.5"
+ use="required">
+ <xsd:annotation>
+ <xsd:documentation>
+
+ The version specifies the version of the
+ connector architecture specification that is
+ supported by this resource adapter. This information
+ enables deployer to configure the resource adapter to
+ support deployment and runtime requirements of the
+ corresponding connector architecture specification.
+
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:attribute>
+ <xsd:attribute name="id" type="xsd:ID"/>
+ </xsd:complexType>
+
+<!-- **************************************************** -->
+
+ <xsd:complexType name="credential-interfaceType">
+ <xsd:annotation>
+ <xsd:documentation>
+
+ The credential-interfaceType specifies the
+ interface that the resource adapter implementation
+ supports for the representation of the
+ credentials. This element(s) that use this type,
+ i.e. credential-interface, should be used by
+ application server to find out the Credential
+ interface it should use as part of the security
+ contract.
+
+ The possible values are:
+
+ javax.resource.spi.security.PasswordCredential
+ org.ietf.jgss.GSSCredential
+ javax.resource.spi.security.GenericCredential
+
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:simpleContent>
+ <xsd:restriction base="j2ee:fully-qualified-classType">
+ <xsd:enumeration
+ value="javax.resource.spi.security.PasswordCredential"/>
+ <xsd:enumeration
+ value="org.ietf.jgss.GSSCredential"/>
+ <xsd:enumeration
+ value="javax.resource.spi.security.GenericCredential"/>
+ </xsd:restriction>
+ </xsd:simpleContent>
+ </xsd:complexType>
+
+<!-- **************************************************** -->
+
+ <xsd:complexType name="inbound-resourceadapterType">
+ <xsd:annotation>
+ <xsd:documentation>
+
+ The inbound-resourceadapterType specifies information
+ about an inbound resource adapter. This contains information
+ specific to the implementation of the resource adapter
+ library as specified through the messageadapter element.
+
+ </xsd:documentation>
+ </xsd:annotation>
+
+ <xsd:sequence>
+ <xsd:element name="messageadapter"
+ type="j2ee:messageadapterType"
+ minOccurs="0">
+ <xsd:unique name="messagelistener-type-uniqueness">
+ <xsd:annotation>
+ <xsd:documentation>
+
+ The messagelistener-type element content must be
+ unique in the messageadapter. Several messagelisteners
+ can not use the same messagelistener-type.
+
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:selector xpath="j2ee:messagelistener"/>
+ <xsd:field xpath="j2ee:messagelistener-type"/>
+ </xsd:unique>
+ </xsd:element>
+ </xsd:sequence>
+ <xsd:attribute name="id" type="xsd:ID"/>
+ </xsd:complexType>
+
+<!-- **************************************************** -->
+
+ <xsd:complexType name="licenseType">
+ <xsd:annotation>
+ <xsd:documentation>
+
+ The licenseType specifies licensing requirements for the
+ resource adapter module. This type specifies whether a
+ license is required to deploy and use this resource adapter,
+ and an optional description of the licensing terms
+ (examples: duration of license, number of connection
+ restrictions). It is used by the license element.
+
+ </xsd:documentation>
+ </xsd:annotation>
+
+ <xsd:sequence>
+ <xsd:element name="description"
+ type="j2ee:descriptionType"
+ minOccurs="0"
+ maxOccurs="unbounded"/>
+ <xsd:element name="license-required"
+ type="j2ee:true-falseType">
+ <xsd:annotation>
+ <xsd:documentation>
+
+ The element license-required specifies whether a
+ license is required to deploy and use the
+ resource adapter. This element must be one of
+ the following, "true" or "false".
+
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+ </xsd:sequence>
+ <xsd:attribute name="id" type="xsd:ID"/>
+ </xsd:complexType>
+
+<!-- **************************************************** -->
+
+ <xsd:complexType name="messageadapterType">
+ <xsd:annotation>
+ <xsd:documentation>
+
+ The messageadapterType specifies information about the
+ messaging capabilities of the resource adapter. This
+ contains information specific to the implementation of the
+ resource adapter library as specified through the
+ messagelistener element.
+
+ </xsd:documentation>
+ </xsd:annotation>
+
+ <xsd:sequence>
+ <xsd:element name="messagelistener"
+ type="j2ee:messagelistenerType"
+ maxOccurs="unbounded"/>
+ </xsd:sequence>
+ <xsd:attribute name="id" type="xsd:ID"/>
+ </xsd:complexType>
+
+<!-- **************************************************** -->
+
+ <xsd:complexType name="messagelistenerType">
+ <xsd:annotation>
+ <xsd:documentation>
+
+ The messagelistenerType specifies information about a
+ specific message listener supported by the messaging
+ resource adapter. It contains information on the Java type
+ of the message listener interface and an activation
+ specification.
+
+ </xsd:documentation>
+ </xsd:annotation>
+
+ <xsd:sequence>
+ <xsd:element name="messagelistener-type"
+ type="j2ee:fully-qualified-classType">
+ <xsd:annotation>
+ <xsd:documentation>
+ <![CDATA[
+
+ The element messagelistener-type specifies the fully
+ qualified name of the Java type of a message
+ listener interface.
+
+ Example:
+
+ <messagelistener-type>javax.jms.MessageListener
+ </messagelistener-type>
+
+ ]]>
+ </xsd:documentation>
+ </xsd:annotation>
+
+ </xsd:element>
+ <xsd:element name="activationspec"
+ type="j2ee:activationspecType"/>
+ </xsd:sequence>
+ <xsd:attribute name="id" type="xsd:ID"/>
+ </xsd:complexType>
+
+<!-- **************************************************** -->
+
+ <xsd:complexType name="outbound-resourceadapterType">
+ <xsd:annotation>
+ <xsd:documentation>
+
+ The outbound-resourceadapterType specifies information about
+ an outbound resource adapter. The information includes fully
+ qualified names of classes/interfaces required as part of
+ the connector architecture specified contracts for
+ connection management, level of transaction support
+ provided, one or more authentication mechanisms supported
+ and additional required security permissions.
+
+ If there is no authentication-mechanism specified as part of
+ resource adapter element then the resource adapter does not
+ support any standard security authentication mechanisms as
+ part of security contract. The application server ignores
+ the security part of the system contracts in this case.
+
+ </xsd:documentation>
+ </xsd:annotation>
+
+ <xsd:sequence>
+ <xsd:element name="connection-definition"
+ type="j2ee:connection-definitionType"
+ maxOccurs="unbounded"/>
+ <xsd:element name="transaction-support"
+ type="j2ee:transaction-supportType"/>
+ <xsd:element name="authentication-mechanism"
+ type="j2ee:authentication-mechanismType"
+ minOccurs="0"
+ maxOccurs="unbounded"/>
+ <xsd:element name="reauthentication-support"
+ type="j2ee:true-falseType">
+ <xsd:annotation>
+ <xsd:documentation>
+
+ The element reauthentication-support specifies
+ whether the resource adapter implementation supports
+ re-authentication of existing Managed- Connection
+ instance. Note that this information is for the
+ resource adapter implementation and not for the
+ underlying EIS instance. This element must have
+ either a "true" or "false" value.
+
+ </xsd:documentation>
+ </xsd:annotation>
+
+ </xsd:element>
+ </xsd:sequence>
+ <xsd:attribute name="id" type="xsd:ID"/>
+ </xsd:complexType>
+
+<!-- **************************************************** -->
+
+ <xsd:complexType name="required-config-propertyType">
+ <xsd:annotation>
+ <xsd:documentation>
+ <![CDATA[
+
+ The required-config-propertyType contains a declaration
+ of a single configuration property used for specifying a
+ required configuration property name. It is used
+ by required-config-property elements.
+
+ Example:
+
+ <required-config-property>Destination</required-config-property>
+
+ ]]>
+ </xsd:documentation>
+ </xsd:annotation>
+
+ <xsd:sequence>
+ <xsd:element name="description"
+ type="j2ee:descriptionType"
+ minOccurs="0"
+ maxOccurs="unbounded"/>
+ <xsd:element name="config-property-name"
+ type="j2ee:config-property-nameType"/>
+ </xsd:sequence>
+ <xsd:attribute name="id" type="xsd:ID"/>
+ </xsd:complexType>
+
+<!-- **************************************************** -->
+
+ <xsd:complexType name="resourceadapterType">
+ <xsd:annotation>
+ <xsd:documentation>
+
+ The resourceadapterType specifies information about the
+ resource adapter. The information includes fully qualified
+ resource adapter Java class name, configuration properties,
+ information specific to the implementation of the resource
+ adapter library as specified through the
+ outbound-resourceadapter and inbound-resourceadapter
+ elements, and an optional set of administered objects.
+
+ </xsd:documentation>
+ </xsd:annotation>
+
+ <xsd:sequence>
+ <xsd:element name="resourceadapter-class"
+ type="j2ee:fully-qualified-classType"
+ minOccurs="0">
+ <xsd:annotation>
+ <xsd:documentation>
+
+ The element resourceadapter-class specifies the
+ fully qualified name of a Java class that implements
+ the javax.resource.spi.ResourceAdapter
+ interface. This Java class is provided as part of
+ resource adapter's implementation of connector
+ architecture specified contracts. The implementation
+ of this class is required to be a JavaBean.
+
+ </xsd:documentation>
+ </xsd:annotation>
+
+ </xsd:element>
+ <xsd:element name="config-property"
+ type="j2ee:config-propertyType"
+ minOccurs="0"
+ maxOccurs="unbounded"/>
+ <xsd:element name="outbound-resourceadapter"
+ type="j2ee:outbound-resourceadapterType"
+ minOccurs="0">
+ <xsd:unique name="connectionfactory-interface-uniqueness">
+ <xsd:annotation>
+ <xsd:documentation>
+
+ The connectionfactory-interface element content
+ must be unique in the outbound-resourceadapter.
+ Multiple connection-definitions can not use the
+ same connectionfactory-type.
+
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:selector xpath="j2ee:connection-definition"/>
+ <xsd:field xpath="j2ee:connectionfactory-interface"/>
+ </xsd:unique>
+ </xsd:element>
+ <xsd:element name="inbound-resourceadapter"
+ type="j2ee:inbound-resourceadapterType"
+ minOccurs="0"/>
+ <xsd:element name="adminobject"
+ type="j2ee:adminobjectType"
+ minOccurs="0"
+ maxOccurs="unbounded"/>
+ <xsd:element name="security-permission"
+ type="j2ee:security-permissionType"
+ minOccurs="0"
+ maxOccurs="unbounded"/>
+ </xsd:sequence>
+ <xsd:attribute name="id" type="xsd:ID"/>
+ </xsd:complexType>
+
+<!-- **************************************************** -->
+
+ <xsd:complexType name="security-permissionType">
+ <xsd:annotation>
+ <xsd:documentation>
+
+ The security-permissionType specifies a security
+ permission that is required by the resource adapter code.
+
+ The security permission listed in the deployment descriptor
+ are ones that are different from those required by the
+ default permission set as specified in the connector
+ specification. The optional description can mention specific
+ reason that resource adapter requires a given security
+ permission.
+
+ </xsd:documentation>
+ </xsd:annotation>
+
+ <xsd:sequence>
+ <xsd:element name="description"
+ type="j2ee:descriptionType"
+ minOccurs="0"
+ maxOccurs="unbounded"/>
+ <xsd:element name="security-permission-spec"
+ type="j2ee:xsdStringType">
+ <xsd:annotation>
+ <xsd:documentation>
+
+ The element security-permission-spec specifies a security
+ permission based on the Security policy file
+ syntax. Refer to the following URL for Sun's
+ implementation of the security permission
+ specification:
+
+ http://java.sun.com/products/jdk/1.4/docs/guide/security/PolicyFiles.html#FileSyntax
+ </xsd:documentation>
+ </xsd:annotation>
+ </xsd:element>
+ </xsd:sequence>
+ <xsd:attribute name="id" type="xsd:ID"/>
+ </xsd:complexType>
+
+<!-- **************************************************** -->
+
+ <xsd:complexType name="transaction-supportType">
+ <xsd:annotation>
+ <xsd:documentation>
+
+ The transaction-supportType specifies the level of
+ transaction support provided by the resource adapter. It is
+ used by transaction-support elements.
+
+ The value must be one of the following:
+
+ NoTransaction
+ LocalTransaction
+ XATransaction
+
+ </xsd:documentation>
+ </xsd:annotation>
+ <xsd:simpleContent>
+ <xsd:restriction base="j2ee:string">
+ <xsd:enumeration value="NoTransaction"/>
+ <xsd:enumeration value="LocalTransaction"/>
+ <xsd:enumeration value="XATransaction"/>
+ </xsd:restriction>
+ </xsd:simpleContent>
+ </xsd:complexType>
+
+</xsd:schema>
+
Added: projects/jboss-jca/branches/Branch_1_0/common/src/test/java/org/jboss/jca/common/metadata/ds/DsParserXMLTestCase.java
===================================================================
--- projects/jboss-jca/branches/Branch_1_0/common/src/test/java/org/jboss/jca/common/metadata/ds/DsParserXMLTestCase.java (rev 0)
+++ projects/jboss-jca/branches/Branch_1_0/common/src/test/java/org/jboss/jca/common/metadata/ds/DsParserXMLTestCase.java 2011-08-17 18:22:08 UTC (rev 112087)
@@ -0,0 +1,82 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2011, 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.DataSources;
+
+import java.io.ByteArrayInputStream;
+import java.io.File;
+import java.io.FileInputStream;
+
+import org.jboss.logging.Logger;
+
+import org.junit.Test;
+
+/**
+ * Test case for parsing XML representation based upon metadata model's toString
+ *
+ * @author <a href="jesper.pedersen at jboss.org">Jesper Pedersen</a>
+ */
+public class DsParserXMLTestCase
+{
+ private static Logger log = Logger.getLogger(DsParserXMLTestCase.class);
+
+ /**
+ * shouldParseXMLRepresentation
+ * @throws Exception in case of error
+ */
+ @Test
+ public void shouldParseXMLRepresentation() throws Exception
+ {
+ FileInputStream is = null;
+ ByteArrayInputStream bais = null;
+
+ //given
+ ClassLoader cl = Thread.currentThread().getContextClassLoader();
+ File xmlFile = new File(cl.getResource("ds/unit/all-ds.xml").toURI());
+ try
+ {
+ is = new FileInputStream(xmlFile);
+
+ DsParser parser = new DsParser();
+
+ //when
+ DataSources ds1 = parser.parse(is);
+
+ String xmlRepresentation = ds1.toString();
+
+ log.debug(xmlRepresentation);
+
+ bais = new ByteArrayInputStream(xmlRepresentation.getBytes("UTF-8"));
+
+ DataSources ds2 = parser.parse(bais);
+ }
+ finally
+ {
+ if (is != null)
+ is.close();
+
+ if (bais != null)
+ bais.close();
+ }
+ }
+}
Modified: projects/jboss-jca/branches/Branch_1_0/common/src/test/java/org/jboss/jca/common/metadata/ironjacamar/IronJacamarParserTestCase.java
===================================================================
--- projects/jboss-jca/branches/Branch_1_0/common/src/test/java/org/jboss/jca/common/metadata/ironjacamar/IronJacamarParserTestCase.java 2011-08-17 17:47:30 UTC (rev 112086)
+++ projects/jboss-jca/branches/Branch_1_0/common/src/test/java/org/jboss/jca/common/metadata/ironjacamar/IronJacamarParserTestCase.java 2011-08-17 18:22:08 UTC (rev 112087)
@@ -33,17 +33,20 @@
import org.jboss.jca.common.api.metadata.ironjacamar.IronJacamar;
import org.jboss.jca.common.metadata.ParserException;
+import java.io.ByteArrayInputStream;
import java.io.File;
import java.io.FileInputStream;
import java.util.List;
import java.util.Map;
+import org.jboss.logging.Logger;
import org.jboss.util.file.FilenamePrefixFilter;
import org.hamcrest.core.IsNull;
import org.junit.Test;
import static org.hamcrest.core.Is.is;
+import static org.hamcrest.core.IsInstanceOf.instanceOf;
import static org.hamcrest.core.IsNot.not;
import static org.junit.Assert.assertThat;
import static org.mockito.Matchers.isNull;
@@ -57,6 +60,8 @@
*/
public class IronJacamarParserTestCase
{
+ private static Logger log = Logger.getLogger(IronJacamarParserTestCase.class);
+
/**
* shouldParseAnyExample
* @throws Exception in case of error
@@ -625,4 +630,46 @@
}
}
+ /**
+ *
+ * shouldParseXMLRepresentation
+ * @throws Exception in case of error
+ */
+ @Test
+ public void shouldParseXMLRepresentation() throws Exception
+ {
+ FileInputStream is = null;
+ ByteArrayInputStream bais = null;
+
+ //given
+ ClassLoader cl = Thread.currentThread().getContextClassLoader();
+ File xmlFile = new File(cl.getResource("ironjacamar/ironjacamar-all.xml").toURI());
+ try
+ {
+ is = new FileInputStream(xmlFile);
+ IronJacamarParser parser = new IronJacamarParser();
+ //when
+ IronJacamar ij1 = parser.parse(is);
+
+ String xmlRepresentation = ij1.toString();
+
+ log.debug(xmlRepresentation);
+
+ bais = new ByteArrayInputStream(xmlRepresentation.getBytes("UTF-8"));
+
+ IronJacamar ij2 = parser.parse(bais);
+
+ //then
+ assertThat(ij1, instanceOf(IronJacamar.class));
+ assertThat(ij2, instanceOf(IronJacamar.class));
+ }
+ finally
+ {
+ if (is != null)
+ is.close();
+
+ if (bais != null)
+ bais.close();
+ }
+ }
}
Modified: projects/jboss-jca/branches/Branch_1_0/common/src/test/java/org/jboss/jca/common/metadata/ra/RaParserTestCase.java
===================================================================
--- projects/jboss-jca/branches/Branch_1_0/common/src/test/java/org/jboss/jca/common/metadata/ra/RaParserTestCase.java 2011-08-17 17:47:30 UTC (rev 112086)
+++ projects/jboss-jca/branches/Branch_1_0/common/src/test/java/org/jboss/jca/common/metadata/ra/RaParserTestCase.java 2011-08-17 18:22:08 UTC (rev 112087)
@@ -27,6 +27,7 @@
import org.jboss.jca.common.api.metadata.ra.ra15.Connector15;
import org.jboss.jca.common.api.metadata.ra.ra16.Connector16;
+import java.io.ByteArrayInputStream;
import java.io.File;
import java.io.FileInputStream;
@@ -123,7 +124,7 @@
//when
Connector connector = parser.parse(is);
//then
- assertThat(connector, instanceOf(Connector15.class));
+ assertThat(connector, instanceOf(Connector16.class));
assertThat(connector.getVersion(), is(Version.V_16));
@@ -165,4 +166,44 @@
}
+ /**
+ * Parse of XML representation
+ * @throws Exception in case of error
+ */
+ @Test
+ public void shouldParseXMLRepresentation() throws Exception
+ {
+ FileInputStream is = null;
+ ByteArrayInputStream bais = null;
+ try
+ {
+ //given
+ File xmlFile = new File(Thread.currentThread().getContextClassLoader()
+ .getResource("ra.xml").toURI());
+ is = new FileInputStream(xmlFile);
+ RaParser parser = new RaParser();
+ //when
+ Connector connector1 = parser.parse(is);
+
+ String xmlRepresentation = connector1.toString();
+ bais = new ByteArrayInputStream(xmlRepresentation.getBytes("UTF-8"));
+ Connector connector2 = parser.parse(bais);
+
+ //then
+ assertThat(connector1, instanceOf(Connector16.class));
+ assertThat(connector1.getVersion(), is(Version.V_16));
+
+ assertThat(connector2, instanceOf(Connector16.class));
+ assertThat(connector2.getVersion(), is(Version.V_16));
+ }
+ finally
+ {
+ if (is != null)
+ is.close();
+
+ if (bais != null)
+ bais.close();
+ }
+
+ }
}
Modified: projects/jboss-jca/branches/Branch_1_0/common/src/test/java/org/jboss/jca/common/metadata/resourceadapter/ResourceAdapterParserTestCase.java
===================================================================
--- projects/jboss-jca/branches/Branch_1_0/common/src/test/java/org/jboss/jca/common/metadata/resourceadapter/ResourceAdapterParserTestCase.java 2011-08-17 17:47:30 UTC (rev 112086)
+++ projects/jboss-jca/branches/Branch_1_0/common/src/test/java/org/jboss/jca/common/metadata/resourceadapter/ResourceAdapterParserTestCase.java 2011-08-17 18:22:08 UTC (rev 112087)
@@ -30,11 +30,13 @@
import org.jboss.jca.common.api.metadata.resourceadapter.ResourceAdapter;
import org.jboss.jca.common.api.metadata.resourceadapter.ResourceAdapters;
+import java.io.ByteArrayInputStream;
import java.io.File;
import java.io.FileInputStream;
import java.util.List;
import java.util.Map;
+import org.jboss.logging.Logger;
import org.jboss.util.file.FileSuffixFilter;
import org.jboss.util.file.FilenamePrefixFilter;
@@ -55,6 +57,8 @@
*/
public class ResourceAdapterParserTestCase
{
+ private static Logger log = Logger.getLogger(ResourceAdapterParserTestCase.class);
+
/**
* shouldParseAnyExample
* @throws Exception in case of error
@@ -171,4 +175,42 @@
}
}
+
+ /**
+ * shouldParseXMLRepresentation
+ * @throws Exception in case of error
+ */
+ @Test
+ public void shouldParseXMLRepresentation() throws Exception
+ {
+ FileInputStream is = null;
+ ByteArrayInputStream bais = null;
+
+ //given
+ ClassLoader cl = Thread.currentThread().getContextClassLoader();
+ File xmlFile = new File(cl.getResource("resource-adapter/all-ra.xml").toURI());
+ try
+ {
+ is = new FileInputStream(xmlFile);
+ ResourceAdapterParser parser = new ResourceAdapterParser();
+ //when
+ ResourceAdapters ra1 = parser.parse(is);
+
+ String xmlRepresentation = ra1.toString();
+
+ log.debug(xmlRepresentation);
+
+ bais = new ByteArrayInputStream(xmlRepresentation.getBytes("UTF-8"));
+
+ ResourceAdapters ra2 = parser.parse(bais);
+ }
+ finally
+ {
+ if (is != null)
+ is.close();
+
+ if (bais != null)
+ bais.close();
+ }
+ }
}
Added: projects/jboss-jca/branches/Branch_1_0/common/src/test/resources/ds/unit/all-ds.xml
===================================================================
--- projects/jboss-jca/branches/Branch_1_0/common/src/test/resources/ds/unit/all-ds.xml (rev 0)
+++ projects/jboss-jca/branches/Branch_1_0/common/src/test/resources/ds/unit/all-ds.xml 2011-08-17 18:22:08 UTC (rev 112087)
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<datasources xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:noNamespaceSchemaLocation="http://www.jboss.org/jee/schema/ironjacamar/datasources_1_0.xsd">
+ <datasource jndi-name="java:/H2DS" pool-name="H2DS">
+ <connection-url>url</connection-url>
+ <driver>test</driver>
+ <pool>
+ <min-pool-size>0</min-pool-size>
+ <max-pool-size>10</max-pool-size>
+ </pool>
+ <security>
+ <user-name>user</user-name>
+ <password>password</password>
+ </security>
+ <validation>
+ <check-valid-connection-sql>SELECT 1</check-valid-connection-sql>
+ </validation>
+ <timeout>
+ <blocking-timeout-millis>5000</blocking-timeout-millis>
+ </timeout>
+ <statement>
+ <prepared-statement-cache-size>32</prepared-statement-cache-size>
+ </statement>
+ </datasource>
+ <xa-datasource jndi-name="java:/H2XADS" pool-name="H2XADS">
+ <driver>test</driver>
+ <xa-datasource-property name="token">value</xa-datasource-property>
+ <xa-pool>
+ <min-pool-size>0</min-pool-size>
+ <max-pool-size>10</max-pool-size>
+ </xa-pool>
+ <security>
+ <user-name>user</user-name>
+ <password>password</password>
+ </security>
+ <validation>
+ <check-valid-connection-sql>SELECT 1</check-valid-connection-sql>
+ </validation>
+ <timeout>
+ <blocking-timeout-millis>5000</blocking-timeout-millis>
+ </timeout>
+ <statement>
+ <prepared-statement-cache-size>32</prepared-statement-cache-size>
+ </statement>
+ <recovery>
+ <recover-credential>
+ <user-name>user</user-name>
+ <password>password</password>
+ </recover-credential>
+ <recover-plugin class-name="token">
+ <config-property name="RProperty">RValue</config-property>
+ </recover-plugin>
+ </recovery>
+ </xa-datasource>
+ <drivers>
+ <driver name="token">
+ <driver-class>token</driver-class>
+ </driver>
+ </drivers>
+</datasources>
Added: projects/jboss-jca/branches/Branch_1_0/common/src/test/resources/ironjacamar/ironjacamar-all.xml
===================================================================
--- projects/jboss-jca/branches/Branch_1_0/common/src/test/resources/ironjacamar/ironjacamar-all.xml (rev 0)
+++ projects/jboss-jca/branches/Branch_1_0/common/src/test/resources/ironjacamar/ironjacamar-all.xml 2011-08-17 18:22:08 UTC (rev 112087)
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<ironjacamar xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:noNamespaceSchemaLocation="../../../main/resources/schema/ironjacamar_1_0.xsd">
+ <config-property name="RAProperty">RAValue</config-property>
+ <transaction-support>NoTransaction</transaction-support>
+ <connection-definitions>
+ <connection-definition class-name="token" enabled="true" jndi-name="aSAPXcess" pool-name="aSAPXcess">
+ <config-property name="CDProperty">CDValue</config-property>
+ <pool>
+ <min-pool-size>0</min-pool-size>
+ <max-pool-size>64</max-pool-size>
+ <prefill>true</prefill>
+ </pool>
+ <security>
+ <application />
+ </security>
+ <timeout>
+ <blocking-timeout-millis>5000</blocking-timeout-millis>
+ <idle-timeout-minutes>15</idle-timeout-minutes>
+ </timeout>
+ <validation>
+ <background-validation>true</background-validation>
+ </validation>
+ <recovery>
+ <recover-credential>
+ <user-name>user</user-name>
+ <password>password</password>
+ </recover-credential>
+ <recover-plugin class-name="token">
+ <config-property name="RProperty">RValue</config-property>
+ </recover-plugin>
+ </recovery>
+ </connection-definition>
+ </connection-definitions>
+ <admin-objects>
+ <admin-object class-name="token" enabled="true" jndi-name="token" use-java-context="false">
+ <config-property name="AOProperty">AOValue</config-property>
+ </admin-object>
+ </admin-objects>
+</ironjacamar>
Added: projects/jboss-jca/branches/Branch_1_0/common/src/test/resources/logging.properties
===================================================================
--- projects/jboss-jca/branches/Branch_1_0/common/src/test/resources/logging.properties (rev 0)
+++ projects/jboss-jca/branches/Branch_1_0/common/src/test/resources/logging.properties 2011-08-17 18:22:08 UTC (rev 112087)
@@ -0,0 +1,62 @@
+#
+# JBoss, Home of Professional Open Source.
+# Copyright 2009, 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.
+#
+
+### $Id: $ ###
+
+# Additional logger names to configure (root logger is always configured)
+loggers=org.jboss.jca,org.jboss,org.jnp,com.arjuna
+
+# Root logger level
+logger.level=${iron.jacamar.log.level:INFO}
+logger.handlers=CONSOLE, FILE
+
+# org.jboss.jca
+logger.org.jboss.jca.level=TRACE
+
+# org.jboss
+logger.org.jboss.level=INFO
+
+# org.jnp
+logger.org.jnp.level=INFO
+
+# com.arjuna
+logger.com.arjuna.level=INFO
+
+# Console handler configuration
+handler.CONSOLE=org.jboss.logmanager.handlers.ConsoleHandler
+handler.CONSOLE.properties=autoFlush
+handler.CONSOLE.level=${iron.jacamar.log.console.level:INFO}
+handler.CONSOLE.autoFlush=true
+handler.CONSOLE.formatter=PATTERN
+
+# File handler configuration
+handler.FILE=org.jboss.logmanager.handlers.FileHandler
+handler.FILE.level=${iron.jacamar.log.file.level:TRACE}
+handler.FILE.properties=autoFlush,fileName
+handler.FILE.autoFlush=true
+handler.FILE.fileName=${test.dir}/common/test.log
+handler.FILE.formatter=PATTERN
+
+# Formatter pattern configuration
+formatter.PATTERN=org.jboss.logmanager.formatters.PatternFormatter
+formatter.PATTERN.properties=pattern
+formatter.PATTERN.pattern=%d{HH:mm:ss,SSS} %-5p [%c{1}] %m%n
Added: projects/jboss-jca/branches/Branch_1_0/common/src/test/resources/resource-adapter/all-ra.xml
===================================================================
--- projects/jboss-jca/branches/Branch_1_0/common/src/test/resources/resource-adapter/all-ra.xml (rev 0)
+++ projects/jboss-jca/branches/Branch_1_0/common/src/test/resources/resource-adapter/all-ra.xml 2011-08-17 18:22:08 UTC (rev 112087)
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<resource-adapters xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:noNamespaceSchemaLocation="../../../main/resources/schema/resource-adapter_1_0.xsd">
+ <resource-adapter>
+ <archive>token</archive>
+ <config-property name="RAProperty">RAValue</config-property>
+ <transaction-support>NoTransaction</transaction-support>
+ <connection-definitions>
+ <connection-definition class-name="token" enabled="true" jndi-name="java:/test" pool-name="test">
+ <config-property name="CDProperty">CDValue</config-property>
+ <xa-pool>
+ <min-pool-size>0</min-pool-size>
+ <max-pool-size>64</max-pool-size>
+ </xa-pool>
+ <security>
+ <application/>
+ </security>
+ <timeout>
+ <blocking-timeout-millis>5000</blocking-timeout-millis>
+ <idle-timeout-minutes>15</idle-timeout-minutes>
+ </timeout>
+ <recovery>
+ <recover-credential>
+ <security-domain>mySecurityDomain</security-domain>
+ </recover-credential>
+ <recover-plugin class-name="myClassName">
+ <config-property name="MyProperty">MyPropertyValue</config-property>
+ </recover-plugin>
+ </recovery>
+ </connection-definition>
+ </connection-definitions>
+ <admin-objects>
+ <admin-object class-name="token" enabled="true" jndi-name="token" use-java-context="false">
+ <config-property name="AOProperty">AOValue</config-property>
+ </admin-object>
+ </admin-objects>
+ </resource-adapter>
+</resource-adapters>
\ No newline at end of file
Modified: projects/jboss-jca/branches/Branch_1_0/core/src/main/java/org/jboss/jca/core/rar/SimpleResourceAdapterRepository.java
===================================================================
--- projects/jboss-jca/branches/Branch_1_0/core/src/main/java/org/jboss/jca/core/rar/SimpleResourceAdapterRepository.java 2011-08-17 17:47:30 UTC (rev 112086)
+++ projects/jboss-jca/branches/Branch_1_0/core/src/main/java/org/jboss/jca/core/rar/SimpleResourceAdapterRepository.java 2011-08-17 18:22:08 UTC (rev 112087)
@@ -27,6 +27,7 @@
import org.jboss.jca.common.api.metadata.ra.RequiredConfigProperty;
import org.jboss.jca.common.api.metadata.ra.ResourceAdapter1516;
import org.jboss.jca.common.api.metadata.ra.ra15.Activationspec15;
+import org.jboss.jca.common.api.metadata.ra.ra16.Activationspec16;
import org.jboss.jca.core.CoreBundle;
import org.jboss.jca.core.CoreLogger;
import org.jboss.jca.core.spi.mdr.MetadataRepository;
@@ -380,15 +381,18 @@
Activationspec15 as = ml.getActivationspec();
Class<?> asClz = Class.forName(as.getActivationspecClass().getValue(), true, cl);
- List<? extends ConfigProperty> cps = as.getConfigProperties();
- if (cps != null && cps.size() > 0)
+ if (as instanceof Activationspec16)
{
- for (ConfigProperty cp : cps)
+ List<? extends ConfigProperty> cps = ((Activationspec16)as).getConfigProperties();
+ if (cps != null && cps.size() > 0)
{
- String name = cp.getConfigPropertyName().getValue();
- Class<?> ct = Class.forName(cp.getConfigPropertyType().getValue(), true, cl);
+ for (ConfigProperty cp : cps)
+ {
+ String name = cp.getConfigPropertyName().getValue();
+ Class<?> ct = Class.forName(cp.getConfigPropertyType().getValue(), true, cl);
- configProperties.put(name, ct);
+ configProperties.put(name, ct);
+ }
}
}
Modified: projects/jboss-jca/branches/Branch_1_0/deployers/src/main/java/org/jboss/jca/deployers/common/AbstractDsDeployer.java
===================================================================
--- projects/jboss-jca/branches/Branch_1_0/deployers/src/main/java/org/jboss/jca/deployers/common/AbstractDsDeployer.java 2011-08-17 17:47:30 UTC (rev 112086)
+++ projects/jboss-jca/branches/Branch_1_0/deployers/src/main/java/org/jboss/jca/deployers/common/AbstractDsDeployer.java 2011-08-17 18:22:08 UTC (rev 112087)
@@ -224,6 +224,9 @@
for (DataSource dataSource : ds)
{
+ if (log.isTraceEnabled())
+ log.tracef("DataSource=%s", dataSource);
+
if (dataSource.isEnabled())
{
String jndiName = buildJndiName(dataSource.getJndiName(), dataSource.isUseJavaContext());
@@ -306,6 +309,9 @@
for (XaDataSource xaDataSource : xads)
{
+ if (log.isTraceEnabled())
+ log.tracef("XaDataSource=%s", xaDataSource);
+
if (xaDataSource.isEnabled())
{
String jndiName = buildJndiName(xaDataSource.getJndiName(), xaDataSource.isUseJavaContext());
@@ -625,7 +631,7 @@
{
interleaving = ds.getXaPool().isInterleaving();
isSameRMOverride = ds.getXaPool().isSameRmOverride();
- wrapXAResource = ds.getXaPool().isWrapXaDataSource();
+ wrapXAResource = ds.getXaPool().isWrapXaResource();
padXid = ds.getXaPool().isPadXid();
}
Modified: projects/jboss-jca/branches/Branch_1_0/deployers/src/main/java/org/jboss/jca/deployers/common/AbstractResourceAdapterDeployer.java
===================================================================
--- projects/jboss-jca/branches/Branch_1_0/deployers/src/main/java/org/jboss/jca/deployers/common/AbstractResourceAdapterDeployer.java 2011-08-17 17:47:30 UTC (rev 112086)
+++ projects/jboss-jca/branches/Branch_1_0/deployers/src/main/java/org/jboss/jca/deployers/common/AbstractResourceAdapterDeployer.java 2011-08-17 18:22:08 UTC (rev 112087)
@@ -43,6 +43,7 @@
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.ResourceAdapter10;
+import org.jboss.jca.common.api.metadata.ra.ra16.Activationspec16;
import org.jboss.jca.common.metadata.ra.common.ConfigPropertyImpl;
import org.jboss.jca.core.api.bootstrap.CloneableBootstrapContext;
import org.jboss.jca.core.api.connectionmanager.ccm.CachedConnectionManager;
@@ -622,20 +623,24 @@
if (mlMD.getActivationspec() != null &&
mlMD.getActivationspec().getActivationspecClass().getValue() != null)
{
+ List<? extends ConfigProperty> asCps = null;
+ if (mlMD.getActivationspec() instanceof Activationspec16)
+ {
+ asCps = ((Activationspec16)mlMD.getActivationspec()).getConfigProperties();
+ }
+
failures = validateArchive(
url,
Arrays.asList((Validate) new ValidateClass(Key.ACTIVATION_SPEC, mlMD.getActivationspec()
- .getActivationspecClass().getValue(), cl, mlMD.getActivationspec().getConfigProperties())),
- failures);
+ .getActivationspecClass().getValue(), cl, asCps)), failures);
if (!(getConfiguration().getArchiveValidationFailOnError() && hasFailuresLevel(failures,
Severity.ERROR)))
{
if (activateDeployment)
{
- List<? extends ConfigProperty> cpm = mlMD.getActivationspec().getConfigProperties();
String asClass = mlMD.getActivationspec().getActivationspecClass().getValue();
- Object oa = initAndInject(asClass, cpm, cl);
+ Object oa = initAndInject(asClass, asCps, cl);
if (oa == null || !(oa instanceof ActivationSpec))
throw new DeployException(bundle.invalidActivationSpec(asClass));
@@ -651,7 +656,7 @@
// Associate for validation
associateResourceAdapter(resourceAdapter, as);
- archiveValidationObjects.add(new ValidateObject(Key.ACTIVATION_SPEC, as, cpm));
+ archiveValidationObjects.add(new ValidateObject(Key.ACTIVATION_SPEC, as, asCps));
}
}
}
@@ -878,6 +883,14 @@
// Check metadata for JNDI information and activate explicit
boolean activateDeployment = checkActivation(cmd, ijmd);
+ if (log.isTraceEnabled())
+ {
+ log.tracef("Connector=%s", cmd);
+ log.tracef("IronJacamar=%s", ijmd);
+ log.tracef("RaXML=%s", raxml);
+ log.tracef("ActivateDeployment=%s", activateDeployment);
+ }
+
// Create objects and inject values
if (cmd != null)
{
@@ -1157,7 +1170,7 @@
interleaving = ijXaPool.isInterleaving();
isSameRMOverride = ijXaPool.isSameRmOverride();
- wrapXAResource = ijXaPool.isWrapXaDataSource();
+ wrapXAResource = ijXaPool.isWrapXaResource();
padXid = ijXaPool.isPadXid();
}
@@ -1174,7 +1187,7 @@
isSameRMOverride = ijXaPool.isSameRmOverride();
if (wrapXAResource == null)
- wrapXAResource = ijXaPool.isWrapXaDataSource();
+ wrapXAResource = ijXaPool.isWrapXaResource();
if (padXid == null)
padXid = ijXaPool.isPadXid();
@@ -1554,7 +1567,7 @@
interleaving = cdRaXmlXaPool.isInterleaving();
isSameRMOverride = cdRaXmlXaPool.isSameRmOverride();
- wrapXAResource = cdRaXmlXaPool.isWrapXaDataSource();
+ wrapXAResource = cdRaXmlXaPool.isWrapXaResource();
padXid = cdRaXmlXaPool.isPadXid();
recoveryMD = cdRaXml.getRecovery();
}
@@ -1570,7 +1583,7 @@
isSameRMOverride = ijXaPool.isSameRmOverride();
if (wrapXAResource == null)
- wrapXAResource = ijXaPool.isWrapXaDataSource();
+ wrapXAResource = ijXaPool.isWrapXaResource();
if (padXid == null)
padXid = ijXaPool.isPadXid();
Modified: projects/jboss-jca/branches/Branch_1_0/validator/src/main/java/org/jboss/jca/validator/Validation.java
===================================================================
--- projects/jboss-jca/branches/Branch_1_0/validator/src/main/java/org/jboss/jca/validator/Validation.java 2011-08-17 17:47:30 UTC (rev 112086)
+++ projects/jboss-jca/branches/Branch_1_0/validator/src/main/java/org/jboss/jca/validator/Validation.java 2011-08-17 18:22:08 UTC (rev 112087)
@@ -31,6 +31,7 @@
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.metadata.MetadataFactory;
import org.jboss.jca.common.spi.annotations.repository.AnnotationRepository;
import org.jboss.jca.common.spi.annotations.repository.AnnotationScanner;
@@ -355,23 +356,27 @@
&& !mlMeta.getActivationspec().getActivationspecClass().equals(XsdString.NULL_XSDSTRING))
{
- try
+ if (mlMeta.getActivationspec() instanceof Activationspec16)
{
- Class<?> clazz = Class.forName(mlMeta.getActivationspec().getActivationspecClass().getValue(),
- true, cl);
- List<? extends ConfigProperty> configProperties = mlMeta.getActivationspec().getConfigProperties();
+ try
+ {
+ Class<?> clazz = Class.forName(mlMeta.getActivationspec().getActivationspecClass().getValue(),
+ true, cl);
+ List<? extends ConfigProperty> configProperties =
+ ((Activationspec16)mlMeta.getActivationspec()).getConfigProperties();
- ValidateClass vc = new ValidateClass(Key.ACTIVATION_SPEC, clazz, configProperties);
- result.add(vc);
+ ValidateClass vc = new ValidateClass(Key.ACTIVATION_SPEC, clazz, configProperties);
+ result.add(vc);
+ }
+ catch (ClassNotFoundException e)
+ {
+ Failure failure = new Failure(Severity.ERROR,
+ rb.getString("uncategorized"),
+ rb.getString("as.cnfe"),
+ e.getMessage());
+ failures.add(failure);
+ }
}
- catch (ClassNotFoundException e)
- {
- Failure failure = new Failure(Severity.ERROR,
- rb.getString("uncategorized"),
- rb.getString("as.cnfe"),
- e.getMessage());
- failures.add(failure);
- }
}
}
}
More information about the jboss-cvs-commits
mailing list