diff --git a/controller/src/main/java/org/jboss/as/controller/extension/ExtensionResourceDefinition.java b/controller/src/main/java/org/jboss/as/controller/extension/ExtensionResourceDefinition.java index 28ca7aa0540..cb68a7dc101 100644 --- a/controller/src/main/java/org/jboss/as/controller/extension/ExtensionResourceDefinition.java +++ b/controller/src/main/java/org/jboss/as/controller/extension/ExtensionResourceDefinition.java @@ -9,6 +9,7 @@ import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.EXTENSION; import org.jboss.as.controller.ModelVersion; +import org.jboss.as.controller.ModuleIdentifierUtil; import org.jboss.as.controller.OperationDefinition; import org.jboss.as.controller.PathElement; import org.jboss.as.controller.SimpleAttributeDefinition; @@ -31,11 +32,14 @@ public class ExtensionResourceDefinition extends SimpleResourceDefinition { public static final SimpleAttributeDefinition MODULE = new SimpleAttributeDefinitionBuilder(ModelDescriptionConstants.MODULE, ModelType.STRING, false) - .setValidator(new StringLengthValidator(1)).build(); + .setValidator(new StringLengthValidator(1)) + .setCorrector(ModuleIdentifierUtil.MODULE_NAME_CORRECTOR) + .build(); private static final OperationDefinition ADD_OP = new SimpleOperationDefinitionBuilder(ADD, ControllerResolver.getResolver(EXTENSION)) .addParameter(new SimpleAttributeDefinitionBuilder(ModelDescriptionConstants.MODULE, ModelType.STRING, true) .setValidator(new StringLengthValidator(1)) + .setCorrector(ModuleIdentifierUtil.MODULE_NAME_CORRECTOR) .setDeprecated(ModelVersion.create(6)) .build()) .build(); diff --git a/core-management/core-management-subsystem/src/main/java/org/wildfly/extension/core/management/ProcessStateListenerResourceDefinition.java b/core-management/core-management-subsystem/src/main/java/org/wildfly/extension/core/management/ProcessStateListenerResourceDefinition.java index 9c9dabe37b0..9b092196f2d 100644 --- a/core-management/core-management-subsystem/src/main/java/org/wildfly/extension/core/management/ProcessStateListenerResourceDefinition.java +++ b/core-management/core-management-subsystem/src/main/java/org/wildfly/extension/core/management/ProcessStateListenerResourceDefinition.java @@ -17,6 +17,7 @@ import org.jboss.as.controller.AbstractAddStepHandler; import org.jboss.as.controller.AbstractRemoveStepHandler; import org.jboss.as.controller.AttributeDefinition; +import org.jboss.as.controller.ModuleIdentifierUtil; import org.jboss.as.controller.OperationContext; import org.jboss.as.controller.OperationFailedException; import org.jboss.as.controller.PersistentResourceDefinition; @@ -57,6 +58,7 @@ public class ProcessStateListenerResourceDefinition extends PersistentResourceDe .setRestartAllServices() .build(); public static final AttributeDefinition LISTENER_MODULE = SimpleAttributeDefinitionBuilder.create(MODULE, ModelType.STRING, false) + .setCorrector(ModuleIdentifierUtil.MODULE_NAME_CORRECTOR) .setAllowExpression(false) .setRestartAllServices() .build(); diff --git a/elytron/src/main/java/org/wildfly/extension/elytron/ClassLoadingAttributeDefinitions.java b/elytron/src/main/java/org/wildfly/extension/elytron/ClassLoadingAttributeDefinitions.java index 56a8a974877..c95a77880e9 100644 --- a/elytron/src/main/java/org/wildfly/extension/elytron/ClassLoadingAttributeDefinitions.java +++ b/elytron/src/main/java/org/wildfly/extension/elytron/ClassLoadingAttributeDefinitions.java @@ -22,6 +22,7 @@ class ClassLoadingAttributeDefinitions { static final SimpleAttributeDefinition MODULE = new SimpleAttributeDefinitionBuilder(ElytronDescriptionConstants.MODULE, ModelType.STRING, true) .setAttributeGroup(ElytronDescriptionConstants.CLASS_LOADING) .setAllowExpression(false) + .setCorrector(ModuleIdentifierUtil.MODULE_NAME_CORRECTOR) .setMinSize(1) .setRestartAllServices() .build(); @@ -43,7 +44,7 @@ class ClassLoadingAttributeDefinitions { static ClassLoader resolveClassLoader(String module) throws ModuleLoadException { Module current = Module.getCallerModule(); if (module != null && current != null) { - current = current.getModule(ModuleIdentifierUtil.parseCanonicalModuleIdentifier(module)); + current = current.getModule(module); } return current != null ? current.getClassLoader() : ClassLoadingAttributeDefinitions.class.getClassLoader(); diff --git a/elytron/src/main/java/org/wildfly/extension/elytron/DirContextDefinition.java b/elytron/src/main/java/org/wildfly/extension/elytron/DirContextDefinition.java index e0a64e1bfc4..a4863df775c 100644 --- a/elytron/src/main/java/org/wildfly/extension/elytron/DirContextDefinition.java +++ b/elytron/src/main/java/org/wildfly/extension/elytron/DirContextDefinition.java @@ -126,6 +126,7 @@ class DirContextDefinition extends SimpleResourceDefinition { static final SimpleAttributeDefinition MODULE = new SimpleAttributeDefinitionBuilder(ElytronDescriptionConstants.MODULE, ModelType.STRING, true) .setAllowExpression(true) + .setCorrector(ModuleIdentifierUtil.MODULE_NAME_CORRECTOR) .setRestartAllServices() .build(); @@ -160,7 +161,7 @@ private static TrivialService.ValueSupplier obtainDirContext if(moduleName != null && !moduleName.isEmpty()){ try { Module cm = Module.getCallerModule(); - module = cm.getModule(ModuleIdentifierUtil.parseCanonicalModuleIdentifier(moduleName)); + module = cm.getModule(moduleName); } catch (ModuleLoadException e) { throw ElytronSubsystemMessages.ROOT_LOGGER.unableToLoadModule(moduleName, e); } diff --git a/elytron/src/main/java/org/wildfly/extension/elytron/JaasRealmDefinition.java b/elytron/src/main/java/org/wildfly/extension/elytron/JaasRealmDefinition.java index cebe82dd697..b3fa4a189bf 100644 --- a/elytron/src/main/java/org/wildfly/extension/elytron/JaasRealmDefinition.java +++ b/elytron/src/main/java/org/wildfly/extension/elytron/JaasRealmDefinition.java @@ -7,6 +7,7 @@ import org.jboss.as.controller.AbstractAddStepHandler; import org.jboss.as.controller.AttributeDefinition; +import org.jboss.as.controller.ModuleIdentifierUtil; import org.jboss.as.controller.OperationContext; import org.jboss.as.controller.OperationFailedException; import org.jboss.as.controller.OperationStepHandler; @@ -68,6 +69,7 @@ public class JaasRealmDefinition extends SimpleResourceDefinition { static final SimpleAttributeDefinition MODULE = new SimpleAttributeDefinitionBuilder(ElytronDescriptionConstants.MODULE, ModelType.STRING, false) .setRequired(false) + .setCorrector(ModuleIdentifierUtil.MODULE_NAME_CORRECTOR) .setRestartAllServices() .build(); diff --git a/host-controller/src/main/java/org/jboss/as/host/controller/discovery/DiscoveryOptionResourceDefinition.java b/host-controller/src/main/java/org/jboss/as/host/controller/discovery/DiscoveryOptionResourceDefinition.java index 0c4bbcdbfcd..dacca561886 100644 --- a/host-controller/src/main/java/org/jboss/as/host/controller/discovery/DiscoveryOptionResourceDefinition.java +++ b/host-controller/src/main/java/org/jboss/as/host/controller/discovery/DiscoveryOptionResourceDefinition.java @@ -11,6 +11,7 @@ import org.jboss.as.controller.AttributeDefinition; import org.jboss.as.controller.MapAttributeDefinition; import org.jboss.as.controller.ModelOnlyWriteAttributeHandler; +import org.jboss.as.controller.ModuleIdentifierUtil; import org.jboss.as.controller.PathElement; import org.jboss.as.controller.PropertiesAttributeDefinition; import org.jboss.as.controller.SimpleAttributeDefinition; @@ -44,6 +45,7 @@ public class DiscoveryOptionResourceDefinition extends SimpleResourceDefinition public static final SimpleAttributeDefinition MODULE = new SimpleAttributeDefinitionBuilder(ModelDescriptionConstants.MODULE, ModelType.STRING, true) .setDefaultValue(new ModelNode(DEFAULT_MODULE)) .setValidator(new StringLengthValidator(1)) + .setCorrector(ModuleIdentifierUtil.MODULE_NAME_CORRECTOR) .setStorageRuntime() .setRuntimeServiceNotRequired() .build(); diff --git a/host-controller/src/main/java/org/jboss/as/host/controller/operations/DiscoveryOptionAddHandler.java b/host-controller/src/main/java/org/jboss/as/host/controller/operations/DiscoveryOptionAddHandler.java index 30809085a35..5c503b15933 100644 --- a/host-controller/src/main/java/org/jboss/as/host/controller/operations/DiscoveryOptionAddHandler.java +++ b/host-controller/src/main/java/org/jboss/as/host/controller/operations/DiscoveryOptionAddHandler.java @@ -13,7 +13,6 @@ import org.jboss.as.controller.OperationContext; import org.jboss.as.controller.OperationFailedException; -import org.jboss.as.controller.client.helpers.JBossModulesNameUtil; import org.jboss.as.controller.registry.Resource; import org.jboss.as.host.controller.discovery.DiscoveryOption; import org.jboss.as.host.controller.discovery.DiscoveryOptionResourceDefinition; @@ -76,7 +75,7 @@ protected void populateHostControllerInfo(LocalHostControllerInfoImpl hostContro try { String moduleID = moduleName != null - ? JBossModulesNameUtil.parseCanonicalModuleIdentifier(moduleName) + ? moduleName : Module.forClass(getClass()).getName(); final Class discoveryOptionClass = Module.loadClassFromCallerModuleLoader(moduleID, discoveryOptionClassName) .asSubclass(DiscoveryOption.class); diff --git a/logging/src/main/java/org/jboss/as/logging/CommonAttributes.java b/logging/src/main/java/org/jboss/as/logging/CommonAttributes.java index af6b1a5ece0..574a47d6154 100644 --- a/logging/src/main/java/org/jboss/as/logging/CommonAttributes.java +++ b/logging/src/main/java/org/jboss/as/logging/CommonAttributes.java @@ -14,11 +14,13 @@ import org.jboss.as.controller.CaseParameterCorrector; import org.jboss.as.controller.DefaultAttributeMarshaller; import org.jboss.as.controller.ModelVersion; +import org.jboss.as.controller.ModuleIdentifierUtil; import org.jboss.as.controller.ObjectTypeAttributeDefinition; import org.jboss.as.controller.OperationFailedException; import org.jboss.as.controller.SimpleAttributeDefinition; import org.jboss.as.controller.SimpleAttributeDefinitionBuilder; import org.jboss.as.controller.SimpleMapAttributeDefinition; +import org.jboss.as.controller.descriptions.ModelDescriptionConstants; import org.jboss.as.controller.operations.validation.ObjectTypeValidator; import org.jboss.as.controller.registry.AttributeAccess.Flag; import org.jboss.as.controller.services.path.PathManager; @@ -111,18 +113,21 @@ public void marshallAsElement(final AttributeDefinition attribute, final ModelNo String LOGGING_PROFILES = "logging-profiles"; - SimpleAttributeDefinition MODULE = SimpleAttributeDefinitionBuilder.create("module", ModelType.STRING) + SimpleAttributeDefinition MODULE = SimpleAttributeDefinitionBuilder + .create(ModelDescriptionConstants.MODULE, ModelType.STRING) .setAllowExpression(false) + .setCorrector(ModuleIdentifierUtil.MODULE_NAME_CORRECTOR) .setRestartAllServices() .build(); - SimpleAttributeDefinition NAME = SimpleAttributeDefinitionBuilder.create("name", ModelType.STRING, true) + SimpleAttributeDefinition NAME = SimpleAttributeDefinitionBuilder + .create(ModelDescriptionConstants.NAME, ModelType.STRING, true) .setAllowExpression(false) .setDeprecated(ModelVersion.create(1, 2, 0)) .setResourceOnly() .build(); - SimpleMapAttributeDefinition PROPERTIES = new SimpleMapAttributeDefinition.Builder("properties", true) + SimpleMapAttributeDefinition PROPERTIES = new SimpleMapAttributeDefinition.Builder(ModelDescriptionConstants.PROPERTIES, true) .setAllowExpression(true) .setAttributeMarshaller(PropertyAttributeMarshaller.INSTANCE) .build(); diff --git a/logging/src/main/java/org/jboss/as/logging/deployments/resources/HandlerResourceDefinition.java b/logging/src/main/java/org/jboss/as/logging/deployments/resources/HandlerResourceDefinition.java index 6a82dcba5e8..fd5b52a88ba 100644 --- a/logging/src/main/java/org/jboss/as/logging/deployments/resources/HandlerResourceDefinition.java +++ b/logging/src/main/java/org/jboss/as/logging/deployments/resources/HandlerResourceDefinition.java @@ -5,6 +5,7 @@ package org.jboss.as.logging.deployments.resources; +import org.jboss.as.controller.ModuleIdentifierUtil; import org.jboss.as.controller.PathElement; import org.jboss.as.controller.SimpleAttributeDefinition; import org.jboss.as.controller.SimpleAttributeDefinitionBuilder; @@ -33,6 +34,7 @@ class HandlerResourceDefinition extends SimpleResourceDefinition { .build(); private static final SimpleAttributeDefinition MODULE = SimpleAttributeDefinitionBuilder.create("module", ModelType.STRING, true) + .setCorrector(ModuleIdentifierUtil.MODULE_NAME_CORRECTOR) .setStorageRuntime() .build(); diff --git a/logging/src/main/java/org/jboss/as/logging/deployments/resources/LoggingDeploymentResources.java b/logging/src/main/java/org/jboss/as/logging/deployments/resources/LoggingDeploymentResources.java index 17db6238943..fab143db5e5 100644 --- a/logging/src/main/java/org/jboss/as/logging/deployments/resources/LoggingDeploymentResources.java +++ b/logging/src/main/java/org/jboss/as/logging/deployments/resources/LoggingDeploymentResources.java @@ -7,6 +7,7 @@ import java.util.Collection; +import org.jboss.as.controller.ModuleIdentifierUtil; import org.jboss.as.controller.PathAddress; import org.jboss.as.controller.PathElement; import org.jboss.as.controller.ResourceDefinition; @@ -121,6 +122,7 @@ private abstract static class PropertiesResourceDefinition extends SimpleResourc .build(); static final SimpleAttributeDefinition MODULE = SimpleAttributeDefinitionBuilder.create("module", ModelType.STRING, true) + .setCorrector(ModuleIdentifierUtil.MODULE_NAME_CORRECTOR) .setStorageRuntime() .build(); diff --git a/security-manager/src/main/java/org/wildfly/extension/security/manager/DeploymentPermissionsResourceDefinition.java b/security-manager/src/main/java/org/wildfly/extension/security/manager/DeploymentPermissionsResourceDefinition.java index 1a1db592798..f7d1260dc79 100644 --- a/security-manager/src/main/java/org/wildfly/extension/security/manager/DeploymentPermissionsResourceDefinition.java +++ b/security-manager/src/main/java/org/wildfly/extension/security/manager/DeploymentPermissionsResourceDefinition.java @@ -18,6 +18,7 @@ import java.util.Collections; import org.jboss.as.controller.AttributeDefinition; +import org.jboss.as.controller.ModuleIdentifierUtil; import org.jboss.as.controller.ObjectListAttributeDefinition; import org.jboss.as.controller.ObjectTypeAttributeDefinition; import org.jboss.as.controller.PathElement; @@ -57,6 +58,7 @@ class DeploymentPermissionsResourceDefinition extends PersistentResourceDefiniti static final SimpleAttributeDefinition MODULE = new SimpleAttributeDefinitionBuilder(PERMISSION_MODULE, ModelType.STRING) .setRequired(false) + .setCorrector(ModuleIdentifierUtil.MODULE_NAME_CORRECTOR) .setFlags(AttributeAccess.Flag.RESTART_ALL_SERVICES) .build(); diff --git a/server/src/main/java/org/jboss/as/server/controller/resources/ModuleLoadingResourceDefinition.java b/server/src/main/java/org/jboss/as/server/controller/resources/ModuleLoadingResourceDefinition.java index 4d09cbf75ed..174c3de0f40 100644 --- a/server/src/main/java/org/jboss/as/server/controller/resources/ModuleLoadingResourceDefinition.java +++ b/server/src/main/java/org/jboss/as/server/controller/resources/ModuleLoadingResourceDefinition.java @@ -24,6 +24,7 @@ import org.jboss.as.controller.AbstractRuntimeOnlyHandler; import org.jboss.as.controller.AttributeDefinition; import org.jboss.as.controller.ModelVersion; +import org.jboss.as.controller.ModuleIdentifierUtil; import org.jboss.as.controller.OperationContext; import org.jboss.as.controller.OperationDefinition; import org.jboss.as.controller.OperationFailedException; @@ -34,7 +35,6 @@ import org.jboss.as.controller.SimpleOperationDefinitionBuilder; import org.jboss.as.controller.SimpleResourceDefinition; import org.jboss.as.controller.access.management.SensitiveTargetAccessConstraintDefinition; -import org.jboss.as.controller.client.helpers.JBossModulesNameUtil; import org.jboss.as.controller.registry.ManagementResourceRegistration; import org.jboss.as.server.controller.descriptions.ServerDescriptions; import org.jboss.dmr.ModelNode; @@ -55,7 +55,8 @@ */ public class ModuleLoadingResourceDefinition extends SimpleResourceDefinition { - private static final AttributeDefinition MODULE_NAME = new SimpleAttributeDefinitionBuilder(MODULE, ModelType.STRING).build(); + private static final AttributeDefinition MODULE_NAME = new SimpleAttributeDefinitionBuilder(MODULE, + ModelType.STRING).setCorrector(ModuleIdentifierUtil.MODULE_NAME_CORRECTOR).build(); public static final ModuleLoadingResourceDefinition INSTANCE = new ModuleLoadingResourceDefinition(); @@ -207,7 +208,7 @@ public List run() throws Exception { private static List findResourcePaths(String moduleName) throws ModuleLoadException, ReflectiveOperationException, IOException, URISyntaxException { ModuleLoader moduleLoader = Module.getCallerModuleLoader(); ModuleLoaderMXBean loader = ModuleInfoHandler.INSTANCE.getMxBean(moduleLoader); - moduleLoader.loadModule(JBossModulesNameUtil.parseCanonicalModuleIdentifier(moduleName)); + moduleLoader.loadModule(moduleName); List result = new LinkedList<>(); for (ResourceLoaderInfo rl : loader.getResourceLoaders(moduleName)){