[jboss-cvs] JBossAS SVN: r63359 - in projects/microcontainer/trunk/aop-mc-int/src: tests/org/jboss/test/microcontainer/support and 1 other directories.

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

Author: kabir.khan at jboss.com
Date: 2007-06-05 13:50:00 -0400 (Tue, 05 Jun 2007)
New Revision: 63359

Modified:
   projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/integration/LifecycleAspectDependencyBuilderListItem.java
   projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/support/InterceptorWithAnnotationDependency.java
   projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/support/InterceptorWithNestedAnnotationDependency.java
   projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/LifecycleTestCase.java
   projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/UnwindLifeCycleTestCase.java
Log:
Get rid of warnings

Modified: projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/integration/LifecycleAspectDependencyBuilderListItem.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/integration/LifecycleAspectDependencyBuilderListItem.java	2007-06-05 17:46:28 UTC (rev 63358)
+++ projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/integration/LifecycleAspectDependencyBuilderListItem.java	2007-06-05 17:50:00 UTC (rev 63359)
@@ -21,11 +21,6 @@
 */ 
 package org.jboss.aop.microcontainer.integration;
 
-import java.util.ArrayList;
-import java.util.List;
-
-import org.jboss.beans.metadata.plugins.AbstractBeanMetaData;
-import org.jboss.beans.metadata.spi.BeanMetaData;
 import org.jboss.dependency.plugins.AbstractLifecycleCallbackItem;
 import org.jboss.dependency.spi.ControllerState;
 import org.jboss.dependency.spi.DependencyInfo;

Modified: projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/support/InterceptorWithAnnotationDependency.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/support/InterceptorWithAnnotationDependency.java	2007-06-05 17:46:28 UTC (rev 63358)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/support/InterceptorWithAnnotationDependency.java	2007-06-05 17:50:00 UTC (rev 63359)
@@ -41,7 +41,7 @@
    
    public void setController(Controller controller)
    {
-      this.controller = controller;
+      InterceptorWithAnnotationDependency.controller = controller;
    }
 
    public Object invoke(Invocation invocation) throws Throwable

Modified: projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/support/InterceptorWithNestedAnnotationDependency.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/support/InterceptorWithNestedAnnotationDependency.java	2007-06-05 17:46:28 UTC (rev 63358)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/support/InterceptorWithNestedAnnotationDependency.java	2007-06-05 17:50:00 UTC (rev 63359)
@@ -43,7 +43,7 @@
    
    public void setController(Controller controller)
    {
-      this.controller = controller;
+      InterceptorWithNestedAnnotationDependency.controller = controller;
    }
 
    public Object invoke(Invocation invocation) throws Throwable

Modified: projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/LifecycleTestCase.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/LifecycleTestCase.java	2007-06-05 17:46:28 UTC (rev 63358)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/LifecycleTestCase.java	2007-06-05 17:50:00 UTC (rev 63359)
@@ -26,7 +26,6 @@
 import junit.framework.Test;
 
 import org.jboss.aop.microcontainer.junit.AOPMicrocontainerTest;
-import org.jboss.dependency.spi.ControllerContext;
 import org.jboss.test.microcontainer.support.Configure;
 import org.jboss.test.microcontainer.support.Create;
 import org.jboss.test.microcontainer.support.Describe;

Modified: projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/UnwindLifeCycleTestCase.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/UnwindLifeCycleTestCase.java	2007-06-05 17:46:28 UTC (rev 63358)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/UnwindLifeCycleTestCase.java	2007-06-05 17:50:00 UTC (rev 63359)
@@ -4,8 +4,6 @@
 import junit.framework.Test;
 
 import org.jboss.aop.microcontainer.junit.AOPMicrocontainerTest;
-import org.jboss.dependency.spi.ControllerContext;
-import org.jboss.dependency.spi.ControllerState;
 import org.jboss.test.microcontainer.support.ErrorLifecycleCallback;
 import org.jboss.test.microcontainer.support.InstallUninstallLifecycleCallback;
 
@@ -39,7 +37,7 @@
       
       try
       {
-         Object o = getBean("Bean");
+         getBean("Bean");
       }
       catch (RuntimeException expected)
       {