Skip to content

Commit b0616da

Browse files
bstansberrybstansberry
committed
AS7-5001 Add micro versions to the management API
1 parent b78a6af commit b0616da

File tree

72 files changed

+343
-72
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

72 files changed

+343
-72
lines changed

‎appclient/src/main/java/org/jboss/as/appclient/subsystem/AppClientExtension.java‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,11 +53,15 @@ public class AppClientExtension implements Extension {
5353

5454
public static final String NAMESPACE_1_0 = "urn:jboss:domain:appclient:1.0";
5555

56+
private static final int MAJOR_VERSION = 1;
57+
private static final int MINOR_VERSION = 0;
58+
private static final int MICRO_VERSION = 0;
59+
5660
private static final ApplicationClientSubsystemParser parser = new ApplicationClientSubsystemParser();
5761

5862
@Override
5963
public void initialize(final ExtensionContext context) {
60-
final SubsystemRegistration subsystem = context.registerSubsystem(Constants.SUBSYSTEM_NAME, 1, 0);
64+
final SubsystemRegistration subsystem = context.registerSubsystem(Constants.SUBSYSTEM_NAME, MAJOR_VERSION, MINOR_VERSION, MICRO_VERSION);
6165
final ManagementResourceRegistration subsystemRegistration = subsystem.registerSubsystemModel(AppClientSubsystemProviders.SUBSYSTEM);
6266

6367
// register the operations

‎clustering/infinispan/src/main/java/org/jboss/as/clustering/infinispan/subsystem/InfinispanExtension.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@ public class InfinispanExtension implements Extension {
7373

7474
private static final int MANAGEMENT_API_MAJOR_VERSION = 1;
7575
private static final int MANAGEMENT_API_MINOR_VERSION = 3;
76+
private static final int MANAGEMENT_API_MICRO_VERSION = 0;
7677

7778
/**
7879
* {@inheritDoc}
@@ -81,7 +82,8 @@ public class InfinispanExtension implements Extension {
8182
@Override
8283
public void initialize(ExtensionContext context) {
8384
// IMPORTANT: Management API version != xsd version! Not all Management API changes result in XSD changes
84-
SubsystemRegistration subsystem = context.registerSubsystem(SUBSYSTEM_NAME, MANAGEMENT_API_MAJOR_VERSION, MANAGEMENT_API_MINOR_VERSION);
85+
SubsystemRegistration subsystem = context.registerSubsystem(SUBSYSTEM_NAME, MANAGEMENT_API_MAJOR_VERSION,
86+
MANAGEMENT_API_MINOR_VERSION, MANAGEMENT_API_MICRO_VERSION);
8587
subsystem.registerXMLElementWriter(new InfinispanSubsystemXMLWriter());
8688

8789
ManagementResourceRegistration registration = subsystem.registerSubsystemModel(InfinispanSubsystemProviders.SUBSYSTEM);

‎clustering/jgroups/src/main/java/org/jboss/as/clustering/jgroups/subsystem/JGroupsExtension.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ public class JGroupsExtension implements Extension {
5757

5858
private static final int MANAGEMENT_API_MAJOR_VERSION = 1;
5959
private static final int MANAGEMENT_API_MINOR_VERSION = 1;
60+
private static final int MANAGEMENT_API_MICRO_VERSION = 0;
6061

6162
/**
6263
* {@inheritDoc}
@@ -66,7 +67,8 @@ public class JGroupsExtension implements Extension {
6667
public void initialize(ExtensionContext context) {
6768

6869
// IMPORTANT: Management API version != xsd version! Not all Management API changes result in XSD changes
69-
SubsystemRegistration subsystem = context.registerSubsystem(SUBSYSTEM_NAME, MANAGEMENT_API_MAJOR_VERSION, MANAGEMENT_API_MINOR_VERSION);
70+
SubsystemRegistration subsystem = context.registerSubsystem(SUBSYSTEM_NAME, MANAGEMENT_API_MAJOR_VERSION,
71+
MANAGEMENT_API_MINOR_VERSION, MANAGEMENT_API_MICRO_VERSION);
7072
subsystem.registerXMLElementWriter(new JGroupsSubsystemXMLWriter());
7173

7274
ManagementResourceRegistration registration = subsystem.registerSubsystemModel(JGroupsSubsystemProviders.SUBSYSTEM);

‎cmp/src/main/java/org/jboss/as/cmp/subsystem/CmpExtension.java‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,13 @@ public class CmpExtension implements Extension {
4242

4343
private static final String RESOURCE_NAME = CmpExtension.class.getPackage().getName() + ".LocalDescriptions";
4444

45+
private static final int MANAGEMENT_API_MAJOR_VERSION = 1;
46+
private static final int MANAGEMENT_API_MINOR_VERSION = 0;
47+
private static final int MANAGEMENT_API_MICRO_VERSION = 0;
48+
4549
public void initialize(final ExtensionContext context) {
46-
final SubsystemRegistration subsystem = context.registerSubsystem(SUBSYSTEM_NAME, 1, 0);
50+
final SubsystemRegistration subsystem = context.registerSubsystem(SUBSYSTEM_NAME, MANAGEMENT_API_MAJOR_VERSION,
51+
MANAGEMENT_API_MINOR_VERSION, MANAGEMENT_API_MICRO_VERSION);
4752

4853
final ManagementResourceRegistration subsystemRegistration = subsystem.registerSubsystemModel(CMPSubsystemRootResourceDescription.INSTANCE);
4954
subsystemRegistration.registerOperationHandler(DESCRIBE, GenericSubsystemDescribeHandler.INSTANCE, GenericSubsystemDescribeHandler.INSTANCE, false, OperationEntry.EntryType.PRIVATE);

‎configadmin/src/main/java/org/jboss/as/configadmin/parser/ConfigAdminExtension.java‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,10 @@ public class ConfigAdminExtension implements Extension {
4646

4747
public static final String SUBSYSTEM_NAME = "configadmin";
4848

49+
private static final int MANAGEMENT_API_MAJOR_VERSION = 1;
50+
private static final int MANAGEMENT_API_MINOR_VERSION = 0;
51+
private static final int MANAGEMENT_API_MICRO_VERSION = 0;
52+
4953
static ConfigAdminServiceImpl getConfigAdminService(OperationContext context) {
5054
ServiceController<?> controller = context.getServiceRegistry(true).getService(ConfigAdminService.SERVICE_NAME);
5155
return controller != null ? (ConfigAdminServiceImpl) controller.getValue() : null;
@@ -61,7 +65,8 @@ public void initialize(ExtensionContext context) {
6165

6266
boolean registerRuntimeOnly = context.isRuntimeOnlyRegistrationValid();
6367

64-
final SubsystemRegistration subsystem = context.registerSubsystem(SUBSYSTEM_NAME, 1, 0);
68+
final SubsystemRegistration subsystem = context.registerSubsystem(SUBSYSTEM_NAME, MANAGEMENT_API_MAJOR_VERSION,
69+
MANAGEMENT_API_MINOR_VERSION, MANAGEMENT_API_MICRO_VERSION);
6570
final ManagementResourceRegistration registration = subsystem.registerSubsystemModel(ConfigAdminProviders.SUBSYSTEM);
6671
registration.registerOperationHandler(ModelDescriptionConstants.ADD, ConfigAdminAdd.INSTANCE, ConfigAdminAdd.DESCRIPTION, false);
6772
registration.registerOperationHandler(ModelDescriptionConstants.DESCRIBE, ConfigAdminDescribeHandler.INSTANCE, ConfigAdminAdd.DESCRIPTION, false, OperationEntry.EntryType.PRIVATE);

‎connector/src/main/java/org/jboss/as/connector/subsystems/datasources/DataSourcesExtension.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -201,6 +201,7 @@ public class DataSourcesExtension implements Extension {
201201

202202
private static final int MANAGEMENT_API_MAJOR_VERSION = 1;
203203
private static final int MANAGEMENT_API_MINOR_VERSION = 1;
204+
private static final int MANAGEMENT_API_MICRO_VERSION = 0;
204205

205206
@Override
206207
public void initialize(final ExtensionContext context) {
@@ -209,7 +210,8 @@ public void initialize(final ExtensionContext context) {
209210
boolean registerRuntimeOnly = context.isRuntimeOnlyRegistrationValid();
210211

211212
// Register the remoting subsystem
212-
final SubsystemRegistration registration = context.registerSubsystem(SUBSYSTEM_NAME, MANAGEMENT_API_MAJOR_VERSION, MANAGEMENT_API_MINOR_VERSION);
213+
final SubsystemRegistration registration = context.registerSubsystem(SUBSYSTEM_NAME, MANAGEMENT_API_MAJOR_VERSION,
214+
MANAGEMENT_API_MINOR_VERSION, MANAGEMENT_API_MICRO_VERSION);
213215

214216
registration.registerXMLElementWriter(DataSourceSubsystemParser.INSTANCE);
215217

‎connector/src/main/java/org/jboss/as/connector/subsystems/jca/JcaExtension.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,14 +83,16 @@ public class JcaExtension implements Extension {
8383

8484
private static final int MANAGEMENT_API_MAJOR_VERSION = 1;
8585
private static final int MANAGEMENT_API_MINOR_VERSION = 1;
86+
private static final int MANAGEMENT_API_MICRO_VERSION = 0;
8687

8788
@Override
8889
public void initialize(final ExtensionContext context) {
8990
ROOT_LOGGER.debugf("Initializing Connector Extension");
9091

9192
final boolean registerRuntimeOnly = context.isRuntimeOnlyRegistrationValid();
9293

93-
final SubsystemRegistration subsystem = context.registerSubsystem(SUBSYSTEM_NAME, MANAGEMENT_API_MAJOR_VERSION, MANAGEMENT_API_MINOR_VERSION);
94+
final SubsystemRegistration subsystem = context.registerSubsystem(SUBSYSTEM_NAME, MANAGEMENT_API_MAJOR_VERSION,
95+
MANAGEMENT_API_MINOR_VERSION, MANAGEMENT_API_MICRO_VERSION);
9496

9597
final ManagementResourceRegistration registration = subsystem.registerSubsystemModel(JcaSubsystemProviders.SUBSYSTEM);
9698
registration.registerOperationHandler(ADD, JcaSubsystemAdd.INSTANCE, JcaSubsystemProviders.SUBSYSTEM_ADD_DESC, false);

‎connector/src/main/java/org/jboss/as/connector/subsystems/resourceadapters/ResourceAdaptersExtension.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,12 +133,14 @@ public class ResourceAdaptersExtension implements Extension {
133133

134134
private static final int MANAGEMENT_API_MAJOR_VERSION = 1;
135135
private static final int MANAGEMENT_API_MINOR_VERSION = 1;
136+
private static final int MANAGEMENT_API_MICRO_VERSION = 0;
136137

137138
@Override
138139
public void initialize(final ExtensionContext context) {
139140
SUBSYSTEM_RA_LOGGER.debugf("Initializing ResourceAdapters Extension");
140141
// Register the remoting subsystem
141-
final SubsystemRegistration registration = context.registerSubsystem(SUBSYSTEM_NAME, MANAGEMENT_API_MAJOR_VERSION, MANAGEMENT_API_MINOR_VERSION);
142+
final SubsystemRegistration registration = context.registerSubsystem(SUBSYSTEM_NAME, MANAGEMENT_API_MAJOR_VERSION,
143+
MANAGEMENT_API_MINOR_VERSION, MANAGEMENT_API_MICRO_VERSION);
142144

143145
ReloadRequiredWriteAttributeHandler disabledRequiredWriteAttributeHandler = new ReloadRequiredWriteAttributeHandler();
144146

‎controller/src/main/java/org/jboss/as/controller/ExtensionContext.java‎

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,20 @@
3434
*/
3535
public interface ExtensionContext {
3636

37+
/**
38+
* Convenience variant of {@link #registerSubsystem(String, int, int, int)} that uses {@code 0}
39+
* as the {@code microVersion}.
40+
*
41+
* @param name the name of the subsystem
42+
* @param majorVersion the major version of the subsystem's management interface
43+
* @param minorVersion the minor version of the subsystem's management interface
44+
*
45+
* @return the {@link SubsystemRegistration}
46+
*
47+
* @throws IllegalStateException if the subsystem name has already been registered
48+
*/
49+
SubsystemRegistration registerSubsystem(String name, int majorVersion, int minorVersion);
50+
3751
/**
3852
* Register a new subsystem type. The returned registration object should be used
3953
* to configure XML parsers, operation handlers, and other subsystem-specific constructs
@@ -48,12 +62,13 @@ public interface ExtensionContext {
4862
* @param name the name of the subsystem
4963
* @param majorVersion the major version of the subsystem's management interface
5064
* @param minorVersion the minor version of the subsystem's management interface
65+
* @param minorVersion the micro version of the subsystem's management interface
5166
*
5267
* @return the {@link SubsystemRegistration}
5368
*
5469
* @throws IllegalStateException if the subsystem name has already been registered
5570
*/
56-
SubsystemRegistration registerSubsystem(String name, int majorVersion, int minorVersion);
71+
SubsystemRegistration registerSubsystem(String name, int majorVersion, int minorVersion, int microVersion);
5772

5873
/**
5974
* Gets the type of the current process.

‎controller/src/main/java/org/jboss/as/controller/descriptions/ModelDescriptionConstants.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,7 @@ public class ModelDescriptionConstants {
133133
public static final String MANAGEMENT_INTERFACE = "management-interface";
134134
public static final String MANAGEMENT_MAJOR_VERSION = "management-major-version";
135135
public static final String MANAGEMENT_MINOR_VERSION = "management-minor-version";
136+
public static final String MANAGEMENT_MICRO_VERSION = "management-micro-version";
136137
public static final String MASK = "mask";
137138
public static final String MASTER = "master";
138139
public static final String MAX = "max";

0 commit comments

Comments
 (0)