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 B7191C3A7 for ; Thu, 26 Apr 2012 21:09:32 +0000 (UTC) Received: (qmail 10370 invoked by uid 500); 26 Apr 2012 21:09:32 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 10324 invoked by uid 500); 26 Apr 2012 21:09:32 -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 10314 invoked by uid 99); 26 Apr 2012 21:09:32 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 26 Apr 2012 21:09:32 +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; Thu, 26 Apr 2012 21:09:28 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 595B7238897D; Thu, 26 Apr 2012 21:09:06 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1331098 - in /cxf/branches/2.3.x-fixes: ./ tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/ tools/javato/ws/src/test/resources/java2wsdl_wsdl/ tools/javato/ws/src/test/resources/org/apache/cxf/tools/java2wsdl/process... Date: Thu, 26 Apr 2012 21:09:06 -0000 To: commits@cxf.apache.org From: dkulp@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120426210906.595B7238897D@eris.apache.org> Author: dkulp Date: Thu Apr 26 21:09:05 2012 New Revision: 1331098 URL: http://svn.apache.org/viewvc?rev=1331098&view=rev Log: Merged revisions 1331093 via svn merge from https://svn.us.apache.org/repos/asf/cxf/branches/2.4.x-fixes ........ r1331093 | dkulp | 2012-04-26 17:05:52 -0400 (Thu, 26 Apr 2012) | 18 lines Merged revisions 1331089 via svn merge from https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes ........ r1331089 | dkulp | 2012-04-26 17:05:02 -0400 (Thu, 26 Apr 2012) | 10 lines Merged revisions 1331084 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/trunk ........ r1331084 | dkulp | 2012-04-26 17:01:39 -0400 (Thu, 26 Apr 2012) | 3 lines Depending on a hashmap implementation, a test could fail due to relying on output from non-compliant wsdl. ........ ........ ........ Modified: cxf/branches/2.3.x-fixes/ (props changed) cxf/branches/2.3.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/JavaToProcessorTest.java cxf/branches/2.3.x-fixes/tools/javato/ws/src/test/resources/java2wsdl_wsdl/hello_world_bare.wsdl cxf/branches/2.3.x-fixes/tools/javato/ws/src/test/resources/org/apache/cxf/tools/java2wsdl/processor/expected/xml-bare-expected.wsdl Propchange: cxf/branches/2.3.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.3.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/JavaToProcessorTest.java URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/JavaToProcessorTest.java?rev=1331098&r1=1331097&r2=1331098&view=diff ============================================================================== --- cxf/branches/2.3.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/JavaToProcessorTest.java (original) +++ cxf/branches/2.3.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/JavaToProcessorTest.java Thu Apr 26 21:09:05 2012 @@ -328,7 +328,7 @@ public class JavaToProcessorTest extends @Test public void testXMlBare() throws Exception { env.put(ToolConstants.CFG_OUTPUTFILE, output.getPath() + "/xml-bare.wsdl"); - env.put(ToolConstants.CFG_CLASSNAME, "org.apache.xml_bare.Greeter"); + env.put(ToolConstants.CFG_CLASSNAME, org.apache.xml_bare.Greeter.class.getName()); processor.setEnvironment(env); processor.process(); Modified: cxf/branches/2.3.x-fixes/tools/javato/ws/src/test/resources/java2wsdl_wsdl/hello_world_bare.wsdl URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/tools/javato/ws/src/test/resources/java2wsdl_wsdl/hello_world_bare.wsdl?rev=1331098&r1=1331097&r2=1331098&view=diff ============================================================================== --- cxf/branches/2.3.x-fixes/tools/javato/ws/src/test/resources/java2wsdl_wsdl/hello_world_bare.wsdl (original) +++ cxf/branches/2.3.x-fixes/tools/javato/ws/src/test/resources/java2wsdl_wsdl/hello_world_bare.wsdl Thu Apr 26 21:09:05 2012 @@ -48,7 +48,7 @@ under the License. - + Modified: cxf/branches/2.3.x-fixes/tools/javato/ws/src/test/resources/org/apache/cxf/tools/java2wsdl/processor/expected/xml-bare-expected.wsdl URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/tools/javato/ws/src/test/resources/org/apache/cxf/tools/java2wsdl/processor/expected/xml-bare-expected.wsdl?rev=1331098&r1=1331097&r2=1331098&view=diff ============================================================================== --- cxf/branches/2.3.x-fixes/tools/javato/ws/src/test/resources/org/apache/cxf/tools/java2wsdl/processor/expected/xml-bare-expected.wsdl (original) +++ cxf/branches/2.3.x-fixes/tools/javato/ws/src/test/resources/org/apache/cxf/tools/java2wsdl/processor/expected/xml-bare-expected.wsdl Thu Apr 26 21:09:05 2012 @@ -18,125 +18,126 @@ under the License. --> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +