You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by co...@apache.org on 2020/03/10 11:28:23 UTC
[cxf] branch 3.3.x-fixes updated (181bfdb -> 4225011)
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a change to branch 3.3.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git.
from 181bfdb Recording .gitmergeinfo Changes
new c529cfa Updating Apache DS to 2.0.0.AM26
new 683cf28 Updating HTTP Client to 4.5.12
new d9ff27a Configure sendServerVersion for OSGi/Blueprint
new 0847626 CXF-8234 - Only disable output stream optimization in TransformOutInterceptor if it isn't configured already
new 663ee1b Recording .gitmergeinfo Changes
new 4225011 CXF-8234 - Checkstyle fix
The 6 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 | 4 ++++
.../apache/cxf/interceptor/transform/TransformOutInterceptor.java | 7 ++++---
parent/pom.xml | 4 ++--
.../http_jetty/blueprint/JettyHTTPServerEngineFactoryHolder.java | 4 +++-
.../cxf/transport/http_jetty/osgi/HTTPJettyTransportActivator.java | 2 ++
5 files changed, 15 insertions(+), 6 deletions(-)
[cxf] 06/06: CXF-8234 - Checkstyle fix
Posted by co...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch 3.3.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 4225011b9c7902ec42912fbdb5ad8a7d90dc335e
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Tue Mar 10 10:43:52 2020 +0000
CXF-8234 - Checkstyle fix
(cherry picked from commit b6ad0ff3398af050c727c3dd3e711b63fd02a783)
---
.../apache/cxf/interceptor/transform/TransformOutInterceptor.java | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/core/src/main/java/org/apache/cxf/interceptor/transform/TransformOutInterceptor.java b/core/src/main/java/org/apache/cxf/interceptor/transform/TransformOutInterceptor.java
index a6e1185..505c3d1 100644
--- a/core/src/main/java/org/apache/cxf/interceptor/transform/TransformOutInterceptor.java
+++ b/core/src/main/java/org/apache/cxf/interceptor/transform/TransformOutInterceptor.java
@@ -26,7 +26,6 @@ import java.util.Map;
import javax.xml.stream.XMLStreamWriter;
-import org.apache.cxf.interceptor.AbstractOutDatabindingInterceptor;
import org.apache.cxf.interceptor.StaxOutEndingInterceptor;
import org.apache.cxf.interceptor.StaxOutInterceptor;
import org.apache.cxf.message.Message;
@@ -35,6 +34,7 @@ import org.apache.cxf.phase.AbstractPhaseInterceptor;
import org.apache.cxf.phase.Phase;
import org.apache.cxf.staxutils.transform.TransformUtils;
+import static org.apache.cxf.interceptor.AbstractOutDatabindingInterceptor.DISABLE_OUTPUTSTREAM_OPTIMIZATION;
/**
* Creates an XMLStreamReader from the InputStream on the Message.
@@ -98,9 +98,8 @@ public class TransformOutInterceptor extends AbstractPhaseInterceptor<Message> {
XMLStreamWriter transformWriter = createTransformWriterIfNeeded(writer, out);
if (transformWriter != null) {
message.setContent(XMLStreamWriter.class, transformWriter);
- if (message.getContextualProperty(AbstractOutDatabindingInterceptor.DISABLE_OUTPUTSTREAM_OPTIMIZATION) == null) {
- message.put(AbstractOutDatabindingInterceptor.DISABLE_OUTPUTSTREAM_OPTIMIZATION,
- Boolean.TRUE);
+ if (message.getContextualProperty(DISABLE_OUTPUTSTREAM_OPTIMIZATION) == null) {
+ message.put(DISABLE_OUTPUTSTREAM_OPTIMIZATION, Boolean.TRUE);
}
if (MessageUtils.isRequestor(message)) {
message.removeContent(OutputStream.class);
[cxf] 03/06: Configure sendServerVersion for OSGi/Blueprint
Posted by co...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch 3.3.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit d9ff27ad39eadd500e9db76a134bf802518f7496
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Tue Mar 10 09:45:52 2020 +0000
Configure sendServerVersion for OSGi/Blueprint
(cherry picked from commit b9380e98129bcbdc5d3f6e8f4efac5949df70f25)
---
.../http_jetty/blueprint/JettyHTTPServerEngineFactoryHolder.java | 4 +++-
.../cxf/transport/http_jetty/osgi/HTTPJettyTransportActivator.java | 2 ++
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/blueprint/JettyHTTPServerEngineFactoryHolder.java b/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/blueprint/JettyHTTPServerEngineFactoryHolder.java
index e20982f..4bbd702 100644
--- a/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/blueprint/JettyHTTPServerEngineFactoryHolder.java
+++ b/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/blueprint/JettyHTTPServerEngineFactoryHolder.java
@@ -146,7 +146,9 @@ public class JettyHTTPServerEngineFactoryHolder {
if (engine.isContinuationsEnabled() != null) {
eng.setContinuationsEnabled(engine.isContinuationsEnabled());
}
-
+ if (engine.isSendServerVersion() != null) {
+ eng.setSendServerVersion(engine.isSendServerVersion());
+ }
if (engine.getHost() != null && !StringUtils.isEmpty(engine.getHost())) {
eng.setHost(engine.getHost());
}
diff --git a/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/osgi/HTTPJettyTransportActivator.java b/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/osgi/HTTPJettyTransportActivator.java
index 63620b6..7aa1ce1 100644
--- a/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/osgi/HTTPJettyTransportActivator.java
+++ b/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/osgi/HTTPJettyTransportActivator.java
@@ -137,6 +137,8 @@ public class HTTPJettyTransportActivator
e.setSessionSupport(Boolean.parseBoolean((String)properties.get(k)));
} else if ("continuationsEnabled".equals(k)) {
e.setContinuationsEnabled(Boolean.parseBoolean((String)properties.get(k)));
+ } else if ("sendServerVersion".equals(k)) {
+ e.setSendServerVersion(Boolean.parseBoolean((String)properties.get(k)));
} else if ("reuseAddress".equals(k)) {
e.setReuseAddress(Boolean.parseBoolean((String)properties.get(k)));
} else if ("maxIdleTime".equals(k)) {
[cxf] 05/06: Recording .gitmergeinfo Changes
Posted by co...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch 3.3.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 663ee1bfc065d9c00854ace7ea12fb2a8e3b1554
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Tue Mar 10 10:12:22 2020 +0000
Recording .gitmergeinfo Changes
---
.gitmergeinfo | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/.gitmergeinfo b/.gitmergeinfo
index cd21f53..162929b 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -18,6 +18,7 @@ B 12b0c595a03e0fed09fbc2d4ee37e0ee15fe4432
B 1448dd059193dac0a975520707ae98b1fe3a7e18
B 16c1d31b17b310d32d24676d3aca9c2b80c866ee
B 180fbbbd5571840b5f7a09ab7c0ce59605edd346
+B 1bd346333d234ca3601274550d5438c41f4c38f4
B 1c55f929bd90a5a50530b5eaf22216c93ce3f2f9
B 1e01eef91b69706c55874d8df5e14a555d11c91a
B 1e3eb7b3edf841d00a284d891b3cee76b64f4b89
@@ -109,10 +110,12 @@ B a50d2d81dd7d620061ac21b6df7943ad5c6c92cc
B a5aeebd9835ce93c2c61fdbdeb614682d4437057
B a69f0444081047e2bbae9e9b8f180d490d417f8a
B a842a33554e8d26b4a42dc1e1734fc9dc0a21067
+B a8ae6bc86b0285196b523f2fc8b2431dd11f2c67
B aa403a00d26475885f8d2f0da74aac87a531cbc6
B ab3df13b8d15aa36365eb2e10b5961d17330d9a2
B adb1b8b6280a738f3b2b4f6ea40ee902d94cc2dd
B ae963c2258b8501f104387891d8de424d0ecc398
+B b62c25d8dd293a0bdb06fbb8592c799f9124984a
B bb5ca3b0f6b2e74912f6f4ec94c36f8fc9a6595b
B bc1848e5686a87355563e50dd12abfa38c84adaa
B bc4ea132eafb8d6668b07667f7acfcd94f1f7d62
@@ -122,6 +125,7 @@ B c598ecf38e4d796ffb35288de39827a609d035be
B c7dff867998da49669f259f6d8f1703684ce685a
B c9a2275276c6f8099585519372c24fda1cd7c3e0
B cc4ea93826655c45eb5dd65290300ee42fe8d596
+B cdf7685cf7a7583ee076e97706d82d5271f582b1
B d076d4494d96d268a196d4d48602b36d7086680d
B d4d4b1e740a48103811e33094adb19d5c22ca108
B da4dfeed6867ed628dc05c9a2dbedbebdf33db21
[cxf] 01/06: Updating Apache DS to 2.0.0.AM26
Posted by co...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch 3.3.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit c529cfa239f3005779cff22f7859257b70af4faf
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Tue Mar 10 07:34:59 2020 +0000
Updating Apache DS to 2.0.0.AM26
(cherry picked from commit 2c661c9bd0348306b93286e91e129c54d413d1ab)
---
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index d601c7c..665d170 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -80,7 +80,7 @@
<cxf.abdera.version>1.1.3</cxf.abdera.version>
<cxf.activemq.version>5.15.11</cxf.activemq.version>
<cxf.ahc.version>2.0.40</cxf.ahc.version>
- <cxf.apacheds.version>2.0.0.AM25</cxf.apacheds.version>
+ <cxf.apacheds.version>2.0.0.AM26</cxf.apacheds.version>
<cxf.arquillian.version>1.1.14.Final</cxf.arquillian.version>
<cxf.arquillian.weld.container.version>2.0.1.Final</cxf.arquillian.weld.container.version>
<cxf.artemis.version>2.10.1</cxf.artemis.version>
[cxf] 04/06: CXF-8234 - Only disable output stream optimization in
TransformOutInterceptor if it isn't configured already
Posted by co...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch 3.3.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 0847626fd44c91b2cb7be5650dc49fb6aaba144b
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Tue Mar 10 10:08:26 2020 +0000
CXF-8234 - Only disable output stream optimization in TransformOutInterceptor if it isn't configured already
(cherry picked from commit 71ed1be91ce6fcadeb16d6fb86e513cf3a95ee52)
---
.../apache/cxf/interceptor/transform/TransformOutInterceptor.java | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/core/src/main/java/org/apache/cxf/interceptor/transform/TransformOutInterceptor.java b/core/src/main/java/org/apache/cxf/interceptor/transform/TransformOutInterceptor.java
index 54878f9..a6e1185 100644
--- a/core/src/main/java/org/apache/cxf/interceptor/transform/TransformOutInterceptor.java
+++ b/core/src/main/java/org/apache/cxf/interceptor/transform/TransformOutInterceptor.java
@@ -98,8 +98,10 @@ public class TransformOutInterceptor extends AbstractPhaseInterceptor<Message> {
XMLStreamWriter transformWriter = createTransformWriterIfNeeded(writer, out);
if (transformWriter != null) {
message.setContent(XMLStreamWriter.class, transformWriter);
- message.put(AbstractOutDatabindingInterceptor.DISABLE_OUTPUTSTREAM_OPTIMIZATION,
- Boolean.TRUE);
+ if (message.getContextualProperty(AbstractOutDatabindingInterceptor.DISABLE_OUTPUTSTREAM_OPTIMIZATION) == null) {
+ message.put(AbstractOutDatabindingInterceptor.DISABLE_OUTPUTSTREAM_OPTIMIZATION,
+ Boolean.TRUE);
+ }
if (MessageUtils.isRequestor(message)) {
message.removeContent(OutputStream.class);
message.put(OUTPUT_STREAM_HOLDER, out);
[cxf] 02/06: Updating HTTP Client to 4.5.12
Posted by co...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch 3.3.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 683cf282482bb740bb4995589a911e24db7c27c7
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Tue Mar 10 07:35:20 2020 +0000
Updating HTTP Client to 4.5.12
(cherry picked from commit f87a83ba7b34988ce37f1455eafc1ed7dac3d126)
---
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index 665d170..d5c3535 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -125,7 +125,7 @@
<cxf.hsqldb.version>2.4.1</cxf.hsqldb.version>
<cxf.httpcomponents.asyncclient.version.range>[4.0,4.2)</cxf.httpcomponents.asyncclient.version.range>
<cxf.httpcomponents.asyncclient.version>4.1.4</cxf.httpcomponents.asyncclient.version>
- <cxf.httpcomponents.client.version>4.5.11</cxf.httpcomponents.client.version>
+ <cxf.httpcomponents.client.version>4.5.12</cxf.httpcomponents.client.version>
<cxf.httpcomponents.core.version.range>[4.3,4.5.0)</cxf.httpcomponents.core.version.range>
<cxf.httpcomponents.core.version>4.4.13</cxf.httpcomponents.core.version>
<cxf.jackson.version>2.10.3</cxf.jackson.version>