From 002a646aede73be4ce5e19d59cbe7acc07fc81be Mon Sep 17 00:00:00 2001
From: "patrick.fry" <patrick.fry@oracle.com>
Date: Sat, 24 Feb 2024 12:46:02 -0500
Subject: [PATCH] COH-29534 Remove TDE setup from cfg scripts for code lines
 which no longer have TDE (auto-submit 107074 after successfully running
 remote remote.full) Job ID: job.9.20240224071849.18191 (auto-submit integ
 107077 main -> coherence-ce/main after successfully running remote
 remote.full) Job ID: job.9.20240224161138.21388

[git-p4: depot-paths = "//dev/coherence-ce/main/": change = 107084]
---
 bin/cfgcommon.sh   | 20 +-------------------
 bin/cfgwindows.cmd | 16 ++--------------
 2 files changed, 3 insertions(+), 33 deletions(-)

diff --git a/bin/cfgcommon.sh b/bin/cfgcommon.sh
index 179e6e9f71722..4e7d51a898582 100644
--- a/bin/cfgcommon.sh
+++ b/bin/cfgcommon.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright (c) 2000, 2023, Oracle and/or its affiliates.
+# Copyright (c) 2000, 2024, Oracle and/or its affiliates.
 #
 # Licensed under the Universal Permissive License v 1.0 as shown at
 # https://oss.oracle.com/licenses/upl.
@@ -16,11 +16,9 @@
 #     JAVA_HOME    e.g. /usr/java/jdk1.6
 #     MAVEN_HOME   e.g. /dev/tools/maven
 #     P4IGNORE     e.g. /dev/.p4ignore
-#     TDE_HOME     e.g. /dev/tools/tde
 #     CLASSPATH    e.g.
 #
 #     _P4IGNORE    saved P4IGNORE
-#     _TDE_HOME    saved TDE_HOME
 #     _CLASSPATH   saved CLASSPATH
 #     _PATH        saved PATH
 #
@@ -53,12 +51,6 @@ function reset
     export P4IGNORE=$_P4IGNORE
   fi
 
-  if [ -z $_TDE_HOME ]; then
-    unset TDE_HOME
-  else
-    export TDE_HOME=$_TDE_HOME
-  fi
-
   if [ -z $_CLASSPATH ]; then
     unset CLASSPATH
   else
@@ -75,7 +67,6 @@ function reset
   unset _JAVA_HOME
   unset _MAVEN_HOME
   unset _P4IGNORE
-  unset _TDE_HOME
   unset _CLASSPATH
   unset _PATH
 
@@ -173,15 +164,6 @@ function setup
     echo P4IGNORE = $P4IGNORE
   fi
 
-  #
-  # Set the TDE_HOME environment variable
-  #
-  _TDE_HOME=$TDE_HOME
-  TDE_HOME=$DEV_ROOT/tools/tde
-  PATH=$TDE_HOME/bin:$PATH
-  export TDE_HOME
-  echo TDE_HOME = $TDE_HOME
-
   #
   # Add the RQ executables to the PATH environment variable
   #
diff --git a/bin/cfgwindows.cmd b/bin/cfgwindows.cmd
index 29d31a5f8963a..c5afff7a9f36d 100755
--- a/bin/cfgwindows.cmd
+++ b/bin/cfgwindows.cmd
@@ -1,8 +1,8 @@
 @echo off
-rem  Copyright (c) 2000, 2020, Oracle and/or its affiliates.
+rem  Copyright (c) 2000, 2024, Oracle and/or its affiliates.
 
 rem  Licensed under the Universal Permissive License v 1.0 as shown at
-rem  http://oss.oracle.com/licenses/upl.
+rem  https://oss.oracle.com/licenses/upl.
 
 rem
 rem This script sets all environment variables necessary to build Coherence.
@@ -14,11 +14,9 @@ rem This script is responsible for the following environment variables:
 rem
 rem     DEV_ROOT     e.g. c:\dev
 rem     MAVEN_HOME   e.g. c:\dev\tools\maven
-rem     TDE_HOME     e.g. c:\dev\tools\tde
 rem     CLASSPATH    e.g.
 rem     PATH         e.g. %ANT_HOME%\bin;%MAVEN_HOME%\bin;%PATH%
 rem
-rem     _TDE_HOME    saved TDE_HOME
 rem     _CLASSPATH   saved CLASSPATH
 rem     _PATH        saved PATH
 rem
@@ -33,13 +31,11 @@ if "%1"=="-reset" (
   )
 
   set MAVEN_HOME=%_MAVEN_HOME%
-  set TDE_HOME=%_TDE_HOME%
   set CLASSPATH=%_CLASSPATH%
   set PATH=%_PATH%
 
   set DEV_ROOT=
   set _MAVEN_HOME=
-  set _TDE_HOME=
   set _CLASSPATH=
   set _PATH=
 
@@ -79,13 +75,6 @@ if exist %DEV_ROOT%\tools\maven (
   echo MAVEN_HOME = %MAVEN_HOME%
 )
 
-rem
-rem Set the TDE_HOME environment variable
-rem
-set _TDE_HOME=%TDE_HOME%
-set TDE_HOME=%DEV_ROOT%\tools\tde
-echo TDE_HOME   = %TDE_HOME%
-
 rem
 rem Set the CLASSPATH environment variable
 rem
@@ -97,7 +86,6 @@ rem
 rem Set the PATH environment variable
 rem
 set _PATH=%PATH%
-set PATH=%TDE_HOME%\bin;%PATH%
 echo PATH      = %PATH%
 
 echo Build environment set.