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

[WFCORE-6542]: Upgrade the Windows service tools. #5700

Merged
merged 1 commit into from
Oct 12, 2023
Merged

[WFCORE-6542]: Upgrade the Windows service tools. #5700

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
4 changes: 4 additions & 0 deletions core-feature-pack/common/assembly.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,10 @@
<directory>src/main/resources</directory>
<outputDirectory/>
</fileSet>
<fileSet>
<directory>target/resources</directory>
<outputDirectory/>
</fileSet>
</fileSets>
<files>
<file>
Expand Down
45 changes: 45 additions & 0 deletions core-feature-pack/common/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,13 @@
<artifactId>commons-cli</artifactId>
</dependency>

<dependency>
<groupId>commons-daemon</groupId>
<artifactId>commons-daemon</artifactId>
<classifier>bin-windows</classifier>
<type>zip</type>
</dependency>

<!-- Dependency for JSonP API and Impl for Jakarta EE 8. We still need this artifact for
internal.javax.json.api.ee8 Jboss module used by org.wildfly.event.logger and
org.jboss.logmanager JBoss modules
Expand Down Expand Up @@ -864,6 +871,44 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>3.6.0</version>
<executions>
<execution>
<id>unpack</id>
<phase>generate-resources</phase>
<goals>
<goal>unpack</goal>
</goals>
<configuration>
<artifactItems>
<artifactItem>
<groupId>commons-daemon</groupId>
<artifactId>commons-daemon</artifactId>
<version>${version.commons-daemon}</version>
<classifier>bin-windows</classifier>
<type>zip</type>
<overWrite>true</overWrite>
<outputDirectory>${project.build.directory}/resources/content/docs/contrib/scripts/service/</outputDirectory>
<includes>**/*.exe</includes>
<fileMappers>
<org.codehaus.plexus.components.io.filemappers.RegExpFileMapper>
<pattern>prunsrv</pattern>
<replacement>wildfly-service</replacement>
</org.codehaus.plexus.components.io.filemappers.RegExpFileMapper>
<org.codehaus.plexus.components.io.filemappers.RegExpFileMapper>
<pattern>prunmgr</pattern>
<replacement>wildfly-mgr</replacement>
</org.codehaus.plexus.components.io.filemappers.RegExpFileMapper>
</fileMappers>
</artifactItem>
</artifactItems>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>

Expand Down
Binary file removed .../common/src/main/resources/content/docs/contrib/scripts/service/amd64/wildfly-service.exe
View file
Open in desktop
Binary file not shown.
11 changes: 5 additions & 6 deletions core-feature-pack/common/src/main/resources/content/docs/contrib/scripts/service/service.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,8 +112,7 @@ if "%DEBUG%" == "1" (
echo(

rem defaults
set SHORTNAME=Wildfly
rem NO quotes around the display name here !
set SHORTNAME=WildFly
set DISPLAYNAME=WildFly
rem NO quotes around the description here !
set DESCRIPTION=WildFly Application Server
Expand Down Expand Up @@ -403,7 +402,7 @@ if not "%JBOSSUSER%" == "" (
set "CREDENTIALS=--user=%JBOSSUSER% --password='!JBOSSPASS!'"
)

set RUNAS=
set "RUNAS=--ServiceUser=LocalSystem"
if not "%SERVICE_USER%" == "" (
if "%SERVICE_PASS%" == "" (
echo When specifying a user, you need to specify the password
Expand Down Expand Up @@ -453,7 +452,7 @@ if not exist "%BASE%\configuration\%CONFIG%" (

if /I "%ISDEBUG%" == "true" (
echo JBOSS_HOME="%JBOSS_HOME%"
echo RUNAS=%RUNAS%
echo RUNAS=!RUNAS!
echo SHORTNAME="%SHORTNAME%"
echo DISPLAYNAME="%DISPLAYNAME%"
echo DESCRIPTION="%DESCRIPTION%"
Expand All @@ -476,8 +475,8 @@ if /I "%ISDEBUG%" == "true" (
)

@rem quotes around the "%DESCRIPTION%" and "%DISPLAYNAME" but nowhere else
echo %PRUNSRV% install %SHORTNAME% %RUNAS% --DisplayName="%DISPLAYNAME%" --Description="%DESCRIPTION%" ++Environment=%ENV_VARS% --LogLevel=%LOGLEVEL% --LogPath=%LOGPATH% --LogPrefix=service --StdOutput=%STDOUT% --StdError=%STDERR% --StartMode=exe --Startup=%STARTUP_MODE% --StartImage=cmd.exe --StartPath=%START_PATH% ++StartParams=%STARTPARAM% --StopMode=exe --StopImage=cmd.exe --StopPath=%STOP_PATH% ++StopParams=!STOPPARAM!
%PRUNSRV% install %SHORTNAME% %RUNAS% --DisplayName="%DISPLAYNAME%" --Description="%DESCRIPTION%" ++Environment=%ENV_VARS% --LogLevel=%LOGLEVEL% --LogPath=%LOGPATH% --LogPrefix=service --StdOutput=%STDOUT% --StdError=%STDERR% --StartMode=exe --Startup=%STARTUP_MODE% --StartImage=cmd.exe --StartPath=%START_PATH% ++StartParams=%STARTPARAM% --StopMode=exe --StopImage=cmd.exe --StopPath=%STOP_PATH% ++StopParams=!STOPPARAM!
echo %PRUNSRV% install %SHORTNAME% !RUNAS! --DisplayName="%DISPLAYNAME%" --Description="%DESCRIPTION%" ++Environment=%ENV_VARS% --LogLevel=%LOGLEVEL% --LogPath=%LOGPATH% --LogPrefix=service --StdOutput=%STDOUT% --StdError=%STDERR% --StartMode=exe --Startup=%STARTUP_MODE% --StartImage=cmd.exe --StartPath=%START_PATH% ++StartParams=%STARTPARAM% --StopMode=exe --StopImage=cmd.exe --StopPath=%STOP_PATH% ++StopParams=!STOPPARAM!
%PRUNSRV% install %SHORTNAME% !RUNAS! --DisplayName="%DISPLAYNAME%" --Description="%DESCRIPTION%" ++Environment=%ENV_VARS% --LogLevel=%LOGLEVEL% --LogPath=%LOGPATH% --LogPrefix=service --StdOutput=%STDOUT% --StdError=%STDERR% --StartMode=exe --Startup=%STARTUP_MODE% --StartImage=cmd.exe --StartPath=%START_PATH% ++StartParams=%STARTPARAM% --StopMode=exe --StopImage=cmd.exe --StopPath=%STOP_PATH% ++StopParams=!STOPPARAM!

@if /I "%ISDEBUG%" == "true" (
@echo off
Expand Down
Binary file removed ...ature-pack/common/src/main/resources/content/docs/contrib/scripts/service/wildfly-mgr.exe
View file
Open in desktop
Binary file not shown.
Binary file removed ...e-pack/common/src/main/resources/content/docs/contrib/scripts/service/wildfly-service.exe
View file
Open in desktop
Binary file not shown.
38 changes: 38 additions & 0 deletions core-feature-pack/galleon-feature-pack/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,44 @@
<build>
<finalName>${server.output.dir.prefix}-galleon-pack-${project.version}</finalName>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>3.6.0</version>
<executions>
<execution>
<id>unpack</id>
<phase>generate-resources</phase>
<goals>
<goal>unpack</goal>
</goals>
<configuration>
<artifactItems>
<artifactItem>
<groupId>commons-daemon</groupId>
<artifactId>commons-daemon</artifactId>
<version>${version.commons-daemon}</version>
<classifier>bin-windows</classifier>
<type>zip</type>
<overWrite>true</overWrite>
<outputDirectory>${project.build.directory}/resources/content/docs/contrib/scripts/service/</outputDirectory>
<includes>**/*.exe</includes>
<fileMappers>
<org.codehaus.plexus.components.io.filemappers.RegExpFileMapper>
<pattern>prunsrv</pattern>
<replacement>wildfly-service</replacement>
</org.codehaus.plexus.components.io.filemappers.RegExpFileMapper>
<org.codehaus.plexus.components.io.filemappers.RegExpFileMapper>
<pattern>prunmgr</pattern>
<replacement>wildfly-mgr</replacement>
</org.codehaus.plexus.components.io.filemappers.RegExpFileMapper>
</fileMappers>
</artifactItem>
</artifactItems>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
Expand Down
8 changes: 8 additions & 0 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,7 @@
<version.com.jcraft.jsch>0.1.55</version.com.jcraft.jsch>
<version.commons-cli>1.5.0</version.commons-cli>
<version.commons-collections>3.2.2</version.commons-collections>
<version.commons-daemon>1.3.4</version.commons-daemon>
<version.commons-lang3>3.12.0</version.commons-lang3>
<version.commons-io>2.10.0</version.commons-io>
<version.io.netty>4.1.99.Final</version.io.netty>
Expand Down Expand Up @@ -700,6 +701,13 @@
<artifactId>commons-cli</artifactId>
<version>${version.commons-cli}</version>
</dependency>
<dependency>
<groupId>commons-daemon</groupId>
<artifactId>commons-daemon</artifactId>
<classifier>bin-windows</classifier>
<type>zip</type>
<version>${version.commons-daemon}</version>
</dependency>
<dependency>
<groupId>io.smallrye</groupId>
<artifactId>jandex</artifactId>
Expand Down