[jboss-cvs] JBossAS SVN: r61797 - in projects/microcontainer/trunk: aop-mc-int/src/main/org/jboss/aop/microcontainer/aspects/jmx and 23 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Mar 28 13:35:24 EDT 2007
Author: adrian at jboss.org
Date: 2007-03-28 13:35:23 -0400 (Wed, 28 Mar 2007)
New Revision: 61797
Modified:
projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/aspects/AbstractIntroduction.java
projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/aspects/jmx/JMXIntroduction.java
projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/aspects/jndi/JndiBinding.java
projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/aspects/jndi/JndiLifecycleCallback.java
projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/aspects/util/ProxyUtils.java
projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/AbstractBinding.java
projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/AspectBeanMetaDataUtil.java
projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/junit/AbstractProxyTest.java
projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/matrix/proxyfactory/test/BaseForceProxyChildAdvisedAndProxyTestCase.java
projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/support/LifecycleCallback.java
projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/support/deployers/AspectManagerBean.java
projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/support/deployers/JMXKernel.java
projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/support/deployers/MainDeployerAspects.java
projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/support/jndi/MockJndiProvider.java
projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/CreatedBeansLifecycleCallbackWithDependencyTestCase.java
projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/DeployersInterceptedAspectManagerJMXTestCase.java
projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/InitialLifecycleCallbackWithDependencyTestCase.java
projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/InterceptorWithOverriddenClassAnnotationDependencyTestCase.java
projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/JMXDecoratedTestCase.java
projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/MetaDataTestCase.java
projects/microcontainer/trunk/container/src/main/org/jboss/beans/info/plugins/AbstractBeanInfo.java
projects/microcontainer/trunk/container/src/main/org/jboss/beans/info/spi/BeanInfo.java
projects/microcontainer/trunk/container/src/main/org/jboss/classadapter/plugins/BasicClassAdapter.java
projects/microcontainer/trunk/deployers/src/main/org/jboss/deployers/plugins/advice/TrackingAdvice.java
projects/microcontainer/trunk/deployers/src/main/org/jboss/deployers/plugins/deployers/helpers/JAXPDeployer.java
projects/microcontainer/trunk/deployers/src/main/org/jboss/deployers/spi/deployment/MainDeployer.java
projects/microcontainer/trunk/deployers/src/tests/org/jboss/test/deployers/attachments/test/AttachmentsTest.java
projects/microcontainer/trunk/deployers/src/tests/org/jboss/test/deployers/structure/main/test/StructureMetaDataUnitTestCase.java
projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/policy/MetaDataRepositoryInstaller.java
projects/microcontainer/trunk/managed/src/main/org/jboss/managed/plugins/ManagedPropertyImpl.java
projects/microcontainer/trunk/managed/src/main/org/jboss/managed/plugins/advice/WrapperAdvice.java
projects/microcontainer/trunk/managed/src/tests/org/jboss/test/managed/mock/MockTest.java
projects/microcontainer/trunk/spring-int/src/main/org/jboss/spring/deployment/xml/SpringBeanHandler.java
projects/microcontainer/trunk/spring-int/src/main/org/jboss/spring/metadata/AbstractConstructorArg.java
projects/microcontainer/trunk/spring-int/src/main/org/jboss/spring/metadata/AbstractSpringDeployment.java
Log:
Source code and javadoc tidyup
Modified: projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/aspects/AbstractIntroduction.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/aspects/AbstractIntroduction.java 2007-03-28 17:01:23 UTC (rev 61796)
+++ projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/aspects/AbstractIntroduction.java 2007-03-28 17:35:23 UTC (rev 61797)
@@ -31,6 +31,7 @@
/**
* Abstract helper class for [Aspect]Introduction.
*
+ * @param <T> the annotation type
* @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
*/
public abstract class AbstractIntroduction<T extends Annotation> implements Interceptor
Modified: projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/aspects/jmx/JMXIntroduction.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/aspects/jmx/JMXIntroduction.java 2007-03-28 17:01:23 UTC (rev 61796)
+++ projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/aspects/jmx/JMXIntroduction.java 2007-03-28 17:35:23 UTC (rev 61797)
@@ -22,7 +22,6 @@
package org.jboss.aop.microcontainer.aspects.jmx;
import javax.management.MBeanServer;
-import javax.management.NotCompliantMBeanException;
import javax.management.ObjectName;
import javax.management.StandardMBean;
Modified: projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/aspects/jndi/JndiBinding.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/aspects/jndi/JndiBinding.java 2007-03-28 17:01:23 UTC (rev 61796)
+++ projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/aspects/jndi/JndiBinding.java 2007-03-28 17:35:23 UTC (rev 61797)
@@ -37,14 +37,18 @@
@Target({ElementType.TYPE,ElementType.FIELD})
public @interface JndiBinding
{
+
/**
* the name under which the binding will be located
- * @return
+ *
+ * @return the name
*/
String name() ;
+
/**
* Optional additional aliases to also bind
- * @return
+ *
+ * @return the aliases
*/
String[] aliases() default {};
}
Modified: projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/aspects/jndi/JndiLifecycleCallback.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/aspects/jndi/JndiLifecycleCallback.java 2007-03-28 17:01:23 UTC (rev 61796)
+++ projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/aspects/jndi/JndiLifecycleCallback.java 2007-03-28 17:35:23 UTC (rev 61797)
@@ -23,13 +23,10 @@
import java.util.Properties;
-import javax.management.ObjectName;
-import javax.management.StandardMBean;
import javax.naming.InitialContext;
import org.jboss.aop.joinpoint.Invocation;
import org.jboss.aop.joinpoint.MethodInvocation;
-import org.jboss.aop.microcontainer.aspects.jmx.JMX;
import org.jboss.kernel.spi.dependency.KernelControllerContext;
import org.jboss.logging.Logger;
import org.jboss.util.naming.Util;
@@ -70,6 +67,10 @@
/**
* Bind the target on setKernelControllerContext, unbind on any other method provided that
* the invocation has a JndiBinding annotation.
+ *
+ * @param invocation the invocation
+ * @return the result
+ * @throws Throwable for any error
*/
public Object invoke(Invocation invocation) throws Throwable
{
Modified: projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/aspects/util/ProxyUtils.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/aspects/util/ProxyUtils.java 2007-03-28 17:01:23 UTC (rev 61796)
+++ projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/aspects/util/ProxyUtils.java 2007-03-28 17:35:23 UTC (rev 61797)
@@ -22,7 +22,6 @@
package org.jboss.aop.microcontainer.aspects.util;
import org.jboss.aop.proxy.container.GeneratedAOPProxyFactory;
-import org.jboss.logging.Logger;
/**
* AOP proxy utils.
@@ -32,8 +31,6 @@
*/
public class ProxyUtils
{
- private static Logger log = Logger.getLogger(ProxyUtils.class);
-
/**
* Create a proxy
*
@@ -46,5 +43,4 @@
{
return GeneratedAOPProxyFactory.createProxy(target, interfaceClass);
}
-
}
Modified: projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/AbstractBinding.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/AbstractBinding.java 2007-03-28 17:01:23 UTC (rev 61796)
+++ projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/AbstractBinding.java 2007-03-28 17:35:23 UTC (rev 61797)
@@ -23,7 +23,6 @@
import org.jboss.aop.AspectManager;
import org.jboss.aop.advice.AspectDefinition;
-import org.jboss.logging.Logger;
import org.jboss.util.id.GUID;
/**
@@ -33,8 +32,6 @@
*/
public abstract class AbstractBinding
{
- private static final Logger log = Logger.getLogger(AbstractBinding.class);
-
protected AspectManager manager;
protected String name = GUID.asString();
Modified: projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/AspectBeanMetaDataUtil.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/AspectBeanMetaDataUtil.java 2007-03-28 17:01:23 UTC (rev 61796)
+++ projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/beans/AspectBeanMetaDataUtil.java 2007-03-28 17:35:23 UTC (rev 61797)
@@ -25,8 +25,6 @@
import org.jboss.beans.metadata.plugins.AbstractBeanMetaData;
import org.jboss.beans.metadata.plugins.AbstractDependencyValueMetaData;
import org.jboss.beans.metadata.plugins.AbstractPropertyMetaData;
-import org.jboss.beans.metadata.plugins.factory.GenericBeanFactoryMetaData;
-import org.jboss.beans.metadata.spi.BeanMetaDataFactory;
/**
*
Modified: projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/junit/AbstractProxyTest.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/junit/AbstractProxyTest.java 2007-03-28 17:01:23 UTC (rev 61796)
+++ projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/junit/AbstractProxyTest.java 2007-03-28 17:35:23 UTC (rev 61797)
@@ -219,7 +219,7 @@
*
* @param target the target
* @param interfaces the interfaces
- * @param metadata the metadata
+ * @param metaData the metadata
* @return the proxy
* @throws Exception for any error
*/
@@ -238,7 +238,7 @@
*
* @param target the target
* @param interfaces the interfaces
- * @param metadata the metadata
+ * @param metaData the metadata
* @param expected the expected class
* @return the proxy
* @throws Exception for any error
@@ -286,6 +286,7 @@
/**
* Create a proxy
*
+ * @param interfaces the interfaces
* @param mixins the mixins
* @param metaData the metadata
* @return the proxy
@@ -304,7 +305,7 @@
* Create a proxy
*
* @param interfaces the interfaces
- * @param metadata the metadata
+ * @param metaData the metadata
* @param expected the expected class
* @return the proxy
* @throws Exception for any error
@@ -320,8 +321,8 @@
/**
* Create a proxy
*
- * @param interfaces the interfaces
- * @param metadata the metadata
+ * @param mixins the mixins
+ * @param metaData the metadata
* @param expected the expected class
* @return the proxy
* @throws Exception for any error
@@ -337,9 +338,9 @@
/**
* Create a proxy
*
- * @param target the target
* @param interfaces the interfaces
* @param mixins the mixins
+ * @param metaData the meta data
* @param expected the expected class
* @return the proxy
* @throws Exception for any error
Modified: projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/matrix/proxyfactory/test/BaseForceProxyChildAdvisedAndProxyTestCase.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/matrix/proxyfactory/test/BaseForceProxyChildAdvisedAndProxyTestCase.java 2007-03-28 17:01:23 UTC (rev 61796)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/matrix/proxyfactory/test/BaseForceProxyChildAdvisedAndProxyTestCase.java 2007-03-28 17:35:23 UTC (rev 61797)
@@ -25,7 +25,6 @@
import junit.framework.Test;
import org.jboss.aop.Advised;
-import org.jboss.aop.AspectManager;
import org.jboss.aop.microcontainer.junit.AbstractProxyTest;
import org.jboss.aop.proxy.container.AspectManaged;
import org.jboss.test.microcontainer.matrix.Base;
Modified: projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/support/LifecycleCallback.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/support/LifecycleCallback.java 2007-03-28 17:01:23 UTC (rev 61796)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/support/LifecycleCallback.java 2007-03-28 17:35:23 UTC (rev 61797)
@@ -52,6 +52,7 @@
handle(context);
}
+ @SuppressWarnings("unchecked")
private void handle(KernelControllerContext context)
{
for (int i = 0 ; i < lifecycleAnnotations.length ; i++)
Modified: projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/support/deployers/AspectManagerBean.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/support/deployers/AspectManagerBean.java 2007-03-28 17:01:23 UTC (rev 61796)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/support/deployers/AspectManagerBean.java 2007-03-28 17:35:23 UTC (rev 61797)
@@ -89,10 +89,6 @@
return AspectManager.getTopLevelAspectManager();
}
- /**
- * @throws Exception
- * @see org.jboss.system.ServiceMBeanSupport#start()
- */
public void start() throws Exception
{
try
@@ -105,10 +101,6 @@
}
}
- /**
- *
- * @see org.jboss.system.ServiceMBeanSupport#destroy()
- */
public void destroy()
{
if (this.server == null)
Modified: projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/support/deployers/JMXKernel.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/support/deployers/JMXKernel.java 2007-03-28 17:01:23 UTC (rev 61796)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/support/deployers/JMXKernel.java 2007-03-28 17:35:23 UTC (rev 61797)
@@ -46,8 +46,8 @@
{
try
{
- mbeanServer = (MBeanServer)AccessController.doPrivileged(new PrivilegedExceptionAction() {
- public Object run() throws Exception
+ mbeanServer = AccessController.doPrivileged(new PrivilegedExceptionAction<MBeanServer>() {
+ public MBeanServer run() throws Exception
{
return MBeanServerFactory.createMBeanServer();
}
Modified: projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/support/deployers/MainDeployerAspects.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/support/deployers/MainDeployerAspects.java 2007-03-28 17:01:23 UTC (rev 61796)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/support/deployers/MainDeployerAspects.java 2007-03-28 17:35:23 UTC (rev 61797)
@@ -64,7 +64,6 @@
throws Throwable
{
Object target = invocation.getTargetObject();
- Object[] args = invocation.getArguments();
log.debug("process, target="+target);
processCalled = true;
return invocation.invokeNext();
Modified: projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/support/jndi/MockJndiProvider.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/support/jndi/MockJndiProvider.java 2007-03-28 17:01:23 UTC (rev 61796)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/support/jndi/MockJndiProvider.java 2007-03-28 17:35:23 UTC (rev 61797)
@@ -23,7 +23,6 @@
import java.io.IOException;
import java.rmi.MarshalledObject;
-import java.util.HashMap;
import java.util.Hashtable;
import java.util.concurrent.ConcurrentHashMap;
@@ -41,7 +40,7 @@
*/
public class MockJndiProvider implements Context
{
- private static ConcurrentHashMap bindings = new ConcurrentHashMap();
+ private static ConcurrentHashMap<Object, Object> bindings = new ConcurrentHashMap<Object, Object>();
private Hashtable<?, ?> env;
MockJndiProvider(Hashtable<?, ?> env)
Modified: projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/CreatedBeansLifecycleCallbackWithDependencyTestCase.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/CreatedBeansLifecycleCallbackWithDependencyTestCase.java 2007-03-28 17:01:23 UTC (rev 61796)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/CreatedBeansLifecycleCallbackWithDependencyTestCase.java 2007-03-28 17:35:23 UTC (rev 61797)
@@ -53,7 +53,7 @@
deploy("CreatedBeansLifecycleCallbackWithDependencyTestCaseNotAutomatic0.xml");
try
{
- Object dependency = (Object) getCheckBeanExists("Dependency");
+ Object dependency = getCheckBeanExists("Dependency");
assertNotNull(dependency);
boolean itworked = false;
Modified: projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/DeployersInterceptedAspectManagerJMXTestCase.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/DeployersInterceptedAspectManagerJMXTestCase.java 2007-03-28 17:01:23 UTC (rev 61796)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/DeployersInterceptedAspectManagerJMXTestCase.java 2007-03-28 17:35:23 UTC (rev 61797)
@@ -23,12 +23,9 @@
import java.util.HashSet;
-import javax.management.MBeanServer;
-
import junit.framework.Test;
import org.jboss.aop.microcontainer.junit.AOPMicrocontainerTest;
-import org.jboss.test.microcontainer.support.deployers.AspectManagerBean;
import org.jboss.test.microcontainer.support.deployers.DeployerAspects;
import org.jboss.test.microcontainer.support.deployers.IMainDeployer;
import org.jboss.test.microcontainer.support.deployers.SampleDeployer;
Modified: projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/InitialLifecycleCallbackWithDependencyTestCase.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/InitialLifecycleCallbackWithDependencyTestCase.java 2007-03-28 17:01:23 UTC (rev 61796)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/InitialLifecycleCallbackWithDependencyTestCase.java 2007-03-28 17:35:23 UTC (rev 61797)
@@ -51,7 +51,7 @@
deploy("InitialLifecycleCallbackWithDependencyTestCaseNotAutomatic0.xml");
try
{
- Object dependency = (Object) getCheckBeanExists("Dependency");
+ Object dependency = getCheckBeanExists("Dependency");
assertNotNull(dependency);
boolean itworked = false;
Modified: projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/InterceptorWithOverriddenClassAnnotationDependencyTestCase.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/InterceptorWithOverriddenClassAnnotationDependencyTestCase.java 2007-03-28 17:01:23 UTC (rev 61796)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/InterceptorWithOverriddenClassAnnotationDependencyTestCase.java 2007-03-28 17:35:23 UTC (rev 61797)
@@ -207,10 +207,9 @@
private void checkNotInstalledAndNotDescribed(String name)
{
- SimpleBean bean;
try
{
- bean = (SimpleBean) getBean(name);
+ getBean(name);
fail("'" + name + "' should not be installed yet");
}
catch (IllegalStateException expected)
@@ -219,12 +218,11 @@
try
{
- bean = (SimpleBean) getBean(name, ControllerState.DESCRIBED);
+ getBean(name, ControllerState.DESCRIBED);
fail("'" + name + "' should not be described");
}
catch(IllegalStateException expected)
{
-
}
}
Modified: projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/JMXDecoratedTestCase.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/JMXDecoratedTestCase.java 2007-03-28 17:01:23 UTC (rev 61796)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/JMXDecoratedTestCase.java 2007-03-28 17:35:23 UTC (rev 61797)
@@ -82,6 +82,8 @@
/**
* Test that the two beans indeed have different metadata values
+ *
+ * @throws Exception for any error
*/
public void testJMXMetaData() throws Exception
{
Modified: projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/MetaDataTestCase.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/MetaDataTestCase.java 2007-03-28 17:01:23 UTC (rev 61796)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/MetaDataTestCase.java 2007-03-28 17:35:23 UTC (rev 61797)
@@ -46,6 +46,8 @@
/**
* Test that the two beans indeed have different metadata values
+ *
+ * @throws Exception for any error
*/
public void testBeanMetaData() throws Exception
{
@@ -64,6 +66,8 @@
/**
* Test that the two beans indeed have different metadata values
+ *
+ * @throws Exception for any error
*/
public void testPropertyMetaData() throws Exception
{
@@ -83,6 +87,8 @@
/**
* Test that the two beans indeed have different metadata values
+ *
+ * @throws Exception for any error
*/
public void testNoMetaData() throws Exception
{
Modified: projects/microcontainer/trunk/container/src/main/org/jboss/beans/info/plugins/AbstractBeanInfo.java
===================================================================
--- projects/microcontainer/trunk/container/src/main/org/jboss/beans/info/plugins/AbstractBeanInfo.java 2007-03-28 17:01:23 UTC (rev 61796)
+++ projects/microcontainer/trunk/container/src/main/org/jboss/beans/info/plugins/AbstractBeanInfo.java 2007-03-28 17:35:23 UTC (rev 61797)
@@ -33,7 +33,6 @@
import org.jboss.beans.info.spi.EventInfo;
import org.jboss.beans.info.spi.PropertyInfo;
import org.jboss.classadapter.spi.ClassAdapter;
-import org.jboss.classadapter.spi.DependencyBuilderListItem;
import org.jboss.joinpoint.plugins.Config;
import org.jboss.joinpoint.spi.ConstructorJoinpoint;
import org.jboss.joinpoint.spi.JoinpointFactory;
Modified: projects/microcontainer/trunk/container/src/main/org/jboss/beans/info/spi/BeanInfo.java
===================================================================
--- projects/microcontainer/trunk/container/src/main/org/jboss/beans/info/spi/BeanInfo.java 2007-03-28 17:01:23 UTC (rev 61796)
+++ projects/microcontainer/trunk/container/src/main/org/jboss/beans/info/spi/BeanInfo.java 2007-03-28 17:35:23 UTC (rev 61797)
@@ -24,7 +24,6 @@
import java.util.List;
import java.util.Set;
-import org.jboss.classadapter.spi.DependencyBuilderListItem;
import org.jboss.joinpoint.spi.JoinpointFactory;
import org.jboss.metadata.spi.MetaData;
import org.jboss.reflect.spi.ClassInfo;
Modified: projects/microcontainer/trunk/container/src/main/org/jboss/classadapter/plugins/BasicClassAdapter.java
===================================================================
--- projects/microcontainer/trunk/container/src/main/org/jboss/classadapter/plugins/BasicClassAdapter.java 2007-03-28 17:01:23 UTC (rev 61796)
+++ projects/microcontainer/trunk/container/src/main/org/jboss/classadapter/plugins/BasicClassAdapter.java 2007-03-28 17:35:23 UTC (rev 61797)
@@ -26,7 +26,6 @@
import org.jboss.classadapter.spi.ClassAdapter;
import org.jboss.classadapter.spi.ClassAdapterFactory;
import org.jboss.classadapter.spi.DependencyBuilder;
-import org.jboss.classadapter.spi.DependencyBuilderListItem;
import org.jboss.joinpoint.spi.JoinpointFactory;
import org.jboss.joinpoint.spi.JoinpointFactoryBuilder;
import org.jboss.metadata.spi.MetaData;
Modified: projects/microcontainer/trunk/deployers/src/main/org/jboss/deployers/plugins/advice/TrackingAdvice.java
===================================================================
--- projects/microcontainer/trunk/deployers/src/main/org/jboss/deployers/plugins/advice/TrackingAdvice.java 2007-03-28 17:01:23 UTC (rev 61796)
+++ projects/microcontainer/trunk/deployers/src/main/org/jboss/deployers/plugins/advice/TrackingAdvice.java 2007-03-28 17:35:23 UTC (rev 61797)
@@ -29,7 +29,6 @@
import org.jboss.aop.joinpoint.MethodInvocation;
import org.jboss.aop.microcontainer.aspects.util.ProxyUtils;
import org.jboss.deployers.spi.attachments.Attachments;
-import org.jboss.logging.Logger;
/**
* An advice for capturing changes made to an Attachments.
@@ -39,7 +38,6 @@
*/
public class TrackingAdvice
{
- private static Logger log = Logger.getLogger(TrackingAdvice.class);
private static ConcurrentHashMap<Object, Map<String, Object>> attachmentsByTarget =
new ConcurrentHashMap<Object, Map<String, Object>>();
Modified: projects/microcontainer/trunk/deployers/src/main/org/jboss/deployers/plugins/deployers/helpers/JAXPDeployer.java
===================================================================
--- projects/microcontainer/trunk/deployers/src/main/org/jboss/deployers/plugins/deployers/helpers/JAXPDeployer.java 2007-03-28 17:01:23 UTC (rev 61796)
+++ projects/microcontainer/trunk/deployers/src/main/org/jboss/deployers/plugins/deployers/helpers/JAXPDeployer.java 2007-03-28 17:35:23 UTC (rev 61797)
@@ -37,7 +37,7 @@
* parse of the VirtualFile passed to parse.
*
*
- * @see #parse(DeploymentUnit, VirtualFile, T)
+ * @see #parse(DeploymentUnit, VirtualFile, Object)
* @see #doParse(DeploymentUnit, VirtualFile)
*
* @param <T> the expected type
Modified: projects/microcontainer/trunk/deployers/src/main/org/jboss/deployers/spi/deployment/MainDeployer.java
===================================================================
--- projects/microcontainer/trunk/deployers/src/main/org/jboss/deployers/spi/deployment/MainDeployer.java 2007-03-28 17:01:23 UTC (rev 61796)
+++ projects/microcontainer/trunk/deployers/src/main/org/jboss/deployers/spi/deployment/MainDeployer.java 2007-03-28 17:35:23 UTC (rev 61797)
@@ -126,9 +126,12 @@
*
*/
void process();
+
/**
* Process the outstanding deployments.
- * @param mode, the mode in which processing should be done.
+ *
+ * @param mode the mode in which processing should be done.
+ * @return the processed deployments
*/
Collection<DeploymentContext> process(ProcessMode mode);
Modified: projects/microcontainer/trunk/deployers/src/tests/org/jboss/test/deployers/attachments/test/AttachmentsTest.java
===================================================================
--- projects/microcontainer/trunk/deployers/src/tests/org/jboss/test/deployers/attachments/test/AttachmentsTest.java 2007-03-28 17:01:23 UTC (rev 61796)
+++ projects/microcontainer/trunk/deployers/src/tests/org/jboss/test/deployers/attachments/test/AttachmentsTest.java 2007-03-28 17:35:23 UTC (rev 61797)
@@ -27,7 +27,6 @@
import org.jboss.deployers.spi.attachments.Attachments;
import org.jboss.test.AbstractTestCaseWithSetup;
import org.jboss.test.AbstractTestDelegate;
-import org.jboss.test.BaseTestCase;
/**
* Attachments Test.
Modified: projects/microcontainer/trunk/deployers/src/tests/org/jboss/test/deployers/structure/main/test/StructureMetaDataUnitTestCase.java
===================================================================
--- projects/microcontainer/trunk/deployers/src/tests/org/jboss/test/deployers/structure/main/test/StructureMetaDataUnitTestCase.java 2007-03-28 17:01:23 UTC (rev 61796)
+++ projects/microcontainer/trunk/deployers/src/tests/org/jboss/test/deployers/structure/main/test/StructureMetaDataUnitTestCase.java 2007-03-28 17:35:23 UTC (rev 61797)
@@ -22,7 +22,6 @@
package org.jboss.test.deployers.structure.main.test;
import java.util.ArrayList;
-import java.util.Comparator;
import java.util.TreeSet;
import junit.framework.Test;
Modified: projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/policy/MetaDataRepositoryInstaller.java
===================================================================
--- projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/policy/MetaDataRepositoryInstaller.java 2007-03-28 17:01:23 UTC (rev 61796)
+++ projects/microcontainer/trunk/kernel/src/main/org/jboss/beans/metadata/plugins/policy/MetaDataRepositoryInstaller.java 2007-03-28 17:35:23 UTC (rev 61797)
@@ -44,6 +44,8 @@
{
private Kernel underlyingKernel;
private Set<Scope> scopes;
+
+ /* TODO What is this for, it is unreferenced? */
private Map<String, Object> bindings;
public void setKernel(Kernel kernel)
Modified: projects/microcontainer/trunk/managed/src/main/org/jboss/managed/plugins/ManagedPropertyImpl.java
===================================================================
--- projects/microcontainer/trunk/managed/src/main/org/jboss/managed/plugins/ManagedPropertyImpl.java 2007-03-28 17:01:23 UTC (rev 61796)
+++ projects/microcontainer/trunk/managed/src/main/org/jboss/managed/plugins/ManagedPropertyImpl.java 2007-03-28 17:35:23 UTC (rev 61797)
@@ -67,7 +67,7 @@
* Create a new ManagedProperty that is not associated to
* a ManagedObject.
*
- * @param fields the fields
+ * @param name the property name
* @throws IllegalArgumentException for null fields or
* missing Fields.NAME
*/
Modified: projects/microcontainer/trunk/managed/src/main/org/jboss/managed/plugins/advice/WrapperAdvice.java
===================================================================
--- projects/microcontainer/trunk/managed/src/main/org/jboss/managed/plugins/advice/WrapperAdvice.java 2007-03-28 17:01:23 UTC (rev 61796)
+++ projects/microcontainer/trunk/managed/src/main/org/jboss/managed/plugins/advice/WrapperAdvice.java 2007-03-28 17:35:23 UTC (rev 61797)
@@ -25,7 +25,6 @@
import org.jboss.aop.joinpoint.Invocation;
import org.jboss.aop.proxy.container.GeneratedAOPProxyFactory;
-import org.jboss.logging.Logger;
import org.jboss.managed.api.Fields;
import org.jboss.managed.api.ManagedObject;
import org.jboss.managed.api.ManagedProperty;
@@ -39,8 +38,6 @@
*/
public class WrapperAdvice
{
- private static Logger log = Logger.getLogger(WrapperAdvice.class);
-
/**
* Wrap a managed object
*
Modified: projects/microcontainer/trunk/managed/src/tests/org/jboss/test/managed/mock/MockTest.java
===================================================================
--- projects/microcontainer/trunk/managed/src/tests/org/jboss/test/managed/mock/MockTest.java 2007-03-28 17:01:23 UTC (rev 61796)
+++ projects/microcontainer/trunk/managed/src/tests/org/jboss/test/managed/mock/MockTest.java 2007-03-28 17:35:23 UTC (rev 61797)
@@ -141,9 +141,9 @@
ManagedProperty user2 = props2.get("user");
assertEquals("user", "Scott", user2.getValue());
ManagedProperty password2 = props2.get("password");
- assertEquals("password", "Tiger", password.getValue());
+ assertEquals("password", "Tiger", password2.getValue());
}
-
+
protected void configureLogging()
{
enableTrace("org.jboss.managed.plugins.advice");
Modified: projects/microcontainer/trunk/spring-int/src/main/org/jboss/spring/deployment/xml/SpringBeanHandler.java
===================================================================
--- projects/microcontainer/trunk/spring-int/src/main/org/jboss/spring/deployment/xml/SpringBeanHandler.java 2007-03-28 17:01:23 UTC (rev 61796)
+++ projects/microcontainer/trunk/spring-int/src/main/org/jboss/spring/deployment/xml/SpringBeanHandler.java 2007-03-28 17:35:23 UTC (rev 61797)
@@ -100,7 +100,6 @@
protected void orderParameters(List<ParameterMetaData> parameters)
{
ParameterMetaData[] pmds = new ParameterMetaData[parameters.size()];
- int i = 0;
for(ParameterMetaData pmd : parameters)
{
int index = pmd.getIndex();
Modified: projects/microcontainer/trunk/spring-int/src/main/org/jboss/spring/metadata/AbstractConstructorArg.java
===================================================================
--- projects/microcontainer/trunk/spring-int/src/main/org/jboss/spring/metadata/AbstractConstructorArg.java 2007-03-28 17:01:23 UTC (rev 61796)
+++ projects/microcontainer/trunk/spring-int/src/main/org/jboss/spring/metadata/AbstractConstructorArg.java 2007-03-28 17:35:23 UTC (rev 61797)
@@ -21,16 +21,15 @@
*/
package org.jboss.spring.metadata;
-import org.jboss.kernel.plugins.deployment.AbstractKernelDeployment;
-import org.jboss.beans.metadata.spi.LifecycleMetaData;
import org.jboss.beans.metadata.plugins.AbstractParameterMetaData;
-import org.jboss.dependency.spi.ControllerState;
/**
* @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
*/
public class AbstractConstructorArg extends AbstractParameterMetaData
{
+ /** The serialVersionUID */
+ private static final long serialVersionUID = -9018964033015040870L;
private boolean explicitIndex;
public void setIndex(int index)
Modified: projects/microcontainer/trunk/spring-int/src/main/org/jboss/spring/metadata/AbstractSpringDeployment.java
===================================================================
--- projects/microcontainer/trunk/spring-int/src/main/org/jboss/spring/metadata/AbstractSpringDeployment.java 2007-03-28 17:01:23 UTC (rev 61796)
+++ projects/microcontainer/trunk/spring-int/src/main/org/jboss/spring/metadata/AbstractSpringDeployment.java 2007-03-28 17:35:23 UTC (rev 61797)
@@ -30,6 +30,9 @@
*/
public class AbstractSpringDeployment extends AbstractKernelDeployment
{
+ /** The serialVersionUID */
+ private static final long serialVersionUID = 1470671009380840890L;
+
/* default init lifecycle method */
protected LifecycleMetaData create;
More information about the jboss-cvs-commits
mailing list