You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by se...@apache.org on 2014/12/08 13:22:52 UTC
cxf git commit: [CXF-6139] Avoiding using expanded qnames as resource
ids
Repository: cxf
Updated Branches:
refs/heads/master 6268a76de -> 922dcbd1b
[CXF-6139] Avoiding using expanded qnames as resource ids
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/922dcbd1
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/922dcbd1
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/922dcbd1
Branch: refs/heads/master
Commit: 922dcbd1ba0d83e0f8eb1f5a063943935bb07e0d
Parents: 6268a76
Author: Sergey Beryozkin <sb...@talend.com>
Authored: Mon Dec 8 12:22:36 2014 +0000
Committer: Sergey Beryozkin <sb...@talend.com>
Committed: Mon Dec 8 12:22:36 2014 +0000
----------------------------------------------------------------------
.../java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/922dcbd1/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java
----------------------------------------------------------------------
diff --git a/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java b/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java
index a1cdcf4..6e2cab2 100644
--- a/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java
+++ b/rt/rs/description/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java
@@ -2068,10 +2068,9 @@ public class WadlGenerator implements ContainerRequestFilter {
if (useJaxbContextForQnames) {
jaxbQname = getJaxbQName(null, serviceClass, new HashMap<Class<?>, QName>(0));
}
- String pName = jaxbQname == null ? PackageUtils.getPackageName(serviceClass) : jaxbQname
- .getNamespaceURI();
+ String pName = jaxbQname == null ? PackageUtils.getPackageName(serviceClass) : null;
String localName = jaxbQname == null ? serviceClass.getSimpleName() : jaxbQname.getLocalPart();
- String nsName = jaxbQname == null ? pName + "." : "{" + pName + "}";
+ String nsName = jaxbQname == null ? pName + "." : "";
return nsName + localName;
}