Merge pull request wildfly#17128 from lvydra/WFLY-18348

[WFLY-18348] PermissionUtils should delegate to the WildFly Core variant where possible
iweiss · Sep 18, 2023 · 6434f52 · 6434f52
2 parents 54dfcb1 + 05797f7
commit 6434f52
Show file tree

Hide file tree

Showing 255 changed files with 240 additions and 399 deletions.
diff --git a/boms/standard-test/pom.xml b/boms/standard-test/pom.xml
@@ -351,18 +351,6 @@
                 <version>${version.org.wildfly.extras.creaper}</version>
                 <scope>test</scope>
             </dependency>
-
-            <dependency>
-                <groupId>xom</groupId>
-                <artifactId>xom</artifactId>
-                <version>${version.xom}</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>*</groupId>
-                        <artifactId>*</artifactId>
-                    </exclusion>
-                </exclusions>
-            </dependency>
         </dependencies>
 
     </dependencyManagement>

diff --git a/pom.xml b/pom.xml
@@ -369,7 +369,6 @@
         <version.org.wildfly.arquillian>5.0.1.Final</version.org.wildfly.arquillian>
         <version.org.wildfly.extras.creaper>1.6.2</version.org.wildfly.extras.creaper>
         <legacy.version.org.wildfly.naming-client>1.0.17.Final</legacy.version.org.wildfly.naming-client>
-        <version.xom>1.3.8</version.xom>
 
         <!--
             *Non-plugin* PRODUCTION CODE dependency versions. Please keep alphabetical.

diff --git a/testsuite/domain/pom.xml b/testsuite/domain/pom.xml
@@ -244,11 +244,6 @@
             <artifactId>wildfly-elytron-ssl</artifactId>
             <scope>test</scope>
         </dependency>
-
-        <dependency>
-            <groupId>xom</groupId>
-            <artifactId>xom</artifactId>
-        </dependency>
     </dependencies>
 
     <build>

diff --git a/...omain/src/test/java/org/jboss/as/test/integration/domain/JVMServerPropertiesTestCase.java b/...omain/src/test/java/org/jboss/as/test/integration/domain/JVMServerPropertiesTestCase.java
@@ -35,7 +35,7 @@
 import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.SERVER_GROUP;
 import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.STEPS;
 import static org.jboss.as.test.integration.domain.management.util.DomainTestSupport.safeClose;
-import static org.jboss.as.test.shared.integration.ejb.security.PermissionUtils.createPermissionsXmlAsset;
+import static org.jboss.as.test.shared.PermissionUtils.createPermissionsXmlAsset;
 
 import java.io.BufferedReader;
 import java.io.IOException;

diff --git a/...rc/test/java/org/jboss/as/test/integration/domain/management/cli/RolloutPlanTestCase.java b/...rc/test/java/org/jboss/as/test/integration/domain/management/cli/RolloutPlanTestCase.java
@@ -21,7 +21,7 @@
  */
 package org.jboss.as.test.integration.domain.management.cli;
 
-import static org.jboss.as.test.shared.integration.ejb.security.PermissionUtils.createPermissionsXmlAsset;
+import static org.jboss.as.test.shared.PermissionUtils.createPermissionsXmlAsset;
 
 import java.io.File;
 import java.net.SocketPermission;

diff --git a/testsuite/integration/basic/pom.xml b/testsuite/integration/basic/pom.xml
@@ -773,10 +773,6 @@
             <groupId>org.wildfly.wildfly-http-client</groupId>
             <artifactId>wildfly-http-transaction-client</artifactId>
         </dependency>
-        <dependency>
-            <groupId>xom</groupId>
-            <artifactId>xom</artifactId>
-        </dependency>
         <dependency>
             <groupId>wsdl4j</groupId>
             <artifactId>wsdl4j</artifactId>

diff --git a/...basic/src/test/java/org/jboss/as/test/integration/batch/chunk/ChunkPartitionTestCase.java b/...basic/src/test/java/org/jboss/as/test/integration/batch/chunk/ChunkPartitionTestCase.java
@@ -22,7 +22,7 @@
 
 package org.jboss.as.test.integration.batch.chunk;
 
