[jboss-cvs] JBossAS SVN: r110821 - in projects/jboss-jca/trunk: common/src/test/java/org/jboss/jca/common/metadata/merge and 3 other directories.

[jboss-cvs-commits at lists.jboss.org]

Author: jesper.pedersen
Date: 2011-03-02 14:32:44 -0500 (Wed, 02 Mar 2011)
New Revision: 110821

Modified:
   projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/AbstractParser.java
   projects/jboss-jca/trunk/common/src/test/java/org/jboss/jca/common/metadata/merge/MergerTestCase.java
   projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/listener/TxConnectionListener.java
   projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/AbstractPool.java
   projects/jboss-jca/trunk/validator/src/main/java/org/jboss/jca/validator/rules/as/ASNull.java
Log:
Fix a couple of checkstyle warnings

Modified: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/AbstractParser.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/AbstractParser.java	2011-03-02 19:24:55 UTC (rev 110820)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/AbstractParser.java	2011-03-02 19:32:44 UTC (rev 110821)
@@ -38,13 +38,11 @@
 import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.XMLStreamReader;
 
-import org.jboss.logging.Logger;
-
 import static javax.xml.stream.XMLStreamConstants.END_ELEMENT;
 import static javax.xml.stream.XMLStreamConstants.START_ELEMENT;
 
+import org.jboss.logging.Logger;
 
-
 /**
  *
  * A AbstractParser.

Modified: projects/jboss-jca/trunk/common/src/test/java/org/jboss/jca/common/metadata/merge/MergerTestCase.java
===================================================================
--- projects/jboss-jca/trunk/common/src/test/java/org/jboss/jca/common/metadata/merge/MergerTestCase.java	2011-03-02 19:24:55 UTC (rev 110820)
+++ projects/jboss-jca/trunk/common/src/test/java/org/jboss/jca/common/metadata/merge/MergerTestCase.java	2011-03-02 19:32:44 UTC (rev 110821)
@@ -723,7 +723,7 @@
          List<ConfigProperty> conDefProps = (List<ConfigProperty>) ((ResourceAdapter1516) merged.getResourceadapter())
             .getOutboundResourceadapter().getConnectionDefinitions().get(0).getConfigProperties();
          assertThat(conDefProps.size(), is(3));
-         assertThat(conDefProps, hasItems(exConf1, exConf2, exConf3));//, exConf4, exConf5));
+         assertThat(conDefProps, hasItems(exConf1, exConf2, exConf3)); //, exConf4, exConf5));
          assertThat(((ResourceAdapter1516) merged.getResourceadapter()).getInboundResourceadapter(),
             equalTo(((ResourceAdapter1516) connector.getResourceadapter()).getInboundResourceadapter()));
       }

Modified: projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/listener/TxConnectionListener.java
===================================================================
--- projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/listener/TxConnectionListener.java	2011-03-02 19:24:55 UTC (rev 110820)
+++ projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/listener/TxConnectionListener.java	2011-03-02 19:32:44 UTC (rev 110821)
@@ -508,7 +508,7 @@
       /**
        * Get the result of the enlistment.
        *
-       * @throws SystemExeption for any error
+       * @throws SystemException for any error
        */
       public void checkEnlisted() throws SystemException
       {

Modified: projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/AbstractPool.java
===================================================================
--- projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/AbstractPool.java	2011-03-02 19:24:55 UTC (rev 110820)
+++ projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/AbstractPool.java	2011-03-02 19:32:44 UTC (rev 110821)
@@ -331,7 +331,7 @@
     * @param trackByTx trnasaction local
     * @param trackByTransaction transaction instance
     * @return connection listener instance
-    * @throws ResourceException
+    * @throws ResourceException Thrown if an error occurs
     */
    ConnectionListener getTransactionOldConnection(TransactionLocal trackByTx, Transaction trackByTransaction)
       throws ResourceException

Modified: projects/jboss-jca/trunk/validator/src/main/java/org/jboss/jca/validator/rules/as/ASNull.java
===================================================================
--- projects/jboss-jca/trunk/validator/src/main/java/org/jboss/jca/validator/rules/as/ASNull.java	2011-03-02 19:24:55 UTC (rev 110820)
+++ projects/jboss-jca/trunk/validator/src/main/java/org/jboss/jca/validator/rules/as/ASNull.java	2011-03-02 19:32:44 UTC (rev 110821)
@@ -33,8 +33,6 @@
 import java.util.List;
 import java.util.ResourceBundle;
 
-import javax.resource.spi.ActivationSpec;;
-
 /**
  * An ActivationSpec class must be non-null
  */