[jboss-cvs] JBossAS SVN: r111500 - in projects/jboss-jca/trunk: adapters/src/main/java/org/jboss/jca/adapters/jdbc/local and 12 other directories.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Wed Jun 1 12:02:19 EDT 2011


Author: jesper.pedersen
Date: 2011-06-01 12:02:18 -0400 (Wed, 01 Jun 2011)
New Revision: 111500

Modified:
   projects/jboss-jca/trunk/adapters/src/main/java/org/jboss/jca/adapters/jdbc/local/LocalManagedConnectionFactory.java
   projects/jboss-jca/trunk/api/build.xml
   projects/jboss-jca/trunk/build.xml
   projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/AbstractConnectionManager.java
   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/NoTxConnectionListener.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/notx/NoTxConnectionManagerImpl.java
   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/api/Pool.java
   projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/mcp/ArrayBlockingQueueManagedConnectionPool.java
   projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/mcp/ManagedConnectionPool.java
   projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/mcp/ManagedConnectionPoolFactory.java
   projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/mcp/SemaphoreArrayListManagedConnectionPool.java
   projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/strategy/OnePool.java
   projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/strategy/PoolByCri.java
   projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/strategy/PoolBySubject.java
   projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/strategy/PoolBySubjectAndCri.java
   projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/strategy/ReauthPool.java
   projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/tx/TxConnectionManagerImpl.java
   projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/AbstractDsDeployer.java
   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/fungal/AbstractFungalRADeployer.java
   projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/DsXmlDeployer.java
   projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/RAActivator.java
   projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/RADeployer.java
   projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/RaXmlDeployer.java
   projects/jboss-jca/trunk/ivy.xml
   projects/jboss-jca/trunk/sjc/build.xml
Log:
[JBJCA-592] i18n/l10n logging (Part 1)

Modified: projects/jboss-jca/trunk/adapters/src/main/java/org/jboss/jca/adapters/jdbc/local/LocalManagedConnectionFactory.java
===================================================================
--- projects/jboss-jca/trunk/adapters/src/main/java/org/jboss/jca/adapters/jdbc/local/LocalManagedConnectionFactory.java	2011-06-01 15:05:33 UTC (rev 111499)
+++ projects/jboss-jca/trunk/adapters/src/main/java/org/jboss/jca/adapters/jdbc/local/LocalManagedConnectionFactory.java	2011-06-01 16:02:18 UTC (rev 111500)
@@ -552,7 +552,7 @@
          //and is not spec compliant, or is the wrong class.
          driver = (Driver) clazz.newInstance();
          DriverManager.registerDriver(driver);
-         log.info("class loaded and instance created:" + driver);
+         log.debug("class loaded and instance created:" + driver);
 
          driverCache.put(url.substring(0, url.indexOf(":", 6)), driver);
          //We can even instantiate one, it must be the wrong class for the URL.
