[WFLY-18370] Move the module tccl test into sub package

iweiss · Sep 18, 2023 · 69db5fd · 69db5fd
1 parent e2ac3c7
commit 69db5fd
Show file tree

Hide file tree

Showing 9 changed files with 16 additions and 16 deletions.
diff --git a/...xt/classloader/ClassAInSarDeployment.java → ...sloader/module/ClassAInSarDeployment.java b/...xt/classloader/ClassAInSarDeployment.java → ...sloader/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/...xt/classloader/ClassBInSarDeployment.java → ...sloader/module/ClassBInSarDeployment.java b/...xt/classloader/ClassBInSarDeployment.java → ...sloader/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/...xt/classloader/ClassCInSarDeployment.java → ...sloader/module/ClassCInSarDeployment.java b/...xt/classloader/ClassCInSarDeployment.java → ...sloader/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/...xt/classloader/ClassDInSarDeployment.java → ...sloader/module/ClassDInSarDeployment.java b/...xt/classloader/ClassDInSarDeployment.java → ...sloader/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/...ontext/classloader/MBeanTCCLTestCase.java → ...der/module/MBeanInModuleTCCLTestCase.java b/...ontext/classloader/MBeanTCCLTestCase.java → ...der/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/...lassloader/jboss-deployment-structure.xml → ...der/module/jboss-deployment-structure.xml b/...lassloader/jboss-deployment-structure.xml → ...der/module/jboss-deployment-structure.xml
diff --git a/...ssloader/mbean/MBeanInAModuleService.java → ...r/module/mbean/MBeanInAModuleService.java b/...ssloader/mbean/MBeanInAModuleService.java → ...r/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/...der/mbean/MBeanInAModuleServiceMBean.java → ...ule/mbean/MBeanInAModuleServiceMBean.java b/...der/mbean/MBeanInAModuleServiceMBean.java → ...ule/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/...t/classloader/mbean/tccl-test-service.xml → ...loader/module/mbean/tccl-test-service.xml b/...t/classloader/mbean/tccl-test-service.xml → ...loader/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">
 
-    <mbean name="wildfly:name=tccl-test-mbean" code="org.jboss.as.test.integration.sar.context.classloader.mbean.MBeanInAModuleService">
+    <mbean name="wildfly:name=tccl-test-mbean" code="org.jboss.as.test.integration.sar.context.classloader.module.mbean.MBeanInAModuleService">
     </mbean>
 </server>