Merge pull request #7890 from OpenLiberty/revert-7687-6379-UlimitChange

Revert "Issue #6379: Ulimit boost change"

dev/com.ibm.ws.kernel.boot.ws-server/publish/bin/server

@@ -64,10 +64,6 @@
 # WLP_ZOS_JOBNAME - The job name to use when starting the server in
 #                   a z/OS environment.
 #
-# WLP_FILE_SOFT_LIMIT - The soft limit of the number of file descriptors / open 
-#               files allowed.  The default value is 4096. 
-#
-#
 ###############################################################################
 
 SERVER_UNKNOWN_STATUS=5
@@ -121,7 +117,6 @@ esac
 ##
 PS_P='ps -p'
 UMASK_O='umask o='
-ULIMIT_N='ulimit -n'
 tryShellExtensions=true
 os400lib=false
 shareclassesCacheDirPerm=true
@@ -778,17 +773,6 @@ serverUmask()
   fi
 }
 
-## call the ulimit -n value to set the specified number of open
-## files or set the default to 4096.
-setUlimit()
-{
-   if [ -z "${WLP_FILE_SOFT_LIMIT}" ]; then
-      $ULIMIT_N 4096 2> /dev/null
-   else
-      $ULIMIT_N "${WLP_FILE_SOFT_LIMIT}" 2> /dev/null
-   fi
-}
-
 ##
 ## javaCmd: Execute a java-based command.  Arguments are:
 ##
@@ -1084,8 +1068,6 @@ case "$ACTION" in
         JAVA_DEBUG="-Dwas.debug.mode=true -Dcom.ibm.websphere.ras.inject.at.transform=true -Dsun.reflect.noInflation=true -agentlib:jdwp=transport=dt_socket,server=y,suspend=${WLP_DEBUG_SUSPEND},address=${WLP_DEBUG_ADDRESS}"
       fi
 
-      setUlimit
-
       serverWorkingDirectory
 
       # WLP_JAR_CYGWIN is used only in support of java -jar startup of a Liberty server.
@@ -1154,8 +1136,6 @@ case "$ACTION" in
         touchIfNotExist "${SERVER_OUTPUT_DIR}/workarea/.sLock"
         rmIfExist "${SERVER_OUTPUT_DIR}/workarea/.sCommand"
 
-        setUlimit
-    
         # Start the target server with the provided arguments
         serverCmd "${X_LOG_DIR}/${X_LOG_FILE}" "$@"
         rc=$?

dev/com.ibm.ws.kernel.boot_fat/bnd.bnd

@@ -14,8 +14,7 @@ bVersion=1.0
 src: \
 	fat/src,\
 	test-applications/checkJvmAppClasspath/src,\
-	test-applications/shutdownfat/src, \
-	test-applications/ulimitApp/src
+	test-applications/shutdownfat/src
 
 
 fat.project: true

dev/com.ibm.ws.kernel.boot_fat/fat/src/com/ibm/ws/kernel/boot/FATSuite.java

@@ -57,7 +57,6 @@
                 ServerStartJVMOptionsTest.class,
                 PauseResumeCommandTest.class,
                 EmbeddedServerMergeProductExtensionTest.class,
-                ServerEndpointControlMBeanTest.class,
-                UlimitTest.class
+                ServerEndpointControlMBeanTest.class
 })
 public class FATSuite {}