diff --git a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/sar/context/classloader/ClassAInSarDeployment.java b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/sar/context/classloader/module/ClassAInSarDeployment.java similarity index 94% rename from testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/sar/context/classloader/ClassAInSarDeployment.java rename to testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/sar/context/classloader/module/ClassAInSarDeployment.java index 9ce759986636..877c611d731b 100644 --- a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/sar/context/classloader/ClassAInSarDeployment.java +++ b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/sar/context/classloader/module/ClassAInSarDeployment.java @@ -20,7 +20,7 @@ * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.jboss.as.test.integration.sar.context.classloader; +package org.jboss.as.test.integration.sar.context.classloader.module; /** * @author: Jaikiran Pai diff --git a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/sar/context/classloader/ClassBInSarDeployment.java b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/sar/context/classloader/module/ClassBInSarDeployment.java similarity index 94% rename from testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/sar/context/classloader/ClassBInSarDeployment.java rename to testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/sar/context/classloader/module/ClassBInSarDeployment.java index 563f847006a9..4c6cac391814 100644 --- a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/sar/context/classloader/ClassBInSarDeployment.java +++ b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/sar/context/classloader/module/ClassBInSarDeployment.java @@ -20,7 +20,7 @@ * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.jboss.as.test.integration.sar.context.classloader; +package org.jboss.as.test.integration.sar.context.classloader.module; /** * @author: Jaikiran Pai diff --git a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/sar/context/classloader/ClassCInSarDeployment.java b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/sar/context/classloader/module/ClassCInSarDeployment.java similarity index 94% rename from testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/sar/context/classloader/ClassCInSarDeployment.java rename to testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/sar/context/classloader/module/ClassCInSarDeployment.java index 7b3debde58e9..2e4bb0558eb6 100644 --- a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/sar/context/classloader/ClassCInSarDeployment.java +++ b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/sar/context/classloader/module/ClassCInSarDeployment.java @@ -20,7 +20,7 @@ * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.jboss.as.test.integration.sar.context.classloader; +package org.jboss.as.test.integration.sar.context.classloader.module; /** * @author: Jaikiran Pai diff --git a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/sar/context/classloader/ClassDInSarDeployment.java b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/sar/context/classloader/module/ClassDInSarDeployment.java similarity index 94% rename from testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/sar/context/classloader/ClassDInSarDeployment.java rename to testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/sar/context/classloader/module/ClassDInSarDeployment.java index e320f771ad1f..1cc8d8772157 100644 --- a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/sar/context/classloader/ClassDInSarDeployment.java +++ b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/sar/context/classloader/module/ClassDInSarDeployment.java @@ -20,7 +20,7 @@ * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ -package org.jboss.as.test.integration.sar.context.classloader; +package org.jboss.as.test.integration.sar.context.classloader.module; /** * @author: Jaikiran Pai diff --git a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/sar/context/classloader/MBeanTCCLTestCase.java b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/sar/context/classloader/module/MBeanInModuleTCCLTestCase.java similarity index 92% rename from testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/sar/context/classloader/MBeanTCCLTestCase.java rename to testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/sar/context/classloader/module/MBeanInModuleTCCLTestCase.java index ed84b0b49d80..e4a015752d56 100644 --- a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/sar/context/classloader/MBeanTCCLTestCase.java +++ b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/sar/context/classloader/module/MBeanInModuleTCCLTestCase.java @@ -1,4 +1,4 @@ -package org.jboss.as.test.integration.sar.context.classloader; +package org.jboss.as.test.integration.sar.context.classloader.module; import java.io.IOException; @@ -14,8 +14,8 @@ import org.jboss.as.arquillian.api.ContainerResource; import org.jboss.as.arquillian.container.ManagementClient; import org.jboss.as.test.integration.common.DefaultConfiguration; -import org.jboss.as.test.integration.sar.context.classloader.mbean.MBeanInAModuleService; -import org.jboss.as.test.integration.sar.context.classloader.mbean.MBeanInAModuleServiceMBean; +import org.jboss.as.test.integration.sar.context.classloader.module.mbean.MBeanInAModuleService; +import org.jboss.as.test.integration.sar.context.classloader.module.mbean.MBeanInAModuleServiceMBean; import org.jboss.shrinkwrap.api.Archive; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; @@ -36,7 +36,7 @@ */ @RunWith(Arquillian.class) @RunAsClient -public class MBeanTCCLTestCase { +public class MBeanInModuleTCCLTestCase { private static final String EAR_NAME = "tccl-mbean-test-app"; private static final String SAR_NAME = "tccl-mbean-test-sar"; @@ -82,7 +82,7 @@ public static Archive createDeployment() { final EnterpriseArchive ear = ShrinkWrap.create(EnterpriseArchive.class, EAR_NAME + ".ear"); ear.addAsModule(sar); ear.addAsModule(jar); - ear.addAsManifestResource(MBeanTCCLTestCase.class.getPackage(), "jboss-deployment-structure.xml", "jboss-deployment-structure.xml"); + ear.addAsManifestResource(MBeanInModuleTCCLTestCase.class.getPackage(), "jboss-deployment-structure.xml", "jboss-deployment-structure.xml"); ear.addAsManifestResource(createPermissionsXmlAsset( // mbean [wildfly:name=tccl-test-mbean] needs the following permission diff --git a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/sar/context/classloader/jboss-deployment-structure.xml b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/sar/context/classloader/module/jboss-deployment-structure.xml similarity index 100% rename from testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/sar/context/classloader/jboss-deployment-structure.xml rename to testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/sar/context/classloader/module/jboss-deployment-structure.xml diff --git a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/sar/context/classloader/mbean/MBeanInAModuleService.java b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/sar/context/classloader/module/mbean/MBeanInAModuleService.java similarity index 86% rename from testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/sar/context/classloader/mbean/MBeanInAModuleService.java rename to testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/sar/context/classloader/module/mbean/MBeanInAModuleService.java index 4735142427d0..e0224518ecdc 100644 --- a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/sar/context/classloader/mbean/MBeanInAModuleService.java +++ b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/sar/context/classloader/module/mbean/MBeanInAModuleService.java @@ -1,4 +1,4 @@ -package org.jboss.as.test.integration.sar.context.classloader.mbean; +package org.jboss.as.test.integration.sar.context.classloader.module.mbean; import org.jboss.logging.Logger; @@ -14,13 +14,13 @@ public class MBeanInAModuleService implements MBeanInAModuleServiceMBean { static { logger.trace("Static block of " + MBeanInAModuleService.class.getName() + " being loaded"); // test TCCL in static block - testClassLoadByTCCL("org.jboss.as.test.integration.sar.context.classloader.ClassAInSarDeployment"); + testClassLoadByTCCL("org.jboss.as.test.integration.sar.context.classloader.module.ClassAInSarDeployment"); } public MBeanInAModuleService() { logger.trace("Constructing " + this); // test TCCL in constructor - testClassLoadByTCCL("org.jboss.as.test.integration.sar.context.classloader.ClassBInSarDeployment"); + testClassLoadByTCCL("org.jboss.as.test.integration.sar.context.classloader.module.ClassBInSarDeployment"); } @Override @@ -31,13 +31,13 @@ public int add(int a, int b) { public void start() { logger.trace("Starting " + this); // test TCCL in lifecycle method - testClassLoadByTCCL("org.jboss.as.test.integration.sar.context.classloader.ClassCInSarDeployment"); + testClassLoadByTCCL("org.jboss.as.test.integration.sar.context.classloader.module.ClassCInSarDeployment"); } public void stop() { logger.trace("Stopping " + this); // test TCCL in lifecycle method - testClassLoadByTCCL("org.jboss.as.test.integration.sar.context.classloader.ClassDInSarDeployment"); + testClassLoadByTCCL("org.jboss.as.test.integration.sar.context.classloader.module.ClassDInSarDeployment"); } private static void testClassLoadByTCCL(final String className) { diff --git a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/sar/context/classloader/mbean/MBeanInAModuleServiceMBean.java b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/sar/context/classloader/module/mbean/MBeanInAModuleServiceMBean.java similarity index 59% rename from testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/sar/context/classloader/mbean/MBeanInAModuleServiceMBean.java rename to testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/sar/context/classloader/module/mbean/MBeanInAModuleServiceMBean.java index 2facac424ed2..beb94847a8b8 100644 --- a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/sar/context/classloader/mbean/MBeanInAModuleServiceMBean.java +++ b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/sar/context/classloader/module/mbean/MBeanInAModuleServiceMBean.java @@ -1,4 +1,4 @@ -package org.jboss.as.test.integration.sar.context.classloader.mbean; +package org.jboss.as.test.integration.sar.context.classloader.module.mbean; /** * @author: Jaikiran Pai diff --git a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/sar/context/classloader/mbean/tccl-test-service.xml b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/sar/context/classloader/module/mbean/tccl-test-service.xml similarity index 94% rename from testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/sar/context/classloader/mbean/tccl-test-service.xml rename to testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/sar/context/classloader/module/mbean/tccl-test-service.xml index da1e4e5be57e..165f46068d0c 100644 --- a/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/sar/context/classloader/mbean/tccl-test-service.xml +++ b/testsuite/integration/basic/src/test/java/org/jboss/as/test/integration/sar/context/classloader/module/mbean/tccl-test-service.xml @@ -23,6 +23,6 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:jboss:service:7.0 jboss-service_7_0.xsd"> - +