Skip to content

Commit 6e3bb7a

Browse files
emmartinsemmartins
authored
Merge pull request #335 from emmartins/add36
[CMTOOL-385] Add support for WildFly 36
2 parents cec6017 + f40fe50 commit 6e3bb7a

File tree

67 files changed

+3628
-2
lines changed

Some content is hidden

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

67 files changed

+3628
-2
lines changed

‎core/src/main/java/org/jboss/migration/core/logger/ServerMigrationLogger.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@
2222
import org.jboss.logging.annotations.MessageLogger;
2323
import org.jboss.migration.core.ProductInfo;
2424

25+
import java.lang.invoke.MethodHandles;
26+
2527
import static org.jboss.logging.Logger.Level.INFO;
2628

2729
/**
@@ -34,7 +36,7 @@ public interface ServerMigrationLogger extends BasicLogger {
3436
/**
3537
* the root logger instance
3638
*/
37-
ServerMigrationLogger ROOT_LOGGER = Logger.getMessageLogger(ServerMigrationLogger.class, ServerMigrationLogger.class.getPackage().getName());
39+
ServerMigrationLogger ROOT_LOGGER = Logger.getMessageLogger(MethodHandles.lookup(), ServerMigrationLogger.class, ServerMigrationLogger.class.getPackage().getName());
3840

