Skip to content
Permalink
Browse files

Merge pull request #2682 from samrocketman/enhance-slave-protocol-des…

…criptions

[JENKINS-40700] Enhance slave protocol descriptions
  • Loading branch information
oleg-nenashev committed Jan 10, 2017
2 parents 8820a55 + 995da42 commit 0c991dec38800adabacd8a56349bd61575c1d7e5
Showing with 28 additions and 16 deletions.
  1. +1 −1 core/src/main/resources/hudson/cli/CliProtocol/description.jelly
  2. +1 −0 core/src/main/resources/hudson/cli/CliProtocol/description.properties
  3. +1 −1 core/src/main/resources/hudson/cli/CliProtocol2/description.jelly
  4. +1 −0 core/src/main/resources/hudson/cli/CliProtocol2/description.properties
  5. +2 −2 core/src/main/resources/hudson/cli/Messages.properties
  6. +1 −1 core/src/main/resources/jenkins/slaves/JnlpSlaveAgentProtocol/description.jelly
  7. +2 −0 core/src/main/resources/jenkins/slaves/JnlpSlaveAgentProtocol/description.properties
  8. +1 −1 core/src/main/resources/jenkins/slaves/JnlpSlaveAgentProtocol/description_sr.properties
  9. +1 −1 core/src/main/resources/jenkins/slaves/JnlpSlaveAgentProtocol2/description.jelly
  10. +3 −0 core/src/main/resources/jenkins/slaves/JnlpSlaveAgentProtocol2/description.properties
  11. +1 −1 core/src/main/resources/jenkins/slaves/JnlpSlaveAgentProtocol2/description_sr.properties
  12. +1 −1 core/src/main/resources/jenkins/slaves/JnlpSlaveAgentProtocol3/description.jelly
  13. +4 −0 core/src/main/resources/jenkins/slaves/JnlpSlaveAgentProtocol3/description.properties
  14. +2 −2 core/src/main/resources/jenkins/slaves/JnlpSlaveAgentProtocol3/description_sr.properties
  15. +1 −1 core/src/main/resources/jenkins/slaves/JnlpSlaveAgentProtocol4/description.jelly
  16. +1 −0 core/src/main/resources/jenkins/slaves/JnlpSlaveAgentProtocol4/description.properties
  17. +4 −4 core/src/main/resources/jenkins/slaves/Messages.properties
@@ -1,4 +1,4 @@
<?jelly escape-by-default='true'?>
<j:jelly xmlns:j="jelly:core">
${%Accepts connections from CLI clients}
${%summary}
</j:jelly>
@@ -0,0 +1 @@
summary=Accepts connections from CLI clients. This protocol is unencrypted.
@@ -1,4 +1,4 @@
<?jelly escape-by-default='true'?>
<j:jelly xmlns:j="jelly:core">
${%Extends the version 1 protocol by adding transport encryption}
${%summary}
</j:jelly>
@@ -0,0 +1 @@
summary=Extends the version 1 protocol by adding transport encryption.
@@ -94,5 +94,5 @@ OfflineNodeCommand.ShortDescription=Stop using a node for performing builds temp
WaitNodeOnlineCommand.ShortDescription=Wait for a node to become online.
WaitNodeOfflineCommand.ShortDescription=Wait for a node to become offline.

CliProtocol.displayName=Jenkins CLI Protocol/1
CliProtocol2.displayName=Jenkins CLI Protocol/2
CliProtocol.displayName=Jenkins CLI Protocol/1 (unencrypted)
CliProtocol2.displayName=Jenkins CLI Protocol/2 (transport encryption)
@@ -1,4 +1,4 @@
<?jelly escape-by-default='true'?>
<j:jelly xmlns:j="jelly:core">
${%Accepts connections from remote clients so that they can be used as additional build agents}
${%summary}
</j:jelly>
@@ -0,0 +1,2 @@
summary=Accepts connections from remote clients so that they can be used as additional build agents. \
This protocol is unencrypted.
@@ -1,3 +1,3 @@
# This file is under the MIT License by authors

