You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by db...@apache.org on 2021/04/27 05:25:41 UTC
[tomee] branch master updated (add06bd -> fbe11b9)
This is an automated email from the ASF dual-hosted git repository.
dblevins pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/tomee.git.
from add06bd Merge pull request #787 from dblevins/jaxrs
new c550d89 Restore the sorting order from CXF master branch
new fbe11b9 Put back the patching of 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:
tomee/apache-tomee/pom.xml | 6 +++---
.../java/org/apache/cxf/jaxrs/provider/ProviderFactory.java | 12 +++++++-----
2 files changed, 10 insertions(+), 8 deletions(-)
[tomee] 02/02: Put back the patching of CXF
Posted by db...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dblevins pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomee.git
commit fbe11b99c539b7869677be0ab0aaf3db340bf187
Author: David Blevins <da...@gmail.com>
AuthorDate: Mon Apr 26 20:13:58 2021 -0700
Put back the patching of CXF
---
tomee/apache-tomee/pom.xml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/tomee/apache-tomee/pom.xml b/tomee/apache-tomee/pom.xml
index dd7b32d..820425e 100644
--- a/tomee/apache-tomee/pom.xml
+++ b/tomee/apache-tomee/pom.xml
@@ -526,9 +526,9 @@
<select>apache-tomee-(plus|plume|webprofile|microprofile).*\.zip</select>
<skipTransform>true</skipTransform>
<createTarGz>true</createTarGz>
- <sourceExcludes>
- <exclude>org/apache/cxf</exclude>
- </sourceExcludes>
+<!-- <sourceExcludes>-->
+<!-- <exclude>org/apache/cxf</exclude>-->
+<!-- </sourceExcludes>-->
</configuration>
<executions>
<execution>
[tomee] 01/02: Restore the sorting order from CXF master branch
Posted by db...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dblevins pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomee.git
commit c550d895e974c0d35e5dedb04fbf2a11c467598e
Author: David Blevins <da...@gmail.com>
AuthorDate: Mon Apr 26 20:12:51 2021 -0700
Restore the sorting order from CXF master branch
---
.../java/org/apache/cxf/jaxrs/provider/ProviderFactory.java | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/tomee/apache-tomee/src/patch/java/org/apache/cxf/jaxrs/provider/ProviderFactory.java b/tomee/apache-tomee/src/patch/java/org/apache/cxf/jaxrs/provider/ProviderFactory.java
index ffd8083..4b16c1f 100644
--- a/tomee/apache-tomee/src/patch/java/org/apache/cxf/jaxrs/provider/ProviderFactory.java
+++ b/tomee/apache-tomee/src/patch/java/org/apache/cxf/jaxrs/provider/ProviderFactory.java
@@ -896,19 +896,21 @@ public abstract class ProviderFactory {
MessageBodyWriter<?> e1 = p1.getProvider();
MessageBodyWriter<?> e2 = p2.getProvider();
- int result = compareClasses(e1, e2);
- if (result != 0) {
- return result;
- }
List<MediaType> types1 =
JAXRSUtils.sortMediaTypes(JAXRSUtils.getProviderProduceTypes(e1), JAXRSUtils.MEDIA_TYPE_QS_PARAM);
List<MediaType> types2 =
JAXRSUtils.sortMediaTypes(JAXRSUtils.getProviderProduceTypes(e2), JAXRSUtils.MEDIA_TYPE_QS_PARAM);
- result = JAXRSUtils.compareSortedMediaTypes(types1, types2, JAXRSUtils.MEDIA_TYPE_QS_PARAM);
+ int result = JAXRSUtils.compareSortedMediaTypes(types1, types2, JAXRSUtils.MEDIA_TYPE_QS_PARAM);
if (result != 0) {
return result;
}
+
+ result = compareClasses(e1, e2);
+ if (result != 0) {
+ return result;
+ }
+
result = compareCustomStatus(p1, p2);
if (result != 0) {
return result;