3941
/**
4042
* Creates an exception indicating that no java.io.Console is available.

‎dist/standalone/pom.xml

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -428,6 +428,56 @@
428428
<artifactId>jboss-server-migration-wildfly35.0-to-wildfly35.0</artifactId>
429429
</dependency>
430430

431+
<!-- wfly 36.0 -->
432+
<dependency>
433+
<groupId>${project.groupId}</groupId>
434+
<artifactId>jboss-server-migration-wildfly36.0-server</artifactId>
435+
</dependency>
436+
<dependency>
437+
<groupId>${project.groupId}</groupId>
438+
<artifactId>jboss-server-migration-wildfly26.0-to-wildfly36.0</artifactId>
439+
</dependency>
440+
<dependency>
441+
<groupId>${project.groupId}</groupId>
442+
<artifactId>jboss-server-migration-wildfly27.0-to-wildfly36.0</artifactId>
443+
</dependency>
444+
<dependency>
445+
<groupId>${project.groupId}</groupId>
446+
<artifactId>jboss-server-migration-wildfly28.0-to-wildfly36.0</artifactId>
447+
</dependency>
448+
<dependency>
449+
<groupId>${project.groupId}</groupId>
450+
<artifactId>jboss-server-migration-wildfly29.0-to-wildfly36.0</artifactId>
451+
</dependency>
452+
<dependency>
453+
<groupId>${project.groupId}</groupId>
454+
<artifactId>jboss-server-migration-wildfly30.0-to-wildfly36.0</artifactId>
455+
</dependency>
456+
<dependency>
457+
<groupId>${project.groupId}</groupId>
458+
<artifactId>jboss-server-migration-wildfly31.0-to-wildfly36.0</artifactId>
459+
</dependency>
460+
<dependency>
461+
<groupId>${project.groupId}</groupId>
462+
<artifactId>jboss-server-migration-wildfly32.0-to-wildfly36.0</artifactId>
463+
</dependency>
464+
<dependency>
465+
<groupId>${project.groupId}</groupId>
466+
<artifactId>jboss-server-migration-wildfly33.0-to-wildfly36.0</artifactId>
467+
</dependency>
468+
<dependency>
469+
<groupId>${project.groupId}</groupId>
470+
<artifactId>jboss-server-migration-wildfly34.0-to-wildfly36.0</artifactId>
471+
</dependency>
472+
<dependency>
473+
<groupId>${project.groupId}</groupId>
474+
<artifactId>jboss-server-migration-wildfly35.0-to-wildfly36.0</artifactId>
475+
</dependency>
476+
<dependency>
477+
<groupId>${project.groupId}</groupId>
478+
<artifactId>jboss-server-migration-wildfly36.0-to-wildfly36.0</artifactId>
479+
</dependency>
480+
431481
<!-- EXTERNAL DEPENDENCIES -->
432482

433483
<dependency>

‎docs/user-guides/migrations/wildfly36.0/wildfly26.0/pom.xml

Lines changed: 86 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,86 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
~ Copyright The WildFly Authors
4+
~ SPDX-License-Identifier: Apache-2.0
5+
-->
6+
<project xmlns="http://maven.apache.org/POM/4.0.0"
7+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
8+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
9+
<modelVersion>4.0.0</modelVersion>
10+
11+
<parent>
12+
<groupId>org.jboss.migration</groupId>
13+
<artifactId>jboss-server-migration-parent</artifactId>
14+
<version>36.0.0.Final-SNAPSHOT</version>
15+
<relativePath>../../../../../pom.xml</relativePath>
16+
</parent>
17+
18+
<artifactId>jboss-server-migration-wildfly26.0-to-wildfly36.0-userguide</artifactId>
19+
20+
<name>JBoss Server Migration: User-Guide Wildfly 26.0 to Wildfly 36.0</name>
21+
22+
<dependencies>
23+
<dependency>
24+
<groupId>${project.groupId}</groupId>
25+
<artifactId>jboss-server-migration-docs-userguide-migration-includes</artifactId>
26+
</dependency>
27+
</dependencies>
28+
29+
<build>
30+
<plugins>
31+
<plugin>
32+
<artifactId>maven-resources-plugin</artifactId>
33+
<executions>
34+
<execution>
35+
<phase>generate-sources</phase>
36+
<goals>
37+
<goal>copy-resources</goal>
38+
</goals>
39+
<configuration>
40+
<outputDirectory>${project.build.directory}/asciidoc</outputDirectory>
41+
<resources>
42+
<resource>
43+
<directory>src/main/asciidoc</directory>
44+
</resource>
45+
</resources>
46+
</configuration>
47+
</execution>
48+
</executions>
49+
</plugin>
50+
<plugin>
51+
<groupId>org.apache.maven.plugins</groupId>
52+
<artifactId>maven-dependency-plugin</artifactId>
53+
<executions>
54+
<execution>
55+
<id>unpack-includes</id>
56+
<phase>generate-sources</phase>
57+
<goals>
58+
<goal>unpack-dependencies</goal>
59+
</goals>
60+
<configuration>
61+
<outputDirectory>${project.build.directory}/asciidoc</outputDirectory>
62+
<includeScope>compile</includeScope>
63+
</configuration>
64+
</execution>
65+
</executions>
66+
</plugin>
67+
<plugin>
68+
<groupId>org.asciidoctor</groupId>
69+
<artifactId>asciidoctor-maven-plugin</artifactId>
70+
<executions>
71+
<execution>
72+
<phase>generate-resources</phase>
73+
<goals>
74+
<goal>process-asciidoc</goal>
75+
</goals>
76+
<configuration>
77+
<sourceDocumentName>master.adoc</sourceDocumentName>
78+
<outputFile>${project.build.outputDirectory}/index.html</outputFile>
79+
</configuration>
80+
</execution>
81+
</executions>
82+
</plugin>
83+
</plugins>
84+
</build>
85+
86+
</project>

‎docs/user-guides/migrations/wildfly36.0/wildfly26.0/src/main/asciidoc/master.adoc

Lines changed: 99 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,99 @@
1+
// setup of vars used by this and/or included docs
2+
:server-source-productName: WildFly 26.0
3+
:server-source-name: WildFly
4+
:server-source-version: 26.0.0.Final
5+
:server-source-baseDir: wildfly-26.0
6+
7+
:server-target-productName: WildFly 36.0
8+
:server-target-name: WildFly
9+
:server-target-version: 36.0.0.Final
10+
:server-target-baseDir: wildfly-36.0
11+
12+
:includesDir: topics
13+
14+
// toc setup
15+
:toc:
16+
:numbered:
17+
18+
// include abstract
19+
include::{includesDir}/ServerMigration.adoc[]
20+
21+
// customize
22+
The server migration from {server-source-productName} to {server-target-productName} includes:
23+
24+
* Modules Migration
25+
* Standalone Server Migration
26+
* Managed Domain Migration
27+
28+
:leveloffset: +1
29+
30+
// --- modules migration
31+
32+
include::{includesDir}/ServerMigration-Modules.adoc[]
33+
34+
// --- standalone server migration
35+
36+
include::{includesDir}/ServerMigration-StandaloneServer.adoc[]
37+
38+
:leveloffset: +1
39+
40+
// ------ standalone server configuration migration
41+
42+
include::{includesDir}/ServerMigration-StandaloneServer-StandaloneServerConfiguration.adoc[]
43+
44+
:leveloffset: +1
45+
46+
include::{includesDir}/WFLY26.0toWFLY36.0-ServerMigration-ServerConfiguration-MigrateJBossDomainProperties.adoc[]
47+
48+
include::{includesDir}/ServerMigration-ServerConfiguration-RemoveUnsupportedSubsystems.adoc[]
49+
50+
include::{includesDir}/ServerMigration-ServerConfiguration-MigrateReferencedModules.adoc[]
51+
52+
include::{includesDir}/ServerMigration-ServerConfiguration-MigrateReferencedPaths.adoc[]
53+
54+
:leveloffset: -1
55+
56+
:leveloffset: -1
57+
58+
// --- managed domain migration
59+
60+
include::{includesDir}/ServerMigration-ManagedDomain.adoc[]
61+
62+
// ------ domain configuration
63+
64+
:leveloffset: +1
65+
66+
include::{includesDir}/ServerMigration-ManagedDomain-DomainConfiguration.adoc[]
67+
68+
:leveloffset: +1
69+
70+
include::{includesDir}/WFLY26.0toWFLY36.0-ServerMigration-ServerConfiguration-MigrateJBossDomainProperties.adoc[]
71+
72+
include::{includesDir}/ServerMigration-ServerConfiguration-RemoveUnsupportedSubsystems.adoc[]
73+
74+
include::{includesDir}/ServerMigration-ServerConfiguration-MigrateReferencedModules.adoc[]
75+
76+
include::{includesDir}/ServerMigration-ServerConfiguration-MigrateReferencedPaths.adoc[]
77+
78+
include::{includesDir}/ServerMigration-ManagedDomain-AddHostExcludes.adoc[]
79+
80+
:leveloffset: -1
81+
82+
// ------ host configuration
83+
84+
include::{includesDir}/ServerMigration-ManagedDomain-HostConfiguration.adoc[]
85+
86+
:leveloffset: +1
87+
88+
include::{includesDir}/WFLY26.0toWFLY36.0-ServerMigration-ServerConfiguration-MigrateJBossDomainProperties.adoc[]
89+
90+
include::{includesDir}/ServerMigration-ServerConfiguration-MigrateReferencedModules.adoc[]
91+
92+
include::{includesDir}/ServerMigration-ServerConfiguration-MigrateReferencedPaths.adoc[]
93+
94+
:leveloffset: -1
95+
96+
:leveloffset: -1
97+
98+
:leveloffset: -1
99+

‎docs/user-guides/migrations/wildfly36.0/wildfly26.0/src/main/asciidoc/topics/WFLY26.0toWFLY36.0-ServerMigration-ServerConfiguration-MigrateJBossDomainProperties.adoc

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
= Migrate JBoss Domain Properties
2+
3+
The words `master` and `slave` on Domain related property names were replaced with the words 'primary' and 'secondary', and the migrates automatically fixes any usage of the old property names.
4+
5+
The console logs any properties renamed by the migration.
6+
7+
[source,options="nowrap"]
8+
----
9+
INFO JBoss domain property jboss.domain.master.address migrated to jboss.domain.primary.address
10+
INFO JBoss domain property jboss.domain.master.port migrated to jboss.domain.primary.port
11+
INFO JBoss domain property jboss.domain.master.protocol migrated to jboss.domain.primary.protocol
12+
----
13+
14+
If any property was successfully renamed the following message will be logged.
15+
[source,options="nowrap"]
16+
----
17+
INFO JBoss domain properties migrated.
18+
----

‎docs/user-guides/migrations/wildfly36.0/wildfly27.0/pom.xml

Lines changed: 86 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,86 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
~ Copyright The WildFly Authors
4+
~ SPDX-License-Identifier: Apache-2.0
5+
-->
6+
<project xmlns="http://maven.apache.org/POM/4.0.0"
7+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
8+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
9+
<modelVersion>4.0.0</modelVersion>
10+
11+
<parent>
12+
<groupId>org.jboss.migration</groupId>
13+
<artifactId>jboss-server-migration-parent</artifactId>
14+
<version>36.0.0.Final-SNAPSHOT</version>
15+
<relativePath>../../../../../pom.xml</relativePath>
16+
</parent>
17+
18+
<artifactId>jboss-server-migration-wildfly27.0-to-wildfly36.0-userguide</artifactId>
19+
20+
<name>JBoss Server Migration: User-Guide Wildfly 27.0 to Wildfly 36.0</name>
21+
22+
<dependencies>
23+
<dependency>
24+
<groupId>${project.groupId}</groupId>
25+
<artifactId>jboss-server-migration-docs-userguide-migration-includes</artifactId>
26+
</dependency>
27+
</dependencies>
28+
29+
<build>
30+
<plugins>
31+
<plugin>
32+
<artifactId>maven-resources-plugin</artifactId>
33+
<executions>
34+
<execution>
35+
<phase>generate-sources</phase>
36+
<goals>
37+
<goal>copy-resources</goal>
38+
</goals>
39+
<configuration>
40+
<outputDirectory>${project.build.directory}/asciidoc</outputDirectory>
41+
<resources>
42+
<resource>
43+
<directory>src/main/asciidoc</directory>
44+
</resource>
45+
</resources>
46+
</configuration>
47+
</execution>
48+
</executions>
49+
</plugin>
50+
<plugin>
51+
<groupId>org.apache.maven.plugins</groupId>
52+
<artifactId>maven-dependency-plugin</artifactId>
53+
<executions>
54+
<execution>
55+
<id>unpack-includes</id>
56+
<phase>generate-sources</phase>
57+
<goals>
58+
<goal>unpack-dependencies</goal>
59+
</goals>
60+
<configuration>
61+
<outputDirectory>${project.build.directory}/asciidoc</outputDirectory>
62+
<includeScope>compile</includeScope>
63+
</configuration>
64+
</execution>
65+
</executions>
66+
</plugin>
67+
<plugin>
68+
<groupId>org.asciidoctor</groupId>
69+
<artifactId>asciidoctor-maven-plugin</artifactId>
70+
<executions>
71+
<execution>
72+
<phase>generate-resources</phase>
73+
<goals>
74+
<goal>process-asciidoc</goal>
75+
</goals>
76+
<configuration>
77+
<sourceDocumentName>master.adoc</sourceDocumentName>
78+
<outputFile>${project.build.outputDirectory}/index.html</outputFile>
79+
</configuration>
80+
</execution>
81+
</executions>
82+
</plugin>
83+
</plugins>
84+
</build>
85+
86+
</project>

0 commit comments

Comments
 (0)