@@ -580,7 +580,6 @@
       }
       catch (Exception e)
       {
-         log.info("Driver not yet registered for url: " + url);
          if (trace)
             log.trace("Driver not yet registered for url: " + url);
          return false;

Modified: projects/jboss-jca/trunk/api/build.xml
===================================================================
--- projects/jboss-jca/trunk/api/build.xml	2011-06-01 15:05:33 UTC (rev 111499)
+++ projects/jboss-jca/trunk/api/build.xml	2011-06-01 16:02:18 UTC (rev 111500)
@@ -41,7 +41,7 @@
            deprecation="${javac.deprecation}"
            optimize="${javac.optimize}"
            includeAntRuntime="false">
-      <!-- <compilerarg value="-Xlint"/> -->
+      <compilerarg value="-proc:none"/>
     </javac> 
 
   </target>

Modified: projects/jboss-jca/trunk/build.xml
===================================================================
--- projects/jboss-jca/trunk/build.xml	2011-06-01 15:05:33 UTC (rev 111499)
+++ projects/jboss-jca/trunk/build.xml	2011-06-01 16:02:18 UTC (rev 111500)
@@ -123,7 +123,9 @@
   <property name="version.jboss.common" value="2.2.17.GA"/>
   <property name="version.jboss.jaspi.api" value="1.0.0.Final"/>
   <property name="version.jboss.jms.api" value="1.0.0.Beta1"/>
-  <property name="version.jboss.logging" value="3.0.0.Beta5"/>
+  <property name="version.jboss.logging" value="3.0.0.CR1"/>
+  <property name="version.jboss.logging-generator" value="1.0.0.Beta7"/>
+  <property name="version.jboss.logging-processor" value="1.0.0.Beta7"/>
   <property name="version.jboss.logmanager" value="1.2.0.CR9"/>
   <property name="version.jboss.naming" value="5.0.3.GA"/>
   <property name="version.jboss.netty" value="3.2.1.Final"/>

Modified: projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/AbstractConnectionManager.java
===================================================================
--- projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/AbstractConnectionManager.java	2011-06-01 15:05:33 UTC (rev 111499)
+++ projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/AbstractConnectionManager.java	2011-06-01 16:02:18 UTC (rev 111500)
@@ -64,7 +64,7 @@
 public abstract class AbstractConnectionManager implements ConnectionManager
 {
    /** Log instance */
-   private final Logger log = Logger.getLogger(getClass());
+   private final Logger log;
 
    /** Log trace */
    private final boolean trace;
@@ -104,17 +104,15 @@
     */
    protected AbstractConnectionManager()
    {
+      this.log = getLogger();
       this.trace = log.isTraceEnabled();
    }
 
    /**
-    * Gets log.
-    * @return log instance
+    * Get the logger.
+    * @return The value
     */
-   protected Logger getLog()
-   {
-      return log;
-   }
+   protected abstract Logger getLogger();
 
    /**
     * Set the pool.

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	2011-06-01 15:05:33 UTC (rev 111499)
+++ projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/listener/AbstractConnectionListener.java	2011-06-01 16:02:18 UTC (rev 111500)
@@ -47,7 +47,7 @@
  */
 public abstract class AbstractConnectionListener implements ConnectionListener
 {
-   private final Logger log = Logger.getLogger(getClass());
+   private final Logger log;
    
    /** Log trace */
    protected boolean trace;
@@ -99,10 +99,11 @@
       this.pool = pool;
       this.internalManagedPoolContext = context;
       this.flushStrategy = flushStrategy;
+      this.log = getLogger();
       this.trace = log.isTraceEnabled();
       this.lastUse = System.currentTimeMillis();
    }
-   
+
    /**
     * Gets cached connection manager
     * @return cached connection manager
@@ -122,13 +123,10 @@
    }
    
    /**
-    * Gets logger.
-    * @return logger instance
+    * Get the logger
+    * @return The value
     */
-   protected Logger getLog()
-   {
-      return log;
-   }
+   protected abstract Logger getLogger();
    
    /**
     * {@inheritDoc}

Modified: projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/listener/NoTxConnectionListener.java
===================================================================
--- projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/listener/NoTxConnectionListener.java	2011-06-01 15:05:33 UTC (rev 111499)
+++ projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/listener/NoTxConnectionListener.java	2011-06-01 16:02:18 UTC (rev 111500)
@@ -28,6 +28,7 @@
 import javax.resource.spi.ConnectionEvent;
 import javax.resource.spi.ManagedConnection;
 
+import org.jboss.logging.Logger;
 
 /**
  * NoTx Connection Listener.
@@ -38,6 +39,9 @@
  */
 public class NoTxConnectionListener extends AbstractConnectionListener
 {
+   /** The logger */
+   private static Logger log = Logger.getLogger(NoTxConnectionListener.class);
+
    /**
     * Creates a new no-tx listener.
     * @param cm connection manager
@@ -55,6 +59,14 @@
    /**
     * {@inheritDoc}
     */
+   protected Logger getLogger()
+   {
+      return log;
+   }
+
+   /**
+    * {@inheritDoc}
+    */
    public void connectionClosed(ConnectionEvent ce)
    {
       if (getCachedConnectionManager() != null)
@@ -65,7 +77,7 @@
          }
          catch (Throwable t)
          {
-            getLog().info("Throwable from unregisterConnection", t);
+            log.debug("Throwable from unregisterConnection", t);
          }
       }
 

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-06-01 15:05:33 UTC (rev 111499)
+++ projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/listener/TxConnectionListener.java	2011-06-01 16:02:18 UTC (rev 111500)
@@ -44,6 +44,8 @@
 import javax.transaction.TransactionManager;
 import javax.transaction.xa.XAResource;
 
+import org.jboss.logging.Logger;
+
 /**
  * Tx connection listener.
  * @author <a href="mailto:gurkanerdogdu at yahoo.com">Gurkan Erdogdu</a>
@@ -51,6 +53,9 @@
  */
 public class TxConnectionListener extends AbstractConnectionListener
 {
+   /** The logger */
+   private static Logger log = Logger.getLogger(TxConnectionListener.class);
+
    /**Transaction synch. instance*/
    private TransactionSynchronization transactionSynchronization;
 
@@ -88,6 +93,14 @@
    /**
     * {@inheritDoc}
     */
+   protected Logger getLogger()
+   {
+      return log;
+   }
+
+   /**
+    * {@inheritDoc}
+    */
    @Override
    public void enlist() throws SystemException
    {
@@ -135,14 +148,14 @@
             String error = "Attempt to use connection outside a transaction when already a tx!";
             if (trace)
             {
-               getLog().trace(error + " " + this);
+               log.trace(error + " " + this);
             }
 
             throw new IllegalStateException(error);
          }
          if (trace)
          {
-            getLog().trace("No transaction, no need to enlist: " + this);
+            log.trace("No transaction, no need to enlist: " + this);
          }
 
          return;
@@ -155,7 +168,7 @@
          String error = "Transaction " + threadTx + " is not active " + TxUtils.getStatusAsString(status);
          if (trace)
          {
-            getLog().trace(error + " cl=" + this);
+            log.trace(error + " cl=" + this);
          }
 
          throw new IllegalStateException(error);
@@ -163,7 +176,7 @@
 
       if (trace)
       {
-         getLog().trace("Pre-enlist: " + this + " threadTx=" + threadTx);
+         log.trace("Pre-enlist: " + this + " threadTx=" + threadTx);
       }
 
       // Our synchronization
@@ -183,7 +196,7 @@
             String error = "Can't enlist - already a tx!";
             if (trace)
             {
-               getLog().trace(error + " " + this);
+               log.trace(error + " " + this);
             }
             throw new IllegalStateException(error);
          }
@@ -194,7 +207,7 @@
             String error = "Trying to change transaction " + threadTx + " in enlist!";
             if (trace)
             {
-               getLog().trace(error + " " + this);
+               log.trace(error + " " + this);
             }
             throw new IllegalStateException(error);
          }
@@ -204,7 +217,7 @@
          {
             if (this.trace)
             {
-               getLog().trace("Get synchronizer " + this + " threadTx=" + threadTx);
+               log.trace("Get synchronizer " + this + " threadTx=" + threadTx);
             }
 
             synchronizer = TransactionSynchronizer.getRegisteredSynchronizer(threadTx);
@@ -255,7 +268,7 @@
       // What was the result of our enlistment?
       if (this.trace)
       {
-         getLog().trace("Check enlisted " + this + " threadTx=" + threadTx);
+         log.trace("Check enlisted " + this + " threadTx=" + threadTx);
       }
 
       ourSynchronization.checkEnlisted();
@@ -268,7 +281,7 @@
    public void delist() throws ResourceException
    {
       if (trace)
-         getLog().trace("delisting " + this);
+         log.trace("delisting " + this);
 
       try
       {
@@ -312,7 +325,7 @@
    public void connectionClosed(ConnectionEvent ce)
    {
       if (trace)
-         getLog().trace("connectionClosed called mc=" + this.getManagedConnection());
+         log.trace("connectionClosed called mc=" + this.getManagedConnection());
       if (this.getManagedConnection() != (ManagedConnection)ce.getSource())
          throw new IllegalArgumentException("ConnectionClosed event received from wrong ManagedConnection! Expected: " +
                this.getManagedConnection() + ", actual: " + ce.getSource());
@@ -326,7 +339,7 @@
          }
          catch (Throwable t)
          {
-            getLog().info("throwable from unregister connection", t);
+            log.info("throwable from unregister connection", t);
          }
       }
 
@@ -336,18 +349,18 @@
          {
             delist();
             if (trace)
-               getLog().trace("isManagedConnectionFree=true mc=" + this.getManagedConnection());
+               log.trace("isManagedConnectionFree=true mc=" + this.getManagedConnection());
             this.getConnectionManager().returnManagedConnection(this, false);
          }
          else
          {
             if (trace)
-               getLog().trace("isManagedConnectionFree=false mc=" + this.getManagedConnection());
+               log.trace("isManagedConnectionFree=false mc=" + this.getManagedConnection());
          }
       }
       catch (Throwable t)
       {
-         getLog().error("Error while closing connection handle!", t);
+         log.error("Error while closing connection handle!", t);
          this.getConnectionManager().returnManagedConnection(this, true);
       }
    }
@@ -405,7 +418,7 @@
          else
          {
             local.rollback();
-            getLog().debug("Unfinished local transaction was rolled back." + this);
+            log.debug("Unfinished local transaction was rolled back." + this);
          }
       }
    }
