[jboss-cvs] JBossAS SVN: r70090 - in projects/microcontainer/trunk/aop-mc-int/src: tests/org/jboss/test/aop/junit and 6 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Feb 26 06:49:47 EST 2008
Author: kabir.khan at jboss.com
Date: 2008-02-26 06:49:46 -0500 (Tue, 26 Feb 2008)
New Revision: 70090
Added:
projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/aop/junit/AOPMicrocontainerTest.java
projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/aop/junit/AOPMicrocontainerTestDelegate.java
projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/aop/junit/AbstractProxyTest.java
projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/aop/junit/AbstractProxyTestDelegate.java
projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/aop/junit/ScopingAOPMicrocontainerTestDelegate.java
Removed:
projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/junit/
Modified:
projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/aop/junit/MicrocontainerJunitSmokeTestCase.java
projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/advisor/test/MicrocontainerAdvisedAdvisorConstructorTestCase.java
projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/advisor/test/MicrocontainerAdvisedAdvisorOverloadedConstructorTestCase.java
projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/advisor/test/MicrocontainerAdvisedAdvisorTestCase.java
projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/advisor/test/MicrocontainerAdvisedAnnotationOverrideProxyAdvisorTestCase.java
projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/advisor/test/MicrocontainerAdvisedInstanceAdvisorTestCase.java
projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/advisor/test/MicrocontainerAdvisedIntroducedAdvisorTestCase.java
projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/advisor/test/MicrocontainerNotAdvisedIntroducedProxyAdvisorTestCase.java
projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/advisor/test/MicrocontainerNotAdvisedNoAdvisorTestCase.java
projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/advisor/test/MicrocontainerNotAdvisedProxyAdvisorConstructorTestCase.java
projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/advisor/test/MicrocontainerNotAdvisedProxyAdvisorOverloadedConstructorTestCase.java
projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/advisor/test/MicrocontainerNotAdvisedProxyAdvisorTestCase.java
projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/AnnotationOverrideTest.java
projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/AspectFactorySimpleTest.java
projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/AspectSimpleTest.java
projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/AspectWithDependencyTest.java
projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/CFlowTest.java
projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/ClassMetaDataBeansTestCase.java
projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/ClassMetaDataLoaderBeansTestCase.java
projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/DomainProxyTest.java
projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/DynamicCFlowTest.java
projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/InterceptorFactorySimpleTest.java
projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/InterceptorSimpleTest.java
projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/InterceptorWithDependencyTest.java
projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/IntroductionClassesTest.java
projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/IntroductionExprTest.java
projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/LightweightAspectTest.java
projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/MixinClassesTest.java
projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/MixinExprTest.java
projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/MultipleAdviceTest.java
projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/MultipleAdvicesWithMultipleDependencyTest.java
projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/MultipleAdvicesWithSingleDependencyTest.java
projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/MultipleStackTest.java
projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/NamedPointcutTest.java
projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/NonStandardNameAspectTest.java
projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/PrecedenceTest.java
projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/ScopedAspectTest.java
projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/StackTest.java
projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/StackWithMultipleDependencyTest.java
projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/StackWithSingleDependencyTest.java
projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/TypeDefTest.java
projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/woven/test/ArrayTest.java
projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/woven/test/PrepareTest.java
projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/matrix/mc/test/AdvisedInstanceMetaDataContextTestCase.java
projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/matrix/mc/test/AdvisedNoInstanceDataTestCase.java
projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/matrix/mc/test/BaseAdvisedChildAdvisedAndProxyTestCase.java
projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/matrix/mc/test/BaseAdvisedChildProxyTestCase.java
projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/matrix/mc/test/BaseNotAdvisedChildAdvisedAndProxyTestCase.java
projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/matrix/mc/test/BaseNotAdvisedChildNotAdvisedTestCase.java
projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/matrix/mc/test/BaseNotAdvisedChildProxyTestCase.java
projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/matrix/mc/test/BaseOnlyAdvisedChildAdvisedAndProxyTestCase.java
projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/matrix/mc/test/BaseOnlyAdvisedChildProxyTestCase.java
projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/matrix/mc/test/BaseOverriddenAdvisedChildAdvisedAndProxyTestCase.java
projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/matrix/mc/test/BaseOverriddenAdvisedChildProxyTestCase.java
projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/matrix/mc/test/BasePreparedChildAdvisedAndProxyTestCase.java
projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/matrix/mc/test/NotAdvisedInstanceMetaDataContextTestCase.java
projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/matrix/mc/test/NotAdvisedNoInstanceDataTestCase.java
projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/matrix/proxyfactory/test/AdvisedInstanceIntroductionsTestCase.java
projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/matrix/proxyfactory/test/AdvisedInstanceMixinTestCase.java
projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/matrix/proxyfactory/test/AdvisedInstanceSimpleMetaDataTestCase.java
projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/matrix/proxyfactory/test/AdvisedNoInstanceDataTestCase.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/matrix/proxyfactory/test/NotAdvisedInstanceIntroductionsTestCase.java
projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/matrix/proxyfactory/test/NotAdvisedInstanceSimpleMetaDataTestCase.java
projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/matrix/proxyfactory/test/NotAdvisedNoInstanceDataTestCase.java
projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/BeanCallingMethodInCtorTestCase.java
projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/BeanNoDefaultCtorUsingParamTestCase.java
projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/ConstructorInterceptorWithDependencyTestCase.java
projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/CreatedBeansLifecycleCallbackTestCase.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/DeployersInterceptedTestCase.java
projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/InitialLifecycleCallbackTestCase.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/InterceptedTestCase.java
projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/InterceptorWithAnnotationDependencyTestCase.java
projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/InterceptorWithDependencyTestCase.java
projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/InterceptorWithNestedAnnotationDependencyTestCase.java
projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/InterceptorWithNestedMethodAnnotationDependencyTestCase.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/InterceptorWithOverriddenMethodAnnotationDependencyBaseTest.java
projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/IntroductionDependencyTestCase.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/JMXLifecycleTestCase.java
projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/JndiDecoratedTestCase.java
projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/JndiLifeCycleTestCase.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/MetaDataTestCase.java
projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/MixinTestCase.java
projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/MultipleLifecycleTestCase.java
projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/NonDefaultMethodsLifecycleCallbackTestCase.java
projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/ScopingAopTestCase.java
projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/SimpleAspectTestCase.java
projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/UnwindLifeCycleTestCase.java
Log:
Move the test base classes and delegates from src/main to src/tests, to help with the maven build
Copied: projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/aop/junit/AOPMicrocontainerTest.java (from rev 70082, projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/junit/AOPMicrocontainerTest.java)
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/aop/junit/AOPMicrocontainerTest.java (rev 0)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/aop/junit/AOPMicrocontainerTest.java 2008-02-26 11:49:46 UTC (rev 70090)
@@ -0,0 +1,63 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2005, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.jboss.test.aop.junit;
+
+import org.jboss.test.AbstractTestDelegate;
+import org.jboss.test.kernel.junit.MicrocontainerTest;
+
+/**
+ * An AOPMicrocontainerTest.
+ *
+ * @author <a href="adrian at jboss.com">Adrian Brock</a>
+ * @version $Revision$
+ */
+public class AOPMicrocontainerTest extends MicrocontainerTest
+{
+ /**
+ * Get the test delegate
+ *
+ * @param clazz the test class
+ * @return the delegate
+ * @throws Exception for any error
+ */
+ public static AbstractTestDelegate getDelegate(Class<?> clazz) throws Exception
+ {
+ String property = System.getProperty("jboss.mc.secure", "false");
+ boolean enableSecurity = Boolean.valueOf(property).booleanValue();
+ property = System.getProperty("jboss.mc.jaxb", "false");
+ boolean useJaxbDeployer = Boolean.valueOf(property).booleanValue();
+ AOPMicrocontainerTestDelegate delegate = new AOPMicrocontainerTestDelegate(clazz);
+ delegate.enableSecurity = enableSecurity;
+ delegate.useJaxbDeployer = useJaxbDeployer;
+ return delegate;
+ }
+
+ /**
+ * Create a new AOPMicrocontainer test
+ *
+ * @param name the test name
+ */
+ public AOPMicrocontainerTest(String name)
+ {
+ super(name);
+ }
+}
Copied: projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/aop/junit/AOPMicrocontainerTestDelegate.java (from rev 70082, projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/junit/AOPMicrocontainerTestDelegate.java)
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/aop/junit/AOPMicrocontainerTestDelegate.java (rev 0)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/aop/junit/AOPMicrocontainerTestDelegate.java 2008-02-26 11:49:46 UTC (rev 70090)
@@ -0,0 +1,140 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2005, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.jboss.test.aop.junit;
+
+import java.net.URL;
+import java.util.Iterator;
+import java.util.concurrent.CopyOnWriteArrayList;
+
+import org.jboss.aop.AspectXmlLoader;
+import org.jboss.kernel.plugins.deployment.xml.BasicXMLDeployer;
+import org.jboss.kernel.spi.deployment.KernelDeployment;
+import org.jboss.test.kernel.junit.MicrocontainerTestDelegate;
+
+/**
+ *
+ * An AOPMicrocontainerTestDelegate.
+ *
+ * @author <a href="adrian at jboss.com">Adrian Brock</a>
+ * @version $Revision$
+ */
+public class AOPMicrocontainerTestDelegate extends MicrocontainerTestDelegate
+{
+ /** The deployed urls */
+ private static final CopyOnWriteArrayList<URL> urls = new CopyOnWriteArrayList<URL>();
+
+ boolean useJaxbDeployer;
+
+ /**
+ * Create a new AOPMicrocontainerTestDelegate.
+ *
+ * @param clazz the class
+ * @throws Exception for any error
+ */
+ public AOPMicrocontainerTestDelegate(Class<?> clazz) throws Exception
+ {
+ super(clazz);
+ }
+
+ public void setUp() throws Exception
+ {
+ super.setUp();
+ log.debug("Security enabled: " + enableSecurity);
+ }
+
+
+
+ protected void deploy() throws Exception
+ {
+ String testName = clazz.getName();
+ testName = testName.replace('.', '/') + "-aop.xml";
+ URL url = clazz.getClassLoader().getResource(testName);
+ if (url != null)
+ deployAOP(url);
+ else
+ log.debug("No test specific deployment " + testName);
+
+ super.deploy();
+ }
+
+ protected void undeploy()
+ {
+
+ super.undeploy();
+ for (Iterator<URL> i = urls.iterator(); i.hasNext();)
+ {
+ URL url = i.next();
+ undeployAOP(url);
+ }
+ }
+
+ /**
+ * Deploy the aop config
+ *
+ * @param url the url
+ * @throws Exception for any error
+ */
+ protected void deployAOP(URL url) throws Exception
+ {
+ log.debug("Deploying " + url);
+ urls.add(url);
+ AspectXmlLoader.deployXML(url);
+ }
+
+ /**
+ * Undeploy the aop config
+ *
+ * @param url the url
+ */
+ protected void undeployAOP(URL url)
+ {
+ try
+ {
+ log.debug("Undeploying " + url);
+ urls.remove(url);
+ AspectXmlLoader.undeployXML(url);
+ }
+ catch (Exception e)
+ {
+ log.warn("Ignored error undeploying " + url, e);
+ }
+ }
+
+ @Override
+ protected BasicXMLDeployer createDeployer()
+ {
+ if (useJaxbDeployer)
+ {
+ return new JAXBDeployer(kernel, defaultMode, clazz);
+ }
+ return super.createDeployer();
+ }
+
+ protected KernelDeployment unmarshal(final URL url) throws Exception
+ {
+ if (!useJaxbDeployer)
+ {
+ throw new IllegalStateException("useJaxbDeployer needs to be true");
+ }
+ return ((JAXBDeployer)deployer).unmarshal(url);
+ }
+}
Copied: projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/aop/junit/AbstractProxyTest.java (from rev 70082, 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/aop/junit/AbstractProxyTest.java (rev 0)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/aop/junit/AbstractProxyTest.java 2008-02-26 11:49:46 UTC (rev 70090)
@@ -0,0 +1,397 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.jboss.test.aop.junit;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import org.jboss.aop.metadata.SimpleMetaData;
+import org.jboss.aop.proxy.container.AOPProxyFactory;
+import org.jboss.aop.proxy.container.AOPProxyFactoryMixin;
+import org.jboss.aop.proxy.container.AOPProxyFactoryParameters;
+import org.jboss.aop.proxy.container.GeneratedAOPProxyFactory;
+import org.jboss.test.AbstractTestCaseWithSetup;
+import org.jboss.test.AbstractTestDelegate;
+
+/**
+ * AbstractProxyTest.
+ *
+ * @author <a href="adrian at jboss.com">Adrian Brock</a>
+ * @version $Revision: 45764 $
+ */
+public abstract class AbstractProxyTest extends AbstractTestCaseWithSetup
+{
+ /** The proxy factory */
+ protected AOPProxyFactory proxyFactory;
+
+ /**
+ * Get the test delegate
+ *
+ * @param clazz the test class
+ * @return the delegate
+ * @throws Exception for any error
+ */
+ public static AbstractTestDelegate getDelegate(Class<?> clazz) throws Exception
+ {
+ String property = System.getProperty("jboss.mc.secure", "false");
+ boolean enableSecurity = Boolean.valueOf(property).booleanValue();
+ AbstractProxyTestDelegate delegate = new AbstractProxyTestDelegate(clazz);
+ delegate.enableSecurity = enableSecurity;
+ return delegate;
+ }
+
+ /**
+ * Create a new AbstractProxyTest.
+ *
+ * @param name the test name
+ */
+ public AbstractProxyTest(String name)
+ {
+ super(name);
+ }
+
+ protected void setUp() throws Exception
+ {
+ super.setUp();
+ configureLogging();
+ proxyFactory = new GeneratedAOPProxyFactory();
+ }
+
+ /**
+ * Create a proxy
+ *
+ * @param target the target
+ * @return the proxy
+ * @throws Exception for any error
+ */
+ protected Object createProxy(Object target) throws Exception
+ {
+ AOPProxyFactoryParameters params = new AOPProxyFactoryParameters();
+ params.setProxiedClass(target.getClass());
+ params.setTarget(target);
+ return proxyFactory.createAdvisedProxy(params);
+ }
+
+ /**
+ * Create a proxy
+ *
+ * @param target the target
+ * @param expected the expected class
+ * @return the proxy
+ * @throws Exception for any error
+ */
+ protected Object assertCreateProxy(Object target, Class<?> expected) throws Exception
+ {
+ Object proxy = createProxy(target);
+ assertNotNull(proxy);
+ assertTrue("Proxy " + proxy + " should implement " + expected.getName() + " interfaces=" + getInterfaces(proxy), expected.isInstance(proxy));
+ return proxy;
+ }
+
+ /**
+ * Create a proxy
+ *
+ * @param target the target
+ * @param interfaces the interfaces
+ * @return the proxy
+ * @throws Exception for any error
+ */
+ protected Object createProxy(Object target, Class<?>[] interfaces) throws Exception
+ {
+ AOPProxyFactoryParameters params = new AOPProxyFactoryParameters();
+ params.setProxiedClass(target.getClass());
+ params.setInterfaces(interfaces);
+ params.setTarget(target);
+ return proxyFactory.createAdvisedProxy(params);
+ }
+
+ /**
+ * Create a proxy
+ *
+ * @param target the target
+ * @param mixins the mixins
+ * @return the proxy
+ * @throws Exception for any error
+ */
+ protected Object createProxy(Object target, AOPProxyFactoryMixin[] mixins) throws Exception
+ {
+ AOPProxyFactoryParameters params = new AOPProxyFactoryParameters();
+ params.setProxiedClass(target.getClass());
+ params.setMixins(mixins);
+ params.setTarget(target);
+ return proxyFactory.createAdvisedProxy(params);
+ }
+
+ /**
+ * Create a proxy
+ *
+ * @param target the target
+ * @param interfaces the interfaces
+ * @param mixins the mixins
+ * @return the proxy
+ * @throws Exception for any error
+ */
+ protected Object createProxy(Object target, Class<?>[] interfaces, AOPProxyFactoryMixin[] mixins) throws Exception
+ {
+ AOPProxyFactoryParameters params = new AOPProxyFactoryParameters();
+ params.setProxiedClass(target.getClass());
+ params.setInterfaces(interfaces);
+ params.setMixins(mixins);
+ params.setTarget(target);
+ return proxyFactory.createAdvisedProxy(params);
+ }
+ /**
+ * Create a proxy
+ *
+ * @param target the target
+ * @param mixins the mixins
+ * @param expected the expected class
+ * @return the proxy
+ * @throws Exception for any error
+ */
+ protected Object assertCreateProxy(Object target, AOPProxyFactoryMixin[] mixins, Class<?> expected) throws Exception
+ {
+ Object proxy = createProxy(target, mixins);
+ assertNotNull(proxy);
+ assertTrue("Proxy " + proxy + " should implement " + expected.getName() + " interfaces=" + getInterfaces(proxy), expected.isInstance(proxy));
+ return proxy;
+ }
+
+ /**
+ * Create a proxy
+ *
+ * @param target the target
+ * @param interfaces the interfaces
+ * @param mixins the mixins
+ * @param expected the expected class
+ * @return the proxy
+ * @throws Exception for any error
+ */
+ protected Object assertCreateProxy(Object target, Class<?>[] interfaces, AOPProxyFactoryMixin[] mixins, Class<?>[] expected) throws Exception
+ {
+ Object proxy = createProxy(target, interfaces, mixins);
+ assertNotNull(proxy);
+ for (int i = 0 ; i < expected.length ; i++)
+ {
+ assertTrue("Proxy " + proxy + " should implement " + expected[i].getName() + " interfaces=" + getInterfaces(proxy), expected[i].isInstance(proxy));
+ }
+ return proxy;
+ }
+
+ /**
+ * Create a proxy
+ *
+ * @param target the target
+ * @param interfaces the interfaces
+ * @param expected the expected class
+ * @return the proxy
+ * @throws Exception for any error
+ */
+ protected Object assertCreateProxy(Object target, Class<?>[] interfaces, Class<?> expected) throws Exception
+ {
+ Object proxy = createProxy(target, interfaces);
+ assertNotNull(proxy);
+ assertTrue("Proxy " + proxy + " should implement " + expected.getName() + " interfaces=" + getInterfaces(proxy), expected.isInstance(proxy));
+ return proxy;
+ }
+
+ /**
+ * Create a proxy
+ *
+ * @param target the target
+ * @param interfaces the interfaces
+ * @param metaData the metadata
+ * @return the proxy
+ * @throws Exception for any error
+ */
+ protected Object createProxy(Object target, Class<?>[] interfaces, SimpleMetaData metaData) throws Exception
+ {
+ AOPProxyFactoryParameters params = new AOPProxyFactoryParameters();
+ params.setProxiedClass(target.getClass());
+ params.setInterfaces(interfaces);
+ params.setSimpleMetaData(metaData);
+ params.setTarget(target);
+ return proxyFactory.createAdvisedProxy(params);
+ }
+
+ /**
+ * Create a proxy
+ *
+ * @param target the target
+ * @param interfaces the interfaces
+ * @param metaData the metadata
+ * @param expected the expected class
+ * @return the proxy
+ * @throws Exception for any error
+ */
+ protected Object assertCreateProxy(Object target, Class<?>[] interfaces, SimpleMetaData metaData, Class<?> expected) throws Exception
+ {
+ Object proxy = createProxy(target, interfaces, metaData);
+ assertNotNull(proxy);
+ assertTrue("Proxy " + proxy + " should implement " + expected.getName() + " interfaces=" + getInterfaces(proxy), expected.isInstance(proxy));
+ return proxy;
+ }
+
+ /**
+ * Create a proxy
+ *
+ * @param interfaces the interfaces
+ * @param metaData the metadata
+ * @return the proxy
+ * @throws Exception for any error
+ */
+ protected Object createHollowProxy(Class<?>[] interfaces, SimpleMetaData metaData) throws Exception
+ {
+ AOPProxyFactoryParameters params = new AOPProxyFactoryParameters();
+ params.setInterfaces(interfaces);
+ params.setSimpleMetaData(metaData);
+ return proxyFactory.createAdvisedProxy(params);
+ }
+
+ /**
+ * Create a proxy
+ *
+ * @param mixins the mixins
+ * @param metaData the metadata
+ * @return the proxy
+ * @throws Exception for any error
+ */
+ protected Object createHollowProxy(AOPProxyFactoryMixin[] mixins, SimpleMetaData metaData) throws Exception
+ {
+ AOPProxyFactoryParameters params = new AOPProxyFactoryParameters();
+ params.setMixins(mixins);
+ params.setSimpleMetaData(metaData);
+ return proxyFactory.createAdvisedProxy(params);
+ }
+
+ /**
+ * Create a proxy
+ *
+ * @param interfaces the interfaces
+ * @param mixins the mixins
+ * @param metaData the metadata
+ * @return the proxy
+ * @throws Exception for any error
+ */
+ protected Object createHollowProxy(Class<?>[] interfaces, AOPProxyFactoryMixin[] mixins, SimpleMetaData metaData) throws Exception
+ {
+ AOPProxyFactoryParameters params = new AOPProxyFactoryParameters();
+ params.setInterfaces(interfaces);
+ params.setMixins(mixins);
+ params.setSimpleMetaData(metaData);
+ return proxyFactory.createAdvisedProxy(params);
+ }
+
+ /**
+ * Create a proxy
+ *
+ * @param interfaces the interfaces
+ * @param metaData the metadata
+ * @param expected the expected class
+ * @return the proxy
+ * @throws Exception for any error
+ */
+ protected Object assertCreateHollowProxy(Class<?>[] interfaces, SimpleMetaData metaData, Class<?> expected) throws Exception
+ {
+ Object proxy = createHollowProxy(interfaces, metaData);
+ assertNotNull(proxy);
+ assertTrue("Proxy " + proxy + " should implement " + expected.getName() + " interfaces=" + getInterfaces(proxy), expected.isInstance(proxy));
+ return proxy;
+ }
+
+ /**
+ * Create a proxy
+ *
+ * @param mixins the mixins
+ * @param metaData the metadata
+ * @param expected the expected class
+ * @return the proxy
+ * @throws Exception for any error
+ */
+ protected Object assertCreateHollowProxy(AOPProxyFactoryMixin[] mixins, SimpleMetaData metaData, Class<?> expected) throws Exception
+ {
+ Object proxy = createHollowProxy(mixins, metaData);
+ assertNotNull(proxy);
+ assertTrue("Proxy " + proxy + " should implement " + expected.getName() + " interfaces=" + getInterfaces(proxy), expected.isInstance(proxy));
+ return proxy;
+ }
+
+ /**
+ * Create a proxy
+ *
+ * @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
+ */
+ protected Object assertCreateHollowProxy(Class<?>[] interfaces, AOPProxyFactoryMixin[] mixins, SimpleMetaData metaData, Class<?>[] expected) throws Exception
+ {
+ Object proxy = createHollowProxy(interfaces, mixins, metaData);
+ assertNotNull(proxy);
+ for (int i = 0 ; i < expected.length ; i++)
+ {
+ assertTrue("Proxy " + proxy + " should implement " + expected[i].getName() + " interfaces=" + getInterfaces(proxy), expected[i].isInstance(proxy));
+ }
+ return proxy;
+ }
+ /**
+ * Get the interfaces for an object
+ *
+ * @param object the object
+ * @return the set of interfaces
+ */
+ protected Set<Class<?>> getInterfaces(Object object)
+ {
+ Set<Class<?>> interfaces = new HashSet<Class<?>>();
+ addInterfaces(interfaces, object.getClass());
+ return interfaces;
+ }
+
+ /**
+ * Add interfaces
+ *
+ * @param interfaces the interfaces to add to
+ * @param clazz the class
+ */
+ protected void addInterfaces(Set<Class<?>> interfaces, Class<?> clazz)
+ {
+ Class<?>[] intfs = clazz.getInterfaces();
+ for (int i = 0; i < intfs.length; ++i)
+ interfaces.add(intfs[i]);
+ Class<?> superClass = clazz.getSuperclass();
+ if (superClass != null)
+ addInterfaces(interfaces, superClass);
+ }
+
+ /**
+ * Get the delegate
+ *
+ * @return the delegate
+ */
+ protected AbstractProxyTestDelegate getMCDelegate()
+ {
+ return (AbstractProxyTestDelegate) getDelegate();
+ }
+
+}
Copied: projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/aop/junit/AbstractProxyTestDelegate.java (from rev 70082, projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/junit/AbstractProxyTestDelegate.java)
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/aop/junit/AbstractProxyTestDelegate.java (rev 0)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/aop/junit/AbstractProxyTestDelegate.java 2008-02-26 11:49:46 UTC (rev 70090)
@@ -0,0 +1,153 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.jboss.test.aop.junit;
+
+import java.net.URL;
+
+import org.jboss.aop.AspectXmlLoader;
+import org.jboss.test.AbstractTestDelegate;
+
+/**
+ * AbstractProxyTestDelegate.
+ *
+ * @author <a href="adrian at jboss.com">Adrian Brock</a>
+ * @version $Revision: 44908 $
+ */
+public class AbstractProxyTestDelegate extends AbstractTestDelegate
+{
+ /**
+ * Create a new AbstractProxyTestDelegate.
+ *
+ * @param clazz the test class
+ * @throws Exception for any error
+ */
+ public AbstractProxyTestDelegate(Class<?> clazz) throws Exception
+ {
+ super(clazz);
+ }
+
+ public void setUp() throws Exception
+ {
+ super.setUp();
+
+ log.debug("Security enabled: " + enableSecurity);
+
+ try
+ {
+ deploy();
+ }
+ catch (RuntimeException e)
+ {
+ throw e;
+ }
+ catch (Exception e)
+ {
+ throw e;
+ }
+ catch (Error e)
+ {
+ throw e;
+ }
+ catch (Throwable e)
+ {
+ throw new RuntimeException(e);
+ }
+ }
+
+ public void tearDown() throws Exception
+ {
+ super.tearDown();
+ undeploy();
+ }
+
+ /**
+ * Deploy the aop config
+ *
+ * @throws Exception for any error
+ */
+ protected void deploy() throws Exception
+ {
+ String testName = clazz.getName();
+ testName = testName.replace('.', '/') + ".xml";
+ URL url = clazz.getClassLoader().getResource(testName);
+ if (url != null)
+ deploy(url);
+ else
+ throw new RuntimeException("No test specific deployment " + testName);
+ }
+
+ /**
+ * Undeploy the aop config
+ */
+ protected void undeploy()
+ {
+ String testName = clazz.getName();
+ testName = testName.replace('.', '/') + ".xml";
+ URL url = clazz.getClassLoader().getResource(testName);
+ if (url != null)
+ undeploy(url);
+ else
+ log.debug("No test specific deployment " + testName);
+ }
+
+ /**
+ * Get the test url
+ *
+ * @return the test url
+ */
+ protected URL getTestURL()
+ {
+ String testName = clazz.getName();
+ testName = testName.replace('.', '/') + ".xml";
+ return clazz.getClassLoader().getResource(testName);
+ }
+
+ /**
+ * Deploy the aop config
+ *
+ * @param url the url
+ * @throws Exception for any error
+ */
+ protected void deploy(URL url) throws Exception
+ {
+ log.debug("Deploying " + url);
+ AspectXmlLoader.deployXML(url);
+ }
+
+ /**
+ * Undeploy the aop config
+ *
+ * @param url the url
+ */
+ protected void undeploy(URL url)
+ {
+ try
+ {
+ log.debug("Undeploying " + url);
+ AspectXmlLoader.undeployXML(url);
+ }
+ catch (Exception e)
+ {
+ log.warn("Ignored error undeploying " + url, e);
+ }
+ }
+}
Modified: projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/aop/junit/MicrocontainerJunitSmokeTestCase.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/aop/junit/MicrocontainerJunitSmokeTestCase.java 2008-02-26 11:45:23 UTC (rev 70089)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/aop/junit/MicrocontainerJunitSmokeTestCase.java 2008-02-26 11:49:46 UTC (rev 70090)
@@ -23,7 +23,6 @@
import junit.framework.Test;
-import org.jboss.aop.microcontainer.junit.AOPMicrocontainerTest;
/**
* MicrocontainerJunitSmokeTestCase.
Copied: projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/aop/junit/ScopingAOPMicrocontainerTestDelegate.java (from rev 70082, projects/microcontainer/trunk/aop-mc-int/src/main/org/jboss/aop/microcontainer/junit/ScopingAOPMicrocontainerTestDelegate.java)
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/aop/junit/ScopingAOPMicrocontainerTestDelegate.java (rev 0)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/aop/junit/ScopingAOPMicrocontainerTestDelegate.java 2008-02-26 11:49:46 UTC (rev 70090)
@@ -0,0 +1,94 @@
+/*
+* JBoss, Home of Professional Open Source
+* Copyright 2006, JBoss Inc., and individual contributors as indicated
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.jboss.test.aop.junit;
+
+import org.jboss.dependency.plugins.AbstractController;
+import org.jboss.dependency.spi.Controller;
+import org.jboss.dependency.spi.ControllerContext;
+import org.jboss.dependency.spi.ControllerState;
+import org.jboss.kernel.spi.dependency.KernelControllerContext;
+
+/**
+ *
+ * A ScopingAOPMicrocontainerTestDelegate.
+ *
+ * @author <a href="ales.justin at jboss.com">Ales Justin</a>
+ */
+public class ScopingAOPMicrocontainerTestDelegate extends AOPMicrocontainerTestDelegate
+{
+ public ScopingAOPMicrocontainerTestDelegate(Class<?> clazz)
+ throws Exception
+ {
+ super(clazz);
+ }
+
+ protected KernelControllerContext getControllerContext(final Object name, final ControllerState state)
+ {
+ try
+ {
+ Controller controller = new TestController((AbstractController)kernel.getController());
+ KernelControllerContext context = (KernelControllerContext)controller.getContext(name, state);
+ if (context == null)
+ throw new IllegalStateException("Bean not found " + name + " at state " + state);
+ return context;
+ }
+ catch (Exception e)
+ {
+ throw new Error(e);
+ }
+ }
+
+ private class TestController extends AbstractController
+ {
+ private AbstractController delegate;
+
+ public TestController(AbstractController controller) throws Exception
+ {
+ this.delegate = controller;
+ }
+
+ public ControllerContext getContext(Object name, ControllerState state)
+ {
+ return findContext(delegate, name, state);
+ }
+
+ private ControllerContext findContext(AbstractController controller, Object name, ControllerState state)
+ {
+ ControllerContext context = controller.getContext(name, state);
+ if (context != null)
+ {
+ return context;
+ }
+ else
+ {
+ for (AbstractController childController : controller.getControllers())
+ {
+ ControllerContext ctx = findContext(childController, name, state);
+ if (ctx != null)
+ return ctx;
+ }
+ }
+ return null;
+ }
+ }
+
+}
Modified: projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/advisor/test/MicrocontainerAdvisedAdvisorConstructorTestCase.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/advisor/test/MicrocontainerAdvisedAdvisorConstructorTestCase.java 2008-02-26 11:45:23 UTC (rev 70089)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/advisor/test/MicrocontainerAdvisedAdvisorConstructorTestCase.java 2008-02-26 11:49:46 UTC (rev 70090)
@@ -24,8 +24,8 @@
import junit.framework.Test;
import org.jboss.aop.Advised;
-import org.jboss.aop.microcontainer.junit.AOPMicrocontainerTest;
import org.jboss.aop.proxy.container.AspectManaged;
+import org.jboss.test.aop.junit.AOPMicrocontainerTest;
import org.jboss.test.microcontainer.advisor.test.some.Pojo;
/**
Modified: projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/advisor/test/MicrocontainerAdvisedAdvisorOverloadedConstructorTestCase.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/advisor/test/MicrocontainerAdvisedAdvisorOverloadedConstructorTestCase.java 2008-02-26 11:45:23 UTC (rev 70089)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/advisor/test/MicrocontainerAdvisedAdvisorOverloadedConstructorTestCase.java 2008-02-26 11:49:46 UTC (rev 70090)
@@ -24,8 +24,8 @@
import junit.framework.Test;
import org.jboss.aop.Advised;
-import org.jboss.aop.microcontainer.junit.AOPMicrocontainerTest;
import org.jboss.aop.proxy.container.AspectManaged;
+import org.jboss.test.aop.junit.AOPMicrocontainerTest;
import org.jboss.test.microcontainer.advisor.test.some.Pojo;
/**
Modified: projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/advisor/test/MicrocontainerAdvisedAdvisorTestCase.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/advisor/test/MicrocontainerAdvisedAdvisorTestCase.java 2008-02-26 11:45:23 UTC (rev 70089)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/advisor/test/MicrocontainerAdvisedAdvisorTestCase.java 2008-02-26 11:49:46 UTC (rev 70090)
@@ -24,8 +24,8 @@
import junit.framework.Test;
import org.jboss.aop.Advised;
-import org.jboss.aop.microcontainer.junit.AOPMicrocontainerTest;
import org.jboss.aop.proxy.container.AspectManaged;
+import org.jboss.test.aop.junit.AOPMicrocontainerTest;
/**
* MicrocontainerAdvisedAdvisorTestCase.
Modified: projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/advisor/test/MicrocontainerAdvisedAnnotationOverrideProxyAdvisorTestCase.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/advisor/test/MicrocontainerAdvisedAnnotationOverrideProxyAdvisorTestCase.java 2008-02-26 11:45:23 UTC (rev 70089)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/advisor/test/MicrocontainerAdvisedAnnotationOverrideProxyAdvisorTestCase.java 2008-02-26 11:49:46 UTC (rev 70090)
@@ -24,8 +24,8 @@
import junit.framework.Test;
import org.jboss.aop.Advised;
-import org.jboss.aop.microcontainer.junit.AOPMicrocontainerTest;
import org.jboss.aop.proxy.container.AspectManaged;
+import org.jboss.test.aop.junit.AOPMicrocontainerTest;
import org.jboss.test.microcontainer.support.MetaDataContextInterceptor;
/**
Modified: projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/advisor/test/MicrocontainerAdvisedInstanceAdvisorTestCase.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/advisor/test/MicrocontainerAdvisedInstanceAdvisorTestCase.java 2008-02-26 11:45:23 UTC (rev 70089)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/advisor/test/MicrocontainerAdvisedInstanceAdvisorTestCase.java 2008-02-26 11:49:46 UTC (rev 70090)
@@ -24,7 +24,7 @@
import junit.framework.Test;
import org.jboss.aop.Advised;
-import org.jboss.aop.microcontainer.junit.AOPMicrocontainerTest;
+import org.jboss.test.aop.junit.AOPMicrocontainerTest;
/**
* MicrocontainerAdvisedInstanceAdvisorTestCase.
Modified: projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/advisor/test/MicrocontainerAdvisedIntroducedAdvisorTestCase.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/advisor/test/MicrocontainerAdvisedIntroducedAdvisorTestCase.java 2008-02-26 11:45:23 UTC (rev 70089)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/advisor/test/MicrocontainerAdvisedIntroducedAdvisorTestCase.java 2008-02-26 11:49:46 UTC (rev 70090)
@@ -24,8 +24,8 @@
import junit.framework.Test;
import org.jboss.aop.Advised;
-import org.jboss.aop.microcontainer.junit.AOPMicrocontainerTest;
import org.jboss.aop.proxy.container.AspectManaged;
+import org.jboss.test.aop.junit.AOPMicrocontainerTest;
/**
* MicrocontainerAdvisedIntroducedAdvisorTestCase.
Modified: projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/advisor/test/MicrocontainerNotAdvisedIntroducedProxyAdvisorTestCase.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/advisor/test/MicrocontainerNotAdvisedIntroducedProxyAdvisorTestCase.java 2008-02-26 11:45:23 UTC (rev 70089)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/advisor/test/MicrocontainerNotAdvisedIntroducedProxyAdvisorTestCase.java 2008-02-26 11:49:46 UTC (rev 70090)
@@ -24,8 +24,8 @@
import junit.framework.Test;
import org.jboss.aop.Advised;
-import org.jboss.aop.microcontainer.junit.AOPMicrocontainerTest;
import org.jboss.aop.proxy.container.AspectManaged;
+import org.jboss.test.aop.junit.AOPMicrocontainerTest;
/**
* MicrocontainerNotAdvisedIntroducedProxyAdvisorTestCase.
Modified: projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/advisor/test/MicrocontainerNotAdvisedNoAdvisorTestCase.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/advisor/test/MicrocontainerNotAdvisedNoAdvisorTestCase.java 2008-02-26 11:45:23 UTC (rev 70089)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/advisor/test/MicrocontainerNotAdvisedNoAdvisorTestCase.java 2008-02-26 11:49:46 UTC (rev 70090)
@@ -24,8 +24,8 @@
import junit.framework.Test;
import org.jboss.aop.Advised;
-import org.jboss.aop.microcontainer.junit.AOPMicrocontainerTest;
import org.jboss.aop.proxy.container.AspectManaged;
+import org.jboss.test.aop.junit.AOPMicrocontainerTest;
/**
* MicrocontainerNotAdvisedNoAdvisorTestCase.
Modified: projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/advisor/test/MicrocontainerNotAdvisedProxyAdvisorConstructorTestCase.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/advisor/test/MicrocontainerNotAdvisedProxyAdvisorConstructorTestCase.java 2008-02-26 11:45:23 UTC (rev 70089)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/advisor/test/MicrocontainerNotAdvisedProxyAdvisorConstructorTestCase.java 2008-02-26 11:49:46 UTC (rev 70090)
@@ -24,8 +24,8 @@
import junit.framework.Test;
import org.jboss.aop.Advised;
-import org.jboss.aop.microcontainer.junit.AOPMicrocontainerTest;
import org.jboss.aop.proxy.container.AspectManaged;
+import org.jboss.test.aop.junit.AOPMicrocontainerTest;
import org.jboss.test.microcontainer.advisor.test.some.Pojo;
/**
Modified: projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/advisor/test/MicrocontainerNotAdvisedProxyAdvisorOverloadedConstructorTestCase.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/advisor/test/MicrocontainerNotAdvisedProxyAdvisorOverloadedConstructorTestCase.java 2008-02-26 11:45:23 UTC (rev 70089)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/advisor/test/MicrocontainerNotAdvisedProxyAdvisorOverloadedConstructorTestCase.java 2008-02-26 11:49:46 UTC (rev 70090)
@@ -24,8 +24,8 @@
import junit.framework.Test;
import org.jboss.aop.Advised;
-import org.jboss.aop.microcontainer.junit.AOPMicrocontainerTest;
import org.jboss.aop.proxy.container.AspectManaged;
+import org.jboss.test.aop.junit.AOPMicrocontainerTest;
import org.jboss.test.microcontainer.advisor.test.some.Pojo;
/**
Modified: projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/advisor/test/MicrocontainerNotAdvisedProxyAdvisorTestCase.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/advisor/test/MicrocontainerNotAdvisedProxyAdvisorTestCase.java 2008-02-26 11:45:23 UTC (rev 70089)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/advisor/test/MicrocontainerNotAdvisedProxyAdvisorTestCase.java 2008-02-26 11:49:46 UTC (rev 70090)
@@ -24,8 +24,8 @@
import junit.framework.Test;
import org.jboss.aop.Advised;
-import org.jboss.aop.microcontainer.junit.AOPMicrocontainerTest;
import org.jboss.aop.proxy.container.AspectManaged;
+import org.jboss.test.aop.junit.AOPMicrocontainerTest;
/**
* MicrocontainerNotAdvisedProxyAdvisorTestCase.
Modified: projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/AnnotationOverrideTest.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/AnnotationOverrideTest.java 2008-02-26 11:45:23 UTC (rev 70089)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/AnnotationOverrideTest.java 2008-02-26 11:49:46 UTC (rev 70090)
@@ -21,7 +21,7 @@
*/
package org.jboss.test.microcontainer.beans.test;
-import org.jboss.aop.microcontainer.junit.AOPMicrocontainerTest;
+import org.jboss.test.aop.junit.AOPMicrocontainerTest;
import org.jboss.test.microcontainer.beans.POJO;
import org.jboss.test.microcontainer.beans.TestAspect;
Modified: projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/AspectFactorySimpleTest.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/AspectFactorySimpleTest.java 2008-02-26 11:45:23 UTC (rev 70089)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/AspectFactorySimpleTest.java 2008-02-26 11:49:46 UTC (rev 70090)
@@ -21,7 +21,7 @@
*/
package org.jboss.test.microcontainer.beans.test;
-import org.jboss.aop.microcontainer.junit.AOPMicrocontainerTest;
+import org.jboss.test.aop.junit.AOPMicrocontainerTest;
import org.jboss.test.microcontainer.beans.POJO;
import org.jboss.test.microcontainer.beans.SimpleFactoryAspect;
Modified: projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/AspectSimpleTest.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/AspectSimpleTest.java 2008-02-26 11:45:23 UTC (rev 70089)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/AspectSimpleTest.java 2008-02-26 11:49:46 UTC (rev 70090)
@@ -21,7 +21,7 @@
*/
package org.jboss.test.microcontainer.beans.test;
-import org.jboss.aop.microcontainer.junit.AOPMicrocontainerTest;
+import org.jboss.test.aop.junit.AOPMicrocontainerTest;
import org.jboss.test.microcontainer.beans.POJO;
import org.jboss.test.microcontainer.beans.TestAspect;
Modified: projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/AspectWithDependencyTest.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/AspectWithDependencyTest.java 2008-02-26 11:45:23 UTC (rev 70089)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/AspectWithDependencyTest.java 2008-02-26 11:49:46 UTC (rev 70090)
@@ -21,9 +21,9 @@
*/
package org.jboss.test.microcontainer.beans.test;
-import org.jboss.aop.microcontainer.junit.AOPMicrocontainerTest;
import org.jboss.dependency.spi.ControllerState;
import org.jboss.kernel.spi.dependency.KernelControllerContext;
+import org.jboss.test.aop.junit.AOPMicrocontainerTest;
import org.jboss.test.microcontainer.beans.Dependency;
import org.jboss.test.microcontainer.beans.POJO;
import org.jboss.test.microcontainer.beans.TestAspectWithDependency;
Modified: projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/CFlowTest.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/CFlowTest.java 2008-02-26 11:45:23 UTC (rev 70089)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/CFlowTest.java 2008-02-26 11:49:46 UTC (rev 70090)
@@ -21,7 +21,7 @@
*/
package org.jboss.test.microcontainer.beans.test;
-import org.jboss.aop.microcontainer.junit.AOPMicrocontainerTest;
+import org.jboss.test.aop.junit.AOPMicrocontainerTest;
import org.jboss.test.microcontainer.beans.POJO;
import org.jboss.test.microcontainer.beans.TestAspect;
Modified: projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/ClassMetaDataBeansTestCase.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/ClassMetaDataBeansTestCase.java 2008-02-26 11:45:23 UTC (rev 70089)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/ClassMetaDataBeansTestCase.java 2008-02-26 11:49:46 UTC (rev 70090)
@@ -23,7 +23,7 @@
import junit.framework.Test;
-import org.jboss.aop.microcontainer.junit.AOPMicrocontainerTest;
+import org.jboss.test.aop.junit.AOPMicrocontainerTest;
import org.jboss.test.microcontainer.beans.POJO;
import org.jboss.test.microcontainer.beans.TestClassMetaDataAspect;
Modified: projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/ClassMetaDataLoaderBeansTestCase.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/ClassMetaDataLoaderBeansTestCase.java 2008-02-26 11:45:23 UTC (rev 70089)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/ClassMetaDataLoaderBeansTestCase.java 2008-02-26 11:49:46 UTC (rev 70090)
@@ -23,7 +23,7 @@
import junit.framework.Test;
-import org.jboss.aop.microcontainer.junit.AOPMicrocontainerTest;
+import org.jboss.test.aop.junit.AOPMicrocontainerTest;
import org.jboss.test.microcontainer.beans.POJO;
import org.jboss.test.microcontainer.beans.TestClassMetaDataAspect;
Modified: projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/DomainProxyTest.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/DomainProxyTest.java 2008-02-26 11:45:23 UTC (rev 70089)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/DomainProxyTest.java 2008-02-26 11:49:46 UTC (rev 70090)
@@ -23,10 +23,10 @@
import org.jboss.aop.AspectManager;
import org.jboss.aop.DomainDefinition;
-import org.jboss.aop.microcontainer.junit.AOPMicrocontainerTest;
import org.jboss.aop.proxy.container.AOPProxyFactoryParameters;
import org.jboss.aop.proxy.container.ContainerCache;
import org.jboss.aop.proxy.container.GeneratedAOPProxyFactory;
+import org.jboss.test.aop.junit.AOPMicrocontainerTest;
/**
*
Modified: projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/DynamicCFlowTest.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/DynamicCFlowTest.java 2008-02-26 11:45:23 UTC (rev 70089)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/DynamicCFlowTest.java 2008-02-26 11:49:46 UTC (rev 70090)
@@ -21,7 +21,7 @@
*/
package org.jboss.test.microcontainer.beans.test;
-import org.jboss.aop.microcontainer.junit.AOPMicrocontainerTest;
+import org.jboss.test.aop.junit.AOPMicrocontainerTest;
import org.jboss.test.microcontainer.beans.DynamicCFlowImpl;
import org.jboss.test.microcontainer.beans.POJO;
import org.jboss.test.microcontainer.beans.TestAspect;
Modified: projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/InterceptorFactorySimpleTest.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/InterceptorFactorySimpleTest.java 2008-02-26 11:45:23 UTC (rev 70089)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/InterceptorFactorySimpleTest.java 2008-02-26 11:49:46 UTC (rev 70090)
@@ -21,7 +21,7 @@
*/
package org.jboss.test.microcontainer.beans.test;
-import org.jboss.aop.microcontainer.junit.AOPMicrocontainerTest;
+import org.jboss.test.aop.junit.AOPMicrocontainerTest;
import org.jboss.test.microcontainer.beans.POJO;
import org.jboss.test.microcontainer.beans.SimpleFactoryInterceptor;
import org.jboss.test.microcontainer.beans.TestAspect;
Modified: projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/InterceptorSimpleTest.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/InterceptorSimpleTest.java 2008-02-26 11:45:23 UTC (rev 70089)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/InterceptorSimpleTest.java 2008-02-26 11:49:46 UTC (rev 70090)
@@ -21,7 +21,7 @@
*/
package org.jboss.test.microcontainer.beans.test;
-import org.jboss.aop.microcontainer.junit.AOPMicrocontainerTest;
+import org.jboss.test.aop.junit.AOPMicrocontainerTest;
import org.jboss.test.microcontainer.beans.POJO;
import org.jboss.test.microcontainer.beans.TestInterceptor;
Modified: projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/InterceptorWithDependencyTest.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/InterceptorWithDependencyTest.java 2008-02-26 11:45:23 UTC (rev 70089)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/InterceptorWithDependencyTest.java 2008-02-26 11:49:46 UTC (rev 70090)
@@ -21,9 +21,9 @@
*/
package org.jboss.test.microcontainer.beans.test;
-import org.jboss.aop.microcontainer.junit.AOPMicrocontainerTest;
import org.jboss.dependency.spi.ControllerState;
import org.jboss.kernel.spi.dependency.KernelControllerContext;
+import org.jboss.test.aop.junit.AOPMicrocontainerTest;
import org.jboss.test.microcontainer.beans.Dependency;
import org.jboss.test.microcontainer.beans.POJO;
import org.jboss.test.microcontainer.beans.TestInterceptorWithDependency;
Modified: projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/IntroductionClassesTest.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/IntroductionClassesTest.java 2008-02-26 11:45:23 UTC (rev 70089)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/IntroductionClassesTest.java 2008-02-26 11:49:46 UTC (rev 70090)
@@ -21,7 +21,7 @@
*/
package org.jboss.test.microcontainer.beans.test;
-import org.jboss.aop.microcontainer.junit.AOPMicrocontainerTest;
+import org.jboss.test.aop.junit.AOPMicrocontainerTest;
import org.jboss.test.microcontainer.beans.IntroductionInterface;
import org.jboss.test.microcontainer.beans.POJO;
import org.jboss.test.microcontainer.beans.TestAspect;
Modified: projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/IntroductionExprTest.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/IntroductionExprTest.java 2008-02-26 11:45:23 UTC (rev 70089)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/IntroductionExprTest.java 2008-02-26 11:49:46 UTC (rev 70090)
@@ -21,7 +21,7 @@
*/
package org.jboss.test.microcontainer.beans.test;
-import org.jboss.aop.microcontainer.junit.AOPMicrocontainerTest;
+import org.jboss.test.aop.junit.AOPMicrocontainerTest;
import org.jboss.test.microcontainer.beans.IntroductionInterface;
import org.jboss.test.microcontainer.beans.POJO;
import org.jboss.test.microcontainer.beans.TestAspect;
Modified: projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/LightweightAspectTest.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/LightweightAspectTest.java 2008-02-26 11:45:23 UTC (rev 70089)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/LightweightAspectTest.java 2008-02-26 11:49:46 UTC (rev 70090)
@@ -27,7 +27,7 @@
import org.jboss.aop.microcontainer.beans.AspectBinding;
import org.jboss.aop.microcontainer.beans.BindingEntry;
import org.jboss.aop.microcontainer.beans.InterceptorEntry;
-import org.jboss.aop.microcontainer.junit.AOPMicrocontainerTest;
+import org.jboss.test.aop.junit.AOPMicrocontainerTest;
/**
*
Modified: projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/MixinClassesTest.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/MixinClassesTest.java 2008-02-26 11:45:23 UTC (rev 70089)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/MixinClassesTest.java 2008-02-26 11:49:46 UTC (rev 70090)
@@ -21,7 +21,7 @@
*/
package org.jboss.test.microcontainer.beans.test;
-import org.jboss.aop.microcontainer.junit.AOPMicrocontainerTest;
+import org.jboss.test.aop.junit.AOPMicrocontainerTest;
import org.jboss.test.microcontainer.beans.MixinInterface;
import org.jboss.test.microcontainer.beans.POJO;
import org.jboss.test.microcontainer.beans.TestAspect;
Modified: projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/MixinExprTest.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/MixinExprTest.java 2008-02-26 11:45:23 UTC (rev 70089)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/MixinExprTest.java 2008-02-26 11:49:46 UTC (rev 70090)
@@ -21,7 +21,7 @@
*/
package org.jboss.test.microcontainer.beans.test;
-import org.jboss.aop.microcontainer.junit.AOPMicrocontainerTest;
+import org.jboss.test.aop.junit.AOPMicrocontainerTest;
import org.jboss.test.microcontainer.beans.MixinInterface;
import org.jboss.test.microcontainer.beans.POJO;
import org.jboss.test.microcontainer.beans.TestAspect;
Modified: projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/MultipleAdviceTest.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/MultipleAdviceTest.java 2008-02-26 11:45:23 UTC (rev 70089)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/MultipleAdviceTest.java 2008-02-26 11:49:46 UTC (rev 70090)
@@ -21,7 +21,7 @@
*/
package org.jboss.test.microcontainer.beans.test;
-import org.jboss.aop.microcontainer.junit.AOPMicrocontainerTest;
+import org.jboss.test.aop.junit.AOPMicrocontainerTest;
import org.jboss.test.microcontainer.beans.POJO;
import org.jboss.test.microcontainer.beans.TestAspect;
import org.jboss.test.microcontainer.beans.TestInterceptor;
Modified: projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/MultipleAdvicesWithMultipleDependencyTest.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/MultipleAdvicesWithMultipleDependencyTest.java 2008-02-26 11:45:23 UTC (rev 70089)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/MultipleAdvicesWithMultipleDependencyTest.java 2008-02-26 11:49:46 UTC (rev 70090)
@@ -21,8 +21,8 @@
*/
package org.jboss.test.microcontainer.beans.test;
-import org.jboss.aop.microcontainer.junit.AOPMicrocontainerTest;
import org.jboss.dependency.spi.ControllerState;
+import org.jboss.test.aop.junit.AOPMicrocontainerTest;
import org.jboss.test.microcontainer.beans.Dependency;
import org.jboss.test.microcontainer.beans.POJO;
import org.jboss.test.microcontainer.beans.TestAspectWithDependency;
Modified: projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/MultipleAdvicesWithSingleDependencyTest.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/MultipleAdvicesWithSingleDependencyTest.java 2008-02-26 11:45:23 UTC (rev 70089)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/MultipleAdvicesWithSingleDependencyTest.java 2008-02-26 11:49:46 UTC (rev 70090)
@@ -21,9 +21,9 @@
*/
package org.jboss.test.microcontainer.beans.test;
-import org.jboss.aop.microcontainer.junit.AOPMicrocontainerTest;
import org.jboss.dependency.spi.ControllerState;
import org.jboss.kernel.spi.dependency.KernelControllerContext;
+import org.jboss.test.aop.junit.AOPMicrocontainerTest;
import org.jboss.test.microcontainer.beans.Dependency;
import org.jboss.test.microcontainer.beans.POJO;
import org.jboss.test.microcontainer.beans.TestAspectWithDependency;
Modified: projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/MultipleStackTest.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/MultipleStackTest.java 2008-02-26 11:45:23 UTC (rev 70089)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/MultipleStackTest.java 2008-02-26 11:49:46 UTC (rev 70090)
@@ -21,7 +21,7 @@
*/
package org.jboss.test.microcontainer.beans.test;
-import org.jboss.aop.microcontainer.junit.AOPMicrocontainerTest;
+import org.jboss.test.aop.junit.AOPMicrocontainerTest;
import org.jboss.test.microcontainer.beans.POJO;
import org.jboss.test.microcontainer.beans.SimpleFactoryAspect;
import org.jboss.test.microcontainer.beans.SimpleFactoryInterceptor;
Modified: projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/NamedPointcutTest.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/NamedPointcutTest.java 2008-02-26 11:45:23 UTC (rev 70089)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/NamedPointcutTest.java 2008-02-26 11:49:46 UTC (rev 70090)
@@ -21,7 +21,7 @@
*/
package org.jboss.test.microcontainer.beans.test;
-import org.jboss.aop.microcontainer.junit.AOPMicrocontainerTest;
+import org.jboss.test.aop.junit.AOPMicrocontainerTest;
import org.jboss.test.microcontainer.beans.POJO;
import org.jboss.test.microcontainer.beans.TestAspect;
Modified: projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/NonStandardNameAspectTest.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/NonStandardNameAspectTest.java 2008-02-26 11:45:23 UTC (rev 70089)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/NonStandardNameAspectTest.java 2008-02-26 11:49:46 UTC (rev 70090)
@@ -21,7 +21,7 @@
*/
package org.jboss.test.microcontainer.beans.test;
-import org.jboss.aop.microcontainer.junit.AOPMicrocontainerTest;
+import org.jboss.test.aop.junit.AOPMicrocontainerTest;
import org.jboss.test.microcontainer.beans.POJO;
import org.jboss.test.microcontainer.beans.TestAspectWithProperty;
Modified: projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/PrecedenceTest.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/PrecedenceTest.java 2008-02-26 11:45:23 UTC (rev 70089)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/PrecedenceTest.java 2008-02-26 11:49:46 UTC (rev 70090)
@@ -23,7 +23,7 @@
import java.util.List;
-import org.jboss.aop.microcontainer.junit.AOPMicrocontainerTest;
+import org.jboss.test.aop.junit.AOPMicrocontainerTest;
import org.jboss.test.microcontainer.beans.Interceptions;
import org.jboss.test.microcontainer.beans.POJO;
import org.jboss.test.microcontainer.beans.TestAspect;
Modified: projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/ScopedAspectTest.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/ScopedAspectTest.java 2008-02-26 11:45:23 UTC (rev 70089)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/ScopedAspectTest.java 2008-02-26 11:49:46 UTC (rev 70090)
@@ -21,7 +21,7 @@
*/
package org.jboss.test.microcontainer.beans.test;
-import org.jboss.aop.microcontainer.junit.AOPMicrocontainerTest;
+import org.jboss.test.aop.junit.AOPMicrocontainerTest;
import org.jboss.test.microcontainer.beans.POJO;
import org.jboss.test.microcontainer.beans.POJO2;
import org.jboss.test.microcontainer.beans.PerClassAspect;
Modified: projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/StackTest.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/StackTest.java 2008-02-26 11:45:23 UTC (rev 70089)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/StackTest.java 2008-02-26 11:49:46 UTC (rev 70090)
@@ -21,7 +21,7 @@
*/
package org.jboss.test.microcontainer.beans.test;
-import org.jboss.aop.microcontainer.junit.AOPMicrocontainerTest;
+import org.jboss.test.aop.junit.AOPMicrocontainerTest;
import org.jboss.test.microcontainer.beans.POJO;
import org.jboss.test.microcontainer.beans.SimpleFactoryAspect;
import org.jboss.test.microcontainer.beans.TestAspect;
Modified: projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/StackWithMultipleDependencyTest.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/StackWithMultipleDependencyTest.java 2008-02-26 11:45:23 UTC (rev 70089)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/StackWithMultipleDependencyTest.java 2008-02-26 11:49:46 UTC (rev 70090)
@@ -21,8 +21,8 @@
*/
package org.jboss.test.microcontainer.beans.test;
-import org.jboss.aop.microcontainer.junit.AOPMicrocontainerTest;
import org.jboss.dependency.spi.ControllerState;
+import org.jboss.test.aop.junit.AOPMicrocontainerTest;
import org.jboss.test.microcontainer.beans.Dependency;
import org.jboss.test.microcontainer.beans.POJO;
import org.jboss.test.microcontainer.beans.TestAspectWithDependency;
Modified: projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/StackWithSingleDependencyTest.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/StackWithSingleDependencyTest.java 2008-02-26 11:45:23 UTC (rev 70089)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/StackWithSingleDependencyTest.java 2008-02-26 11:49:46 UTC (rev 70090)
@@ -21,9 +21,9 @@
*/
package org.jboss.test.microcontainer.beans.test;
-import org.jboss.aop.microcontainer.junit.AOPMicrocontainerTest;
import org.jboss.dependency.spi.ControllerState;
import org.jboss.kernel.spi.dependency.KernelControllerContext;
+import org.jboss.test.aop.junit.AOPMicrocontainerTest;
import org.jboss.test.microcontainer.beans.Dependency;
import org.jboss.test.microcontainer.beans.POJO;
import org.jboss.test.microcontainer.beans.TestAspectWithDependency;
Modified: projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/TypeDefTest.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/TypeDefTest.java 2008-02-26 11:45:23 UTC (rev 70089)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/test/TypeDefTest.java 2008-02-26 11:49:46 UTC (rev 70090)
@@ -21,7 +21,7 @@
*/
package org.jboss.test.microcontainer.beans.test;
-import org.jboss.aop.microcontainer.junit.AOPMicrocontainerTest;
+import org.jboss.test.aop.junit.AOPMicrocontainerTest;
import org.jboss.test.microcontainer.beans.POJO;
import org.jboss.test.microcontainer.beans.TestAspect;
Modified: projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/woven/test/ArrayTest.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/woven/test/ArrayTest.java 2008-02-26 11:45:23 UTC (rev 70089)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/woven/test/ArrayTest.java 2008-02-26 11:49:46 UTC (rev 70090)
@@ -22,7 +22,7 @@
package org.jboss.test.microcontainer.beans.woven.test;
import org.jboss.aop.Advised;
-import org.jboss.aop.microcontainer.junit.AOPMicrocontainerTest;
+import org.jboss.test.aop.junit.AOPMicrocontainerTest;
import org.jboss.test.microcontainer.beans.TestInterceptor;
/**
Modified: projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/woven/test/PrepareTest.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/woven/test/PrepareTest.java 2008-02-26 11:45:23 UTC (rev 70089)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/beans/woven/test/PrepareTest.java 2008-02-26 11:49:46 UTC (rev 70090)
@@ -22,7 +22,7 @@
package org.jboss.test.microcontainer.beans.woven.test;
import org.jboss.aop.Advised;
-import org.jboss.aop.microcontainer.junit.AOPMicrocontainerTest;
+import org.jboss.test.aop.junit.AOPMicrocontainerTest;
import org.jboss.test.microcontainer.beans.POJO;
/**
Modified: projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/matrix/mc/test/AdvisedInstanceMetaDataContextTestCase.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/matrix/mc/test/AdvisedInstanceMetaDataContextTestCase.java 2008-02-26 11:45:23 UTC (rev 70089)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/matrix/mc/test/AdvisedInstanceMetaDataContextTestCase.java 2008-02-26 11:49:46 UTC (rev 70090)
@@ -25,8 +25,8 @@
import junit.framework.Test;
import org.jboss.aop.Advised;
-import org.jboss.aop.microcontainer.junit.AOPMicrocontainerTest;
import org.jboss.aop.proxy.container.AspectManaged;
+import org.jboss.test.aop.junit.AOPMicrocontainerTest;
import org.jboss.test.microcontainer.matrix.Base;
import org.jboss.test.microcontainer.matrix.TestInterceptor;
Modified: projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/matrix/mc/test/AdvisedNoInstanceDataTestCase.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/matrix/mc/test/AdvisedNoInstanceDataTestCase.java 2008-02-26 11:45:23 UTC (rev 70089)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/matrix/mc/test/AdvisedNoInstanceDataTestCase.java 2008-02-26 11:49:46 UTC (rev 70090)
@@ -25,8 +25,8 @@
import junit.framework.Test;
import org.jboss.aop.Advised;
-import org.jboss.aop.microcontainer.junit.AOPMicrocontainerTest;
import org.jboss.aop.proxy.container.AspectManaged;
+import org.jboss.test.aop.junit.AOPMicrocontainerTest;
import org.jboss.test.microcontainer.matrix.Base;
import org.jboss.test.microcontainer.matrix.TestInterceptor;
Modified: projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/matrix/mc/test/BaseAdvisedChildAdvisedAndProxyTestCase.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/matrix/mc/test/BaseAdvisedChildAdvisedAndProxyTestCase.java 2008-02-26 11:45:23 UTC (rev 70089)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/matrix/mc/test/BaseAdvisedChildAdvisedAndProxyTestCase.java 2008-02-26 11:49:46 UTC (rev 70090)
@@ -25,8 +25,8 @@
import junit.framework.Test;
import org.jboss.aop.Advised;
-import org.jboss.aop.microcontainer.junit.AOPMicrocontainerTest;
import org.jboss.aop.proxy.container.AspectManaged;
+import org.jboss.test.aop.junit.AOPMicrocontainerTest;
import org.jboss.test.microcontainer.matrix.AnnotatedChild;
import org.jboss.test.microcontainer.matrix.Base;
import org.jboss.test.microcontainer.matrix.Child;
Modified: projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/matrix/mc/test/BaseAdvisedChildProxyTestCase.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/matrix/mc/test/BaseAdvisedChildProxyTestCase.java 2008-02-26 11:45:23 UTC (rev 70089)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/matrix/mc/test/BaseAdvisedChildProxyTestCase.java 2008-02-26 11:49:46 UTC (rev 70090)
@@ -25,8 +25,8 @@
import junit.framework.Test;
import org.jboss.aop.Advised;
-import org.jboss.aop.microcontainer.junit.AOPMicrocontainerTest;
import org.jboss.aop.proxy.container.AspectManaged;
+import org.jboss.test.aop.junit.AOPMicrocontainerTest;
import org.jboss.test.microcontainer.matrix.AnnotatedChild;
import org.jboss.test.microcontainer.matrix.Base;
import org.jboss.test.microcontainer.matrix.Child;
Modified: projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/matrix/mc/test/BaseNotAdvisedChildAdvisedAndProxyTestCase.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/matrix/mc/test/BaseNotAdvisedChildAdvisedAndProxyTestCase.java 2008-02-26 11:45:23 UTC (rev 70089)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/matrix/mc/test/BaseNotAdvisedChildAdvisedAndProxyTestCase.java 2008-02-26 11:49:46 UTC (rev 70090)
@@ -24,8 +24,8 @@
import junit.framework.Test;
import org.jboss.aop.Advised;
-import org.jboss.aop.microcontainer.junit.AOPMicrocontainerTest;
import org.jboss.aop.proxy.container.AspectManaged;
+import org.jboss.test.aop.junit.AOPMicrocontainerTest;
import org.jboss.test.microcontainer.matrix.AnnotatedChild;
import org.jboss.test.microcontainer.matrix.Base;
import org.jboss.test.microcontainer.matrix.Child;
Modified: projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/matrix/mc/test/BaseNotAdvisedChildNotAdvisedTestCase.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/matrix/mc/test/BaseNotAdvisedChildNotAdvisedTestCase.java 2008-02-26 11:45:23 UTC (rev 70089)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/matrix/mc/test/BaseNotAdvisedChildNotAdvisedTestCase.java 2008-02-26 11:49:46 UTC (rev 70090)
@@ -25,8 +25,8 @@
import junit.framework.Test;
import org.jboss.aop.Advised;
-import org.jboss.aop.microcontainer.junit.AOPMicrocontainerTest;
import org.jboss.aop.proxy.container.AspectManaged;
+import org.jboss.test.aop.junit.AOPMicrocontainerTest;
import org.jboss.test.microcontainer.matrix.Base;
import org.jboss.test.microcontainer.matrix.Child;
Modified: projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/matrix/mc/test/BaseNotAdvisedChildProxyTestCase.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/matrix/mc/test/BaseNotAdvisedChildProxyTestCase.java 2008-02-26 11:45:23 UTC (rev 70089)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/matrix/mc/test/BaseNotAdvisedChildProxyTestCase.java 2008-02-26 11:49:46 UTC (rev 70090)
@@ -24,8 +24,8 @@
import junit.framework.Test;
import org.jboss.aop.Advised;
-import org.jboss.aop.microcontainer.junit.AOPMicrocontainerTest;
import org.jboss.aop.proxy.container.AspectManaged;
+import org.jboss.test.aop.junit.AOPMicrocontainerTest;
import org.jboss.test.microcontainer.matrix.AnnotatedChild;
import org.jboss.test.microcontainer.matrix.Base;
import org.jboss.test.microcontainer.matrix.Child;
Modified: projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/matrix/mc/test/BaseOnlyAdvisedChildAdvisedAndProxyTestCase.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/matrix/mc/test/BaseOnlyAdvisedChildAdvisedAndProxyTestCase.java 2008-02-26 11:45:23 UTC (rev 70089)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/matrix/mc/test/BaseOnlyAdvisedChildAdvisedAndProxyTestCase.java 2008-02-26 11:49:46 UTC (rev 70090)
@@ -25,8 +25,8 @@
import junit.framework.Test;
import org.jboss.aop.Advised;
-import org.jboss.aop.microcontainer.junit.AOPMicrocontainerTest;
import org.jboss.aop.proxy.container.AspectManaged;
+import org.jboss.test.aop.junit.AOPMicrocontainerTest;
import org.jboss.test.microcontainer.matrix.AnnotatedChild;
import org.jboss.test.microcontainer.matrix.Base;
import org.jboss.test.microcontainer.matrix.Child;
Modified: projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/matrix/mc/test/BaseOnlyAdvisedChildProxyTestCase.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/matrix/mc/test/BaseOnlyAdvisedChildProxyTestCase.java 2008-02-26 11:45:23 UTC (rev 70089)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/matrix/mc/test/BaseOnlyAdvisedChildProxyTestCase.java 2008-02-26 11:49:46 UTC (rev 70090)
@@ -25,8 +25,8 @@
import junit.framework.Test;
import org.jboss.aop.Advised;
-import org.jboss.aop.microcontainer.junit.AOPMicrocontainerTest;
import org.jboss.aop.proxy.container.AspectManaged;
+import org.jboss.test.aop.junit.AOPMicrocontainerTest;
import org.jboss.test.microcontainer.matrix.AnnotatedChild;
import org.jboss.test.microcontainer.matrix.Base;
import org.jboss.test.microcontainer.matrix.Child;
Modified: projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/matrix/mc/test/BaseOverriddenAdvisedChildAdvisedAndProxyTestCase.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/matrix/mc/test/BaseOverriddenAdvisedChildAdvisedAndProxyTestCase.java 2008-02-26 11:45:23 UTC (rev 70089)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/matrix/mc/test/BaseOverriddenAdvisedChildAdvisedAndProxyTestCase.java 2008-02-26 11:49:46 UTC (rev 70090)
@@ -25,8 +25,8 @@
import junit.framework.Test;
import org.jboss.aop.Advised;
-import org.jboss.aop.microcontainer.junit.AOPMicrocontainerTest;
import org.jboss.aop.proxy.container.AspectManaged;
+import org.jboss.test.aop.junit.AOPMicrocontainerTest;
import org.jboss.test.microcontainer.matrix.AnnotatedChild;
import org.jboss.test.microcontainer.matrix.Base;
import org.jboss.test.microcontainer.matrix.Child;
Modified: projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/matrix/mc/test/BaseOverriddenAdvisedChildProxyTestCase.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/matrix/mc/test/BaseOverriddenAdvisedChildProxyTestCase.java 2008-02-26 11:45:23 UTC (rev 70089)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/matrix/mc/test/BaseOverriddenAdvisedChildProxyTestCase.java 2008-02-26 11:49:46 UTC (rev 70090)
@@ -25,8 +25,8 @@
import junit.framework.Test;
import org.jboss.aop.Advised;
-import org.jboss.aop.microcontainer.junit.AOPMicrocontainerTest;
import org.jboss.aop.proxy.container.AspectManaged;
+import org.jboss.test.aop.junit.AOPMicrocontainerTest;
import org.jboss.test.microcontainer.matrix.AnnotatedChild;
import org.jboss.test.microcontainer.matrix.Base;
import org.jboss.test.microcontainer.matrix.Child;
Modified: projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/matrix/mc/test/BasePreparedChildAdvisedAndProxyTestCase.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/matrix/mc/test/BasePreparedChildAdvisedAndProxyTestCase.java 2008-02-26 11:45:23 UTC (rev 70089)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/matrix/mc/test/BasePreparedChildAdvisedAndProxyTestCase.java 2008-02-26 11:49:46 UTC (rev 70090)
@@ -24,8 +24,8 @@
import junit.framework.Test;
import org.jboss.aop.Advised;
-import org.jboss.aop.microcontainer.junit.AOPMicrocontainerTest;
import org.jboss.aop.proxy.container.AspectManaged;
+import org.jboss.test.aop.junit.AOPMicrocontainerTest;
import org.jboss.test.microcontainer.matrix.AnnotatedChild;
import org.jboss.test.microcontainer.matrix.Base;
import org.jboss.test.microcontainer.matrix.Child;
Modified: projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/matrix/mc/test/NotAdvisedInstanceMetaDataContextTestCase.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/matrix/mc/test/NotAdvisedInstanceMetaDataContextTestCase.java 2008-02-26 11:45:23 UTC (rev 70089)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/matrix/mc/test/NotAdvisedInstanceMetaDataContextTestCase.java 2008-02-26 11:49:46 UTC (rev 70090)
@@ -25,8 +25,8 @@
import junit.framework.Test;
import org.jboss.aop.Advised;
-import org.jboss.aop.microcontainer.junit.AOPMicrocontainerTest;
import org.jboss.aop.proxy.container.AspectManaged;
+import org.jboss.test.aop.junit.AOPMicrocontainerTest;
import org.jboss.test.microcontainer.matrix.Base;
import org.jboss.test.microcontainer.matrix.DynamicAspectDeployer;
import org.jboss.test.microcontainer.matrix.TestInterceptor;
Modified: projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/matrix/mc/test/NotAdvisedNoInstanceDataTestCase.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/matrix/mc/test/NotAdvisedNoInstanceDataTestCase.java 2008-02-26 11:45:23 UTC (rev 70089)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/matrix/mc/test/NotAdvisedNoInstanceDataTestCase.java 2008-02-26 11:49:46 UTC (rev 70090)
@@ -25,8 +25,8 @@
import junit.framework.Test;
import org.jboss.aop.Advised;
-import org.jboss.aop.microcontainer.junit.AOPMicrocontainerTest;
import org.jboss.aop.proxy.container.AspectManaged;
+import org.jboss.test.aop.junit.AOPMicrocontainerTest;
import org.jboss.test.microcontainer.matrix.Base;
import org.jboss.test.microcontainer.matrix.DynamicAspectDeployer;
import org.jboss.test.microcontainer.matrix.TestInterceptor;
Modified: projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/matrix/proxyfactory/test/AdvisedInstanceIntroductionsTestCase.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/matrix/proxyfactory/test/AdvisedInstanceIntroductionsTestCase.java 2008-02-26 11:45:23 UTC (rev 70089)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/matrix/proxyfactory/test/AdvisedInstanceIntroductionsTestCase.java 2008-02-26 11:49:46 UTC (rev 70090)
@@ -24,8 +24,8 @@
import junit.framework.Test;
import org.jboss.aop.Advised;
-import org.jboss.aop.microcontainer.junit.AbstractProxyTest;
import org.jboss.aop.proxy.container.AspectManaged;
+import org.jboss.test.aop.junit.AbstractProxyTest;
import org.jboss.test.microcontainer.support.SimpleBean;
import org.jboss.test.microcontainer.matrix.Base;
import org.jboss.test.microcontainer.matrix.ReturningInterceptor;
Modified: projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/matrix/proxyfactory/test/AdvisedInstanceMixinTestCase.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/matrix/proxyfactory/test/AdvisedInstanceMixinTestCase.java 2008-02-26 11:45:23 UTC (rev 70089)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/matrix/proxyfactory/test/AdvisedInstanceMixinTestCase.java 2008-02-26 11:49:46 UTC (rev 70090)
@@ -24,9 +24,9 @@
import junit.framework.Test;
import org.jboss.aop.Advised;
-import org.jboss.aop.microcontainer.junit.AbstractProxyTest;
import org.jboss.aop.proxy.container.AOPProxyFactoryMixin;
import org.jboss.aop.proxy.container.AspectManaged;
+import org.jboss.test.aop.junit.AbstractProxyTest;
import org.jboss.test.microcontainer.support.OtherMixin;
import org.jboss.test.microcontainer.support.OtherMixinImpl;
import org.jboss.test.microcontainer.support.SomeMixin;
Modified: projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/matrix/proxyfactory/test/AdvisedInstanceSimpleMetaDataTestCase.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/matrix/proxyfactory/test/AdvisedInstanceSimpleMetaDataTestCase.java 2008-02-26 11:45:23 UTC (rev 70089)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/matrix/proxyfactory/test/AdvisedInstanceSimpleMetaDataTestCase.java 2008-02-26 11:49:46 UTC (rev 70090)
@@ -26,8 +26,8 @@
import org.jboss.aop.Advised;
import org.jboss.aop.metadata.SimpleMetaData;
-import org.jboss.aop.microcontainer.junit.AbstractProxyTest;
import org.jboss.aop.proxy.container.AspectManaged;
+import org.jboss.test.aop.junit.AbstractProxyTest;
import org.jboss.test.microcontainer.matrix.Base;
import org.jboss.test.microcontainer.matrix.TestInterceptor;
Modified: projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/matrix/proxyfactory/test/AdvisedNoInstanceDataTestCase.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/matrix/proxyfactory/test/AdvisedNoInstanceDataTestCase.java 2008-02-26 11:45:23 UTC (rev 70089)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/matrix/proxyfactory/test/AdvisedNoInstanceDataTestCase.java 2008-02-26 11:49:46 UTC (rev 70090)
@@ -25,8 +25,8 @@
import junit.framework.Test;
import org.jboss.aop.Advised;
-import org.jboss.aop.microcontainer.junit.AbstractProxyTest;
import org.jboss.aop.proxy.container.AspectManaged;
+import org.jboss.test.aop.junit.AbstractProxyTest;
import org.jboss.test.microcontainer.matrix.Base;
import org.jboss.test.microcontainer.matrix.TestInterceptor;
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 2008-02-26 11:45:23 UTC (rev 70089)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/matrix/proxyfactory/test/BaseForceProxyChildAdvisedAndProxyTestCase.java 2008-02-26 11:49:46 UTC (rev 70090)
@@ -25,8 +25,8 @@
import junit.framework.Test;
import org.jboss.aop.Advised;
-import org.jboss.aop.microcontainer.junit.AbstractProxyTest;
import org.jboss.aop.proxy.container.AspectManaged;
+import org.jboss.test.aop.junit.AbstractProxyTest;
import org.jboss.test.microcontainer.matrix.Base;
import org.jboss.test.microcontainer.matrix.Child;
import org.jboss.test.microcontainer.matrix.ChildInterface;
Modified: projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/matrix/proxyfactory/test/NotAdvisedInstanceIntroductionsTestCase.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/matrix/proxyfactory/test/NotAdvisedInstanceIntroductionsTestCase.java 2008-02-26 11:45:23 UTC (rev 70089)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/matrix/proxyfactory/test/NotAdvisedInstanceIntroductionsTestCase.java 2008-02-26 11:49:46 UTC (rev 70090)
@@ -24,9 +24,9 @@
import junit.framework.Test;
import org.jboss.aop.Advised;
-import org.jboss.aop.microcontainer.junit.AbstractProxyTest;
import org.jboss.aop.proxy.container.AOPProxyFactoryMixin;
import org.jboss.aop.proxy.container.AspectManaged;
+import org.jboss.test.aop.junit.AbstractProxyTest;
import org.jboss.test.microcontainer.support.OtherMixin;
import org.jboss.test.microcontainer.support.OtherMixinImpl;
import org.jboss.test.microcontainer.support.SimpleBean;
Modified: projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/matrix/proxyfactory/test/NotAdvisedInstanceSimpleMetaDataTestCase.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/matrix/proxyfactory/test/NotAdvisedInstanceSimpleMetaDataTestCase.java 2008-02-26 11:45:23 UTC (rev 70089)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/matrix/proxyfactory/test/NotAdvisedInstanceSimpleMetaDataTestCase.java 2008-02-26 11:49:46 UTC (rev 70090)
@@ -26,8 +26,8 @@
import org.jboss.aop.Advised;
import org.jboss.aop.metadata.SimpleMetaData;
-import org.jboss.aop.microcontainer.junit.AbstractProxyTest;
import org.jboss.aop.proxy.container.AspectManaged;
+import org.jboss.test.aop.junit.AbstractProxyTest;
import org.jboss.test.microcontainer.matrix.Base;
import org.jboss.test.microcontainer.matrix.DynamicAspectDeployer;
import org.jboss.test.microcontainer.matrix.TestInterceptor;
Modified: projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/matrix/proxyfactory/test/NotAdvisedNoInstanceDataTestCase.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/matrix/proxyfactory/test/NotAdvisedNoInstanceDataTestCase.java 2008-02-26 11:45:23 UTC (rev 70089)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/matrix/proxyfactory/test/NotAdvisedNoInstanceDataTestCase.java 2008-02-26 11:49:46 UTC (rev 70090)
@@ -25,8 +25,8 @@
import junit.framework.Test;
import org.jboss.aop.Advised;
-import org.jboss.aop.microcontainer.junit.AbstractProxyTest;
import org.jboss.aop.proxy.container.AspectManaged;
+import org.jboss.test.aop.junit.AbstractProxyTest;
import org.jboss.test.microcontainer.matrix.Base;
import org.jboss.test.microcontainer.matrix.DynamicAspectDeployer;
import org.jboss.test.microcontainer.matrix.TestInterceptor;
Modified: projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/BeanCallingMethodInCtorTestCase.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/BeanCallingMethodInCtorTestCase.java 2008-02-26 11:45:23 UTC (rev 70089)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/BeanCallingMethodInCtorTestCase.java 2008-02-26 11:49:46 UTC (rev 70090)
@@ -21,7 +21,7 @@
*/
package org.jboss.test.microcontainer.test;
-import org.jboss.aop.microcontainer.junit.AOPMicrocontainerTest;
+import org.jboss.test.aop.junit.AOPMicrocontainerTest;
import org.jboss.test.microcontainer.support.BeanCallingMethodInCtor;
import org.jboss.test.microcontainer.support.CalledInterceptor;
Modified: projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/BeanNoDefaultCtorUsingParamTestCase.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/BeanNoDefaultCtorUsingParamTestCase.java 2008-02-26 11:45:23 UTC (rev 70089)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/BeanNoDefaultCtorUsingParamTestCase.java 2008-02-26 11:49:46 UTC (rev 70090)
@@ -21,7 +21,7 @@
*/
package org.jboss.test.microcontainer.test;
-import org.jboss.aop.microcontainer.junit.AOPMicrocontainerTest;
+import org.jboss.test.aop.junit.AOPMicrocontainerTest;
import org.jboss.test.microcontainer.support.BeanNoDefaultCtorUsingParam;
import org.jboss.test.microcontainer.support.CalledInterceptor;
Modified: projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/ConstructorInterceptorWithDependencyTestCase.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/ConstructorInterceptorWithDependencyTestCase.java 2008-02-26 11:45:23 UTC (rev 70089)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/ConstructorInterceptorWithDependencyTestCase.java 2008-02-26 11:49:46 UTC (rev 70090)
@@ -23,9 +23,9 @@
import junit.framework.Test;
-import org.jboss.aop.microcontainer.junit.AOPMicrocontainerTest;
import org.jboss.dependency.spi.ControllerState;
import org.jboss.kernel.spi.dependency.KernelControllerContext;
+import org.jboss.test.aop.junit.AOPMicrocontainerTest;
import org.jboss.test.microcontainer.support.InterceptorWithDependency;
import org.jboss.test.microcontainer.support.SimpleBean;
Modified: projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/CreatedBeansLifecycleCallbackTestCase.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/CreatedBeansLifecycleCallbackTestCase.java 2008-02-26 11:45:23 UTC (rev 70089)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/CreatedBeansLifecycleCallbackTestCase.java 2008-02-26 11:49:46 UTC (rev 70090)
@@ -23,8 +23,8 @@
import junit.framework.Test;
-import org.jboss.aop.microcontainer.junit.AOPMicrocontainerTest;
import org.jboss.dependency.spi.ControllerState;
+import org.jboss.test.aop.junit.AOPMicrocontainerTest;
import org.jboss.test.microcontainer.support.SimpleLifecycleCallback;
/**
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 2008-02-26 11:45:23 UTC (rev 70089)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/CreatedBeansLifecycleCallbackWithDependencyTestCase.java 2008-02-26 11:49:46 UTC (rev 70090)
@@ -23,9 +23,9 @@
import junit.framework.Test;
-import org.jboss.aop.microcontainer.junit.AOPMicrocontainerTest;
import org.jboss.dependency.spi.ControllerState;
import org.jboss.kernel.spi.dependency.KernelControllerContext;
+import org.jboss.test.aop.junit.AOPMicrocontainerTest;
import org.jboss.test.microcontainer.support.LifecycleCallbackWithBeanDependency;
import org.jboss.test.microcontainer.support.SimpleBean;
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 2008-02-26 11:45:23 UTC (rev 70089)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/DeployersInterceptedAspectManagerJMXTestCase.java 2008-02-26 11:49:46 UTC (rev 70090)
@@ -25,7 +25,7 @@
import junit.framework.Test;
-import org.jboss.aop.microcontainer.junit.AOPMicrocontainerTest;
+import org.jboss.test.aop.junit.AOPMicrocontainerTest;
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/DeployersInterceptedTestCase.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/DeployersInterceptedTestCase.java 2008-02-26 11:45:23 UTC (rev 70089)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/DeployersInterceptedTestCase.java 2008-02-26 11:49:46 UTC (rev 70090)
@@ -25,7 +25,7 @@
import junit.framework.Test;
-import org.jboss.aop.microcontainer.junit.AOPMicrocontainerTest;
+import org.jboss.test.aop.junit.AOPMicrocontainerTest;
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/InitialLifecycleCallbackTestCase.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/InitialLifecycleCallbackTestCase.java 2008-02-26 11:45:23 UTC (rev 70089)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/InitialLifecycleCallbackTestCase.java 2008-02-26 11:49:46 UTC (rev 70090)
@@ -23,8 +23,8 @@
import junit.framework.Test;
-import org.jboss.aop.microcontainer.junit.AOPMicrocontainerTest;
import org.jboss.dependency.spi.ControllerState;
+import org.jboss.test.aop.junit.AOPMicrocontainerTest;
import org.jboss.test.microcontainer.support.SimpleLifecycleCallback;
/**
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 2008-02-26 11:45:23 UTC (rev 70089)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/InitialLifecycleCallbackWithDependencyTestCase.java 2008-02-26 11:49:46 UTC (rev 70090)
@@ -23,9 +23,9 @@
import junit.framework.Test;
-import org.jboss.aop.microcontainer.junit.AOPMicrocontainerTest;
import org.jboss.dependency.spi.ControllerState;
import org.jboss.kernel.spi.dependency.KernelControllerContext;
+import org.jboss.test.aop.junit.AOPMicrocontainerTest;
import org.jboss.test.microcontainer.support.LifecycleCallbackWithBeanDependency;
import org.jboss.test.microcontainer.support.SimpleBean;
Modified: projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/InterceptedTestCase.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/InterceptedTestCase.java 2008-02-26 11:45:23 UTC (rev 70089)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/InterceptedTestCase.java 2008-02-26 11:49:46 UTC (rev 70090)
@@ -23,7 +23,7 @@
import junit.framework.Test;
-import org.jboss.aop.microcontainer.junit.AOPMicrocontainerTest;
+import org.jboss.test.aop.junit.AOPMicrocontainerTest;
import org.jboss.test.microcontainer.support.CalledInterceptor;
import org.jboss.test.microcontainer.support.SimpleBean;
Modified: projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/InterceptorWithAnnotationDependencyTestCase.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/InterceptorWithAnnotationDependencyTestCase.java 2008-02-26 11:45:23 UTC (rev 70089)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/InterceptorWithAnnotationDependencyTestCase.java 2008-02-26 11:49:46 UTC (rev 70090)
@@ -24,9 +24,9 @@
import junit.framework.Test;
import junit.textui.TestRunner;
-import org.jboss.aop.microcontainer.junit.AOPMicrocontainerTest;
import org.jboss.dependency.spi.ControllerState;
import org.jboss.kernel.spi.dependency.KernelControllerContext;
+import org.jboss.test.aop.junit.AOPMicrocontainerTest;
import org.jboss.test.microcontainer.support.InterceptorWithAnnotationDependency;
import org.jboss.test.microcontainer.support.SimpleBean;
import org.jboss.test.microcontainer.support.SimpleBeanImpl;
Modified: projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/InterceptorWithDependencyTestCase.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/InterceptorWithDependencyTestCase.java 2008-02-26 11:45:23 UTC (rev 70089)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/InterceptorWithDependencyTestCase.java 2008-02-26 11:49:46 UTC (rev 70090)
@@ -23,9 +23,9 @@
import junit.framework.Test;
-import org.jboss.aop.microcontainer.junit.AOPMicrocontainerTest;
import org.jboss.dependency.spi.ControllerState;
import org.jboss.kernel.spi.dependency.KernelControllerContext;
+import org.jboss.test.aop.junit.AOPMicrocontainerTest;
import org.jboss.test.microcontainer.support.InterceptorWithDependency;
import org.jboss.test.microcontainer.support.SimpleBean;
Modified: projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/InterceptorWithNestedAnnotationDependencyTestCase.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/InterceptorWithNestedAnnotationDependencyTestCase.java 2008-02-26 11:45:23 UTC (rev 70089)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/InterceptorWithNestedAnnotationDependencyTestCase.java 2008-02-26 11:49:46 UTC (rev 70090)
@@ -24,9 +24,9 @@
import junit.framework.Test;
import junit.textui.TestRunner;
-import org.jboss.aop.microcontainer.junit.AOPMicrocontainerTest;
import org.jboss.dependency.spi.ControllerState;
import org.jboss.kernel.spi.dependency.KernelControllerContext;
+import org.jboss.test.aop.junit.AOPMicrocontainerTest;
import org.jboss.test.microcontainer.support.InterceptorWithAnnotationDependency;
import org.jboss.test.microcontainer.support.InterceptorWithNestedAnnotationDependency;
import org.jboss.test.microcontainer.support.SimpleBean;
Modified: projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/InterceptorWithNestedMethodAnnotationDependencyTestCase.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/InterceptorWithNestedMethodAnnotationDependencyTestCase.java 2008-02-26 11:45:23 UTC (rev 70089)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/InterceptorWithNestedMethodAnnotationDependencyTestCase.java 2008-02-26 11:49:46 UTC (rev 70090)
@@ -24,9 +24,9 @@
import junit.framework.Test;
import junit.textui.TestRunner;
-import org.jboss.aop.microcontainer.junit.AOPMicrocontainerTest;
import org.jboss.dependency.spi.ControllerState;
import org.jboss.kernel.spi.dependency.KernelControllerContext;
+import org.jboss.test.aop.junit.AOPMicrocontainerTest;
import org.jboss.test.microcontainer.support.InterceptorWithAnnotationDependency;
import org.jboss.test.microcontainer.support.InterceptorWithNestedAnnotationDependency;
import org.jboss.test.microcontainer.support.SimpleBean;
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 2008-02-26 11:45:23 UTC (rev 70089)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/InterceptorWithOverriddenClassAnnotationDependencyTestCase.java 2008-02-26 11:49:46 UTC (rev 70090)
@@ -24,9 +24,9 @@
import junit.framework.Test;
import junit.textui.TestRunner;
-import org.jboss.aop.microcontainer.junit.AOPMicrocontainerTest;
import org.jboss.dependency.spi.ControllerState;
import org.jboss.kernel.spi.dependency.KernelControllerContext;
+import org.jboss.test.aop.junit.AOPMicrocontainerTest;
import org.jboss.test.microcontainer.support.InterceptorWithAnnotationDependency;
import org.jboss.test.microcontainer.support.SimpleBean;
Modified: projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/InterceptorWithOverriddenMethodAnnotationDependencyBaseTest.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/InterceptorWithOverriddenMethodAnnotationDependencyBaseTest.java 2008-02-26 11:45:23 UTC (rev 70089)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/InterceptorWithOverriddenMethodAnnotationDependencyBaseTest.java 2008-02-26 11:49:46 UTC (rev 70090)
@@ -21,9 +21,9 @@
*/
package org.jboss.test.microcontainer.test;
-import org.jboss.aop.microcontainer.junit.AOPMicrocontainerTest;
import org.jboss.dependency.spi.ControllerState;
import org.jboss.kernel.spi.dependency.KernelControllerContext;
+import org.jboss.test.aop.junit.AOPMicrocontainerTest;
import org.jboss.test.microcontainer.support.InterceptorWithAnnotationDependency;
import org.jboss.test.microcontainer.support.OverriddenPropertyAnnotatedBean;
import org.jboss.test.microcontainer.support.SimpleBean;
Modified: projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/IntroductionDependencyTestCase.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/IntroductionDependencyTestCase.java 2008-02-26 11:45:23 UTC (rev 70089)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/IntroductionDependencyTestCase.java 2008-02-26 11:49:46 UTC (rev 70090)
@@ -23,9 +23,9 @@
import junit.framework.Test;
-import org.jboss.aop.microcontainer.junit.AOPMicrocontainerTest;
import org.jboss.dependency.spi.ControllerState;
import org.jboss.kernel.spi.dependency.KernelControllerContext;
+import org.jboss.test.aop.junit.AOPMicrocontainerTest;
import org.jboss.test.microcontainer.support.InterceptorWithDependency;
import org.jboss.test.microcontainer.support.MarkerInterface;
import org.jboss.test.microcontainer.support.SimpleBean;
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 2008-02-26 11:45:23 UTC (rev 70089)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/JMXDecoratedTestCase.java 2008-02-26 11:49:46 UTC (rev 70090)
@@ -30,7 +30,7 @@
import junit.framework.Test;
import org.jboss.aop.microcontainer.aspects.jmx.JMX;
-import org.jboss.aop.microcontainer.junit.AOPMicrocontainerTest;
+import org.jboss.test.aop.junit.AOPMicrocontainerTest;
import org.jboss.test.microcontainer.support.JmxRegistrant;
import org.jboss.test.microcontainer.support.MetaDataContextInterceptor;
import org.jboss.test.microcontainer.support.SimpleBean;
Modified: projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/JMXLifecycleTestCase.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/JMXLifecycleTestCase.java 2008-02-26 11:45:23 UTC (rev 70089)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/JMXLifecycleTestCase.java 2008-02-26 11:49:46 UTC (rev 70090)
@@ -29,7 +29,7 @@
import junit.framework.Test;
-import org.jboss.aop.microcontainer.junit.AOPMicrocontainerTest;
+import org.jboss.test.aop.junit.AOPMicrocontainerTest;
import org.jboss.test.microcontainer.support.JmxRegistrant;
public class JMXLifecycleTestCase extends AOPMicrocontainerTest
Modified: projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/JndiDecoratedTestCase.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/JndiDecoratedTestCase.java 2008-02-26 11:45:23 UTC (rev 70089)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/JndiDecoratedTestCase.java 2008-02-26 11:49:46 UTC (rev 70090)
@@ -28,7 +28,7 @@
import junit.framework.Test;
-import org.jboss.aop.microcontainer.junit.AOPMicrocontainerTest;
+import org.jboss.test.aop.junit.AOPMicrocontainerTest;
import org.jboss.test.microcontainer.support.jndi.SimpleBean;
import org.jboss.test.microcontainer.support.jndi.SimpleBeanAnnotatedImpl;
Modified: projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/JndiLifeCycleTestCase.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/JndiLifeCycleTestCase.java 2008-02-26 11:45:23 UTC (rev 70089)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/JndiLifeCycleTestCase.java 2008-02-26 11:49:46 UTC (rev 70090)
@@ -7,7 +7,7 @@
import junit.framework.Test;
-import org.jboss.aop.microcontainer.junit.AOPMicrocontainerTest;
+import org.jboss.test.aop.junit.AOPMicrocontainerTest;
import org.jboss.test.microcontainer.support.jndi.SimpleBean;
import org.jboss.test.microcontainer.support.jndi.SimpleBeanAnnotatedImpl;
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 2008-02-26 11:45:23 UTC (rev 70089)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/LifecycleTestCase.java 2008-02-26 11:49:46 UTC (rev 70090)
@@ -25,7 +25,7 @@
import junit.framework.Test;
-import org.jboss.aop.microcontainer.junit.AOPMicrocontainerTest;
+import org.jboss.test.aop.junit.AOPMicrocontainerTest;
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/MetaDataTestCase.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/MetaDataTestCase.java 2008-02-26 11:45:23 UTC (rev 70089)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/MetaDataTestCase.java 2008-02-26 11:49:46 UTC (rev 70090)
@@ -23,7 +23,7 @@
import junit.framework.Test;
-import org.jboss.aop.microcontainer.junit.AOPMicrocontainerTest;
+import org.jboss.test.aop.junit.AOPMicrocontainerTest;
import org.jboss.test.microcontainer.support.MetaDataContextInterceptor;
import org.jboss.test.microcontainer.support.PropertyBean;
Modified: projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/MixinTestCase.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/MixinTestCase.java 2008-02-26 11:45:23 UTC (rev 70089)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/MixinTestCase.java 2008-02-26 11:49:46 UTC (rev 70090)
@@ -23,7 +23,7 @@
import junit.framework.Test;
-import org.jboss.aop.microcontainer.junit.AOPMicrocontainerTest;
+import org.jboss.test.aop.junit.AOPMicrocontainerTest;
import org.jboss.test.microcontainer.support.OtherMixin;
import org.jboss.test.microcontainer.support.OtherMixinImpl;
import org.jboss.test.microcontainer.support.SimpleBean;
Modified: projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/MultipleLifecycleTestCase.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/MultipleLifecycleTestCase.java 2008-02-26 11:45:23 UTC (rev 70089)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/MultipleLifecycleTestCase.java 2008-02-26 11:49:46 UTC (rev 70090)
@@ -28,7 +28,7 @@
import junit.framework.Test;
-import org.jboss.aop.microcontainer.junit.AOPMicrocontainerTest;
+import org.jboss.test.aop.junit.AOPMicrocontainerTest;
import org.jboss.test.microcontainer.support.SimpleLifecycleCallback;
/**
Modified: projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/NonDefaultMethodsLifecycleCallbackTestCase.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/NonDefaultMethodsLifecycleCallbackTestCase.java 2008-02-26 11:45:23 UTC (rev 70089)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/NonDefaultMethodsLifecycleCallbackTestCase.java 2008-02-26 11:49:46 UTC (rev 70090)
@@ -23,7 +23,7 @@
import junit.framework.Test;
-import org.jboss.aop.microcontainer.junit.AOPMicrocontainerTest;
+import org.jboss.test.aop.junit.AOPMicrocontainerTest;
import org.jboss.test.microcontainer.support.NonDefaultMethodsLifecycleCallback;
/**
Modified: projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/ScopingAopTestCase.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/ScopingAopTestCase.java 2008-02-26 11:45:23 UTC (rev 70089)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/ScopingAopTestCase.java 2008-02-26 11:49:46 UTC (rev 70090)
@@ -22,10 +22,10 @@
package org.jboss.test.microcontainer.test;
import junit.framework.Test;
-import org.jboss.aop.microcontainer.junit.AOPMicrocontainerTest;
-import org.jboss.aop.microcontainer.junit.AOPMicrocontainerTestDelegate;
-import org.jboss.aop.microcontainer.junit.ScopingAOPMicrocontainerTestDelegate;
import org.jboss.test.AbstractTestDelegate;
+import org.jboss.test.aop.junit.AOPMicrocontainerTest;
+import org.jboss.test.aop.junit.AOPMicrocontainerTestDelegate;
+import org.jboss.test.aop.junit.ScopingAOPMicrocontainerTestDelegate;
import org.jboss.test.microcontainer.support.CalledInterceptor;
import org.jboss.test.microcontainer.support.SimpleBean;
Modified: projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/SimpleAspectTestCase.java
===================================================================
--- projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/SimpleAspectTestCase.java 2008-02-26 11:45:23 UTC (rev 70089)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/SimpleAspectTestCase.java 2008-02-26 11:49:46 UTC (rev 70090)
@@ -23,7 +23,7 @@
import junit.framework.Test;
-import org.jboss.aop.microcontainer.junit.AOPMicrocontainerTest;
+import org.jboss.test.aop.junit.AOPMicrocontainerTest;
import org.jboss.test.microcontainer.support.SimpleBeanImpl;
import org.jboss.test.microcontainer.support.TestAspect;
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 2008-02-26 11:45:23 UTC (rev 70089)
+++ projects/microcontainer/trunk/aop-mc-int/src/tests/org/jboss/test/microcontainer/test/UnwindLifeCycleTestCase.java 2008-02-26 11:49:46 UTC (rev 70090)
@@ -3,7 +3,7 @@
import junit.framework.Test;
-import org.jboss.aop.microcontainer.junit.AOPMicrocontainerTest;
+import org.jboss.test.aop.junit.AOPMicrocontainerTest;
import org.jboss.test.microcontainer.support.ErrorLifecycleCallback;
import org.jboss.test.microcontainer.support.InstallUninstallLifecycleCallback;
More information about the jboss-cvs-commits
mailing list