cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From serg...@apache.org
Subject cxf git commit: [CXF-6139] Avoiding using expanded qnames as resource ids
Date Mon, 08 Dec 2014 12:23:49 GMT
Repository: cxf
Updated Branches:
  refs/heads/3.0.x-fixes 746467818 -> 80b0b9e59


[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/80b0b9e5
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/80b0b9e5
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/80b0b9e5

Branch: refs/heads/3.0.x-fixes
Commit: 80b0b9e59cfd67defcc42245e203679fcff15a29
Parents: 7464678
Author: Sergey Beryozkin <sberyozkin@talend.com>
Authored: Mon Dec 8 12:22:36 2014 +0000
Committer: Sergey Beryozkin <sberyozkin@talend.com>
Committed: Mon Dec 8 12:23:29 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/80b0b9e5/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;
         }
 


Mime
View raw message