@@ -517,7 +530,7 @@
             String error = "Error enlisting resource in transaction=" + this.currentTx;
             if (TxConnectionListener.this.trace)
             {
-               TxConnectionListener.this.getLog().trace(error + " " + TxConnectionListener.this);
+               TxConnectionListener.this.log.trace(error + " " + TxConnectionListener.this);
             }
 
             // Wrap the error to give a reasonable stacktrace since the resource
@@ -538,7 +551,7 @@
             String error = "Resource is not enlisted in transaction=" + currentTx;
             if (trace)
             {
-               getLog().trace(error + " " + TxConnectionListener.this);
+               log.trace(error + " " + TxConnectionListener.this);
             }
             throw new IllegalStateException("Resource was not enlisted.");
          }
@@ -553,7 +566,7 @@
       {
          if (TxConnectionListener.this.trace)
          {
-            TxConnectionListener.this.getLog().trace("Enlisting resource " + TxConnectionListener.this);
+            TxConnectionListener.this.log.trace("Enlisting resource " + TxConnectionListener.this);
          }
          try
          {
@@ -574,7 +587,7 @@
             {
                if (trace)
                {
-                  getLog().trace("Failed to enlist resource " + TxConnectionListener.this, enlistError);
+                  log.trace("Failed to enlist resource " + TxConnectionListener.this, enlistError);
                }
 
                setTrackByTx(false);
@@ -585,7 +598,7 @@
 
             if (trace)
             {
-               getLog().trace("Enlisted resource " + TxConnectionListener.this);
+               log.trace("Enlisted resource " + TxConnectionListener.this);
             }
 
             enlisted = true;
@@ -626,7 +639,7 @@
                String message = "afterCompletion called with wrong tx! Expected: " +
                   this + ", actual: " + transactionSynchronization;
                IllegalStateException e = new IllegalStateException(message);
-               getLog().error("There is something wrong with the pooling?", e);
+               log.error("There is something wrong with the pooling?", e);
             }
          }
          // "Delist"
@@ -636,8 +649,8 @@
          {
             if (trace)
             {
-               getLog().trace("afterCompletion(" + status + ") isTrackByTx=" + isTrackByTx() +
-                     " for " + TxConnectionListener.this);
+               log.trace("afterCompletion(" + status + ") isTrackByTx=" + isTrackByTx() +
+                         " for " + TxConnectionListener.this);
             }
 
             if (wasFreed(null))

Modified: projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/notx/NoTxConnectionManagerImpl.java
===================================================================
--- projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/notx/NoTxConnectionManagerImpl.java	2011-06-01 15:05:33 UTC (rev 111499)
+++ projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/notx/NoTxConnectionManagerImpl.java	2011-06-01 16:02:18 UTC (rev 111500)
@@ -35,6 +35,8 @@
 import javax.resource.spi.ManagedConnection;
 import javax.transaction.SystemException;
 
+import org.jboss.logging.Logger;
+
 /**
  * Non transactional connection manager implementation.
  *
@@ -43,6 +45,9 @@
  */
 public class NoTxConnectionManagerImpl extends AbstractConnectionManager implements NoTxConnectionManager
 {
+   /** The logger */
+   private static Logger log = Logger.getLogger(NoTxConnectionManager.class);
+
    /** Serial version uid */
    private static final long serialVersionUID = 1L;
 
@@ -54,6 +59,15 @@
    }
 
    /**
+    * Get the logger.
+    * @return The value
+    */
+   protected Logger getLogger()
+   {
+      return log;
+   }
+
+   /**
     * {@inheritDoc}
     */
    public ConnectionListener createConnectionListener(ManagedConnection managedConnection, Object context)

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-06-01 15:05:33 UTC (rev 111499)
+++ projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/AbstractPool.java	2011-06-01 16:02:18 UTC (rev 111500)
@@ -66,10 +66,10 @@
 public abstract class AbstractPool implements Pool
 {
    /** The logger */
-   protected final Logger log = Logger.getLogger(getClass());
+   protected final Logger log;
 
    /** Is trace enabled */
-   private boolean trace = false;
+   private boolean trace;
 
    /** The managed connection pools, maps key --> pool */
    private final ConcurrentMap<Object, ManagedConnectionPool> mcpPools =
@@ -112,6 +112,7 @@
       this.mcf = mcf;
       this.poolConfiguration = pc;
       this.noTxSeparatePools = noTxSeparatePools;
+      this.log = getLogger();
       this.trace = log.isTraceEnabled();
       this.statistics = new PoolStatisticsImpl(pc.getMaxSize(), mcpPools);
    }
@@ -165,7 +166,7 @@
          if (mcp == null)
          {
             ManagedConnectionPoolFactory mcpf = new ManagedConnectionPoolFactory();
-            ManagedConnectionPool newMcp = mcpf.create(mcf, clf, subject, cri, poolConfiguration, this, log);
+            ManagedConnectionPool newMcp = mcpf.create(mcf, clf, subject, cri, poolConfiguration, this);
 
             mcp = mcpPools.putIfAbsent(key, newMcp);
             if (mcp == null)
@@ -630,4 +631,10 @@
    {
       return mcpPools;
    }
+
+   /**
+    * Get the logger
+    * @return The value
+    */
+   public abstract Logger getLogger();
 }

Modified: projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/api/Pool.java
===================================================================
--- projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/api/Pool.java	2011-06-01 15:05:33 UTC (rev 111499)
+++ projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/api/Pool.java	2011-06-01 16:02:18 UTC (rev 111500)
@@ -31,6 +31,8 @@
 import javax.security.auth.Subject;
 import javax.transaction.Transaction;
 
+import org.jboss.logging.Logger;
+
 /**
  * A pool.
  *
@@ -92,4 +94,10 @@
     * @param pool The pool
     */
    public void emptyManagedConnectionPool(ManagedConnectionPool pool);
+
+   /**
+    * Get the logger
+    * @return The value
+    */
+   public Logger getLogger();
 }

Modified: projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/mcp/ArrayBlockingQueueManagedConnectionPool.java
===================================================================
--- projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/mcp/ArrayBlockingQueueManagedConnectionPool.java	2011-06-01 15:05:33 UTC (rev 111499)
+++ projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/mcp/ArrayBlockingQueueManagedConnectionPool.java	2011-06-01 16:02:18 UTC (rev 111500)
@@ -125,7 +125,7 @@
     * {@inheritDoc}
     */
    public void initialize(ManagedConnectionFactory mcf, ConnectionListenerFactory clf, Subject subject,
-                          ConnectionRequestInfo cri, PoolConfiguration pc, Pool p, Logger log)
+                          ConnectionRequestInfo cri, PoolConfiguration pc, Pool p)
    {
       if (mcf == null)
          throw new IllegalArgumentException("ManagedConnectionFactory is null");
@@ -139,9 +139,6 @@
       if (p == null)
          throw new IllegalArgumentException("Pool is null");
 
-      if (log == null)
-         throw new IllegalArgumentException("Logger is null");
-
       this.mcf = mcf;
       this.clf = clf;
       this.defaultSubject = subject;
@@ -149,7 +146,7 @@
       this.poolConfiguration = pc;
       this.maxSize = pc.getMaxSize();
       this.pool = p;
-      this.log = log;
+      this.log = pool.getLogger();
       this.trace = log.isTraceEnabled();
       this.cls = new ArrayBlockingQueue<ConnectionListener>(this.maxSize, true);
       this.permits = new ConcurrentHashMap<ConnectionListener, ConnectionListener>(this.maxSize);

Modified: projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/mcp/ManagedConnectionPool.java
===================================================================
--- projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/mcp/ManagedConnectionPool.java	2011-06-01 15:05:33 UTC (rev 111499)
+++ projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/mcp/ManagedConnectionPool.java	2011-06-01 16:02:18 UTC (rev 111500)
@@ -33,8 +33,6 @@
 import javax.resource.spi.ManagedConnectionFactory;
 import javax.security.auth.Subject;
 
-import org.jboss.logging.Logger;
-
 /**
  * Represents a managed connection pool, which manages all connection listeners
  *
@@ -51,10 +49,9 @@
     * @param cri The connection request info
     * @param pc The pool configuration
     * @param p The pool
-    * @param log The logger for the managed connection pool
     */
    public void initialize(ManagedConnectionFactory mcf, ConnectionListenerFactory clf, Subject subject,
-                          ConnectionRequestInfo cri, PoolConfiguration pc, Pool p, Logger log);
+                          ConnectionRequestInfo cri, PoolConfiguration pc, Pool p);
 
    /**
     * Returns a connection listener that wraps managed connection.

Modified: projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/mcp/ManagedConnectionPoolFactory.java
===================================================================
--- projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/mcp/ManagedConnectionPoolFactory.java	2011-06-01 15:05:33 UTC (rev 111499)
+++ projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/mcp/ManagedConnectionPoolFactory.java	2011-06-01 16:02:18 UTC (rev 111500)
@@ -87,17 +87,16 @@
     * @param cri the connection request info
     * @param pc the pool configuration
     * @param p The pool
-    * @param log The logger for the managed connection pool
     * @return The initialized managed connection pool
     * @exception Throwable Thrown in case of an error
     */
    public ManagedConnectionPool create(ManagedConnectionFactory mcf, ConnectionListenerFactory clf, Subject subject,
-                                       ConnectionRequestInfo cri, PoolConfiguration pc, Pool p, Logger log) 
+                                       ConnectionRequestInfo cri, PoolConfiguration pc, Pool p) 
       throws Throwable
    {
       ManagedConnectionPool mcp = (ManagedConnectionPool)defaultImplementation.newInstance();
       
-      return init(mcp, mcf, clf, subject, cri, pc, p, log);
+      return init(mcp, mcf, clf, subject, cri, pc, p);
    }
 
    /**
@@ -110,13 +109,12 @@
     * @param cri the connection request info
     * @param pc the pool configuration
     * @param p The pool
-    * @param log The logger for the managed connection pool
     * @return The initialized managed connection pool
     * @exception Throwable Thrown in case of an error
     */
    public ManagedConnectionPool create(String strategy, 
                                        ManagedConnectionFactory mcf, ConnectionListenerFactory clf, Subject subject,
-                                       ConnectionRequestInfo cri, PoolConfiguration pc, Pool p, Logger log)
+                                       ConnectionRequestInfo cri, PoolConfiguration pc, Pool p)
       throws Throwable
    {
       Class<?> clz = Class.forName(strategy, 
@@ -125,7 +123,7 @@
       
       ManagedConnectionPool mcp = (ManagedConnectionPool)clz.newInstance();
       
-      return init(mcp, mcf, clf, subject, cri, pc, p, log);
+      return init(mcp, mcf, clf, subject, cri, pc, p);
    }
 
    /**
@@ -137,14 +135,13 @@
     * @param cri the connection request info
     * @param pc the pool configuration
     * @param p The pool
-    * @param log The logger for the managed connection pool
     * @return The initialized managed connection pool
     */
    private ManagedConnectionPool init(ManagedConnectionPool mcp, 
                                       ManagedConnectionFactory mcf, ConnectionListenerFactory clf, Subject subject,
-                                      ConnectionRequestInfo cri, PoolConfiguration pc, Pool p, Logger log)
+                                      ConnectionRequestInfo cri, PoolConfiguration pc, Pool p)
    {
-      mcp.initialize(mcf, clf, subject, cri, pc, p, log);
+      mcp.initialize(mcf, clf, subject, cri, pc, p);
 
       return mcp;
    }

