Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[CMTOOL-348] proper jgroups config migration #305

Merged
merged 1 commit into from
Feb 27, 2024
Merged

[CMTOOL-348] proper jgroups config migration #305

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion ...ain/java/org/jboss/migration/eap6/to/eap8/tasks/EAP6_4ToEAP7_4UpdateJGroupsSubsystem.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
package org.jboss.migration.eap6.to.eap8.tasks;

import org.jboss.migration.core.jboss.JBossSubsystemNames;
import org.jboss.migration.eap.task.subsystem.jgroups.FixPortRange;
import org.jboss.migration.wfly10.config.task.management.subsystem.UpdateSubsystemResources;
import org.jboss.migration.wfly10.config.task.subsystem.jgroups.UpdateProtocols;

Expand All @@ -33,6 +34,8 @@ public EAP6_4ToEAP7_4UpdateJGroupsSubsystem() {
.replace("UNICAST2", "UNICAST3")
.remove("RSVP")
.replace("FRAG2", "FRAG3")
));
),
new FixPortRange<>()
);
}
}
2 changes: 0 additions & 2 deletions ...src/main/java/org/jboss/migration/eap7/to/eap8/EAP7_0ToEAP8_0ServerMigrationProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,6 @@ public WildFlyServerMigration10 getServerMigration() {
.subtask(legacySecurityConfigurationMigration.getRemoveLegacySecurityRealms())
.subtask(new EAP7_0ToEAP8_0UpdateInfinispanSubsystem<>())
.subtask(new EAP7_0ToEAP8_0UpdateUndertowSubsystem<>())
.subtask(new EAP7_0ToEAP8_0UpdateJGroupsSubsystem<>())
.subtask(legacySecurityConfigurationMigration.getEnsureBasicElytronSubsystem())
.subtask(legacySecurityConfigurationMigration.getMigrateLegacySecurityRealmsToElytron())
.subtask(legacySecurityConfigurationMigration.getMigrateLegacySecurityDomainsToElytron())
Expand All @@ -89,7 +88,6 @@ public WildFlyServerMigration10 getServerMigration() {
.subtask(new EAP8_0AddHostExcludes<>())
.subtask(new EAP7_0ToEAP8_0UpdateInfinispanSubsystem<>())
.subtask(new EAP7_0ToEAP8_0UpdateUndertowSubsystem<>())
.subtask(new EAP7_0ToEAP8_0UpdateJGroupsSubsystem<>())
.subtask(new AddCoreManagementSubsystem<>())
.subtask(new AddDiscoverySubsystem<>())
.subtask(new AddEESecuritySubsystem<>())
Expand Down
63 changes: 0 additions & 63 deletions .../src/main/java/org/jboss/migration/eap7/to/eap8/EAP7_0ToEAP8_0UpdateJGroupsSubsystem.java
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions ...src/main/java/org/jboss/migration/eap7/to/eap8/EAP7_1ToEAP8_0ServerMigrationProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,6 @@ public WildFlyServerMigration10 getServerMigration() {
.subtask(new EAP7_1ToEAP8_0UpdateInfinispanSubsystem<>())
.subtask(new EAP7_1ToEAP8_0UpdateUndertowSubsystem<>())
.subtask(new AddJGroupsFDSocketBindings<>())
.subtask(new EAP7_1ToEAP8_0UpdateJGroupsSubsystem<>())
.subtask(legacySecurityConfigurationMigration.getEnsureBasicElytronSubsystem())
.subtask(legacySecurityConfigurationMigration.getMigrateLegacySecurityRealmsToElytron())
.subtask(legacySecurityConfigurationMigration.getMigrateLegacySecurityDomainsToElytron())
Expand All @@ -87,7 +86,6 @@ public WildFlyServerMigration10 getServerMigration() {
.subtask(new EAP7_1ToEAP8_0UpdateInfinispanSubsystem<>())
.subtask(new EAP7_1ToEAP8_0UpdateUndertowSubsystem<>())
.subtask(new AddJGroupsFDSocketBindings<>())
.subtask(new EAP7_1ToEAP8_0UpdateJGroupsSubsystem<>())
.subtask(new AddDiscoverySubsystem<>())
.subtask(new AddEESecuritySubsystem<>())
.subtask(new EAP8_0AddHostExcludes<>())
Expand Down
62 changes: 0 additions & 62 deletions .../src/main/java/org/jboss/migration/eap7/to/eap8/EAP7_1ToEAP8_0UpdateJGroupsSubsystem.java
View file
Open in desktop

This file was deleted.

3 changes: 0 additions & 3 deletions ...src/main/java/org/jboss/migration/eap7/to/eap8/EAP7_2ToEAP8_0ServerMigrationProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
import org.jboss.migration.eap.EAPServer7_2;
import org.jboss.migration.eap.EAPServerMigrationProvider8_0;
import org.jboss.migration.eap.task.hostexclude.EAP8_0AddHostExcludes;
import org.jboss.migration.eap.task.subsystem.jgroups.EAP7_2ToEAP8_0UpdateJGroupsSubsystem;
import org.jboss.migration.eap.task.subsystem.metrics.EAP8_0AddMetricsSubsystem;
import org.jboss.migration.wfly.task.paths.WildFly26_0MigrateReferencedPaths;
import org.jboss.migration.wfly.task.security.LegacySecurityConfigurationMigration;
Expand Down Expand Up @@ -61,7 +60,6 @@ public WildFlyServerMigration10 getServerMigration() {
.subtask(new WildFly22_0UpdateInfinispanSubsystem<>())
.subtask(new WildFly26_0MigrateVault<>())
.subtask(new AddJGroupsFDSocketBindings<>())
.subtask(new EAP7_2ToEAP8_0UpdateJGroupsSubsystem<>())
.subtask(legacySecurityConfigurationMigration.getEnsureBasicElytronSubsystem())
.subtask(legacySecurityConfigurationMigration.getMigrateLegacySecurityRealmsToElytron())
.subtask(legacySecurityConfigurationMigration.getMigrateLegacySecurityDomainsToElytron())
Expand All @@ -80,7 +78,6 @@ public WildFlyServerMigration10 getServerMigration() {
.subtask(new MigrateReferencedModules<>())
.subtask(new WildFly26_0MigrateReferencedPaths<>())
.subtask(new AddJGroupsFDSocketBindings<>())
.subtask(new EAP7_2ToEAP8_0UpdateJGroupsSubsystem<>())
.subtask(legacySecurityConfigurationMigration.getRemoveLegacySecurityRealms())
.subtask(new WildFly22_0UpdateInfinispanSubsystem<>())
.subtask(new EAP8_0AddHostExcludes<>())
Expand Down
3 changes: 0 additions & 3 deletions ...src/main/java/org/jboss/migration/eap7/to/eap7/EAP7_3ToEAP8_0ServerMigrationProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
import org.jboss.migration.eap.EAPServer7_3;
import org.jboss.migration.eap.EAPServerMigrationProvider8_0;
import org.jboss.migration.eap.task.hostexclude.EAP8_0AddHostExcludes;
import org.jboss.migration.eap.task.subsystem.jgroups.EAP7_2ToEAP8_0UpdateJGroupsSubsystem;
import org.jboss.migration.eap.task.subsystem.metrics.EAP8_0AddMetricsSubsystem;
import org.jboss.migration.wfly.task.paths.WildFly26_0MigrateReferencedPaths;
import org.jboss.migration.wfly.task.security.LegacySecurityConfigurationMigration;
Expand Down Expand Up @@ -58,7 +57,6 @@ public WildFlyServerMigration10 getServerMigration() {
.subtask(legacySecurityConfigurationMigration.getRemoveLegacySecurityRealms())
.subtask(new WildFly22_0UpdateInfinispanSubsystem<>())
.subtask(new WildFly26_0MigrateVault<>())
.subtask(new EAP7_2ToEAP8_0UpdateJGroupsSubsystem<>())
.subtask(legacySecurityConfigurationMigration.getEnsureBasicElytronSubsystem())
.subtask(legacySecurityConfigurationMigration.getMigrateLegacySecurityRealmsToElytron())
.subtask(legacySecurityConfigurationMigration.getMigrateLegacySecurityDomainsToElytron())
Expand All @@ -79,7 +77,6 @@ public WildFlyServerMigration10 getServerMigration() {
.subtask(legacySecurityConfigurationMigration.getRemoveLegacySecurityRealms())
.subtask(new WildFly22_0UpdateInfinispanSubsystem<>())
.subtask(new EAP8_0AddHostExcludes<>())
.subtask(new EAP7_2ToEAP8_0UpdateJGroupsSubsystem<>())
.subtask(legacySecurityConfigurationMigration.getEnsureBasicElytronSubsystem())
.subtask(legacySecurityConfigurationMigration.getMigrateLegacySecurityRealmsToElytron())
.subtask(legacySecurityConfigurationMigration.getMigrateLegacySecurityDomainsToElytron())
Expand Down
6 changes: 3 additions & 3 deletions ...src/main/java/org/jboss/migration/eap7/to/eap7/EAP7_4ToEAP8_0ServerMigrationProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
import org.jboss.migration.eap.EAPServer7_4;
import org.jboss.migration.eap.EAPServerMigrationProvider8_0;
import org.jboss.migration.eap.task.hostexclude.EAP8_0AddHostExcludes;
import org.jboss.migration.eap.task.subsystem.jgroups.EAP7_2ToEAP8_0UpdateJGroupsSubsystem;
import org.jboss.migration.eap.task.subsystem.jgroups.EAP8_0UpdateJGroupsSubsystem;
import org.jboss.migration.wfly.task.paths.WildFly26_0MigrateReferencedPaths;
import org.jboss.migration.wfly.task.security.LegacySecurityConfigurationMigration;
import org.jboss.migration.wfly.task.subsystem.keycloak.MigrateKeycloakSubsystem;
Expand Down Expand Up @@ -53,7 +53,7 @@ public WildFlyServerMigration10 getServerMigration() {
.subtask(new WildFly26_0MigrateReferencedPaths<>())
.subtask(legacySecurityConfigurationMigration.getRemoveLegacySecurityRealms())
.subtask(new WildFly26_0MigrateVault<>())
.subtask(new EAP7_2ToEAP8_0UpdateJGroupsSubsystem<>())
.subtask(new EAP8_0UpdateJGroupsSubsystem<>())
.subtask(legacySecurityConfigurationMigration.getEnsureBasicElytronSubsystem())
.subtask(legacySecurityConfigurationMigration.getMigrateLegacySecurityRealmsToElytron())
.subtask(legacySecurityConfigurationMigration.getMigrateLegacySecurityDomainsToElytron())
Expand All @@ -71,7 +71,7 @@ public WildFlyServerMigration10 getServerMigration() {
.subtask(new WildFly26_0MigrateReferencedPaths<>())
.subtask(legacySecurityConfigurationMigration.getRemoveLegacySecurityRealms())
.subtask(new EAP8_0AddHostExcludes<>())
.subtask(new EAP7_2ToEAP8_0UpdateJGroupsSubsystem<>())
.subtask(new EAP8_0UpdateJGroupsSubsystem<>())
.subtask(legacySecurityConfigurationMigration.getEnsureBasicElytronSubsystem())
.subtask(legacySecurityConfigurationMigration.getMigrateLegacySecurityRealmsToElytron())
.subtask(legacySecurityConfigurationMigration.getMigrateLegacySecurityDomainsToElytron())
Expand Down
6 changes: 3 additions & 3 deletions ...main/java/org/jboss/migration/eap7/to/eap7/EAPXP7_4ToEAPXP8_0ServerMigrationProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
import org.jboss.migration.eap.EAPXPServer7_4;
import org.jboss.migration.eap.EAPXPServerMigrationProvider8_0;
import org.jboss.migration.eap.task.hostexclude.EAPXP8_0AddHostExcludes;
import org.jboss.migration.eap.task.subsystem.jgroups.EAP7_2ToEAP8_0UpdateJGroupsSubsystem;
import org.jboss.migration.eap.task.subsystem.jgroups.EAP8_0UpdateJGroupsSubsystem;
import org.jboss.migration.eap.task.subsystem.metrics.MigrateMicroprofileMetricsSmallryeSubsystem;
import org.jboss.migration.eap.task.subsystem.opentracing.MigrateMicroprofileOpentracingSmallryeSubsystem;
import org.jboss.migration.wfly.task.paths.WildFly26_0MigrateReferencedPaths;
Expand Down Expand Up @@ -56,7 +56,7 @@ public WildFlyServerMigration10 getServerMigration() {
.subtask(new WildFly26_0MigrateReferencedPaths<>())
.subtask(legacySecurityConfigurationMigration.getRemoveLegacySecurityRealms())
.subtask(new WildFly26_0MigrateVault<>())
.subtask(new EAP7_2ToEAP8_0UpdateJGroupsSubsystem<>())
.subtask(new EAP8_0UpdateJGroupsSubsystem<>())
.subtask(legacySecurityConfigurationMigration.getEnsureBasicElytronSubsystem())
.subtask(legacySecurityConfigurationMigration.getMigrateLegacySecurityRealmsToElytron())
.subtask(legacySecurityConfigurationMigration.getMigrateLegacySecurityDomainsToElytron())
Expand All @@ -76,7 +76,7 @@ public WildFlyServerMigration10 getServerMigration() {
.subtask(new WildFly26_0MigrateReferencedPaths<>())
.subtask(legacySecurityConfigurationMigration.getRemoveLegacySecurityRealms())
.subtask(new EAPXP8_0AddHostExcludes<>())
.subtask(new EAP7_2ToEAP8_0UpdateJGroupsSubsystem<>())
.subtask(new EAP8_0UpdateJGroupsSubsystem<>())
.subtask(legacySecurityConfigurationMigration.getEnsureBasicElytronSubsystem())
.subtask(legacySecurityConfigurationMigration.getMigrateLegacySecurityRealmsToElytron())
.subtask(legacySecurityConfigurationMigration.getMigrateLegacySecurityDomainsToElytron())
Expand Down
50 changes: 0 additions & 50 deletions ...java/org/jboss/migration/eap/task/subsystem/jgroups/EAP7_2AddFDSockProtocolOperation.java
View file
Open in desktop

This file was deleted.

Loading
Loading