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/06/08 11:18:04 UTC
[cxf] branch 3.3.x-fixes updated (09b6e35 -> 6d2e0d1)
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 09b6e35 Recording .gitmergeinfo Changes
new 869eeb6 CXF-8298 - An invalid package name is generated
new 6d2e0d1 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 | 1 +
core/src/main/java/org/apache/cxf/common/util/PackageUtils.java | 4 +++-
core/src/test/java/org/apache/cxf/common/util/PackageUtilsTest.java | 4 ++++
3 files changed, 8 insertions(+), 1 deletion(-)
[cxf] 01/02: CXF-8298 - An invalid package name is generated
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 869eeb6a5be5f71d1a9497cbdd01d93e585be7c1
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Mon Jun 8 11:14:27 2020 +0100
CXF-8298 - An invalid package name is generated
(cherry picked from commit 9713d86acedbfa6be6375e7d494c2771cd438f05)
---
core/src/main/java/org/apache/cxf/common/util/PackageUtils.java | 4 +++-
core/src/test/java/org/apache/cxf/common/util/PackageUtilsTest.java | 4 ++++
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/core/src/main/java/org/apache/cxf/common/util/PackageUtils.java b/core/src/main/java/org/apache/cxf/common/util/PackageUtils.java
index 2c422e9..49e19ff 100644
--- a/core/src/main/java/org/apache/cxf/common/util/PackageUtils.java
+++ b/core/src/main/java/org/apache/cxf/common/util/PackageUtils.java
@@ -132,12 +132,14 @@ public final class PackageUtils {
String token = tokens.get(i);
token = removeIllegalIdentifierChars(token);
+ token = token.toLowerCase();
+
// this will check for reserved keywords
if (JavaUtils.isJavaKeyword(token)) {
token = '_' + token;
}
- tokens.set(i, token.toLowerCase());
+ tokens.set(i, token);
}
// concat all the pieces and return it
diff --git a/core/src/test/java/org/apache/cxf/common/util/PackageUtilsTest.java b/core/src/test/java/org/apache/cxf/common/util/PackageUtilsTest.java
index 24ff807..6dad735 100644
--- a/core/src/test/java/org/apache/cxf/common/util/PackageUtilsTest.java
+++ b/core/src/test/java/org/apache/cxf/common/util/PackageUtilsTest.java
@@ -134,6 +134,10 @@ public class PackageUtilsTest {
PackageUtils.getPackageNameByNameSpaceURI("com.esendex.ems.soapinterface"));
assertEquals("ddd.cc.bb.aa.eee.fff_v01_00",
PackageUtils.getPackageNameByNameSpaceURI("http://aa.bb.cc.ddd/eee/fff_v01.00"));
+ assertEquals("org.apache.cxf._case",
+ PackageUtils.getPackageNameByNameSpaceURI("http://www.case.cxf.apache.org"));
+ assertEquals("org.apache.cxf._case",
+ PackageUtils.getPackageNameByNameSpaceURI("http://www.Case.cxf.apache.org"));
}
@Test
[cxf] 02/02: 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 6d2e0d1107850c2425c9b4e15366b1dddc7daa42
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Mon Jun 8 11:15:27 2020 +0100
Recording .gitmergeinfo Changes
---
.gitmergeinfo | 1 +
1 file changed, 1 insertion(+)
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 30fb2a0..0b5aa3a 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -112,6 +112,7 @@ B 6bc7f0cc09395effeaa57ee92e4b8c5dce5c00a6
B 6c368654075cfc80a6b59903fd0ae343f2cd5fff
B 6d59a806aca3cd81e7e86df401afd771274c3141
B 6dd6377021ac0b9b586a0c579c3adfd6950936c8
+B 6eb88763b1ca04b3a9451f994c435e5f821ca449
B 6ef11c95058077c4eb707077ff99271da581599e
B 6f9303c1e94800ac453cc10e5268024fd2831418
B 6fbaddee67676f9840405bd49cb7d6e08a81bd23