[cxf] branch master updated: CXF-8193: add missing test resource
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.git
The following commit(s) were added to refs/heads/master by this push:
new 2425fad CXF-8193: add missing test resource
2425fad is described below
commit 2425fad2eb3a31b643e4f6d23115f3dc146027a7
Author: Alexey Markevich
AuthorDate: Thu Jan 16 10:51:13 2020 +0300
CXF-8193: add missing test resource
---
.../systest/jaxrs/JAXRSRequestDispatcherTest.java | 50 +++---
.../resources/jaxrs_dispatch/book_include.html | 28
2 files changed, 53 insertions(+), 25 deletions(-)
diff --git
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSRequestDispatcherTest.java
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSRequestDispatcherTest.java
index ce005aa..7002a30 100644
---
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSRequestDispatcherTest.java
+++
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSRequestDispatcherTest.java
@@ -22,6 +22,7 @@ package org.apache.cxf.systest.jaxrs;
import java.util.HashMap;
import java.util.Map;
+import javax.ws.rs.core.HttpHeaders;
import javax.ws.rs.core.MediaType;
import org.apache.cxf.jaxrs.client.WebClient;
@@ -59,18 +60,18 @@ public class JAXRSRequestDispatcherTest extends
AbstractBusClientServerTestBase
}
private void doTestGetBookHTML(String endpointAddress) throws Exception {
-WebClient client = WebClient.create(endpointAddress);
-client.accept("text/html");
-
WebClient.getConfig(client).getHttpConduit().getClient().setReceiveTimeout(1);
-XMLSource source = client.accept("text/html").get(XMLSource.class);
+WebClient client = WebClient.create(endpointAddress)
+.accept(MediaType.TEXT_HTML);
+
+XMLSource source = client.get(XMLSource.class);
Map namespaces = new HashMap<>();
namespaces.put("xhtml", "http://www.w3.org/1999/xhtml";);
namespaces.put("books", "http://www.w3.org/books";);
String value =
source.getValue("xhtml:html/xhtml:body/xhtml:ul/books:bookTag", namespaces);
assertEquals("CXF Rocks", value);
-Object contentType =
client.getResponse().getMetadata().getFirst("Content-Type");
+Object contentType =
client.getResponse().getHeaders().getFirst(HttpHeaders.CONTENT_TYPE);
assertNotNull("Content-Type should be present", contentType);
-assertEquals("text/html", contentType.toString());
+assertEquals(MediaType.TEXT_HTML, contentType.toString());
assertEquals(MediaType.TEXT_HTML_TYPE,
client.getResponse().getMediaType());
}
@@ -79,10 +80,10 @@ public class JAXRSRequestDispatcherTest extends
AbstractBusClientServerTestBase
public void testGetBookJSPRequestScope() throws Exception {
String endpointAddress =
"http://localhost:"; + PORT + "/the/bookstore2/books/html/123";
-WebClient client = WebClient.create(endpointAddress);
-client.accept("text/html");
-
WebClient.getConfig(client).getHttpConduit().getClient().setReceiveTimeout(1);
-String data = client.accept("text/html").get(String.class);
+WebClient client = WebClient.create(endpointAddress)
+.accept(MediaType.TEXT_HTML);
+
+String data = client.get(String.class);
assertTrue(data.contains("Request Book 123"));
assertTrue(data.contains("CXF in
Action"));
@@ -93,10 +94,10 @@ public class JAXRSRequestDispatcherTest extends
AbstractBusClientServerTestBase
public void testGetBookJSPSessionScope() throws Exception {
String endpointAddress =
"http://localhost:"; + PORT + "/the/bookstore3/books/html/456";
-WebClient client = WebClient.create(endpointAddress);
-client.accept("text/html");
-
WebClient.getConfig(client).getHttpConduit().getClient().setReceiveTimeout(1);
-String data = client.accept("text/html").get(String.class);
+WebClient client = WebClient.create(endpointAddress)
+.accept(MediaType.TEXT_HTML);
+
+String data = client.get(String.class);
assertTrue(data.contains("Session Book 456"));
assertTrue(data.contains("CXF in
Action"));
}
@@ -105,10 +106,10 @@ public class JAXRSRequestDispatcherTest extends
AbstractBusClientServerTestBase
public void testGetBookHTMLFromDefaultServlet() throws Exception {
String endpointAddress =
"http://localhost:"; + PORT + "/the/bookstore4/books/html/123";
-WebClient client = WebClient.create(endpointAddress);
-client.accept("text/html");
-
WebClient.getConfig(client).getHttpConduit().getClient().setReceiveTimeout(1);
-XMLSource source = client.accept("text/html").get(XMLSource.class);
+WebClient client = WebClient.c
[cxf] branch master updated: CXF-7996: Jakarta EE TCKs and compatibility. Finalizing the Jenkins pipeline
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 180578d CXF-7996: Jakarta EE TCKs and compatibility. Finalizing the
Jenkins pipeline
180578d is described below
commit 180578d01f361d77ce7f42dd760fa8d5f245ce7e
Author: reta
AuthorDate: Wed Jan 15 18:34:02 2020 -0500
CXF-7996: Jakarta EE TCKs and compatibility. Finalizing the Jenkins pipeline
---
tck/Jenkinsfile | 96 +++--
1 file changed, 94 insertions(+), 2 deletions(-)
diff --git a/tck/Jenkinsfile b/tck/Jenkinsfile
index fa8184f..6e7d127 100644
--- a/tck/Jenkinsfile
+++ b/tck/Jenkinsfile
@@ -4,11 +4,22 @@ pipeline {
}
tools {
+ant 'Ant 1.10.6'
maven 'Maven 3.6.2'
jdk 'JDK 1.8.0_191'
}
- stages {
+environment {
+ANT_OPTS = "-Djavax.xml.accessExternalSchema=all"
+}
+
+stages {
+stage("Initialization") {
+steps {
+buildName "CXF ${params.Version} JAX-RS 2.1 TCK"
+}
+}
+
stage("Prepare") {
steps {
cleanWs()
@@ -21,13 +32,19 @@ pipeline {
echo "PATH = ${PATH}"
echo "M2_HOME = ${M2_HOME}"
echo "JAVA_HOME = ${JAVA_HOME}"
+echo "ANT_HOME = ${ANT_HOME}"
+echo "WORKSPACE = ${PWD}"
'''
}
}
stage('Download JakartaEE TCK') {
steps {
- git 'https://github.com/eclipse-ee4j/jakartaee-tck'
+ checkout([$class: 'GitSCM',
+ branches: [[name: '*/master']],
+ userRemoteConfigs: [[url:
'https://github.com/eclipse-ee4j/jakartaee-tck']],
+ extensions: [[$class: 'RelativeTargetDirectory',
relativeTargetDir: 'jakartaee-tck']]
+ ])
}
}
@@ -49,10 +66,85 @@ pipeline {
sh "mvn
org.apache.maven.plugins:maven-dependency-plugin:2.8:get
-DremoteRepositories=https://repository.apache.org/snapshots,https://repository.apache.org
-Dartifact=org.apache.cxf:cxf-rt-transports-http:${params.Version}:jar
-Dtransitive=false -Ddest=glassfish5/glassfish/lib"
}
}
+
+ stage('Prepare JAX-RS TCK build configuration') {
+ steps {
+ withEnv(["WORKSPACE = ${PWD}"]) {
+sh "wget
https://raw.githubusercontent.com/apache/cxf/master/tck/ts.jte.template";
+sh "sed -i '" + 's/${version}/' + params.Version + "/g'
ts.jte.template"
+sh "sed -i '" + 's#${GF_HOME}#' +
"${WORKSPACE}/glassfish5/glassfish" + "#g' ts.jte.template"
+sh "cp jakartaee-tck/bin/xml/impl/glassfish/jersey.xml
jakartaee-tck/bin/xml/impl/glassfish/cxf.xml"
+ }
+ }
+ }
+
+ stage('Build JAX-RS TCK') {
+ steps {
+withEnv([
+"WORKSPACE=${pwd()}",
+"TS_HOME=${WORKSPACE}/jakartaee-tck",
+"javaee_home=${WORKSPACE}/glassfish5",
+"GF_HOME=${WORKSPACE}/glassfish5/glassfish",
+"AS_JAVA=$JAVA_HOME",
+"deliverabledir=jaxrs"
+]) {
+sh 'yes | cp -vr ts.jte.template
jakartaee-tck/install/jaxrs/bin/ts.jte'
+
+dir("${TS_HOME}/install/${deliverabledir}/bin") {
+sh "ant build.all"
+sh "ant update.jaxrs.wars"
+}
+
+dir("${TS_HOME}/release/tools/") {
+sh "ant jaxrs"
+}
+}
+ }
+ }
+
+ stage('Run JAX-RS TCK') {
+ steps {
+withEnv([
+"WORKSPACE=${pwd()}",
+"TS_HOME=${WORKSPACE}/restful-ws-tck",
+"javaee_home=${WORKSPACE}/glassfish5",
+"GF_HOME=${WORKSPACE}/glassfish5/glassfish",
+"AS_JAVA=$JAVA_HOME",
+"deliverabledir=jaxrs"
+]) {
+sh "cp -r
jakartaee-tck/release/JAXRS_BUILD/latest/restful-ws-tck ${WORKSPACE}"
+sh "yes | cp -vr ts.jte.template ${TS_HOME}/bin/ts.jte"
+
+dir("${TS_HOME}/bin") {
+sh "ant config.vi"
+sh "ant deploy.all"
+sh "ant run.all"
+}
+}
+ }
+
+ post {
+ always {
+ withEnv([
+"WORKSPACE=${pwd()}",
+"TS_HOME=${WORKSPAC
svn commit: r1055304 - in /websites/production/cxf/content: cache/main.pageCache cxf-3212-release-notes.html cxf-335-release-notes.html download.html index.html
Author: buildbot Date: Wed Jan 15 19:57:31 2020 New Revision: 1055304 Log: Production update by buildbot for cxf Added: websites/production/cxf/content/cxf-3212-release-notes.html websites/production/cxf/content/cxf-335-release-notes.html Modified: websites/production/cxf/content/cache/main.pageCache websites/production/cxf/content/download.html websites/production/cxf/content/index.html Modified: websites/production/cxf/content/cache/main.pageCache == Binary files - no diff available. Added: websites/production/cxf/content/cxf-3212-release-notes.html == --- websites/production/cxf/content/cxf-3212-release-notes.html (added) +++ websites/production/cxf/content/cxf-3212-release-notes.html Wed Jan 15 19:57:31 2020 @@ -0,0 +1,149 @@ + +http://www.w3.org/TR/html4/loose.dtd";> + + + + + + + + + + + + + + + +Apache CXF -- CXF 3.2.12 Release Notes + + + + + + + + + + + + + + + + + +http://cxf.apache.org/"; title="Apache CXF">Apache CXF + +http://www.apache.org/"; title="The Apache Software Foundation">https://apache.org/img/asf_logo.png";> + + + + + + + + +Index > Download > CXF 3.2.12 Release Notes + + + + + + +Download | http://cxf.apache.org/docs/index.html";>Documentation + + + + + + + + + + + + + + + + + + + + + +Apache CXFHomeDownloadPeopleProject StatusRoadmapMailing Listshttp://issues.apache.org/jira/browse/CXF";>Issue ReportingSpecial Thankshttp://www.apache.org/licenses/";>LicenseSecurity AdvisoriesUsershttp://cxf.apache.org/docs/index.html";>User's Guide SupportFAQResources and ArticlesSearchhttp://www.google.com/cse";> http://www.google.com/cse/brand?form=cse-search-box&lang=en";> Developershttp://cxf.apache.org/docs/cxf-architecture.html";>Architecture GuideSource RepositoryBuildingAutomated BuildsTesting-DebuggingCoding GuidelinesGetting InvolvedRelease ManagementSubprojectsDistributed OSGiXJC UtilsBuild UtilsFedizhttp://www.apache.org";>ASFhttp://www.apache.org/foundation/how-it-works.html";>How Apache Workshttp://www.apache.org/foundation/";>Foundationhttp://www.apache.org/foundation/sponsorship.html";>Sponsor Apachehttp://www.apache.org/foundation/thanks.html";>Thankshttp://www.apache.org/security/";>Security http://www.apache.org/events/current-event.html";>http://www.apache.org/events/current-event-125x125.png"; data-image-src="http://www.apache.org/events/current-event-125x125.png";> + + + + + + + + + +CXF 3.2.12 Release NotesOverviewApache CXF 3.2.12 delivers the latest set of patches and bug fixes for Apache CXF 3.2.x. This release fixes over 11 JIRA issues that have been reported by users.DownloadDescriptionFileSHA512Source distributionhttps://www.apache.org/dyn/closer.cgi?path=/cxf/3.2.12/apache-cxf-3.2.12-src.t ar.gz">apache-cxf-3.2.12-src.tar.gzhttps://www.apache.org/dist/cxf/3.2.12/apache-cxf-3.2.12-src.tar.gz.sha512";>apache-cxf-3.2.12-src.tar.gz.sha512https://www.apache.org/dyn/closer.cgi?path=/cxf/3.2.12/apache-cxf-3.2.12-src.zip";>apache-cxf-3.2.12-src.ziphttps://www.apache.org/dist/cxf/3.2.12/apache-cxf-3.2.12-src.zip.sha512";>apache-cxf-3.2.12-src.zip.sha512Binary distributionhttps://www.apache.org/dyn/ closer.cgi?path=/cxf/3.2.12/apache-cxf-3.2.12.tar.gz">apache-cxf-3.2.12.tar.gzhttps://www.apache.org/dist/cxf/3.2.12/apache-cxf-3.2.12.tar.gz.sha512";>apache-cxf-3.2.12.tar.gz.sha512https://www.apache.org/dyn/closer.cgi?path=/cxf/3.2.12/apache-cxf-3.2.12.zip";>apache-cxf-3.2.12.ziphttps://www.apache.org/dist/cxf/3.2.12/apache-cxf-3.2.12.zip.sha512";>apache-cxf-3.2.12.zip.sha512Installation PrerequisitesBefore installing Apache CXF, make sure the following products,with the specified versions, are installed on your system:Java 8 Development KitMaven 3.1 or laterJava Development KitYou must install the J2SE Development Kit (JDK) 8.0, which can be downloadedfrom:http://www.oracle.com/technetwork/java/javase/downloads/index.html"; rel="nofollow">http://www.oracle.com/technetwork/java/javase/downloads/index.htmlAfter installing the JDK, set or modify the following environment variables:JAVA_HOME – set this environment variableto point at the root directory of the Java installation.PATH – make sure that your PATH includes:%JAVA_HOME%\bin (Windows) $JAVA_HOME/bin (UNIX)Building the SamplesBuilding the samples included in t he binary distribution is easy. Change
buildbot success in on cxf-site-production
The Buildbot has detected a restored build on builder cxf-site-production while building . Full details are available at: https://ci.apache.org/builders/cxf-site-production/builds/38205 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: bb-cms-slave Build Reason: The Nightly scheduler named 'cxf-site-production' triggered this build Build Source Stamp: [branch cxf/web] HEAD Blamelist: Build succeeded! Sincerely, -The Buildbot
[cxf] branch master updated: cxf-core: update null check
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.git
The following commit(s) were added to refs/heads/master by this push:
new 91634e8 cxf-core: update null check
91634e8 is described below
commit 91634e844c1a062588ee3b338949d77621e3f8ab
Author: Alexey Markevich
AuthorDate: Wed Jan 15 22:26:58 2020 +0300
cxf-core: update null check
---
.../cxf/common/classloader/ClassLoaderUtils.java| 4 ++--
.../org/apache/cxf/common/util/PrimitiveUtils.java | 21 +++--
.../cxf/common/util/PropertiesLoaderUtils.java | 4 ++--
.../java/org/apache/cxf/endpoint/ClientImpl.java| 10 ++
.../main/java/org/apache/cxf/helpers/JavaUtils.java | 2 +-
.../java/org/apache/cxf/staxutils/StaxUtils.java| 20
.../apache/cxf/staxutils/W3CDOMStreamReader.java| 2 +-
7 files changed, 27 insertions(+), 36 deletions(-)
diff --git
a/core/src/main/java/org/apache/cxf/common/classloader/ClassLoaderUtils.java
b/core/src/main/java/org/apache/cxf/common/classloader/ClassLoaderUtils.java
index 5f446f1..f049d5f 100644
--- a/core/src/main/java/org/apache/cxf/common/classloader/ClassLoaderUtils.java
+++ b/core/src/main/java/org/apache/cxf/common/classloader/ClassLoaderUtils.java
@@ -140,7 +140,7 @@ public final class ClassLoaderUtils {
url = callingClass.getResource(resourceName);
}
-if ((url == null) && (resourceName != null) && (resourceName.charAt(0)
!= '/')) {
+if ((url == null) && (resourceName.charAt(0) != '/')) {
return getResource('/' + resourceName, callingClass);
}
@@ -227,7 +227,7 @@ public final class ClassLoaderUtils {
}
-if (ret.isEmpty() && (resourceName != null) && (resourceName.charAt(0)
!= '/')) {
+if (ret.isEmpty() && (resourceName.charAt(0) != '/')) {
return getResources('/' + resourceName, callingClass);
}
return ret;
diff --git a/core/src/main/java/org/apache/cxf/common/util/PrimitiveUtils.java
b/core/src/main/java/org/apache/cxf/common/util/PrimitiveUtils.java
index cbf74c9..ae7128d 100644
--- a/core/src/main/java/org/apache/cxf/common/util/PrimitiveUtils.java
+++ b/core/src/main/java/org/apache/cxf/common/util/PrimitiveUtils.java
@@ -81,26 +81,19 @@ public final class PrimitiveUtils {
Object ret = value;
if (Integer.TYPE.equals(type) || Integer.class.equals(type)) {
ret = Integer.valueOf(value);
-}
-if (Byte.TYPE.equals(type) || Byte.class.equals(type)) {
+} else if (Byte.TYPE.equals(type) || Byte.class.equals(type)) {
ret = Byte.valueOf(value);
-}
-if (Short.TYPE.equals(type) || Short.class.equals(type)) {
+} else if (Short.TYPE.equals(type) || Short.class.equals(type)) {
ret = Short.valueOf(value);
-}
-if (Long.TYPE.equals(type) || Long.class.equals(type)) {
+} else if (Long.TYPE.equals(type) || Long.class.equals(type)) {
ret = Long.valueOf(value);
-}
-if (Float.TYPE.equals(type) || Float.class.equals(type)) {
+} else if (Float.TYPE.equals(type) || Float.class.equals(type)) {
ret = Float.valueOf(value);
-}
-if (Double.TYPE.equals(type) || Double.class.equals(type)) {
+} else if (Double.TYPE.equals(type) || Double.class.equals(type)) {
ret = Double.valueOf(value);
-}
-if (Boolean.TYPE.equals(type) || Boolean.class.equals(type)) {
+} else if (Boolean.TYPE.equals(type) || Boolean.class.equals(type)) {
ret = Boolean.valueOf(value);
-}
-if (Character.TYPE.equals(type) || Character.class.equals(type)) {
+} else if ((Character.TYPE.equals(type) ||
Character.class.equals(type)) && value != null) {
ret = value.charAt(0);
}
return ret;
diff --git
a/core/src/main/java/org/apache/cxf/common/util/PropertiesLoaderUtils.java
b/core/src/main/java/org/apache/cxf/common/util/PropertiesLoaderUtils.java
index f63a9b2..8dba12e 100644
--- a/core/src/main/java/org/apache/cxf/common/util/PropertiesLoaderUtils.java
+++ b/core/src/main/java/org/apache/cxf/common/util/PropertiesLoaderUtils.java
@@ -73,8 +73,8 @@ public final class PropertiesLoaderUtils {
logger.log(level, msg, url.toString());
}
-try (InputStream is = url.openStream()) {
-properties.loadFromXML(new BufferedInputStream(is));
+try (InputStream is = new BufferedInputStream(url.openStream())) {
+properties.loadFromXML(is);
}
}
return properties;
diff --git a/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java
b/core/src/main/java/org/apache/cxf/endpoint/ClientImpl.java
index b3322df..8a07112 100644
--- a/core/src/main/java/org/apache/
buildbot failure in on cxf-site-production
The Buildbot has detected a new failure on builder cxf-site-production while building . Full details are available at: https://ci.apache.org/builders/cxf-site-production/builds/38204 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: bb-cms-slave Build Reason: The Nightly scheduler named 'cxf-site-production' triggered this build Build Source Stamp: [branch cxf/web] HEAD Blamelist: BUILD FAILED: failed compile Sincerely, -The Buildbot
[cxf] branch 3.3.x-fixes updated: [CXF-8193]upgrade to jetty 9.4.25.v20191220
This is an automated email from the ASF dual-hosted git repository.
ffang pushed a commit to branch 3.3.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/3.3.x-fixes by this push:
new 22678a4 [CXF-8193]upgrade to jetty 9.4.25.v20191220
22678a4 is described below
commit 22678a4c84225e46825e256acdbfbbdc7bed5637
Author: Freeman Fang
AuthorDate: Wed Jan 15 09:40:22 2020 -0500
[CXF-8193]upgrade to jetty 9.4.25.v20191220
(cherry picked from commit 528b35178ec31860cf5ad2095d6f3cc3c951d914)
---
parent/pom.xml | 2 +-
.../resources/jaxrs_dispatch/WEB-INF/beans.xml | 4 ++--
.../test/resources/jaxrs_dispatch/WEB-INF/web.xml | 26 ++
3 files changed, 29 insertions(+), 3 deletions(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index 29c1840..c171259 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -147,8 +147,8 @@
1.4.0
[9.2,10)
${cxf.jetty9.version}
-9.4.24.v20191120
2.1.1
+9.4.25.v20191220
2.9.4
1.1.13
1.1.4
diff --git a/systests/jaxrs/src/test/resources/jaxrs_dispatch/WEB-INF/beans.xml
b/systests/jaxrs/src/test/resources/jaxrs_dispatch/WEB-INF/beans.xml
index 3a510a9..a1e344d 100644
--- a/systests/jaxrs/src/test/resources/jaxrs_dispatch/WEB-INF/beans.xml
+++ b/systests/jaxrs/src/test/resources/jaxrs_dispatch/WEB-INF/beans.xml
@@ -48,7 +48,7 @@
-
+
@@ -92,4 +92,4 @@
-
\ No newline at end of file
+
diff --git a/systests/jaxrs/src/test/resources/jaxrs_dispatch/WEB-INF/web.xml
b/systests/jaxrs/src/test/resources/jaxrs_dispatch/WEB-INF/web.xml
index b9fe1c8..3795f7c 100644
--- a/systests/jaxrs/src/test/resources/jaxrs_dispatch/WEB-INF/web.xml
+++ b/systests/jaxrs/src/test/resources/jaxrs_dispatch/WEB-INF/web.xml
@@ -59,6 +59,32 @@
/the/*
+RedirectIncludeCXFServlet
+Redirect CXF Servlet
+
+org.apache.cxf.transport.servlet.CXFServlet
+
+
+redirects-list
+
+ /(\w)+.html
+
+
+
+redirect-with-include
+true
+
+
+redirect-servlet-path
+/static
+
+1
+
+
+RedirectIncludeCXFServlet
+/book_include.html
+
+
RedirectCXFServlet
Redirect CXF Servlet
[cxf] branch master updated: [CXF-8193]upgrade to jetty 9.4.25.v20191220
This is an automated email from the ASF dual-hosted git repository.
ffang 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 528b351 [CXF-8193]upgrade to jetty 9.4.25.v20191220
528b351 is described below
commit 528b35178ec31860cf5ad2095d6f3cc3c951d914
Author: Freeman Fang
AuthorDate: Wed Jan 15 09:40:22 2020 -0500
[CXF-8193]upgrade to jetty 9.4.25.v20191220
---
parent/pom.xml | 2 +-
.../resources/jaxrs_dispatch/WEB-INF/beans.xml | 4 ++--
.../test/resources/jaxrs_dispatch/WEB-INF/web.xml | 26 ++
3 files changed, 29 insertions(+), 3 deletions(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index 66222ec..7adccab 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -149,7 +149,7 @@
1.4.0
[9.2,10)
${cxf.jetty9.version}
-9.4.24.v20191120
+9.4.25.v20191220
3.1
2.9.4
1.1.13
diff --git a/systests/jaxrs/src/test/resources/jaxrs_dispatch/WEB-INF/beans.xml
b/systests/jaxrs/src/test/resources/jaxrs_dispatch/WEB-INF/beans.xml
index 3a510a9..a1e344d 100644
--- a/systests/jaxrs/src/test/resources/jaxrs_dispatch/WEB-INF/beans.xml
+++ b/systests/jaxrs/src/test/resources/jaxrs_dispatch/WEB-INF/beans.xml
@@ -48,7 +48,7 @@
-
+
@@ -92,4 +92,4 @@
-
\ No newline at end of file
+
diff --git a/systests/jaxrs/src/test/resources/jaxrs_dispatch/WEB-INF/web.xml
b/systests/jaxrs/src/test/resources/jaxrs_dispatch/WEB-INF/web.xml
index b9fe1c8..3795f7c 100644
--- a/systests/jaxrs/src/test/resources/jaxrs_dispatch/WEB-INF/web.xml
+++ b/systests/jaxrs/src/test/resources/jaxrs_dispatch/WEB-INF/web.xml
@@ -59,6 +59,32 @@
/the/*
+RedirectIncludeCXFServlet
+Redirect CXF Servlet
+
+org.apache.cxf.transport.servlet.CXFServlet
+
+
+redirects-list
+
+ /(\w)+.html
+
+
+
+redirect-with-include
+true
+
+
+redirect-servlet-path
+/static
+
+1
+
+
+RedirectIncludeCXFServlet
+/book_include.html
+
+
RedirectCXFServlet
Redirect CXF Servlet
[cxf] branch 3.3.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.3.x-fixes in repository https://gitbox.apache.org/repos/asf/cxf.git The following commit(s) were added to refs/heads/3.3.x-fixes by this push: new d484b43 Recording .gitmergeinfo Changes d484b43 is described below commit d484b43096c6da5f6c9bf4c8f0312e57ced6895b Author: Colm O hEigeartaigh AuthorDate: Wed Jan 15 13:22:32 2020 + Recording .gitmergeinfo Changes --- .gitmergeinfo | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitmergeinfo b/.gitmergeinfo index b595b2d..1c16ff2 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -21,7 +21,9 @@ B 212b83f2da31deff076e5869a30563a90d633aea B 214e375e1a3771ece687294c4313da0641bea99b B 24af0f4bb4737a08a8211340f8c85d74bb5d8450 B 26212d8581b27825fd9ccaf2894c1ce3c8854743 +B 27092895f73a6611190634a6d04a1e83e6c6fdd5 B 277430f6673140643a5593b979316ff981839b2b +B 27ad3c89dee2280c2c19955696603b8411af0c10 B 2bd5324d6d09e35345af4013bb5f4f07113b03d2 B 2d159906f9b9fd756a4a94053b360552a679cf9d B 2e7278c35f3fadc94e03dcf8c9b10a5f46053fce
[cxf] branch master updated: Fixing some minor javascript issues
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 2709289 Fixing some minor javascript issues
2709289 is described below
commit 27092895f73a6611190634a6d04a1e83e6c6fdd5
Author: Colm O hEigeartaigh
AuthorDate: Wed Jan 15 13:21:34 2020 +
Fixing some minor javascript issues
---
.../search/src/main/resources/browser/index.html | 2 +-
.../resources/org/apache/cxf/javascript/cxf-utils.js | 19 +--
2 files changed, 6 insertions(+), 15 deletions(-)
diff --git
a/distribution/src/main/release/samples/jax_rs/search/src/main/resources/browser/index.html
b/distribution/src/main/release/samples/jax_rs/search/src/main/resources/browser/index.html
index 63ce56b..ab67a07 100644
---
a/distribution/src/main/release/samples/jax_rs/search/src/main/resources/browser/index.html
+++
b/distribution/src/main/release/samples/jax_rs/search/src/main/resources/browser/index.html
@@ -118,7 +118,7 @@
}
var encodedWildcardsQuery = encodeURIComponent(
wildcardsQuery.trim() );
- var filter = contentQuery + wildcardsQuery;
+ var filter = contentQuery + encodedWildcardsQuery;
$.ajax({
url: $(this).attr("action") + "?$filter=" +
filter,
diff --git
a/rt/javascript/javascript-rt/src/main/resources/org/apache/cxf/javascript/cxf-utils.js
b/rt/javascript/javascript-rt/src/main/resources/org/apache/cxf/javascript/cxf-utils.js
index 00b0c41..e5aa233 100644
---
a/rt/javascript/javascript-rt/src/main/resources/org/apache/cxf/javascript/cxf-utils.js
+++
b/rt/javascript/javascript-rt/src/main/resources/org/apache/cxf/javascript/cxf-utils.js
@@ -75,10 +75,8 @@ function org_apache_cxf_findNamespace(elementNode,
namespacePrefix) {
if ((attributes != null) && (attributes.length > 0)) {
for (var x = 0;x < attributes.length; x++) {
var attributeNodeName = attributes.item(x).nodeName;
- var attributeNamespacePrefix =
org_apache_cxf_getPrefix(attributes
- .item(x).nodeName);
- var attributeNamespaceSuffix =
org_apache_cxf_getLocalName(attributes
- .item(x).nodeName);
+ var attributeNamespacePrefix =
org_apache_cxf_getPrefix(attributeNodeName);
+ var attributeNamespaceSuffix =
org_apache_cxf_getLocalName(attributeNodeName);
if ((namespacePrefix == null) &&
(attributeNamespacePrefix == null)
&& (attributeNamespaceSuffix ==
"xmlns"))
@@ -163,8 +161,6 @@ function org_apache_cxf_getLocalName(tagName) {
function org_apache_cxf_element_name_for_trace(node) {
if (node == null)
return "Null";
- else if (node == undefined)
- return "Undefined";
else {
var n = '';
if (node.namespaceURI != null && node.namespaceURI != '') {
@@ -177,7 +173,7 @@ function org_apache_cxf_element_name_for_trace(node) {
CxfApacheOrgUtil.prototype.traceElementName =
org_apache_cxf_element_name_for_trace;
function org_apache_cxf_escapeXmlEntities(val) {
- if (val == null || val == undefined)
+ if (val == null)
return "";
else {
val = String(val);
@@ -221,8 +217,6 @@ function org_apache_cxf_getFirstElementChild(node) {
CxfApacheOrgUtil.prototype.getFirstElementChild =
org_apache_cxf_getFirstElementChild;
function org_apache_cxf_getNextElementSibling(node) {
- if (node == undefined)
- throw "undefined node to getNextElementSibling";
if (node == null)
throw "null node to getNextElementSibling";
var n;
@@ -446,7 +440,6 @@ function org_apache_cxf_base64_decode64Unicode(input) {
function org_apache_cxf_base64_decode64UTF8(input) {
var utftext = org_apache_cxf_base64_decode64array(input);
var plaintext = "";
- var cRay = new Array();
var i = 0;
var c;
var c2;
@@ -1001,10 +994,8 @@ function org_apache_cxf_get_xsi_type(elementNode) {
if ((attributes != null) && (attributes.length > 0)) {
for (var x = 0;x < attributes.length; x++) {
var attributeNodeName = attributes.item(x).nodeName;
- var attributeNamespacePrefix =
org_apache_cxf_getPrefix(attributes
- .item(x).nodeName);
- var attributeNamespaceSuffix =
org_apache_cxf_getLocalName(attributes
- .item(x).nodeName);
+ var attributeN
[cxf] branch master updated: Update to released build-utils & xjc-utils
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.git The following commit(s) were added to refs/heads/master by this push: new 27ad3c8 Update to released build-utils & xjc-utils 27ad3c8 is described below commit 27ad3c89dee2280c2c19955696603b8411af0c10 Author: Alexey Markevich AuthorDate: Wed Jan 15 12:47:35 2020 +0300 Update to released build-utils & xjc-utils --- parent/pom.xml | 2 +- pom.xml| 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index f5727a8..66222ec 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -383,7 +383,7 @@ com.puppycrawl.tools checkstyle -8.26 +8.28 diff --git a/pom.xml b/pom.xml index 27b2ea6..f24d059 100644 --- a/pom.xml +++ b/pom.xml @@ -40,8 +40,8 @@ false -3.4.4-SNAPSHOT -3.3.1-SNAPSHOT +3.4.4 +3.3.1 1.8 UTF-8 scp://people.apache.org/www/cxf.apache.org/maven-site
[cxf-dosgi] branch master updated: Updating CXF
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-dosgi.git The following commit(s) were added to refs/heads/master by this push: new d2cf109 Updating CXF d2cf109 is described below commit d2cf109c2261ab5453e8e0f1b4956af4451681d6 Author: Colm O hEigeartaigh AuthorDate: Wed Jan 15 09:33:11 2020 + Updating CXF --- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parent/pom.xml b/parent/pom.xml index 5cb46a8..5d29e93 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -30,7 +30,7 @@ 6.0.0 6.0.0 1.14.0 -3.3.4 +3.3.5 5.6.8 3.4.14 3.0
[cxf-fediz] branch master updated: Update CXF build-utils
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
The following commit(s) were added to refs/heads/master by this push:
new 719306e Update CXF build-utils
719306e is described below
commit 719306e077337d547bdcf1dc3c2aff1f6c04bebd
Author: Alexey Markevich
AuthorDate: Wed Jan 15 11:32:31 2020 +0300
Update CXF build-utils
---
.../cxf/fediz/core/metadata/MetadataWriter.java| 4 ++--
.../java/org/apache/cxf/fediz/common/STSUtil.java | 22 +-
.../cxf/fediz/core/SAML2CallbackHandler.java | 2 +-
.../fediz/core/federation/ClaimsProcessorTest.java | 17 +++--
pom.xml| 4 ++--
5 files changed, 29 insertions(+), 20 deletions(-)
diff --git
a/plugins/core/src/main/java/org/apache/cxf/fediz/core/metadata/MetadataWriter.java
b/plugins/core/src/main/java/org/apache/cxf/fediz/core/metadata/MetadataWriter.java
index d9bf0c4..10fd10d 100644
---
a/plugins/core/src/main/java/org/apache/cxf/fediz/core/metadata/MetadataWriter.java
+++
b/plugins/core/src/main/java/org/apache/cxf/fediz/core/metadata/MetadataWriter.java
@@ -125,8 +125,8 @@ public class MetadataWriter {
if (hasSigningKey) {
Document doc = DOMUtils.readXml(is);
Document result = SignatureUtils.signMetaInfo(
-config.getSigningKey().getCrypto(),
config.getSigningKey().getKeyAlias(), config.getSigningKey().getKeyPassword(),
-doc, referenceID);
+config.getSigningKey().getCrypto(),
config.getSigningKey().getKeyAlias(),
+config.getSigningKey().getKeyPassword(), doc,
referenceID);
if (result != null) {
return result;
} else {
diff --git
a/plugins/core/src/test/java/org/apache/cxf/fediz/common/STSUtil.java
b/plugins/core/src/test/java/org/apache/cxf/fediz/common/STSUtil.java
index 273f2c1..22edf56 100644
--- a/plugins/core/src/test/java/org/apache/cxf/fediz/common/STSUtil.java
+++ b/plugins/core/src/test/java/org/apache/cxf/fediz/common/STSUtil.java
@@ -20,13 +20,15 @@
package org.apache.cxf.fediz.common;
import java.io.ByteArrayInputStream;
+import java.io.IOException;
import java.io.InputStream;
-import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
-public class STSUtil {
+import org.xml.sax.SAXException;
+public final class STSUtil {
public static final String SAMPLE_RSTR_COLL_MSG =
""
@@ -55,23 +57,25 @@ public class STSUtil {
+ "";
-private static DocumentBuilderFactory factory =
DocumentBuilderFactory.newInstance();
+private static final DocumentBuilderFactory FACTORY =
DocumentBuilderFactory.newInstance();
static {
-factory.setNamespaceAware(true);
+FACTORY.setNamespaceAware(true);
}
-protected STSUtil() {
-
+private STSUtil() {
}
/**
* Convert an XML document as a String to a org.w3c.dom.Document.
+ * @throws IOException
+ * @throws ParserConfigurationException
+ * @throws SAXException
*/
-public static org.w3c.dom.Document toSOAPPart(String xml) throws Exception
{
+public static org.w3c.dom.Document toSOAPPart(String xml)
+throws IOException, SAXException, ParserConfigurationException {
try (InputStream in = new ByteArrayInputStream(xml.getBytes())) {
-DocumentBuilder builder = factory.newDocumentBuilder();
-return builder.parse(in);
+return FACTORY.newDocumentBuilder().parse(in);
}
}
diff --git
a/plugins/core/src/test/java/org/apache/cxf/fediz/core/SAML2CallbackHandler.java
b/plugins/core/src/test/java/org/apache/cxf/fediz/core/SAML2CallbackHandler.java
index b590cec..d6ff4de 100644
---
a/plugins/core/src/test/java/org/apache/cxf/fediz/core/SAML2CallbackHandler.java
+++
b/plugins/core/src/test/java/org/apache/cxf/fediz/core/SAML2CallbackHandler.java
@@ -36,7 +36,7 @@ import org.apache.wss4j.common.saml.builder.SAML2Constants;
*/
public class SAML2CallbackHandler extends AbstractSAMLCallbackHandler {
-public SAML2CallbackHandler() throws Exception {
+public SAML2CallbackHandler() {
// Required for Holder-Of-Key. Commented out.
/*
if (certs == null) {
diff --git
a/plugins/core/src/test/java/org/apache/cxf/fediz/core/federation/ClaimsProcessorTest.java
b/plugins/core/src/test/java/org/apache/cxf/fediz/core/federation/ClaimsProcessorTest.java
index 5c33b29..c88bc1d 100644
---
a/plugins/core/src/test/java/org/apache/cxf/fediz/core/federation/ClaimsProcessorTest.java
+++
b/plugins/core/src/test/java/org/apache/cxf/fediz/core/federation/ClaimsProcessorTest.java
@@ -29,10 +2