-import static org.jboss.as.test.shared.integration.ejb.security.PermissionUtils.createPermissionsXmlAsset;
+import static org.jboss.as.test.shared.PermissionUtils.createPermissionsXmlAsset;
 
 import java.io.FilePermission;
 import java.net.URL;

diff --git a/...basic/src/test/java/org/jboss/as/test/integration/batch/common/AbstractBatchTestCase.java b/...basic/src/test/java/org/jboss/as/test/integration/batch/common/AbstractBatchTestCase.java
@@ -22,7 +22,7 @@
 
 package org.jboss.as.test.integration.batch.common;
 
-import static org.jboss.as.test.shared.integration.ejb.security.PermissionUtils.createPermissionsXmlAsset;
+import static org.jboss.as.test.shared.PermissionUtils.createPermissionsXmlAsset;
 
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;

diff --git a/...asic/src/test/java/org/jboss/as/test/integration/batch/deployment/JobControlTestCase.java b/...asic/src/test/java/org/jboss/as/test/integration/batch/deployment/JobControlTestCase.java
@@ -22,7 +22,7 @@
 
 package org.jboss.as.test.integration.batch.deployment;
 
-import static org.jboss.as.test.shared.integration.ejb.security.PermissionUtils.createPermissionsXmlAsset;
+import static org.jboss.as.test.shared.PermissionUtils.createPermissionsXmlAsset;
 
 import java.io.FilePermission;
 import java.io.IOException;

diff --git a/...tion/basic/src/test/java/org/jboss/as/test/integration/bc/BouncyCastleModuleTestCase.java b/...tion/basic/src/test/java/org/jboss/as/test/integration/bc/BouncyCastleModuleTestCase.java
@@ -21,7 +21,7 @@
  */
 package org.jboss.as.test.integration.bc;
 
-import static org.jboss.as.test.shared.integration.ejb.security.PermissionUtils.createPermissionsXmlAsset;
+import static org.jboss.as.test.shared.PermissionUtils.createPermissionsXmlAsset;
 
 import java.nio.charset.StandardCharsets;
 import java.security.Key;

diff --git a/...src/test/java/org/jboss/as/test/integration/beanvalidation/BeanValidationEE8TestCase.java b/...src/test/java/org/jboss/as/test/integration/beanvalidation/BeanValidationEE8TestCase.java
@@ -44,7 +44,7 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
-import static org.jboss.as.test.shared.integration.ejb.security.PermissionUtils.createPermissionsXmlAsset;
+import static org.jboss.as.test.shared.PermissionUtils.createPermissionsXmlAsset;
 
 /**
  * A test validating the Jakarta Bean Validation 2.0 support.

diff --git a/...as/test/integration/deployment/classloading/ear/EarJbossStructureDepedenciesTestCase.java b/...as/test/integration/deployment/classloading/ear/EarJbossStructureDepedenciesTestCase.java
@@ -32,7 +32,7 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
-import static org.jboss.as.test.shared.integration.ejb.security.PermissionUtils.createPermissionsXmlAsset;
+import static org.jboss.as.test.shared.PermissionUtils.createPermissionsXmlAsset;
 
 @RunWith(Arquillian.class)
 public class EarJbossStructureDepedenciesTestCase {

diff --git a/...ss/as/test/integration/deployment/classloading/war/WarChildFirstClassLoadingTestCase.java b/...ss/as/test/integration/deployment/classloading/war/WarChildFirstClassLoadingTestCase.java
@@ -21,7 +21,7 @@
  */
 package org.jboss.as.test.integration.deployment.classloading.war;
 
-import static org.jboss.as.test.shared.integration.ejb.security.PermissionUtils.createPermissionsXmlAsset;
+import static org.jboss.as.test.shared.PermissionUtils.createPermissionsXmlAsset;
 
 import jakarta.ejb.Stateless;
 

