[jboss-cvs] JBossAS SVN: r86409 - branches/Branch_5_x/connector/src/main/org/jboss/resource/metadata/mcf.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Mar 27 04:56:28 EDT 2009
Author: emuckenhuber
Date: 2009-03-27 04:56:28 -0400 (Fri, 27 Mar 2009)
New Revision: 86409
Modified:
branches/Branch_5_x/connector/src/main/org/jboss/resource/metadata/mcf/DataSourceConnectionPropertyMetaData.java
branches/Branch_5_x/connector/src/main/org/jboss/resource/metadata/mcf/DataSourceDeploymentMetaData.java
branches/Branch_5_x/connector/src/main/org/jboss/resource/metadata/mcf/ManagedConnectionFactoryDeploymentMetaData.java
branches/Branch_5_x/connector/src/main/org/jboss/resource/metadata/mcf/NonXADataSourceDeploymentMetaData.java
branches/Branch_5_x/connector/src/main/org/jboss/resource/metadata/mcf/TxConnectionFactoryDeploymentMetaData.java
branches/Branch_5_x/connector/src/main/org/jboss/resource/metadata/mcf/XADataSourceDeploymentMetaData.java
Log:
[JBAS-6671] update managed properties
Modified: branches/Branch_5_x/connector/src/main/org/jboss/resource/metadata/mcf/DataSourceConnectionPropertyMetaData.java
===================================================================
--- branches/Branch_5_x/connector/src/main/org/jboss/resource/metadata/mcf/DataSourceConnectionPropertyMetaData.java 2009-03-27 08:49:43 UTC (rev 86408)
+++ branches/Branch_5_x/connector/src/main/org/jboss/resource/metadata/mcf/DataSourceConnectionPropertyMetaData.java 2009-03-27 08:56:28 UTC (rev 86409)
@@ -27,7 +27,6 @@
import javax.xml.bind.annotation.XmlValue;
import org.jboss.managed.api.annotation.ManagementObject;
-import org.jboss.managed.api.annotation.ManagementProperty;
/**
Modified: branches/Branch_5_x/connector/src/main/org/jboss/resource/metadata/mcf/DataSourceDeploymentMetaData.java
===================================================================
--- branches/Branch_5_x/connector/src/main/org/jboss/resource/metadata/mcf/DataSourceDeploymentMetaData.java 2009-03-27 08:49:43 UTC (rev 86408)
+++ branches/Branch_5_x/connector/src/main/org/jboss/resource/metadata/mcf/DataSourceDeploymentMetaData.java 2009-03-27 08:56:28 UTC (rev 86409)
@@ -316,8 +316,8 @@
@Override
@ManagementProperty(name="config-property",
- description="The connection factory property info", managed=true,
- includeInTemplate=true)
+ description="The connection factory property info",
+ managed=true, readOnly = true)
@ManagementPropertyFactory(ConnectionFactoryProperty.class)
public List<ManagedConnectionFactoryPropertyMetaData> getManagedConnectionFactoryProperties()
{
Modified: branches/Branch_5_x/connector/src/main/org/jboss/resource/metadata/mcf/ManagedConnectionFactoryDeploymentMetaData.java
===================================================================
--- branches/Branch_5_x/connector/src/main/org/jboss/resource/metadata/mcf/ManagedConnectionFactoryDeploymentMetaData.java 2009-03-27 08:49:43 UTC (rev 86408)
+++ branches/Branch_5_x/connector/src/main/org/jboss/resource/metadata/mcf/ManagedConnectionFactoryDeploymentMetaData.java 2009-03-27 08:56:28 UTC (rev 86409)
@@ -41,8 +41,8 @@
import org.jboss.managed.api.annotation.ManagementProperty;
import org.jboss.managed.api.annotation.ManagementPropertyFactory;
import org.jboss.managed.api.annotation.ViewUse;
+import org.jboss.resource.deployers.management.ConnectionFactoryProperty;
import org.jboss.system.metadata.ServiceMetaData;
-import org.jboss.resource.deployers.management.ConnectionFactoryProperty;
/**
@@ -181,7 +181,8 @@
* @return the connectionDefinition.
*/
@ManagementProperty(name="connection-definition",
- includeInTemplate=true)
+ description="The connection factory class name",
+ mandatory=true, includeInTemplate=true)
public String getConnectionDefinition()
{
return connectionDefinition;
@@ -204,7 +205,8 @@
*/
@ManagementProperty(name="jndi-name",
description="The global JNDI name to bind the factory under",
- includeInTemplate=true)
+ includeInTemplate=true,
+ mandatory=true)
@ManagementObjectID(type="DataSource")
public String getJndiName()
{
@@ -270,7 +272,9 @@
*
* @return the managedConnectionFactoryProperties.
*/
- @ManagementProperty(name="config-property", managed=true, includeInTemplate=true)
+ @ManagementProperty(name="config-property",
+ description="The connection factory config properties",
+ managed=true, includeInTemplate=true)
@ManagementPropertyFactory(ConnectionFactoryProperty.class)
public List<ManagedConnectionFactoryPropertyMetaData> getManagedConnectionFactoryProperties()
{
@@ -293,7 +297,9 @@
*
* @return the rarName.
*/
- @ManagementProperty(name="rar-name")
+ @ManagementProperty(name="rar-name",
+ description="The resource adapter archive name",
+ mandatory=true, includeInTemplate=true)
public String getRarName()
{
return rarName;
@@ -314,7 +320,9 @@
*
* @return the securityMetaData.
*/
- @ManagementProperty(name="security-domain", managed=true, includeInTemplate=true)
+ @ManagementProperty(name="security-domain",
+ description="The security-domain used to validate connections",
+ managed=true, includeInTemplate=true)
public SecurityMetaData getSecurityMetaData()
{
return securityMetaData;
@@ -357,7 +365,9 @@
*
* @return the jmxInvokerName.
*/
- @ManagementProperty(name="jmx-invoker-name")
+ @ManagementProperty(name="jmx-invoker-name",
+ description="The name of the JMX invoker",
+ includeInTemplate=true)
@ManagementObjectRef(type="JMXInvoker")
public String getJmxInvokerName()
{
@@ -416,7 +426,9 @@
this.dependsServices = dependsServices;
}
- @ManagementProperty(name="min-pool-size", includeInTemplate=true)
+ @ManagementProperty(name="min-pool-size",
+ description="The min size of the pool",
+ includeInTemplate=true)
public void setMinSize(int minSize)
{
this.minSize = minSize;
@@ -427,7 +439,9 @@
return this.minSize;
}
- @ManagementProperty(name="max-pool-size", includeInTemplate=true)
+ @ManagementProperty(name="max-pool-size",
+ description="The max size of the pool",
+ includeInTemplate=true)
public void setMaxSize(int maxSize)
{
this.maxPoolSize = maxSize;
@@ -443,7 +457,9 @@
}
}
- @ManagementProperty(name="blocking-timeout-millis", includeInTemplate=true)
+ @ManagementProperty(name="blocking-timeout-millis",
+ description="The time to wait for a connection to become available before giving up",
+ includeInTemplate=true)
public void setBlockingTimeoutMilliSeconds(long blockTimeout)
{
this.blockingTimeout = blockTimeout;
@@ -454,7 +470,9 @@
return this.blockingTimeout;
}
- @ManagementProperty(name="idle-timeout-minutes", includeInTemplate=true)
+ @ManagementProperty(name="idle-timeout-minutes",
+ description="The idle timeout in minutes",
+ includeInTemplate=true)
public void setIdleTimeoutMinutes(int idleTimeout)
{
this.idleTimeout = idleTimeout;
@@ -465,7 +483,9 @@
return this.idleTimeout;
}
- @ManagementProperty(name="prefill", includeInTemplate=true)
+ @ManagementProperty(name="prefill",
+ description = "Whether to prefill the pool",
+ includeInTemplate=true)
public void setPrefill(Boolean prefill)
{
this.prefill = prefill;
@@ -476,7 +496,9 @@
return this.prefill;
}
- @ManagementProperty(name="background-validation", includeInTemplate=true)
+ @ManagementProperty(name="background-validation",
+ description = "Whether to use backgroup validation",
+ includeInTemplate=true)
public boolean isBackgroundValidation()
{
return backgroundValidation;
@@ -549,7 +571,9 @@
this.interleaving = interleaving;
}
- @ManagementProperty(name="allocation-retry", includeInTemplate=true)
+ @ManagementProperty(name="allocation-retry",
+ description="The number of times allocation retries should be tried",
+ includeInTemplate=true)
public int getAllocationRetry()
{
return this.allocationRetry;
@@ -560,7 +584,9 @@
this.allocationRetry = ar;
}
- @ManagementProperty(name="allocation-retry-wait-millis", includeInTemplate=true)
+ @ManagementProperty(name="allocation-retry-wait-millis",
+ description="The time to wait between allocation retries",
+ includeInTemplate=true)
public long getAllocationRetryWaitMillis()
{
return this.allocationRetryWaitMillis;
Modified: branches/Branch_5_x/connector/src/main/org/jboss/resource/metadata/mcf/NonXADataSourceDeploymentMetaData.java
===================================================================
--- branches/Branch_5_x/connector/src/main/org/jboss/resource/metadata/mcf/NonXADataSourceDeploymentMetaData.java 2009-03-27 08:49:43 UTC (rev 86408)
+++ branches/Branch_5_x/connector/src/main/org/jboss/resource/metadata/mcf/NonXADataSourceDeploymentMetaData.java 2009-03-27 08:56:28 UTC (rev 86409)
@@ -58,8 +58,9 @@
@XmlElement(name="connection-property")
private List<DataSourceConnectionPropertyMetaData> connectionProperties = new ArrayList<DataSourceConnectionPropertyMetaData>();
- @ManagementProperty(name="connection-url", description="The DataSource connection URL",
- includeInTemplate=true)
+ @ManagementProperty(name="connection-url",
+ description="The DataSource connection URL",
+ mandatory=true, includeInTemplate=true)
public String getConnectionUrl()
{
return connectionUrl;
@@ -72,7 +73,7 @@
@ManagementProperty(name="driver-class",
description="The DataSource connection driver class name",
- includeInTemplate=true)
+ mandatory=true, includeInTemplate=true)
public String getDriverClass()
{
return driverClass;
@@ -100,7 +101,7 @@
@Override
@ManagementProperty(name="config-property",
description="The connection factory property info",
- managed=true, includeInTemplate=true)
+ managed=true, readOnly = true)
@ManagementPropertyFactory(ConnectionFactoryProperty.class)
public List<ManagedConnectionFactoryPropertyMetaData> getManagedConnectionFactoryProperties()
{
Modified: branches/Branch_5_x/connector/src/main/org/jboss/resource/metadata/mcf/TxConnectionFactoryDeploymentMetaData.java
===================================================================
--- branches/Branch_5_x/connector/src/main/org/jboss/resource/metadata/mcf/TxConnectionFactoryDeploymentMetaData.java 2009-03-27 08:49:43 UTC (rev 86408)
+++ branches/Branch_5_x/connector/src/main/org/jboss/resource/metadata/mcf/TxConnectionFactoryDeploymentMetaData.java 2009-03-27 08:56:28 UTC (rev 86409)
@@ -58,13 +58,16 @@
@XmlElement(name="xa-transaction")
private Boolean xaTransaction = Boolean.FALSE;
- @ManagementProperty(name="xa-resource-timeout")
+ @ManagementProperty(name="xa-resource-timeout",
+ description="The XA resource timeout",
+ includeInTemplate=true)
public int getXaResourceTimeout()
{
return xaResourceTimeout;
}
- @ManagementProperty(name="xa-transaction")
+ @ManagementProperty(name="xa-transaction",
+ includeInTemplate=true)
public Boolean getXATransaction()
{
return xaTransaction;
Modified: branches/Branch_5_x/connector/src/main/org/jboss/resource/metadata/mcf/XADataSourceDeploymentMetaData.java
===================================================================
--- branches/Branch_5_x/connector/src/main/org/jboss/resource/metadata/mcf/XADataSourceDeploymentMetaData.java 2009-03-27 08:49:43 UTC (rev 86408)
+++ branches/Branch_5_x/connector/src/main/org/jboss/resource/metadata/mcf/XADataSourceDeploymentMetaData.java 2009-03-27 08:56:28 UTC (rev 86409)
@@ -76,8 +76,9 @@
setTransactionSupportMetaData(ManagedConnectionFactoryTransactionSupportMetaData.XA);
}
- @ManagementProperty(name="xa-datasource-class", description="The XADataSource class",
- includeInTemplate=true)
+ @ManagementProperty(name="xa-datasource-class",
+ description="The XADataSource class",
+ mandatory=true, includeInTemplate=true)
public String getXaDataSourceClass()
{
return xaDataSourceClass;
@@ -88,7 +89,8 @@
this.xaDataSourceClass = xaDataSourceClass;
}
- @ManagementProperty(name="url-property", description="The url-property",
+ @ManagementProperty(name="url-property",
+ description="The url-property",
includeInTemplate=true)
public String getURLProperty()
{
@@ -100,7 +102,8 @@
this.urlProperty = urlProperty;
}
- @ManagementProperty(name="xa-resource-timeout", description="The XAResource timeout",
+ @ManagementProperty(name="xa-resource-timeout",
+ description="The XAResource timeout",
includeInTemplate=true)
public int getXaResourceTimeout()
{
@@ -113,7 +116,7 @@
}
@ManagementProperty(name="xa-datasource-properties",
- description="The DataSource properties",
+ description="The xa datasource properties",
managed=true, includeInTemplate=true)
@ManagementPropertyFactory(XAConnectionFactoryProperty.class)
public List<XAConnectionPropertyMetaData> getXADataSourceProperties()
@@ -129,7 +132,7 @@
@Override
@ManagementProperty(name="config-property",
description="The connection factory property info",
- managed=true, includeInTemplate=true)
+ managed=true, readOnly = true)
@ManagementPropertyFactory(ConnectionFactoryProperty.class)
public List<ManagedConnectionFactoryPropertyMetaData> getManagedConnectionFactoryProperties()
{
More information about the jboss-cvs-commits
mailing list