Modified: projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/mcp/SemaphoreArrayListManagedConnectionPool.java
===================================================================
--- projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/mcp/SemaphoreArrayListManagedConnectionPool.java	2011-06-01 15:05:33 UTC (rev 111499)
+++ projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/mcp/SemaphoreArrayListManagedConnectionPool.java	2011-06-01 16:02:18 UTC (rev 111500)
@@ -124,7 +124,7 @@
     * {@inheritDoc}
     */
    public void initialize(ManagedConnectionFactory mcf, ConnectionListenerFactory clf, Subject subject,
-                          ConnectionRequestInfo cri, PoolConfiguration pc, Pool p, Logger log)
+                          ConnectionRequestInfo cri, PoolConfiguration pc, Pool p)
    {
       if (mcf == null)
          throw new IllegalArgumentException("ManagedConnectionFactory is null");
@@ -138,9 +138,6 @@
       if (p == null)
          throw new IllegalArgumentException("Pool is null");
 
-      if (log == null)
-         throw new IllegalArgumentException("Logger is null");
-
       this.mcf = mcf;
       this.clf = clf;
       this.defaultSubject = subject;
@@ -148,7 +145,7 @@
       this.poolConfiguration = pc;
       this.maxSize = pc.getMaxSize();
       this.pool = p;
-      this.log = log;
+      this.log = pool.getLogger();
       this.trace = log.isTraceEnabled();
       this.cls = new ArrayList<ConnectionListener>(this.maxSize);
       this.statistics = new ManagedConnectionPoolStatisticsImpl(maxSize);

Modified: projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/strategy/OnePool.java
===================================================================
--- projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/strategy/OnePool.java	2011-06-01 15:05:33 UTC (rev 111499)
+++ projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/strategy/OnePool.java	2011-06-01 16:02:18 UTC (rev 111500)
@@ -30,6 +30,8 @@
 import javax.resource.spi.ManagedConnectionFactory;
 import javax.security.auth.Subject;
 
+import org.jboss.logging.Logger;
+
 /**
  * Single pool implementation.
  * 
@@ -38,6 +40,9 @@
  */
 public class OnePool extends AbstractPrefillPool
 {
+   /** The logger */
+   private static Logger log = Logger.getLogger(OnePool.class);
+
    /**
     * Creates a new instance.
     * 
@@ -81,4 +86,12 @@
    {
       return internalTestConnection(null);
    }
+
+   /**
+    * {@inheritDoc}
+    */
+   public Logger getLogger()
+   {
+      return log;
+   }
 }

Modified: projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/strategy/PoolByCri.java
===================================================================
--- projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/strategy/PoolByCri.java	2011-06-01 15:05:33 UTC (rev 111499)
+++ projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/strategy/PoolByCri.java	2011-06-01 16:02:18 UTC (rev 111500)
@@ -30,6 +30,8 @@
 import javax.resource.spi.ManagedConnectionFactory;
 import javax.security.auth.Subject;
 
+import org.jboss.logging.Logger;
+
 /**
  * Pool implementation that uses subject.
  * 
@@ -38,6 +40,8 @@
  */
 public class PoolByCri extends AbstractPool
 {
+   /** The logger */
+   private static Logger log = Logger.getLogger(PoolByCri.class);
    
    /**
     * Creates a new instance.
@@ -67,4 +71,12 @@
    {
       return false;
    }
+
+   /**
+    * {@inheritDoc}
+    */
+   public Logger getLogger()
+   {
+      return log;
+   }
 }

Modified: projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/strategy/PoolBySubject.java
===================================================================
--- projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/strategy/PoolBySubject.java	2011-06-01 15:05:33 UTC (rev 111499)
+++ projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/strategy/PoolBySubject.java	2011-06-01 16:02:18 UTC (rev 111500)
@@ -36,6 +36,7 @@
 import javax.resource.spi.security.PasswordCredential;
 import javax.security.auth.Subject;
 
+import org.jboss.logging.Logger;
 import org.jboss.security.SecurityContext;
 import org.jboss.security.SecurityContextAssociation;
 import org.jboss.security.SecurityContextFactory;
@@ -49,6 +50,8 @@
  */
 public class PoolBySubject extends AbstractPrefillPool
 {
+   /** The logger */
+   private static Logger log = Logger.getLogger(PoolBySubject.class);
    
    /**
     * Creates a new instance.
@@ -160,4 +163,12 @@
          }
       });
    }
+
+   /**
+    * {@inheritDoc}
+    */
+   public Logger getLogger()
+   {
+      return log;
+   }
 }

Modified: projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/strategy/PoolBySubjectAndCri.java
===================================================================
--- projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/strategy/PoolBySubjectAndCri.java	2011-06-01 15:05:33 UTC (rev 111499)
+++ projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/strategy/PoolBySubjectAndCri.java	2011-06-01 16:02:18 UTC (rev 111500)
@@ -30,6 +30,8 @@
 import javax.resource.spi.ManagedConnectionFactory;
 import javax.security.auth.Subject;
 
+import org.jboss.logging.Logger;
+
 /**
  * Pool implementation that uses subject and connection
  * request info for its pool partition.
@@ -39,6 +41,8 @@
  */
 public class PoolBySubjectAndCri extends AbstractPool
 {
+   /** The logger */
+   private static Logger log = Logger.getLogger(PoolBySubjectAndCri.class);
    
    /**
     * Creates a new instance.
@@ -68,4 +72,12 @@
    {
       return false;
    }
+
+   /**
+    * {@inheritDoc}
+    */
+   public Logger getLogger()
+   {
+      return log;
+   }
 }

Modified: projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/strategy/ReauthPool.java
===================================================================
--- projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/strategy/ReauthPool.java	2011-06-01 15:05:33 UTC (rev 111499)
+++ projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/strategy/ReauthPool.java	2011-06-01 16:02:18 UTC (rev 111500)
@@ -31,6 +31,8 @@
 import javax.resource.spi.ManagedConnectionFactory;
 import javax.security.auth.Subject;
 
+import org.jboss.logging.Logger;
+
 /**
  * Pool implementation that supports reauthentication
  *
@@ -43,6 +45,9 @@
  */
 public class ReauthPool extends AbstractPool
 {
+   /** The logger */
+   private static Logger log = Logger.getLogger(ReauthPool.class);
+
    /**
     * Creates a new instance.
     * @param mcf managed connection factory
@@ -85,4 +90,12 @@
    {
       return false;
    }
+
+   /**
+    * {@inheritDoc}
+    */
+   public Logger getLogger()
+   {
+      return log;
+   }
 }

Modified: projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/tx/TxConnectionManagerImpl.java
===================================================================
--- projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/tx/TxConnectionManagerImpl.java	2011-06-01 15:05:33 UTC (rev 111499)
+++ projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/tx/TxConnectionManagerImpl.java	2011-06-01 16:02:18 UTC (rev 111500)
@@ -54,6 +54,7 @@
 import javax.transaction.xa.XAException;
 import javax.transaction.xa.XAResource;
 
+import org.jboss.logging.Logger;
 import org.jboss.util.NestedRuntimeException;
 import org.jboss.util.NotImplementedException;
 
@@ -131,6 +132,9 @@
  */
 public class TxConnectionManagerImpl extends AbstractConnectionManager implements TxConnectionManager
 {
+   /** The logger */
+   private static Logger log = Logger.getLogger(TxConnectionManager.class);
+
    /** Serial version uid */
    private static final long serialVersionUID = 1L;
 
@@ -180,6 +184,15 @@
    }
 
    /**
+    * Get the logger.
+    * @return The value
+    */
+   protected Logger getLogger()
+   {
+      return log;
+   }
+
+   /**
     * Get the transaction integration instance
     * @return The transaction integration
     */
@@ -346,7 +359,7 @@
          JBossResourceException.rethrowAsResourceException("Error checking for a transaction.", t);
       }
 