diff --git a/.../test/integration/deployment/classloading/war/WarInEarChildFirstClassLoadingTestCase.java b/.../test/integration/deployment/classloading/war/WarInEarChildFirstClassLoadingTestCase.java
@@ -38,7 +38,7 @@
 import org.junit.runner.RunWith;
 import org.jboss.as.test.integration.common.WebInfLibClass;
 
-import static org.jboss.as.test.shared.integration.ejb.security.PermissionUtils.createPermissionsXmlAsset;
+import static org.jboss.as.test.shared.PermissionUtils.createPermissionsXmlAsset;
 
 @RunWith(Arquillian.class)
 public class WarInEarChildFirstClassLoadingTestCase {

diff --git a/...sic/src/test/java/org/jboss/as/test/integration/deployment/jcedeployment/JCETestCase.java b/...sic/src/test/java/org/jboss/as/test/integration/deployment/jcedeployment/JCETestCase.java
@@ -22,7 +22,7 @@
 package org.jboss.as.test.integration.deployment.jcedeployment;
 
 import static java.util.concurrent.TimeUnit.SECONDS;
-import static org.jboss.as.test.shared.integration.ejb.security.PermissionUtils.createPermissionsXmlAsset;
+import static org.jboss.as.test.shared.PermissionUtils.createPermissionsXmlAsset;
 import static org.junit.Assert.assertEquals;
 
 import java.io.File;

diff --git a/...oss/as/test/integration/deployment/structure/ear/EarJBossDeploymentStructureTestCase.java b/...oss/as/test/integration/deployment/structure/ear/EarJBossDeploymentStructureTestCase.java
@@ -1,6 +1,6 @@
 package org.jboss.as.test.integration.deployment.structure.ear;
 
-import static org.jboss.as.test.shared.integration.ejb.security.PermissionUtils.createPermissionsXmlAsset;
+import static org.jboss.as.test.shared.PermissionUtils.createPermissionsXmlAsset;
 import static org.junit.Assert.assertEquals;
 
 import jakarta.ejb.EJB;

diff --git a/...oss/as/test/integration/deployment/structure/jar/JarJBossDeploymentStructureTestCase.java b/...oss/as/test/integration/deployment/structure/jar/JarJBossDeploymentStructureTestCase.java
@@ -1,6 +1,6 @@
 package org.jboss.as.test.integration.deployment.structure.jar;
 
-import static org.jboss.as.test.shared.integration.ejb.security.PermissionUtils.createPermissionsXmlAsset;
+import static org.jboss.as.test.shared.PermissionUtils.createPermissionsXmlAsset;
 import static org.junit.Assert.assertEquals;
 
 import jakarta.ejb.EJB;

diff --git a/...oss/as/test/integration/deployment/structure/war/WarJBossDeploymentStructureTestCase.java b/...oss/as/test/integration/deployment/structure/war/WarJBossDeploymentStructureTestCase.java
@@ -18,7 +18,7 @@
 import java.io.InputStream;
 import java.nio.charset.StandardCharsets;
 
-import static org.jboss.as.test.shared.integration.ejb.security.PermissionUtils.createPermissionsXmlAsset;
+import static org.jboss.as.test.shared.PermissionUtils.createPermissionsXmlAsset;
 import static org.junit.Assert.assertEquals;
 
 

diff --git a/.../test/java/org/jboss/as/test/integration/ee/concurrent/DefaultContextServiceTestCase.java b/.../test/java/org/jboss/as/test/integration/ee/concurrent/DefaultContextServiceTestCase.java
@@ -22,7 +22,7 @@
 
 package org.jboss.as.test.integration.ee.concurrent;
 
-import static org.jboss.as.test.shared.integration.ejb.security.PermissionUtils.createPermissionsXmlAsset;
+import static org.jboss.as.test.shared.PermissionUtils.createPermissionsXmlAsset;
 
 import java.util.concurrent.Callable;
 

diff --git a/...va/org/jboss/as/test/integration/ee/concurrent/DefaultManagedExecutorServiceTestCase.java b/...va/org/jboss/as/test/integration/ee/concurrent/DefaultManagedExecutorServiceTestCase.java
@@ -36,7 +36,7 @@
 import org.junit.runner.RunWith;
 import org.wildfly.security.permission.ElytronPermission;
 
-import static org.jboss.as.test.shared.integration.ejb.security.PermissionUtils.createPermissionsXmlAsset;
+import static org.jboss.as.test.shared.PermissionUtils.createPermissionsXmlAsset;
 
 /**
  * Test for EE's default ManagedExecutorService

diff --git a/...oss/as/test/integration/ee/concurrent/DefaultManagedScheduledExecutorServiceTestCase.java b/...oss/as/test/integration/ee/concurrent/DefaultManagedScheduledExecutorServiceTestCase.java
@@ -22,7 +22,7 @@
 
 package org.jboss.as.test.integration.ee.concurrent;
 
-import static org.jboss.as.test.shared.integration.ejb.security.PermissionUtils.createPermissionsXmlAsset;
+import static org.jboss.as.test.shared.PermissionUtils.createPermissionsXmlAsset;
 
 import java.util.concurrent.Callable;
 import java.util.concurrent.TimeUnit;

diff --git a/...java/org/jboss/as/test/integration/ee/concurrent/DefaultManagedThreadFactoryTestCase.java b/...java/org/jboss/as/test/integration/ee/concurrent/DefaultManagedThreadFactoryTestCase.java
@@ -22,7 +22,7 @@
 
 package org.jboss.as.test.integration.ee.concurrent;
 
-import static org.jboss.as.test.shared.integration.ejb.security.PermissionUtils.createPermissionsXmlAsset;
+import static org.jboss.as.test.shared.PermissionUtils.createPermissionsXmlAsset;
 
 import java.util.PropertyPermission;
 import java.util.concurrent.Callable;

diff --git a/...test/java/org/jboss/as/test/integration/ee/concurrent/EEConcurrentManagementTestCase.java b/...test/java/org/jboss/as/test/integration/ee/concurrent/EEConcurrentManagementTestCase.java
@@ -26,7 +26,7 @@
 import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.FAILURE_DESCRIPTION;
 import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.OPERATION_HEADERS;
 import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.SUBSYSTEM;
-import static org.jboss.as.test.shared.integration.ejb.security.PermissionUtils.createPermissionsXmlAsset;
+import static org.jboss.as.test.shared.PermissionUtils.createPermissionsXmlAsset;
 
 import java.io.FilePermission;
 

diff --git a/...c/test/java/org/jboss/as/test/integration/ee/concurrent/HungTasksTerminationTestCase.java b/...c/test/java/org/jboss/as/test/integration/ee/concurrent/HungTasksTerminationTestCase.java
@@ -58,7 +58,7 @@
 import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.OPERATION_HEADERS;
 import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.RESULT;
 import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.SUBSYSTEM;
-import static org.jboss.as.test.shared.integration.ejb.security.PermissionUtils.createPermissionsXmlAsset;
+import static org.jboss.as.test.shared.PermissionUtils.createPermissionsXmlAsset;
 
 /**
  * Test case for managed executor's hung tasks termination feature.

diff --git a/...va/org/jboss/as/test/integration/ee/concurrent/ManagedExecutorServiceMetricsTestCase.java b/...va/org/jboss/as/test/integration/ee/concurrent/ManagedExecutorServiceMetricsTestCase.java
@@ -61,7 +61,7 @@
 import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.OPERATION_HEADERS;
 import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.RESULT;
 import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.SUBSYSTEM;
-import static org.jboss.as.test.shared.integration.ejb.security.PermissionUtils.createPermissionsXmlAsset;
+import static org.jboss.as.test.shared.PermissionUtils.createPermissionsXmlAsset;
 
 /**
  * Test case for managed executor runtime stats

diff --git a/...as/test/integration/ee/injection/support/websocket/WebSocketInjectionSupportTestCase.java b/...as/test/integration/ee/injection/support/websocket/WebSocketInjectionSupportTestCase.java
@@ -45,7 +45,7 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
-import static org.jboss.as.test.shared.integration.ejb.security.PermissionUtils.createPermissionsXmlAsset;
+import static org.jboss.as.test.shared.PermissionUtils.createPermissionsXmlAsset;
 
 /**
  * @author Matus Abaffy

diff --git a/...ava/org/jboss/as/test/integration/ee/lifecycle/servlet/LifecycleInterceptionTestCase.java b/...ava/org/jboss/as/test/integration/ee/lifecycle/servlet/LifecycleInterceptionTestCase.java
@@ -36,7 +36,7 @@
 import org.jboss.shrinkwrap.api.asset.EmptyAsset;
 import org.jboss.shrinkwrap.api.spec.WebArchive;
 
-import static org.jboss.as.test.shared.integration.ejb.security.PermissionUtils.createPermissionsXmlAsset;
+import static org.jboss.as.test.shared.PermissionUtils.createPermissionsXmlAsset;
 
 /**
  * @author Matus Abaffy

diff --git a/...st/integration/ee/naming/defaultbindings/datasource/DefaultDataSourceRemovedTestCase.java b/...st/integration/ee/naming/defaultbindings/datasource/DefaultDataSourceRemovedTestCase.java
@@ -24,7 +24,7 @@
 
 import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.OUTCOME;
 import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.SUCCESS;
-import static org.jboss.as.test.shared.integration.ejb.security.PermissionUtils.createPermissionsXmlAsset;
+import static org.jboss.as.test.shared.PermissionUtils.createPermissionsXmlAsset;
 
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.container.test.api.OperateOnDeployment;

diff --git a/...ion/basic/src/test/java/org/jboss/as/test/integration/ee/remotelookup/LookupTestCase.java b/...ion/basic/src/test/java/org/jboss/as/test/integration/ee/remotelookup/LookupTestCase.java
@@ -22,7 +22,7 @@
 
 package org.jboss.as.test.integration.ee.remotelookup;
 
-import static org.jboss.as.test.shared.integration.ejb.security.PermissionUtils.createPermissionsXmlAsset;
+import static org.jboss.as.test.shared.PermissionUtils.createPermissionsXmlAsset;
 import static org.junit.Assert.assertNotNull;
 
 import java.net.SocketPermission;

diff --git a/.../src/test/java/org/jboss/as/test/integration/ee/suspend/EEConcurrencySuspendTestCase.java b/.../src/test/java/org/jboss/as/test/integration/ee/suspend/EEConcurrencySuspendTestCase.java
@@ -26,7 +26,7 @@
 import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.READ_ATTRIBUTE_OPERATION;
 import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.RESULT;
 import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.SUSPEND_STATE;
-import static org.jboss.as.test.shared.integration.ejb.security.PermissionUtils.createPermissionsXmlAsset;
+import static org.jboss.as.test.shared.PermissionUtils.createPermissionsXmlAsset;
 
 import java.io.IOException;
 import java.net.HttpURLConnection;

diff --git a/.../org/jboss/as/test/integration/ejb/interceptor/serverside/ServerInterceptorsTestCase.java b/.../org/jboss/as/test/integration/ejb/interceptor/serverside/ServerInterceptorsTestCase.java
@@ -27,7 +27,7 @@
 import static org.jboss.as.controller.client.helpers.ClientConstants.READ_ATTRIBUTE_OPERATION;
 import static org.jboss.as.controller.client.helpers.ClientConstants.RESULT;
 import static org.jboss.as.controller.client.helpers.ClientConstants.SUBSYSTEM;
-import static org.jboss.as.test.shared.integration.ejb.security.PermissionUtils.createPermissionsXmlAsset;
+import static org.jboss.as.test.shared.PermissionUtils.createPermissionsXmlAsset;
 import static org.junit.Assert.assertTrue;
 import java.io.FilePermission;
 import java.util.Collections;

diff --git a/...as/test/integration/ejb/interceptor/serverside/protocol/RemoteProtocolChangeTestCase.java b/...as/test/integration/ejb/interceptor/serverside/protocol/RemoteProtocolChangeTestCase.java
@@ -21,7 +21,7 @@
  */
 package org.jboss.as.test.integration.ejb.interceptor.serverside.protocol;
 
-import static org.jboss.as.test.shared.integration.ejb.security.PermissionUtils.createPermissionsXmlAsset;
+import static org.jboss.as.test.shared.PermissionUtils.createPermissionsXmlAsset;
 
 import java.util.Collections;
 import java.util.Hashtable;

diff --git a/...sic/src/test/java/org/jboss/as/test/integration/ejb/mdb/JMSMessageDrivenBeanTestCase.java b/...sic/src/test/java/org/jboss/as/test/integration/ejb/mdb/JMSMessageDrivenBeanTestCase.java
@@ -21,7 +21,7 @@
  */
 package org.jboss.as.test.integration.ejb.mdb;
 
-import static org.jboss.as.test.shared.integration.ejb.security.PermissionUtils.createPermissionsXmlAsset;
+import static org.jboss.as.test.shared.PermissionUtils.createPermissionsXmlAsset;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 

diff --git a/...te/integration/basic/src/test/java/org/jboss/as/test/integration/ejb/mdb/MDBTestCase.java b/...te/integration/basic/src/test/java/org/jboss/as/test/integration/ejb/mdb/MDBTestCase.java
@@ -47,7 +47,7 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
-import static org.jboss.as.test.shared.integration.ejb.security.PermissionUtils.createPermissionsXmlAsset;
+import static org.jboss.as.test.shared.PermissionUtils.createPermissionsXmlAsset;
 
 import java.io.FilePermission;
 import java.io.IOException;

diff --git a/.../jboss/as/test/integration/ejb/mdb/activationconfig/unit/MDBActivationConfigTestCase.java b/.../jboss/as/test/integration/ejb/mdb/activationconfig/unit/MDBActivationConfigTestCase.java
@@ -23,7 +23,7 @@
 package org.jboss.as.test.integration.ejb.mdb.activationconfig.unit;
 
 import static org.jboss.as.test.integration.ejb.mdb.activationconfig.JMSHelper.assertSendAndReceiveTextMessage;
-import static org.jboss.as.test.shared.integration.ejb.security.PermissionUtils.createPermissionsXmlAsset;
+import static org.jboss.as.test.shared.PermissionUtils.createPermissionsXmlAsset;
 
 import java.util.PropertyPermission;
 import java.util.UUID;

diff --git a/...ic/src/test/java/org/jboss/as/test/integration/ejb/mdb/cdi/MDBCdiIntegrationTestCase.java b/...ic/src/test/java/org/jboss/as/test/integration/ejb/mdb/cdi/MDBCdiIntegrationTestCase.java
@@ -48,7 +48,7 @@
 
 import java.util.PropertyPermission;
 
-import static org.jboss.as.test.shared.integration.ejb.security.PermissionUtils.createPermissionsXmlAsset;
+import static org.jboss.as.test.shared.PermissionUtils.createPermissionsXmlAsset;
 
 /**
  * Tests that the CDI request scope is active in MDB invocations.

diff --git a/...test/java/org/jboss/as/test/integration/ejb/mdb/cdi/MDBRAScopeCdiIntegrationTestCase.java b/...test/java/org/jboss/as/test/integration/ejb/mdb/cdi/MDBRAScopeCdiIntegrationTestCase.java
@@ -24,7 +24,7 @@
 
 import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.OP;
 import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.OP_ADDR;
-import static org.jboss.as.test.shared.integration.ejb.security.PermissionUtils.createPermissionsXmlAsset;
+import static org.jboss.as.test.shared.PermissionUtils.createPermissionsXmlAsset;
 
 import java.io.IOException;
 import java.util.Hashtable;

diff --git a/...integration/ejb/mdb/cmt/notsupported/ContainerManagedTransactionNotSupportedTestCase.java b/...integration/ejb/mdb/cmt/notsupported/ContainerManagedTransactionNotSupportedTestCase.java
@@ -23,7 +23,7 @@
 package org.jboss.as.test.integration.ejb.mdb.cmt.notsupported;
 
 import static org.jboss.as.test.shared.TimeoutUtil.adjust;
-import static org.jboss.as.test.shared.integration.ejb.security.PermissionUtils.createPermissionsXmlAsset;
+import static org.jboss.as.test.shared.PermissionUtils.createPermissionsXmlAsset;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;

diff --git a/.../test/java/org/jboss/as/test/integration/ejb/mdb/containerstart/SendMessagesTestCase.java b/.../test/java/org/jboss/as/test/integration/ejb/mdb/containerstart/SendMessagesTestCase.java
@@ -24,7 +24,7 @@
 
 import static java.util.concurrent.TimeUnit.SECONDS;
 import static org.jboss.as.test.integration.common.jms.JMSOperationsProvider.getInstance;
-import static org.jboss.as.test.shared.integration.ejb.security.PermissionUtils.createPermissionsXmlAsset;
+import static org.jboss.as.test.shared.PermissionUtils.createPermissionsXmlAsset;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;

diff --git a/...basic/src/test/java/org/jboss/as/test/integration/ejb/mdb/deliveryactive/MDBTestCase.java b/...basic/src/test/java/org/jboss/as/test/integration/ejb/mdb/deliveryactive/MDBTestCase.java
@@ -29,7 +29,7 @@
 import static org.jboss.as.controller.client.helpers.ClientConstants.READ_ATTRIBUTE_OPERATION;
 import static org.jboss.as.controller.client.helpers.ClientConstants.RESULT;
 import static org.jboss.as.controller.client.helpers.ClientConstants.SUCCESS;
-import static org.jboss.as.test.shared.integration.ejb.security.PermissionUtils.createPermissionsXmlAsset;
+import static org.jboss.as.test.shared.PermissionUtils.createPermissionsXmlAsset;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;

diff --git a/...st/java/org/jboss/as/test/integration/ejb/mdb/dynamic/DynamicMessageListenerTestCase.java b/...st/java/org/jboss/as/test/integration/ejb/mdb/dynamic/DynamicMessageListenerTestCase.java
@@ -48,7 +48,7 @@
 
 import static org.jboss.as.test.integration.ejb.mdb.dynamic.impl.TtyCodes.TTY_Bright;
 import static org.jboss.as.test.integration.ejb.mdb.dynamic.impl.TtyCodes.TTY_Reset;
-import static org.jboss.as.test.shared.integration.ejb.security.PermissionUtils.createPermissionsXmlAsset;
+import static org.jboss.as.test.shared.PermissionUtils.createPermissionsXmlAsset;
 import static org.jboss.shrinkwrap.api.ShrinkWrap.create;
 import static org.junit.Assert.assertEquals;
 

diff --git a/...c/test/java/org/jboss/as/test/integration/ejb/mdb/ejb2x/MDB20MessageSelectorTestCase.java b/...c/test/java/org/jboss/as/test/integration/ejb/mdb/ejb2x/MDB20MessageSelectorTestCase.java
@@ -43,7 +43,7 @@
 import javax.naming.InitialContext;
 import java.util.PropertyPermission;
 
-import static org.jboss.as.test.shared.integration.ejb.security.PermissionUtils.createPermissionsXmlAsset;
+import static org.jboss.as.test.shared.PermissionUtils.createPermissionsXmlAsset;
 
 import jakarta.jms.QueueRequestor;
 import jakarta.jms.QueueSession;

diff --git a/...n/basic/src/test/java/org/jboss/as/test/integration/ejb/mdb/ejb2x/MDB20QueueTestCase.java b/...n/basic/src/test/java/org/jboss/as/test/integration/ejb/mdb/ejb2x/MDB20QueueTestCase.java
@@ -45,7 +45,7 @@
 import javax.naming.InitialContext;
 import java.util.PropertyPermission;
 
-import static org.jboss.as.test.shared.integration.ejb.security.PermissionUtils.createPermissionsXmlAsset;
+import static org.jboss.as.test.shared.PermissionUtils.createPermissionsXmlAsset;
 
 import jakarta.jms.QueueRequestor;
 import jakarta.jms.QueueSession;