Accepts\ connections\ from\ remote\ clients\ so\ that\ they\ can\ be\ used\ as\ additional\ build\ agents=\u041F\u0440\u0438\u0445\u0432\u0430\u0442\u0430 \u0432\u0435\u0437\u0435 \u043E\u0434 \u043A\u043B\u0438\u0458\u0435\u043D\u0442\u0438\u043C\u0430 \u0434\u0430 \u0431\u0438 \u043C\u043E\u0433\u043B\u0438 \u0441\u0435 \u0443\u043F\u043E\u0442\u0440\u0435\u0431\u0438\u0442\u0438 \u043A\u0430\u043E \u0434\u043E\u0434\u0430\u0442\u043D\u0435 \u0430\u0433\u0435\u043D\u0442\u0435 \u0437\u0430 \u0438\u0437\u0433\u0440\u0430\u0434\u045A\u0443.
summary=\u041f\u0440\u0438\u0445\u0432\u0430\u0442\u0430 \u0432\u0435\u0437\u0435 \u043e\u0434 \u043a\u043b\u0438\u0458\u0435\u043d\u0442\u0438\u043c\u0430 \u0434\u0430 \u0431\u0438 \u043c\u043e\u0433\u043b\u0438 \u0441\u0435 \u0443\u043f\u043e\u0442\u0440\u0435\u0431\u0438\u0442\u0438 \u043a\u0430\u043e \u0434\u043e\u0434\u0430\u0442\u043d\u0435 \u0430\u0433\u0435\u043d\u0442\u0435 \u0437\u0430 \u0438\u0437\u0433\u0440\u0430\u0434\u045a\u0443.
@@ -1,4 +1,4 @@
<?jelly escape-by-default='true'?>
<j:jelly xmlns:j="jelly:core">
${%Extends the version 1 protocol by adding a per-client cookie, so that we can detect a reconnection from the agent and take appropriate action}
${%summary}
</j:jelly>
@@ -0,0 +1,3 @@
summary=Extends the version 1 protocol by adding a per-client cookie, \
so that we can detect a reconnection from the agent and take appropriate action. \
This protocol is unencrypted.
@@ -1,3 +1,3 @@
# This file is under the MIT License by authors

Extends\ the\ version\ 1\ protocol\ by\ adding\ a\ per-client\ cookie,\ so\ that\ we\ can\ detect\ a\ reconnection\ from\ the\ agent\ and\ take\ appropriate\ action=\u041D\u0430\u0434\u0433\u0440\u0430\u0452\u0443\u0458\u0435 \u0432\u0435\u0440\u0437\u0438\u0458\u0443 1 \u043F\u0440\u043E\u0442\u043E\u043A\u043E\u043B\u0430 \u0434\u043E\u0434\u0430\u0432\u0430\u045B\u0438 cookie \u0441\u0432\u0430\u043A\u043E\u043C \u043A\u043B\u0438\u0458\u0435\u043D\u0442\u0443, \u0448\u0442\u043E \u043E\u043C\u043E\u0433\u0443\u0458\u0443\u045B\u0435 \u043F\u043E\u043D\u043E\u0432\u043E \u043F\u043E\u0432\u0435\u0437\u0438\u0432\u0430\u045A\u0435 \u0441\u0430 \u0430\u0433\u0435\u043D\u0442\u043E\u043C.
summary=\u041d\u0430\u0434\u0433\u0440\u0430\u0452\u0443\u0458\u0435 \u0432\u0435\u0440\u0437\u0438\u0458\u0443 1 \u043f\u0440\u043e\u0442\u043e\u043a\u043e\u043b\u0430 \u0434\u043e\u0434\u0430\u0432\u0430\u045b\u0438 cookie \u0441\u0432\u0430\u043a\u043e\u043c \u043a\u043b\u0438\u0458\u0435\u043d\u0442\u0443, \u0448\u0442\u043e \u043e\u043c\u043e\u0433\u0443\u0458\u0443\u045b\u0435 \u043f\u043e\u043d\u043e\u0432\u043e \u043f\u043e\u0432\u0435\u0437\u0438\u0432\u0430\u045a\u0435 \u0441\u0430 \u0430\u0433\u0435\u043d\u0442\u043e\u043c.
@@ -1,4 +1,4 @@
<?jelly escape-by-default='true'?>
<j:jelly xmlns:j="jelly:core">
${%Extends the version 2 protocol by adding basic encryption but requires a thread per client}
${%summary}
</j:jelly>
@@ -0,0 +1,4 @@
summary=Extends the version 2 protocol by adding basic encryption but requires a thread per client. \
This protocol falls back to Java Web Start Agent Protocol/2 (unencrypted) when it can't create a secure connection. \
This protocol is not recommended. \
Use Java Web Start Agent Protocol/4 instead.
@@ -1,3 +1,3 @@
# This file is under the MIT License by authors

