[jboss-cvs] JBossAS SVN: r80815 - trunk/connector/src/main/org/jboss/resource/deployers.

[jboss-cvs-commits at lists.jboss.org]

Author: adrian at jboss.org
Date: 2008-11-11 12:19:17 -0500 (Tue, 11 Nov 2008)
New Revision: 80815

Modified:
   trunk/connector/src/main/org/jboss/resource/deployers/ManagedConnectionFactoryClassLoaderDeployer.java
   trunk/connector/src/main/org/jboss/resource/deployers/ManagedConnectionFactoryParserDeployer.java
   trunk/connector/src/main/org/jboss/resource/deployers/RARDeployment.java
Log:
Sourcecode tidyup

Modified: trunk/connector/src/main/org/jboss/resource/deployers/ManagedConnectionFactoryClassLoaderDeployer.java
===================================================================
--- trunk/connector/src/main/org/jboss/resource/deployers/ManagedConnectionFactoryClassLoaderDeployer.java	2008-11-11 16:49:48 UTC (rev 80814)
+++ trunk/connector/src/main/org/jboss/resource/deployers/ManagedConnectionFactoryClassLoaderDeployer.java	2008-11-11 17:19:17 UTC (rev 80815)
@@ -21,14 +21,7 @@
 */
 package org.jboss.resource.deployers;
 
-import java.io.ByteArrayInputStream;
-import java.util.Properties;
-
-import javax.management.ObjectName;
-
 import org.jboss.classloading.spi.metadata.ClassLoadingMetaData;
-import org.jboss.classloading.spi.metadata.ExportAll;
-import org.jboss.classloading.spi.version.Version;
 import org.jboss.deployers.spi.DeploymentException;
 import org.jboss.deployers.spi.deployer.DeploymentStages;
 import org.jboss.deployers.spi.deployer.helpers.AbstractSimpleRealDeployer;

Modified: trunk/connector/src/main/org/jboss/resource/deployers/ManagedConnectionFactoryParserDeployer.java
===================================================================
--- trunk/connector/src/main/org/jboss/resource/deployers/ManagedConnectionFactoryParserDeployer.java	2008-11-11 16:49:48 UTC (rev 80814)
+++ trunk/connector/src/main/org/jboss/resource/deployers/ManagedConnectionFactoryParserDeployer.java	2008-11-11 17:19:17 UTC (rev 80815)
@@ -30,14 +30,11 @@
 import javax.xml.bind.Unmarshaller;
 import javax.xml.transform.stream.StreamSource;
 
-import org.jboss.deployers.vfs.spi.deployer.AbstractVFSParsingDeployer;
-import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
 import org.jboss.deployers.spi.DeploymentException;
 import org.jboss.deployers.spi.deployer.managed.ManagedObjectCreator;
 import org.jboss.deployers.structure.spi.DeploymentUnit;
-import org.jboss.resource.metadata.mcf.ManagedConnectionFactoryDeploymentGroup;
-import org.jboss.resource.metadata.repository.JCAMetaDataRepository;
-import org.jboss.virtual.VirtualFile;
+import org.jboss.deployers.vfs.spi.deployer.AbstractVFSParsingDeployer;
+import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit;
 import org.jboss.managed.api.ManagedObject;
 import org.jboss.managed.api.ManagedProperty;
 import org.jboss.managed.plugins.factory.AbstractManagedObjectFactory;
@@ -46,6 +43,9 @@
 import org.jboss.metatype.api.values.CollectionValue;
 import org.jboss.metatype.api.values.GenericValue;
 import org.jboss.metatype.api.values.MetaValue;
+import org.jboss.resource.metadata.mcf.ManagedConnectionFactoryDeploymentGroup;
+import org.jboss.resource.metadata.repository.JCAMetaDataRepository;
+import org.jboss.virtual.VirtualFile;
 
 /**
  * A ManagedConnectionFactoryParserDeployer.
@@ -98,7 +98,7 @@
    
    public void create() throws Exception
    {
-      Class[] classes = {super.getOutput()};
+      Class<?>[] classes = {super.getOutput()};
       context = JAXBContext.newInstance(classes);      
    }
    

Modified: trunk/connector/src/main/org/jboss/resource/deployers/RARDeployment.java
===================================================================
--- trunk/connector/src/main/org/jboss/resource/deployers/RARDeployment.java	2008-11-11 16:49:48 UTC (rev 80814)
+++ trunk/connector/src/main/org/jboss/resource/deployers/RARDeployment.java	2008-11-11 17:19:17 UTC (rev 80815)
@@ -23,7 +23,6 @@
 
 import java.net.URL;
 import java.util.Collection;
-import java.util.Iterator;
 import java.util.Timer;
 
 import javax.management.Attribute;
@@ -48,10 +47,10 @@
 import org.jboss.resource.deployment.ResourceAdapterFactory;
 import org.jboss.resource.metadata.ConfigPropertyMetaData;
 import org.jboss.resource.metadata.ConnectorMetaData;
+import org.jboss.resource.metadata.DescriptionGroupMetaData;
 import org.jboss.resource.metadata.JBossRAMetaData;
+import org.jboss.resource.metadata.MessageListenerMetaData;
 import org.jboss.resource.metadata.RARDeploymentMetaData;
-import org.jboss.resource.metadata.DescriptionGroupMetaData;
-import org.jboss.resource.metadata.MessageListenerMetaData;
 import org.jboss.system.ServiceDynamicMBeanSupport;
 
 /**
@@ -83,7 +82,7 @@
    /**
     * Create a new RAR deployment
     * 
-    * @param cmd the metadata
+    * @param rdmd the metadata
     */
    public RARDeployment(RARDeploymentMetaData rdmd)
    {
@@ -169,7 +168,7 @@
 
    protected MBeanAttributeInfo[] getInternalAttributeInfo()
    {
-      Collection properties = cmd.getProperties();
+      Collection<ConfigPropertyMetaData> properties = cmd.getProperties();
       MBeanAttributeInfo[] attrs = new MBeanAttributeInfo[13+properties.size()];
       attrs[0] = new MBeanAttributeInfo("MetaData", ConnectorMetaData.class.getName(), "The meta data", true, false, false);
       attrs[1] = new MBeanAttributeInfo("AuthenticationMechanism", String.class.getName(), "The authentication mechanism", true, false, false);
@@ -185,9 +184,8 @@
       attrs[11] = new MBeanAttributeInfo("WorkManager", WorkManager.class.getName(), "The work manager", true, true, false);
       attrs[12] = new MBeanAttributeInfo("XATerminator", XATerminator.class.getName(), "The xa terminator", true, true, false);
       int n = 13;
-      for (Iterator i = properties.iterator(); i.hasNext();)
+      for (ConfigPropertyMetaData cpmd : properties)
       {
-         ConfigPropertyMetaData cpmd = (ConfigPropertyMetaData) i.next();
          attrs[n++] = new MBeanAttributeInfo(cpmd.getName(), cpmd.getType(), cpmd.getDescription().getDescription(), true, false, false);
       }
       return attrs;
@@ -265,6 +263,7 @@
       return ops;
    }
    
+   @SuppressWarnings("unchecked")
    protected Object internalInvoke(String actionName, Object[] params, String[] signature) throws MBeanException,
          ReflectionException
    {
@@ -297,6 +296,7 @@
       return super.internalInvoke(actionName, params, signature);
    }
 
+   @SuppressWarnings("unchecked")
    protected ActivationSpec createActivationSpec(Class messagingType, Collection activationConfig) throws MBeanException
    {
       boolean trace = log.isTraceEnabled();