Remove AJP per [JENKINS-33776] because Jetty 9 dropped support

jenkinsci · Mar 29, 2016 · 581cc9f · 581cc9f
1 parent b3ce03a
commit 581cc9f
Show file tree

Hide file tree

Showing 7 changed files with 1 addition and 36 deletions.
diff --git a/deb/build/debian/jenkins.default b/deb/build/debian/jenkins.default
@@ -56,8 +56,6 @@ MAXOPENFILES=8192
 # port for HTTP connector (default 8080; disable with -1)
 HTTP_PORT=@@PORT@@
 
-# port for AJP connector (disabled by default)
-AJP_PORT=-1
 
 # servlet context, important if you want to use apache proxying  
 PREFIX=/$NAME
@@ -66,10 +64,9 @@ PREFIX=/$NAME
 # --javahome=$JAVA_HOME
 # --httpPort=$HTTP_PORT (default 8080; disable with -1)
 # --httpsPort=$HTTP_PORT
-# --ajp13Port=$AJP_PORT
 # --argumentsRealm.passwd.$ADMIN_USER=[password]
 # --argumentsRealm.roles.$ADMIN_USER=admin
 # --webroot=~/.jenkins/war
 # --prefix=$PREFIX
 
-JENKINS_ARGS="--webroot=/var/cache/$NAME/war --httpPort=$HTTP_PORT --ajp13Port=$AJP_PORT"
+JENKINS_ARGS="--webroot=/var/cache/$NAME/war --httpPort=$HTTP_PORT"
diff --git a/osx/Library/Application Support/Jenkins/jenkins-runner.sh b/osx/Library/Application Support/Jenkins/jenkins-runner.sh
@@ -36,8 +36,6 @@ add_to_args httpPort
 add_to_args httpListenAddress
 add_to_args httpsPort
 add_to_args httpsListenAddress
-add_to_args ajp13Port
-add_to_args ajp13ListenAddress
 
 echo "JENKINS_HOME=$JENKINS_HOME"
 echo "@@PRODUCTNAME@@ command line for execution:"

diff --git a/osx/Library/Documentation/Jenkins/command-line-preferences.html b/osx/Library/Documentation/Jenkins/command-line-preferences.html
@@ -36,8 +36,6 @@ <h4>Supported Settings</h4>
 <li>httpListenAddress
 <li>httpsPort
 <li>httpsListenAddress
-<li>ajp13Port
-<li>ajp13ListenAddress
 </ul>
 
 <p>Additionally, you can set also these:

diff --git a/rpm/build/SOURCES/jenkins.init.in b/rpm/build/SOURCES/jenkins.init.in
@@ -88,8 +88,6 @@ PARAMS="--logfile=/var/log/@@ARTIFACTNAME@@/@@ARTIFACTNAME@@.log --webroot=/var/
 [ -n "$JENKINS_HTTPS_KEYSTORE" ] && PARAMS="$PARAMS --httpsKeyStore=$JENKINS_HTTPS_KEYSTORE"
 [ -n "$JENKINS_HTTPS_KEYSTORE_PASSWORD" ] && PARAMS="$PARAMS --httpsKeyStorePassword='$JENKINS_HTTPS_KEYSTORE_PASSWORD'"
 [ -n "$JENKINS_HTTPS_LISTEN_ADDRESS" ] && PARAMS="$PARAMS --httpsListenAddress=$JENKINS_HTTPS_LISTEN_ADDRESS"
-[ -n "$JENKINS_AJP_PORT" ] && PARAMS="$PARAMS --ajp13Port=$JENKINS_AJP_PORT"
-[ -n "$JENKINS_AJP_LISTEN_ADDRESS" ] && PARAMS="$PARAMS --ajp13ListenAddress=$JENKINS_AJP_LISTEN_ADDRESS"
 [ -n "$JENKINS_DEBUG_LEVEL" ] && PARAMS="$PARAMS --debug=$JENKINS_DEBUG_LEVEL"
 [ -n "$JENKINS_HANDLER_STARTUP" ] && PARAMS="$PARAMS --handlerCountStartup=$JENKINS_HANDLER_STARTUP"
 [ -n "$JENKINS_HANDLER_MAX" ] && PARAMS="$PARAMS --handlerCountMax=$JENKINS_HANDLER_MAX"

diff --git a/rpm/build/SOURCES/jenkins.sysconfig.in b/rpm/build/SOURCES/jenkins.sysconfig.in
@@ -100,23 +100,6 @@ JENKINS_HTTPS_KEYSTORE_PASSWORD=""
 #
 JENKINS_HTTPS_LISTEN_ADDRESS=""
 
-## Type:        integer(0:65535)
-## Default:     8009
-## ServiceRestart: @@ARTIFACTNAME@@
-#
-# Ajp13 Port Jenkins is listening on.
-# Set to -1 to disable
-#
-JENKINS_AJP_PORT="8009"
-
-## Type:        string
-## Default:     ""
-## ServiceRestart: @@ARTIFACTNAME@@
-#
-# IP address Jenkins listens on for Ajp13 requests.
-# Default is all interfaces (0.0.0.0).
-#
-JENKINS_AJP_LISTEN_ADDRESS=""
 
 ## Type:        integer(1:9)
 ## Default:     5

diff --git a/suse/build/SOURCES/jenkins.init.in b/suse/build/SOURCES/jenkins.init.in
@@ -79,7 +79,6 @@ export JAVA_HOME
 JAVA_CMD="$JAVA_HOME/bin/java $JENKINS_JAVA_OPTIONS -DJENKINS_HOME=$JENKINS_HOME -jar $JENKINS_WAR"
 PARAMS="--javaHome=$JAVA_HOME --logfile=/var/log/@@ARTIFACTNAME@@/@@ARTIFACTNAME@@.log --webroot=/var/cache/@@ARTIFACTNAME@@/war"
 [ -n "$JENKINS_PORT" ] && PARAMS="$PARAMS --httpPort=$JENKINS_PORT"
-[ -n "$JENKINS_AJP_PORT" ] && PARAMS="$PARAMS --ajp13Port=$JENKINS_AJP_PORT"
 [ -n "$JENKINS_DEBUG_LEVEL" ] && PARAMS="$PARAMS --debug=$JENKINS_DEBUG_LEVEL"
 [ -n "$JENKINS_HANDLER_STARTUP" ] && PARAMS="$PARAMS --handlerCountStartup=$JENKINS_HANDLER_STARTUP"
 [ -n "$JENKINS_HANDLER_MAX" ] && PARAMS="$PARAMS --handlerCountMax=$JENKINS_HANDLER_MAX"

diff --git a/suse/build/SOURCES/jenkins.sysconfig.in b/suse/build/SOURCES/jenkins.sysconfig.in
@@ -67,14 +67,6 @@ JENKINS_JAVA_OPTIONS="-Djava.awt.headless=true"
 #
 JENKINS_PORT="@@PORT@@"
 
-## Type:        integer(0:65535)
-## Default:     8009
-## ServiceRestart: @@ARTIFACTNAME@@
-#
-# Ajp13 Port Jenkins is listening on.
-# Set to -1 to disable
-#
-JENKINS_AJP_PORT="8009"
 
 ## Type:        integer(1:9)
 ## Default:     5