Return-Path: X-Original-To: apmail-cxf-commits-archive@www.apache.org Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 824127378 for ; Mon, 24 Oct 2011 12:13:50 +0000 (UTC) Received: (qmail 55809 invoked by uid 500); 24 Oct 2011 12:13:50 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 55747 invoked by uid 500); 24 Oct 2011 12:13:50 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 55740 invoked by uid 99); 24 Oct 2011 12:13:50 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 24 Oct 2011 12:13:50 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 24 Oct 2011 12:13:49 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 11AB5238889B for ; Mon, 24 Oct 2011 12:13:29 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: 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 Date: Mon, 24 Oct 2011 12:13:28 -0000 To: commits@cxf.apache.org From: sergeyb@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20111024121329.11AB5238889B@eris.apache.org> 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 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 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 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();