Skip to content

Commit cd269c6

Browse files
committed
converted groovy to jelly in proxy config and added german localization
1 parent 6ec55c3 commit cd269c6

File tree

5 files changed

+53
-35
lines changed

5 files changed

+53
-35
lines changed

core/src/main/java/hudson/ProxyConfiguration.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -567,7 +567,7 @@ public FormValidation doCheckSecretPassword(@QueryParameter String value) {
567567
@RequirePOST
568568
@Restricted(NoExternalUse.class)
569569
public FormValidation doValidateProxy(
570-
@QueryParameter("testUrl") String testUrl, @QueryParameter("name") String name, @QueryParameter("port") int port,
570+
@QueryParameter("testUrl") String testUrl, @QueryParameter("server") String server, @QueryParameter("port") int port,
571571
@QueryParameter("userName") String userName, @QueryParameter("secretPassword") Secret password,
572572
@QueryParameter("noProxyHost") String noProxyHost) throws InterruptedException {
573573

@@ -588,8 +588,8 @@ public FormValidation doValidateProxy(
588588
builder.connectTimeout(DEFAULT_CONNECT_TIMEOUT_MILLIS > 0
589589
? Duration.ofMillis(DEFAULT_CONNECT_TIMEOUT_MILLIS)
590590
: Duration.ofSeconds(30));
591-
if (Util.fixEmptyAndTrim(name) != null && !isNoProxyHost(uri.getHost(), noProxyHost)) {
592-
builder.proxy(ProxySelector.of(new InetSocketAddress(name, port)));
591+
if (Util.fixEmptyAndTrim(server) != null && !isNoProxyHost(uri.getHost(), noProxyHost)) {
592+
builder.proxy(ProxySelector.of(new InetSocketAddress(server, port)));
593593
Authenticator authenticator = newValidationAuthenticator(userName, password != null ? password.getPlainText() : null);
594594
builder.authenticator(authenticator);
595595
}

core/src/main/resources/hudson/Messages_de.properties

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ PluginWrapper.PluginWrapperAdministrativeMonitor.DisplayName=Plugin-Ladefehler
6767

6868
ProxyConfiguration.FailedToConnectViaProxy=Konnte nicht mit {0} verbinden.
6969
ProxyConfiguration.FailedToConnect=Konnte nicht mit {0} verbinden (code {1}).
70+
ProxyConfiguration.NonTLSWarning=Jenkins unterstützt nur die Verwendung einer HTTP-Verbindung zum Proxy. Die Zugangsdaten könnten für andere im selben Netzwerk sichtbar sein.
7071
ProxyConfiguration.MalformedTestUrl=Format der Test-URL ungültig
7172
ProxyConfiguration.Success=Erfolg (code {0})
7273
ProxyConfiguration.TestUrlRequired=Test-URL muss angegeben werden.

core/src/main/resources/hudson/ProxyConfiguration/config.groovy

Lines changed: 0 additions & 32 deletions
This file was deleted.
Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
<!--
2+
The MIT License
3+
Copyright (c) 2025, Stefan Spieker
4+
Permission is hereby granted, free of charge, to any person obtaining a copy
5+
of this software and associated documentation files (the "Software"), to deal
6+
in the Software without restriction, including without limitation the rights
7+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
8+
copies of the Software, and to permit persons to whom the Software is
9+
furnished to do so, subject to the following conditions:
10+
The above copyright notice and this permission notice shall be included in
11+
all copies or substantial portions of the Software.
12+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
13+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
14+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
15+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
16+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
17+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
18+
THE SOFTWARE.
19+
-->
20+
21+
<?jelly escape-by-default='true'?>
22+
<j:jelly xmlns:j="jelly:core" xmlns:f="/lib/form" xmlns:l="/lib/layout">
23+
<j:set var="readOnlyMode" value="${!app.hasPermission(app.ADMINISTER)}"/>
24+
<f:entry title="${%Server}">
25+
<f:textbox field="server"/>
26+
</f:entry>
27+
<f:entry title="${%Port}">
28+
<f:number field="port" min="0" max="65535" step="1"/>
29+
</f:entry>
30+
<f:entry title="${%User name}">
31+
<f:textbox field="userName"/>
32+
</f:entry>
33+
<f:entry title="${%Password}">
34+
<f:password field="secretPassword"/>
35+
</f:entry>
36+
<f:entry title="${%No Proxy Host}">
37+
<f:textarea field="noProxyHost"/>
38+
</f:entry>
39+
40+
<l:isAdmin>
41+
<f:advanced>
42+
<f:entry title="${%Test URL}">
43+
<f:textbox field="testUrl"/>
44+
</f:entry>
45+
<f:validateButton title="${%Validate Proxy}" method="validateProxy" with="testUrl,server,port,userName,secretPassword,noProxyHost"/>
46+
</f:advanced>
47+
</l:isAdmin>
48+
</j:jelly>

core/src/main/resources/hudson/ProxyConfiguration/config_de.properties

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,5 +24,6 @@ Server=Server
2424
Port=Port
2525
User\ name=Benutzername
2626
Password=Passwort
27+
Test\ URL=Test-URL
2728
No\ Proxy\ Host=Proxy-Ausnahmen
2829
Validate\ Proxy=Proxy-Konfiguration prüfen

0 commit comments

Comments
 (0)