[jboss-cvs] JBossAS SVN: r110393 - in projects/jboss-jca/trunk: core/src/main/java/org/jboss/jca/core/api/connectionmanager/pool and 11 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Jan 17 12:59:13 EST 2011
Author: jesper.pedersen
Date: 2011-01-17 12:59:12 -0500 (Mon, 17 Jan 2011)
New Revision: 110393
Added:
projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/api/connectionmanager/pool/
projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/api/connectionmanager/pool/PoolConfiguration.java
projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/api/connectionmanager/pool/package.html
Removed:
projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/api/PoolConfiguration.java
Modified:
projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/api/management/ManagedConnectionFactory.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/AbstractPrefillPool.java
projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/SubPoolContext.java
projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/api/PoolFactory.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/test/java/org/jboss/jca/core/connectionmanager/listener/NoTxConnectionListenerTestCase.java
projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/core/connectionmanager/notx/NoTxConnectionManagerTestCase.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/core/src/test/java/org/jboss/jca/core/connectionmanager/tx/TxConnectionManagerTestCase.java
projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/core/connectionmanager/tx/XATxConnectionManagerTestCase.java
projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/core/connectionmanager/unit/AbstractConnectionManagerTestCase.java
projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/core/connectionmanager/unit/pool/PoolConfigurationTestCase.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
Log:
[JBJCA-492] Enable management repository (Part 2)
Copied: projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/api/connectionmanager/pool/PoolConfiguration.java (from rev 110388, projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/api/PoolConfiguration.java)
===================================================================
--- projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/api/connectionmanager/pool/PoolConfiguration.java (rev 0)
+++ projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/api/connectionmanager/pool/PoolConfiguration.java 2011-01-17 17:59:12 UTC (rev 110393)
@@ -0,0 +1,262 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2008-2009, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.jboss.jca.core.api.connectionmanager.pool;
+
+/**
+ * The pool configuration.
+ * @author <a href="mailto:gurkanerdogdu at yahoo.com">Gurkan Erdogdu</a>
+ * @author <a href="mailto:jesper.pedersen at jboss.org">Jesper Pedersen</a>
+ */
+public class PoolConfiguration
+{
+ /** Minumum size of the pool */
+ private int minSize;
+
+ /** Maximum size of the pool */
+ private int maxSize;
+
+ /** Blocking timeout. In milliseconds */
+ private long blockingTimeout;
+
+ /** Idle timeout period. Default 30 mins. In milliseconds */
+ private long idleTimeout;
+
+ /** Background validation */
+ private boolean backgroundValidation;
+
+ /** Background validation - minutes */
+ private int backgroundValidationMinutes;
+
+ /** Prefill pool*/
+ private boolean prefill;
+
+ /** Strict minumum, default false */
+ private boolean strictMin;
+
+ /**
+ * Do we want to immeadiately break when a connection cannot be matched and
+ * not evaluate the rest of the pool?
+ */
+ private boolean useFastFail;
+
+ /**
+ * Constructor
+ */
+ public PoolConfiguration()
+ {
+ minSize = 0;
+ maxSize = 20;
+ blockingTimeout = 30000;
+ idleTimeout = 1000 * 60 * 30;
+ backgroundValidation = false;
+ backgroundValidationMinutes = 0;
+ prefill = true;
+ strictMin = false;
+ useFastFail = false;
+ }
+
+ /**
+ * @return the minSize
+ */
+ public int getMinSize()
+ {
+ if (minSize > maxSize)
+ return maxSize;
+
+ return minSize;
+ }
+
+ /**
+ * @param minSize the minSize to set
+ */
+ public void setMinSize(int minSize)
+ {
+ this.minSize = minSize;
+ }
+
+ /**
+ * @return the maxSize
+ */
+ public int getMaxSize()
+ {
+ if (maxSize < minSize)
+ return minSize;
+
+ return maxSize;
+ }
+
+ /**
+ * @param maxSize the maxSize to set
+ */
+ public void setMaxSize(int maxSize)
+ {
+ this.maxSize = maxSize;
+ }
+
+ /**
+ * @return the blockingTimeout
+ */
+ public long getBlockingTimeout()
+ {
+ return blockingTimeout;
+ }
+
+ /**
+ * @param blockingTimeout the blockingTimeout to set
+ */
+ public void setBlockingTimeout(long blockingTimeout)
+ {
+ this.blockingTimeout = blockingTimeout;
+ }
+
+ /**
+ * @return the idleTimeout
+ */
+ public long getIdleTimeout()
+ {
+ return idleTimeout;
+ }
+
+ /**
+ * @param idleTimeout the idleTimeout to set
+ */
+ public void setIdleTimeout(long idleTimeout)
+ {
+ this.idleTimeout = idleTimeout;
+ }
+
+ /**
+ * @return Should background validation be performed
+ */
+ public boolean isBackgroundValidation()
+ {
+ return backgroundValidation;
+ }
+
+ /**
+ * @param v Should background validation be performed
+ */
+ public void setBackgroundValidation(boolean v)
+ {
+ this.backgroundValidation = v;
+ }
+
+ /**
+ * Get the background validation minutes setting
+ * @return The value
+ */
+ public int getBackgroundValidationMinutes()
+ {
+ return backgroundValidationMinutes;
+ }
+
+ /**
+ * Set the background validation minutes setting
+ * @param v The value
+ */
+ public void setBackgroundValidationMinutes(int v)
+ {
+ this.backgroundValidationMinutes = v;
+ }
+
+ /**
+ * Get the background validation interval in milliseconds
+ * @return The interval
+ */
+ public long getBackgroundValidationInterval()
+ {
+ return backgroundValidationMinutes * 60000L;
+ }
+
+ /**
+ * @return the prefill
+ */
+ public boolean isPrefill()
+ {
+ return prefill;
+ }
+
+ /**
+ * @param prefill the prefill to set
+ */
+ public void setPrefill(boolean prefill)
+ {
+ this.prefill = prefill;
+ }
+
+ /**
+ * @return the strictMin
+ */
+ public boolean isStrictMin()
+ {
+ return strictMin;
+ }
+
+ /**
+ * @param strictMin the strictMin to set
+ */
+ public void setStrictMin(boolean strictMin)
+ {
+ this.strictMin = strictMin;
+ }
+
+ /**
+ * @return the useFastFail
+ */
+ public boolean isUseFastFail()
+ {
+ return useFastFail;
+ }
+
+ /**
+ * @param useFastFail the useFastFail to set
+ */
+ public void setUseFastFail(boolean useFastFail)
+ {
+ this.useFastFail = useFastFail;
+ }
+
+ /**
+ * String representation
+ * @return The string
+ */
+ @Override
+ public String toString()
+ {
+ StringBuilder sb = new StringBuilder();
+
+ sb.append("PoolConfiguration@").append(Integer.toHexString(System.identityHashCode(this)));
+ sb.append("[minSize=").append(minSize);
+ sb.append(" maxSize=").append(maxSize);
+ sb.append(" blockingTimeout=").append(blockingTimeout);
+ sb.append(" idleTimeout=").append(idleTimeout);
+ sb.append(" backgroundValidation=").append(backgroundValidation);
+ sb.append(" backgroundValidationMinutes=").append(backgroundValidationMinutes);
+ sb.append(" prefill=").append(prefill);
+ sb.append(" strictMin=").append(strictMin);
+ sb.append(" useFastFail=").append(useFastFail);
+ sb.append("]");
+
+ return sb.toString();
+ }
+}
Added: projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/api/connectionmanager/pool/package.html
===================================================================
--- projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/api/connectionmanager/pool/package.html (rev 0)
+++ projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/api/connectionmanager/pool/package.html 2011-01-17 17:59:12 UTC (rev 110393)
@@ -0,0 +1,3 @@
+<body>
+This package contains the pool API for the connection manager.
+</body>
Modified: projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/api/management/ManagedConnectionFactory.java
===================================================================
--- projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/api/management/ManagedConnectionFactory.java 2011-01-17 17:11:24 UTC (rev 110392)
+++ projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/api/management/ManagedConnectionFactory.java 2011-01-17 17:59:12 UTC (rev 110393)
@@ -22,8 +22,8 @@
package org.jboss.jca.core.api.management;
+import org.jboss.jca.core.api.connectionmanager.pool.PoolConfiguration;
import org.jboss.jca.core.connectionmanager.pool.api.Pool;
-import org.jboss.jca.core.connectionmanager.pool.api.PoolConfiguration;
import java.lang.ref.WeakReference;
import java.util.ArrayList;
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-01-17 17:11:24 UTC (rev 110392)
+++ projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/AbstractPool.java 2011-01-17 17:59:12 UTC (rev 110393)
@@ -23,10 +23,10 @@
package org.jboss.jca.core.connectionmanager.pool;
import org.jboss.jca.common.JBossResourceException;
+import org.jboss.jca.core.api.connectionmanager.pool.PoolConfiguration;
import org.jboss.jca.core.connectionmanager.listener.ConnectionListener;
import org.jboss.jca.core.connectionmanager.listener.ConnectionListenerFactory;
import org.jboss.jca.core.connectionmanager.pool.api.Pool;
-import org.jboss.jca.core.connectionmanager.pool.api.PoolConfiguration;
import org.jboss.jca.core.connectionmanager.pool.mcp.ManagedConnectionPool;
import java.util.Iterator;
Modified: projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/AbstractPrefillPool.java
===================================================================
--- projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/AbstractPrefillPool.java 2011-01-17 17:11:24 UTC (rev 110392)
+++ projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/AbstractPrefillPool.java 2011-01-17 17:59:12 UTC (rev 110393)
@@ -22,7 +22,7 @@
package org.jboss.jca.core.connectionmanager.pool;
-import org.jboss.jca.core.connectionmanager.pool.api.PoolConfiguration;
+import org.jboss.jca.core.api.connectionmanager.pool.PoolConfiguration;
import javax.resource.spi.ConnectionRequestInfo;
import javax.resource.spi.ManagedConnectionFactory;
Modified: projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/SubPoolContext.java
===================================================================
--- projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/SubPoolContext.java 2011-01-17 17:11:24 UTC (rev 110392)
+++ projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/SubPoolContext.java 2011-01-17 17:59:12 UTC (rev 110393)
@@ -22,9 +22,9 @@
package org.jboss.jca.core.connectionmanager.pool;
+import org.jboss.jca.core.api.connectionmanager.pool.PoolConfiguration;
import org.jboss.jca.core.connectionmanager.listener.ConnectionListenerFactory;
import org.jboss.jca.core.connectionmanager.pool.api.Pool;
-import org.jboss.jca.core.connectionmanager.pool.api.PoolConfiguration;
import org.jboss.jca.core.connectionmanager.pool.mcp.ManagedConnectionPool;
import org.jboss.jca.core.connectionmanager.pool.mcp.ManagedConnectionPoolFactory;
Deleted: projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/api/PoolConfiguration.java
===================================================================
--- projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/api/PoolConfiguration.java 2011-01-17 17:11:24 UTC (rev 110392)
+++ projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/api/PoolConfiguration.java 2011-01-17 17:59:12 UTC (rev 110393)
@@ -1,262 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008-2009, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
-package org.jboss.jca.core.connectionmanager.pool.api;
-
-/**
- * The pool configuration.
- * @author <a href="mailto:gurkanerdogdu at yahoo.com">Gurkan Erdogdu</a>
- * @author <a href="mailto:jesper.pedersen at jboss.org">Jesper Pedersen</a>
- */
-public class PoolConfiguration
-{
- /** Minumum size of the pool */
- private int minSize;
-
- /** Maximum size of the pool */
- private int maxSize;
-
- /** Blocking timeout. In milliseconds */
- private long blockingTimeout;
-
- /** Idle timeout period. Default 30 mins. In milliseconds */
- private long idleTimeout;
-
- /** Background validation */
- private boolean backgroundValidation;
-
- /** Background validation - minutes */
- private int backgroundValidationMinutes;
-
- /** Prefill pool*/
- private boolean prefill;
-
- /** Strict minumum, default false */
- private boolean strictMin;
-
- /**
- * Do we want to immeadiately break when a connection cannot be matched and
- * not evaluate the rest of the pool?
- */
- private boolean useFastFail;
-
- /**
- * Constructor
- */
- public PoolConfiguration()
- {
- minSize = 0;
- maxSize = 20;
- blockingTimeout = 30000;
- idleTimeout = 1000 * 60 * 30;
- backgroundValidation = false;
- backgroundValidationMinutes = 0;
- prefill = true;
- strictMin = false;
- useFastFail = false;
- }
-
- /**
- * @return the minSize
- */
- public int getMinSize()
- {
- if (minSize > maxSize)
- return maxSize;
-
- return minSize;
- }
-
- /**
- * @param minSize the minSize to set
- */
- public void setMinSize(int minSize)
- {
- this.minSize = minSize;
- }
-
- /**
- * @return the maxSize
- */
- public int getMaxSize()
- {
- if (maxSize < minSize)
- return minSize;
-
- return maxSize;
- }
-
- /**
- * @param maxSize the maxSize to set
- */
- public void setMaxSize(int maxSize)
- {
- this.maxSize = maxSize;
- }
-
- /**
- * @return the blockingTimeout
- */
- public long getBlockingTimeout()
- {
- return blockingTimeout;
- }
-
- /**
- * @param blockingTimeout the blockingTimeout to set
- */
- public void setBlockingTimeout(long blockingTimeout)
- {
- this.blockingTimeout = blockingTimeout;
- }
-
- /**
- * @return the idleTimeout
- */
- public long getIdleTimeout()
- {
- return idleTimeout;
- }
-
- /**
- * @param idleTimeout the idleTimeout to set
- */
- public void setIdleTimeout(long idleTimeout)
- {
- this.idleTimeout = idleTimeout;
- }
-
- /**
- * @return Should background validation be performed
- */
- public boolean isBackgroundValidation()
- {
- return backgroundValidation;
- }
-
- /**
- * @param v Should background validation be performed
- */
- public void setBackgroundValidation(boolean v)
- {
- this.backgroundValidation = v;
- }
-
- /**
- * Get the background validation minutes setting
- * @return The value
- */
- public int getBackgroundValidationMinutes()
- {
- return backgroundValidationMinutes;
- }
-
- /**
- * Set the background validation minutes setting
- * @param v The value
- */
- public void setBackgroundValidationMinutes(int v)
- {
- this.backgroundValidationMinutes = v;
- }
-
- /**
- * Get the background validation interval in milliseconds
- * @return The interval
- */
- public long getBackgroundValidationInterval()
- {
- return backgroundValidationMinutes * 60000L;
- }
-
- /**
- * @return the prefill
- */
- public boolean isPrefill()
- {
- return prefill;
- }
-
- /**
- * @param prefill the prefill to set
- */
- public void setPrefill(boolean prefill)
- {
- this.prefill = prefill;
- }
-
- /**
- * @return the strictMin
- */
- public boolean isStrictMin()
- {
- return strictMin;
- }
-
- /**
- * @param strictMin the strictMin to set
- */
- public void setStrictMin(boolean strictMin)
- {
- this.strictMin = strictMin;
- }
-
- /**
- * @return the useFastFail
- */
- public boolean isUseFastFail()
- {
- return useFastFail;
- }
-
- /**
- * @param useFastFail the useFastFail to set
- */
- public void setUseFastFail(boolean useFastFail)
- {
- this.useFastFail = useFastFail;
- }
-
- /**
- * String representation
- * @return The string
- */
- @Override
- public String toString()
- {
- StringBuilder sb = new StringBuilder();
-
- sb.append("PoolConfiguration@").append(Integer.toHexString(System.identityHashCode(this)));
- sb.append("[minSize=").append(minSize);
- sb.append(" maxSize=").append(maxSize);
- sb.append(" blockingTimeout=").append(blockingTimeout);
- sb.append(" idleTimeout=").append(idleTimeout);
- sb.append(" backgroundValidation=").append(backgroundValidation);
- sb.append(" backgroundValidationMinutes=").append(backgroundValidationMinutes);
- sb.append(" prefill=").append(prefill);
- sb.append(" strictMin=").append(strictMin);
- sb.append(" useFastFail=").append(useFastFail);
- sb.append("]");
-
- return sb.toString();
- }
-}
Modified: projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/api/PoolFactory.java
===================================================================
--- projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/api/PoolFactory.java 2011-01-17 17:11:24 UTC (rev 110392)
+++ projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/api/PoolFactory.java 2011-01-17 17:59:12 UTC (rev 110393)
@@ -22,6 +22,7 @@
package org.jboss.jca.core.connectionmanager.pool.api;
+import org.jboss.jca.core.api.connectionmanager.pool.PoolConfiguration;
import org.jboss.jca.core.connectionmanager.pool.strategy.OnePool;
import org.jboss.jca.core.connectionmanager.pool.strategy.PoolByCri;
import org.jboss.jca.core.connectionmanager.pool.strategy.PoolBySubject;
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-01-17 17:11:24 UTC (rev 110392)
+++ projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/mcp/ArrayBlockingQueueManagedConnectionPool.java 2011-01-17 17:59:12 UTC (rev 110393)
@@ -23,12 +23,12 @@
package org.jboss.jca.core.connectionmanager.pool.mcp;
import org.jboss.jca.common.JBossResourceException;
+import org.jboss.jca.core.api.connectionmanager.pool.PoolConfiguration;
import org.jboss.jca.core.connectionmanager.listener.ConnectionListener;
import org.jboss.jca.core.connectionmanager.listener.ConnectionListenerFactory;
import org.jboss.jca.core.connectionmanager.listener.ConnectionState;
import org.jboss.jca.core.connectionmanager.pool.SubPoolContext;
import org.jboss.jca.core.connectionmanager.pool.api.Pool;
-import org.jboss.jca.core.connectionmanager.pool.api.PoolConfiguration;
import org.jboss.jca.core.connectionmanager.pool.idle.IdleRemover;
import org.jboss.jca.core.connectionmanager.pool.validator.ConnectionValidator;
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-01-17 17:11:24 UTC (rev 110392)
+++ projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/mcp/ManagedConnectionPool.java 2011-01-17 17:59:12 UTC (rev 110393)
@@ -22,11 +22,11 @@
package org.jboss.jca.core.connectionmanager.pool.mcp;
+import org.jboss.jca.core.api.connectionmanager.pool.PoolConfiguration;
import org.jboss.jca.core.connectionmanager.listener.ConnectionListener;
import org.jboss.jca.core.connectionmanager.listener.ConnectionListenerFactory;
import org.jboss.jca.core.connectionmanager.pool.SubPoolContext;
import org.jboss.jca.core.connectionmanager.pool.api.Pool;
-import org.jboss.jca.core.connectionmanager.pool.api.PoolConfiguration;
import org.jboss.jca.core.connectionmanager.pool.idle.IdleConnectionRemovalSupport;
import javax.resource.ResourceException;
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-01-17 17:11:24 UTC (rev 110392)
+++ projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/mcp/ManagedConnectionPoolFactory.java 2011-01-17 17:59:12 UTC (rev 110393)
@@ -22,10 +22,10 @@
package org.jboss.jca.core.connectionmanager.pool.mcp;
+import org.jboss.jca.core.api.connectionmanager.pool.PoolConfiguration;
import org.jboss.jca.core.connectionmanager.listener.ConnectionListenerFactory;
import org.jboss.jca.core.connectionmanager.pool.SubPoolContext;
import org.jboss.jca.core.connectionmanager.pool.api.Pool;
-import org.jboss.jca.core.connectionmanager.pool.api.PoolConfiguration;
import javax.resource.spi.ConnectionRequestInfo;
import javax.resource.spi.ManagedConnectionFactory;
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-01-17 17:11:24 UTC (rev 110392)
+++ projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/mcp/SemaphoreArrayListManagedConnectionPool.java 2011-01-17 17:59:12 UTC (rev 110393)
@@ -23,12 +23,12 @@
package org.jboss.jca.core.connectionmanager.pool.mcp;
import org.jboss.jca.common.JBossResourceException;
+import org.jboss.jca.core.api.connectionmanager.pool.PoolConfiguration;
import org.jboss.jca.core.connectionmanager.listener.ConnectionListener;
import org.jboss.jca.core.connectionmanager.listener.ConnectionListenerFactory;
import org.jboss.jca.core.connectionmanager.listener.ConnectionState;
import org.jboss.jca.core.connectionmanager.pool.SubPoolContext;
import org.jboss.jca.core.connectionmanager.pool.api.Pool;
-import org.jboss.jca.core.connectionmanager.pool.api.PoolConfiguration;
import org.jboss.jca.core.connectionmanager.pool.idle.IdleRemover;
import org.jboss.jca.core.connectionmanager.pool.validator.ConnectionValidator;
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-01-17 17:11:24 UTC (rev 110392)
+++ projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/strategy/OnePool.java 2011-01-17 17:59:12 UTC (rev 110393)
@@ -22,8 +22,8 @@
package org.jboss.jca.core.connectionmanager.pool.strategy;
+import org.jboss.jca.core.api.connectionmanager.pool.PoolConfiguration;
import org.jboss.jca.core.connectionmanager.pool.AbstractPrefillPool;
-import org.jboss.jca.core.connectionmanager.pool.api.PoolConfiguration;
import org.jboss.jca.core.connectionmanager.pool.mcp.ManagedConnectionPool;
import javax.resource.ResourceException;
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-01-17 17:11:24 UTC (rev 110392)
+++ projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/strategy/PoolByCri.java 2011-01-17 17:59:12 UTC (rev 110393)
@@ -22,8 +22,8 @@
package org.jboss.jca.core.connectionmanager.pool.strategy;
+import org.jboss.jca.core.api.connectionmanager.pool.PoolConfiguration;
import org.jboss.jca.core.connectionmanager.pool.AbstractPool;
-import org.jboss.jca.core.connectionmanager.pool.api.PoolConfiguration;
import javax.resource.ResourceException;
import javax.resource.spi.ConnectionRequestInfo;
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-01-17 17:11:24 UTC (rev 110392)
+++ projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/strategy/PoolBySubject.java 2011-01-17 17:59:12 UTC (rev 110393)
@@ -22,8 +22,8 @@
package org.jboss.jca.core.connectionmanager.pool.strategy;
+import org.jboss.jca.core.api.connectionmanager.pool.PoolConfiguration;
import org.jboss.jca.core.connectionmanager.pool.AbstractPool;
-import org.jboss.jca.core.connectionmanager.pool.api.PoolConfiguration;
import javax.resource.ResourceException;
import javax.resource.spi.ConnectionRequestInfo;
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-01-17 17:11:24 UTC (rev 110392)
+++ projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/strategy/PoolBySubjectAndCri.java 2011-01-17 17:59:12 UTC (rev 110393)
@@ -22,8 +22,8 @@
package org.jboss.jca.core.connectionmanager.pool.strategy;
+import org.jboss.jca.core.api.connectionmanager.pool.PoolConfiguration;
import org.jboss.jca.core.connectionmanager.pool.AbstractPool;
-import org.jboss.jca.core.connectionmanager.pool.api.PoolConfiguration;
import javax.resource.ResourceException;
import javax.resource.spi.ConnectionRequestInfo;
Modified: projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/core/connectionmanager/listener/NoTxConnectionListenerTestCase.java
===================================================================
--- projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/core/connectionmanager/listener/NoTxConnectionListenerTestCase.java 2011-01-17 17:11:24 UTC (rev 110392)
+++ projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/core/connectionmanager/listener/NoTxConnectionListenerTestCase.java 2011-01-17 17:59:12 UTC (rev 110393)
@@ -21,6 +21,7 @@
*/
package org.jboss.jca.core.connectionmanager.listener;
+import org.jboss.jca.core.api.connectionmanager.pool.PoolConfiguration;
import org.jboss.jca.core.connectionmanager.ConnectionManager;
import org.jboss.jca.core.connectionmanager.ConnectionManagerFactory;
import org.jboss.jca.core.connectionmanager.common.MockConnectionRequestInfo;
@@ -28,7 +29,6 @@
import org.jboss.jca.core.connectionmanager.common.MockManagedConnectionFactory;
import org.jboss.jca.core.connectionmanager.notx.NoTxConnectionManagerImpl;
import org.jboss.jca.core.connectionmanager.pool.api.Pool;
-import org.jboss.jca.core.connectionmanager.pool.api.PoolConfiguration;
import org.jboss.jca.core.connectionmanager.pool.api.PoolFactory;
import org.jboss.jca.core.connectionmanager.pool.api.PoolStrategy;
import org.jboss.jca.core.connectionmanager.tx.TxConnectionManagerTestCase;
Modified: projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/core/connectionmanager/notx/NoTxConnectionManagerTestCase.java
===================================================================
--- projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/core/connectionmanager/notx/NoTxConnectionManagerTestCase.java 2011-01-17 17:11:24 UTC (rev 110392)
+++ projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/core/connectionmanager/notx/NoTxConnectionManagerTestCase.java 2011-01-17 17:59:12 UTC (rev 110393)
@@ -22,6 +22,7 @@
package org.jboss.jca.core.connectionmanager.notx;
import org.jboss.jca.core.api.connectionmanager.ConnectionManager;
+import org.jboss.jca.core.api.connectionmanager.pool.PoolConfiguration;
import org.jboss.jca.core.connectionmanager.ConnectionManagerFactory;
import org.jboss.jca.core.connectionmanager.NoTxConnectionManager;
import org.jboss.jca.core.connectionmanager.common.MockConnectionRequestInfo;
@@ -30,7 +31,6 @@
import org.jboss.jca.core.connectionmanager.listener.ConnectionListener;
import org.jboss.jca.core.connectionmanager.listener.NoTxConnectionListener;
import org.jboss.jca.core.connectionmanager.pool.api.Pool;
-import org.jboss.jca.core.connectionmanager.pool.api.PoolConfiguration;
import org.jboss.jca.core.connectionmanager.pool.api.PoolFactory;
import org.jboss.jca.core.connectionmanager.pool.api.PoolStrategy;
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 2011-01-17 17:11:24 UTC (rev 110392)
+++ projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/core/connectionmanager/notx/SerializableTestCase.java 2011-01-17 17:59:12 UTC (rev 110393)
@@ -22,10 +22,10 @@
package org.jboss.jca.core.connectionmanager.notx;
import org.jboss.jca.core.api.connectionmanager.ConnectionManager;
+import org.jboss.jca.core.api.connectionmanager.pool.PoolConfiguration;
import org.jboss.jca.core.connectionmanager.ConnectionManagerFactory;
import org.jboss.jca.core.connectionmanager.common.MockManagedConnectionFactory;
import org.jboss.jca.core.connectionmanager.pool.api.Pool;
-import org.jboss.jca.core.connectionmanager.pool.api.PoolConfiguration;
import org.jboss.jca.core.connectionmanager.pool.api.PoolFactory;
import org.jboss.jca.core.connectionmanager.pool.api.PoolStrategy;
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 2011-01-17 17:11:24 UTC (rev 110392)
+++ projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/core/connectionmanager/tx/SerializableTestCase.java 2011-01-17 17:59:12 UTC (rev 110393)
@@ -22,10 +22,10 @@
package org.jboss.jca.core.connectionmanager.tx;
import org.jboss.jca.core.api.connectionmanager.ConnectionManager;
+import org.jboss.jca.core.api.connectionmanager.pool.PoolConfiguration;
import org.jboss.jca.core.connectionmanager.ConnectionManagerFactory;
import org.jboss.jca.core.connectionmanager.common.MockManagedConnectionFactory;
import org.jboss.jca.core.connectionmanager.pool.api.Pool;
-import org.jboss.jca.core.connectionmanager.pool.api.PoolConfiguration;
import org.jboss.jca.core.connectionmanager.pool.api.PoolFactory;
import org.jboss.jca.core.connectionmanager.pool.api.PoolStrategy;
import org.jboss.jca.embedded.Embedded;
Modified: projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/core/connectionmanager/tx/TxConnectionManagerTestCase.java
===================================================================
--- projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/core/connectionmanager/tx/TxConnectionManagerTestCase.java 2011-01-17 17:11:24 UTC (rev 110392)
+++ projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/core/connectionmanager/tx/TxConnectionManagerTestCase.java 2011-01-17 17:59:12 UTC (rev 110393)
@@ -22,6 +22,7 @@
package org.jboss.jca.core.connectionmanager.tx;
import org.jboss.jca.core.api.connectionmanager.ConnectionManager;
+import org.jboss.jca.core.api.connectionmanager.pool.PoolConfiguration;
import org.jboss.jca.core.connectionmanager.ConnectionManagerFactory;
import org.jboss.jca.core.connectionmanager.TxConnectionManager;
import org.jboss.jca.core.connectionmanager.common.MockConnectionRequestInfo;
@@ -30,7 +31,6 @@
import org.jboss.jca.core.connectionmanager.listener.ConnectionListener;
import org.jboss.jca.core.connectionmanager.listener.TxConnectionListener;
import org.jboss.jca.core.connectionmanager.pool.api.Pool;
-import org.jboss.jca.core.connectionmanager.pool.api.PoolConfiguration;
import org.jboss.jca.core.connectionmanager.pool.api.PoolFactory;
import org.jboss.jca.core.connectionmanager.pool.api.PoolStrategy;
import org.jboss.jca.core.connectionmanager.transaction.TransactionSynchronizer;
Modified: projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/core/connectionmanager/tx/XATxConnectionManagerTestCase.java
===================================================================
--- projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/core/connectionmanager/tx/XATxConnectionManagerTestCase.java 2011-01-17 17:11:24 UTC (rev 110392)
+++ projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/core/connectionmanager/tx/XATxConnectionManagerTestCase.java 2011-01-17 17:59:12 UTC (rev 110393)
@@ -21,6 +21,7 @@
*/
package org.jboss.jca.core.connectionmanager.tx;
+import org.jboss.jca.core.api.connectionmanager.pool.PoolConfiguration;
import org.jboss.jca.core.connectionmanager.ConnectionManagerFactory;
import org.jboss.jca.core.connectionmanager.TxConnectionManager;
import org.jboss.jca.core.connectionmanager.common.MockConnectionRequestInfo;
@@ -29,7 +30,6 @@
import org.jboss.jca.core.connectionmanager.listener.ConnectionListener;
import org.jboss.jca.core.connectionmanager.listener.TxConnectionListener;
import org.jboss.jca.core.connectionmanager.pool.api.Pool;
-import org.jboss.jca.core.connectionmanager.pool.api.PoolConfiguration;
import org.jboss.jca.core.connectionmanager.pool.api.PoolFactory;
import org.jboss.jca.core.connectionmanager.pool.api.PoolStrategy;
import org.jboss.jca.core.connectionmanager.transaction.TransactionSynchronizer;
Modified: projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/core/connectionmanager/unit/AbstractConnectionManagerTestCase.java
===================================================================
--- projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/core/connectionmanager/unit/AbstractConnectionManagerTestCase.java 2011-01-17 17:11:24 UTC (rev 110392)
+++ projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/core/connectionmanager/unit/AbstractConnectionManagerTestCase.java 2011-01-17 17:59:12 UTC (rev 110393)
@@ -21,12 +21,12 @@
*/
package org.jboss.jca.core.connectionmanager.unit;
+import org.jboss.jca.core.api.connectionmanager.pool.PoolConfiguration;
import org.jboss.jca.core.connectionmanager.AbstractConnectionManager;
import org.jboss.jca.core.connectionmanager.ccm.CachedConnectionManager;
import org.jboss.jca.core.connectionmanager.common.MockConnectionManager;
import org.jboss.jca.core.connectionmanager.common.MockManagedConnectionFactory;
import org.jboss.jca.core.connectionmanager.pool.api.Pool;
-import org.jboss.jca.core.connectionmanager.pool.api.PoolConfiguration;
import org.jboss.jca.core.connectionmanager.pool.api.PoolFactory;
import org.jboss.jca.core.connectionmanager.pool.api.PoolStrategy;
Modified: projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/core/connectionmanager/unit/pool/PoolConfigurationTestCase.java
===================================================================
--- projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/core/connectionmanager/unit/pool/PoolConfigurationTestCase.java 2011-01-17 17:11:24 UTC (rev 110392)
+++ projects/jboss-jca/trunk/core/src/test/java/org/jboss/jca/core/connectionmanager/unit/pool/PoolConfigurationTestCase.java 2011-01-17 17:59:12 UTC (rev 110393)
@@ -22,7 +22,7 @@
package org.jboss.jca.core.connectionmanager.unit.pool;
-import org.jboss.jca.core.connectionmanager.pool.api.PoolConfiguration;
+import org.jboss.jca.core.api.connectionmanager.pool.PoolConfiguration;
import org.junit.Test;
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-01-17 17:11:24 UTC (rev 110392)
+++ projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/AbstractDsDeployer.java 2011-01-17 17:59:12 UTC (rev 110393)
@@ -32,10 +32,10 @@
import org.jboss.jca.common.api.metadata.ra.Connector;
import org.jboss.jca.common.api.metadata.ra.ResourceAdapter1516;
import org.jboss.jca.common.metadata.merge.Merger;
+import org.jboss.jca.core.api.connectionmanager.pool.PoolConfiguration;
import org.jboss.jca.core.connectionmanager.ConnectionManager;
import org.jboss.jca.core.connectionmanager.ConnectionManagerFactory;
import org.jboss.jca.core.connectionmanager.pool.api.Pool;
-import org.jboss.jca.core.connectionmanager.pool.api.PoolConfiguration;
import org.jboss.jca.core.connectionmanager.pool.api.PoolFactory;
import org.jboss.jca.core.connectionmanager.pool.api.PoolStrategy;
import org.jboss.jca.core.spi.mdr.MetadataRepository;
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-01-17 17:11:24 UTC (rev 110392)
+++ projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/common/AbstractResourceAdapterDeployer.java 2011-01-17 17:59:12 UTC (rev 110393)
@@ -39,10 +39,10 @@
import org.jboss.jca.common.api.metadata.ra.ResourceAdapter1516;
import org.jboss.jca.common.api.metadata.ra.ra10.ResourceAdapter10;
import org.jboss.jca.core.api.bootstrap.CloneableBootstrapContext;
+import org.jboss.jca.core.api.connectionmanager.pool.PoolConfiguration;
import org.jboss.jca.core.connectionmanager.ConnectionManager;
import org.jboss.jca.core.connectionmanager.ConnectionManagerFactory;
import org.jboss.jca.core.connectionmanager.pool.api.Pool;
-import org.jboss.jca.core.connectionmanager.pool.api.PoolConfiguration;
import org.jboss.jca.core.connectionmanager.pool.api.PoolFactory;
import org.jboss.jca.core.connectionmanager.pool.api.PoolStrategy;
import org.jboss.jca.core.spi.mdr.AlreadyExistsException;
More information about the jboss-cvs-commits
mailing list