-      getLog().tracef("getManagedConnection interleaving=%s , tx=%s", interleaving, trackByTransaction);  
+      log.tracef("getManagedConnection interleaving=%s , tx=%s", interleaving, trackByTransaction);  
       
       return super.getManagedConnection(trackByTransaction, subject, cri);
    }
@@ -408,7 +421,7 @@
       }
       catch (Throwable t)
       {
-         getLog().trace("Could not enlist in transaction on entering meta-aware object! " + cl, t);  
+         log.trace("Could not enlist in transaction on entering meta-aware object! " + cl, t);  
 
          throw new JBossResourceException("Could not enlist in transaction on entering meta-aware object!", t);
       }
@@ -432,13 +445,13 @@
       //if there are no more handles and tx is complete, we can return to pool.
       if (cl.isManagedConnectionFree())
       {
-         getLog().tracef("Disconnected isManagedConnectionFree=true cl=%s", cl);
+         log.tracef("Disconnected isManagedConnectionFree=true cl=%s", cl);
 
          returnManagedConnection(cl, false);
       }
       else
       {
-         getLog().tracef("Disconnected isManagedConnectionFree=false cl=%s", cl);
+         log.tracef("Disconnected isManagedConnectionFree=false cl=%s", cl);
       }
 
       // Rethrow the error
