diff --git a/boms/standard-test/pom.xml b/boms/standard-test/pom.xml index 8f790b65a544..1647b5bc1116 100644 --- a/boms/standard-test/pom.xml +++ b/boms/standard-test/pom.xml @@ -351,18 +351,6 @@ ${version.org.wildfly.extras.creaper} test - - - xom - xom - ${version.xom} - - - * - * - - - diff --git a/pom.xml b/pom.xml index 8f6c9e498382..ac79e19c237b 100644 --- a/pom.xml +++ b/pom.xml @@ -369,7 +369,6 @@ 5.0.1.Final 1.6.2 1.0.17.Final - 1.3.8 ${project.groupId} diff --git a/testsuite/integration/elytron/src/test/java/org/wildfly/test/integration/elytron/application/AbstractCredentialStoreTestCase.java b/testsuite/integration/elytron/src/test/java/org/wildfly/test/integration/elytron/application/AbstractCredentialStoreTestCase.java index 74bc4da07c98..42e1be3a83da 100644 --- a/testsuite/integration/elytron/src/test/java/org/wildfly/test/integration/elytron/application/AbstractCredentialStoreTestCase.java +++ b/testsuite/integration/elytron/src/test/java/org/wildfly/test/integration/elytron/application/AbstractCredentialStoreTestCase.java @@ -53,7 +53,7 @@ import org.jboss.as.controller.descriptions.ModelDescriptionConstants; import org.jboss.as.test.integration.management.util.CLIOpResult; import org.jboss.as.test.integration.management.util.CLIWrapper; -import org.jboss.as.test.shared.integration.ejb.security.PermissionUtils; +import org.jboss.as.test.shared.PermissionUtils; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; import org.jboss.shrinkwrap.api.spec.WebArchive; diff --git a/testsuite/integration/elytron/src/test/java/org/wildfly/test/integration/elytron/batch/BatchSubsystemSecurityTestCase.java b/testsuite/integration/elytron/src/test/java/org/wildfly/test/integration/elytron/batch/BatchSubsystemSecurityTestCase.java index 00370bf45347..8dae09cb3416 100644 --- a/testsuite/integration/elytron/src/test/java/org/wildfly/test/integration/elytron/batch/BatchSubsystemSecurityTestCase.java +++ b/testsuite/integration/elytron/src/test/java/org/wildfly/test/integration/elytron/batch/BatchSubsystemSecurityTestCase.java @@ -47,7 +47,7 @@ import org.jboss.as.test.shared.ServerReload; import org.jboss.as.test.shared.SnapshotRestoreSetupTask; import org.jboss.as.test.shared.TimeoutUtil; -import org.jboss.as.test.shared.integration.ejb.security.PermissionUtils; +import org.jboss.as.test.shared.PermissionUtils; import org.jboss.dmr.ModelNode; import org.jboss.shrinkwrap.api.Archive; import org.jboss.shrinkwrap.api.ShrinkWrap; diff --git a/testsuite/integration/elytron/src/test/java/org/wildfly/test/integration/elytron/ejb/AuthenticationTestCase.java b/testsuite/integration/elytron/src/test/java/org/wildfly/test/integration/elytron/ejb/AuthenticationTestCase.java index 049dd81132b0..4335c7b508eb 100644 --- a/testsuite/integration/elytron/src/test/java/org/wildfly/test/integration/elytron/ejb/AuthenticationTestCase.java +++ b/testsuite/integration/elytron/src/test/java/org/wildfly/test/integration/elytron/ejb/AuthenticationTestCase.java @@ -23,7 +23,7 @@ import static org.wildfly.test.integration.elytron.util.HttpUtil.get; 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 static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; diff --git a/testsuite/integration/elytron/src/test/java/org/wildfly/test/integration/elytron/ejb/DefaultElytronEjbSecurityDomainTestCase.java b/testsuite/integration/elytron/src/test/java/org/wildfly/test/integration/elytron/ejb/DefaultElytronEjbSecurityDomainTestCase.java index d35a97f991b4..09ba36d5157a 100644 --- a/testsuite/integration/elytron/src/test/java/org/wildfly/test/integration/elytron/ejb/DefaultElytronEjbSecurityDomainTestCase.java +++ b/testsuite/integration/elytron/src/test/java/org/wildfly/test/integration/elytron/ejb/DefaultElytronEjbSecurityDomainTestCase.java @@ -22,7 +22,7 @@ package org.wildfly.test.integration.elytron.ejb; -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.fail; diff --git a/testsuite/integration/elytron/src/test/java/org/wildfly/test/integration/elytron/ejb/IdentityPropagationTestCase.java b/testsuite/integration/elytron/src/test/java/org/wildfly/test/integration/elytron/ejb/IdentityPropagationTestCase.java index c5e168e02631..9a47d1370798 100644 --- a/testsuite/integration/elytron/src/test/java/org/wildfly/test/integration/elytron/ejb/IdentityPropagationTestCase.java +++ b/testsuite/integration/elytron/src/test/java/org/wildfly/test/integration/elytron/ejb/IdentityPropagationTestCase.java @@ -29,7 +29,7 @@ import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.WRITE_ATTRIBUTE_OPERATION; import static org.jboss.as.controller.operations.common.Util.createAddOperation; import static org.jboss.as.controller.operations.common.Util.getUndefineAttributeOperation; -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.assertTrue; import static org.wildfly.test.integration.elytron.util.HttpUtil.get; diff --git a/testsuite/integration/elytron/src/test/java/org/wildfly/test/integration/elytron/realm/AggregateRealmTestCase.java b/testsuite/integration/elytron/src/test/java/org/wildfly/test/integration/elytron/realm/AggregateRealmTestCase.java index 54d55fb3f08d..fd9c3b02f56a 100644 --- a/testsuite/integration/elytron/src/test/java/org/wildfly/test/integration/elytron/realm/AggregateRealmTestCase.java +++ b/testsuite/integration/elytron/src/test/java/org/wildfly/test/integration/elytron/realm/AggregateRealmTestCase.java @@ -22,7 +22,7 @@ package org.wildfly.test.integration.elytron.realm; import static jakarta.servlet.http.HttpServletResponse.SC_OK; -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.wildfly.test.integration.elytron.realm.AggregateRealmUtil.assertAttribute; import static org.wildfly.test.integration.elytron.realm.AggregateRealmUtil.assertAuthenticationFailed; diff --git a/testsuite/integration/elytron/src/test/java/org/wildfly/test/integration/elytron/realm/AggregateRealmWithTransformerTestCase.java b/testsuite/integration/elytron/src/test/java/org/wildfly/test/integration/elytron/realm/AggregateRealmWithTransformerTestCase.java index 3c7d4b2520f0..09aa30cad1a3 100644 --- a/testsuite/integration/elytron/src/test/java/org/wildfly/test/integration/elytron/realm/AggregateRealmWithTransformerTestCase.java +++ b/testsuite/integration/elytron/src/test/java/org/wildfly/test/integration/elytron/realm/AggregateRealmWithTransformerTestCase.java @@ -55,7 +55,7 @@ import static org.hamcrest.CoreMatchers.is; -import static org.jboss.as.test.shared.integration.ejb.security.PermissionUtils.createPermissionsXmlAsset; +import static org.jboss.as.test.shared.PermissionUtils.createPermissionsXmlAsset; import static org.wildfly.test.integration.elytron.realm.AggregateRealmUtil.assertAttribute; import static org.wildfly.test.integration.elytron.realm.AggregateRealmUtil.assertAuthenticationFailed; import static org.wildfly.test.integration.elytron.realm.AggregateRealmUtil.assertAuthenticationSuccess; diff --git a/testsuite/integration/elytron/src/test/java/org/wildfly/test/integration/elytron/realm/JdbcRealmTestCase.java b/testsuite/integration/elytron/src/test/java/org/wildfly/test/integration/elytron/realm/JdbcRealmTestCase.java index 36376e6d25f0..e114a03d617e 100644 --- a/testsuite/integration/elytron/src/test/java/org/wildfly/test/integration/elytron/realm/JdbcRealmTestCase.java +++ b/testsuite/integration/elytron/src/test/java/org/wildfly/test/integration/elytron/realm/JdbcRealmTestCase.java @@ -17,7 +17,7 @@ package org.wildfly.test.integration.elytron.realm; import static jakarta.servlet.http.HttpServletResponse.SC_OK; -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.net.URL; diff --git a/testsuite/integration/elytron/src/test/java/org/wildfly/test/integration/elytron/web/WebAuthenticationTestCaseBase.java b/testsuite/integration/elytron/src/test/java/org/wildfly/test/integration/elytron/web/WebAuthenticationTestCaseBase.java index e0024231b430..a0337d91c94f 100644 --- a/testsuite/integration/elytron/src/test/java/org/wildfly/test/integration/elytron/web/WebAuthenticationTestCaseBase.java +++ b/testsuite/integration/elytron/src/test/java/org/wildfly/test/integration/elytron/web/WebAuthenticationTestCaseBase.java @@ -23,7 +23,7 @@ package org.wildfly.test.integration.elytron.web; 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 static org.wildfly.test.integration.elytron.util.HttpUtil.get; diff --git a/testsuite/integration/iiop/pom.xml b/testsuite/integration/iiop/pom.xml index 3818c0779ac6..577e55101109 100644 --- a/testsuite/integration/iiop/pom.xml +++ b/testsuite/integration/iiop/pom.xml @@ -96,11 +96,6 @@ wildfly-transaction-client test - - xom - xom - test - diff --git a/testsuite/integration/iiop/src/test/java/org/jboss/as/test/iiop/basic/BasicIIOPInvocationTestCase.java b/testsuite/integration/iiop/src/test/java/org/jboss/as/test/iiop/basic/BasicIIOPInvocationTestCase.java index 881383d07adf..a1eac259bbfe 100644 --- a/testsuite/integration/iiop/src/test/java/org/jboss/as/test/iiop/basic/BasicIIOPInvocationTestCase.java +++ b/testsuite/integration/iiop/src/test/java/org/jboss/as/test/iiop/basic/BasicIIOPInvocationTestCase.java @@ -36,7 +36,7 @@ import org.jboss.as.network.NetworkUtils; import org.jboss.as.test.shared.FileUtils; import org.jboss.as.test.shared.PropertiesValueResolver; -import org.jboss.as.test.shared.integration.ejb.security.PermissionUtils; +import org.jboss.as.test.shared.PermissionUtils; import org.jboss.shrinkwrap.api.Archive; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; diff --git a/testsuite/integration/iiop/src/test/java/org/jboss/as/test/iiop/security/IIOPSecurityInvocationTestCase.java b/testsuite/integration/iiop/src/test/java/org/jboss/as/test/iiop/security/IIOPSecurityInvocationTestCase.java index 90ca76c9cdea..ba039a199912 100644 --- a/testsuite/integration/iiop/src/test/java/org/jboss/as/test/iiop/security/IIOPSecurityInvocationTestCase.java +++ b/testsuite/integration/iiop/src/test/java/org/jboss/as/test/iiop/security/IIOPSecurityInvocationTestCase.java @@ -36,7 +36,7 @@ import org.jboss.as.network.NetworkUtils; import org.jboss.as.test.shared.FileUtils; import org.jboss.as.test.shared.PropertiesValueResolver; -import org.jboss.as.test.shared.integration.ejb.security.PermissionUtils; +import org.jboss.as.test.shared.PermissionUtils; import org.jboss.as.test.shared.integration.ejb.security.Util; import org.jboss.shrinkwrap.api.Archive; import org.jboss.shrinkwrap.api.ShrinkWrap; diff --git a/testsuite/integration/iiop/src/test/java/org/jboss/as/test/iiop/transaction/TransactionIIOPInvocationTestCase.java b/testsuite/integration/iiop/src/test/java/org/jboss/as/test/iiop/transaction/TransactionIIOPInvocationTestCase.java index f9f7c7d7314d..98193bee0153 100644 --- a/testsuite/integration/iiop/src/test/java/org/jboss/as/test/iiop/transaction/TransactionIIOPInvocationTestCase.java +++ b/testsuite/integration/iiop/src/test/java/org/jboss/as/test/iiop/transaction/TransactionIIOPInvocationTestCase.java @@ -40,7 +40,7 @@ import org.jboss.as.network.NetworkUtils; import org.jboss.as.test.shared.FileUtils; import org.jboss.as.test.shared.PropertiesValueResolver; -import org.jboss.as.test.shared.integration.ejb.security.PermissionUtils; +import org.jboss.as.test.shared.PermissionUtils; import org.jboss.shrinkwrap.api.Archive; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; diff --git a/testsuite/integration/iiop/src/test/java/org/jboss/as/test/iiop/transaction/timeout/IIOPTimeoutTestCase.java b/testsuite/integration/iiop/src/test/java/org/jboss/as/test/iiop/transaction/timeout/IIOPTimeoutTestCase.java index 381873f90406..86d150db5424 100644 --- a/testsuite/integration/iiop/src/test/java/org/jboss/as/test/iiop/transaction/timeout/IIOPTimeoutTestCase.java +++ b/testsuite/integration/iiop/src/test/java/org/jboss/as/test/iiop/transaction/timeout/IIOPTimeoutTestCase.java @@ -50,7 +50,7 @@ import java.rmi.ServerException; 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 on transaction timeout behavior with SLSB beans diff --git a/testsuite/integration/manualmode/pom.xml b/testsuite/integration/manualmode/pom.xml index c31f81010485..edcb54f6ae63 100644 --- a/testsuite/integration/manualmode/pom.xml +++ b/testsuite/integration/manualmode/pom.xml @@ -320,11 +320,6 @@ wsdl4j test - - xom - xom - test - ${project.groupId} wildfly-client-all diff --git a/testsuite/integration/manualmode/src/test/java/org/jboss/as/test/manualmode/ejb/client/outbound/connection/RemoteOutboundConnectionReconnectTestCase.java b/testsuite/integration/manualmode/src/test/java/org/jboss/as/test/manualmode/ejb/client/outbound/connection/RemoteOutboundConnectionReconnectTestCase.java index be934bec02a3..fed56956c784 100644 --- a/testsuite/integration/manualmode/src/test/java/org/jboss/as/test/manualmode/ejb/client/outbound/connection/RemoteOutboundConnectionReconnectTestCase.java +++ b/testsuite/integration/manualmode/src/test/java/org/jboss/as/test/manualmode/ejb/client/outbound/connection/RemoteOutboundConnectionReconnectTestCase.java @@ -22,7 +22,7 @@ package org.jboss.as.test.manualmode.ejb.client.outbound.connection; -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.io.FilePermission; diff --git a/testsuite/integration/manualmode/src/test/java/org/jboss/as/test/manualmode/ejb/client/outbound/connection/transaction/preparehalt/TransactionPropagationFailureTestCase.java b/testsuite/integration/manualmode/src/test/java/org/jboss/as/test/manualmode/ejb/client/outbound/connection/transaction/preparehalt/TransactionPropagationFailureTestCase.java index e4ca97932e59..ba81a6ec3a8e 100644 --- a/testsuite/integration/manualmode/src/test/java/org/jboss/as/test/manualmode/ejb/client/outbound/connection/transaction/preparehalt/TransactionPropagationFailureTestCase.java +++ b/testsuite/integration/manualmode/src/test/java/org/jboss/as/test/manualmode/ejb/client/outbound/connection/transaction/preparehalt/TransactionPropagationFailureTestCase.java @@ -62,7 +62,7 @@ import java.util.PropertyPermission; import static org.jboss.as.test.shared.integration.ejb.security.PermissionUtils.createFilePermission; -import static org.jboss.as.test.shared.integration.ejb.security.PermissionUtils.createPermissionsXmlAsset; +import static org.jboss.as.test.shared.PermissionUtils.createPermissionsXmlAsset; /** * Testing transaction recovery on cases where WildFly calls remote Jakarta Enterprise Beans on the other WildFly instance. diff --git a/testsuite/integration/manualmode/src/test/java/org/jboss/as/test/manualmode/messaging/ActivemqServerAddonsTestCase.java b/testsuite/integration/manualmode/src/test/java/org/jboss/as/test/manualmode/messaging/ActivemqServerAddonsTestCase.java index 1203b135efbb..ee87efc9f667 100644 --- a/testsuite/integration/manualmode/src/test/java/org/jboss/as/test/manualmode/messaging/ActivemqServerAddonsTestCase.java +++ b/testsuite/integration/manualmode/src/test/java/org/jboss/as/test/manualmode/messaging/ActivemqServerAddonsTestCase.java @@ -15,7 +15,7 @@ */ package org.jboss.as.test.manualmode.messaging; -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; import static org.junit.Assert.assertFalse; diff --git a/testsuite/integration/manualmode/src/test/java/org/jboss/as/test/manualmode/server/nongraceful/NongracefulStartTestCase.java b/testsuite/integration/manualmode/src/test/java/org/jboss/as/test/manualmode/server/nongraceful/NongracefulStartTestCase.java index 51bd76a63901..ad5d2c024dcb 100644 --- a/testsuite/integration/manualmode/src/test/java/org/jboss/as/test/manualmode/server/nongraceful/NongracefulStartTestCase.java +++ b/testsuite/integration/manualmode/src/test/java/org/jboss/as/test/manualmode/server/nongraceful/NongracefulStartTestCase.java @@ -1,6 +1,6 @@ package org.jboss.as.test.manualmode.server.nongraceful; -import static org.jboss.as.test.shared.integration.ejb.security.PermissionUtils.createPermissionsXmlAsset; +import static org.jboss.as.test.shared.PermissionUtils.createPermissionsXmlAsset; import java.net.SocketPermission; import java.util.PropertyPermission; diff --git a/testsuite/integration/manualmode/src/test/java/org/jboss/as/test/manualmode/weld/builtinBeans/LegacyCompliantPrincipalPropagationTestCase.java b/testsuite/integration/manualmode/src/test/java/org/jboss/as/test/manualmode/weld/builtinBeans/LegacyCompliantPrincipalPropagationTestCase.java index ec60056176f2..9f7521a3f4b0 100644 --- a/testsuite/integration/manualmode/src/test/java/org/jboss/as/test/manualmode/weld/builtinBeans/LegacyCompliantPrincipalPropagationTestCase.java +++ b/testsuite/integration/manualmode/src/test/java/org/jboss/as/test/manualmode/weld/builtinBeans/LegacyCompliantPrincipalPropagationTestCase.java @@ -40,7 +40,7 @@ import org.wildfly.security.permission.ElytronPermission; import static org.jboss.as.controller.client.helpers.Operations.createWriteAttributeOperation; -import static org.jboss.as.test.shared.integration.ejb.security.PermissionUtils.createPermissionsXmlAsset; +import static org.jboss.as.test.shared.PermissionUtils.createPermissionsXmlAsset; /** diff --git a/testsuite/integration/manualmode/src/test/java/org/jboss/as/test/manualmode/weld/extension/BeforeShutdownJNDILookupTestCase.java b/testsuite/integration/manualmode/src/test/java/org/jboss/as/test/manualmode/weld/extension/BeforeShutdownJNDILookupTestCase.java index 5643257fc975..361c33075366 100644 --- a/testsuite/integration/manualmode/src/test/java/org/jboss/as/test/manualmode/weld/extension/BeforeShutdownJNDILookupTestCase.java +++ b/testsuite/integration/manualmode/src/test/java/org/jboss/as/test/manualmode/weld/extension/BeforeShutdownJNDILookupTestCase.java @@ -6,7 +6,7 @@ import org.jboss.arquillian.container.test.api.TargetsContainer; import org.jboss.arquillian.junit.Arquillian; import org.jboss.arquillian.test.api.ArquillianResource; -import org.jboss.as.test.shared.integration.ejb.security.PermissionUtils; +import org.jboss.as.test.shared.PermissionUtils; import org.jboss.shrinkwrap.api.Archive; import org.jboss.shrinkwrap.api.ArchivePaths; import org.jboss.shrinkwrap.api.ShrinkWrap; diff --git a/testsuite/integration/manualmode/src/test/java/org/wildfly/test/manual/elytron/seccontext/AbstractSecurityContextPropagationTestBase.java b/testsuite/integration/manualmode/src/test/java/org/wildfly/test/manual/elytron/seccontext/AbstractSecurityContextPropagationTestBase.java index 6c444cc181b7..9b2d1e354f0c 100644 --- a/testsuite/integration/manualmode/src/test/java/org/wildfly/test/manual/elytron/seccontext/AbstractSecurityContextPropagationTestBase.java +++ b/testsuite/integration/manualmode/src/test/java/org/wildfly/test/manual/elytron/seccontext/AbstractSecurityContextPropagationTestBase.java @@ -24,7 +24,7 @@ import static org.hamcrest.CoreMatchers.containsString; import static org.hamcrest.CoreMatchers.not; import static org.hamcrest.CoreMatchers.startsWith; -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.hamcrest.MatcherAssert.assertThat; diff --git a/testsuite/integration/manualmode/src/test/java/org/wildfly/test/manual/elytron/seccontext/ServerChainSecurityContextPropagationTestCase.java b/testsuite/integration/manualmode/src/test/java/org/wildfly/test/manual/elytron/seccontext/ServerChainSecurityContextPropagationTestCase.java index ce4e0a8922e0..870cb589608f 100644 --- a/testsuite/integration/manualmode/src/test/java/org/wildfly/test/manual/elytron/seccontext/ServerChainSecurityContextPropagationTestCase.java +++ b/testsuite/integration/manualmode/src/test/java/org/wildfly/test/manual/elytron/seccontext/ServerChainSecurityContextPropagationTestCase.java @@ -21,7 +21,7 @@ */ package org.wildfly.test.manual.elytron.seccontext; -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.assertArrayEquals; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; diff --git a/testsuite/integration/microprofile-tck/fault-tolerance/pom.xml b/testsuite/integration/microprofile-tck/fault-tolerance/pom.xml index 64dba58594c7..89de1c8df2c0 100644 --- a/testsuite/integration/microprofile-tck/fault-tolerance/pom.xml +++ b/testsuite/integration/microprofile-tck/fault-tolerance/pom.xml @@ -46,6 +46,11 @@ + + org.wildfly.core + wildfly-core-testsuite-shared + test + io.smallrye smallrye-fault-tolerance @@ -76,11 +81,6 @@ shrinkwrap-descriptors-impl-javaee test - - xom - xom - test - diff --git a/testsuite/integration/microprofile-tck/fault-tolerance/src/test/java/org/wildfly/extension/microprofile/faulttolerance/tck/FaultToleranceApplicationArchiveProcessor.java b/testsuite/integration/microprofile-tck/fault-tolerance/src/test/java/org/wildfly/extension/microprofile/faulttolerance/tck/FaultToleranceApplicationArchiveProcessor.java index a3c4cccbbacc..15f7c031434f 100644 --- a/testsuite/integration/microprofile-tck/fault-tolerance/src/test/java/org/wildfly/extension/microprofile/faulttolerance/tck/FaultToleranceApplicationArchiveProcessor.java +++ b/testsuite/integration/microprofile-tck/fault-tolerance/src/test/java/org/wildfly/extension/microprofile/faulttolerance/tck/FaultToleranceApplicationArchiveProcessor.java @@ -21,7 +21,7 @@ */ package org.wildfly.extension.microprofile.faulttolerance.tck; -import static org.jboss.as.test.shared.integration.ejb.security.PermissionUtils.createPermissionsXmlAsset; +import static org.jboss.as.test.shared.PermissionUtils.createPermissionsXmlAsset; import java.lang.reflect.ReflectPermission; import java.util.PropertyPermission; diff --git a/testsuite/integration/microprofile/pom.xml b/testsuite/integration/microprofile/pom.xml index 498d67c64072..a620c94b1fce 100644 --- a/testsuite/integration/microprofile/pom.xml +++ b/testsuite/integration/microprofile/pom.xml @@ -327,12 +327,6 @@ test - - xom - xom - test - - org.wildfly diff --git a/testsuite/integration/microprofile/src/test/java/org/wildfly/test/integration/microprofile/reactive/messaging/kafka/api/ReactiveMessagingKafkaUserApiTestCase.java b/testsuite/integration/microprofile/src/test/java/org/wildfly/test/integration/microprofile/reactive/messaging/kafka/api/ReactiveMessagingKafkaUserApiTestCase.java index 2065512e9b01..627cf5329a6f 100644 --- a/testsuite/integration/microprofile/src/test/java/org/wildfly/test/integration/microprofile/reactive/messaging/kafka/api/ReactiveMessagingKafkaUserApiTestCase.java +++ b/testsuite/integration/microprofile/src/test/java/org/wildfly/test/integration/microprofile/reactive/messaging/kafka/api/ReactiveMessagingKafkaUserApiTestCase.java @@ -53,7 +53,7 @@ import java.util.Set; import java.util.concurrent.TimeUnit; -import static org.jboss.as.test.shared.integration.ejb.security.PermissionUtils.createPermissionsXmlAsset; +import static org.jboss.as.test.shared.PermissionUtils.createPermissionsXmlAsset; /** * @author Kabir Khan diff --git a/testsuite/integration/microprofile/src/test/java/org/wildfly/test/integration/microprofile/reactive/messaging/kafka/serializer/ReactiveMessagingKafkaSerializerTestCase.java b/testsuite/integration/microprofile/src/test/java/org/wildfly/test/integration/microprofile/reactive/messaging/kafka/serializer/ReactiveMessagingKafkaSerializerTestCase.java index 1b226bbd3f1e..dff6e1555357 100644 --- a/testsuite/integration/microprofile/src/test/java/org/wildfly/test/integration/microprofile/reactive/messaging/kafka/serializer/ReactiveMessagingKafkaSerializerTestCase.java +++ b/testsuite/integration/microprofile/src/test/java/org/wildfly/test/integration/microprofile/reactive/messaging/kafka/serializer/ReactiveMessagingKafkaSerializerTestCase.java @@ -22,7 +22,7 @@ package org.wildfly.test.integration.microprofile.reactive.messaging.kafka.serializer; -import static org.jboss.as.test.shared.integration.ejb.security.PermissionUtils.createPermissionsXmlAsset; +import static org.jboss.as.test.shared.PermissionUtils.createPermissionsXmlAsset; import java.util.ArrayList; import java.util.HashMap; diff --git a/testsuite/integration/microprofile/src/test/java/org/wildfly/test/integration/microprofile/reactive/messaging/kafka/ssl/ReactiveMessagingKafkaSslTestCase.java b/testsuite/integration/microprofile/src/test/java/org/wildfly/test/integration/microprofile/reactive/messaging/kafka/ssl/ReactiveMessagingKafkaSslTestCase.java index 28a04acdf339..e9a5efe8532b 100644 --- a/testsuite/integration/microprofile/src/test/java/org/wildfly/test/integration/microprofile/reactive/messaging/kafka/ssl/ReactiveMessagingKafkaSslTestCase.java +++ b/testsuite/integration/microprofile/src/test/java/org/wildfly/test/integration/microprofile/reactive/messaging/kafka/ssl/ReactiveMessagingKafkaSslTestCase.java @@ -22,7 +22,7 @@ package org.wildfly.test.integration.microprofile.reactive.messaging.kafka.ssl; -import static org.jboss.as.test.shared.integration.ejb.security.PermissionUtils.createPermissionsXmlAsset; +import static org.jboss.as.test.shared.PermissionUtils.createPermissionsXmlAsset; import java.util.Arrays; import java.util.HashSet; diff --git a/testsuite/integration/microprofile/src/test/java/org/wildfly/test/integration/microprofile/reactive/messaging/kafka/tx/ReactiveMessagingKafkaTestCase.java b/testsuite/integration/microprofile/src/test/java/org/wildfly/test/integration/microprofile/reactive/messaging/kafka/tx/ReactiveMessagingKafkaTestCase.java index a6c28282b707..8f40ba420597 100644 --- a/testsuite/integration/microprofile/src/test/java/org/wildfly/test/integration/microprofile/reactive/messaging/kafka/tx/ReactiveMessagingKafkaTestCase.java +++ b/testsuite/integration/microprofile/src/test/java/org/wildfly/test/integration/microprofile/reactive/messaging/kafka/tx/ReactiveMessagingKafkaTestCase.java @@ -22,7 +22,7 @@ package org.wildfly.test.integration.microprofile.reactive.messaging.kafka.tx; -import static org.jboss.as.test.shared.integration.ejb.security.PermissionUtils.createPermissionsXmlAsset; +import static org.jboss.as.test.shared.PermissionUtils.createPermissionsXmlAsset; import java.util.Arrays; import java.util.Collections; diff --git a/testsuite/integration/microprofile/src/test/java/org/wildfly/test/integration/microprofile/reactive/messaging/ported/config/ConnectorConfigTestCase.java b/testsuite/integration/microprofile/src/test/java/org/wildfly/test/integration/microprofile/reactive/messaging/ported/config/ConnectorConfigTestCase.java index 5988b8381eb6..721982839f38 100644 --- a/testsuite/integration/microprofile/src/test/java/org/wildfly/test/integration/microprofile/reactive/messaging/ported/config/ConnectorConfigTestCase.java +++ b/testsuite/integration/microprofile/src/test/java/org/wildfly/test/integration/microprofile/reactive/messaging/ported/config/ConnectorConfigTestCase.java @@ -22,7 +22,7 @@ package org.wildfly.test.integration.microprofile.reactive.messaging.ported.config; -import static org.jboss.as.test.shared.integration.ejb.security.PermissionUtils.createPermissionsXmlAsset; +import static org.jboss.as.test.shared.PermissionUtils.createPermissionsXmlAsset; import static org.wildfly.test.integration.microprofile.reactive.messaging.ported.utils.ReactiveMessagingTestUtils.await; import static org.wildfly.test.integration.microprofile.reactive.messaging.ported.utils.ReactiveMessagingTestUtils.checkList; diff --git a/testsuite/integration/microprofile/src/test/java/org/wildfly/test/integration/microprofile/reactive/messaging/ported/config/ConnectorProfileConfigTestCase.java b/testsuite/integration/microprofile/src/test/java/org/wildfly/test/integration/microprofile/reactive/messaging/ported/config/ConnectorProfileConfigTestCase.java index 60485fab54d6..96c5a9975ee5 100644 --- a/testsuite/integration/microprofile/src/test/java/org/wildfly/test/integration/microprofile/reactive/messaging/ported/config/ConnectorProfileConfigTestCase.java +++ b/testsuite/integration/microprofile/src/test/java/org/wildfly/test/integration/microprofile/reactive/messaging/ported/config/ConnectorProfileConfigTestCase.java @@ -22,7 +22,7 @@ package org.wildfly.test.integration.microprofile.reactive.messaging.ported.config; -import static org.jboss.as.test.shared.integration.ejb.security.PermissionUtils.createPermissionsXmlAsset; +import static org.jboss.as.test.shared.PermissionUtils.createPermissionsXmlAsset; import static org.wildfly.test.integration.microprofile.reactive.messaging.ported.utils.ReactiveMessagingTestUtils.await; import java.util.List; diff --git a/testsuite/integration/microprofile/src/test/java/org/wildfly/test/integration/microprofile/reactive/messaging/ported/signatures/ProcessorSignatureTestCase.java b/testsuite/integration/microprofile/src/test/java/org/wildfly/test/integration/microprofile/reactive/messaging/ported/signatures/ProcessorSignatureTestCase.java index 7b292148401d..dccc344683af 100644 --- a/testsuite/integration/microprofile/src/test/java/org/wildfly/test/integration/microprofile/reactive/messaging/ported/signatures/ProcessorSignatureTestCase.java +++ b/testsuite/integration/microprofile/src/test/java/org/wildfly/test/integration/microprofile/reactive/messaging/ported/signatures/ProcessorSignatureTestCase.java @@ -22,7 +22,7 @@ package org.wildfly.test.integration.microprofile.reactive.messaging.ported.signatures; -import static org.jboss.as.test.shared.integration.ejb.security.PermissionUtils.createPermissionsXmlAsset; +import static org.jboss.as.test.shared.PermissionUtils.createPermissionsXmlAsset; import static org.wildfly.test.integration.microprofile.reactive.messaging.ported.utils.ReactiveMessagingTestUtils.await; import static org.wildfly.test.integration.microprofile.reactive.messaging.ported.utils.ReactiveMessagingTestUtils.checkList; diff --git a/testsuite/integration/microprofile/src/test/java/org/wildfly/test/integration/microprofile/reactive/messaging/ported/signatures/PublisherSignatureTestCase.java b/testsuite/integration/microprofile/src/test/java/org/wildfly/test/integration/microprofile/reactive/messaging/ported/signatures/PublisherSignatureTestCase.java index 6d87b32420ab..d40acd697a49 100644 --- a/testsuite/integration/microprofile/src/test/java/org/wildfly/test/integration/microprofile/reactive/messaging/ported/signatures/PublisherSignatureTestCase.java +++ b/testsuite/integration/microprofile/src/test/java/org/wildfly/test/integration/microprofile/reactive/messaging/ported/signatures/PublisherSignatureTestCase.java @@ -22,7 +22,7 @@ package org.wildfly.test.integration.microprofile.reactive.messaging.ported.signatures; -import static org.jboss.as.test.shared.integration.ejb.security.PermissionUtils.createPermissionsXmlAsset; +import static org.jboss.as.test.shared.PermissionUtils.createPermissionsXmlAsset; import static org.wildfly.test.integration.microprofile.reactive.messaging.ported.utils.ReactiveMessagingTestUtils.await; import static org.wildfly.test.integration.microprofile.reactive.messaging.ported.utils.ReactiveMessagingTestUtils.checkList; diff --git a/testsuite/integration/microprofile/src/test/java/org/wildfly/test/integration/microprofile/reactive/messaging/ported/signatures/SubscriberSignatureTestCase.java b/testsuite/integration/microprofile/src/test/java/org/wildfly/test/integration/microprofile/reactive/messaging/ported/signatures/SubscriberSignatureTestCase.java index eddac33b5f75..920545928ff1 100644 --- a/testsuite/integration/microprofile/src/test/java/org/wildfly/test/integration/microprofile/reactive/messaging/ported/signatures/SubscriberSignatureTestCase.java +++ b/testsuite/integration/microprofile/src/test/java/org/wildfly/test/integration/microprofile/reactive/messaging/ported/signatures/SubscriberSignatureTestCase.java @@ -22,7 +22,7 @@ package org.wildfly.test.integration.microprofile.reactive.messaging.ported.signatures; -import static org.jboss.as.test.shared.integration.ejb.security.PermissionUtils.createPermissionsXmlAsset; +import static org.jboss.as.test.shared.PermissionUtils.createPermissionsXmlAsset; import static org.wildfly.test.integration.microprofile.reactive.messaging.ported.utils.ReactiveMessagingTestUtils.await; import static org.wildfly.test.integration.microprofile.reactive.messaging.ported.utils.ReactiveMessagingTestUtils.checkList; diff --git a/testsuite/integration/microprofile/src/test/java/org/wildfly/test/integration/microprofile/reactive/messaging/ported/signatures/TransformerSignatureTestCase.java b/testsuite/integration/microprofile/src/test/java/org/wildfly/test/integration/microprofile/reactive/messaging/ported/signatures/TransformerSignatureTestCase.java index 5e3852c92d69..8ad8fa8b58a5 100644 --- a/testsuite/integration/microprofile/src/test/java/org/wildfly/test/integration/microprofile/reactive/messaging/ported/signatures/TransformerSignatureTestCase.java +++ b/testsuite/integration/microprofile/src/test/java/org/wildfly/test/integration/microprofile/reactive/messaging/ported/signatures/TransformerSignatureTestCase.java @@ -22,7 +22,7 @@ package org.wildfly.test.integration.microprofile.reactive.messaging.ported.signatures; -import static org.jboss.as.test.shared.integration.ejb.security.PermissionUtils.createPermissionsXmlAsset; +import static org.jboss.as.test.shared.PermissionUtils.createPermissionsXmlAsset; import static org.wildfly.test.integration.microprofile.reactive.messaging.ported.utils.ReactiveMessagingTestUtils.await; import static org.wildfly.test.integration.microprofile.reactive.messaging.ported.utils.ReactiveMessagingTestUtils.checkList; diff --git a/testsuite/integration/microprofile/src/test/java/org/wildfly/test/integration/microprofile/reactive/messaging/rest/channels/ReactiveMessagingChannelsTestCase.java b/testsuite/integration/microprofile/src/test/java/org/wildfly/test/integration/microprofile/reactive/messaging/rest/channels/ReactiveMessagingChannelsTestCase.java index acafc5b1c1e4..1d165fcb6ed9 100644 --- a/testsuite/integration/microprofile/src/test/java/org/wildfly/test/integration/microprofile/reactive/messaging/rest/channels/ReactiveMessagingChannelsTestCase.java +++ b/testsuite/integration/microprofile/src/test/java/org/wildfly/test/integration/microprofile/reactive/messaging/rest/channels/ReactiveMessagingChannelsTestCase.java @@ -22,7 +22,7 @@ package org.wildfly.test.integration.microprofile.reactive.messaging.rest.channels; -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.BufferedReader; diff --git a/testsuite/integration/microprofile/src/test/java/org/wildfly/test/integration/microprofile/reactive/messaging/sanity/ReactiveMessagingSanityTestCase.java b/testsuite/integration/microprofile/src/test/java/org/wildfly/test/integration/microprofile/reactive/messaging/sanity/ReactiveMessagingSanityTestCase.java index 7d7d22625202..7250c4f569fa 100644 --- a/testsuite/integration/microprofile/src/test/java/org/wildfly/test/integration/microprofile/reactive/messaging/sanity/ReactiveMessagingSanityTestCase.java +++ b/testsuite/integration/microprofile/src/test/java/org/wildfly/test/integration/microprofile/reactive/messaging/sanity/ReactiveMessagingSanityTestCase.java @@ -22,7 +22,7 @@ package org.wildfly.test.integration.microprofile.reactive.messaging.sanity; -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.TimeUnit; diff --git a/testsuite/integration/microprofile/src/test/java/org/wildfly/test/integration/microprofile/reactive/messaging/tx/ReactiveMessagingTransactionTestCase.java b/testsuite/integration/microprofile/src/test/java/org/wildfly/test/integration/microprofile/reactive/messaging/tx/ReactiveMessagingTransactionTestCase.java index 8af0c3984dba..dbe491b650b1 100644 --- a/testsuite/integration/microprofile/src/test/java/org/wildfly/test/integration/microprofile/reactive/messaging/tx/ReactiveMessagingTransactionTestCase.java +++ b/testsuite/integration/microprofile/src/test/java/org/wildfly/test/integration/microprofile/reactive/messaging/tx/ReactiveMessagingTransactionTestCase.java @@ -22,7 +22,7 @@ package org.wildfly.test.integration.microprofile.reactive.messaging.tx; -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.PropertyPermission; diff --git a/testsuite/integration/microprofile/src/test/java/org/wildfly/test/integration/microprofile/reactive/streams/operators/ReactiveStreamsOperatorsInjectedReactiveEngineProviderSanityTestCase.java b/testsuite/integration/microprofile/src/test/java/org/wildfly/test/integration/microprofile/reactive/streams/operators/ReactiveStreamsOperatorsInjectedReactiveEngineProviderSanityTestCase.java index 463188514fd9..312efcd35aec 100644 --- a/testsuite/integration/microprofile/src/test/java/org/wildfly/test/integration/microprofile/reactive/streams/operators/ReactiveStreamsOperatorsInjectedReactiveEngineProviderSanityTestCase.java +++ b/testsuite/integration/microprofile/src/test/java/org/wildfly/test/integration/microprofile/reactive/streams/operators/ReactiveStreamsOperatorsInjectedReactiveEngineProviderSanityTestCase.java @@ -22,7 +22,7 @@ package org.wildfly.test.integration.microprofile.reactive.streams.operators; -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.util.List; diff --git a/testsuite/integration/microprofile/src/test/java/org/wildfly/test/integration/microprofile/reactive/streams/operators/ReactiveStreamsOperatorsNoReactiveEngineProviderSanityTestCase.java b/testsuite/integration/microprofile/src/test/java/org/wildfly/test/integration/microprofile/reactive/streams/operators/ReactiveStreamsOperatorsNoReactiveEngineProviderSanityTestCase.java index 7c03910df5d0..42a95d6ea95f 100644 --- a/testsuite/integration/microprofile/src/test/java/org/wildfly/test/integration/microprofile/reactive/streams/operators/ReactiveStreamsOperatorsNoReactiveEngineProviderSanityTestCase.java +++ b/testsuite/integration/microprofile/src/test/java/org/wildfly/test/integration/microprofile/reactive/streams/operators/ReactiveStreamsOperatorsNoReactiveEngineProviderSanityTestCase.java @@ -22,7 +22,7 @@ package org.wildfly.test.integration.microprofile.reactive.streams.operators; -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.util.List; diff --git a/testsuite/integration/microprofile/src/test/java/org/wildfly/test/integration/observability/opentelemetry/BaseOpenTelemetryTest.java b/testsuite/integration/microprofile/src/test/java/org/wildfly/test/integration/observability/opentelemetry/BaseOpenTelemetryTest.java index d80feed243b6..5f2e71d97d2f 100644 --- a/testsuite/integration/microprofile/src/test/java/org/wildfly/test/integration/observability/opentelemetry/BaseOpenTelemetryTest.java +++ b/testsuite/integration/microprofile/src/test/java/org/wildfly/test/integration/observability/opentelemetry/BaseOpenTelemetryTest.java @@ -19,7 +19,7 @@ package org.wildfly.test.integration.observability.opentelemetry; -import static org.jboss.as.test.shared.integration.ejb.security.PermissionUtils.createPermissionsXmlAsset; +import static org.jboss.as.test.shared.PermissionUtils.createPermissionsXmlAsset; import jakarta.inject.Inject; import io.opentelemetry.sdk.autoconfigure.spi.traces.ConfigurableSpanExporterProvider; diff --git a/testsuite/integration/multinode/pom.xml b/testsuite/integration/multinode/pom.xml index 882b8044fa94..a3fa32bc3ae3 100644 --- a/testsuite/integration/multinode/pom.xml +++ b/testsuite/integration/multinode/pom.xml @@ -93,11 +93,6 @@ wildfly-transaction-client test - - xom - xom - test - diff --git a/testsuite/integration/multinode/src/test/java/org/jboss/as/test/multinode/batch/stoprestart/StopFromDifferentNodeTestCase.java b/testsuite/integration/multinode/src/test/java/org/jboss/as/test/multinode/batch/stoprestart/StopFromDifferentNodeTestCase.java index 937d83b3070a..e5b8fad77562 100644 --- a/testsuite/integration/multinode/src/test/java/org/jboss/as/test/multinode/batch/stoprestart/StopFromDifferentNodeTestCase.java +++ b/testsuite/integration/multinode/src/test/java/org/jboss/as/test/multinode/batch/stoprestart/StopFromDifferentNodeTestCase.java @@ -28,7 +28,7 @@ import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.STEPS; import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.SUBSYSTEM; import static org.jboss.as.test.multinode.ejb.timer.database.DatabaseTimerServiceMultiNodeExecutionDisabledTestCase.getRemoteContext; -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.net.SocketPermission; diff --git a/testsuite/integration/multinode/src/test/java/org/jboss/as/test/multinode/clientinterceptor/RemoteCallClientInterceptorTestCase.java b/testsuite/integration/multinode/src/test/java/org/jboss/as/test/multinode/clientinterceptor/RemoteCallClientInterceptorTestCase.java index 25c564c1032c..41085d95a95b 100644 --- a/testsuite/integration/multinode/src/test/java/org/jboss/as/test/multinode/clientinterceptor/RemoteCallClientInterceptorTestCase.java +++ b/testsuite/integration/multinode/src/test/java/org/jboss/as/test/multinode/clientinterceptor/RemoteCallClientInterceptorTestCase.java @@ -22,7 +22,7 @@ package org.jboss.as.test.multinode.clientinterceptor; -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.io.FilePermission; diff --git a/testsuite/integration/multinode/src/test/java/org/jboss/as/test/multinode/clientinterceptor/multiple/MultipleClientInterceptorTestCase.java b/testsuite/integration/multinode/src/test/java/org/jboss/as/test/multinode/clientinterceptor/multiple/MultipleClientInterceptorTestCase.java index 34e753d85b6b..5f8adcf1cbb5 100644 --- a/testsuite/integration/multinode/src/test/java/org/jboss/as/test/multinode/clientinterceptor/multiple/MultipleClientInterceptorTestCase.java +++ b/testsuite/integration/multinode/src/test/java/org/jboss/as/test/multinode/clientinterceptor/multiple/MultipleClientInterceptorTestCase.java @@ -21,7 +21,7 @@ */ package org.jboss.as.test.multinode.clientinterceptor.multiple; -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.fail; import java.security.SecurityPermission; import java.util.Arrays; diff --git a/testsuite/integration/multinode/src/test/java/org/jboss/as/test/multinode/clientinterceptor/protocol/RemoteProtocolChangeClientInterceptorTestCase.java b/testsuite/integration/multinode/src/test/java/org/jboss/as/test/multinode/clientinterceptor/protocol/RemoteProtocolChangeClientInterceptorTestCase.java index 13170c937d93..5263f783d065 100644 --- a/testsuite/integration/multinode/src/test/java/org/jboss/as/test/multinode/clientinterceptor/protocol/RemoteProtocolChangeClientInterceptorTestCase.java +++ b/testsuite/integration/multinode/src/test/java/org/jboss/as/test/multinode/clientinterceptor/protocol/RemoteProtocolChangeClientInterceptorTestCase.java @@ -22,7 +22,7 @@ package org.jboss.as.test.multinode.clientinterceptor.protocol; import static org.jboss.as.test.shared.TestSuiteEnvironment.getSystemProperty; -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.io.FilePermission; diff --git a/testsuite/integration/multinode/src/test/java/org/jboss/as/test/multinode/clientinterceptor/secured/SecuredBeanClientInterceptorTestCase.java b/testsuite/integration/multinode/src/test/java/org/jboss/as/test/multinode/clientinterceptor/secured/SecuredBeanClientInterceptorTestCase.java index b919861a1f80..fdfd92dbd5d7 100644 --- a/testsuite/integration/multinode/src/test/java/org/jboss/as/test/multinode/clientinterceptor/secured/SecuredBeanClientInterceptorTestCase.java +++ b/testsuite/integration/multinode/src/test/java/org/jboss/as/test/multinode/clientinterceptor/secured/SecuredBeanClientInterceptorTestCase.java @@ -21,7 +21,7 @@ */ package org.jboss.as.test.multinode.clientinterceptor.secured; -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.io.FilePermission; diff --git a/testsuite/integration/multinode/src/test/java/org/jboss/as/test/multinode/ejb/http/EjbOverHttpDescriptorTestCase.java b/testsuite/integration/multinode/src/test/java/org/jboss/as/test/multinode/ejb/http/EjbOverHttpDescriptorTestCase.java index e4e27bcf1d7e..1198fee049ce 100644 --- a/testsuite/integration/multinode/src/test/java/org/jboss/as/test/multinode/ejb/http/EjbOverHttpDescriptorTestCase.java +++ b/testsuite/integration/multinode/src/test/java/org/jboss/as/test/multinode/ejb/http/EjbOverHttpDescriptorTestCase.java @@ -41,7 +41,7 @@ import java.net.SocketPermission; import java.util.Arrays; import static org.jboss.as.test.shared.integration.ejb.security.PermissionUtils.createFilePermission; -import static org.jboss.as.test.shared.integration.ejb.security.PermissionUtils.createPermissionsXmlAsset; +import static org.jboss.as.test.shared.PermissionUtils.createPermissionsXmlAsset; /** diff --git a/testsuite/integration/multinode/src/test/java/org/jboss/as/test/multinode/ejb/http/EjbOverHttpTestCase.java b/testsuite/integration/multinode/src/test/java/org/jboss/as/test/multinode/ejb/http/EjbOverHttpTestCase.java index a0a4ad123fda..a071d42fe008 100644 --- a/testsuite/integration/multinode/src/test/java/org/jboss/as/test/multinode/ejb/http/EjbOverHttpTestCase.java +++ b/testsuite/integration/multinode/src/test/java/org/jboss/as/test/multinode/ejb/http/EjbOverHttpTestCase.java @@ -57,7 +57,7 @@ import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.STEPS; import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.SUBSYSTEM; import static org.jboss.as.test.shared.integration.ejb.security.PermissionUtils.createFilePermission; -import static org.jboss.as.test.shared.integration.ejb.security.PermissionUtils.createPermissionsXmlAsset; +import static org.jboss.as.test.shared.PermissionUtils.createPermissionsXmlAsset; /** diff --git a/testsuite/integration/multinode/src/test/java/org/jboss/as/test/multinode/ejb/http/EjbOverHttpWrongCredentialsTestCase.java b/testsuite/integration/multinode/src/test/java/org/jboss/as/test/multinode/ejb/http/EjbOverHttpWrongCredentialsTestCase.java index 8feef4044916..d2094fa8f103 100644 --- a/testsuite/integration/multinode/src/test/java/org/jboss/as/test/multinode/ejb/http/EjbOverHttpWrongCredentialsTestCase.java +++ b/testsuite/integration/multinode/src/test/java/org/jboss/as/test/multinode/ejb/http/EjbOverHttpWrongCredentialsTestCase.java @@ -22,7 +22,7 @@ package org.jboss.as.test.multinode.ejb.http; import static org.jboss.as.test.shared.integration.ejb.security.PermissionUtils.createFilePermission; -import static org.jboss.as.test.shared.integration.ejb.security.PermissionUtils.createPermissionsXmlAsset; +import static org.jboss.as.test.shared.PermissionUtils.createPermissionsXmlAsset; import java.net.SocketPermission; import java.util.Arrays; diff --git a/testsuite/integration/multinode/src/test/java/org/jboss/as/test/multinode/ejb/timer/database/DatabaseTimerServiceMultiNodeTestCase.java b/testsuite/integration/multinode/src/test/java/org/jboss/as/test/multinode/ejb/timer/database/DatabaseTimerServiceMultiNodeTestCase.java index 8c68a6835e39..617534db98ae 100644 --- a/testsuite/integration/multinode/src/test/java/org/jboss/as/test/multinode/ejb/timer/database/DatabaseTimerServiceMultiNodeTestCase.java +++ b/testsuite/integration/multinode/src/test/java/org/jboss/as/test/multinode/ejb/timer/database/DatabaseTimerServiceMultiNodeTestCase.java @@ -28,7 +28,7 @@ import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.STEPS; import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.SUBSYSTEM; import static org.jboss.as.test.multinode.ejb.timer.database.DatabaseTimerServiceMultiNodeExecutionDisabledTestCase.getRemoteContext; -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.File; diff --git a/testsuite/integration/multinode/src/test/java/org/jboss/as/test/multinode/ejb/timer/database/DatabaseTimerServiceRefreshTestCase.java b/testsuite/integration/multinode/src/test/java/org/jboss/as/test/multinode/ejb/timer/database/DatabaseTimerServiceRefreshTestCase.java index 07f0665341ce..a49cf1b35edc 100644 --- a/testsuite/integration/multinode/src/test/java/org/jboss/as/test/multinode/ejb/timer/database/DatabaseTimerServiceRefreshTestCase.java +++ b/testsuite/integration/multinode/src/test/java/org/jboss/as/test/multinode/ejb/timer/database/DatabaseTimerServiceRefreshTestCase.java @@ -32,7 +32,7 @@ import static org.jboss.as.test.multinode.ejb.timer.database.RefreshIF.Info.CLIENT1; import static org.jboss.as.test.multinode.ejb.timer.database.RefreshIF.Info.RETURN_HANDLE; import static org.jboss.as.test.multinode.ejb.timer.database.RefreshIF.Info.SERVER1; -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.assertTrue; diff --git a/testsuite/integration/multinode/src/test/java/org/jboss/as/test/multinode/remotecall/RemoteLocalCallProfileTestCase.java b/testsuite/integration/multinode/src/test/java/org/jboss/as/test/multinode/remotecall/RemoteLocalCallProfileTestCase.java index ea7733d2693d..0adafa89e0f6 100644 --- a/testsuite/integration/multinode/src/test/java/org/jboss/as/test/multinode/remotecall/RemoteLocalCallProfileTestCase.java +++ b/testsuite/integration/multinode/src/test/java/org/jboss/as/test/multinode/remotecall/RemoteLocalCallProfileTestCase.java @@ -28,7 +28,7 @@ import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.STEPS; import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.SUBSYSTEM; import static org.jboss.as.test.shared.integration.ejb.security.PermissionUtils.createFilePermission; -import static org.jboss.as.test.shared.integration.ejb.security.PermissionUtils.createPermissionsXmlAsset; +import static org.jboss.as.test.shared.PermissionUtils.createPermissionsXmlAsset; import java.util.Arrays; import java.util.Collections; diff --git a/testsuite/integration/multinode/src/test/java/org/jboss/as/test/multinode/remotecall/RemoteLocalCallTestCase.java b/testsuite/integration/multinode/src/test/java/org/jboss/as/test/multinode/remotecall/RemoteLocalCallTestCase.java index ca675d490834..d05b5d82f8fc 100644 --- a/testsuite/integration/multinode/src/test/java/org/jboss/as/test/multinode/remotecall/RemoteLocalCallTestCase.java +++ b/testsuite/integration/multinode/src/test/java/org/jboss/as/test/multinode/remotecall/RemoteLocalCallTestCase.java @@ -23,7 +23,7 @@ package org.jboss.as.test.multinode.remotecall; import static org.jboss.as.test.shared.integration.ejb.security.PermissionUtils.createFilePermission; -import static org.jboss.as.test.shared.integration.ejb.security.PermissionUtils.createPermissionsXmlAsset; +import static org.jboss.as.test.shared.PermissionUtils.createPermissionsXmlAsset; import java.security.SecurityPermission; import java.util.Arrays; diff --git a/testsuite/integration/multinode/src/test/java/org/jboss/as/test/multinode/remotecall/scoped/context/DynamicJNDIContextEJBInvocationTestCase.java b/testsuite/integration/multinode/src/test/java/org/jboss/as/test/multinode/remotecall/scoped/context/DynamicJNDIContextEJBInvocationTestCase.java index 2bf04e8159da..c91b9a4d698b 100644 --- a/testsuite/integration/multinode/src/test/java/org/jboss/as/test/multinode/remotecall/scoped/context/DynamicJNDIContextEJBInvocationTestCase.java +++ b/testsuite/integration/multinode/src/test/java/org/jboss/as/test/multinode/remotecall/scoped/context/DynamicJNDIContextEJBInvocationTestCase.java @@ -40,7 +40,7 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -import static org.jboss.as.test.shared.integration.ejb.security.PermissionUtils.createPermissionsXmlAsset; +import static org.jboss.as.test.shared.PermissionUtils.createPermissionsXmlAsset; /** * A test case for testing the feature introduced in https://issues.jboss.org/browse/EJBCLIENT-34 which diff --git a/testsuite/integration/multinode/src/test/java/org/jboss/as/test/multinode/transaction/TransactionInvocationTestCase.java b/testsuite/integration/multinode/src/test/java/org/jboss/as/test/multinode/transaction/TransactionInvocationTestCase.java index 1ed3e0cf22b8..f7712aea5157 100644 --- a/testsuite/integration/multinode/src/test/java/org/jboss/as/test/multinode/transaction/TransactionInvocationTestCase.java +++ b/testsuite/integration/multinode/src/test/java/org/jboss/as/test/multinode/transaction/TransactionInvocationTestCase.java @@ -43,7 +43,7 @@ import java.util.Arrays; import static org.jboss.as.test.shared.integration.ejb.security.PermissionUtils.createFilePermission; -import static org.jboss.as.test.shared.integration.ejb.security.PermissionUtils.createPermissionsXmlAsset; +import static org.jboss.as.test.shared.PermissionUtils.createPermissionsXmlAsset; /** * A simple Jakarta Enterprise Beans Remoting transaction context propagation in JTS style from one AS7 server to another. diff --git a/testsuite/integration/multinode/src/test/java/org/jboss/as/test/multinode/transaction/async/TransactionPropagationTestCase.java b/testsuite/integration/multinode/src/test/java/org/jboss/as/test/multinode/transaction/async/TransactionPropagationTestCase.java index ac0b0003680c..068ebfe1c9e2 100644 --- a/testsuite/integration/multinode/src/test/java/org/jboss/as/test/multinode/transaction/async/TransactionPropagationTestCase.java +++ b/testsuite/integration/multinode/src/test/java/org/jboss/as/test/multinode/transaction/async/TransactionPropagationTestCase.java @@ -33,7 +33,7 @@ import org.junit.runner.RunWith; import static org.jboss.as.test.shared.integration.ejb.security.PermissionUtils.createFilePermission; -import static org.jboss.as.test.shared.integration.ejb.security.PermissionUtils.createPermissionsXmlAsset; +import static org.jboss.as.test.shared.PermissionUtils.createPermissionsXmlAsset; import java.util.Arrays; diff --git a/testsuite/integration/multinode/src/test/java/org/jboss/as/test/multinode/transaction/nooutbound/TransactionContextRemoteCallTestCase.java b/testsuite/integration/multinode/src/test/java/org/jboss/as/test/multinode/transaction/nooutbound/TransactionContextRemoteCallTestCase.java index 1422152925b6..525e8087d548 100644 --- a/testsuite/integration/multinode/src/test/java/org/jboss/as/test/multinode/transaction/nooutbound/TransactionContextRemoteCallTestCase.java +++ b/testsuite/integration/multinode/src/test/java/org/jboss/as/test/multinode/transaction/nooutbound/TransactionContextRemoteCallTestCase.java @@ -23,7 +23,7 @@ package org.jboss.as.test.multinode.transaction.nooutbound; import static org.jboss.as.test.shared.integration.ejb.security.PermissionUtils.createFilePermission; -import static org.jboss.as.test.shared.integration.ejb.security.PermissionUtils.createPermissionsXmlAsset; +import static org.jboss.as.test.shared.PermissionUtils.createPermissionsXmlAsset; import java.net.SocketPermission; import java.util.Arrays; diff --git a/testsuite/integration/rts/pom.xml b/testsuite/integration/rts/pom.xml index 45d74f756d6f..34b721a17d9c 100644 --- a/testsuite/integration/rts/pom.xml +++ b/testsuite/integration/rts/pom.xml @@ -122,11 +122,6 @@ wildfly-core-testsuite-shared test - - xom - xom - test - diff --git a/testsuite/integration/rts/src/test/java/org/wildfly/test/extension/rts/CoordinatorTestCase.java b/testsuite/integration/rts/src/test/java/org/wildfly/test/extension/rts/CoordinatorTestCase.java index ab6e28483337..204bdf38774a 100644 --- a/testsuite/integration/rts/src/test/java/org/wildfly/test/extension/rts/CoordinatorTestCase.java +++ b/testsuite/integration/rts/src/test/java/org/wildfly/test/extension/rts/CoordinatorTestCase.java @@ -31,7 +31,7 @@ import org.jboss.arquillian.test.api.ArquillianResource; import org.jboss.as.arquillian.container.ManagementClient; import org.jboss.as.test.shared.TestSuiteEnvironment; -import org.jboss.as.test.shared.integration.ejb.security.PermissionUtils; +import org.jboss.as.test.shared.PermissionUtils; import org.jboss.jbossts.star.util.TxMediaType; import org.jboss.jbossts.star.util.TxStatusMediaType; import org.jboss.jbossts.star.util.TxSupport; diff --git a/testsuite/integration/rts/src/test/java/org/wildfly/test/extension/rts/ParticipantTestCase.java b/testsuite/integration/rts/src/test/java/org/wildfly/test/extension/rts/ParticipantTestCase.java index 2111b79510c6..c4dda4cf2898 100644 --- a/testsuite/integration/rts/src/test/java/org/wildfly/test/extension/rts/ParticipantTestCase.java +++ b/testsuite/integration/rts/src/test/java/org/wildfly/test/extension/rts/ParticipantTestCase.java @@ -33,7 +33,7 @@ import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.junit.Arquillian; import org.jboss.as.test.shared.TestSuiteEnvironment; -import org.jboss.as.test.shared.integration.ejb.security.PermissionUtils; +import org.jboss.as.test.shared.PermissionUtils; import org.jboss.jbossts.star.util.TxStatus; import org.jboss.jbossts.star.util.TxSupport; import org.jboss.narayana.rest.integration.api.Aborted; diff --git a/testsuite/integration/secman/pom.xml b/testsuite/integration/secman/pom.xml index 26420f5a1f35..d131af7d8507 100644 --- a/testsuite/integration/secman/pom.xml +++ b/testsuite/integration/secman/pom.xml @@ -93,11 +93,6 @@ jakarta.transaction-api test - - xom - xom - test - diff --git a/testsuite/integration/secman/src/test/java/org/jboss/as/testsuite/integration/secman/propertypermission/AbstractPropertyPermissionTests.java b/testsuite/integration/secman/src/test/java/org/jboss/as/testsuite/integration/secman/propertypermission/AbstractPropertyPermissionTests.java index 8251fbb933d9..a51a584610bb 100644 --- a/testsuite/integration/secman/src/test/java/org/jboss/as/testsuite/integration/secman/propertypermission/AbstractPropertyPermissionTests.java +++ b/testsuite/integration/secman/src/test/java/org/jboss/as/testsuite/integration/secman/propertypermission/AbstractPropertyPermissionTests.java @@ -38,7 +38,7 @@ import org.jboss.arquillian.test.api.ArquillianResource; import org.jboss.as.arquillian.api.ServerSetup; import org.jboss.as.test.integration.security.common.Utils; -import org.jboss.as.test.shared.integration.ejb.security.PermissionUtils; +import org.jboss.as.test.shared.PermissionUtils; import org.jboss.as.testsuite.integration.secman.servlets.JSMCheckServlet; import org.jboss.logging.Logger; import org.jboss.shrinkwrap.api.asset.Asset; diff --git a/testsuite/integration/secman/src/test/java/org/jboss/as/testsuite/integration/secman/propertypermission/PropertyPermissionExpressionsTestCase.java b/testsuite/integration/secman/src/test/java/org/jboss/as/testsuite/integration/secman/propertypermission/PropertyPermissionExpressionsTestCase.java index 73433e8b0045..9d73604021cc 100644 --- a/testsuite/integration/secman/src/test/java/org/jboss/as/testsuite/integration/secman/propertypermission/PropertyPermissionExpressionsTestCase.java +++ b/testsuite/integration/secman/src/test/java/org/jboss/as/testsuite/integration/secman/propertypermission/PropertyPermissionExpressionsTestCase.java @@ -43,7 +43,7 @@ import org.jboss.as.test.integration.security.common.AbstractSystemPropertiesServerSetupTask; import org.jboss.as.test.integration.security.common.Utils; import org.jboss.as.test.shared.TestSuiteEnvironment; -import org.jboss.as.test.shared.integration.ejb.security.PermissionUtils; +import org.jboss.as.test.shared.PermissionUtils; import org.jboss.as.testsuite.integration.secman.servlets.JSMCheckServlet; import org.jboss.as.testsuite.integration.secman.servlets.PrintSystemPropertyServlet; import org.jboss.dmr.ModelNode; diff --git a/testsuite/integration/secman/src/test/java/org/jboss/as/testsuite/integration/secman/subsystem/MaximumPermissionsTestCase.java b/testsuite/integration/secman/src/test/java/org/jboss/as/testsuite/integration/secman/subsystem/MaximumPermissionsTestCase.java index cf38166a52c6..3a3ac3f2de65 100644 --- a/testsuite/integration/secman/src/test/java/org/jboss/as/testsuite/integration/secman/subsystem/MaximumPermissionsTestCase.java +++ b/testsuite/integration/secman/src/test/java/org/jboss/as/testsuite/integration/secman/subsystem/MaximumPermissionsTestCase.java @@ -40,7 +40,7 @@ import org.jboss.as.test.integration.management.util.CLIOpResult; import org.jboss.as.test.integration.security.common.Utils; import org.jboss.as.test.shared.TestSuiteEnvironment; -import org.jboss.as.test.shared.integration.ejb.security.PermissionUtils; +import org.jboss.as.test.shared.PermissionUtils; import org.jboss.as.testsuite.integration.secman.servlets.PrintSystemPropertyServlet; import org.jboss.logging.Logger; import org.jboss.shrinkwrap.api.ShrinkWrap; diff --git a/testsuite/integration/smoke/pom.xml b/testsuite/integration/smoke/pom.xml index b74508d917d4..71fbc4f2383d 100644 --- a/testsuite/integration/smoke/pom.xml +++ b/testsuite/integration/smoke/pom.xml @@ -416,12 +416,6 @@ wsdl4j test - - - xom - xom - test - diff --git a/testsuite/integration/smoke/src/test/java/org/jboss/as/test/smoke/jms/JMSBridgeTest.java b/testsuite/integration/smoke/src/test/java/org/jboss/as/test/smoke/jms/JMSBridgeTest.java index 6d7cf9448ec0..ddbb9cfc5146 100644 --- a/testsuite/integration/smoke/src/test/java/org/jboss/as/test/smoke/jms/JMSBridgeTest.java +++ b/testsuite/integration/smoke/src/test/java/org/jboss/as/test/smoke/jms/JMSBridgeTest.java @@ -24,7 +24,7 @@ import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.OUTCOME; import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.RESULT; 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 static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; diff --git a/testsuite/integration/web/pom.xml b/testsuite/integration/web/pom.xml index af9feeae4d4b..e6315c768a33 100644 --- a/testsuite/integration/web/pom.xml +++ b/testsuite/integration/web/pom.xml @@ -167,12 +167,6 @@ test - - xom - xom - test - - org.wildfly diff --git a/testsuite/integration/web/src/test/java/org/jboss/as/test/integration/ee/concurrent/DefaultContextServiceServletTestCase.java b/testsuite/integration/web/src/test/java/org/jboss/as/test/integration/ee/concurrent/DefaultContextServiceServletTestCase.java index f59e1771ad85..2bc9f9b3e500 100644 --- a/testsuite/integration/web/src/test/java/org/jboss/as/test/integration/ee/concurrent/DefaultContextServiceServletTestCase.java +++ b/testsuite/integration/web/src/test/java/org/jboss/as/test/integration/ee/concurrent/DefaultContextServiceServletTestCase.java @@ -22,7 +22,7 @@ package org.jboss.as.test.integration.ee.concurrent; 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 java.net.URL; diff --git a/testsuite/integration/web/src/test/java/org/jboss/as/test/integration/web/handlers/ForwardedHandlerTestCase.java b/testsuite/integration/web/src/test/java/org/jboss/as/test/integration/web/handlers/ForwardedHandlerTestCase.java index c421fede4dc6..8a6b198dfe23 100644 --- a/testsuite/integration/web/src/test/java/org/jboss/as/test/integration/web/handlers/ForwardedHandlerTestCase.java +++ b/testsuite/integration/web/src/test/java/org/jboss/as/test/integration/web/handlers/ForwardedHandlerTestCase.java @@ -3,7 +3,7 @@ import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.ALLOW_RESOURCE_SERVICE_RESTART; 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 static org.junit.Assert.assertEquals; import java.io.IOException; diff --git a/testsuite/integration/web/src/test/java/org/jboss/as/test/integration/web/handlers/RequestDumpingHandlerTestCase.java b/testsuite/integration/web/src/test/java/org/jboss/as/test/integration/web/handlers/RequestDumpingHandlerTestCase.java index 75924c36ca08..d5084fd43f2c 100644 --- a/testsuite/integration/web/src/test/java/org/jboss/as/test/integration/web/handlers/RequestDumpingHandlerTestCase.java +++ b/testsuite/integration/web/src/test/java/org/jboss/as/test/integration/web/handlers/RequestDumpingHandlerTestCase.java @@ -7,7 +7,7 @@ import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.PROTOCOL; import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.SUBSYSTEM; import static org.jboss.as.test.integration.management.util.ModelUtil.createOpNode; -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/web/src/test/java/org/jboss/as/test/integration/web/handlers/UndertowHandlersConfigTestCase.java b/testsuite/integration/web/src/test/java/org/jboss/as/test/integration/web/handlers/UndertowHandlersConfigTestCase.java index af8a58fe96ae..5fd8817860ad 100644 --- a/testsuite/integration/web/src/test/java/org/jboss/as/test/integration/web/handlers/UndertowHandlersConfigTestCase.java +++ b/testsuite/integration/web/src/test/java/org/jboss/as/test/integration/web/handlers/UndertowHandlersConfigTestCase.java @@ -12,7 +12,6 @@ import org.jboss.arquillian.container.test.api.RunAsClient; import org.jboss.arquillian.junit.Arquillian; import org.jboss.arquillian.test.api.ArquillianResource; -import org.jboss.as.test.shared.integration.ejb.security.PermissionUtils; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; import org.jboss.shrinkwrap.api.spec.WebArchive; @@ -23,6 +22,7 @@ import java.io.FilePermission; import java.net.URL; +import static org.jboss.as.test.shared.PermissionUtils.createPermissionsXmlAsset; import static org.junit.Assert.assertEquals; /** @@ -41,7 +41,7 @@ public static WebArchive deploy() { .addAsWebInfResource(UndertowHandlersConfigTestCase.class.getPackage(), "jboss-web.xml", "jboss-web.xml") .addAsWebResource(new StringAsset("A file"), "file.txt") .addAsWebInfResource(new StringAsset("regex['/rewrite.*'] -> rewrite['/file.txt']"), "undertow-handlers.conf") - .addAsWebResource(PermissionUtils.createPermissionsXmlAsset(new FilePermission("<>", "read,write")), "META-INF/permissions.xml"); + .addAsWebResource(createPermissionsXmlAsset(new FilePermission("<>", "read,write")), "META-INF/permissions.xml"); } diff --git a/testsuite/integration/web/src/test/java/org/jboss/as/test/integration/web/security/servlet3/WebSecurityProgrammaticLoginTestCase.java b/testsuite/integration/web/src/test/java/org/jboss/as/test/integration/web/security/servlet3/WebSecurityProgrammaticLoginTestCase.java index 3685ca7aa142..5bab1b5cceb7 100644 --- a/testsuite/integration/web/src/test/java/org/jboss/as/test/integration/web/security/servlet3/WebSecurityProgrammaticLoginTestCase.java +++ b/testsuite/integration/web/src/test/java/org/jboss/as/test/integration/web/security/servlet3/WebSecurityProgrammaticLoginTestCase.java @@ -21,7 +21,7 @@ */ package org.jboss.as.test.integration.web.security.servlet3; -import static org.jboss.as.test.shared.integration.ejb.security.PermissionUtils.createPermissionsXmlAsset; +import static org.jboss.as.test.shared.PermissionUtils.createPermissionsXmlAsset; import org.apache.http.HttpResponse; import org.apache.http.client.methods.HttpGet; diff --git a/testsuite/integration/web/src/test/java/org/jboss/as/test/integration/web/security/websocket/WebSocketSecurityTestCase.java b/testsuite/integration/web/src/test/java/org/jboss/as/test/integration/web/security/websocket/WebSocketSecurityTestCase.java index d90b3fdb0cd7..a6d1ae60d618 100644 --- a/testsuite/integration/web/src/test/java/org/jboss/as/test/integration/web/security/websocket/WebSocketSecurityTestCase.java +++ b/testsuite/integration/web/src/test/java/org/jboss/as/test/integration/web/security/websocket/WebSocketSecurityTestCase.java @@ -21,7 +21,7 @@ */ package org.jboss.as.test.integration.web.security.websocket; -import static org.jboss.as.test.shared.integration.ejb.security.PermissionUtils.createPermissionsXmlAsset; +import static org.jboss.as.test.shared.PermissionUtils.createPermissionsXmlAsset; import java.net.SocketPermission; import java.net.URI; diff --git a/testsuite/integration/web/src/test/java/org/jboss/as/test/integration/web/servlet/lifecycle/ServletLifecycleMethodDescriptorTestCase.java b/testsuite/integration/web/src/test/java/org/jboss/as/test/integration/web/servlet/lifecycle/ServletLifecycleMethodDescriptorTestCase.java index d733c0ec3f73..2ac60e1e0477 100644 --- a/testsuite/integration/web/src/test/java/org/jboss/as/test/integration/web/servlet/lifecycle/ServletLifecycleMethodDescriptorTestCase.java +++ b/testsuite/integration/web/src/test/java/org/jboss/as/test/integration/web/servlet/lifecycle/ServletLifecycleMethodDescriptorTestCase.java @@ -22,7 +22,7 @@ package org.jboss.as.test.integration.web.servlet.lifecycle; 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.net.URL; diff --git a/testsuite/integration/web/src/test/java/org/jboss/as/test/integration/web/websocket/WebSocketTestCase.java b/testsuite/integration/web/src/test/java/org/jboss/as/test/integration/web/websocket/WebSocketTestCase.java index c80dadadf80c..d04e92f311cc 100644 --- a/testsuite/integration/web/src/test/java/org/jboss/as/test/integration/web/websocket/WebSocketTestCase.java +++ b/testsuite/integration/web/src/test/java/org/jboss/as/test/integration/web/websocket/WebSocketTestCase.java @@ -1,6 +1,6 @@ package org.jboss.as.test.integration.web.websocket; -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.SocketPermission; diff --git a/testsuite/integration/ws/pom.xml b/testsuite/integration/ws/pom.xml index e9462a577c6a..ad6216f33dcd 100644 --- a/testsuite/integration/ws/pom.xml +++ b/testsuite/integration/ws/pom.xml @@ -360,11 +360,6 @@ wsdl4j test - - xom - xom - test - diff --git a/testsuite/integration/ws/src/test/java/org/jboss/as/test/integration/ws/basic/EJBEndpointTestCase.java b/testsuite/integration/ws/src/test/java/org/jboss/as/test/integration/ws/basic/EJBEndpointTestCase.java index 4c73e21d1225..50ac09aa8575 100644 --- a/testsuite/integration/ws/src/test/java/org/jboss/as/test/integration/ws/basic/EJBEndpointTestCase.java +++ b/testsuite/integration/ws/src/test/java/org/jboss/as/test/integration/ws/basic/EJBEndpointTestCase.java @@ -36,7 +36,7 @@ import org.junit.Before; 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 Rostislav Svoboda diff --git a/testsuite/integration/ws/src/test/java/org/jboss/as/test/integration/ws/basic/PojoEndpointTestCase.java b/testsuite/integration/ws/src/test/java/org/jboss/as/test/integration/ws/basic/PojoEndpointTestCase.java index 88b1c9baa009..dee7fdad2683 100644 --- a/testsuite/integration/ws/src/test/java/org/jboss/as/test/integration/ws/basic/PojoEndpointTestCase.java +++ b/testsuite/integration/ws/src/test/java/org/jboss/as/test/integration/ws/basic/PojoEndpointTestCase.java @@ -36,7 +36,7 @@ import org.junit.Before; 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 Rostislav Svoboda diff --git a/testsuite/integration/ws/src/test/java/org/jboss/as/test/integration/ws/serviceref/ServiceRefEarTestCase.java b/testsuite/integration/ws/src/test/java/org/jboss/as/test/integration/ws/serviceref/ServiceRefEarTestCase.java index ad11a7c3859a..02191fd13a6c 100644 --- a/testsuite/integration/ws/src/test/java/org/jboss/as/test/integration/ws/serviceref/ServiceRefEarTestCase.java +++ b/testsuite/integration/ws/src/test/java/org/jboss/as/test/integration/ws/serviceref/ServiceRefEarTestCase.java @@ -48,7 +48,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; /** * Tests for WS ServiceRef from servlet to verify access for in nested war diff --git a/testsuite/integration/ws/src/test/java/org/jboss/as/test/integration/ws/serviceref/ServiceRefSevletTestCase.java b/testsuite/integration/ws/src/test/java/org/jboss/as/test/integration/ws/serviceref/ServiceRefSevletTestCase.java index 737204c4bb6c..b91fc1eb8de2 100644 --- a/testsuite/integration/ws/src/test/java/org/jboss/as/test/integration/ws/serviceref/ServiceRefSevletTestCase.java +++ b/testsuite/integration/ws/src/test/java/org/jboss/as/test/integration/ws/serviceref/ServiceRefSevletTestCase.java @@ -46,7 +46,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 Rostislav Svoboda diff --git a/testsuite/integration/ws/src/test/java/org/jboss/as/test/integration/ws/serviceref/ServiceRefTestCase.java b/testsuite/integration/ws/src/test/java/org/jboss/as/test/integration/ws/serviceref/ServiceRefTestCase.java index 2303b2b722b8..6ae86b4c3bd1 100644 --- a/testsuite/integration/ws/src/test/java/org/jboss/as/test/integration/ws/serviceref/ServiceRefTestCase.java +++ b/testsuite/integration/ws/src/test/java/org/jboss/as/test/integration/ws/serviceref/ServiceRefTestCase.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; /** * Serviceref through ejb3 deployment descriptor. diff --git a/testsuite/integration/xts/pom.xml b/testsuite/integration/xts/pom.xml index e268ad005cdd..c30b856fd1f4 100644 --- a/testsuite/integration/xts/pom.xml +++ b/testsuite/integration/xts/pom.xml @@ -211,11 +211,6 @@ wsdl4j test - - xom - xom - test - diff --git a/testsuite/integration/xts/src/test/java/org/jboss/as/test/xts/suspend/AbstractTestCase.java b/testsuite/integration/xts/src/test/java/org/jboss/as/test/xts/suspend/AbstractTestCase.java index 873fd6fe7058..ef9a1af01f8f 100644 --- a/testsuite/integration/xts/src/test/java/org/jboss/as/test/xts/suspend/AbstractTestCase.java +++ b/testsuite/integration/xts/src/test/java/org/jboss/as/test/xts/suspend/AbstractTestCase.java @@ -41,7 +41,7 @@ import java.net.URL; import java.util.List; -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.as.test.xts.suspend.Helpers.getExecutorService; import static org.jboss.as.test.xts.suspend.Helpers.getRemoteService; diff --git a/testsuite/integration/xts/src/test/java/org/jboss/as/test/xts/util/DeploymentHelper.java b/testsuite/integration/xts/src/test/java/org/jboss/as/test/xts/util/DeploymentHelper.java index f0b2505a4be8..7cd425defd89 100644 --- a/testsuite/integration/xts/src/test/java/org/jboss/as/test/xts/util/DeploymentHelper.java +++ b/testsuite/integration/xts/src/test/java/org/jboss/as/test/xts/util/DeploymentHelper.java @@ -26,7 +26,7 @@ import java.lang.reflect.ReflectPermission; import java.util.PropertyPermission; -import org.jboss.as.test.shared.integration.ejb.security.PermissionUtils; +import org.jboss.as.test.shared.PermissionUtils; import org.jboss.shrinkwrap.api.ArchivePaths; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.Asset; diff --git a/testsuite/preview/basic/src/test/java/org/wildfly/test/preview/util/TestsuiteModuleTestCase.java b/testsuite/preview/basic/src/test/java/org/wildfly/test/preview/util/TestsuiteModuleTestCase.java index 345e21bcd16f..c03bafdec874 100644 --- a/testsuite/preview/basic/src/test/java/org/wildfly/test/preview/util/TestsuiteModuleTestCase.java +++ b/testsuite/preview/basic/src/test/java/org/wildfly/test/preview/util/TestsuiteModuleTestCase.java @@ -17,7 +17,7 @@ */ package org.wildfly.test.preview.util; -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.RunAsClient; diff --git a/testsuite/preview/pom.xml b/testsuite/preview/pom.xml index 96c2160bfd8d..665235c1ed81 100644 --- a/testsuite/preview/pom.xml +++ b/testsuite/preview/pom.xml @@ -86,11 +86,6 @@ wildfly-arquillian-protocol-jmx test - - xom - xom - test - diff --git a/testsuite/shared/pom.xml b/testsuite/shared/pom.xml index ce297e9ce404..1a453aa9868c 100644 --- a/testsuite/shared/pom.xml +++ b/testsuite/shared/pom.xml @@ -255,11 +255,6 @@ compile - - xom - xom - - diff --git a/testsuite/shared/src/main/java/org/jboss/as/test/shared/integration/ejb/security/PermissionUtils.java b/testsuite/shared/src/main/java/org/jboss/as/test/shared/integration/ejb/security/PermissionUtils.java index bb72258f0fa8..3c660b03e982 100644 --- a/testsuite/shared/src/main/java/org/jboss/as/test/shared/integration/ejb/security/PermissionUtils.java +++ b/testsuite/shared/src/main/java/org/jboss/as/test/shared/integration/ejb/security/PermissionUtils.java @@ -22,66 +22,19 @@ package org.jboss.as.test.shared.integration.ejb.security; -import java.io.ByteArrayOutputStream; import java.io.File; import java.io.FilePermission; -import java.io.IOException; -import java.io.OutputStream; -import java.io.UnsupportedEncodingException; import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; -import java.security.Permission; import java.util.Arrays; import java.util.Iterator; -import nu.xom.Attribute; -import nu.xom.Document; -import nu.xom.Element; -import nu.xom.Serializer; -import org.jboss.shrinkwrap.api.asset.Asset; -import org.jboss.shrinkwrap.api.asset.StringAsset; - /** * @author David M. Lloyd */ public final class PermissionUtils { - public static Asset createPermissionsXmlAsset(Permission... permissions) { - final Element permissionsElement = new Element("permissions"); - permissionsElement.setNamespaceURI("http://xmlns.jcp.org/xml/ns/javaee"); - permissionsElement.addAttribute(new Attribute("version", "7")); - for (Permission permission : permissions) { - final Element permissionElement = new Element("permission"); - - final Element classNameElement = new Element("class-name"); - final Element nameElement = new Element("name"); - classNameElement.appendChild(permission.getClass().getName()); - nameElement.appendChild(permission.getName()); - permissionElement.appendChild(classNameElement); - permissionElement.appendChild(nameElement); - - final String actions = permission.getActions(); - if (actions != null && ! actions.isEmpty()) { - final Element actionsElement = new Element("actions"); - actionsElement.appendChild(actions); - permissionElement.appendChild(actionsElement); - } - permissionsElement.appendChild(permissionElement); - } - Document document = new Document(permissionsElement); - try (ByteArrayOutputStream stream = new ByteArrayOutputStream()) { - final NiceSerializer serializer = new NiceSerializer(stream); - serializer.setIndent(4); - serializer.setLineSeparator("\n"); - serializer.write(document); - serializer.flush(); - return new StringAsset(stream.toString("UTF-8")); - } catch (IOException e) { - throw new IllegalStateException("Generating permissions.xml failed", e); - } - } - /** * Creates a new {@link FilePermission} with the base path of the system property {@code jboss.inst}. * @@ -152,16 +105,4 @@ public static FilePermission createFilePermission(final String action, final Str } return new FilePermission(path.toString(), action); } - - static class NiceSerializer extends Serializer { - - public NiceSerializer(OutputStream out) throws UnsupportedEncodingException { - super(out, "UTF-8"); - } - - protected void writeXMLDeclaration() throws IOException { - super.writeXMLDeclaration(); - super.breakLine(); - } - } }