[jboss-cvs] JBossAS SVN: r83936 - projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/jboss/mcf.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Feb 6 04:42:01 EST 2009
Author: jeff.zhang
Date: 2009-02-06 04:42:01 -0500 (Fri, 06 Feb 2009)
New Revision: 83936
Modified:
projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/jboss/mcf/DBMSMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/jboss/mcf/DataSourceConnectionPropertyMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/jboss/mcf/DataSourceDeploymentMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/jboss/mcf/LocalDataSourceDeploymentMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/jboss/mcf/ManagedConnectionFactoryDeploymentMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/jboss/mcf/NoTxDataSourceDeploymentMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/jboss/mcf/NonXADataSourceDeploymentMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/jboss/mcf/SecurityMetaData.java
projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/jboss/mcf/XADataSourceDeploymentMetaData.java
Log:
[JBMETA-167] clean up code
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/jboss/mcf/DBMSMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/jboss/mcf/DBMSMetaData.java 2009-02-06 09:04:21 UTC (rev 83935)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/jboss/mcf/DBMSMetaData.java 2009-02-06 09:42:01 UTC (rev 83936)
@@ -40,7 +40,6 @@
{
private static final long serialVersionUID = -5511233258559770711L;
- @XmlElement(name="type-mapping")
private String typeMapping;
public String getTypeMapping()
@@ -48,6 +47,7 @@
return typeMapping;
}
+ @XmlElement(name="type-mapping")
public void setTypeMapping(String typeMapping)
{
this.typeMapping = typeMapping;
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/jboss/mcf/DataSourceConnectionPropertyMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/jboss/mcf/DataSourceConnectionPropertyMetaData.java 2009-02-06 09:04:21 UTC (rev 83935)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/jboss/mcf/DataSourceConnectionPropertyMetaData.java 2009-02-06 09:42:01 UTC (rev 83936)
@@ -31,7 +31,7 @@
*
* @author <a href="weston.price at jboss.org">Weston Price</a>
* @author Jeff Zhang
- * @version $Revision: 1.1 $
+ * @version $Revision$
*/
@XmlAccessorType(XmlAccessType.FIELD)
public class DataSourceConnectionPropertyMetaData
@@ -39,10 +39,8 @@
{
private static final long serialVersionUID = 1444129514410015366L;
- //@XmlAttribute(name="name")
protected String name;
- //@XmlValue
protected String value;
public String getName()
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/jboss/mcf/DataSourceDeploymentMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/jboss/mcf/DataSourceDeploymentMetaData.java 2009-02-06 09:04:21 UTC (rev 83935)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/jboss/mcf/DataSourceDeploymentMetaData.java 2009-02-06 09:42:01 UTC (rev 83936)
@@ -26,70 +26,52 @@
import javax.xml.bind.annotation.XmlElement;
-//import org.jboss.resource.deployers.management.ConnectionFactoryProperty;
-
/**
* A DataSourceDeploymentMetaData.
*
* @author <a href="weston.price at jboss.org">Weston Price</a>
* @author Jeff Zhang
- * @version $Revision: $
+ * @version $Revision$
*/
public class DataSourceDeploymentMetaData extends ManagedConnectionFactoryDeploymentMetaData implements JDBCProviderSupport
{
/** The serialVersionUID */
- private static final long serialVersionUID = 1440129014410015366L;
+ private static final long serialVersionUID = 1440129014410915366L;
private static final String CONNECTION_DEFINITION = "javax.sql.DataSource";
private static final String RAR_NAME = "jboss-local-jdbc.rar";
- @XmlElement(name="transaction-isolation")
private String transactionIsolation;
- @XmlElement(name="user-name")
private String userName;
- //@XmlElement(name="password")
private String passWord;
- @XmlElement(name="new-connection-sql")
private String newConnectionSQL;
- @XmlElement(name="check-valid-connection-sql")
private String checkValidConnectionSQL;
- @XmlElement(name="valid-connection-checker-class-name")
private String validConnectionCheckerClassName;
- @XmlElement(name="exception-sorter-class-name")
private String exceptionSorterClassName;
- @XmlElement(name="stale-connection-checker-class-name")
private String staleConnectionCheckerClassName;
- @XmlElement(name="track-statements")
private String trackStatements;
- @XmlElement(name="prepared-statement-cache-size")
private int preparedStatementCacheSize = 0;
- @XmlElement(name="share-prepared-statements")
private boolean sharePreparedStatements;
- //@XmlElement(name="set-tx-query-timeout")
private boolean useQueryTimeout;
- @XmlElement(name="query-timeout")
- private int queryTimeout;
+ private int queryTimeout; @XmlElement(name="url-selector-strategy-class-name")
- @XmlElement(name="use-try-lock")
private long useTryLock;
- @XmlElement(name="url-delimiter")
private String urlDelimiter;
- @XmlElement(name="url-selector-strategy-class-name")
private String urlSelectorStrategyClassName;
public DataSourceDeploymentMetaData()
@@ -113,6 +95,7 @@
{
return passWord;
}
+
@XmlElement(name="password")
public void setPassWord(String passWord)
{
@@ -135,6 +118,7 @@
return checkValidConnectionSQL;
}
+ @XmlElement(name="check-valid-connection-sql")
public void setCheckValidConnectionSQL(String checkValidConnectionSQL)
{
this.checkValidConnectionSQL = checkValidConnectionSQL;
@@ -155,6 +139,7 @@
return newConnectionSQL;
}
+ @XmlElement(name="new-connection-sql")
public void setNewConnectionSQL(String newConnectionSQL)
{
this.newConnectionSQL = newConnectionSQL;
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/jboss/mcf/LocalDataSourceDeploymentMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/jboss/mcf/LocalDataSourceDeploymentMetaData.java 2009-02-06 09:04:21 UTC (rev 83935)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/jboss/mcf/LocalDataSourceDeploymentMetaData.java 2009-02-06 09:42:01 UTC (rev 83936)
@@ -34,8 +34,8 @@
*/
@XmlType(name="local-tx-datasource", propOrder={"jndiName", "useJavaContext", "connectionUrl", "urlDelimiter", "urlSelectorStrategyClassName",
"driverClass", "transactionIsolation", "connectionProperties", "userName", "passWord", "securityMetaData", "minSize",
- "maxSize", "blockingTimeoutMilliSeconds", "backgroundValidation", "backgroundValidationMillis", "validateOnMatch", "idleTimeoutMinutes",
- "allocationRetry", "allocationRetryWaitMillis", "noTxSeparatePools", "newConnectionSQL", "checkValidConnectionSQL",
+ "maxSize", "blockingTimeoutMilliSeconds", "backgroundValidation", "backgroundValidationMillis", "idleTimeoutMinutes",
+ "allocationRetry", "allocationRetryWaitMillis", "validateOnMatch", "noTxSeparatePools", "newConnectionSQL", "checkValidConnectionSQL",
"validConnectionCheckerClassName", "exceptionSorterClassName", "staleConnectionCheckerClassName", "trackStatements", "prefill",
"preparedStatementCacheSize", "sharePreparedStatements", "useQueryTimeout", "queryTimeout", "useTryLock", "dbmsMetaData", "typeMapping",
"dependsNames"})
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/jboss/mcf/ManagedConnectionFactoryDeploymentMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/jboss/mcf/ManagedConnectionFactoryDeploymentMetaData.java 2009-02-06 09:04:21 UTC (rev 83935)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/jboss/mcf/ManagedConnectionFactoryDeploymentMetaData.java 2009-02-06 09:42:01 UTC (rev 83936)
@@ -31,15 +31,12 @@
import javax.xml.bind.annotation.XmlTransient;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-//import org.jboss.resource.deployers.management.ConnectionFactoryProperty;
-
-
/**
* A ManagedConnectionFactoryDeployment.
*
* @author <a href="weston.price at jboss.org">Weston Price</a>
* @author Jeff Zhang
- * @version $Revision:$
+ * @version $Revision$
*/
@XmlAccessorType(XmlAccessType.FIELD)
public class ManagedConnectionFactoryDeploymentMetaData
@@ -49,70 +46,51 @@
private static final long serialVersionUID = -4591557831734316580L;
/** The jndiName */
- @XmlElement(name="jndi-name")
private String jndiName;
/** The rarName */
- @XmlElement(name="rar-name")
private String rarName;
/** The useJavaContext */
- @XmlElement(name="use-java-context")
private boolean useJavaContext = true;
/** The connectionDefinition */
- @XmlElement(name="connection-definition")
protected String connectionDefinition;
- //@XmlElement(name="min-pool-size")
private int minSize = 0;
- //@XmlElement(name="max-pool-size")
private int maxSize = 10;
- //@XmlElement(name="blocking-timeout-millis")
private long blockingTimeoutMilliSeconds = 30000;
- @XmlElement(name="idle-timeout-minutes")
private int idleTimeoutMinutes = 30;
- @XmlElement(name="allocation-retry")
private int allocationRetry = 0;
- @XmlElement(name="allocation-retry-wait-millis")
private long allocationRetryWaitMillis = 5000;
- @XmlElement(name="prefill")
private Boolean prefill = Boolean.FALSE;
- @XmlElement(name="background-validation")
private boolean backgroundValidation;
- @XmlElement(name="background-validation-millis")
private long backgroundValidationMillis;
- @XmlElement(name="validate-on-match")
private boolean validateOnMatch = true;
@XmlJavaTypeAdapter(ManagedConnectionEmptyContentAdapter.class)
- @XmlElement(name="use-strict-min")
private Boolean useStrictMin = Boolean.FALSE;
@XmlJavaTypeAdapter(ManagedConnectionEmptyContentAdapter.class)
- @XmlElement(name="no-tx-separate-pools")
private Boolean noTxSeparatePools = Boolean.FALSE;
- @XmlElement(name="statistics-formatter")
private String statisticsFormatter = "org.jboss.resource.statistic.pool.JBossDefaultSubPoolStatisticFormatter";
- //@XmlElement(name="isSameRM-override-value")
private Boolean isSameRMOverrideValue = Boolean.FALSE;
// is always true now and left here for the xml binding
@Deprecated
private Boolean trackConnectionByTransaction;
-
private Boolean interleaving;
/** The transactionSupportMetaData */
@@ -120,29 +98,21 @@
private ManagedConnectionFactoryTransactionSupportMetaData transactionSupportMetaData = ManagedConnectionFactoryTransactionSupportMetaData.NONE;
/** The managedConnectionFactoryProperties */
- @XmlElement(name="config-property")
private List<ManagedConnectionFactoryPropertyMetaData> managedConnectionFactoryProperties;// = new ArrayList<ManagedConnectionFactoryPropertyMetaData>();
/** The securityMetaData */
private SecurityMetaData securityMetaData;
- //@XmlElement(name="depends")
- private List<String> dependsNames;// = new ArrayList<String>();
-
- //@XmlTransient
- //private List<ServiceMetaData> dependsServices = new ArrayList<ServiceMetaData>();
+ private List<String> dependsNames;
- //@XmlElement(name="metadata")
private DBMSMetaData dbmsMetaData;
// todo: this should be wrapped into <metadata> element
- @XmlElement(name="type-mapping")
String typeMapping;
/** The localTransactions */
@XmlJavaTypeAdapter(ManagedConnectionEmptyContentAdapter.class)
- @XmlElement(name="local-transaction")
private Boolean localTransactions = Boolean.FALSE;
public ManagedConnectionFactoryDeploymentMetaData()
@@ -245,6 +215,7 @@
*
* @param managedConnectionFactoryProperties The managedConnectionFactoryProperties to set.
*/
+ @XmlElement(name="config-property")
public void setManagedConnectionFactoryProperties(
List<ManagedConnectionFactoryPropertyMetaData> managedConnectionFactoryProperties)
{
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/jboss/mcf/NoTxDataSourceDeploymentMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/jboss/mcf/NoTxDataSourceDeploymentMetaData.java 2009-02-06 09:04:21 UTC (rev 83935)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/jboss/mcf/NoTxDataSourceDeploymentMetaData.java 2009-02-06 09:42:01 UTC (rev 83936)
@@ -28,7 +28,7 @@
*
* @author <a href="weston.price at jboss.org">Weston Price</a>
* @author Jeff Zhang
- * @version $Revision: $
+ * @version $Revision$
*/
@XmlType(name="no-tx-datasource", propOrder={"jndiName", "useJavaContext", "connectionUrl", "urlDelimiter", "urlSelectorStrategyClassName",
"driverClass", "connectionProperties", "userName", "passWord", "securityMetaData", "minSize", "maxSize", "blockingTimeoutMilliSeconds",
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/jboss/mcf/NonXADataSourceDeploymentMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/jboss/mcf/NonXADataSourceDeploymentMetaData.java 2009-02-06 09:04:21 UTC (rev 83935)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/jboss/mcf/NonXADataSourceDeploymentMetaData.java 2009-02-06 09:42:01 UTC (rev 83936)
@@ -28,31 +28,23 @@
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlElement;
-//import org.jboss.resource.deployers.management.ConnectionFactoryProperty;
-
/**
* Provide a common base for non xa data source deployment meta data.
*
- * TODO: update to AS 5
- * See also http://docs.jboss.org/jbossas/jboss4guide/r2/html/ch7.chapt.html#ch7.jdbc.sect
- *
* @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
* @author Scott.Stark at jboss.org
* @author Jeff Zhang
- * @version $Revision: $
+ * @version $Revision$
*/
@XmlAccessorType(XmlAccessType.FIELD)
public abstract class NonXADataSourceDeploymentMetaData extends DataSourceDeploymentMetaData
{
private static final long serialVersionUID = 1444129014410015366L;
- @XmlElement(name="driver-class", required=true)
private String driverClass;
- @XmlElement(name="connection-url", required=true)
private String connectionUrl;
- //@XmlElement(name="connection-property")
private List<DataSourceConnectionPropertyMetaData> connectionProperties = new ArrayList<DataSourceConnectionPropertyMetaData>();
public String getConnectionUrl()
@@ -60,6 +52,7 @@
return connectionUrl;
}
+ @XmlElement(required=true)
public void setConnectionUrl(String connectionUrl)
{
this.connectionUrl = connectionUrl;
@@ -70,6 +63,7 @@
return driverClass;
}
+ @XmlElement(required=true)
public void setDriverClass(String driverClass)
{
this.driverClass = driverClass;
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/jboss/mcf/SecurityMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/jboss/mcf/SecurityMetaData.java 2009-02-06 09:04:21 UTC (rev 83935)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/jboss/mcf/SecurityMetaData.java 2009-02-06 09:42:01 UTC (rev 83936)
@@ -40,7 +40,6 @@
/** The serialVersionUID */
private static final long serialVersionUID = 8939054836116025885L;
- //@XmlValue
private String domain;
protected SecurityDeploymentType type;
@@ -62,6 +61,7 @@
{
return domain;
}
+
@XmlValue
public void setDomain(String domain)
{
Modified: projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/jboss/mcf/XADataSourceDeploymentMetaData.java
===================================================================
--- projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/jboss/mcf/XADataSourceDeploymentMetaData.java 2009-02-06 09:04:21 UTC (rev 83935)
+++ projects/metadata/trunk/src/main/java/org/jboss/metadata/rar/jboss/mcf/XADataSourceDeploymentMetaData.java 2009-02-06 09:42:01 UTC (rev 83936)
@@ -57,10 +57,8 @@
private List<XAConnectionPropertyMetaData> xaDataSourceProperties = new ArrayList<XAConnectionPropertyMetaData>();
- @XmlElement(name="url-property")
private String urlProperty;
- @XmlElement(name="xa-resource-timeout")
private int xaResourceTimeout;
public XADataSourceDeploymentMetaData()
@@ -78,7 +76,8 @@
{
this.xaDataSourceClass = xaDataSourceClass;
}
- public String getUrlProperty()
+
+ public String getUrlProperty()
{
return urlProperty;
}
More information about the jboss-cvs-commits
mailing list