@@ -463,7 +476,7 @@
     
          if (xaResourceTimeout != 0)
          {
-            getLog().debug("XAResource transaction timeout cannot be set for local transactions: " + getJndiName());  
+            log.debug("XAResource transaction timeout cannot be set for local transactions: " + getJndiName());  
          }
       }      
       else
@@ -492,7 +505,7 @@
             if (eisProductVersion == null)
                eisProductVersion = getJndiName();
 
-            getLog().tracef("Generating XAResourceWrapper for TxConnectionManager (%s)", this);
+            log.tracef("Generating XAResourceWrapper for TxConnectionManager (%s)", this);
 
             xaResource = txIntegration.createXAResourceWrapper(mc.getXAResource(), padXid, 
                                                                isSameRMOverride, 
@@ -501,7 +514,7 @@
          }
          else
          {
-            getLog().tracef("Not wrapping XAResource.");
+            log.tracef("Not wrapping XAResource.");
 
             xaResource = mc.getXAResource();
          }
@@ -511,7 +524,7 @@
             try
             {
                if (!xaResource.setTransactionTimeout(xaResourceTimeout))
-                  getLog().debug("XAResource does not support transaction timeout configuration: " + getJndiName());
+                  log.debug("XAResource does not support transaction timeout configuration: " + getJndiName());
             }
             catch (XAException e)
             {

Modified: projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/AbstractDsDeployer.java
===================================================================
--- projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/AbstractDsDeployer.java	2011-06-01 15:05:33 UTC (rev 111499)
+++ projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/AbstractDsDeployer.java	2011-06-01 16:02:18 UTC (rev 111500)
@@ -100,11 +100,10 @@
 
    /**
     * Create a new AbstractDsDeployer.
-    * @param log The logger
     */
-   public AbstractDsDeployer(Logger log)
+   public AbstractDsDeployer()
    {
-      this.log = log;
+      this.log = getLogger();
       this.transactionIntegration = null;
       this.ccm = null;
    }
@@ -929,6 +928,12 @@
    protected abstract SubjectFactory getSubjectFactory(String securityDomain) throws DeployException;
 
    /**
+    * Get the logger
+    * @return The value
+    */
+   protected abstract Logger getLogger();
+
+   /**
     * Create a subject
     * @param subjectFactory The subject factory
     * @param securityDomain The security domain

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	2011-06-01 15:05:33 UTC (rev 111499)
+++ projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/AbstractResourceAdapterDeployer.java	2011-06-01 16:02:18 UTC (rev 111500)
@@ -130,13 +130,12 @@
     *
     * @param validateClasses validateClasses validateClasses  boolean to express if this instance will
     * apply validation on classes structure
-    * @param log the right log where put messages
     */
-   public AbstractResourceAdapterDeployer(boolean validateClasses, Logger log)
+   public AbstractResourceAdapterDeployer(boolean validateClasses)
    {
       super();
-      this.log = log;
-      trace = log.isTraceEnabled();
+      this.log = getLogger();
+      this.trace = log.isTraceEnabled();
       this.validateClasses = validateClasses;
    }
 
@@ -2046,4 +2045,10 @@
     */
    protected abstract Object initAndInject(String value, List<? extends ConfigProperty> cpm, ClassLoader cl)
       throws DeployException;
+
+   /**
+    * Get the logger
+    * @return The value
+    */
+   protected abstract Logger getLogger();
 }

