Return-Path: Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: (qmail 84343 invoked from network); 7 Sep 2010 19:05:50 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 7 Sep 2010 19:05:50 -0000 Received: (qmail 41357 invoked by uid 500); 7 Sep 2010 19:05:50 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 41225 invoked by uid 500); 7 Sep 2010 19:05: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 41217 invoked by uid 99); 7 Sep 2010 19:05:50 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 07 Sep 2010 19:05:50 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.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; Tue, 07 Sep 2010 19:05:49 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id CED39238899C; Tue, 7 Sep 2010 19:05:29 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r993480 - in /cxf/branches/2.2.x-fixes: ./ tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/ServiceBuilderFactoryTest.java Date: Tue, 07 Sep 2010 19:05:29 -0000 To: commits@cxf.apache.org From: dkulp@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100907190529.CED39238899C@eris.apache.org> Author: dkulp Date: Tue Sep 7 19:05:29 2010 New Revision: 993480 URL: http://svn.apache.org/viewvc?rev=993480&view=rev Log: Merged revisions 993442 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r993442 | dkulp | 2010-09-07 13:31:25 -0400 (Tue, 07 Sep 2010) | 1 line Missed a file ........ Modified: cxf/branches/2.2.x-fixes/ (props changed) cxf/branches/2.2.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/ServiceBuilderFactoryTest.java Propchange: cxf/branches/2.2.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.2.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/ServiceBuilderFactoryTest.java URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/ServiceBuilderFactoryTest.java?rev=993480&r1=993479&r2=993480&view=diff ============================================================================== --- cxf/branches/2.2.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/ServiceBuilderFactoryTest.java (original) +++ cxf/branches/2.2.x-fixes/tools/javato/ws/src/test/java/org/apache/cxf/tools/java2wsdl/processor/internal/ServiceBuilderFactoryTest.java Tue Sep 7 19:05:29 2010 @@ -30,7 +30,8 @@ import org.junit.Assert; import org.junit.Test; public class ServiceBuilderFactoryTest extends Assert { - ServiceBuilderFactory factory = ServiceBuilderFactory.getInstance(new ArrayList()); + ServiceBuilderFactory factory = ServiceBuilderFactory.getInstance(new ArrayList(), + "jaxb"); @Test public void testGetJaxwsBuilder() {