[cxf-fediz] 01/02: Update Jetty
This is an automated email from the ASF dual-hosted git repository. buhhunyx pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/cxf-fediz.git commit a81f266b809a71014139daba9133045cd86ce7f4 Author: Alexey Markevich AuthorDate: Wed Jan 15 10:17:36 2020 +0300 Update Jetty --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 2fadc7b..8e39dd7 100644 --- a/pom.xml +++ b/pom.xml @@ -56,7 +56,7 @@ 3.0.0 2.0.1.Final 2.3.2 -9.4.24.v20191120 +9.4.25.v20191220 4.12 1.1.1 1.2.17
[cxf-fediz] 02/02: Update CXF
This is an automated email from the ASF dual-hosted git repository. buhhunyx pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/cxf-fediz.git commit 60802b4d04eb9dc4c2239ab1b6dd8a91c504023f Author: Alexey Markevich AuthorDate: Wed Jan 15 10:17:58 2020 +0300 Update CXF --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 8e39dd7..568a9df 100644 --- a/pom.xml +++ b/pom.xml @@ -43,7 +43,7 @@ 1.2 1.8 1.6 -3.3.4 +3.3.5 3.4.3 4.0.2 2.10.6
[cxf-fediz] branch master updated (a8b3f88 -> 60802b4)
This is an automated email from the ASF dual-hosted git repository. buhhunyx pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/cxf-fediz.git. from a8b3f88 fediz-core: cleanup ClassLoaderUtils new a81f266 Update Jetty new 60802b4 Update CXF 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: pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
[cxf] branch master updated: CXF-7996: Jakarta EE TCKs and compatibility. Fixing GF_HOME
This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/master by this push:
new 464e41a CXF-7996: Jakarta EE TCKs and compatibility. Fixing GF_HOME
464e41a is described below
commit 464e41a12dea11a00c86a370b31d7a7f009cb8e9
Author: reta
AuthorDate: Tue Jan 14 19:04:44 2020 -0500
CXF-7996: Jakarta EE TCKs and compatibility. Fixing GF_HOME
---
tck/ts.jte.template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tck/ts.jte.template b/tck/ts.jte.template
index 4c97424..f82f03b 100644
--- a/tck/ts.jte.template
+++ b/tck/ts.jte.template
@@ -396,7 +396,7 @@ s1as.admin.port=${glassfish.admin.port}
# with instructions on how to package and deploy
# Default to jersey
##
-web.home=/home/reta/Workspaces/glassfish5/glassfish
+web.home=${GF_HOME}
jaxrs_impl.classes=${web.home}/lib/cxf-rt-rs-client-${version}.jar:${web.home}/lib/cxf-core-${version}.jar:${web.home}/lib/cxf-rt-transports-http-${version}.jar:${web.home}/lib/cxf-rt-frontend-jaxrs-${version}.jar:${web.home}/lib/cxf-rt-rs-sse-${version}.jar
jaxrs.classes=${web.home}/modules/jakarta.ws.rs-api.jar:${web.home}/modules/endorsed/jakarta.annotation-api.jar:${web.home}/modules/bean-validator.jar:${web.home}/modules/jakarta.json.jar:${web.home}/modules/jakarta.interceptor-api.jar:${web.home}/modules/jakarta.ejb-api.jar:${web.home}/modules/jakarta.inject.jar:${web.home}/modules/cdi-api.jar:${web.home}/modules/jakarta.json.bind-api.jar
[cxf] branch 3.2.x-fixes updated: Recording .gitmergeinfo Changes
This is an automated email from the ASF dual-hosted git repository. coheigea pushed a commit to branch 3.2.x-fixes in repository https://gitbox.apache.org/repos/asf/cxf.git The following commit(s) were added to refs/heads/3.2.x-fixes by this push: new 96b8e4a Recording .gitmergeinfo Changes 96b8e4a is described below commit 96b8e4a70d53658a03041bbc99c14671949f7662 Author: Colm O hEigeartaigh AuthorDate: Tue Jan 14 23:02:06 2020 + Recording .gitmergeinfo Changes --- .gitmergeinfo | 6 ++ 1 file changed, 6 insertions(+) diff --git a/.gitmergeinfo b/.gitmergeinfo index 36bbc3e..9a9f384 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -26,6 +26,7 @@ B 07251d65ed30455dd982fdbe694aab419d2fbfcb B 07696f88f3d5bae43c4a248c26fdf24a916fd5f5 B 07faf9e4b03a2e15d9aa7885dacc63d1797df38f B 080f440281e1d3546886af44ee2a907c2e6bf2c4 +B 083813a6f70fa00223caf68e6900c8d3187d238f B 0861dd6eefeb15cd3f642ff6144159d047445c97 B 0883d9177d54fccfd76de51c9f8715f48a336d2e B 08b9ebc7d43692994a4f0b188caad27d @@ -176,6 +177,7 @@ B 37e9a9b3ed51cb9042fd288ab5f9b847e96bff1d B 37f1867f092f493478b303aa6ad87cc27768d4a4 B 384a11f419c06c52ec07d9f7114bb2134c18ba3c B 38582fbab7ca33b1383715f1f5094b9b46a0303f +B 38909f32ec72404c3cfa41f0f58e509b490f756a B 38f61bb674d4e0ac5257d62624d3d126a140fa63 B 38f8280925eead756fdcd299ca7476d17cbde0c2 B 38fe864233b66c14616aa10ad7025a74b1dba691 @@ -208,6 +210,7 @@ B 40ec1e6da2ccf52e37dcb3ec77e2fae11cc33cf4 B 40e9b1871534f51ee2dd8efb7125c309ab81 B 4104641a4b731c72d66b1dace3d9ed4290226694 B 416c74f964580edad80936bb9c31ec7b6f03d4a0 +B 41c834aea9bc6a537f7b336e626d07036e40b5c6 B 4206b97eed0cf8e2593336053d9f2d08d8a04367 B 42338421b7495b9497caee8322f98f6c523b59a5 B 424591420b052a2b557d3f1dd48609c9858d9809 @@ -342,6 +345,7 @@ B 6a4b3777d6432c7d44fdd8ce91b495e51ba1b218 B 6a5ecb6d063037c7f8786b67294d32e5b28895bc B 6acd80b9cd4aff1a866d84ad8a86afb33bfefde3 B 6ae17b03967f7b397c7217d52f3d7cf9e28cd999 +B 6b3d7681bd43a56e09b2931ac106f90e854b1b83 B 6bd1b921ef1742c69e487a313a4980fabcede5c3 B 6ce0a3e43483b28b8d299fb1af58ff9d6f0a7241 B 6ce1a1b4114f138b0f5ce7a377af46c816be6c69 @@ -583,6 +587,7 @@ B c09877e9773d5a4b5737930a348ce9f13e48df42 B c0e7ca85c00f4ab6ce4ef87ecc6dd777d744e71b B c186d6ad03df4cf75fe46f25ada48870f430ddea B c19b382995dce13ded39d9cd5ea70a24a48db380 +B c2c912024f22d498e343bbd52e57a65f3fd4a1b8 B c2d9000c1872973d4ad6e30075d320da167d3c2d B c2ebc2870ebd11a021277c450876bb79d0e78b6f B c489d553a5398c457b05b79f4fc24304cf39a113 @@ -627,6 +632,7 @@ B cd1288715bbb9de60a7061efbd54e0f9245d9a88 B cd55616673c20a6cde063904686b318ce175c71f B cd6351b8b7eb9918f0221306bd6fac23ab1fcc88 B cd65d1b0e7d74d61752b020640425184fb90afc2 +B cdc0942717bda3ebd965464199ef175d6271e05f B cde58adaabf5f10847f18a9d37361153b0ac7cac B ce6419a07249005c4503bda59289054e6fc42576 B ce8a7729a6db509d2bcb57d73a0a634c675b1230
[cxf] branch 3.3.x-fixes updated (e0a3a23 -> 6b3d768)
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 e0a3a23 [CXF-8191]align dom4j bundle version to 2.1.1 new 41c834a getBytes uses the platform charset by default. (#624) new cdc0942 Removing exclusions which is no longer required new 6b3d768 Recording .gitmergeinfo Changes The 3 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 ++ parent/pom.xml| 6 -- .../java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java | 11 +-- 3 files changed, 7 insertions(+), 12 deletions(-)
[cxf] 03/03: Recording .gitmergeinfo Changes
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 6b3d7681bd43a56e09b2931ac106f90e854b1b83 Author: Colm O hEigeartaigh AuthorDate: Tue Jan 14 19:39:03 2020 + Recording .gitmergeinfo Changes --- .gitmergeinfo | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitmergeinfo b/.gitmergeinfo index 9b23675..b595b2d 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -12,6 +12,7 @@ B 11de1e0dfff9a8f9b157e23983c8e25f8503f868 B 1279837f4879cb5446ae402cec432010455151fa B 129a02d671c9aa0bcbb3be1ffd732d7937583667 B 1448dd059193dac0a975520707ae98b1fe3a7e18 +B 16c1d31b17b310d32d24676d3aca9c2b80c866ee B 180fbbbd5571840b5f7a09ab7c0ce59605edd346 B 1c55f929bd90a5a50530b5eaf22216c93ce3f2f9 B 1e01eef91b69706c55874d8df5e14a555d11c91a @@ -43,6 +44,7 @@ B 4ba8ca20314da9a581f1e9a17cec5f14a210f55f B 4c39a21a06edc779a91d5dc86cf85257d7a7d5d4 B 4d46618c17cb5c1386d493c75faf0f89dbece267 B 505b76285bae4b9d9827eb8191ce0a08d6623d42 +B 5c81c3e82990ae0906a6e2b48746726f894618a1 B 5fd6e467773b092a0327fef64fd4c9e4cce5f6e1 B 62e828c7e74d0dd5d4e337a090344a13501d8aeb B 64584f32c8a4632344a1e062e0fc969dfd88e41e
[cxf] 01/03: getBytes uses the platform charset by default. (#624)
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 41c834aea9bc6a537f7b336e626d07036e40b5c6
Author: Adrian Leonhard
AuthorDate: Tue Jan 14 13:35:05 2020 +0100
getBytes uses the platform charset by default. (#624)
* getBytes uses the platform charset by default.
As far as I can see, the only place where the schemas are loaded into the
cache is loadSchemasIntoCache, where they are extracted from an XML Document.
As such, they won't have an associated encoding. The XMLSource defaults to
UTF-8, so this blows up if you have special characters and, for example,
windows-1252 as the platform charset.
* Alphabet hard
* Update WadlGenerator.java
https://www.joelonsoftware.com/2003/10/08/the-absolute-minimum-every-software-developer-absolutely-positively-must-know-about-unicode-and-character-sets-no-excuses/
* Remove BOS import
(cherry picked from commit 543521ab051cb4f199faeab5765d001920a2)
---
.../java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java | 11 +--
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git
a/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java
b/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java
index 3573a14..1827e81 100644
---
a/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java
+++
b/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java
@@ -19,7 +19,6 @@
package org.apache.cxf.jaxrs.model.wadl;
import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.StringReader;
@@ -32,6 +31,7 @@ import java.lang.reflect.Type;
import java.lang.reflect.TypeVariable;
import java.net.URI;
import java.net.URL;
+import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
@@ -1978,7 +1978,7 @@ public class WadlGenerator implements
ContainerRequestFilter {
this.theSchemas = new LinkedList<>();
// we'll need to do the proper schema caching eventually
for (String s : schemas) {
-XMLSource source = new XMLSource(new
ByteArrayInputStream(s.getBytes()));
+XMLSource source = new XMLSource(new
ByteArrayInputStream(s.getBytes(StandardCharsets.UTF_8)));
source.setBuffering();
Map locs = getLocationsMap(source, "import",
links, ui);
locs.putAll(getLocationsMap(source, "include", links, ui));
@@ -2026,17 +2026,16 @@ public class WadlGenerator implements
ContainerRequestFilter {
}
private String transformSchema(String schema, Map
locs) {
-ByteArrayOutputStream bos = new ByteArrayOutputStream();
-SchemaConverter sc = new
SchemaConverter(StaxUtils.createXMLStreamWriter(bos), locs);
+StringWriter sw = new StringWriter();
+SchemaConverter sc = new
SchemaConverter(StaxUtils.createXMLStreamWriter(sw), locs);
try {
StaxUtils.copy(new StreamSource(new StringReader(schema)), sc);
sc.flush();
sc.close();
-return bos.toString();
+return sw.toString();
} catch (Exception ex) {
return schema;
}
-
}
@Override
[cxf] 02/03: Removing exclusions which is no longer required
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 cdc0942717bda3ebd965464199ef175d6271e05f
Author: Colm O hEigeartaigh
AuthorDate: Tue Jan 14 17:30:28 2020 +
Removing exclusions which is no longer required
(cherry picked from commit 48caf0646efb0bcecc2a740c5819a7c1a6ee3110)
---
parent/pom.xml | 6 --
1 file changed, 6 deletions(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index 63ee9da..29c1840 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -1260,12 +1260,6 @@
org.apache.cxf.xjc-utils
cxf-xjc-runtime
${cxf.xjc-utils.version}
-
-
-javax.xml.bind
-jaxb-api
-
-
[cxf] 01/02: Finished javadoc cleanup
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 16c1d31b17b310d32d24676d3aca9c2b80c866ee
Author: Colm O hEigeartaigh
AuthorDate: Mon Jan 13 18:06:58 2020 +
Finished javadoc cleanup
---
.../src/main/java/org/apache/cxf/javascript/AttributeInfo.java | 2 +-
.../org/apache/cxf/transport/http_jetty/JettyHTTPDestination.java | 2 +-
.../java/org/apache/cxf/transport/http/auth/HttpAuthHeader.java | 1 -
.../java/org/apache/cxf/transport/http/auth/HttpAuthSupplier.java | 2 +-
.../main/java/org/apache/cxf/transport/jms/JMSConfigFactory.java| 5 -
.../java/org/apache/cxf/transport/jms/JMSMessageHeadersType.java| 4
.../java/org/apache/cxf/transport/websocket/WebSocketUtils.java | 1 -
.../rm/src/main/java/org/apache/cxf/ws/rm/InternalContextUtils.java | 2 +-
rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMContextUtils.java | 1 -
rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMEndpoint.java | 1 -
.../main/java/org/apache/cxf/ws/rm/policy/RMPolicyUtilities.java| 4 ++--
.../main/java/org/apache/cxf/ws/rm/soap/RedeliveryQueueImpl.java| 2 +-
.../main/java/org/apache/cxf/ws/security/trust/TrustException.java | 3 ++-
.../org/apache/cxf/ws/security/wss4j/AbstractTokenInterceptor.java | 3 ---
.../java/org/apache/cxf/ws/security/wss4j/CryptoCoverageUtil.java | 2 +-
.../org/apache/cxf/ws/security/wss4j/WSS4JStaxOutInterceptor.java | 2 +-
.../policyvalidators/AbstractSupportingTokenPolicyValidator.java| 2 +-
.../src/main/java/org/apache/cxf/sts/request/RequestParser.java | 2 +-
.../main/java/org/apache/cxf/ws/discovery/WSDiscoveryClient.java| 1 -
.../apache/cxf/xkms/x509/validator/TrustedAuthorityValidator.java | 4 ++--
.../java/org/apache/cxf/tools/common/AbstractCXFToolContainer.java | 2 +-
.../tools/java2wsdl/processor/internal/ServiceBuilderFactory.java | 6 +++---
22 files changed, 19 insertions(+), 35 deletions(-)
diff --git
a/rt/javascript/javascript-rt/src/main/java/org/apache/cxf/javascript/AttributeInfo.java
b/rt/javascript/javascript-rt/src/main/java/org/apache/cxf/javascript/AttributeInfo.java
index a7c2a00..a927958 100644
---
a/rt/javascript/javascript-rt/src/main/java/org/apache/cxf/javascript/AttributeInfo.java
+++
b/rt/javascript/javascript-rt/src/main/java/org/apache/cxf/javascript/AttributeInfo.java
@@ -80,7 +80,7 @@ public final class AttributeInfo implements ItemInfo {
/**
* Fill in an AttributeInfo for an attribute or anyAttribute from a
sequence.
*
- * @param sequesequenceObjectnceElement
+ * @param sequenceObject
* @param currentSchema
* @param schemaCollection
* @param prefixAccumulator
diff --git
a/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPDestination.java
b/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPDestination.java
index 9ca5b93..6592b80 100644
---
a/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPDestination.java
+++
b/rt/transports/http-jetty/src/main/java/org/apache/cxf/transport/http_jetty/JettyHTTPDestination.java
@@ -79,7 +79,7 @@ public class JettyHTTPDestination extends ServletDestination {
/**
* Constructor
*
- * @param b the associated Bus
+ * @param bus the associated Bus
* @param registry the associated destinationRegistry
* @param ei the endpoint info of the destination
* @param serverEngineFactory the serverEngineFactory which could be used
to create ServerEngine
diff --git
a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/auth/HttpAuthHeader.java
b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/auth/HttpAuthHeader.java
index db7b02e..3b53c2e 100644
---
a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/auth/HttpAuthHeader.java
+++
b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/auth/HttpAuthHeader.java
@@ -140,7 +140,6 @@ public final class HttpAuthHeader {
* Extracts the authorization realm from the
* "WWW-Authenticate" Http response header.
*
- * @param authenticate content of the WWW-Authenticate header
* @return The realm, or null if it is non-existent.
*/
public String getRealm() {
diff --git
a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/auth/HttpAuthSupplier.java
b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/auth/HttpAuthSupplier.java
index ebe1ada..7e33e47 100644
---
a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/auth/HttpAuthSupplier.java
+++
b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/auth/HttpAuthSupplier.java
@@ -57,7 +57,7 @@ public interface HttpAuthSupplier {
*/
String getAuthorization(
AuthorizationPolicy authPolicy,
-
[cxf] 02/02: Removing exclusions which is no longer required
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 48caf0646efb0bcecc2a740c5819a7c1a6ee3110
Author: Colm O hEigeartaigh
AuthorDate: Tue Jan 14 17:30:28 2020 +
Removing exclusions which is no longer required
---
parent/pom.xml | 6 --
1 file changed, 6 deletions(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index e8269db..f5727a8 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -1267,12 +1267,6 @@
org.apache.cxf.xjc-utils
cxf-xjc-runtime
${cxf.xjc-utils.version}
-
-
-javax.xml.bind
-jaxb-api
-
-
[cxf] branch master updated (543521a -> 48caf06)
This is an automated email from the ASF dual-hosted git repository. coheigea pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/cxf.git. from 543521a getBytes uses the platform charset by default. (#624) new 16c1d31 Finished javadoc cleanup new 48caf06 Removing exclusions which is no longer required 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: parent/pom.xml | 6 -- .../src/main/java/org/apache/cxf/javascript/AttributeInfo.java | 2 +- .../org/apache/cxf/transport/http_jetty/JettyHTTPDestination.java | 2 +- .../java/org/apache/cxf/transport/http/auth/HttpAuthHeader.java | 1 - .../java/org/apache/cxf/transport/http/auth/HttpAuthSupplier.java | 2 +- .../main/java/org/apache/cxf/transport/jms/JMSConfigFactory.java| 5 - .../java/org/apache/cxf/transport/jms/JMSMessageHeadersType.java| 4 .../java/org/apache/cxf/transport/websocket/WebSocketUtils.java | 1 - .../rm/src/main/java/org/apache/cxf/ws/rm/InternalContextUtils.java | 2 +- rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMContextUtils.java | 1 - rt/ws/rm/src/main/java/org/apache/cxf/ws/rm/RMEndpoint.java | 1 - .../main/java/org/apache/cxf/ws/rm/policy/RMPolicyUtilities.java| 4 ++-- .../main/java/org/apache/cxf/ws/rm/soap/RedeliveryQueueImpl.java| 2 +- .../main/java/org/apache/cxf/ws/security/trust/TrustException.java | 3 ++- .../org/apache/cxf/ws/security/wss4j/AbstractTokenInterceptor.java | 3 --- .../java/org/apache/cxf/ws/security/wss4j/CryptoCoverageUtil.java | 2 +- .../org/apache/cxf/ws/security/wss4j/WSS4JStaxOutInterceptor.java | 2 +- .../policyvalidators/AbstractSupportingTokenPolicyValidator.java| 2 +- .../src/main/java/org/apache/cxf/sts/request/RequestParser.java | 2 +- .../main/java/org/apache/cxf/ws/discovery/WSDiscoveryClient.java| 1 - .../apache/cxf/xkms/x509/validator/TrustedAuthorityValidator.java | 4 ++-- .../java/org/apache/cxf/tools/common/AbstractCXFToolContainer.java | 2 +- .../tools/java2wsdl/processor/internal/ServiceBuilderFactory.java | 6 +++--- 23 files changed, 19 insertions(+), 41 deletions(-)
svn commit: r37620 - in /release/cxf: 3.2.12/ 3.3.5/
Author: dkulp Date: Tue Jan 14 17:11:51 2020 New Revision: 37620 Log: Add latest releases Added: release/cxf/3.2.12/ release/cxf/3.2.12/apache-cxf-3.2.12-src.tar.gz (with props) release/cxf/3.2.12/apache-cxf-3.2.12-src.tar.gz.asc release/cxf/3.2.12/apache-cxf-3.2.12-src.tar.gz.sha256 release/cxf/3.2.12/apache-cxf-3.2.12-src.zip (with props) release/cxf/3.2.12/apache-cxf-3.2.12-src.zip.asc release/cxf/3.2.12/apache-cxf-3.2.12-src.zip.sha256 release/cxf/3.2.12/apache-cxf-3.2.12.tar.gz (with props) release/cxf/3.2.12/apache-cxf-3.2.12.tar.gz.asc release/cxf/3.2.12/apache-cxf-3.2.12.tar.gz.sha256 release/cxf/3.2.12/apache-cxf-3.2.12.zip (with props) release/cxf/3.2.12/apache-cxf-3.2.12.zip.asc release/cxf/3.2.12/apache-cxf-3.2.12.zip.sha256 release/cxf/3.3.5/ release/cxf/3.3.5/apache-cxf-3.3.5-src.tar.gz (with props) release/cxf/3.3.5/apache-cxf-3.3.5-src.tar.gz.asc release/cxf/3.3.5/apache-cxf-3.3.5-src.tar.gz.sha256 release/cxf/3.3.5/apache-cxf-3.3.5-src.zip (with props) release/cxf/3.3.5/apache-cxf-3.3.5-src.zip.asc release/cxf/3.3.5/apache-cxf-3.3.5-src.zip.sha256 release/cxf/3.3.5/apache-cxf-3.3.5.tar.gz (with props) release/cxf/3.3.5/apache-cxf-3.3.5.tar.gz.asc release/cxf/3.3.5/apache-cxf-3.3.5.tar.gz.sha256 release/cxf/3.3.5/apache-cxf-3.3.5.zip (with props) release/cxf/3.3.5/apache-cxf-3.3.5.zip.asc release/cxf/3.3.5/apache-cxf-3.3.5.zip.sha256 Added: release/cxf/3.2.12/apache-cxf-3.2.12-src.tar.gz == Binary file - no diff available. Propchange: release/cxf/3.2.12/apache-cxf-3.2.12-src.tar.gz -- svn:mime-type = application/octet-stream Added: release/cxf/3.2.12/apache-cxf-3.2.12-src.tar.gz.asc == --- release/cxf/3.2.12/apache-cxf-3.2.12-src.tar.gz.asc (added) +++ release/cxf/3.2.12/apache-cxf-3.2.12-src.tar.gz.asc Tue Jan 14 17:11:51 2020 @@ -0,0 +1,17 @@ +-BEGIN PGP SIGNATURE- +Comment: GPGTools - http://gpgtools.org + +iQIzBAABCgAdFiEEUbUtxd1FL5K+NCzChY/ExPQ4VqMFAl4Yw58ACgkQhY/ExPQ4 +VqPPcA//dzUPddjoONpLAzaSW/eryIOBAYWQsIEPVxLfJUfqjy9m1mNqsU4QQeoN +HmMSBHBZ5dRtQ9XvcR27QqaHE04rihE5s2/Aa8TZpdBkJ9DUDNZnstjKSn9KUSq6 +g0EeZZpoJXqWwst8ACywGRvWZSloaPgom7rUW3ZKXQ2kBzskALuxo3okB2RR0W78 +hO4ARaHWEFerY/teB1TSKc353lgRPCxWuYcwl0Y6zi/fJTPRnatUP88H9OkKUi4o +sFtFseMiBDxDEgRwKjbxhr8VMGUe1Vv4n4v2bAF7ElYNTU9/VyfLAJxCGr0KRP7M +9EZj9Jottj2HsRlje664/83ncWpj/yHLWt5Bwp4KlKE2SuEFmXBCNNQdqjYr7XI+ +iYnpoEcQA8Zv6oTUPzBXtUpcrO+0Tfs7xd13rFLO7u7ttx5krgWrzzP88l4bWWr4 +aoi7QbkfLnavdKYxdB7nWP+aov4H/Loo5fTidOwHwI6ZXsMgW8f5Kxsc7CMevRFy +6+HOYjOJtkii78BBCYH0WDXQrADGqNvJceLygxBqX5Qh/sbB3308fILRkLFKz7Oo +HwVjJEUqNkbhG5Nhne/oazKjr6jzXyPkIUXuA1wlnV6P2z+dGc1279uaqPoWjNwN +TMaxOwIN9T+48r3dQkZEK/yuYk0TI1sHTTlhXvDlImoMhgWiwLg= +=uLh9 +-END PGP SIGNATURE- Added: release/cxf/3.2.12/apache-cxf-3.2.12-src.tar.gz.sha256 == --- release/cxf/3.2.12/apache-cxf-3.2.12-src.tar.gz.sha256 (added) +++ release/cxf/3.2.12/apache-cxf-3.2.12-src.tar.gz.sha256 Tue Jan 14 17:11:51 2020 @@ -0,0 +1 @@ +0baea9d0763465817a38f66e97961d51f483de27b0f36db1cd913ddf297acccb apache-cxf-3.2.12-src.tar.gz Added: release/cxf/3.2.12/apache-cxf-3.2.12-src.zip == Binary file - no diff available. Propchange: release/cxf/3.2.12/apache-cxf-3.2.12-src.zip -- svn:mime-type = application/octet-stream Added: release/cxf/3.2.12/apache-cxf-3.2.12-src.zip.asc == --- release/cxf/3.2.12/apache-cxf-3.2.12-src.zip.asc (added) +++ release/cxf/3.2.12/apache-cxf-3.2.12-src.zip.asc Tue Jan 14 17:11:51 2020 @@ -0,0 +1,17 @@ +-BEGIN PGP SIGNATURE- +Comment: GPGTools - http://gpgtools.org + +iQIzBAABCgAdFiEEUbUtxd1FL5K+NCzChY/ExPQ4VqMFAl4Yw6AACgkQhY/ExPQ4 +VqMqKw//XbwEjc4RRFILY3Zh3PmLgIYwJ6m2u3jBCsz54hzyv+pRB18oeUTvXjQ+ +RuJGye5WXoK/zLwf1Plp1rkBaj9+Hkp7uaicM8WTAeXVI93YtivGj2NLQu5nlewl +5byBIQzkMz/JNxpTgRnxmzG6fFH2lL0Y5L6Udiy2wZfkcr6U+2C/Ar0hG7BjR4xi +FQD8PGl9eghjofkO+/Qg+7J3ym+oxdDsoi3chjvFSE9TGwFn+lHnE/ntu5X2XwOX +abXnDU+M9zBl7j3K4gxCfUk+D9EaJFFIuMpGLNEex4LoTKIfmOiFD7TYSCAr+WgR +9MKe5qWMaEvPbwLeBXbeVZ00JpMvX47ACPQKhekB4OXsnDaocgdllg7SFe4sDZud +0RgHNshYctiwDKtT85EadPAe2GlOUvgjbuMDc1OnI87zuJ0/O2TE3igUgPTKaxGj +Y5OowQZR2AeKipxdwPK7i6B8w3CintS5NQGjfmIzYvjMNYLZq5hdTCrtqSl+t6ED +vdaCTnEevnR7wGHSPHyByT+JSGYwhS4seS1FpLyjs5hgCQuB7B5bVaBkU5jyWHLB +B+nkJKdjA0QXtypIqlrVzcryl846flagySZBYQ5K29ZfDLiiQz0hUdGGsW5LtS+f +YiTEPnrTkOjOmGTGzoXApVMw8boa0F4YgG3zlXYc1OIjGhTNkj8= +=d7fp +-END PGP SIGNATURE- Added:
Nexus: Promotion Completed
Message from: https://repository.apache.orgDeployer properties:"userAgent" = "Apache-Maven/3.6.2 (Java 1.8.0_202; Mac OS X 10.15.2)""userId" = "dkulp""ip" = "24.63.198.214"Details:The following artifacts have been promoted to the "Releases" [id=releases] repository/org/apache/cxf/cxf-xjc-plugin/3.3.1/cxf-xjc-plugin-3.3.1-javadoc.jar.asc(SHA1: 15fb8ebff49fa6f1e33af663ea03db5b30543d17)/org/apache/cxf/cxf-xjc-plugin/3.3.1/cxf-xjc-plugin-3.3.1.pom(SHA1: 2110e4c2275fdfce53c1d2dcfd4c8bc8825d3837)/org/apache/cxf/cxf-xjc-plugin/3.3.1/cxf-xjc-plugin-3.3.1-javadoc.jar(SHA1: f207bc1ededd2253039f501af8a3f019f038d10b)/org/apache/cxf/cxf-xjc-plugin/3.3.1/cxf-xjc-plugin-3.3.1.jar.asc(SHA1: 5e0e589921df77a7d0e2ed1c0d3c363f78b37d86)/org/apache/cxf/cxf-xjc-plugin/3.3.1/cxf-xjc-plugin-3.3.1-sources.jar.asc(SHA1: 79f41be97fe56a7db92b1e1cb974a57c202409cf)/org/apache/cxf/cxf-xjc-plugin/3.3.1/cxf-xjc-plugin-3.3.1.jar(SHA1: bd30ac0fe363005d1795a1efc3aaad1dc6a4cbef)/org/apache/cxf/cxf-xjc-plugin/3.3.1/cxf-xjc-plugin-3.3.1-sources.jar(SHA1: f1cf9ffe0aaa76f60316f97a117d1c5a9a537b8d)/org/apache/cxf/cxf-xjc-plugin/3.3.1/cxf-xjc-plugin-3.3.1.pom.asc(SHA1: d0dcbf616a498666afd964356bc673d44cf82ef0)/org/apache/cxf/xjcplugins/cxf-xjc-bug986/3.3.1/cxf-xjc-bug986-3.3.1-javadoc.jar(SHA1: 8c137c141170e76ae1ffccb2ccf8ad096de13cf1)/org/apache/cxf/xjcplugins/cxf-xjc-bug986/3.3.1/cxf-xjc-bug986-3.3.1-sources.jar(SHA1: f2723b4b1903ef9cbfe8c1442a6a3b6c5e394450)/org/apache/cxf/xjcplugins/cxf-xjc-bug986/3.3.1/cxf-xjc-bug986-3.3.1.pom(SHA1: 62e8471232dd8b6f9b736b62c01f0530e9dc18a8)/org/apache/cxf/xjcplugins/cxf-xjc-bug986/3.3.1/cxf-xjc-bug986-3.3.1-sources.jar.asc(SHA1: 14c1cb72e63da8120d419597df35afe1ef78ac39)/org/apache/cxf/xjcplugins/cxf-xjc-bug986/3.3.1/cxf-xjc-bug986-3.3.1.jar.asc(SHA1: fd3ebdacadb994aa14e4df8e46d9d167e3706323)/org/apache/cxf/xjcplugins/cxf-xjc-bug986/3.3.1/cxf-xjc-bug986-3.3.1.jar(SHA1: 3fc58ac33424862df12b7a20cccd6c6e9ddbb024)/org/apache/cxf/xjcplugins/cxf-xjc-bug986/3.3.1/cxf-xjc-bug986-3.3.1-javadoc.jar.asc(SHA1: 6b176cd94b69d019aa549fb876759bd1b517fb0d)/org/apache/cxf/xjcplugins/cxf-xjc-bug986/3.3.1/cxf-xjc-bug986-3.3.1.pom.asc(SHA1: 531e5fadde92c280024ebc93024182930906359d)/org/apache/cxf/xjcplugins/cxf-xjc-pl/3.3.1/cxf-xjc-pl-3.3.1-sources.jar.asc(SHA1: 2ae56f9489bc9a5a37c8155a1dd3ece4e51f1a20)/org/apache/cxf/xjcplugins/cxf-xjc-pl/3.3.1/cxf-xjc-pl-3.3.1-javadoc.jar(SHA1: 452af0ae012939f36a3c3f65d2d2fdaee0bde956)/org/apache/cxf/xjcplugins/cxf-xjc-pl/3.3.1/cxf-xjc-pl-3.3.1.jar.asc(SHA1: fabfb49a09ae6507e3f5945a3dcf7e347ff176ec)/org/apache/cxf/xjcplugins/cxf-xjc-pl/3.3.1/cxf-xjc-pl-3.3.1.jar(SHA1: da57be26d8246ed373273e67878b79a74561b003)/org/apache/cxf/xjcplugins/cxf-xjc-pl/3.3.1/cxf-xjc-pl-3.3.1.pom(SHA1: f596a0d3b8dfc1749470fe2d7574db627b37ed75)/org/apache/cxf/xjcplugins/cxf-xjc-pl/3.3.1/cxf-xjc-pl-3.3.1-javadoc.jar.asc(SHA1: c3b22d01748f6bec18b872fdd3458a612276c362)/org/apache/cxf/xjcplugins/cxf-xjc-pl/3.3.1/cxf-xjc-pl-3.3.1-sources.jar(SHA1: 80883ed94b31a3438c224e58223eb1f60f81f31c)/org/apache/cxf/xjcplugins/cxf-xjc-pl/3.3.1/cxf-xjc-pl-3.3.1.pom.asc(SHA1: 0d8bc43b3059a6e0c4bea42af159666dea9c6d9c)/org/apache/cxf/xjcplugins/cxf-xjc-bug671/3.3.1/cxf-xjc-bug671-3.3.1.pom(SHA1: 96536ff9318b94c6702155c65e3b27b4443e7d40)/org/apache/cxf/xjcplugins/cxf-xjc-bug671/3.3.1/cxf-xjc-bug671-3.3.1-javadoc.jar.asc(SHA1: fb858e0f8ced9e0e27be99e79f4863f3602ac407)/org/apache/cxf/xjcplugins/cxf-xjc-bug671/3.3.1/cxf-xjc-bug671-3.3.1-javadoc.jar(SHA1: 30b1ffa0b51354920615fb2340e95121d98eb1b6)/org/apache/cxf/xjcplugins/cxf-xjc-bug671/3.3.1/cxf-xjc-bug671-3.3.1-sources.jar(SHA1: 4284b7f5df9417992c285be441a47c7d29b75c04)/org/apache/cxf/xjcplugins/cxf-xjc-bug671/3.3.1/cxf-xjc-bug671-3.3.1.pom.asc(SHA1: 25c1d762c821ba89ab13394bf5881a90fa9f32f8)/org/apache/cxf/xjcplugins/cxf-xjc-bug671/3.3.1/cxf-xjc-bug671-3.3.1.jar.asc(SHA1: ad677a5165e6c40d80931d32655afdc41e41dc0d)/org/apache/cxf/xjcplugins/cxf-xjc-bug671/3.3.1/cxf-xjc-bug671-3.3.1-sources.jar.asc(SHA1: c12403e2143ce171f0be57c7362f181e47f6a3d2)/org/apache/cxf/xjcplugins/cxf-xjc-bug671/3.3.1/cxf-xjc-bug671-3.3.1.jar(SHA1: cae74b73d9fa81d6611f7d6ab79e3cadf5a04b64)/org/apache/cxf/xjcplugins/cxf-xjc-boolean/3.3.1/cxf-xjc-boolean-3.3.1-javadoc.jar.asc(SHA1: c504b3f666b9b5cc17c8e146a2282e7b5e3b48ac)/org/apache/cxf/xjcplugins/cxf-xjc-boolean/3.3.1/cxf-xjc-boolean-3.3.1-sources.jar.asc(SHA1: 142ad737bb3486da11c4ca36bc3815bb9c58cb43)/org/apache/cxf/xjcplugins/cxf-xjc-boolean/3.3.1/cxf-xjc-boolean-3.3.1-javadoc.jar(SHA1: b1ae42d451e73e0ba1224cbb7fa6222ad3586efd)/org/apache/cxf/xjcplugins/cxf-xjc-boolean/3.3.1/cxf-xjc-boolean-3.3.1-sources.jar(SHA1: 01e0ae071df32fc8618cbf2cca7b74fb199e1c18)/org/apache/cxf/xjcplugins/cxf-xjc-boolean/3.3.1/cxf-xjc-boolean-3.3.1.pom.asc(SHA1: 79fda522ee0d558fce216541221e48e4e5625609)/org/apache/cxf/xjcplugins/cxf-xjc-boolean/3.3.1/cxf-xjc-boolean-3.3.1.jar.asc(SHA1:
[cxf] branch master updated: getBytes uses the platform charset by default. (#624)
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/master by this push:
new 543521a getBytes uses the platform charset by default. (#624)
543521a is described below
commit 543521ab051cb4f199faeab5765d001920a2
Author: Adrian Leonhard
AuthorDate: Tue Jan 14 13:35:05 2020 +0100
getBytes uses the platform charset by default. (#624)
* getBytes uses the platform charset by default.
As far as I can see, the only place where the schemas are loaded into the
cache is loadSchemasIntoCache, where they are extracted from an XML Document.
As such, they won't have an associated encoding. The XMLSource defaults to
UTF-8, so this blows up if you have special characters and, for example,
windows-1252 as the platform charset.
* Alphabet hard
* Update WadlGenerator.java
https://www.joelonsoftware.com/2003/10/08/the-absolute-minimum-every-software-developer-absolutely-positively-must-know-about-unicode-and-character-sets-no-excuses/
* Remove BOS import
---
.../java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java | 11 +--
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git
a/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java
b/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java
index 3573a14..1827e81 100644
---
a/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java
+++
b/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java
@@ -19,7 +19,6 @@
package org.apache.cxf.jaxrs.model.wadl;
import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.StringReader;
@@ -32,6 +31,7 @@ import java.lang.reflect.Type;
import java.lang.reflect.TypeVariable;
import java.net.URI;
import java.net.URL;
+import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
@@ -1978,7 +1978,7 @@ public class WadlGenerator implements
ContainerRequestFilter {
this.theSchemas = new LinkedList<>();
// we'll need to do the proper schema caching eventually
for (String s : schemas) {
-XMLSource source = new XMLSource(new
ByteArrayInputStream(s.getBytes()));
+XMLSource source = new XMLSource(new
ByteArrayInputStream(s.getBytes(StandardCharsets.UTF_8)));
source.setBuffering();
Map locs = getLocationsMap(source, "import",
links, ui);
locs.putAll(getLocationsMap(source, "include", links, ui));
@@ -2026,17 +2026,16 @@ public class WadlGenerator implements
ContainerRequestFilter {
}
private String transformSchema(String schema, Map
locs) {
-ByteArrayOutputStream bos = new ByteArrayOutputStream();
-SchemaConverter sc = new
SchemaConverter(StaxUtils.createXMLStreamWriter(bos), locs);
+StringWriter sw = new StringWriter();
+SchemaConverter sc = new
SchemaConverter(StaxUtils.createXMLStreamWriter(sw), locs);
try {
StaxUtils.copy(new StreamSource(new StringReader(schema)), sc);
sc.flush();
sc.close();
-return bos.toString();
+return sw.toString();
} catch (Exception ex) {
return schema;
}
-
}
@Override
