[jboss-cvs] JBossAS SVN: r94066 - in projects/jboss-jca/trunk: core/src/main/java/org/jboss/jca/core/connectionmanager and 5 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Sep 28 12:19:26 EDT 2009
Author: jesper.pedersen
Date: 2009-09-28 12:19:25 -0400 (Mon, 28 Sep 2009)
New Revision: 94066
Modified:
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/CachedConnectionManager.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/InternalManagedConnectionPool.java
projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/PoolFiller.java
projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/BeanValidation.java
projects/jboss-jca/trunk/fungal/src/main/java/org/jboss/jca/fungal/impl/DeploymentDeployer.java
projects/jboss-jca/trunk/fungal/src/main/java/org/jboss/jca/fungal/impl/KernelImpl.java
projects/jboss-jca/trunk/fungal/src/main/java/org/jboss/jca/fungal/impl/MainDeployer.java
projects/jboss-jca/trunk/sjc/src/main/java/org/jboss/jca/sjc/Main.java
projects/jboss-jca/trunk/standalone/src/main/java/org/jboss/jca/standalone/Main.java
Log:
[JBJCA-180] Require JDK6+ for building
Modified: projects/jboss-jca/trunk/build.xml
===================================================================
--- projects/jboss-jca/trunk/build.xml 2009-09-28 15:31:54 UTC (rev 94065)
+++ projects/jboss-jca/trunk/build.xml 2009-09-28 16:19:25 UTC (rev 94066)
@@ -174,6 +174,8 @@
<target name="init">
<ivy:settings file="${basedir}/ivy.settings.xml"/>
+ <fail message="JBoss JCA requires JDK6+" unless="HAVE_JDK_1.6"/>
+
<mkdir dir="${build.dir}" />
<mkdir dir="${target.dir}" />
</target>
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 2009-09-28 15:31:54 UTC (rev 94065)
+++ projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/AbstractConnectionManager.java 2009-09-28 16:19:25 UTC (rev 94066)
@@ -552,7 +552,7 @@
}
for (Iterator<ConnectionListener> i = cls.iterator(); i.hasNext();)
{
- disconnectManagedConnection((ConnectionListener) i.next());
+ disconnectManagedConnection(i.next());
}
}
@@ -581,7 +581,7 @@
log.warn("reconnecting a connection handle that still has a managedConnection! "
+ cr.getConnectionListener().getManagedConnection() + " " + cr.getConnection());
}
- ConnectionListener cl = (ConnectionListener) criToCLMap.get(cr.getCri());
+ ConnectionListener cl = criToCLMap.get(cr.getCri());
if (cl == null)
{
cl = getManagedConnection(getSubject(), cr.getCri());
Modified: projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/CachedConnectionManager.java
===================================================================
--- projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/CachedConnectionManager.java 2009-09-28 15:31:54 UTC (rev 94065)
+++ projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/CachedConnectionManager.java 2009-09-28 16:19:25 UTC (rev 94066)
@@ -152,8 +152,8 @@
while (cmToConnectionsMapIterator.hasNext())
{
Entry<ConnectionCacheListener, Collection<ConnectionRecord>> entry = cmToConnectionsMapIterator.next();
- ConnectionCacheListener cm = (ConnectionCacheListener) entry.getKey();
- Collection<ConnectionRecord> conns = entry.getValue();
+ ConnectionCacheListener cm = entry.getKey();
+ Collection<ConnectionRecord> conns = entry.getValue();
cm.transactionStarted(conns);
}
@@ -370,7 +370,7 @@
while (cmToConnectionsMapIterator.hasNext())
{
Entry<ConnectionCacheListener, Collection<ConnectionRecord>> entry = cmToConnectionsMapIterator.next();
- ConnectionCacheListener cm = (ConnectionCacheListener) entry.getKey();
+ ConnectionCacheListener cm = entry.getKey();
Collection<ConnectionRecord> conns = entry.getValue();
cm.reconnect(conns, unsharableResources);
@@ -400,7 +400,7 @@
while (cmToConnectionsMapIterator.hasNext())
{
Entry<ConnectionCacheListener, Collection<ConnectionRecord>> entry = cmToConnectionsMapIterator.next();
- ConnectionCacheListener cm = (ConnectionCacheListener) entry.getKey();
+ ConnectionCacheListener cm = entry.getKey();
Collection<ConnectionRecord> conns = entry.getValue();
cm.disconnect(conns, unsharableResources);
@@ -539,7 +539,7 @@
synchronized (connectionStackTraces)
{
- exception = (Throwable) connectionStackTraces.remove(connectionHandle);
+ exception = connectionStackTraces.remove(connectionHandle);
}
Method m = connectionHandle.getClass().getMethod("close", new Class[]{});
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 2009-09-28 15:31:54 UTC (rev 94065)
+++ projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/AbstractPool.java 2009-09-28 16:19:25 UTC (rev 94066)
@@ -157,7 +157,7 @@
*/
protected SubPoolContext getSubPool(Object key, Subject subject, ConnectionRequestInfo cri) throws ResourceException
{
- SubPoolContext subPoolContext = (SubPoolContext)subPools.get(key);
+ SubPoolContext subPoolContext = subPools.get(key);
if (subPoolContext == null)
{
SubPoolContext newSubPoolContext = new SubPoolContext(getTransactionManager(), mcf, clf, subject,
Modified: projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/InternalManagedConnectionPool.java
===================================================================
--- projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/InternalManagedConnectionPool.java 2009-09-28 15:31:54 UTC (rev 94065)
+++ projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/InternalManagedConnectionPool.java 2009-09-28 16:19:25 UTC (rev 94066)
@@ -204,7 +204,7 @@
this.checkedOut.add(connectionListener);
//Max used connections, maxSize - permits.aval --> gives current used connection!
- int size = (int) (maxSize - permits.availablePermits());
+ int size = (maxSize - permits.availablePermits());
if (size > maxUsedConnections)
{
maxUsedConnections = size;
@@ -342,7 +342,7 @@
cl = createsConnectionEventListener(subject, cri);
checkedOut.add(cl);
- int size = (int) (maxSize - permits.availablePermits());
+ int size = (maxSize - permits.availablePermits());
if (size > maxUsedConnections)
{
maxUsedConnections = size;
@@ -449,7 +449,7 @@
break;
// Check the first in the list
- ConnectionListener cl = (ConnectionListener) cls.get(0);
+ ConnectionListener cl = cls.get(0);
if (cl.isTimedOut(timeout) && shouldRemove())
{
connectionCounter.incTimedOutCount();
@@ -474,7 +474,7 @@
{
for (int i = 0; i < destroy.size(); ++i)
{
- ConnectionListener cl = (ConnectionListener) destroy.get(i);
+ ConnectionListener cl = destroy.get(i);
if (trace)
{
log.trace("Destroying timedout connection " + cl);
@@ -1006,7 +1006,7 @@
ConnectionListener cl = null;
for (Iterator<ConnectionListener> iter = cls.iterator(); iter.hasNext();)
{
- cl = (ConnectionListener) iter.next();
+ cl = iter.next();
long lastCheck = cl.getLastValidatedTime();
if ((System.currentTimeMillis() - lastCheck) >= poolParams.getBackgroundValidationInterval())
Modified: projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/PoolFiller.java
===================================================================
--- projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/PoolFiller.java 2009-09-28 15:31:54 UTC (rev 94065)
+++ projects/jboss-jca/trunk/core/src/main/java/org/jboss/jca/core/connectionmanager/pool/PoolFiller.java 2009-09-28 16:19:25 UTC (rev 94066)
@@ -102,7 +102,7 @@
// keep iterating through pools till empty, exception escapes.
while (true)
{
- mcp = (InternalManagedConnectionPool) pools.remove();
+ mcp = pools.remove();
if (mcp == null)
{
Modified: projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/BeanValidation.java
===================================================================
--- projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/BeanValidation.java 2009-09-28 15:31:54 UTC (rev 94065)
+++ projects/jboss-jca/trunk/deployers/src/main/java/org/jboss/jca/deployers/fungal/BeanValidation.java 2009-09-28 16:19:25 UTC (rev 94066)
@@ -79,7 +79,7 @@
}
else
{
- Class[] vargs = (Class[])groupsClasses.toArray(new Class[groupsClasses.size()]);
+ Class[] vargs = groupsClasses.toArray(new Class[groupsClasses.size()]);
errors = v.validate(object, vargs);
}
if (errors != null && errors.size() > 0)
Modified: projects/jboss-jca/trunk/fungal/src/main/java/org/jboss/jca/fungal/impl/DeploymentDeployer.java
===================================================================
--- projects/jboss-jca/trunk/fungal/src/main/java/org/jboss/jca/fungal/impl/DeploymentDeployer.java 2009-09-28 15:31:54 UTC (rev 94065)
+++ projects/jboss-jca/trunk/fungal/src/main/java/org/jboss/jca/fungal/impl/DeploymentDeployer.java 2009-09-28 16:19:25 UTC (rev 94066)
@@ -283,6 +283,7 @@
* @return The new bean
* @exception Exception Thrown if an error occurs
*/
+ @SuppressWarnings("unchecked")
private Object createBean(BeanType bt, ClassLoader cl) throws Exception
{
Class<?> clz = null;
@@ -670,6 +671,7 @@
/**
* Init logging
*/
+ @SuppressWarnings("unchecked")
private static void initLogging()
{
try
@@ -691,6 +693,7 @@
* @param s The string
* @param t The throwable
*/
+ @SuppressWarnings("unchecked")
private static void error(String s, Throwable t)
{
if (logging != null)
@@ -717,6 +720,7 @@
* Logging: WARN
* @param s The string
*/
+ @SuppressWarnings("unchecked")
private static void warn(String s)
{
if (logging != null)
@@ -742,6 +746,7 @@
* Logging: INFO
* @param s The string
*/
+ @SuppressWarnings("unchecked")
private static void info(String s)
{
if (logging != null)
@@ -767,6 +772,7 @@
* Logging: Is DEBUG enabled
* @return True if debug is enabled; otherwise false
*/
+ @SuppressWarnings("unchecked")
private static boolean isDebugEnabled()
{
if (logging != null)
@@ -789,6 +795,7 @@
* Logging: DEBUG
* @param s The string
*/
+ @SuppressWarnings("unchecked")
private static void debug(String s)
{
if (logging != null)
Modified: projects/jboss-jca/trunk/fungal/src/main/java/org/jboss/jca/fungal/impl/KernelImpl.java
===================================================================
--- projects/jboss-jca/trunk/fungal/src/main/java/org/jboss/jca/fungal/impl/KernelImpl.java 2009-09-28 15:31:54 UTC (rev 94065)
+++ projects/jboss-jca/trunk/fungal/src/main/java/org/jboss/jca/fungal/impl/KernelImpl.java 2009-09-28 16:19:25 UTC (rev 94066)
@@ -354,6 +354,7 @@
* @param deployment The deployment unit
* @exception Throwable If an error occurs
*/
+ @SuppressWarnings("unchecked")
void shutdownDeployment(Deployment deployment) throws Throwable
{
SecurityActions.setThreadContextClassLoader(kernelClassLoader);
@@ -601,6 +602,7 @@
* Init logging
* @param cl The classloader to load from
*/
+ @SuppressWarnings("unchecked")
private void initLogging(ClassLoader cl)
{
try
@@ -637,6 +639,7 @@
* @param s The string
* @param t The throwable
*/
+ @SuppressWarnings("unchecked")
private void error(String s, Throwable t)
{
if (logging != null)
@@ -663,6 +666,7 @@
* Logging: WARN
* @param s The string
*/
+ @SuppressWarnings("unchecked")
private void warn(String s)
{
if (logging != null)
@@ -688,6 +692,7 @@
* Logging: INFO
* @param s The string
*/
+ @SuppressWarnings("unchecked")
private void info(String s)
{
if (logging != null)
@@ -713,6 +718,7 @@
* Logging: Is DEBUG enabled
* @return True if debug is enabled; otherwise false
*/
+ @SuppressWarnings("unchecked")
private boolean isDebugEnabled()
{
if (logging != null)
@@ -735,6 +741,7 @@
* Logging: DEBUG
* @param s The string
*/
+ @SuppressWarnings("unchecked")
private void debug(String s)
{
if (logging != null)
Modified: projects/jboss-jca/trunk/fungal/src/main/java/org/jboss/jca/fungal/impl/MainDeployer.java
===================================================================
--- projects/jboss-jca/trunk/fungal/src/main/java/org/jboss/jca/fungal/impl/MainDeployer.java 2009-09-28 15:31:54 UTC (rev 94065)
+++ projects/jboss-jca/trunk/fungal/src/main/java/org/jboss/jca/fungal/impl/MainDeployer.java 2009-09-28 16:19:25 UTC (rev 94066)
@@ -42,11 +42,6 @@
/** Logging */
private static Object logging;
- static
- {
- initLogging();
- }
-
/**
* Constructor
* @param kernel The kernel
@@ -121,147 +116,4 @@
if (deployment != null)
kernel.shutdownDeployment(deployment);
}
-
- /**
- * Init logging
- */
- private static void initLogging()
- {
- try
- {
- Class clz = Class.forName("org.jboss.logging.Logger");
-
- Method mGetLogger = clz.getMethod("getLogger", String.class);
-
- logging = mGetLogger.invoke((Object)null, new Object[] {"org.jboss.jca.fungal.impl.MainDeployer"});
- }
- catch (Throwable t)
- {
- // Nothing we can do
- }
- }
-
- /**
- * Logging: ERROR
- * @param s The string
- * @param t The throwable
- */
- private static void error(String s, Throwable t)
- {
- if (logging != null)
- {
- try
- {
- Class clz = logging.getClass();
- Method mError = clz.getMethod("error", Object.class, Throwable.class);
- mError.invoke(logging, new Object[] {s, t});
- }
- catch (Throwable th)
- {
- // Nothing we can do
- }
- }
- else
- {
- System.out.println(s);
- t.printStackTrace(System.out);
- }
- }
-
- /**
- * Logging: WARN
- * @param s The string
- */
- private static void warn(String s)
- {
- if (logging != null)
- {
- try
- {
- Class clz = logging.getClass();
- Method mWarn = clz.getMethod("warn", Object.class);
- mWarn.invoke(logging, new Object[] {s});
- }
- catch (Throwable t)
- {
- // Nothing we can do
- }
- }
- else
- {
- System.out.println(s);
- }
- }
-
- /**
- * Logging: INFO
- * @param s The string
- */
- private static void info(String s)
- {
- if (logging != null)
- {
- try
- {
- Class clz = logging.getClass();
- Method mInfo = clz.getMethod("info", Object.class);
- mInfo.invoke(logging, new Object[] {s});
- }
- catch (Throwable t)
- {
- // Nothing we can do
- }
- }
- else
- {
- System.out.println(s);
- }
- }
-
- /**
- * Logging: Is DEBUG enabled
- * @return True if debug is enabled; otherwise false
- */
- private static boolean isDebugEnabled()
- {
- if (logging != null)
- {
- try
- {
- Class clz = logging.getClass();
- Method mIsDebugEnabled = clz.getMethod("isDebugEnabled", (Class[])null);
- return ((Boolean)mIsDebugEnabled.invoke(logging, (Object[])null)).booleanValue();
- }
- catch (Throwable t)
- {
- // Nothing we can do
- }
- }
- return true;
- }
-
- /**
- * Logging: DEBUG
- * @param s The string
- */
- private static void debug(String s)
- {
- if (logging != null)
- {
- try
- {
- Class clz = logging.getClass();
- Method mDebug = clz.getMethod("debug", Object.class);
- mDebug.invoke(logging, new Object[] {s});
- }
- catch (Throwable t)
- {
- // Nothing we can do
- }
- }
- else
- {
- System.out.println(s);
- }
- }
}
Modified: projects/jboss-jca/trunk/sjc/src/main/java/org/jboss/jca/sjc/Main.java
===================================================================
--- projects/jboss-jca/trunk/sjc/src/main/java/org/jboss/jca/sjc/Main.java 2009-09-28 15:31:54 UTC (rev 94065)
+++ projects/jboss-jca/trunk/sjc/src/main/java/org/jboss/jca/sjc/Main.java 2009-09-28 16:19:25 UTC (rev 94066)
@@ -103,6 +103,7 @@
* Init logging
* @param cl The classloader to load from
*/
+ @SuppressWarnings("unchecked")
private static void initLogging(ClassLoader cl)
{
try
@@ -139,6 +140,7 @@
* @param s The string
* @param t The throwable
*/
+ @SuppressWarnings("unchecked")
private static void error(String s, Throwable t)
{
if (logging != null)
@@ -165,6 +167,7 @@
* Logging: WARN
* @param s The string
*/
+ @SuppressWarnings("unchecked")
private static void warn(String s)
{
if (logging != null)
@@ -190,6 +193,7 @@
* Logging: INFO
* @param s The string
*/
+ @SuppressWarnings("unchecked")
private static void info(String s)
{
if (logging != null)
@@ -215,6 +219,7 @@
* Logging: Is DEBUG enabled
* @return True if debug is enabled; otherwise false
*/
+ @SuppressWarnings("unchecked")
private static boolean isDebugEnabled()
{
if (logging != null)
@@ -237,6 +242,7 @@
* Logging: DEBUG
* @param s The string
*/
+ @SuppressWarnings("unchecked")
private static void debug(String s)
{
if (logging != null)
Modified: projects/jboss-jca/trunk/standalone/src/main/java/org/jboss/jca/standalone/Main.java
===================================================================
--- projects/jboss-jca/trunk/standalone/src/main/java/org/jboss/jca/standalone/Main.java 2009-09-28 15:31:54 UTC (rev 94065)
+++ projects/jboss-jca/trunk/standalone/src/main/java/org/jboss/jca/standalone/Main.java 2009-09-28 16:19:25 UTC (rev 94066)
@@ -56,6 +56,7 @@
* Boot
* @param args The arguments
*/
+ @SuppressWarnings("unchecked")
private void boot(String[] args)
{
try
@@ -144,6 +145,7 @@
/**
* Shutdown
*/
+ @SuppressWarnings("unchecked")
private void shutdown()
{
try
More information about the jboss-cvs-commits
mailing list