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 2013/04/04 09:09:14 UTC
svn commit: r1464302 - in /cxf/trunk:
rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/wadl/
systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/
systests/jaxrs/src/test/resources/jaxrs/WEB-INF/
systests/jaxrs/src/test/resources/wadl/
Author: sergeyb
Date: Thu Apr 4 07:09:14 2013
New Revision: 1464302
URL: http://svn.apache.org/r1464302
Log:
[CXF-4924] Renaming the test resources to make it simpler to merge to 2.7.x
Added:
cxf/trunk/systests/jaxrs/src/test/resources/wadl/bookstoreImportResource.wadl
- copied, changed from r1464017, cxf/trunk/systests/jaxrs/src/test/resources/wadl/bookstoreImportResource.xml
cxf/trunk/systests/jaxrs/src/test/resources/wadl/bookstoreImportResourceType.wadl
- copied unchanged from r1464017, cxf/trunk/systests/jaxrs/src/test/resources/wadl/bookstoreImportResourceType.xml
Removed:
cxf/trunk/systests/jaxrs/src/test/resources/wadl/bookstoreImportResource.xml
cxf/trunk/systests/jaxrs/src/test/resources/wadl/bookstoreImportResourceType.xml
Modified:
cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java
cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerSpringBookTest.java
cxf/trunk/systests/jaxrs/src/test/resources/jaxrs/WEB-INF/beans.xml
Modified: cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java?rev=1464302&r1=1464301&r2=1464302&view=diff
==============================================================================
--- cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java (original)
+++ cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java Thu Apr 4 07:09:14 2013
@@ -975,9 +975,6 @@ public class WadlGenerator implements Co
String actualRef = parentRef + href;
docLocationMap.put(actualRef, parentDocLoc + originalRef);
- if (fragment != null) {
- docLocationMap.put(parentRef + originalRef, parentDocLoc + originalRef);
- }
UriBuilder ub = UriBuilder.fromUri(getBaseURI(m, ui)).path(actualRef).fragment(fragment);
URI schemaURI = ub.build();
DOMUtils.setAttribute(element, attrName, schemaURI.toString());
Modified: cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerSpringBookTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerSpringBookTest.java?rev=1464302&r1=1464301&r2=1464302&view=diff
==============================================================================
--- cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerSpringBookTest.java (original)
+++ cxf/trunk/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerSpringBookTest.java Thu Apr 4 07:09:14 2013
@@ -138,7 +138,7 @@ public class JAXRSClientServerSpringBook
checkWadlResourcesInfo(address, address + "/bookstore", "/schemas/book.xsd", 2);
assertEquals("", resources.get(0).getAttribute("type"));
String type = resources.get(1).getAttribute("type");
- String resourceTypeAddress = address + "/bookstoreImportResourceType.xml#bookstoreType";
+ String resourceTypeAddress = address + "/bookstoreImportResourceType.wadl#bookstoreType";
assertEquals(resourceTypeAddress, type);
checkSchemas(address, "/schemas/book.xsd", "/schemas/chapter.xsd", "include");
Modified: cxf/trunk/systests/jaxrs/src/test/resources/jaxrs/WEB-INF/beans.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/jaxrs/src/test/resources/jaxrs/WEB-INF/beans.xml?rev=1464302&r1=1464301&r2=1464302&view=diff
==============================================================================
--- cxf/trunk/systests/jaxrs/src/test/resources/jaxrs/WEB-INF/beans.xml (original)
+++ cxf/trunk/systests/jaxrs/src/test/resources/jaxrs/WEB-INF/beans.xml Thu Apr 4 07:09:14 2013
@@ -209,7 +209,7 @@ http://cxf.apache.org/schemas/core.xsd">
</jaxrs:server>
<jaxrs:server id="bookserviceGenerated" address="/generated"
- docLocation="classpath:/wadl/bookstoreImportResource.xml">
+ docLocation="classpath:/wadl/bookstoreImportResource.wadl">
<jaxrs:serviceBeans>
<bean class="org.apache.cxf.systest.jaxrs.codegen.service.BookStore"/>
</jaxrs:serviceBeans>
Copied: cxf/trunk/systests/jaxrs/src/test/resources/wadl/bookstoreImportResource.wadl (from r1464017, cxf/trunk/systests/jaxrs/src/test/resources/wadl/bookstoreImportResource.xml)
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/jaxrs/src/test/resources/wadl/bookstoreImportResource.wadl?p2=cxf/trunk/systests/jaxrs/src/test/resources/wadl/bookstoreImportResource.wadl&p1=cxf/trunk/systests/jaxrs/src/test/resources/wadl/bookstoreImportResource.xml&r1=1464017&r2=1464302&rev=1464302&view=diff
==============================================================================
--- cxf/trunk/systests/jaxrs/src/test/resources/wadl/bookstoreImportResource.xml (original)
+++ cxf/trunk/systests/jaxrs/src/test/resources/wadl/bookstoreImportResource.wadl Thu Apr 4 07:09:14 2013
@@ -35,7 +35,7 @@
</method>
</resource>
</resource>
- <resource path="/bookstore2" type="bookstoreImportResourceType.xml#bookstoreType"/>
+ <resource path="/bookstore2" type="bookstoreImportResourceType.wadl#bookstoreType"/>
</resources>