Merge pull request wildfly#13923 from yersan/tasks/WFLY-14006

[WFLY-14006] Deprecate the extensions where the root subsystem is alr…
jimma · Feb 18, 2021 · fcfe230 · fcfe230
2 parents dff8e4a + 4319a04
commit fcfe230
Show file tree

Hide file tree

Showing 14 changed files with 16 additions and 10 deletions.
diff --git a/legacy/cmp/src/main/java/org/jboss/as/cmp/subsystem/CmpExtension.java b/legacy/cmp/src/main/java/org/jboss/as/cmp/subsystem/CmpExtension.java
@@ -55,7 +55,7 @@ public CmpExtension() {
     @Override
     protected Set<ManagementResourceRegistration> initializeLegacyModel(final ExtensionContext context) {
 
-        final SubsystemRegistration subsystemRegistration = context.registerSubsystem(SUBSYSTEM_NAME, CURRENT_MODEL_VERSION);
+        final SubsystemRegistration subsystemRegistration = context.registerSubsystem(SUBSYSTEM_NAME, CURRENT_MODEL_VERSION, true);
 
         subsystemRegistration.registerXMLElementWriter(new CmpSubsystem11Parser());
 

diff --git a/legacy/configadmin/src/main/java/org/jboss/as/configadmin/parser/ConfigAdminExtension.java b/legacy/configadmin/src/main/java/org/jboss/as/configadmin/parser/ConfigAdminExtension.java
@@ -49,6 +49,7 @@ public class ConfigAdminExtension extends AbstractLegacyExtension {
     static final PathElement SUBSYSTEM_PATH = PathElement.pathElement(SUBSYSTEM, SUBSYSTEM_NAME);
 
     private static final ModelVersion MANAGEMENT_API_VERSION = ModelVersion.create(1, 1, 0);
+    static final ModelVersion DEPRECATED_SINCE = ModelVersion.create(1, 1, 0);
 
     private static final String RESOURCE_NAME = ConfigAdminExtension.class.getPackage().getName() + ".LocalDescriptions";
     public static final String EXTENSION_NAME = "org.jboss.as.configadmin";
@@ -69,7 +70,7 @@ public void initializeLegacyParsers(ExtensionParsingContext context) {
     @Override
     public Set<ManagementResourceRegistration> initializeLegacyModel(ExtensionContext context) {
 
-        final SubsystemRegistration subsystem = context.registerSubsystem(SUBSYSTEM_NAME, MANAGEMENT_API_VERSION);
+        final SubsystemRegistration subsystem = context.registerSubsystem(SUBSYSTEM_NAME, MANAGEMENT_API_VERSION, true);
         ManagementResourceRegistration subsystemRoot = subsystem.registerSubsystemModel(new ConfigAdminRootResource());
 
         //no need to register transformers as whole extension was deprecated in EAP 6.1 and hasn't changed since, so 1.1.0 in 6.2+ is same as current

diff --git a/...cy/configadmin/src/main/java/org/jboss/as/configadmin/parser/ConfigAdminRootResource.java b/...cy/configadmin/src/main/java/org/jboss/as/configadmin/parser/ConfigAdminRootResource.java
@@ -35,6 +35,7 @@ class ConfigAdminRootResource extends SimpleResourceDefinition {
 
     public ConfigAdminRootResource() {
         super(ConfigAdminExtension.SUBSYSTEM_PATH, ConfigAdminExtension.getResourceDescriptionResolver(SUBSYSTEM), ConfigAdminAdd.INSTANCE, new ReloadRequiredRemoveStepHandler());
+        this.setDeprecated(ConfigAdminExtension.DEPRECATED_SINCE);
     }
 
     @Override

diff --git a/...nfigadmin/src/main/resources/org/jboss/as/configadmin/parser/LocalDescriptions.properties b/...nfigadmin/src/main/resources/org/jboss/as/configadmin/parser/LocalDescriptions.properties
@@ -1,5 +1,6 @@
 subsystem=The ConfigAdmin subsystem configuration.
 subsystem.activate=Activate the ConfigAdmin subsystem.
+subsystem.deprecated=The ConfigAdmin subsystem is deprecated and may be removed or moved in future versions.
 
 subsystem.add=Add the ConfigAdmin subsystem configuration.
 subsystem.remove=Remove the ConfigAdmin subsystem configuration.

diff --git a/legacy/jacorb/src/main/java/org/jboss/as/jacorb/JacORBExtension.java b/legacy/jacorb/src/main/java/org/jboss/as/jacorb/JacORBExtension.java
@@ -74,7 +74,7 @@ static ResourceDescriptionResolver getResourceDescriptionResolver(final String..
 
     @Override
     protected Set<ManagementResourceRegistration> initializeLegacyModel(ExtensionContext context) {
-        final SubsystemRegistration subsystem = context.registerSubsystem(SUBSYSTEM_NAME, CURRENT_MODEL_VERSION);
+        final SubsystemRegistration subsystem = context.registerSubsystem(SUBSYSTEM_NAME, CURRENT_MODEL_VERSION, true);
         final ManagementResourceRegistration subsystemRegistration = subsystem.registerSubsystemModel(JacORBSubsystemResource.INSTANCE);
         subsystem.registerXMLElementWriter(PARSER);
 

diff --git a/legacy/jaxr/src/main/java/org/jboss/as/jaxr/extension/JAXRExtension.java b/legacy/jaxr/src/main/java/org/jboss/as/jaxr/extension/JAXRExtension.java
@@ -45,6 +45,7 @@
 public class JAXRExtension extends AbstractLegacyExtension {
 
     private static final ModelVersion CURRENT_MODEL_VERSION = ModelVersion.create(1, 2, 0);
+    static final ModelVersion DEPRECATED_SINCE = ModelVersion.create(1, 2, 0);
     static final String SUBSYSTEM_NAME = "jaxr";
     static final PathElement SUBSYSTEM_PATH = PathElement.pathElement(ModelDescriptionConstants.SUBSYSTEM, SUBSYSTEM_NAME);
 
@@ -64,7 +65,7 @@ public JAXRExtension() {
 
     @Override
     protected Set<ManagementResourceRegistration> initializeLegacyModel(ExtensionContext context) {
-        SubsystemRegistration subsystemRegistration = context.registerSubsystem(SUBSYSTEM_NAME, CURRENT_MODEL_VERSION);
+        SubsystemRegistration subsystemRegistration = context.registerSubsystem(SUBSYSTEM_NAME, CURRENT_MODEL_VERSION, true);
 
         subsystemRegistration.registerXMLElementWriter(JAXRSubsystemWriter.INSTANCE);
 

diff --git a/legacy/jaxr/src/main/java/org/jboss/as/jaxr/extension/JAXRSubsystemRootResource.java b/legacy/jaxr/src/main/java/org/jboss/as/jaxr/extension/JAXRSubsystemRootResource.java
@@ -50,6 +50,7 @@ class JAXRSubsystemRootResource extends ModelOnlyResourceDefinition {
         super(JAXRExtension.SUBSYSTEM_PATH,
                 JAXRExtension.getResolver(),
                 CONNECTION_FACTORY_ATTRIBUTE, CONNECTION_FACTORY_IMPL_ATTRIBUTE);
+        this.setDeprecated(JAXRExtension.DEPRECATED_SINCE);
     }
 
     @Override

diff --git a/legacy/jaxr/src/main/resources/org/jboss/as/jaxr/LocalDescriptions.properties b/legacy/jaxr/src/main/resources/org/jboss/as/jaxr/LocalDescriptions.properties
@@ -1,5 +1,6 @@
 jaxr=The configuration of the JAXR subsystem.
 jaxr.add=Adds the JAXR subsystem.
+jaxr.deprecated=The JAXR subsystem is deprecated and may be removed or moved in future versions.
 jaxr.jndi-name=The JNDI name under which the JAXR ConnectionFactory is bound
 jaxr.class=The JAXR ConnectionFactory implementation class
 jaxr.remove=Removes the JAXR subsystem.

diff --git a/legacy/messaging/src/main/java/org/jboss/as/messaging/MessagingExtension.java b/legacy/messaging/src/main/java/org/jboss/as/messaging/MessagingExtension.java
@@ -160,7 +160,7 @@ public MessagingExtension() {
 
     @Override
     protected Set<ManagementResourceRegistration> initializeLegacyModel(ExtensionContext context) {
-        final SubsystemRegistration subsystem = context.registerSubsystem(SUBSYSTEM_NAME, CURRENT_MODEL_VERSION);
+        final SubsystemRegistration subsystem = context.registerSubsystem(SUBSYSTEM_NAME, CURRENT_MODEL_VERSION, true);
         subsystem.registerXMLElementWriter(MessagingXMLWriter.INSTANCE);
 
         // Root resource

diff --git a/legacy/web/src/main/java/org/jboss/as/web/WebExtension.java b/legacy/web/src/main/java/org/jboss/as/web/WebExtension.java
@@ -92,7 +92,7 @@ static StandardResourceDescriptionResolver getResourceDescriptionResolver(final
 
     @Override
     protected Set<ManagementResourceRegistration> initializeLegacyModel(ExtensionContext context) {
-        final SubsystemRegistration subsystem = context.registerSubsystem(SUBSYSTEM_NAME, CURRENT_MODEL_VERSION);
+        final SubsystemRegistration subsystem = context.registerSubsystem(SUBSYSTEM_NAME, CURRENT_MODEL_VERSION, true);
 
         final ManagementResourceRegistration registration = subsystem.registerSubsystemModel(WebDefinition.INSTANCE);
         subsystem.registerXMLElementWriter(new WebSubsystemParser());

diff --git a/...etlink/src/main/java/org/wildfly/extension/picketlink/federation/FederationExtension.java b/...etlink/src/main/java/org/wildfly/extension/picketlink/federation/FederationExtension.java
@@ -63,7 +63,7 @@ public static ResourceDescriptionResolver getResourceDescriptionResolver(final S
 
     @Override
     public void initialize(ExtensionContext context) {
-        SubsystemRegistration subsystemRegistration = context.registerSubsystem(SUBSYSTEM_NAME, CURRENT_MODEL_VERSION);
+        SubsystemRegistration subsystemRegistration = context.registerSubsystem(SUBSYSTEM_NAME, CURRENT_MODEL_VERSION, true);
 
         subsystemRegistration.registerSubsystemModel(new FederationSubsystemRootResourceDefinition(context));
         subsystemRegistration.registerXMLElementWriter(FederationSubsystemWriter.INSTANCE);

diff --git a/picketlink/src/main/java/org/wildfly/extension/picketlink/idm/IDMExtension.java b/picketlink/src/main/java/org/wildfly/extension/picketlink/idm/IDMExtension.java
@@ -61,7 +61,7 @@ public static ResourceDescriptionResolver getResourceDescriptionResolver(final S
 
     @Override
     public void initialize(ExtensionContext context) {
-        SubsystemRegistration subsystem = context.registerSubsystem(SUBSYSTEM_NAME, CURRENT_MODEL_VERSION);
+        SubsystemRegistration subsystem = context.registerSubsystem(SUBSYSTEM_NAME, CURRENT_MODEL_VERSION, true);
 
         subsystem.registerSubsystemModel(IDMSubsystemRootResourceDefinition.INSTANCE);
         subsystem.registerXMLElementWriter(Namespace.CURRENT.getXMLWriter());

diff --git a/security/subsystem/src/main/java/org/jboss/as/security/SecurityExtension.java b/security/subsystem/src/main/java/org/jboss/as/security/SecurityExtension.java
@@ -89,7 +89,7 @@ public void initialize(ExtensionContext context) {
 
         final boolean registerRuntimeOnly = context.isRuntimeOnlyRegistrationValid();
 
-        final SubsystemRegistration subsystem = context.registerSubsystem(SUBSYSTEM_NAME, CURRENT_MODEL_VERSION);
+        final SubsystemRegistration subsystem = context.registerSubsystem(SUBSYSTEM_NAME, CURRENT_MODEL_VERSION, true);
         final ManagementResourceRegistration registration = subsystem.registerSubsystemModel(SecuritySubsystemRootResourceDefinition.INSTANCE);
         registration.registerOperationHandler(GenericSubsystemDescribeHandler.DEFINITION, GenericSubsystemDescribeHandler.INSTANCE);
 

diff --git a/xts/src/main/java/org/jboss/as/xts/XTSExtension.java b/xts/src/main/java/org/jboss/as/xts/XTSExtension.java
@@ -56,7 +56,7 @@ static StandardResourceDescriptionResolver getResourceDescriptionResolver(final
 
     public void initialize(ExtensionContext context) {
         XtsAsLogger.ROOT_LOGGER.debug("Initializing XTS Extension");
-        final SubsystemRegistration subsystem = context.registerSubsystem(SUBSYSTEM_NAME, CURRENT_MODEL_VERSION);
+        final SubsystemRegistration subsystem = context.registerSubsystem(SUBSYSTEM_NAME, CURRENT_MODEL_VERSION, true);
         subsystem.registerSubsystemModel(new XTSSubsystemDefinition());
         subsystem.registerXMLElementWriter(new XTSSubsystemParser());
     }