[jboss-cvs] JBossAS SVN: r112749 - in projects/jboss-jca/trunk: common/src/main/java/org/jboss/jca/common/metadata/common and 9 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Mar 9 13:38:34 EST 2012
Author: jesper.pedersen
Date: 2012-03-09 13:38:33 -0500 (Fri, 09 Mar 2012)
New Revision: 112749
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/common/CommonIronJacamarParser.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/ds/ValidationImpl.java
projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ironjacamar/IronJacamarParser.java
projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/merge/Merger.java
projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/RaParser.java
projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/resourceadapter/ResourceAdapterParser.java
projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/listener/AbstractConnectionListener.java
projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/core/connectionmanager/notx/SerializableTestCase.java
projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/core/connectionmanager/tx/SerializableTestCase.java
projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/AbstractResourceAdapterDeployer.java
Log:
checkstyle fixes
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 2012-03-09 18:27:06 UTC (rev 112748)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/AbstractParser.java 2012-03-09 18:38:33 UTC (rev 112749)
@@ -48,12 +48,12 @@
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
+import static javax.xml.stream.XMLStreamConstants.END_ELEMENT;
+import static javax.xml.stream.XMLStreamConstants.START_ELEMENT;
+
import org.jboss.logging.Logger;
import org.jboss.logging.Messages;
-import static javax.xml.stream.XMLStreamConstants.END_ELEMENT;
-import static javax.xml.stream.XMLStreamConstants.START_ELEMENT;
-
/**
*
* A AbstractParser.
Modified: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/common/CommonIronJacamarParser.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/common/CommonIronJacamarParser.java 2012-03-09 18:27:06 UTC (rev 112748)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/common/CommonIronJacamarParser.java 2012-03-09 18:38:33 UTC (rev 112749)
@@ -39,11 +39,11 @@
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
-import org.jboss.logging.Messages;
-
import static javax.xml.stream.XMLStreamConstants.END_ELEMENT;
import static javax.xml.stream.XMLStreamConstants.START_ELEMENT;
+import org.jboss.logging.Messages;
+
/**
*
* A CommonIronJacamarParser.
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 2012-03-09 18:27:06 UTC (rev 112748)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ds/DsParser.java 2012-03-09 18:38:33 UTC (rev 112749)
@@ -52,11 +52,11 @@
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
-import org.jboss.logging.Messages;
-
import static javax.xml.stream.XMLStreamConstants.END_ELEMENT;
import static javax.xml.stream.XMLStreamConstants.START_ELEMENT;
+import org.jboss.logging.Messages;
+
/**
*
* A DsParser.
Modified: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ds/ValidationImpl.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ds/ValidationImpl.java 2012-03-09 18:27:06 UTC (rev 112748)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ds/ValidationImpl.java 2012-03-09 18:38:33 UTC (rev 112749)
@@ -149,9 +149,13 @@
public void validate() throws ValidateException
{
if (this.backgroundValidationMillis != null && this.backgroundValidationMillis < 0)
- throw new ValidateException(bundle.invalidNegative(Validation.Tag.BACKGROUND_VALIDATION_MILLIS.getLocalName()));
+ {
+ throw new
+ ValidateException(bundle.invalidNegative(Validation.Tag.BACKGROUND_VALIDATION_MILLIS.getLocalName()));
+ }
if (this.validConnectionChecker != null)
+ {
try
{
this.validConnectionChecker.validate();
@@ -160,7 +164,9 @@
{
throw new ValidateException(bundle.invalidTag(Validation.Tag.VALID_CONNECTION_CHECKER.getLocalName()), ve);
}
+ }
if (this.exceptionSorter != null)
+ {
try
{
this.exceptionSorter.validate();
@@ -169,7 +175,9 @@
{
throw new ValidateException(bundle.invalidTag(Validation.Tag.EXCEPTION_SORTER.getLocalName()), ve);
}
+ }
if (this.staleConnectionChecker != null)
+ {
try
{
this.staleConnectionChecker.validate();
@@ -178,6 +186,7 @@
{
throw new ValidateException(bundle.invalidTag(Validation.Tag.STALE_CONNECTION_CHECKER.getLocalName()), ve);
}
+ }
}
@Override
Modified: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ironjacamar/IronJacamarParser.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ironjacamar/IronJacamarParser.java 2012-03-09 18:27:06 UTC (rev 112748)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ironjacamar/IronJacamarParser.java 2012-03-09 18:38:33 UTC (rev 112749)
@@ -40,11 +40,11 @@
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
-import org.jboss.logging.Messages;
-
import static javax.xml.stream.XMLStreamConstants.END_ELEMENT;
import static javax.xml.stream.XMLStreamConstants.START_ELEMENT;
+import org.jboss.logging.Messages;
+
/**
*
* A ResourceAdapterParserr.
Modified: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/merge/Merger.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/merge/Merger.java 2012-03-09 18:27:06 UTC (rev 112748)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/merge/Merger.java 2012-03-09 18:38:33 UTC (rev 112749)
@@ -732,7 +732,8 @@
case DATASOURCECLASS : {
if (ds != null && ds.getDataSourceClass() != null)
{
- configProperties.add(ConfigPropertyFactory.createConfigProperty(prototype, ds.getDataSourceClass()));
+ configProperties.add(ConfigPropertyFactory.createConfigProperty(prototype,
+ ds.getDataSourceClass()));
}
break;
}
Modified: projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/RaParser.java
===================================================================
--- projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/RaParser.java 2012-03-09 18:27:06 UTC (rev 112748)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/ra/RaParser.java 2012-03-09 18:38:33 UTC (rev 112749)
@@ -80,11 +80,11 @@
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
-import org.jboss.logging.Messages;
-
import static javax.xml.stream.XMLStreamConstants.END_ELEMENT;
import static javax.xml.stream.XMLStreamConstants.START_ELEMENT;
+import org.jboss.logging.Messages;
+
/**
*
* A RaParser.
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 2012-03-09 18:27:06 UTC (rev 112748)
+++ projects/jboss-jca/trunk/common/src/main/java/org/jboss/jca/common/metadata/resourceadapter/ResourceAdapterParser.java 2012-03-09 18:38:33 UTC (rev 112749)
@@ -41,11 +41,11 @@
import javax.xml.stream.XMLStreamException;
import javax.xml.stream.XMLStreamReader;
-import org.jboss.logging.Messages;
-
import static javax.xml.stream.XMLStreamConstants.END_ELEMENT;
import static javax.xml.stream.XMLStreamConstants.START_ELEMENT;
+import org.jboss.logging.Messages;
+
/**
*
* A ResourceAdapterParserr.
Modified: projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/listener/AbstractConnectionListener.java
===================================================================
--- projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/listener/AbstractConnectionListener.java 2012-03-09 18:27:06 UTC (rev 112748)
+++ projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/listener/AbstractConnectionListener.java 2012-03-09 18:38:33 UTC (rev 112749)
@@ -28,7 +28,6 @@
import org.jboss.jca.core.connectionmanager.ConnectionManager;
import org.jboss.jca.core.connectionmanager.pool.api.Pool;
-import java.util.Iterator;
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.concurrent.atomic.AtomicBoolean;
Modified: projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/core/connectionmanager/notx/SerializableTestCase.java
===================================================================
--- projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/core/connectionmanager/notx/SerializableTestCase.java 2012-03-09 18:27:06 UTC (rev 112748)
+++ projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/core/connectionmanager/notx/SerializableTestCase.java 2012-03-09 18:38:33 UTC (rev 112749)
@@ -31,7 +31,6 @@
import org.jboss.jca.core.connectionmanager.pool.api.PoolStrategy;
import java.io.ByteArrayOutputStream;
-import java.io.IOException;
import java.io.ObjectOutputStream;
import javax.resource.spi.ManagedConnectionFactory;
Modified: projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/core/connectionmanager/tx/SerializableTestCase.java
===================================================================
--- projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/core/connectionmanager/tx/SerializableTestCase.java 2012-03-09 18:27:06 UTC (rev 112748)
+++ projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/core/connectionmanager/tx/SerializableTestCase.java 2012-03-09 18:38:33 UTC (rev 112749)
@@ -34,7 +34,6 @@
import org.jboss.jca.embedded.EmbeddedFactory;
import java.io.ByteArrayOutputStream;
-import java.io.IOException;
import java.io.ObjectOutputStream;
import java.net.URL;
Modified: projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/AbstractResourceAdapterDeployer.java
===================================================================
--- projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/AbstractResourceAdapterDeployer.java 2012-03-09 18:27:06 UTC (rev 112748)
+++ projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/AbstractResourceAdapterDeployer.java 2012-03-09 18:38:33 UTC (rev 112749)
@@ -1358,7 +1358,8 @@
if (connectionDefinition != null)
sharable = connectionDefinition.isSharable();
- Pool pool = pf.create(strategy, mcf, pc, noTxSeparatePool.booleanValue(), sharable.booleanValue());
+ Pool pool =
+ pf.create(strategy, mcf, pc, noTxSeparatePool.booleanValue(), sharable.booleanValue());
// Add a connection manager
ConnectionManagerFactory cmf = new ConnectionManagerFactory();
More information about the jboss-cvs-commits
mailing list