Extends\ the\ version\ 2\ protocol\ by\ adding\ basic\ encryption\ but\ requires\ a\ thread\ per\ client=\u041D\u0430\u0434\u0433\u0440\u0430\u0452\u0443\u0458\u0435 \u0432\u0435\u0440\u0437\u0438\u0458\u0443 2 \u043F\u0440\u043E\u0442\u043E\u043A\u043E\u043B\u0430 \u0434\u043E\u0434\u0430\u0432\u0430\u0458\u0443\u045B\u0438 \u0448\u0438\u0444\u0440\u043E\u0432\u0430\u045A\u0435 (\u043F\u043E\u0442\u0440\u0435\u0431\u043D\u043E \u0458\u0435\u0434\u0430\u043D \u043D\u0438\u0437 \u0437\u0430 \u0441\u0432\u0430\u043A\u043E\u0433 \u043A\u043B\u0438\u0458\u0435\u043D\u0442\u0430)
#TODO: Summary is outdated, needs to be modified
summary=\u041d\u0430\u0434\u0433\u0440\u0430\u0452\u0443\u0458\u0435 \u0432\u0435\u0440\u0437\u0438\u0458\u0443 2 \u043f\u0440\u043e\u0442\u043e\u043a\u043e\u043b\u0430 \u0434\u043e\u0434\u0430\u0432\u0430\u0458\u0443\u045b\u0438 \u0448\u0438\u0444\u0440\u043e\u0432\u0430\u045a\u0435 (\u043f\u043e\u0442\u0440\u0435\u0431\u043d\u043e \u0458\u0435\u0434\u0430\u043d \u043d\u0438\u0437 \u0437\u0430 \u0441\u0432\u0430\u043a\u043e\u0433 \u043a\u043b\u0438\u0458\u0435\u043d\u0442\u0430)
@@ -1,4 +1,4 @@
<?jelly escape-by-default='true'?>
<j:jelly xmlns:j="jelly:core">
${%A TLS secured connection between the master and the agent performed by TLS upgrade of the socket.}
${%summary}
</j:jelly>
@@ -0,0 +1 @@
summary=A TLS secured connection between the master and the agent performed by TLS upgrade of the socket.
@@ -20,7 +20,7 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
# THE SOFTWARE.

JnlpSlaveAgentProtocol.displayName=Java Web Start Agent Protocol/1
JnlpSlaveAgentProtocol2.displayName=Java Web Start Agent Protocol/2
JnlpSlaveAgentProtocol3.displayName=Java Web Start Agent Protocol/3
JnlpSlaveAgentProtocol4.displayName=Java Web Start Agent Protocol/4
JnlpSlaveAgentProtocol.displayName=Java Web Start Agent Protocol/1 (unencrypted)
JnlpSlaveAgentProtocol2.displayName=Java Web Start Agent Protocol/2 (unencrypted)
JnlpSlaveAgentProtocol3.displayName=Java Web Start Agent Protocol/3 (basic encryption)
JnlpSlaveAgentProtocol4.displayName=Java Web Start Agent Protocol/4 (TLS encryption)

0 comments on commit 0c991de

Please sign in to comment.
You can’t perform that action at this time.