[jboss-cvs] JBossAS SVN: r76129 - in trunk/connector: src/main/org/jboss/resource and 10 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Jul 23 08:16:01 EDT 2008
Author: jesper.pedersen
Date: 2008-07-23 08:16:01 -0400 (Wed, 23 Jul 2008)
New Revision: 76129
Modified:
trunk/connector/build.xml
trunk/connector/src/main/org/jboss/resource/JBossResourceException.java
trunk/connector/src/main/org/jboss/resource/adapter/jdbc/CachedCallableStatement.java
trunk/connector/src/main/org/jboss/resource/adapter/jdbc/jdk5/CachedCallableStatementJDK5.java
trunk/connector/src/main/org/jboss/resource/adapter/jdbc/jdk6/CachedCallableStatementJDK6.java
trunk/connector/src/main/org/jboss/resource/adapter/jdbc/local/LocalTxDataSource.java
trunk/connector/src/main/org/jboss/resource/adapter/jdbc/remote/WrapperDataSourceService.java
trunk/connector/src/main/org/jboss/resource/binding/remote/RemoteConnectionFactoryService.java
trunk/connector/src/main/org/jboss/resource/connectionmanager/CachedConnectionInterceptor.java
trunk/connector/src/main/org/jboss/resource/connectionmanager/ConnectionFactoryBindingService.java
trunk/connector/src/main/org/jboss/resource/connectionmanager/RARDeployment.java
trunk/connector/src/main/org/jboss/resource/deployers/RARDeployment.java
trunk/connector/src/main/org/jboss/resource/deployers/management/DsDataSourceTemplate.java
trunk/connector/src/main/org/jboss/resource/deployment/ActivationSpecFactory.java
trunk/connector/src/main/org/jboss/resource/deployment/AdminObject.java
trunk/connector/src/main/org/jboss/resource/deployment/AdminObjectFactory.java
trunk/connector/src/main/org/jboss/resource/deployment/RARDeployer.java
trunk/connector/src/main/org/jboss/resource/deployment/RARDeployment.java
trunk/connector/src/main/org/jboss/resource/deployment/ResourceAdapterFactory.java
Log:
[JBAS-5797] Fix / suppress deprecation warnings in connector module
Modified: trunk/connector/build.xml
===================================================================
--- trunk/connector/build.xml 2008-07-23 11:12:23 UTC (rev 76128)
+++ trunk/connector/build.xml 2008-07-23 12:16:01 UTC (rev 76129)
@@ -126,8 +126,6 @@
<!-- Where source files live -->
<property name="source.java" value="${module.source}/main"/>
- <property name="javac.target" value="1.5"/>
- <property name="javac.source" value="1.5"/>
<property name="source.etc" value="${module.source}/etc"/>
<property name="source.resources" value="${module.source}/resources"/>
@@ -222,11 +220,10 @@
<target name="compile-classes-jdk5" depends="init" unless="HAVE_JDK_1.6">
<mkdir dir="${build.classes}"/>
- <!-- compile the non adapter classes from regular source -->
<javac destdir="${build.classes}"
optimize="${javac.optimize}"
- target="${javac.target}"
- source="${javac.source}"
+ target="1.5"
+ source="1.5"
debug="${javac.debug}"
depend="${javac.depend}"
verbose="${javac.verbose}"
@@ -242,11 +239,10 @@
<target name="compile-classes-jdk6" depends="init" if="HAVE_JDK_1.6">
<mkdir dir="${build.classes}"/>
- <!-- compile the non adapter classes from regular source -->
<javac destdir="${build.classes}"
optimize="${javac.optimize}"
- target="${javac.target}"
- source="${javac.source}"
+ target="1.6"
+ source="1.6"
debug="${javac.debug}"
depend="${javac.depend}"
verbose="${javac.verbose}"
Modified: trunk/connector/src/main/org/jboss/resource/JBossResourceException.java
===================================================================
--- trunk/connector/src/main/org/jboss/resource/JBossResourceException.java 2008-07-23 11:12:23 UTC (rev 76128)
+++ trunk/connector/src/main/org/jboss/resource/JBossResourceException.java 2008-07-23 12:16:01 UTC (rev 76129)
@@ -92,6 +92,7 @@
* @param code Error code.
* @param linked Linked <tt>Exception</tt>.
*/
+ @SuppressWarnings("deprecation")
public JBossResourceException(final String msg, final String code, final Throwable linked)
{
super(msg, code);
@@ -105,6 +106,7 @@
* @param msg Detail message.
* @param linked Linked <tt>Exception</tt>.
*/
+ @SuppressWarnings("deprecation")
public JBossResourceException(final String msg, final Throwable linked)
{
super(msg);
Modified: trunk/connector/src/main/org/jboss/resource/adapter/jdbc/CachedCallableStatement.java
===================================================================
--- trunk/connector/src/main/org/jboss/resource/adapter/jdbc/CachedCallableStatement.java 2008-07-23 11:12:23 UTC (rev 76128)
+++ trunk/connector/src/main/org/jboss/resource/adapter/jdbc/CachedCallableStatement.java 2008-07-23 12:16:01 UTC (rev 76129)
@@ -44,6 +44,7 @@
* @author Scott.Stark at jboss.org
* @version $Revision$
*/
+ at SuppressWarnings("deprecation")
public abstract class CachedCallableStatement extends CachedPreparedStatement
implements CallableStatement
{
@@ -456,5 +457,4 @@
{
return cs;
}
-
}
Modified: trunk/connector/src/main/org/jboss/resource/adapter/jdbc/jdk5/CachedCallableStatementJDK5.java
===================================================================
--- trunk/connector/src/main/org/jboss/resource/adapter/jdbc/jdk5/CachedCallableStatementJDK5.java 2008-07-23 11:12:23 UTC (rev 76128)
+++ trunk/connector/src/main/org/jboss/resource/adapter/jdbc/jdk5/CachedCallableStatementJDK5.java 2008-07-23 12:16:01 UTC (rev 76129)
@@ -32,11 +32,11 @@
* @author <a href="adrian at jboss.com">Adrian Brock</a>
* @version $Revision: 1.1 $
*/
+ at SuppressWarnings("deprecation")
public class CachedCallableStatementJDK5 extends CachedCallableStatement
{
public CachedCallableStatementJDK5(CallableStatement cs) throws SQLException
{
super(cs);
}
-
}
Modified: trunk/connector/src/main/org/jboss/resource/adapter/jdbc/jdk6/CachedCallableStatementJDK6.java
===================================================================
--- trunk/connector/src/main/org/jboss/resource/adapter/jdbc/jdk6/CachedCallableStatementJDK6.java 2008-07-23 11:12:23 UTC (rev 76128)
+++ trunk/connector/src/main/org/jboss/resource/adapter/jdbc/jdk6/CachedCallableStatementJDK6.java 2008-07-23 12:16:01 UTC (rev 76129)
@@ -39,6 +39,7 @@
* @author <a href="adrian at jboss.com">Adrian Brock</a>
* @version $Revision: 1.1 $
*/
+ at SuppressWarnings("deprecation")
public class CachedCallableStatementJDK6 extends CachedCallableStatement
{
public CachedCallableStatementJDK6(CallableStatement cs) throws SQLException
Modified: trunk/connector/src/main/org/jboss/resource/adapter/jdbc/local/LocalTxDataSource.java
===================================================================
--- trunk/connector/src/main/org/jboss/resource/adapter/jdbc/local/LocalTxDataSource.java 2008-07-23 11:12:23 UTC (rev 76128)
+++ trunk/connector/src/main/org/jboss/resource/adapter/jdbc/local/LocalTxDataSource.java 2008-07-23 12:16:01 UTC (rev 76129)
@@ -30,7 +30,7 @@
import javax.resource.spi.ConnectionRequestInfo;
import javax.resource.spi.ManagedConnectionFactory;
import javax.transaction.TransactionManager;
-import org.jboss.deployment.DeploymentException;
+import org.jboss.deployers.spi.DeploymentException;
import org.jboss.logging.Logger;
import org.jboss.resource.connectionmanager.CachedConnectionManager;
import org.jboss.resource.connectionmanager.InternalManagedConnectionPool;
Modified: trunk/connector/src/main/org/jboss/resource/adapter/jdbc/remote/WrapperDataSourceService.java
===================================================================
--- trunk/connector/src/main/org/jboss/resource/adapter/jdbc/remote/WrapperDataSourceService.java 2008-07-23 11:12:23 UTC (rev 76128)
+++ trunk/connector/src/main/org/jboss/resource/adapter/jdbc/remote/WrapperDataSourceService.java 2008-07-23 12:16:01 UTC (rev 76129)
@@ -52,7 +52,7 @@
import javax.resource.Referenceable;
import javax.sql.DataSource;
-import org.jboss.deployment.DeploymentException;
+import org.jboss.deployers.spi.DeploymentException;
import org.jboss.invocation.Invocation;
import org.jboss.invocation.Invoker;
import org.jboss.invocation.InvokerInterceptor;
Modified: trunk/connector/src/main/org/jboss/resource/binding/remote/RemoteConnectionFactoryService.java
===================================================================
--- trunk/connector/src/main/org/jboss/resource/binding/remote/RemoteConnectionFactoryService.java 2008-07-23 11:12:23 UTC (rev 76128)
+++ trunk/connector/src/main/org/jboss/resource/binding/remote/RemoteConnectionFactoryService.java 2008-07-23 12:16:01 UTC (rev 76129)
@@ -38,7 +38,7 @@
import javax.naming.StringRefAddr;
import javax.resource.Referenceable;
-import org.jboss.deployment.DeploymentException;
+import org.jboss.deployers.spi.DeploymentException;
import org.jboss.invocation.Invocation;
import org.jboss.invocation.Invoker;
import org.jboss.invocation.InvokerInterceptor;
Modified: trunk/connector/src/main/org/jboss/resource/connectionmanager/CachedConnectionInterceptor.java
===================================================================
--- trunk/connector/src/main/org/jboss/resource/connectionmanager/CachedConnectionInterceptor.java 2008-07-23 11:12:23 UTC (rev 76128)
+++ trunk/connector/src/main/org/jboss/resource/connectionmanager/CachedConnectionInterceptor.java 2008-07-23 12:16:01 UTC (rev 76129)
@@ -43,9 +43,6 @@
import org.jboss.invocation.Invocation;
import org.jboss.invocation.InvocationType;
import org.jboss.logging.Logger;
-import org.jboss.metadata.ApplicationMetaData;
-import org.jboss.metadata.BeanMetaData;
-import org.jboss.metadata.ResourceRefMetaData;
import org.jboss.mx.util.JMXExceptionDecoder;
import org.jboss.mx.util.MBeanServerLocator;
@@ -84,6 +81,7 @@
}
}
+ @SuppressWarnings("deprecation")
public void start() throws Exception
{
log.debug("start called in CachedConnectionInterceptor");
@@ -111,14 +109,14 @@
}
// get the JNDI names for all resources that are referenced "Unshareable"
- BeanMetaData bmd = container.getBeanMetaData();
- ApplicationMetaData appMetaData = bmd.getApplicationMetaData();
- ResourceRefMetaData resRefMetaData;
+ org.jboss.metadata.BeanMetaData bmd = container.getBeanMetaData();
+ org.jboss.metadata.ApplicationMetaData appMetaData = bmd.getApplicationMetaData();
+ org.jboss.metadata.ResourceRefMetaData resRefMetaData;
String jndiName;
for (Iterator iter = bmd.getResourceReferences(); iter.hasNext();)
{
- resRefMetaData = (ResourceRefMetaData) iter.next();
+ resRefMetaData = (org.jboss.metadata.ResourceRefMetaData) iter.next();
jndiName = resRefMetaData.getJndiName();
if (jndiName == null)
{
Modified: trunk/connector/src/main/org/jboss/resource/connectionmanager/ConnectionFactoryBindingService.java
===================================================================
--- trunk/connector/src/main/org/jboss/resource/connectionmanager/ConnectionFactoryBindingService.java 2008-07-23 11:12:23 UTC (rev 76128)
+++ trunk/connector/src/main/org/jboss/resource/connectionmanager/ConnectionFactoryBindingService.java 2008-07-23 12:16:01 UTC (rev 76129)
@@ -27,7 +27,7 @@
import javax.naming.NamingException;
import javax.resource.ResourceException;
-import org.jboss.deployment.DeploymentException;
+import org.jboss.deployers.spi.DeploymentException;
import org.jboss.logging.Logger;
import org.jboss.managed.api.annotation.ManagementObjectID;
import org.jboss.managed.api.annotation.ManagementProperty;
Modified: trunk/connector/src/main/org/jboss/resource/connectionmanager/RARDeployment.java
===================================================================
--- trunk/connector/src/main/org/jboss/resource/connectionmanager/RARDeployment.java 2008-07-23 11:12:23 UTC (rev 76128)
+++ trunk/connector/src/main/org/jboss/resource/connectionmanager/RARDeployment.java 2008-07-23 12:16:01 UTC (rev 76129)
@@ -37,7 +37,7 @@
import javax.resource.spi.ResourceAdapter;
import javax.resource.spi.ResourceAdapterAssociation;
-import org.jboss.deployment.DeploymentException;
+import org.jboss.deployers.spi.DeploymentException;
import org.jboss.logging.Logger;
import org.jboss.metadata.MetaData;
import org.jboss.resource.metadata.ConfigPropertyMetaData;
Modified: trunk/connector/src/main/org/jboss/resource/deployers/RARDeployment.java
===================================================================
--- trunk/connector/src/main/org/jboss/resource/deployers/RARDeployment.java 2008-07-23 11:12:23 UTC (rev 76128)
+++ trunk/connector/src/main/org/jboss/resource/deployers/RARDeployment.java 2008-07-23 12:16:01 UTC (rev 76129)
@@ -42,7 +42,7 @@
import javax.resource.spi.endpoint.MessageEndpointFactory;
import javax.resource.spi.work.WorkManager;
-import org.jboss.deployment.DeploymentException;
+import org.jboss.deployers.spi.DeploymentException;
import org.jboss.resource.deployment.ActivationSpecFactory;
import org.jboss.resource.deployment.ResourceAdapterFactory;
import org.jboss.resource.metadata.ConfigPropertyMetaData;
Modified: trunk/connector/src/main/org/jboss/resource/deployers/management/DsDataSourceTemplate.java
===================================================================
--- trunk/connector/src/main/org/jboss/resource/deployers/management/DsDataSourceTemplate.java 2008-07-23 11:12:23 UTC (rev 76128)
+++ trunk/connector/src/main/org/jboss/resource/deployers/management/DsDataSourceTemplate.java 2008-07-23 12:16:01 UTC (rev 76129)
@@ -61,6 +61,7 @@
private DeploymentTemplateInfo info;
+ @SuppressWarnings("deprecation")
public VirtualFile applyTemplate(VirtualFile root, String deploymentBaseName, DeploymentTemplateInfo values) throws Exception
{
String dsName = deploymentBaseName+"-ds.xml";
Modified: trunk/connector/src/main/org/jboss/resource/deployment/ActivationSpecFactory.java
===================================================================
--- trunk/connector/src/main/org/jboss/resource/deployment/ActivationSpecFactory.java 2008-07-23 11:12:23 UTC (rev 76128)
+++ trunk/connector/src/main/org/jboss/resource/deployment/ActivationSpecFactory.java 2008-07-23 12:16:01 UTC (rev 76129)
@@ -29,9 +29,8 @@
import javax.management.ObjectName;
import javax.resource.spi.ActivationSpec;
-import org.jboss.deployment.DeploymentException;
+import org.jboss.deployers.spi.DeploymentException;
import org.jboss.logging.Logger;
-import org.jboss.metadata.ActivationConfigPropertyMetaData;
import org.jboss.resource.metadata.MessageListenerMetaData;
import org.jboss.resource.metadata.RequiredConfigPropertyMetaData;
import org.jboss.util.propertyeditor.PropertyEditors;
@@ -47,6 +46,7 @@
/** The logger */
private static final Logger log = Logger.getLogger(ActivationSpecFactory.class);
+ @SuppressWarnings("deprecation")
public static ActivationSpec createActivationSpec(ObjectName rarName,
String messagingType, Collection activationConfig,
MessageListenerMetaData mlmd)
@@ -73,7 +73,7 @@
boolean found = false;
for (Iterator j = activationConfig.iterator(); j.hasNext();)
{
- ActivationConfigPropertyMetaData acpmd = (ActivationConfigPropertyMetaData) j.next();
+ org.jboss.metadata.ActivationConfigPropertyMetaData acpmd = (org.jboss.metadata.ActivationConfigPropertyMetaData) j.next();
String acp = acpmd.getName();
String acpName = acp.substring(0, 1).toUpperCase();
@@ -117,7 +117,7 @@
Properties beanProps = new Properties();
for (Iterator i = activationConfig.iterator(); i.hasNext();)
{
- ActivationConfigPropertyMetaData acpmd = (ActivationConfigPropertyMetaData) i.next();
+ org.jboss.metadata.ActivationConfigPropertyMetaData acpmd = (org.jboss.metadata.ActivationConfigPropertyMetaData) i.next();
String name = acpmd.getName();
String value = acpmd.getValue();
beanProps.setProperty(name, value);
Modified: trunk/connector/src/main/org/jboss/resource/deployment/AdminObject.java
===================================================================
--- trunk/connector/src/main/org/jboss/resource/deployment/AdminObject.java 2008-07-23 11:12:23 UTC (rev 76128)
+++ trunk/connector/src/main/org/jboss/resource/deployment/AdminObject.java 2008-07-23 12:16:01 UTC (rev 76129)
@@ -26,7 +26,7 @@
import javax.management.ObjectName;
import javax.naming.InitialContext;
-import org.jboss.deployment.DeploymentException;
+import org.jboss.deployers.spi.DeploymentException;
import org.jboss.resource.metadata.AdminObjectMetaData;
import org.jboss.resource.metadata.ConnectorMetaData;
import org.jboss.system.ServiceMBeanSupport;
Modified: trunk/connector/src/main/org/jboss/resource/deployment/AdminObjectFactory.java
===================================================================
--- trunk/connector/src/main/org/jboss/resource/deployment/AdminObjectFactory.java 2008-07-23 11:12:23 UTC (rev 76128)
+++ trunk/connector/src/main/org/jboss/resource/deployment/AdminObjectFactory.java 2008-07-23 12:16:01 UTC (rev 76129)
@@ -32,7 +32,7 @@
import javax.management.ObjectName;
-import org.jboss.deployment.DeploymentException;
+import org.jboss.deployers.spi.DeploymentException;
import org.jboss.logging.Logger;
import org.jboss.resource.metadata.AdminObjectMetaData;
import org.jboss.resource.metadata.ConfigPropertyMetaData;
Modified: trunk/connector/src/main/org/jboss/resource/deployment/RARDeployer.java
===================================================================
--- trunk/connector/src/main/org/jboss/resource/deployment/RARDeployer.java 2008-07-23 11:12:23 UTC (rev 76128)
+++ trunk/connector/src/main/org/jboss/resource/deployment/RARDeployer.java 2008-07-23 12:16:01 UTC (rev 76129)
@@ -29,7 +29,6 @@
import javax.resource.spi.XATerminator;
import javax.resource.spi.work.WorkManager;
-import org.jboss.deployment.DeploymentException;
import org.jboss.deployment.DeploymentInfo;
import org.jboss.deployment.ObjectModelFactorySimpleSubDeployerSupport;
import org.jboss.resource.metadata.ConnectorMetaData;
@@ -70,9 +69,9 @@
setEnhancedSuffixes(new String[] { "250:.rar" });
}
- protected void parseMetaData(DeploymentInfo di, URL url) throws DeploymentException
- {
-
+ @SuppressWarnings("deprecation")
+ protected void parseMetaData(DeploymentInfo di, URL url) throws org.jboss.deployment.DeploymentException
+ {
super.parseMetaData(di, url);
InputStream is = di.localCl.getResourceAsStream(JBOSS_RA_XML);
@@ -97,7 +96,7 @@
catch (Throwable t)
{
- DeploymentException.rethrowAsDeploymentException("Error parsing meta data " + url, t);
+ org.jboss.deployment.DeploymentException.rethrowAsDeploymentException("Error parsing meta data " + url, t);
}finally
{
@@ -124,8 +123,8 @@
{
return "META-INF/ra.xml";
}
-
- public String getObjectName(DeploymentInfo di) throws DeploymentException
+
+ public String getObjectName(DeploymentInfo di) throws org.jboss.deployment.DeploymentException
{
String name = di.shortName;
di = di.parent;
Modified: trunk/connector/src/main/org/jboss/resource/deployment/RARDeployment.java
===================================================================
--- trunk/connector/src/main/org/jboss/resource/deployment/RARDeployment.java 2008-07-23 11:12:23 UTC (rev 76128)
+++ trunk/connector/src/main/org/jboss/resource/deployment/RARDeployment.java 2008-07-23 12:16:01 UTC (rev 76129)
@@ -39,7 +39,7 @@
import javax.resource.spi.endpoint.MessageEndpointFactory;
import javax.resource.spi.work.WorkManager;
-import org.jboss.deployment.DeploymentException;
+import org.jboss.deployers.spi.DeploymentException;
import org.jboss.deployment.DeploymentInfo;
import org.jboss.resource.metadata.ConfigPropertyMetaData;
import org.jboss.resource.metadata.ConnectorMetaData;
Modified: trunk/connector/src/main/org/jboss/resource/deployment/ResourceAdapterFactory.java
===================================================================
--- trunk/connector/src/main/org/jboss/resource/deployment/ResourceAdapterFactory.java 2008-07-23 11:12:23 UTC (rev 76128)
+++ trunk/connector/src/main/org/jboss/resource/deployment/ResourceAdapterFactory.java 2008-07-23 12:16:01 UTC (rev 76129)
@@ -29,7 +29,7 @@
import javax.resource.spi.ResourceAdapter;
-import org.jboss.deployment.DeploymentException;
+import org.jboss.deployers.spi.DeploymentException;
import org.jboss.resource.metadata.ConfigPropertyMetaData;
import org.jboss.resource.metadata.ConnectorMetaData;
import org.jboss.resource.metadata.RARDeploymentMetaData;
More information about the jboss-cvs-commits
mailing list