[jboss-cvs] JBossAS SVN: r85363 - in projects/jboss-deployers/trunk/deployers-jmx/src: test/java/org/jboss/test and 1 other directories.

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

Author: adrian at jboss.org
Date: 2009-03-05 16:45:18 -0500 (Thu, 05 Mar 2009)
New Revision: 85363

Modified:
   projects/jboss-deployers/trunk/deployers-jmx/src/main/java/org/jboss/system/deployers/managed/ManagementObjectClass.java
   projects/jboss-deployers/trunk/deployers-jmx/src/main/java/org/jboss/system/deployers/managed/ServiceMetaDataICF.java
   projects/jboss-deployers/trunk/deployers-jmx/src/test/java/org/jboss/test/AbstractSystemTest.java
   projects/jboss-deployers/trunk/deployers-jmx/src/test/java/org/jboss/test/system/deployers/test/ServiceUnitNameTestCase.java
Log:
Source code tidyup

Modified: projects/jboss-deployers/trunk/deployers-jmx/src/main/java/org/jboss/system/deployers/managed/ManagementObjectClass.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-jmx/src/main/java/org/jboss/system/deployers/managed/ManagementObjectClass.java	2009-03-05 21:43:16 UTC (rev 85362)
+++ projects/jboss-deployers/trunk/deployers-jmx/src/main/java/org/jboss/system/deployers/managed/ManagementObjectClass.java	2009-03-05 21:45:18 UTC (rev 85363)
@@ -21,6 +21,7 @@
  */
 package org.jboss.system.deployers.managed;
 
+import java.io.Serializable;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
@@ -30,7 +31,7 @@
  * ManagementObjectClass annotation for describing the actual class
  * annotated with org.jboss.managed.api.annotation.ManagementObject.
  * 
- * @see {@linkplain org.jboss.managed.api.annotation.ManagementObject}
+ * @see org.jboss.managed.api.annotation.ManagementObject
  * 
  * @author <a href="dimitris at jboss.org">Dimitris Andreadis</a>
  * @version $Revision$
@@ -40,5 +41,5 @@
 public @interface ManagementObjectClass
 {
    /** The class annotated with ManagementObject */
-   Class code();
+   Class<? extends Serializable> code();
 }
\ No newline at end of file

Modified: projects/jboss-deployers/trunk/deployers-jmx/src/main/java/org/jboss/system/deployers/managed/ServiceMetaDataICF.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-jmx/src/main/java/org/jboss/system/deployers/managed/ServiceMetaDataICF.java	2009-03-05 21:43:16 UTC (rev 85362)
+++ projects/jboss-deployers/trunk/deployers-jmx/src/main/java/org/jboss/system/deployers/managed/ServiceMetaDataICF.java	2009-03-05 21:45:18 UTC (rev 85363)
@@ -77,6 +77,7 @@
       return ServiceMetaData.class;
    }
 
+   @SuppressWarnings("unchecked")
    public Class<? extends Serializable> getManagedObjectClass(ServiceMetaData md)
       throws ClassNotFoundException
    {

Modified: projects/jboss-deployers/trunk/deployers-jmx/src/test/java/org/jboss/test/AbstractSystemTest.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-jmx/src/test/java/org/jboss/test/AbstractSystemTest.java	2009-03-05 21:43:16 UTC (rev 85362)
+++ projects/jboss-deployers/trunk/deployers-jmx/src/test/java/org/jboss/test/AbstractSystemTest.java	2009-03-05 21:45:18 UTC (rev 85363)
@@ -87,7 +87,7 @@
     * @return the delegate
     * @throws Exception for any error
     */
-   public static AbstractTestDelegate getDelegate(Class clazz) throws Exception
+   public static AbstractTestDelegate getDelegate(Class<?> clazz) throws Exception
    {
       AbstractTestDelegate delegate = new AbstractTestDelegate(clazz);
       delegate.enableSecurity = true;

Modified: projects/jboss-deployers/trunk/deployers-jmx/src/test/java/org/jboss/test/system/deployers/test/ServiceUnitNameTestCase.java
===================================================================
--- projects/jboss-deployers/trunk/deployers-jmx/src/test/java/org/jboss/test/system/deployers/test/ServiceUnitNameTestCase.java	2009-03-05 21:43:16 UTC (rev 85362)
+++ projects/jboss-deployers/trunk/deployers-jmx/src/test/java/org/jboss/test/system/deployers/test/ServiceUnitNameTestCase.java	2009-03-05 21:45:18 UTC (rev 85363)
@@ -195,9 +195,8 @@
       System.setProperty(ServerConstants.MBEAN_SERVER_BUILDER_CLASS_PROPERTY, builder);
 
       ClassLoader cl = Thread.currentThread().getContextClassLoader();
-      Class clazz = cl.loadClass("java.lang.management.ManagementFactory");
-      Class[] sig = null;
-      Method method = clazz.getMethod("getPlatformMBeanServer", sig);
+      Class<?> clazz = cl.loadClass("java.lang.management.ManagementFactory");
+      Method method = clazz.getMethod("getPlatformMBeanServer");
       Object[] args = null;
       server = (MBeanServer)method.invoke(null, args);
       // Tell the MBeanServerLocator to point to this mbeanServer