Modified: projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/AbstractFungalRADeployer.java
===================================================================
--- projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/AbstractFungalRADeployer.java	2011-06-01 15:05:33 UTC (rev 111499)
+++ projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/AbstractFungalRADeployer.java	2011-06-01 16:02:18 UTC (rev 111500)
@@ -72,11 +72,10 @@
     * Create a new AbstractResourceAdapterDeployer.
     *
     * @param validateClasses boolean to express if this instance will apply validation on classes structure
-    * @param log the right log where put messages
     */
-   public AbstractFungalRADeployer(boolean validateClasses, Logger log)
+   public AbstractFungalRADeployer(boolean validateClasses)
    {
-      super(validateClasses, log);
+      super(validateClasses);
       kernel = null;
    }
 

Modified: projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/DsXmlDeployer.java
===================================================================
--- projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/DsXmlDeployer.java	2011-06-01 15:05:33 UTC (rev 111499)
+++ projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/DsXmlDeployer.java	2011-06-01 16:02:18 UTC (rev 111500)
@@ -70,6 +70,9 @@
  */
 public final class DsXmlDeployer extends AbstractDsDeployer implements Deployer
 {
+   /** The logger */
+   private static Logger log = Logger.getLogger(DsXmlDeployer.class);
+
    /** jdbcLocal **/
    private String jdbcLocal;
 
@@ -87,8 +90,6 @@
     */
    public DsXmlDeployer()
    {
-      super(Logger.getLogger(DsXmlDeployer.class));
-
       this.kernel = null;
       this.jdbcLocal = null;
       this.jdbcXA = null;
@@ -149,6 +150,14 @@
    }
 
    /**
+    * {@inheritDoc}
+    */
+   protected Logger getLogger()
+   {
+      return log;
+   }
+
+   /**
     * Deploy
     * @param url The url
     * @param parent The parent classloader

Modified: projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/RAActivator.java
===================================================================
--- projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/RAActivator.java	2011-06-01 15:05:33 UTC (rev 111499)
+++ projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/RAActivator.java	2011-06-01 16:02:18 UTC (rev 111500)
@@ -73,13 +73,21 @@
     */
    public RAActivator()
    {
-      super(false, log);
+      super(false);
       enabled = true;
       excludeArchives = null;
       deployments = null;
    }
 
    /**
+    * {@inheritDoc}
+    */
+   protected Logger getLogger()
+   {
+      return log;
+   }
+
+   /**
     * Get the exclude archives
     * @return The archives
     */

Modified: projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/RADeployer.java
===================================================================
--- projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/RADeployer.java	2011-06-01 15:05:33 UTC (rev 111499)
+++ projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/RADeployer.java	2011-06-01 16:02:18 UTC (rev 111500)
@@ -68,19 +68,26 @@
  */
 public final class RADeployer extends AbstractFungalRADeployer implements Deployer, MultiStageDeployer, DeployerOrder
 {
-
    /** The logger */
-   static Logger log = Logger.getLogger(RADeployer.class);
+   private static Logger log = Logger.getLogger(RADeployer.class);
 
    /**
     * Constructor
     */
    public RADeployer()
    {
-      super(true, log);
+      super(true);
    }
 
    /**
+    * {@inheritDoc}
+    */
+   protected Logger getLogger()
+   {
+      return log;
+   }
+
+   /**
     * Deployer order
     * @return The deployment
     */

Modified: projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/RaXmlDeployer.java
===================================================================
--- projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/RaXmlDeployer.java	2011-06-01 15:05:33 UTC (rev 111499)
+++ projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/RaXmlDeployer.java	2011-06-01 16:02:18 UTC (rev 111500)
@@ -75,10 +75,18 @@
     */
    public RaXmlDeployer()
    {
-      super(false, log);
+      super(false);
    }
 
    /**
+    * {@inheritDoc}
+    */
+   protected Logger getLogger()
+   {
+      return log;
+   }
+
+   /**
     * Deployer order
     * @return The deployment
     */

Modified: projects/jboss-jca/trunk/ivy.xml
===================================================================
--- projects/jboss-jca/trunk/ivy.xml	2011-06-01 15:05:33 UTC (rev 111499)
+++ projects/jboss-jca/trunk/ivy.xml	2011-06-01 16:02:18 UTC (rev 111500)
@@ -95,6 +95,8 @@
   <dependencies>
     <!-- Maven doesn't handle dependencies well, so logging has to be first -->
     <dependency org="org.jboss.logging" name="jboss-logging" rev="${version.jboss.logging}" conf="common,ironjacamar-common-impl,ironjacamar-common-impl-papaki,ironjacamar-core-impl,ironjacamar-depchain,ironjacamar-deployers-common,ironjacamar-deployers-fungal"/>
+    <dependency org="org.jboss.logging" name="jboss-logging-generator" rev="${version.jboss.logging-generator}" conf="common"/>
+    <dependency org="org.jboss.logging" name="jboss-logging-processor" rev="${version.jboss.logging-processor}" conf="common"/>
     <dependency org="org.jboss.logmanager" name="jboss-logmanager" rev="${version.jboss.logmanager}" conf="common,ironjacamar-depchain"/>
 
     <!-- Keep these sorted -->

Modified: projects/jboss-jca/trunk/sjc/build.xml
===================================================================
--- projects/jboss-jca/trunk/sjc/build.xml	2011-06-01 15:05:33 UTC (rev 111499)
+++ projects/jboss-jca/trunk/sjc/build.xml	2011-06-01 16:02:18 UTC (rev 111500)
@@ -199,6 +199,8 @@
     <copy todir="${target.dir}/sjc/lib">
       <fileset dir="${lib.dir}/common">
         <include name="*.jar"/>
+        <exclude name="jboss-logging-generator.jar"/>
+        <exclude name="jboss-logging-processor.jar"/>
       </fileset>
     </copy>
 



More information about the jboss-cvs-commits mailing list