[jboss-cvs] JBossAS SVN: r107712 - in projects/jboss-jca/trunk/common/src: main/java/org/jboss/jca/common/api/metadata/resourceadapter and 5 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Aug 20 05:07:10 EDT 2010
Author: maeste
Date: 2010-08-20 05:07:09 -0400 (Fri, 20 Aug 2010)
New Revision: 107712
Modified:
projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/ds/DataSource.java
projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/ds/DataSources.java
projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/ds/XaDataSource.java
projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/resourceadapter/AdminObject.java
projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/resourceadapter/LocalTxConnectionFactory.java
projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/resourceadapter/NoTxConnectionFactory.java
projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/resourceadapter/XaTxConnectionFactory.java
projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/AbstractParser.java
projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ds/DatasourcesImpl.java
projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ds/DsParser.java
projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/resourceadapter/ResourceAdapterParser.java
projects/jboss-jca/trunk/common/src/test/java/org/jboss/jca/common/metadata/MetadataFactoryTestCase.java
projects/jboss-jca/trunk/common/src/test/java/org/jboss/jca/common/metadata/ds/DsParserTestCase.java
Log:
fixed few spelling errors in methods name and enums. Fixed also attributeAsBoolena to receive default value as input
Modified: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/ds/DataSource.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/ds/DataSource.java 2010-08-20 08:44:52 UTC (rev 107711)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/ds/DataSource.java 2010-08-20 09:07:09 UTC (rev 107712)
@@ -322,7 +322,7 @@
/** jndiName attribute
*
*/
- JNDINAME("jndiName"),
+ JNDINAME("jndi-name"),
/** jndiName attribute
*
Modified: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/ds/DataSources.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/ds/DataSources.java 2010-08-20 08:44:52 UTC (rev 107711)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/ds/DataSources.java 2010-08-20 09:07:09 UTC (rev 107712)
@@ -45,7 +45,7 @@
*
* @return the datasource.
*/
- public List<DataSource> getDatasource();
+ public List<DataSource> getDataSource();
/**
* Get the xaDataSource.
Modified: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/ds/XaDataSource.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/ds/XaDataSource.java 2010-08-20 08:44:52 UTC (rev 107711)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/ds/XaDataSource.java 2010-08-20 09:07:09 UTC (rev 107712)
@@ -391,7 +391,7 @@
/** jndiName attribute
*
*/
- JNDINAME("jndiName"),
+ JNDINAME("jndi-name"),
/** jndiName attribute
*
@@ -405,7 +405,7 @@
/** jndiName attribute
*
*/
- USEJAVACONTEXT("useJavaContext");
+ USEJAVACONTEXT("use-java-context");
private final String name;
Modified: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/resourceadapter/AdminObject.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/resourceadapter/AdminObject.java 2010-08-20 08:44:52 UTC (rev 107711)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/resourceadapter/AdminObject.java 2010-08-20 09:07:09 UTC (rev 107712)
@@ -155,7 +155,7 @@
/** jndiName attribute
*
*/
- JNDINAME("jndiName"),
+ JNDINAME("jndi-name"),
/** class-name attribute
*
Modified: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/resourceadapter/LocalTxConnectionFactory.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/resourceadapter/LocalTxConnectionFactory.java 2010-08-20 08:44:52 UTC (rev 107711)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/resourceadapter/LocalTxConnectionFactory.java 2010-08-20 09:07:09 UTC (rev 107712)
@@ -177,7 +177,7 @@
/** jndiName attribute
*
*/
- JNDINAME("jndiName"),
+ JNDINAME("jndi-name"),
/** class-name attribute
*
Modified: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/resourceadapter/NoTxConnectionFactory.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/resourceadapter/NoTxConnectionFactory.java 2010-08-20 08:44:52 UTC (rev 107711)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/resourceadapter/NoTxConnectionFactory.java 2010-08-20 09:07:09 UTC (rev 107712)
@@ -262,7 +262,7 @@
/** jndiName attribute
*
*/
- JNDINAME("jndiName"),
+ JNDINAME("jndi-name"),
/** class-name attribute
*
Modified: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/resourceadapter/XaTxConnectionFactory.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/resourceadapter/XaTxConnectionFactory.java 2010-08-20 08:44:52 UTC (rev 107711)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/api/metadata/resourceadapter/XaTxConnectionFactory.java 2010-08-20 09:07:09 UTC (rev 107712)
@@ -175,7 +175,7 @@
/** jndiName attribute
*
*/
- JNDINAME("jndiName"),
+ JNDINAME("jndi-name"),
/** class-name attribute
*
Modified: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/AbstractParser.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/AbstractParser.java 2010-08-20 08:44:52 UTC (rev 107711)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/AbstractParser.java 2010-08-20 09:07:09 UTC (rev 107712)
@@ -52,14 +52,16 @@
*
* @param reader the StAX reader
* @param attributeName the name of the attribute
+ * @param defaultValue defaultValue
* @return the boolean representing element
* @throws XMLStreamException StAX exception
*/
- protected boolean attributeAsBoolean(XMLStreamReader reader, String attributeName) throws XMLStreamException
+ protected boolean attributeAsBoolean(XMLStreamReader reader, String attributeName, boolean defaultValue)
+ throws XMLStreamException
{
return reader.getAttributeValue("", attributeName) == null
|| reader.getAttributeValue("", attributeName).length() == 0
- ? false :
+ ? defaultValue :
Boolean.valueOf(reader.getAttributeValue("", attributeName).trim());
}
Modified: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ds/DatasourcesImpl.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ds/DatasourcesImpl.java 2010-08-20 08:44:52 UTC (rev 107711)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ds/DatasourcesImpl.java 2010-08-20 09:07:09 UTC (rev 107712)
@@ -81,7 +81,7 @@
* @return the datasource.
*/
@Override
- public final List<DataSource> getDatasource()
+ public final List<DataSource> getDataSource()
{
return Collections.unmodifiableList(datasource);
}
Modified: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ds/DsParser.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ds/DsParser.java 2010-08-20 08:44:52 UTC (rev 107711)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ds/DsParser.java 2010-08-20 09:07:09 UTC (rev 107712)
@@ -198,7 +198,7 @@
switch (attribute)
{
case ENABLED : {
- enabled = attributeAsBoolean(reader, attribute.getLocalName());
+ enabled = attributeAsBoolean(reader, attribute.getLocalName(), true);
break;
}
case JNDINAME : {
@@ -210,7 +210,7 @@
break;
}
case USEJAVACONTEXT : {
- useJavaContext = attributeAsBoolean(reader, attribute.getLocalName());
+ useJavaContext = attributeAsBoolean(reader, attribute.getLocalName(), true);
break;
}
default :
@@ -431,7 +431,7 @@
switch (attribute)
{
case ENABLED : {
- enabled = attributeAsBoolean(reader, attribute.getLocalName());
+ enabled = attributeAsBoolean(reader, attribute.getLocalName(), true);
break;
}
case JNDINAME : {
@@ -443,7 +443,7 @@
break;
}
case USEJAVACONTEXT : {
- useJavaContext = attributeAsBoolean(reader, attribute.getLocalName());
+ useJavaContext = attributeAsBoolean(reader, attribute.getLocalName(), true);
break;
}
default :
Modified: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/resourceadapter/ResourceAdapterParser.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/resourceadapter/ResourceAdapterParser.java 2010-08-20 08:44:52 UTC (rev 107711)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/resourceadapter/ResourceAdapterParser.java 2010-08-20 09:07:09 UTC (rev 107712)
@@ -204,7 +204,7 @@
switch (attribute)
{
case ENABLED : {
- enabled = attributeAsBoolean(reader, attribute.getLocalName());
+ enabled = attributeAsBoolean(reader, attribute.getLocalName(), true);
break;
}
case JNDINAME : {
@@ -220,7 +220,7 @@
break;
}
case USEJAVACONTEXT : {
- useJavaContext = attributeAsBoolean(reader, attribute.getLocalName());
+ useJavaContext = attributeAsBoolean(reader, attribute.getLocalName(), true);
break;
}
default :
@@ -342,7 +342,7 @@
switch (attribute)
{
case ENABLED : {
- enabled = attributeAsBoolean(reader, attribute.getLocalName());
+ enabled = attributeAsBoolean(reader, attribute.getLocalName(), true);
break;
}
case JNDINAME : {
@@ -358,7 +358,7 @@
break;
}
case USEJAVACONTEXT : {
- useJavaContext = attributeAsBoolean(reader, attribute.getLocalName());
+ useJavaContext = attributeAsBoolean(reader, attribute.getLocalName(), true);
break;
}
default :
@@ -475,7 +475,7 @@
switch (attribute)
{
case ENABLED : {
- enabled = attributeAsBoolean(reader, attribute.getLocalName());
+ enabled = attributeAsBoolean(reader, attribute.getLocalName(), true);
break;
}
case JNDINAME : {
@@ -491,7 +491,7 @@
break;
}
case USEJAVACONTEXT : {
- useJavaContext = attributeAsBoolean(reader, attribute.getLocalName());
+ useJavaContext = attributeAsBoolean(reader, attribute.getLocalName(), true);
break;
}
default :
@@ -738,7 +738,7 @@
switch (attribute)
{
case ENABLED : {
- enabled = attributeAsBoolean(reader, attribute.getLocalName());
+ enabled = attributeAsBoolean(reader, attribute.getLocalName(), true);
break;
}
case JNDINAME : {
@@ -750,7 +750,7 @@
break;
}
case USEJAVACONTEXT : {
- useJavaContext = attributeAsBoolean(reader, attribute.getLocalName());
+ useJavaContext = attributeAsBoolean(reader, attribute.getLocalName(), true);
break;
}
default :
Modified: projects/jboss-jca/trunk/common/src/test/java/org/jboss/jca/common/metadata/MetadataFactoryTestCase.java
===================================================================
--- projects/jboss-jca/trunk/common/src/test/java/org/jboss/jca/common/metadata/MetadataFactoryTestCase.java 2010-08-20 08:44:52 UTC (rev 107711)
+++ projects/jboss-jca/trunk/common/src/test/java/org/jboss/jca/common/metadata/MetadataFactoryTestCase.java 2010-08-20 09:07:09 UTC (rev 107712)
@@ -101,7 +101,7 @@
//when
MetadataFactory mf = new MetadataFactory();
- Connector merged = mf.mergeConnectorAndDs(ds.getDatasource().get(0), connector);
+ Connector merged = mf.mergeConnectorAndDs(ds.getDataSource().get(0), connector);
//then
assertThat(merged, instanceOf(Connector15.class));
assertThat(merged.getVersion(), is(Version.V_15));
Modified: projects/jboss-jca/trunk/common/src/test/java/org/jboss/jca/common/metadata/ds/DsParserTestCase.java
===================================================================
--- projects/jboss-jca/trunk/common/src/test/java/org/jboss/jca/common/metadata/ds/DsParserTestCase.java 2010-08-20 08:44:52 UTC (rev 107711)
+++ projects/jboss-jca/trunk/common/src/test/java/org/jboss/jca/common/metadata/ds/DsParserTestCase.java 2010-08-20 09:07:09 UTC (rev 107712)
@@ -63,7 +63,7 @@
//when
DataSources ds = parser.parse(is);
//then
- assertThat(ds.getDatasource().size() + ds.getXaDataSource().size(), is(1));
+ assertThat(ds.getDataSource().size() + ds.getXaDataSource().size(), is(1));
}
finally
More information about the jboss-cvs-commits
mailing list