[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.1.x-fixes in repository https://gitbox.apache.org/repos/asf/cxf.git commit 50226d644e1599d9efcdb0064e2e4b9dfe54f229 Author: Colm O hEigeartaigh AuthorDate: Tue Jun 26 23:26:59 2018 +0100 Recording .gitmergeinfo Changes --- .gitmergeinfo | 5 + 1 file changed, 5 insertions(+) diff --git a/.gitmergeinfo b/.gitmergeinfo index 45ba798..4e50c1b 100644 --- a/.gitmergeinfo +++ b/.gitmergeinfo @@ -67,6 +67,7 @@ B 108dcd6099e86cd2070b5f9bae2b0feb7d5a7524 B 1101d8edd8dcf1dab383b0148db5f34b0ec93835 B 1116dff4ec9f06e2e69b040f5aa03779c0424c23 B 111d52fd4b92d0222af9bf1c22156145ea01ed01 +B 11b8c0e5ceb5ec9cbedb24bc258611beb337251d B 1206efe17352f3985d778f10a2e9ac984787cacb B 1224d5cc9f646aa3a4924ce9cb045366d2f4cdff B 122d1f64f248294a4303632571ec363aea4c2179 @@ -344,6 +345,7 @@ B 5a57f4a89737a5cfa37ffb94f6643c08e2ab6eb1 B 5b4275ce202777828633dbb65133d3fe44f1d404 B 5b7308408d8b0127a5ee4deea7bd66b44217dd58 B 5b90271e05b62fb8b576d3a48bd224abd4871af0 +B 5b9151a454e31f4776c69ac13c8eafa8cd5a635b B 5bfff0a49749c5b7308fb918ea732ca366e4de05 B 5cadb1e99fec627a45dba61f8ded76ad71a569d2 B 5cdf919c94c3606ce4a0d58536ba85b80a3c24bd @@ -427,6 +429,7 @@ B 71c447df9b80fad85affc8b199c3af6193c2cdae B 7230763f340664c3c235e9acb123acc058062b30 B 724f22436665d9971c22eb3dc6eb2a663390d612 B 7263bb6f9e9025c31cd5bcab1f270805587a6a6d +B 7337bddb3744772a78bd36715e9a0dae586cd317 B 73d1f886ae5265131e8664ee952ffd1cdc82f71a B 741c9e349e7e48d3fe278ba8d8f17dd6bf4c4370 B 7437a89a9c0fd3892863ab3fbaee6101b0d18851 @@ -670,6 +673,7 @@ B bbb04acb7c09d28ae8f662f1cbedd8c5f4d1bf1a B bbda68b6d7948d098ee598d248266f4ce81c820a B bbe2ddf81f05a8b69ea5fdc176488c1c5412555e B bbf85d9bcf72c4c6e099751b9baf8f1abc6a2938 +B bc2f01b3c76266b9dd138ba33c226b303e33713d B bc4cd1ed8ea06ca7e0a05c5d2ee898bb937b3663 B bcacbef8c3aa0e40e2cf560c6d0922edb4b641fb B bcb6385a095dcaaf8390ecfc33e9e22b9149daad @@ -1351,6 +1355,7 @@ M ded06c40ba057981e003903faa93beb94cbe11fa M df0c727132630165ff2c58d93c1f0cfc7eb68a4c M df3854cefae5d2da71f8d222a86218e81df7bd05 M df47c2d60100ac528b12f862166e3ac59d72f751 +M df53c20bfa19c4006ab0868d328970bc6d1d13c5 M e00b84269aa8112bf4073b69b58f933fda3ab497 M e0ace3dc71a45a9bee6223e550f2ad869581c12d M e0bbfe4a0c8a17c2335d08aec558c98fdebbf07d
[cxf] 01/02: CXF-7765 - URITemplate.compareTemplates returns inconsistent results
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch 3.1.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit ce7351dbaa84d3fae1d3012369f2de0336a25505
Author: Shon Vella
AuthorDate: Mon Jun 25 09:07:10 2018 -0600
CXF-7765 - URITemplate.compareTemplates returns inconsistent results
(cherry picked from commit df53c20bfa19c4006ab0868d328970bc6d1d13c5)
# Conflicts:
#
rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/URITemplate.java
---
.../org/apache/cxf/jaxrs/model/URITemplate.java| 34 ++
.../apache/cxf/jaxrs/model/URITemplateTest.java| 13 +
2 files changed, 28 insertions(+), 19 deletions(-)
diff --git
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/URITemplate.java
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/URITemplate.java
index 7803b94..8e37ee1 100644
---
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/URITemplate.java
+++
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/URITemplate.java
@@ -377,29 +377,25 @@ public final class URITemplate {
}
public static int compareTemplates(URITemplate t1, URITemplate t2) {
-String l1 = t1.getLiteralChars();
-String l2 = t2.getLiteralChars();
-if (!l1.equals(l2)) {
-// descending order
-return l1.length() < l2.length() ? 1 : -1;
-}
-
-int g1 = t1.getVariables().size();
-int g2 = t2.getVariables().size();
+int l1 = t1.getLiteralChars().length();
+int l2 = t2.getLiteralChars().length();
// descending order
-int result = g1 < g2 ? 1 : g1 > g2 ? -1 : 0;
+int result = l1 < l2 ? 1 : l1 > l2 ? -1 : 0;
if (result == 0) {
-int gCustom1 = t1.getCustomVariables().size();
-int gCustom2 = t2.getCustomVariables().size();
-if (gCustom1 != gCustom2) {
-// descending order
-return gCustom1 < gCustom2 ? 1 : -1;
+int g1 = t1.getVariables().size();
+int g2 = t2.getVariables().size();
+// descending order
+result = g1 < g2 ? 1 : g1 > g2 ? -1 : 0;
+if (result == 0) {
+int gCustom1 = t1.getCustomVariables().size();
+int gCustom2 = t2.getCustomVariables().size();
+result = gCustom1 < gCustom2 ? 1 : gCustom1 > gCustom2 ? -1 :
0;
+if (result == 0) {
+result =
t1.getPatternValue().compareTo(t2.getPatternValue());
+}
}
}
-if (result == 0) {
-result = t1.getPatternValue().compareTo(t2.getPatternValue());
-}
-
+
return result;
}
diff --git
a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/model/URITemplateTest.java
b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/model/URITemplateTest.java
index acfd7da..53f5c1c 100644
---
a/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/model/URITemplateTest.java
+++
b/rt/frontend/jaxrs/src/test/java/org/apache/cxf/jaxrs/model/URITemplateTest.java
@@ -740,4 +740,17 @@ public class URITemplateTest extends Assert {
//System.out.println(ut.encodeLiteralCharacters());
assertEquals("a%20{digit:[0-9]}%20b",
ut.encodeLiteralCharacters(false));
}
+
+@Test
+public void testCompareNumberOfLiteralCharacters() {
+URITemplate t1 = new URITemplate("/foo");
+URITemplate t2 = new URITemplate("/bar");
+URITemplate t3 = new URITemplate("/foo/bar");
+assertEquals(0, URITemplate.compareTemplates(t1, t1));
+assertTrue(URITemplate.compareTemplates(t1, t3) > 0);
+assertTrue(URITemplate.compareTemplates(t3, t1) < 0);
+assertEquals(Integer.signum(URITemplate.compareTemplates(t1, t2)),
+-Integer.signum(URITemplate.compareTemplates(t2, t1)));
+}
+
}
[cxf] branch 3.1.x-fixes updated (288a1df -> 50226d6)
This is an automated email from the ASF dual-hosted git repository. coheigea pushed a change to branch 3.1.x-fixes in repository https://gitbox.apache.org/repos/asf/cxf.git. from 288a1df CXF-7760 - JOSE: JwsCompactConsumer parsing headers issue new ce7351d CXF-7765 - URITemplate.compareTemplates returns inconsistent results new 50226d6 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 | 5 .../org/apache/cxf/jaxrs/model/URITemplate.java| 34 ++ .../apache/cxf/jaxrs/model/URITemplateTest.java| 13 + 3 files changed, 33 insertions(+), 19 deletions(-)
[cxf] branch master updated (540bb76 -> fc9431f)
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 540bb76 [CXF-7768]ensure we close all temp queue/topic before we close a JMS connection add df53c20 CXF-7765 - URITemplate.compareTemplates returns inconsistent results new fc9431f Merge pull request #425 from svella/CXF-7765 The 1 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: .../org/apache/cxf/jaxrs/model/URITemplate.java| 32 ++ .../apache/cxf/jaxrs/model/URITemplateTest.java| 13 + 2 files changed, 27 insertions(+), 18 deletions(-)
[cxf] 01/01: Merge pull request #425 from svella/CXF-7765
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 fc9431f92b938c365c1e0af2da47c2872dc682fb Merge: 540bb76 df53c20 Author: Colm O hEigeartaigh AuthorDate: Tue Jun 26 22:03:59 2018 +0100 Merge pull request #425 from svella/CXF-7765 CXF-7765 - URITemplate.compareTemplates returns inconsistent results .../org/apache/cxf/jaxrs/model/URITemplate.java| 32 ++ .../apache/cxf/jaxrs/model/URITemplateTest.java| 13 + 2 files changed, 27 insertions(+), 18 deletions(-)
Nexus: Staging Completed
Message from: https://repository.apache.orgDeployer properties:"userAgent" = "Apache-Maven/3.5.3 (Java 1.7.0_80; Linux 4.15.0-23-generic)""userId" = "coheigea""ip" = "37.228.233.175"Details:The following artifacts have been staged/org/apache/cxf/fediz/systests/fediz-systests-idp/1.4.4/fediz-systests-idp-1.4.4.pom(SHA1: 0f0866e2b8789a71c134032e6da0ea68a01a71de)/org/apache/cxf/fediz/systests/fediz-systests-idp/1.4.4/fediz-systests-idp-1.4.4.jar(SHA1: d56b8f770f0d6684897b366cfd52c4214bf42d5d)/org/apache/cxf/fediz/systests/fediz-systests-idp/1.4.4/fediz-systests-idp-1.4.4-sources.jar(SHA1: 5c7339572a28b70a7f8c3539c87576ed7b24db56)/org/apache/cxf/fediz/systests/fediz-systests-idp/1.4.4/fediz-systests-idp-1.4.4.pom.asc(SHA1: 046223ca27c3cf5fa6d442bdf0322b7f6e423f16)/org/apache/cxf/fediz/systests/fediz-systests-idp/1.4.4/fediz-systests-idp-1.4.4.jar.asc(SHA1: 02466fb3258596f14d728e2ef5209ed50e6bad46)/org/apache/cxf/fediz/systests/fediz-systests-idp/1.4.4/fediz-systests-idp-1.4.4-sources.jar.asc(SHA1: 310413f625edfb4f3126a0fd28bb01bf29da2615)/org/apache/cxf/fediz/systests/fediz-systests-jetty9/1.4.4/fediz-systests-jetty9-1.4.4.pom.asc(SHA1: 100273c3455e979f2abe7e603d3da0d7a00b9c3a)/org/apache/cxf/fediz/systests/fediz-systests-jetty9/1.4.4/fediz-systests-jetty9-1.4.4.jar(SHA1: ba4682da66a1bbb04f6cb91b12edd39c46cec879)/org/apache/cxf/fediz/systests/fediz-systests-jetty9/1.4.4/fediz-systests-jetty9-1.4.4-sources.jar(SHA1: 3fe1ba7a9ac6ee6fd1e24a96201afbe47afa9ce4)/org/apache/cxf/fediz/systests/fediz-systests-jetty9/1.4.4/fediz-systests-jetty9-1.4.4.jar.asc(SHA1: fb9ed581c17cae74bc1880b61e2ace47d042be18)/org/apache/cxf/fediz/systests/fediz-systests-jetty9/1.4.4/fediz-systests-jetty9-1.4.4-sources.jar.asc(SHA1: fe1c575657b5f58ffabeaa79787f779f5b3fe1be)/org/apache/cxf/fediz/systests/fediz-systests-jetty9/1.4.4/fediz-systests-jetty9-1.4.4.pom(SHA1: 0dd9b98b3c453117e539f15e0ceb8e3712aee225)/org/apache/cxf/fediz/systests/fediz-systests-oidc/1.4.4/fediz-systests-oidc-1.4.4.jar.asc(SHA1: dc7dd40e5a49438c553f69d43ea59b6dfaf2393a)/org/apache/cxf/fediz/systests/fediz-systests-oidc/1.4.4/fediz-systests-oidc-1.4.4.jar(SHA1: da79a084d9d1e5f5d46803d7896982153d91da13)/org/apache/cxf/fediz/systests/fediz-systests-oidc/1.4.4/fediz-systests-oidc-1.4.4-sources.jar(SHA1: c13758c638e56c30699239db65912f7fbb7be7a7)/org/apache/cxf/fediz/systests/fediz-systests-oidc/1.4.4/fediz-systests-oidc-1.4.4.pom(SHA1: ea5631e713566d98accbbe4e456d0814cc872d4f)/org/apache/cxf/fediz/systests/fediz-systests-oidc/1.4.4/fediz-systests-oidc-1.4.4.pom.asc(SHA1: 7472e7e26e5dbbfba2f6f4ab744a3ddf781ddff9)/org/apache/cxf/fediz/systests/fediz-systests-oidc/1.4.4/fediz-systests-oidc-1.4.4-sources.jar.asc(SHA1: b37db811146973c520c72e9b49fd8005d5439382)/org/apache/cxf/fediz/systests/fediz-systests-tomcat7/1.4.4/fediz-systests-tomcat7-1.4.4.jar.asc(SHA1: bc27cf9fbe8ba47c5df6109fb52a20cbdc585e1e)/org/apache/cxf/fediz/systests/fediz-systests-tomcat7/1.4.4/fediz-systests-tomcat7-1.4.4-sources.jar.asc(SHA1: a8274b55037e7301cb590e1932e02bd66711d45f)/org/apache/cxf/fediz/systests/fediz-systests-tomcat7/1.4.4/fediz-systests-tomcat7-1.4.4.pom(SHA1: 3da715c08f60db78c361b52fc8e0390c16fd4f8f)/org/apache/cxf/fediz/systests/fediz-systests-tomcat7/1.4.4/fediz-systests-tomcat7-1.4.4-sources.jar(SHA1: 029e2f49a1954cdfb74e06b3a762959d6351f401)/org/apache/cxf/fediz/systests/fediz-systests-tomcat7/1.4.4/fediz-systests-tomcat7-1.4.4.jar(SHA1: c8d5c0ab98c0545d8fa0a176acd290aece2358d5)/org/apache/cxf/fediz/systests/fediz-systests-tomcat7/1.4.4/fediz-systests-tomcat7-1.4.4.pom.asc(SHA1: 020da0fd62f8cf992fab5a1ebd135c940ba2100d)/org/apache/cxf/fediz/systests/fediz-systests-tomcat8/1.4.4/fediz-systests-tomcat8-1.4.4-sources.jar(SHA1: 8a227810027d945bf36add25fb4dff94b3f102ad)/org/apache/cxf/fediz/systests/fediz-systests-tomcat8/1.4.4/fediz-systests-tomcat8-1.4.4.jar(SHA1: 05cc5ae58f7a6cc49a9ece422bf0361733a1fb68)/org/apache/cxf/fediz/systests/fediz-systests-tomcat8/1.4.4/fediz-systests-tomcat8-1.4.4-sources.jar.asc(SHA1: ac3b7426bbc459d66f3958cf8d8e41d52d302722)/org/apache/cxf/fediz/systests/fediz-systests-tomcat8/1.4.4/fediz-systests-tomcat8-1.4.4.pom(SHA1: 1fdfd0f05c0b8d0b8ad8addc0d4b8ab769390179)/org/apache/cxf/fediz/systests/fediz-systests-tomcat8/1.4.4/fediz-systests-tomcat8-1.4.4.pom.asc(SHA1: 55916ca7856ce9561f15c32e4d470cfbf2e91de8)/org/apache/cxf/fediz/systests/fediz-systests-tomcat8/1.4.4/fediz-systests-tomcat8-1.4.4.jar.asc(SHA1: f8caf7a9819321a1add7e02386b79c05d5734add)/org/apache/cxf/fediz/systests/webapps/fediz-systests-webapps-simple/1.4.4/fediz-systests-webapps-simple-1.4.4.war.asc(SHA1: bc521c7633c529e44e9727419fac06f51f323722)/org/apache/cxf/fediz/systests/webapps/fediz-systests-webapps-simple/1.4.4/fediz-systests-webapps-simple-1.4.4.pom(SHA1: fe14b994513d71834470f8c540909ae0cdf0ae75)/org/apache/cxf/fediz/systests/webapps/fediz-systests-webapps-simple/1.4.4/fediz-systests-webapps-simple-1.4.4.war(SHA1:
Nexus: Staging Repository Dropped
Message from: https://repository.apache.orgDeployer properties:"userAgent" = "Apache-Maven/3.5.4 (Java 1.7.0_80; Linux 4.15.0-23-generic)""userId" = "coheigea""ip" = "37.228.233.175"Details:The orgapachecxf-1118 staging repository has been dropped.Action performed by Colm O hEigeartaigh (coheigea)
