You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by il...@apache.org on 2020/03/16 15:44:12 UTC
[ignite] branch master updated: IGNITE-12503 Fix httpCfg assignment
in Jetty REST configurations - Fixes #7525.
This is an automated email from the ASF dual-hosted git repository.
ilyak pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new 577be1d IGNITE-12503 Fix httpCfg assignment in Jetty REST configurations - Fixes #7525.
577be1d is described below
commit 577be1de4efe86cbc1871ca400b3b9de2b805d2d
Author: Ilya Kasnacheev <il...@gmail.com>
AuthorDate: Mon Mar 16 18:43:22 2020 +0300
IGNITE-12503 Fix httpCfg assignment in Jetty REST configurations - Fixes #7525.
Signed-off-by: Ilya Kasnacheev <il...@gmail.com>
---
modules/clients/src/test/resources/jetty/rest-jetty.xml | 2 +-
modules/clients/src/test/resources/jetty/router-jetty.xml | 2 +-
.../web-console/web-agent/src/test/resources/jetty-with-ciphers-0.xml | 2 +-
.../web-console/web-agent/src/test/resources/jetty-with-ciphers-1.xml | 2 +-
.../web-console/web-agent/src/test/resources/jetty-with-ciphers-2.xml | 2 +-
modules/web-console/web-agent/src/test/resources/jetty-with-ssl.xml | 2 +-
6 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/modules/clients/src/test/resources/jetty/rest-jetty.xml b/modules/clients/src/test/resources/jetty/rest-jetty.xml
index bbb68a4..677aace 100644
--- a/modules/clients/src/test/resources/jetty/rest-jetty.xml
+++ b/modules/clients/src/test/resources/jetty/rest-jetty.xml
@@ -43,7 +43,7 @@
<Array type="org.eclipse.jetty.server.ConnectionFactory">
<Item>
<New class="org.eclipse.jetty.server.HttpConnectionFactory">
- <Ref refid="httpCfg"/>
+ <Arg><Ref refid="httpCfg"/></Arg>
</New>
</Item>
</Array>
diff --git a/modules/clients/src/test/resources/jetty/router-jetty.xml b/modules/clients/src/test/resources/jetty/router-jetty.xml
index cd98c5b..a91a508 100644
--- a/modules/clients/src/test/resources/jetty/router-jetty.xml
+++ b/modules/clients/src/test/resources/jetty/router-jetty.xml
@@ -43,7 +43,7 @@
<Array type="org.eclipse.jetty.server.ConnectionFactory">
<Item>
<New class="org.eclipse.jetty.server.HttpConnectionFactory">
- <Ref refid="httpCfg"/>
+ <Arg><Ref refid="httpCfg"/></Arg>
</New>
</Item>
</Array>
diff --git a/modules/web-console/web-agent/src/test/resources/jetty-with-ciphers-0.xml b/modules/web-console/web-agent/src/test/resources/jetty-with-ciphers-0.xml
index 40f08b5..5e705ac 100644
--- a/modules/web-console/web-agent/src/test/resources/jetty-with-ciphers-0.xml
+++ b/modules/web-console/web-agent/src/test/resources/jetty-with-ciphers-0.xml
@@ -65,7 +65,7 @@
</Item>
<Item>
<New class="org.eclipse.jetty.server.HttpConnectionFactory">
- <Ref refid="httpsCfg"/>
+ <Arg><Ref refid="httpsCfg"/></Arg>
</New>
</Item>
</Array>
diff --git a/modules/web-console/web-agent/src/test/resources/jetty-with-ciphers-1.xml b/modules/web-console/web-agent/src/test/resources/jetty-with-ciphers-1.xml
index cb3a293..cbcd37e 100644
--- a/modules/web-console/web-agent/src/test/resources/jetty-with-ciphers-1.xml
+++ b/modules/web-console/web-agent/src/test/resources/jetty-with-ciphers-1.xml
@@ -65,7 +65,7 @@
</Item>
<Item>
<New class="org.eclipse.jetty.server.HttpConnectionFactory">
- <Ref refid="httpsCfg"/>
+ <Arg><Ref refid="httpsCfg"/></Arg>
</New>
</Item>
</Array>
diff --git a/modules/web-console/web-agent/src/test/resources/jetty-with-ciphers-2.xml b/modules/web-console/web-agent/src/test/resources/jetty-with-ciphers-2.xml
index 2251de2..2ca189e 100644
--- a/modules/web-console/web-agent/src/test/resources/jetty-with-ciphers-2.xml
+++ b/modules/web-console/web-agent/src/test/resources/jetty-with-ciphers-2.xml
@@ -65,7 +65,7 @@
</Item>
<Item>
<New class="org.eclipse.jetty.server.HttpConnectionFactory">
- <Ref refid="httpsCfg"/>
+ <Arg><Ref refid="httpsCfg"/></Arg>
</New>
</Item>
</Array>
diff --git a/modules/web-console/web-agent/src/test/resources/jetty-with-ssl.xml b/modules/web-console/web-agent/src/test/resources/jetty-with-ssl.xml
index 7e06829..0b6ff1c 100644
--- a/modules/web-console/web-agent/src/test/resources/jetty-with-ssl.xml
+++ b/modules/web-console/web-agent/src/test/resources/jetty-with-ssl.xml
@@ -60,7 +60,7 @@
</Item>
<Item>
<New class="org.eclipse.jetty.server.HttpConnectionFactory">
- <Ref refid="httpsCfg"/>
+ <Arg><Ref refid="httpsCfg"/></Arg>
</New>
</Item>
</Array>