You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2014/10/30 17:20:35 UTC
[1/2] git commit: [CXF-6071] Make sure the Impl classnames is
properly munged
Repository: cxf
Updated Branches:
refs/heads/2.7.x-fixes 136f9da77 -> 3a8c85dc0
[CXF-6071] Make sure the Impl classnames is properly munged
Conflicts:
tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/ImplGenerator.java
tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/ServerGenerator.java
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/fb923522
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/fb923522
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/fb923522
Branch: refs/heads/2.7.x-fixes
Commit: fb92352240d1579145571d26977340b60908de50
Parents: 136f9da
Author: Daniel Kulp <dk...@apache.org>
Authored: Thu Oct 30 11:02:50 2014 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Thu Oct 30 12:20:17 2014 -0400
----------------------------------------------------------------------
.../java/org/apache/cxf/tools/util/NameUtil.java | 15 ++++++++++-----
.../frontend/jaxws/generators/ImplGenerator.java | 3 ++-
.../frontend/jaxws/generators/ServerGenerator.java | 2 +-
3 files changed, 13 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/fb923522/tools/common/src/main/java/org/apache/cxf/tools/util/NameUtil.java
----------------------------------------------------------------------
diff --git a/tools/common/src/main/java/org/apache/cxf/tools/util/NameUtil.java b/tools/common/src/main/java/org/apache/cxf/tools/util/NameUtil.java
index 4023d6e..37fdae7 100644
--- a/tools/common/src/main/java/org/apache/cxf/tools/util/NameUtil.java
+++ b/tools/common/src/main/java/org/apache/cxf/tools/util/NameUtil.java
@@ -70,7 +70,7 @@ public final class NameUtil {
return sb.toString();
}
- private static int nextBreak(String s, int start) {
+ private static int nextBreak(String s, int start, boolean allowUnderscore) {
int n = s.length();
char c1 = s.charAt(start);
@@ -84,7 +84,7 @@ public final class NameUtil {
switch (ACTION_TABLE[t0 * 5 + t1]) {
case ACTION_CHECK_PUNCT:
- if (isPunct(c1)) {
+ if (isPunct(c1) && !(allowUnderscore && c1 == '_')) {
return i;
}
break;
@@ -146,13 +146,15 @@ public final class NameUtil {
}
}
-
public static List<String> toWordList(String s) {
+ return toWordList(s, false);
+ }
+ public static List<String> toWordList(String s, boolean allowUnderscore) {
List<String> ss = new ArrayList<String>();
int n = s.length();
for (int i = 0; i < n;) {
while (i < n) {
- if (!isPunct(s.charAt(i))) {
+ if ((allowUnderscore && s.charAt(i) == '_') || !isPunct(s.charAt(i))) {
break;
}
i++;
@@ -161,7 +163,7 @@ public final class NameUtil {
break;
}
- int b = nextBreak(s, i);
+ int b = nextBreak(s, i, allowUnderscore);
String w = (b == -1) ? s.substring(i) : s.substring(i, b);
ss.add(escape(capitalize(w)));
if (b == -1) {
@@ -258,6 +260,9 @@ public final class NameUtil {
public static String mangleNameToClassName(String name) {
return toMixedCaseName(toWordList(name), true);
}
+ public static String mangleNameToClassName(String name, boolean allowUnderscores) {
+ return toMixedCaseName(toWordList(name, allowUnderscores), true);
+ }
public static String mangleNameToVariableName(String name) {
return toMixedCaseName(toWordList(name), false);
http://git-wip-us.apache.org/repos/asf/cxf/blob/fb923522/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/ImplGenerator.java
----------------------------------------------------------------------
diff --git a/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/ImplGenerator.java b/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/ImplGenerator.java
index 2f92416..2f37920 100644
--- a/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/ImplGenerator.java
+++ b/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/ImplGenerator.java
@@ -34,6 +34,7 @@ import org.apache.cxf.tools.common.model.JavaModel;
import org.apache.cxf.tools.common.model.JavaPort;
import org.apache.cxf.tools.common.model.JavaServiceClass;
import org.apache.cxf.tools.util.ClassCollector;
+import org.apache.cxf.tools.util.NameUtil;
import org.apache.cxf.tools.wsdlto.frontend.jaxws.processor.WSDLToJavaProcessor;
public class ImplGenerator extends AbstractJAXWSGenerator {
@@ -126,7 +127,7 @@ public class ImplGenerator extends AbstractJAXWSGenerator {
}
String name = nm.get(service + "/" + port);
if (name == null) {
- name = intf.getName() + "Impl";
+ name = NameUtil.mangleNameToClassName(intf.getName() + "Impl", true);
name = mapClassName(intf.getPackageName(), name, penv);
nm.put(service + "/" + port, name);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/fb923522/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/ServerGenerator.java
----------------------------------------------------------------------
diff --git a/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/ServerGenerator.java b/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/ServerGenerator.java
index ed20181..3941625 100644
--- a/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/ServerGenerator.java
+++ b/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/generators/ServerGenerator.java
@@ -119,7 +119,7 @@ public class ServerGenerator extends AbstractJAXWSGenerator {
}
String name = nm.get(service + "/" + port);
if (name == null) {
- name = intf.getName() + "Impl";
+ name = NameUtil.mangleNameToClassName(intf.getName() + "Impl", true);
name = mapClassName(intf.getPackageName(), name, penv);
nm.put(service + "/" + port, name);
}
[2/2] git commit: Recording .gitmergeinfo Changes
Posted by dk...@apache.org.
Recording .gitmergeinfo Changes
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/3a8c85dc
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/3a8c85dc
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/3a8c85dc
Branch: refs/heads/2.7.x-fixes
Commit: 3a8c85dc079c18516e404833ad6972407f864ed2
Parents: fb92352
Author: Daniel Kulp <dk...@apache.org>
Authored: Thu Oct 30 12:20:19 2014 -0400
Committer: Daniel Kulp <dk...@apache.org>
Committed: Thu Oct 30 12:20:19 2014 -0400
----------------------------------------------------------------------
.gitmergeinfo | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/3a8c85dc/.gitmergeinfo
----------------------------------------------------------------------
diff --git a/.gitmergeinfo b/.gitmergeinfo
index 268fe9a..29783c8 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -528,6 +528,7 @@ B 563d7793d6517980a1e1c143d3a02c72209e7065
B 567f9862fa817ed6446cac1ec93fea3ad8c73ac5
B 568ddf675cc639efb4adbfebb11ac887cfcd355d
B 56a44e02e49f1d5281799ac57370b03772620cc8
+B 571b4fa0ab4f986feb927b49734bd9935ba131a3
B 57270b2ddefebebef6068a2ec1616a4bee93975d
B 5748b2981da7c3e72d7fd2cd7701469c64c5c349
B 5753513fa33edafda8730b9e275865d777c2926c
@@ -1800,6 +1801,7 @@ M 652fab32f3ae5ffa3b4cb6290d654eadbdfd39a2
M 657ab96e82579f0a8edc2b785c6857d46d60a7ec
M 6760726ef4281dde2031dfb7cc9b97a940452242
M 683dc5caa73f8659fb45a7ab251dc6476dff8961
+M 68d79ef59b53b24e35c18055a9272fd7ee21e119
M 6940c5f35041d81151c80c8b3ce06edf5bb0f0a4
M 69bc8b32faebee6b68c545fd281a460bcedad1b7
M 69eada2cd44097d11c3bf1be613befdf3be451cd