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 2011/10/24 14:13:28 UTC
svn commit: r1188106 - in /cxf/branches/2.4.x-fixes: ./
rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/codegen/SourceGenerator.java
tools/wadlto/jaxrs/src/test/java/org/apache/cxf/tools/wadlto/jaxrs/JAXRSContainerTest.java
Author: sergeyb
Date: Mon Oct 24 12:13:28 2011
New Revision: 1188106
URL: http://svn.apache.org/viewvc?rev=1188106&view=rev
Log:
Merged revisions 1188096 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1188096 | sergeyb | 2011-10-24 12:38:49 +0100 (Mon, 24 Oct 2011) | 1 line
[CXF-3854] Appending Resource to syntesized resource names to avoid clashes with schema types generated into the same package
........
Modified:
cxf/branches/2.4.x-fixes/ (props changed)
cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/codegen/SourceGenerator.java
cxf/branches/2.4.x-fixes/tools/wadlto/jaxrs/src/test/java/org/apache/cxf/tools/wadlto/jaxrs/JAXRSContainerTest.java
Propchange: cxf/branches/2.4.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Oct 24 12:13:28 2011
@@ -1 +1 @@
-/cxf/trunk:1187370,1187376,1187390,1187401,1188080
+/cxf/trunk:1187370,1187376,1187390,1187401,1188080,1188096
Propchange: cxf/branches/2.4.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/codegen/SourceGenerator.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/codegen/SourceGenerator.java?rev=1188106&r1=1188105&r2=1188106&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/codegen/SourceGenerator.java (original)
+++ cxf/branches/2.4.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ext/codegen/SourceGenerator.java Mon Oct 24 12:13:28 2011
@@ -363,9 +363,8 @@ public class SourceGenerator {
resourceId += split[i].toUpperCase().charAt(0) + split[i].substring(1);
}
}
- } else {
- resourceId = DEFAULT_RESOURCE_NAME;
}
+ resourceId += DEFAULT_RESOURCE_NAME;
}
boolean expandedQName = resourceId.startsWith("{") ? true : false;
Modified: cxf/branches/2.4.x-fixes/tools/wadlto/jaxrs/src/test/java/org/apache/cxf/tools/wadlto/jaxrs/JAXRSContainerTest.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/tools/wadlto/jaxrs/src/test/java/org/apache/cxf/tools/wadlto/jaxrs/JAXRSContainerTest.java?rev=1188106&r1=1188105&r2=1188106&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/tools/wadlto/jaxrs/src/test/java/org/apache/cxf/tools/wadlto/jaxrs/JAXRSContainerTest.java (original)
+++ cxf/branches/2.4.x-fixes/tools/wadlto/jaxrs/src/test/java/org/apache/cxf/tools/wadlto/jaxrs/JAXRSContainerTest.java Mon Oct 24 12:13:28 2011
@@ -186,7 +186,7 @@ public class JAXRSContainerTest extends
List<File> files = FileUtils.getFilesRecurse(output, ".+\\." + "class" + "$");
assertEquals(4, files.size());
- assertTrue(checkContains(files, "application" + ".Bookstore.class"));
+ assertTrue(checkContains(files, "application" + ".BookstoreResource.class"));
assertTrue(checkContains(files, "superbooks" + ".Book.class"));
assertTrue(checkContains(files, "superbooks" + ".ObjectFactory.class"));
assertTrue(checkContains(files, "superbooks" + ".package-info.class"));
@@ -316,12 +316,12 @@ public class JAXRSContainerTest extends
List<File> javaFiles = FileUtils.getFilesRecurse(output, ".+\\." + "java" + "$");
assertEquals(2, javaFiles.size());
- assertTrue(checkContains(javaFiles, "application.Bookstore.java"));
- assertTrue(checkContains(javaFiles, "application.Books.java"));
+ assertTrue(checkContains(javaFiles, "application.BookstoreResource.java"));
+ assertTrue(checkContains(javaFiles, "application.BooksResource.java"));
List<File> classFiles = FileUtils.getFilesRecurse(output, ".+\\." + "class" + "$");
assertEquals(2, classFiles.size());
- assertTrue(checkContains(classFiles, "application.Bookstore.class"));
- assertTrue(checkContains(classFiles, "application.Books.class"));
+ assertTrue(checkContains(classFiles, "application.BookstoreResource.class"));
+ assertTrue(checkContains(classFiles, "application.BooksResource.class"));
} catch (Exception e) {
e.printStackTrace();
fail();