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/01/16 13:10:17 UTC
svn commit: r1558769 - in /cxf/branches/2.6.x-fixes: ./
tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/jaxrs/SourceGenerator.java
tools/wadlto/jaxrs/src/test/resources/wadl/bookstore.xml
Author: sergeyb
Date: Thu Jan 16 12:10:17 2014
New Revision: 1558769
URL: http://svn.apache.org/r1558769
Log:
Merged revisions 1558768 via svnmerge from
https://svn.apache.org/repos/asf/cxf/branches/2.7.x-fixes
................
r1558768 | sergeyb | 2014-01-16 12:07:15 +0000 (Thu, 16 Jan 2014) | 13 lines
Merged revisions 1558763-1558764 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1558763 | sergeyb | 2014-01-16 11:50:04 +0000 (Thu, 16 Jan 2014) | 1 line
[CXF-5494] Making sure '-' does not make it into the method names
........
r1558764 | sergeyb | 2014-01-16 11:52:49 +0000 (Thu, 16 Jan 2014) | 1 line
[CXF-5494] Removing println
........
................
Modified:
cxf/branches/2.6.x-fixes/ (props changed)
cxf/branches/2.6.x-fixes/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/jaxrs/SourceGenerator.java
cxf/branches/2.6.x-fixes/tools/wadlto/jaxrs/src/test/resources/wadl/bookstore.xml
Propchange: cxf/branches/2.6.x-fixes/
------------------------------------------------------------------------------
Merged /cxf/branches/2.7.x-fixes:r1558768
Merged /cxf/trunk:r1558763-1558764
Propchange: cxf/branches/2.6.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.6.x-fixes/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/jaxrs/SourceGenerator.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/jaxrs/SourceGenerator.java?rev=1558769&r1=1558768&r2=1558769&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/jaxrs/SourceGenerator.java (original)
+++ cxf/branches/2.6.x-fixes/tools/wadlto/jaxrs/src/main/java/org/apache/cxf/tools/wadlto/jaxrs/SourceGenerator.java Thu Jan 16 12:10:17 2014
@@ -665,7 +665,7 @@ public class SourceGenerator {
if (!jaxpSourceRequired && inXmlRep != null && xmlRequestReps.size() > 1) {
String value = inXmlRep.getAttribute("element");
int index = value.indexOf(":");
- suffixName = value.substring(index + 1);
+ suffixName = value.substring(index + 1).replace("-", "");
}
if (writeAnnotations(info.isInterfaceGenerated())) {
sbCode.append(TAB);
Modified: cxf/branches/2.6.x-fixes/tools/wadlto/jaxrs/src/test/resources/wadl/bookstore.xml
URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/tools/wadlto/jaxrs/src/test/resources/wadl/bookstore.xml?rev=1558769&r1=1558768&r2=1558769&view=diff
==============================================================================
--- cxf/branches/2.6.x-fixes/tools/wadlto/jaxrs/src/test/resources/wadl/bookstore.xml (original)
+++ cxf/branches/2.6.x-fixes/tools/wadlto/jaxrs/src/test/resources/wadl/bookstore.xml Thu Jan 16 12:10:17 2014
@@ -18,13 +18,12 @@
under the License.
-->
<application xmlns="http://wadl.dev.java.net/2009/02" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:prefix1="http://superbooks">
-
<grammars>
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
xmlns:tns="http://superbooks" attributeFormDefault="unqualified" elementFormDefault="unqualified"
targetNamespace="http://superbooks">
<xs:element name="thebook" type="tns:book"/>
- <xs:element name="theBook2" type="tns:theBook2"/>
+ <xs:element name="the-Book2" type="tns:theBook2"/>
<xs:element name="thechapter" type="tns:chapter"/>
<xs:complexType name="book">
<xs:sequence>
@@ -98,7 +97,7 @@ required="true">
<resource path="/book2/{bookid:.*}">
<method name="GET" id="getBook2">
<response>
- <representation mediaType="application/xml" element="prefix1:theBook2"/>
+ <representation mediaType="application/xml" element="prefix1:the-Book2"/>
<representation mediaType="application/json"/>
</response>
</method>
@@ -127,10 +126,10 @@ required="true">
<param name="provider.bar" style="query" required="true" type="xs:int"/>
<param name="a" style="query" repeating="true" type="xs:string"/>
<param name="b:c" style="query" repeating="true" type="xs:long"/>
- <representation mediaType="application/xml" element="prefix1:theBook2">
+ <representation mediaType="application/xml" element="prefix1:the-Book2">
<doc>InputBook</doc>
</representation>
- <representation mediaType="application/json" element="prefix1:theBook2">
+ <representation mediaType="application/json" element="prefix1:the-Book2">
<doc>InputBook</doc>
</representation>
</request>
@@ -157,7 +156,7 @@ required="true">
<method name="POST" id="addBookOrBook2">
<request>
<representation mediaType="application/xml" element="prefix1:thebook"/>
- <representation mediaType="application/xml" element="prefix1:theBook2"/>
+ <representation mediaType="application/xml" element="prefix1:the-Book2"/>
<representation mediaType="application/json"/>
</request>
<response status="201"/>