Remove icepatch2 (#1991)

zeroc-ice · Mar 28, 2024 · 05dd314 · 05dd314
1 parent 3111cba
commit 05dd314
Show file tree

Hide file tree

Showing 68 changed files with 28 additions and 5,168 deletions.
diff --git a/CHANGELOG-3.8.md b/CHANGELOG-3.8.md
@@ -24,7 +24,7 @@ This feature has been deprecated since Ice 3.7.
 
 - Slice classes no longer represent remote Ice objects; the syntax `MyClass*` (a proxy to a class) is now invalid.
 
-- An interface can no longer be used as a type This feature, known as "interface by value", has been deprecated since
+- An interface can no longer be used as a type. This feature, known as "interface by value", has been deprecated since
 Ice 3.7. You can still define proxies with the usual syntax, `Greeter*`, where `Greeter` represents an interface.
 
 ## C++ Changes
@@ -39,3 +39,12 @@ C++ compiler with support for std=c++17 or higher.
 ## PHP Changes
 
 - Removed the flattened mapping deprecated in 3.7.
+
+## IceGrid Changes
+
+- Removed deprecated server and application distributions in IceGrid. These distributions relied on the IcePatch2
+service.
+
+## IcePatch2 Changes
+
+- The IcePatch2 service was removed.
diff --git a/config/PropertyNames.xml b/config/PropertyNames.xml
@@ -542,20 +542,6 @@ generated from the section label.
         <property name="Registry.UserAccounts" />
     </section>
 
-    <section name="IcePatch2">
-        <property class="objectadapter" />
-        <property name="Directory" />
-        <property name="InstanceName" />
-    </section>
-
-    <section name="IcePatch2Client">
-        <property name="ChunkSize" />
-        <property name="Directory" />
-        <property name="Proxy" />
-        <property name="Remove" />
-        <property name="Thorough" />
-    </section>
-
     <section name="IceSSL">
         <property name="Alias" />
         <property name="CAs"/>

diff --git a/cpp/Makefile b/cpp/Makefile
@@ -13,7 +13,7 @@ include $(lang_srcdir)/config/Make.rules
 # that other projects might depend on so it's important to parse them first for the
 # generated headers variable to be defined when we load other projects.
 #
-load_first = Ice IceSSL IceBox IcePatch2Lib Glacier2Lib IceGridLib IceStormLib
+load_first = Ice IceSSL IceBox Glacier2Lib IceGridLib IceStormLib
 
 #
 # Create projects for all the Slice translators from src/slice2* and load source projects.

diff --git a/cpp/config/Make.rules b/cpp/config/Make.rules
@@ -31,8 +31,7 @@ coreandstub_components  = IceUtil \
                           Glacier2 \
                           IceStorm \
                           IceGrid \
-                          IceBox \
-                          IcePatch2
+                          IceBox
 
 # Add the Bluetooth transport if Bluetooth system libraries are available
 ifneq ($(IceBT_system_libs),)

diff --git a/cpp/include/Ice/Properties.h b/cpp/include/Ice/Properties.h
@@ -144,7 +144,7 @@ namespace Ice
         /**
          * Convert a sequence of command-line options into properties. All options that begin with one of the following
          * prefixes are converted into properties: <code>--Ice</code>, <code>--IceBox</code>, <code>--IceGrid</code>,
-         * <code>--IcePatch2</code>, <code>--IceSSL</code>, <code>--IceStorm</code>, <code>--Freeze</code>, and
+         * <code>--IceSSL</code>, <code>--IceStorm</code>, <code>--Freeze</code>, and
          * <code>--Glacier2</code>.
          * @param options The command-line options.
          * @return The command-line options that do not start with one of the listed prefixes, in their original order.

diff --git a/cpp/include/IcePatch2/ClientUtil.h b/cpp/include/IcePatch2/ClientUtil.h
diff --git a/cpp/include/IcePatch2/Config.h b/cpp/include/IcePatch2/Config.h
diff --git a/cpp/include/IcePatch2/IcePatch2.h b/cpp/include/IcePatch2/IcePatch2.h
diff --git a/cpp/msbuild/ice.nuget.targets b/cpp/msbuild/ice.nuget.targets
@@ -30,7 +30,6 @@
                                      $(IceSrcRootDir)bin\$(Platform)\$(Configuration)\icebridge.exe;
                                      $(IceSrcRootDir)bin\$(Platform)\$(Configuration)\icegridadmin.exe;
                                      $(IceSrcRootDir)bin\$(Platform)\$(Configuration)\icegriddb.exe;
-                                     $(IceSrcRootDir)bin\$(Platform)\$(Configuration)\icepatch2*.exe;
                                      $(IceSrcRootDir)bin\$(Platform)\$(Configuration)\iceserviceinstall.exe;
                                      $(IceSrcRootDir)bin\$(Platform)\$(Configuration)\icestormadmin.exe;
                                      $(IceSrcRootDir)bin\$(Platform)\$(Configuration)\icestormdb.exe"

diff --git a/cpp/msbuild/ice.sln b/cpp/msbuild/ice.sln
@@ -201,31 +201,11 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "icesslopenssl", "..\src\Ice
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ice2slice", "..\src\ice2slice\msbuild\ice2slice.vcxproj", "{773EA63E-40AE-45B8-82B4-82B54CF309F8}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "icepatch2", "..\src\IcePatch2Lib\msbuild\icepatch2\icepatch2.vcxproj", "{18F381D8-BA61-4E6A-B877-9F6BC28C07E5}"
-	ProjectSection(ProjectDependencies) = postProject
-		{3AB9772C-6113-4F1C-90FB-5368E7486C11} = {3AB9772C-6113-4F1C-90FB-5368E7486C11}
-	EndProjectSection
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "glacier2cryptpermissionsverifier", "..\src\Glacier2CryptPermissionsVerifier\msbuild\glacier2cryptpermissionsverifier\glacier2cryptpermissionsverifier.vcxproj", "{BF2077E4-D837-486B-9356-24FA5F659808}"
 	ProjectSection(ProjectDependencies) = postProject
 		{2940A3C2-A9BA-44AA-AF65-00479C783407} = {2940A3C2-A9BA-44AA-AF65-00479C783407}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "icepatch2server", "..\src\IcePatch2\msbuild\icepatch2server\icepatch2server.vcxproj", "{7E1D6372-D417-4143-A7AF-BE3E77550238}"
-	ProjectSection(ProjectDependencies) = postProject
-		{18F381D8-BA61-4E6A-B877-9F6BC28C07E5} = {18F381D8-BA61-4E6A-B877-9F6BC28C07E5}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "icepatch2calc", "..\src\IcePatch2\msbuild\icepatch2calc\icepatch2calc.vcxproj", "{8BCB4793-C004-459D-9605-272470D53A40}"
-	ProjectSection(ProjectDependencies) = postProject
-		{18F381D8-BA61-4E6A-B877-9F6BC28C07E5} = {18F381D8-BA61-4E6A-B877-9F6BC28C07E5}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "icepatch2client", "..\src\IcePatch2\msbuild\icepatch2client\icepatch2client.vcxproj", "{43D54B43-526E-40CE-9945-81420C54A415}"
-	ProjectSection(ProjectDependencies) = postProject
-		{18F381D8-BA61-4E6A-B877-9F6BC28C07E5} = {18F381D8-BA61-4E6A-B877-9F6BC28C07E5}
-	EndProjectSection
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
@@ -506,14 +486,6 @@ Global
 		{773EA63E-40AE-45B8-82B4-82B54CF309F8}.Release|Win32.Build.0 = Release|Win32
 		{773EA63E-40AE-45B8-82B4-82B54CF309F8}.Release|x64.ActiveCfg = Release|x64
 		{773EA63E-40AE-45B8-82B4-82B54CF309F8}.Release|x64.Build.0 = Release|x64
-		{18F381D8-BA61-4E6A-B877-9F6BC28C07E5}.Debug|Win32.ActiveCfg = Debug|Win32
-		{18F381D8-BA61-4E6A-B877-9F6BC28C07E5}.Debug|Win32.Build.0 = Debug|Win32
-		{18F381D8-BA61-4E6A-B877-9F6BC28C07E5}.Debug|x64.ActiveCfg = Debug|x64
-		{18F381D8-BA61-4E6A-B877-9F6BC28C07E5}.Debug|x64.Build.0 = Debug|x64
-		{18F381D8-BA61-4E6A-B877-9F6BC28C07E5}.Release|Win32.ActiveCfg = Release|Win32
-		{18F381D8-BA61-4E6A-B877-9F6BC28C07E5}.Release|Win32.Build.0 = Release|Win32
-		{18F381D8-BA61-4E6A-B877-9F6BC28C07E5}.Release|x64.ActiveCfg = Release|x64
-		{18F381D8-BA61-4E6A-B877-9F6BC28C07E5}.Release|x64.Build.0 = Release|x64
 		{BF2077E4-D837-486B-9356-24FA5F659808}.Debug|Win32.ActiveCfg = Debug|Win32
 		{BF2077E4-D837-486B-9356-24FA5F659808}.Debug|Win32.Build.0 = Debug|Win32
 		{BF2077E4-D837-486B-9356-24FA5F659808}.Debug|x64.ActiveCfg = Debug|x64
@@ -522,30 +494,6 @@ Global
 		{BF2077E4-D837-486B-9356-24FA5F659808}.Release|Win32.Build.0 = Release|Win32
 		{BF2077E4-D837-486B-9356-24FA5F659808}.Release|x64.ActiveCfg = Release|x64
 		{BF2077E4-D837-486B-9356-24FA5F659808}.Release|x64.Build.0 = Release|x64
-		{7E1D6372-D417-4143-A7AF-BE3E77550238}.Debug|Win32.ActiveCfg = Debug|Win32
-		{7E1D6372-D417-4143-A7AF-BE3E77550238}.Debug|Win32.Build.0 = Debug|Win32
-		{7E1D6372-D417-4143-A7AF-BE3E77550238}.Debug|x64.ActiveCfg = Debug|x64
-		{7E1D6372-D417-4143-A7AF-BE3E77550238}.Debug|x64.Build.0 = Debug|x64
-		{7E1D6372-D417-4143-A7AF-BE3E77550238}.Release|Win32.ActiveCfg = Release|Win32
-		{7E1D6372-D417-4143-A7AF-BE3E77550238}.Release|Win32.Build.0 = Release|Win32
-		{7E1D6372-D417-4143-A7AF-BE3E77550238}.Release|x64.ActiveCfg = Release|x64
-		{7E1D6372-D417-4143-A7AF-BE3E77550238}.Release|x64.Build.0 = Release|x64
-		{8BCB4793-C004-459D-9605-272470D53A40}.Debug|Win32.ActiveCfg = Debug|Win32
-		{8BCB4793-C004-459D-9605-272470D53A40}.Debug|Win32.Build.0 = Debug|Win32
-		{8BCB4793-C004-459D-9605-272470D53A40}.Debug|x64.ActiveCfg = Debug|x64
-		{8BCB4793-C004-459D-9605-272470D53A40}.Debug|x64.Build.0 = Debug|x64
-		{8BCB4793-C004-459D-9605-272470D53A40}.Release|Win32.ActiveCfg = Release|Win32
-		{8BCB4793-C004-459D-9605-272470D53A40}.Release|Win32.Build.0 = Release|Win32
-		{8BCB4793-C004-459D-9605-272470D53A40}.Release|x64.ActiveCfg = Release|x64
-		{8BCB4793-C004-459D-9605-272470D53A40}.Release|x64.Build.0 = Release|x64
-		{43D54B43-526E-40CE-9945-81420C54A415}.Debug|Win32.ActiveCfg = Debug|Win32
-		{43D54B43-526E-40CE-9945-81420C54A415}.Debug|Win32.Build.0 = Debug|Win32
-		{43D54B43-526E-40CE-9945-81420C54A415}.Debug|x64.ActiveCfg = Debug|x64
-		{43D54B43-526E-40CE-9945-81420C54A415}.Debug|x64.Build.0 = Debug|x64
-		{43D54B43-526E-40CE-9945-81420C54A415}.Release|Win32.ActiveCfg = Release|Win32
-		{43D54B43-526E-40CE-9945-81420C54A415}.Release|Win32.Build.0 = Release|Win32
-		{43D54B43-526E-40CE-9945-81420C54A415}.Release|x64.ActiveCfg = Release|x64
-		{43D54B43-526E-40CE-9945-81420C54A415}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE