From 97ca574116bb5ee5af0bf1ed69fe1f60b6b770b6 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Tue, 31 Mar 2026 14:32:44 +0000
Subject: [PATCH 1/4] Initial plan


From bbc3d1165a3565cbcd998c8bfc1673c645ae390b Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Tue, 31 Mar 2026 14:34:39 +0000
Subject: [PATCH 2/4] ci: add Windows service start/stop test to Test on
 Windows step

Agent-Logs-Url: https://github.com/OpenIdentityPlatform/OpenDJ/sessions/b8d7e4b7-e6e7-45c5-b70c-b90833a88d84

Co-authored-by: vharseko <6818498+vharseko@users.noreply.github.com>
---
 .github/workflows/build.yml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 26894a3684..a4131e4327 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -234,6 +234,12 @@ jobs:
         opendj-server-legacy\target\package\opendj\bat\rebuild-index.bat --bindDN "cn=Directory Manager" --bindPassword password --baseDN "dc=example2,dc=com" --rebuildAll --trustAll
         opendj-server-legacy\target\package\opendj\bat\ldapsearch.bat --hostname localhost --port 1636 --bindDN "cn=Directory Manager" --bindPassword password --useSsl --trustAll --baseDN "dc=example2,dc=com" --searchScope sub "(uid=user.*)" dn | find /c '"dn:"' | findstr "10000"
         opendj-server-legacy\target\package\opendj\bat\stop-ds.bat
+        opendj-server-legacy\target\package\opendj\bat\windows-service.bat --enableService
+        net start OpenDJ
+        powershell -Command "for ($i=0; $i -lt 12; $i++) { try { $c = New-Object System.Net.Sockets.TcpClient('localhost', 1636); $c.Close(); break } catch { Start-Sleep -Seconds 5 } }"
+        opendj-server-legacy\target\package\opendj\bat\status.bat --bindDN "cn=Directory Manager" --bindPassword password
+        net stop OpenDJ
+        opendj-server-legacy\target\package\opendj\bat\windows-service.bat --disableService
     - name: Upload artifacts OpenDJ Server
       uses: actions/upload-artifact@v4
       with:

From 607c63167ebd4fcfcb522a709c6dbec17a6724c2 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Tue, 31 Mar 2026 15:31:01 +0000
Subject: [PATCH 3/4] fix: correct Windows service name and PowerShell wait
 loop in CI

Agent-Logs-Url: https://github.com/OpenIdentityPlatform/OpenDJ/sessions/a07e721d-23f2-4511-976c-3682f3473369

Co-authored-by: vharseko <6818498+vharseko@users.noreply.github.com>
---
 .github/workflows/build.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index a4131e4327..cc2c4e9ed0 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -235,10 +235,10 @@ jobs:
         opendj-server-legacy\target\package\opendj\bat\ldapsearch.bat --hostname localhost --port 1636 --bindDN "cn=Directory Manager" --bindPassword password --useSsl --trustAll --baseDN "dc=example2,dc=com" --searchScope sub "(uid=user.*)" dn | find /c '"dn:"' | findstr "10000"
         opendj-server-legacy\target\package\opendj\bat\stop-ds.bat
         opendj-server-legacy\target\package\opendj\bat\windows-service.bat --enableService
-        net start OpenDJ
-        powershell -Command "for ($i=0; $i -lt 12; $i++) { try { $c = New-Object System.Net.Sockets.TcpClient('localhost', 1636); $c.Close(); break } catch { Start-Sleep -Seconds 5 } }"
+        net start "OpenDJ Server"
+        for ($i=0; $i -lt 12; $i++) { try { $c = New-Object System.Net.Sockets.TcpClient('localhost', 1636); $c.Close(); break } catch { Start-Sleep -Seconds 5 } }
         opendj-server-legacy\target\package\opendj\bat\status.bat --bindDN "cn=Directory Manager" --bindPassword password
-        net stop OpenDJ
+        net stop "OpenDJ Server"
         opendj-server-legacy\target\package\opendj\bat\windows-service.bat --disableService
     - name: Upload artifacts OpenDJ Server
       uses: actions/upload-artifact@v4

From 7b70095de59250f585b7c9d83459ec4cb2ca8b4a Mon Sep 17 00:00:00 2001
From: Valery Kharseko <vharseko@3a-systems.ru>
Date: Tue, 31 Mar 2026 18:34:41 +0300
Subject: [PATCH 4/4] Replace status.bat with ldapsearch.bat in build.yml

---
 .github/workflows/build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index cc2c4e9ed0..af65065eaf 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -237,7 +237,7 @@ jobs:
         opendj-server-legacy\target\package\opendj\bat\windows-service.bat --enableService
         net start "OpenDJ Server"
         for ($i=0; $i -lt 12; $i++) { try { $c = New-Object System.Net.Sockets.TcpClient('localhost', 1636); $c.Close(); break } catch { Start-Sleep -Seconds 5 } }
-        opendj-server-legacy\target\package\opendj\bat\status.bat --bindDN "cn=Directory Manager" --bindPassword password
+        opendj-server-legacy\target\package\opendj\bat\ldapsearch.bat --hostname localhost --port 1636 --bindDN "cn=Directory Manager" --bindPassword password --useSsl --trustAll --baseDN "dc=example2,dc=com" --searchScope sub "(uid=user.*)" dn | find /c '"dn:"' | findstr "10000"
         net stop "OpenDJ Server"
         opendj-server-legacy\target\package\opendj\bat\windows-service.bat --disableService
     - name: Upload artifacts OpenDJ Server