[cxf] branch 3.6.x-fixes updated: CXF-8894: Unimplemented getRequestCharacterEncoding() (#1441)
This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch 3.6.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/3.6.x-fixes by this push:
new e35f359699 CXF-8894: Unimplemented getRequestCharacterEncoding()
(#1441)
e35f359699 is described below
commit e35f359699a87e41bc9287d761a82a042d342dc3
Author: Andriy Redko
AuthorDate: Thu Oct 5 09:33:18 2023 -0400
CXF-8894: Unimplemented getRequestCharacterEncoding() (#1441)
(cherry picked from commit 1a02ba3850ca6930e318c65b64e028385514e34a)
---
.../transport/http_jetty/JettyContextHandler.java | 62 ++
.../cxf/transport/http_jetty/JettyHTTPHandler.java | 3 +-
.../http_jetty/JettyHTTPServerEngine.java | 3 ++
3 files changed, 67 insertions(+), 1 deletion(-)
diff --git
a/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyContextHandler.java
b/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyContextHandler.java
new file mode 100644
index 00..94e96bce85
--- /dev/null
+++
b/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyContextHandler.java
@@ -0,0 +1,62 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.cxf.transport.http_jetty;
+
+import org.eclipse.jetty.server.handler.ContextHandler;
+
+/**
+ * The Jetty-specific ContextHandler
+ */
+class JettyContextHandler extends ContextHandler {
+JettyContextHandler() {
+super(null, null, null);
+_scontext = new JettyContext();
+}
+
+class JettyContext extends Context {
+@Override
+public String getRequestCharacterEncoding() {
+return getDefaultRequestCharacterEncoding();
+}
+
+@Override
+public void setRequestCharacterEncoding(String encoding) {
+if (!isStarting()) {
+throw new IllegalStateException();
+}
+
+setDefaultRequestCharacterEncoding(encoding);
+}
+
+@Override
+public String getResponseCharacterEncoding() {
+return getDefaultResponseCharacterEncoding();
+}
+
+@Override
+public void setResponseCharacterEncoding(String encoding) {
+if (!isStarting()) {
+throw new IllegalStateException();
+}
+
+setDefaultResponseCharacterEncoding(encoding);
+}
+}
+}
diff --git
a/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPHandler.java
b/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPHandler.java
index b35b7f9d86..1fa6bd3f72 100644
---
a/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPHandler.java
+++
b/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPHandler.java
@@ -44,6 +44,7 @@ public class JettyHTTPHandler extends AbstractHandler {
contextMatchExact = cmExact;
jettyHTTPDestination = jhd;
}
+
public JettyHTTPHandler(Bus bus) {
this.bus = bus;
}
@@ -85,7 +86,7 @@ public class JettyHTTPHandler extends AbstractHandler {
}
public ContextHandler createContextHandler() {
-return new ContextHandler();
+return new JettyContextHandler();
}
public Bus getBus() {
diff --git
a/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java
b/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java
index 201706ceb9..fec87cb311 100644
---
a/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java
+++
b/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java
@@ -491,6 +491,9 @@ public class JettyHTTPServerEngine implements ServerEngine,
HttpServerEngineSupp
}
String contextName = HttpUriMapper.getContextName(url.getPath());
+if (contextName.isEmpty()) {
+contextName = "/";
+}
ContextHandler
[cxf] branch main updated: CXF-8894: Unimplemented getRequestCharacterEncoding() (#1441)
This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/main by this push:
new 1a02ba3850 CXF-8894: Unimplemented getRequestCharacterEncoding()
(#1441)
1a02ba3850 is described below
commit 1a02ba3850ca6930e318c65b64e028385514e34a
Author: Andriy Redko
AuthorDate: Thu Oct 5 09:33:18 2023 -0400
CXF-8894: Unimplemented getRequestCharacterEncoding() (#1441)
---
.../transport/http_jetty/JettyContextHandler.java | 62 ++
.../cxf/transport/http_jetty/JettyHTTPHandler.java | 3 +-
.../http_jetty/JettyHTTPServerEngine.java | 3 ++
3 files changed, 67 insertions(+), 1 deletion(-)
diff --git
a/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyContextHandler.java
b/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyContextHandler.java
new file mode 100644
index 00..94e96bce85
--- /dev/null
+++
b/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyContextHandler.java
@@ -0,0 +1,62 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.cxf.transport.http_jetty;
+
+import org.eclipse.jetty.server.handler.ContextHandler;
+
+/**
+ * The Jetty-specific ContextHandler
+ */
+class JettyContextHandler extends ContextHandler {
+JettyContextHandler() {
+super(null, null, null);
+_scontext = new JettyContext();
+}
+
+class JettyContext extends Context {
+@Override
+public String getRequestCharacterEncoding() {
+return getDefaultRequestCharacterEncoding();
+}
+
+@Override
+public void setRequestCharacterEncoding(String encoding) {
+if (!isStarting()) {
+throw new IllegalStateException();
+}
+
+setDefaultRequestCharacterEncoding(encoding);
+}
+
+@Override
+public String getResponseCharacterEncoding() {
+return getDefaultResponseCharacterEncoding();
+}
+
+@Override
+public void setResponseCharacterEncoding(String encoding) {
+if (!isStarting()) {
+throw new IllegalStateException();
+}
+
+setDefaultResponseCharacterEncoding(encoding);
+}
+}
+}
diff --git
a/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPHandler.java
b/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPHandler.java
index e4f54d08e0..2be0114cc1 100644
---
a/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPHandler.java
+++
b/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPHandler.java
@@ -43,6 +43,7 @@ public class JettyHTTPHandler extends AbstractHandler {
contextMatchExact = cmExact;
jettyHTTPDestination = jhd;
}
+
public JettyHTTPHandler(Bus bus) {
this.bus = bus;
}
@@ -84,7 +85,7 @@ public class JettyHTTPHandler extends AbstractHandler {
}
public ContextHandler createContextHandler() {
-return new ContextHandler();
+return new JettyContextHandler();
}
public Bus getBus() {
diff --git
a/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java
b/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java
index 8cd8764b31..57dd88dcfa 100644
---
a/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java
+++
b/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPServerEngine.java
@@ -494,6 +494,9 @@ public class JettyHTTPServerEngine implements ServerEngine,
HttpServerEngineSupp
}
String contextName = HttpUriMapper.getContextName(url.getPath());
+if (contextName.isEmpty()) {
+contextName = "/";
+}
ContextHandler context = handler.createContextHandler();
context.setContextPath(contextName);
[cxf] 01/02: Use SPDX identifier instead for License (#1462)
This is an automated email from the ASF dual-hosted git repository. coheigea pushed a commit to branch 3.4.x-fixes in repository https://gitbox.apache.org/repos/asf/cxf.git commit 0c74f31729a978ec15af5e143f8172c1d23ea23d Author: Colm O hEigeartaigh AuthorDate: Thu Oct 5 08:01:44 2023 +0100 Use SPDX identifier instead for License (#1462) (cherry picked from commit 5573655dbab549cfdce8ba0e957e9d753bbd0dac) (cherry picked from commit bf7c3b5151718ac911c2e215a891cc56b706dbc8) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 4cf4cee352..38b977ed23 100644 --- a/pom.xml +++ b/pom.xml @@ -153,7 +153,7 @@ -Apache License, Version 2.0 +Apache-2.0 https://www.apache.org/licenses/LICENSE-2.0.txt repo
[cxf] branch 3.4.x-fixes updated (ac3a3628bd -> d98c6fa642)
This is an automated email from the ASF dual-hosted git repository. coheigea pushed a change to branch 3.4.x-fixes in repository https://gitbox.apache.org/repos/asf/cxf.git from ac3a3628bd CXF-8907: java.lang.NullPointerException at AsymmetricBindingHandler.java (#1361) new 0c74f31729 Use SPDX identifier instead for License (#1462) new d98c6fa642 Recording .gitmergeinfo Changes The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .gitmergeinfo | 2 ++ pom.xml | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-)
[cxf] 02/02: Recording .gitmergeinfo Changes
This is an automated email from the ASF dual-hosted git repository. coheigea pushed a commit to branch 3.4.x-fixes in repository https://gitbox.apache.org/repos/asf/cxf.git commit d98c6fa6427097c69fa3ea9c7decb9214a4522fb Author: Colm O hEigeartaigh AuthorDate: Thu Oct 5 08:04:07 2023 +0100 Recording .gitmergeinfo Changes --- .gitmergeinfo | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitmergeinfo b/.gitmergeinfo index 44e8fd0d25..0f52e0eaf6 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -153,6 +153,7 @@ B 83c84808d86dcab32efffe6e7227ddcc94c571f4 B 842272447a054cf89a2ed7da0d100fc05a0508ae B 86c22f928f138c7f7cb2fc5fd7188b5e4dbe23d8 B 86d0edd7e423cbd41b8200f5cd401dba8c318f79 +B 876323beef77b81fad0094947aa646ce1cb17421 B 8897a9b5e815ff165b8ebd89997c50f60d709158 B 897ab25a2dcdb010bf09169bf1c633537c640f72 B 8a7aa1bad47f0a1d4b86e172cabc240f2bc9f008 @@ -175,6 +176,7 @@ B 9af2b5a79664da5e8b21cf30a53309489be8326a B 9b9868a2797ab56afdfdd2ab22f82d9044560a5b B 9ba0178cc44b2b5babafccf056bfc96aa9eea0eb B 9c5658b9b39403cc95d38a61de900af0591222d5 +B 9cb8e70e90d452dd539aa50ae500a26acc5d5367 B 9ed98f36a381b8f881c2d63a5846572ba83a4ed9 B a05c7db2a8c09f38e98ad08c921da55f0d5f511f B a06d00066c88077a1cf25766b841bd8f6cabb027
[cxf] branch 3.5.x-fixes updated: Use SPDX identifier instead for License (#1462)
This is an automated email from the ASF dual-hosted git repository. coheigea pushed a commit to branch 3.5.x-fixes in repository https://gitbox.apache.org/repos/asf/cxf.git The following commit(s) were added to refs/heads/3.5.x-fixes by this push: new bf7c3b5151 Use SPDX identifier instead for License (#1462) bf7c3b5151 is described below commit bf7c3b5151718ac911c2e215a891cc56b706dbc8 Author: Colm O hEigeartaigh AuthorDate: Thu Oct 5 08:01:44 2023 +0100 Use SPDX identifier instead for License (#1462) (cherry picked from commit 5573655dbab549cfdce8ba0e957e9d753bbd0dac) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6b28b355f4..d1e3b81178 100644 --- a/pom.xml +++ b/pom.xml @@ -153,7 +153,7 @@ -Apache License, Version 2.0 +Apache-2.0 https://www.apache.org/licenses/LICENSE-2.0.txt repo
[cxf] branch 3.6.x-fixes updated: Use SPDX identifier instead for License (#1462)
This is an automated email from the ASF dual-hosted git repository. coheigea pushed a commit to branch 3.6.x-fixes in repository https://gitbox.apache.org/repos/asf/cxf.git The following commit(s) were added to refs/heads/3.6.x-fixes by this push: new 5573655dba Use SPDX identifier instead for License (#1462) 5573655dba is described below commit 5573655dbab549cfdce8ba0e957e9d753bbd0dac Author: Colm O hEigeartaigh AuthorDate: Thu Oct 5 08:01:44 2023 +0100 Use SPDX identifier instead for License (#1462) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 5304c677ee..73e185a2a1 100644 --- a/pom.xml +++ b/pom.xml @@ -153,7 +153,7 @@ -Apache License, Version 2.0 +Apache-2.0 https://www.apache.org/licenses/LICENSE-2.0.txt repo
[cxf] branch coheigea/licenses deleted (was 6040b0815a)
This is an automated email from the ASF dual-hosted git repository. coheigea pushed a change to branch coheigea/licenses in repository https://gitbox.apache.org/repos/asf/cxf.git was 6040b0815a Use SPDX identifier instead for License The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[cxf] branch main updated: Use SPDX identifier instead for License (#1462)
This is an automated email from the ASF dual-hosted git repository. coheigea pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/cxf.git The following commit(s) were added to refs/heads/main by this push: new 1d8b2bed2c Use SPDX identifier instead for License (#1462) 1d8b2bed2c is described below commit 1d8b2bed2c5311e61cbfc0dec222f0b665f8ce7e Author: Colm O hEigeartaigh AuthorDate: Thu Oct 5 08:01:44 2023 +0100 Use SPDX identifier instead for License (#1462) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b7e92c8835..87e8aa787b 100644 --- a/pom.xml +++ b/pom.xml @@ -153,7 +153,7 @@ -Apache License, Version 2.0 +Apache-2.0 https://www.apache.org/licenses/LICENSE-2.0.txt repo
